Date: Fri, 7 Jun 1996 15:07:31 +0200 (MET DST) From: Andreas Klemm <andreas@klemm.gtn.com> To: ports@FreeBSD.org Cc: asami@FreeBSD.org, jkh@FreeBSD.org Subject: modified bsd.ports.mk to allow a local patchdir MYPATCHDIR Message-ID: <Pine.BSF.3.92.960607150046.9214A-100000@klemm.gtn.com>
next in thread | raw e-mail | index | archive | help
Hi !
I enhanced the bmake include file bsd.port.mk, to allow to have an
additional patchdir, where administrators can store local patches.
It's for the case, that the port maintainers don't match my personal
configuration needs.
For example /usr/ports/print/a2ps/patchdir/...official patches...
/usr/ports/print/a2ps/mypatchdir/...my personal preferences...
Hope you like that idea ... Here comes the unified diff.
Andreas ///
--- bsd.port.mk.orig Fri Jun 7 14:54:58 1996
+++ bsd.port.mk Fri Jun 7 14:59:53 1996
@@ -65,6 +65,9 @@
# PATCHDIR - A directory containing any additional patches you made
# to port this software to FreeBSD (default:
# ${.CURDIR}/patches)
+# MYPATCHDIR - A directory containing patches, that are only needed
+# for your own system (default:
+# ${.CURDIR}/mypatches)
# SCRIPTDIR - A directory containing any auxiliary scripts
# (default: ${.CURDIR}/scripts)
# FILESDIR - A directory containing any miscellaneous additional files.
@@ -221,6 +224,7 @@
WRKSRC?= ${WRKDIR}/${DISTNAME}
.endif
PATCHDIR?= ${.CURDIR}/patches
+MYPATCHDIR?= ${.CURDIR}/mypatches
SCRIPTDIR?= ${.CURDIR}/scripts
FILESDIR?= ${.CURDIR}/files
PKGDIR?= ${.CURDIR}/pkg
@@ -459,7 +463,8 @@
all:
@${SETENV} CURDIR=${.CURDIR} DISTNAME=${DISTNAME} \
DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} \
- PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
+ PATCHDIR=${PATCHDIR} MYPATCHDIR=${MYPATCHDIR} \
+ SCRIPTDIR=${SCRIPTDIR} \
FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
DEPENDS="${DEPENDS}" BUILD_DEPENDS="${BUILD_DEPENDS}" \
RUN_DEPENDS="${RUN_DEPENDS}" X11BASE=${X11BASE} \
@@ -651,6 +656,20 @@
esac; \
done; \
fi
+ @if [ -d ${MYPATCHDIR} ]; then \
+ ${ECHO_MSG} "===> Applying local patches for ${PKGNAME}" ; \
+ for i in ${MYPATCHDIR}/patch-*; do \
+ case $$i in \
+ *.orig|*~) \
+ ${ECHO_MSG} "===> Ignoring patchfile $$i" ; \
+ ;; \
+ *) \
+ ${ECHO_MSG} "===> Applying local patch $$i" ; \
+ ${PATCH} ${PATCH_ARGS} < $$i; \
+ ;; \
+ esac; \
+ done; \
+ fi
.else
@if [ -d ${PATCHDIR} ]; then \
${ECHO_MSG} "===> Applying FreeBSD patches for ${PKGNAME}" ; \
@@ -665,6 +684,19 @@
esac; \
done;\
fi
+ @if [ -d ${MYPATCHDIR} ]; then \
+ ${ECHO_MSG} "===> Applying local patches for ${PKGNAME}" ; \
+ for i in ${MYPATCHDIR}/patch-*; do \
+ case $$i in \
+ *.orig|*~) \
+ ${ECHO_MSG} "===> Ignoring patchfile $$i" ; \
+ ;; \
+ *) \
+ ${PATCH} ${PATCH_ARGS} < $$i; \
+ ;; \
+ esac; \
+ done;\
+ fi
.endif
.endif
@@ -798,7 +830,8 @@
@${MAKE} ${.MAKEFLAGS} ${.TARGET:S/^real-/pre-/}
@if [ -f ${SCRIPTDIR}/${.TARGET:S/^real-/pre-/} ]; then \
${SETENV} CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
- WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
+ WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
+ MYPATCHDIR=${MYPATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
/bin/sh ${SCRIPTDIR}/${.TARGET:S/^real-/pre-/}; \
@@ -807,7 +840,8 @@
@${MAKE} ${.MAKEFLAGS} ${.TARGET:S/^real-/post-/}
@if [ -f ${SCRIPTDIR}/${.TARGET:S/^real-/post-/} ]; then \
${SETENV} CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
- WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
+ WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
+ MYPATCHDIR=${MYPATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
/bin/sh ${SCRIPTDIR}/${.TARGET:S/^real-/post-/}; \
--
andreas@klemm.gtn.com /\/\___ Wiechers & Partner Datentechnik GmbH
Andreas Klemm ___/\/\/ Support Unix -- andreas.klemm@wup.de
pgp p-key http://www-swiss.ai.mit.edu/~bal/pks-toplev.html >>> powered by <<<
ftp://sunsite.unc.edu/pub/Linux/system/Printing/aps-491.tgz >>> FreeBSD <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.3.92.960607150046.9214A-100000>