Date: Sat, 7 Dec 1996 04:55:57 -0800 (PST) From: asami@freebsd.org (Satoshi Asami) To: max@freefall.freebsd.org Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-ports@freefall.freebsd.org Subject: Re: cvs commit: ports/devel/gdb Makefile Message-ID: <199612071255.EAA01207@silvia.HIP.Berkeley.EDU> In-Reply-To: <199612071054.CAA19788@freefall.freebsd.org> (message from Masafumi NAKANE on Sat, 7 Dec 1996 02:54:09 -0800 (PST))
next in thread | previous in thread | raw e-mail | index | archive | help
> Um, I don't think NO_PACKAGE is included in that list.... ;) (Maybe it
> should.)
Well, I added it to bsd.port.mk, please check.
Also included is the removal of "yes" check from BROKEN and NO_CDROM
(I have heard that it may break when there are special characters such
as ; in the string...they are all going to be converted anyway) and a
small bug fix to not run clean as part of clean-depends (note `cd ""'
will not change the current directory in sh) when DEPENDS or all of
*_DEPENDS were missing.
Satoshi
-------
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.233
diff -u -r1.233 bsd.port.mk
--- bsd.port.mk 1996/12/04 05:53:17 1.233
+++ bsd.port.mk 1996/12/07 12:34:49
@@ -581,20 +581,12 @@
.elif (defined(REQUIRES_MOTIF) && !defined(HAVE_MOTIF))
IGNORE= "requires Motif"
.elif (defined(NO_CDROM) && defined(FOR_CDROM))
-.if ${NO_CDROM} == yes
-IGNORE= "may not be placed on a CDROM"
-.else
IGNORE= "may not be placed on a CDROM: ${NO_CDROM}"
-.endif
.elif (defined(RESTRICTED) && defined(NO_RESTRICTED))
IGNORE= "is restricted: ${RESTRICTED}"
.elif defined(BROKEN)
-.if ${BROKEN} == yes
-IGNORE= "is marked as broken"
-.else
IGNORE= "is marked as broken: ${BROKEN}"
.endif
-.endif
.if defined(IGNORE)
.if defined(IGNORE_SILENT)
@@ -693,7 +685,11 @@
# Disable package
.if defined(NO_PACKAGE) && !target(package)
package:
+.if defined(IGNORE_SILENT)
@${DO_NADA}
+.else
+ @${ECHO_MSG} "===> ${PKGNAME} may not be packaged: ${NO_PACKAGE}."
+.endif
.endif
# Disable describe
@@ -1370,13 +1366,17 @@
.if !target(clean-depends)
clean-depends:
+.if defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS)
@for i in ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}; do \
dir=`${ECHO} $$i | ${SED} -e 's/.*://'`; \
if [ -d $$dir ] ; then (cd $$dir; ${MAKE} clean); fi \
done
+.endif
+.if defined(DEPENDS)
@for dir in ${DEPENDS}; do \
if [ -d $$dir ] ; then (cd $$dir; ${MAKE} clean); fi \
done
+.endif
.endif
.if !target(depends-list)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199612071255.EAA01207>