diff options
| author | asami <asami@FreeBSD.org> | 1997-04-15 08:36:41 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1997-04-15 08:36:41 +0000 |
| commit | d52813b87369a7b3f4128df4cd3ed2bf77fb55b8 (patch) | |
| tree | ad45e499e6443d1cd32001052ffd1f003fa8640e | |
| parent | 54f4bf0d7dfbda79a12b8a706b11ed84317e77ce (diff) | |
| download | FreeBSD-src-d52813b87369a7b3f4128df4cd3ed2bf77fb55b8.zip FreeBSD-src-d52813b87369a7b3f4128df4cd3ed2bf77fb55b8.tar.gz | |
(1) Change comment for USE_X11 to be more explicit about what it
means.
(2) Change MASTER_SITE_GNU etc. to use += instead of ?=, so users can
specify a local mirror in /etc/make.conf and still get the full
fallback in case something is missing.
Submitted by: Narvi <narvi@haldjas.folklore.ee>
(3) Skip port if USE_X11 or USE_IMAKE is defined and /usr/X11R6
doesn't exist.
Submitted by: imp
(4) Add "-" in front of rmdir of ${DISTDIR}/${DIST_SUBDIR} in
distclean target; the directory might not be empty because the
subdir is shared with some other ports' distfiles.
| -rw-r--r-- | share/mk/bsd.port.mk | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk index 83cd804..1dd1bd2 100644 --- a/share/mk/bsd.port.mk +++ b/share/mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $Id: bsd.port.mk,v 1.253 1997/02/23 13:24:45 asami Exp $ +# $Id: bsd.port.mk,v 1.254 1997/03/06 08:28:15 asami Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -114,7 +114,7 @@ OpenBSD_MAINTAINER= imp@OpenBSD.ORG # RESTRICTED - Port is restricted. Set this string to the reason why. # USE_GMAKE - Says that the port uses gmake. # USE_IMAKE - Says that the port uses imake. -# USE_X11 - Says that the port uses X11. +# USE_X11 - Says that the port uses X11 (i.e., installs in ${X11BASE}). # NO_INSTALL_MANPAGES - For imake ports that don't like the install.man # target. # HAS_CONFIGURE - Says that the port has its own configure script. @@ -478,26 +478,26 @@ ALL_TARGET?= all INSTALL_TARGET?= install # Popular master sites -MASTER_SITE_XCONTRIB?= \ - ftp://ftp.x.org/contrib/${MASTER_SITE_SUBDIR}/ \ - ftp://crl.dec.com/pub/X11/contrib/${MASTER_SITE_SUBDIR}/ +MASTER_SITE_XCONTRIB+= \ + ftp://crl.dec.com/pub/X11/contrib/${MASTER_SITE_SUBDIR}/ \ + ftp://ftp.eu.net/X11/contrib/${MASTER_SITE_SUBDIR}/ -MASTER_SITE_GNU?= \ +MASTER_SITE_GNU+= \ ftp://prep.ai.mit.edu/pub/gnu/${MASTER_SITE_SUBDIR}/ \ ftp://wuarchive.wustl.edu/systems/gnu/${MASTER_SITE_SUBDIR}/ -MASTER_SITE_PERL_CPAN?= \ +MASTER_SITE_PERL_CPAN+= \ ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/${MASTER_SITE_SUBDIR}/ \ ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/${MASTER_SITE_SUBDIR}/ -MASTER_SITE_TEX_CTAN?= \ +MASTER_SITE_TEX_CTAN+= \ ftp://ftp.cdrom.com/pub/tex/ctan/${MASTER_SITE_SUBDIR}/ \ ftp://wuarchive.wustl.edu/packages/TeX/${MASTER_SITE_SUBDIR}/ \ ftp://ftp.funet.fi/pub/TeX/CTAN/${MASTER_SITE_SUBDIR}/ \ ftp://ftp.tex.ac.uk/public/ctan/tex-archive/${MASTER_SITE_SUBDIR}/ \ ftp://ftp.dante.de/tex-archive/${MASTER_SITE_SUBDIR}/ -MASTER_SITE_SUNSITE?= \ +MASTER_SITE_SUNSITE+= \ ftp://sunsite.unc.edu/pub/Linux/${MASTER_SITE_SUBDIR}/ \ ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/${MASTER_SITE_SUBDIR}/ \ ftp://ftp.funet.fi/pub/mirrors/sunsite.unc.edu/pub/Linux/${MASTER_SITE_SUBDIR}/ @@ -675,6 +675,8 @@ IGNORE= "does not require Motif" IGNORE= "may not be placed on a CDROM: ${NO_CDROM}" .elif (defined(RESTRICTED) && defined(NO_RESTRICTED)) IGNORE= "is restricted: ${RESTRICTED}" +.elif ((defined(USE_IMAKE) || defined(USE_X11)) && !exists(${X11BASE})) +IGNORE= "uses X11, but ${X11BASE} not found" .elif defined(BROKEN) IGNORE= "is marked as broken: ${BROKEN}" .endif @@ -1235,7 +1237,7 @@ distclean: pre-distclean clean ${RM} -f ${DISTFILES} ${PATCHFILES}; \ fi) .if defined(DIST_SUBDIR) - @${RMDIR} ${_DISTDIR} + -@${RMDIR} ${_DISTDIR} .endif .endif |
