diff options
| author | hubertf <hubertf@pkgsrc.org> | 2001-08-24 00:54:46 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2001-08-24 00:54:46 +0000 |
| commit | aeed7c63ec85d1402fff79f0a5023fe182e42341 (patch) | |
| tree | 5e48a5e4e93f18fcc13130385e80c77188f5fa23 /mk | |
| parent | 0d8b59e6d549574011fc2a5cb8b8b59bf972c09c (diff) | |
| download | pkgsrc-aeed7c63ec85d1402fff79f0a5023fe182e42341.tar.gz | |
* When applying patches, also look in $LOCALPATCHES/$PKGPATH for
any local patches that the user wants to maintain outside of
pkgsrc.
* print-PLIST: ignore Linux procfs entries
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 21 | ||||
| -rw-r--r-- | mk/mk.conf.example | 6 |
2 files changed, 21 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b5cdfd8f182..9b3c7feccfc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.801 2001/08/23 16:37:27 abs Exp $ +# $NetBSD: bsd.pkg.mk,v 1.802 2001/08/24 00:54:47 hubertf Exp $ # # This file is in the public domain. # @@ -1416,7 +1416,14 @@ do-patch: uptodate-digest else \ ${ECHO_MSG} "${_PKGSRC_IN}> Applying ${OPSYS} patches for ${PKGNAME}" ; \ fail=""; \ - for i in ${PATCHDIR}/patch-*; do \ + for i in ${PATCHDIR}/patch-* ${LOCALPATCHES}/${PKGPATH}/* ; do \ + if [ "$$i" = "${LOCALPATCHES}/${PKGPATH}/*" ]; then \ + continue ; \ + fi ; \ + if [ ! -f "$$i" ]; then \ + ${ECHO_MSG} "${_PKGSRC_IN}> $$i is not a valid patch file - skipping" ; \ + continue ; \ + fi ; \ case $$i in \ *.orig|*.rej|*~) \ ${ECHO_MSG} "${_PKGSRC_IN}> Ignoring patchfile $$i" ; \ @@ -1424,6 +1431,8 @@ do-patch: uptodate-digest ;; \ ${PATCHDIR}/patch-local-*) \ ;; \ + ${LOCALPATCHES}/${PKGPATH}/*) \ + ;; \ *) \ if [ -f ${DISTINFO_FILE} ]; then \ filename=`expr $$i : '.*/\(.*\)'`; \ @@ -3099,14 +3108,15 @@ print-PLIST: | ${SED} \ -e 's@${PREFIX}/./@@' \ -e 's@${OPSYS}@\$${OPSYS}@' \ - -e 's@${OS_VERSION:S/./\./}@\$${OS_VERSION}@' \ + -e 's@${OS_VERSION:S/./\./}@\$${OS_VERSION}@' \ -e 's@${MACHINE_ARCH}@\$${MACHINE_ARCH}@' \ -e 's@${MACHINE_GNU_ARCH}@\$${MACHINE_GNU_ARCH}@' \ -e 's@${MACHINE_GNU_PLATFORM}@\$${MACHINE_GNU_PLATFORM}@' \ -e 's@${LOWER_VENDOR}@\$${LOWER_VENDOR}@' \ -e 's@${LOWER_OPSYS}@\$${LOWER_OPSYS}@' \ -e 's@${PKGNAME}@\$${PKGNAME}@' \ - | ${SORT} \ + | ${SORT} \ + | ${GREP} -v emul/linux/proc \ | ${AWK} ' \ /^@/ { print $$0; next } \ /.*\/lib[^\/]+\.so\.[0-9]+\.[0-9]+\.[0-9]+$$/ { \ @@ -3155,7 +3165,8 @@ print-PLIST: -e s@${MACHINE_GNU_PLATFORM}@\$${MACHINE_GNU_PLATFORM}@ \ -e s@${LOWER_VENDOR}@\$${LOWER_VENDOR}@ \ -e s@${LOWER_OPSYS}@\$${LOWER_OPSYS}@ \ - -e s@${PKGNAME}@\$${PKGNAME}@ + -e s@${PKGNAME}@\$${PKGNAME}@ \ + | ${GREP} -v emul/linux/proc .endif # target(print-PLIST) diff --git a/mk/mk.conf.example b/mk/mk.conf.example index ef550b23c50..ee2905a192c 100644 --- a/mk/mk.conf.example +++ b/mk/mk.conf.example @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf.example,v 1.238 2001/08/19 08:47:57 zuntum Exp $ +# $NetBSD: mk.conf.example,v 1.239 2001/08/24 00:54:46 hubertf Exp $ # # Sample /etc/mk.conf file, which can be used to set specific values @@ -347,6 +347,10 @@ # Possible: -v, -u, etc. See pkg_add(8) # Default: (no option) +#LOCALPATCHES=... +# Directory where local patches are stored. See pkgsrc/Packages.txt. +# Possible: Any local directory +# Default: none # # Definitions used only in the packages collection |