diff options
author | wiz <wiz@pkgsrc.org> | 2000-12-08 10:17:36 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2000-12-08 10:17:36 +0000 |
commit | 8184259f54c131a46e278a8cfa37aea7539538a1 (patch) | |
tree | 0e15edae271d88fb139765651b8b971d91454667 | |
parent | bef9e409f7fb9feb74892cb52110767d9a7de950 (diff) | |
download | pkgsrc-8184259f54c131a46e278a8cfa37aea7539538a1.tar.gz |
REQ is no more, its place is taken by INSTALL & friends.
-rw-r--r-- | Packages.txt | 7 | ||||
-rw-r--r-- | mk/bsd.pkg.mk | 15 |
2 files changed, 2 insertions, 20 deletions
diff --git a/Packages.txt b/Packages.txt index 57cc43426d8..c515f5c7fc5 100644 --- a/Packages.txt +++ b/Packages.txt @@ -1,4 +1,4 @@ -# $NetBSD: Packages.txt,v 1.127 2000/12/07 01:23:48 hubertf Exp $ +# $NetBSD: Packages.txt,v 1.128 2000/12/08 10:18:19 wiz Exp $ ########################################################################### ========================== @@ -651,11 +651,6 @@ which does a lot of the donkey work for you. delete the files created in the original distribution. See pkg_delete(1) and pkg_create(1) for more information. - * pkg/REQ: - Require-script that is invoked before installation and de-installation - to ensure things like certain accounts being available, user/sysadmin - agreeing with usage policy, etc. - * pkg/MESSAGE Display this file after installation of the package. Useful for things like legal notices on almost-free software, diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 93668302b5f..3760e587a24 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.627 2000/12/06 16:29:16 abs Exp $ +# $NetBSD: bsd.pkg.mk,v 1.628 2000/12/08 10:17:36 wiz Exp $ # # This file is in the public domain. # @@ -503,11 +503,6 @@ INSTALL_FILE= ${PKGDIR}/INSTALL DEINSTALL_FILE= ${PKGDIR}/DEINSTALL .endif -# Set REQ_FILE to be the name of any REQ file -.if !defined(REQ_FILE) && exists(${PKGDIR}/REQ) -REQ_FILE= ${PKGDIR}/REQ -.endif - # Set MESSAGE_FILE to be the name of any MESSAGE file .if !defined(MESSAGE_FILE) && exists(${PKGDIR}/MESSAGE) MESSAGE_FILE= ${PKGDIR}/MESSAGE @@ -705,9 +700,6 @@ PKG_ARGS+= -i ${INSTALL_FILE} .ifdef DEINSTALL_FILE PKG_ARGS+= -k ${DEINSTALL_FILE} .endif -.ifdef REQ_FILE -PKG_ARGS+= -r ${REQ_FILE} -.endif .ifdef MESSAGE_FILE PKG_ARGS+= -D ${MESSAGE_FILE} .endif @@ -3207,11 +3199,6 @@ fake-pkg: ${PLIST} ${DESCR} ${CP} ${DEINSTALL_FILE} ${PKG_DBDIR}/${PKGNAME}/+DEINSTALL; \ fi; \ fi; \ - if [ -n "${REQ_FILE}" ]; then \ - if ${TEST} -e ${REQ_FILE}; then \ - ${CP} ${REQ_FILE} ${PKG_DBDIR}/${PKGNAME}/+REQUIRE; \ - fi; \ - fi; \ if [ -n "${MESSAGE_FILE}" ]; then \ if ${TEST} -e ${MESSAGE_FILE}; then \ ${CP} ${MESSAGE_FILE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \ |