From 3b3433af0e09b982397deaabb881b9e0ef11a64a Mon Sep 17 00:00:00 2001 From: hubertf Date: Sat, 18 Oct 1997 23:33:25 +0000 Subject: - don't clean out dependent packages (requested by thorpej) - actually document the feature used above (NOCLEANDEPENDS) - put pkg/MESSAGE file into /var/db/pkg/XXX/+DISPLAY, if present (from FreeBSD) --- mk/bsd.pkg.mk | 7 ++++++- mk/bsd.port.mk | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 7132ca6ccca..1840143f7f6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # Id: bsd.port.mk,v 1.263 1997/07/17 17:47:36 markm Exp -# $NetBSD: bsd.pkg.mk,v 1.12 1997/10/17 01:40:49 thorpej Exp $ +# $NetBSD: bsd.pkg.mk,v 1.13 1997/10/18 23:33:25 hubertf Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -131,6 +131,7 @@ NetBSD_MAINTAINER= agc@netbsd.org # NO_WRKDIR - There's no work directory at all; port does this someplace # else. # NO_DEPENDS - Don't verify build of dependencies. +# NOCLEANDEPENDS - Don't clean dependent packages # BROKEN - Port is broken. Set this string to the reason why. # RESTRICTED - Port is restricted. Set this string to the reason why. # USE_GMAKE - Says that the port uses gmake. @@ -310,6 +311,7 @@ NOMANCOMPRESS?= yes DEF_UMASK?= 022 .elif (${OPSYS} == "NetBSD") DEF_UMASK?= 0022 +NOCLEANDEPENDS= yes .else DEF_UMASK?= 0022 .endif @@ -1782,6 +1784,9 @@ fake-pkg: ${PLIST} if [ -f ${PKGDIR}/REQ ]; then \ ${CP} ${PKGDIR}/REQ ${PKG_DBDIR}/${PKGNAME}/+REQ; \ fi; \ + if [ -f ${PKGDIR}/MESSAGE ]; then \ + ${CP} ${PKGDIR}/MESSAGE ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \ + fi; \ for dep in `make package-depends ECHO_MSG=/usr/bin/true | sort -u`; do \ if [ -d ${PKG_DBDIR}/$$dep ]; then \ if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \ diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index a11f7e9d5b1..b0020fe6b2f 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # Id: bsd.port.mk,v 1.263 1997/07/17 17:47:36 markm Exp -# $NetBSD: bsd.port.mk,v 1.12 1997/10/17 01:40:49 thorpej Exp $ +# $NetBSD: bsd.port.mk,v 1.13 1997/10/18 23:33:25 hubertf Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -131,6 +131,7 @@ NetBSD_MAINTAINER= agc@netbsd.org # NO_WRKDIR - There's no work directory at all; port does this someplace # else. # NO_DEPENDS - Don't verify build of dependencies. +# NOCLEANDEPENDS - Don't clean dependent packages # BROKEN - Port is broken. Set this string to the reason why. # RESTRICTED - Port is restricted. Set this string to the reason why. # USE_GMAKE - Says that the port uses gmake. @@ -310,6 +311,7 @@ NOMANCOMPRESS?= yes DEF_UMASK?= 022 .elif (${OPSYS} == "NetBSD") DEF_UMASK?= 0022 +NOCLEANDEPENDS= yes .else DEF_UMASK?= 0022 .endif @@ -1782,6 +1784,9 @@ fake-pkg: ${PLIST} if [ -f ${PKGDIR}/REQ ]; then \ ${CP} ${PKGDIR}/REQ ${PKG_DBDIR}/${PKGNAME}/+REQ; \ fi; \ + if [ -f ${PKGDIR}/MESSAGE ]; then \ + ${CP} ${PKGDIR}/MESSAGE ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \ + fi; \ for dep in `make package-depends ECHO_MSG=/usr/bin/true | sort -u`; do \ if [ -d ${PKG_DBDIR}/$$dep ]; then \ if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \ -- cgit v1.2.3