diff options
| author | cheusov <cheusov> | 2012-05-29 21:19:30 +0000 |
|---|---|---|
| committer | cheusov <cheusov> | 2012-05-29 21:19:30 +0000 |
| commit | 6f4f9f81a2e4ae31880bb2b40f2ba6bef4ad5dcd (patch) | |
| tree | 865ec1d9f850b0afcb575b75c7e8cc80fef461f6 /devel/patch | |
| parent | ca2adcb938bec4cd2d0834315698cecb5febc3fb (diff) | |
| download | pkgsrc-6f4f9f81a2e4ae31880bb2b40f2ba6bef4ad5dcd.tar.gz | |
Remove GNU_PROGRAM_PREFIX variable (discussed in pkgsrc-users@).
All utilities are installed with a prefix 'g'. Symlinks with original
names are created in ${PREFIX}/gnu/bin.
++pkgrevision
Diffstat (limited to 'devel/patch')
| -rw-r--r-- | devel/patch/Makefile | 21 | ||||
| -rw-r--r-- | devel/patch/PLIST | 8 |
2 files changed, 10 insertions, 19 deletions
diff --git a/devel/patch/Makefile b/devel/patch/Makefile index f74671b94ac..2ee7ec4734d 100644 --- a/devel/patch/Makefile +++ b/devel/patch/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2011/07/09 10:32:17 tron Exp $ +# $NetBSD: Makefile,v 1.33 2012/05/29 21:19:30 cheusov Exp $ DISTNAME= patch-2.5.9 +PKGREVISION= 1 CATEGORIES= devel # We keep an uncompressed tar archive of the sources on # ${MASTER_SITE_LOCAL} so that we won't need gzcat to extract the @@ -23,21 +24,13 @@ GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" -.if defined(GNU_PROGRAM_PREFIX) -CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q} -.endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} -BUILD_DEFS+= GNU_PROGRAM_PREFIX - -PLIST_VARS+= gpatch - -.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" -PLIST.gpatch= yes -.endif +CONFIGURE_ARGS+= --program-prefix=g INSTALL_MAKE_FLAGS= bindir=${DESTDIR}${PREFIX}/bin \ man1dir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 +INSTALLATION_DIRS= gnu/bin + do-patch: ${MV} ${WRKSRC}/pch.c ${WRKSRC}/pch.c.orig ${AWK} '/#include <pch.h>/{print $$0 "\n#include <sys/param.h>";next;}\ @@ -47,9 +40,7 @@ do-patch: < ${WRKSRC}/pch.c.orig \ > ${WRKSRC}/pch.c -.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" post-install: - ${LN} -sf ${GNU_PROGRAM_PREFIX}patch ${DESTDIR}${PREFIX}/bin/gpatch -.endif + ${LN} -sf ../../bin/gpatch ${DESTDIR}${PREFIX}/gnu/bin/patch .include "../../mk/bsd.pkg.mk" diff --git a/devel/patch/PLIST b/devel/patch/PLIST index a9ce3aa48b2..9e9dd1d3a4d 100644 --- a/devel/patch/PLIST +++ b/devel/patch/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:00 jlam Exp $ -bin/${GNU_PROGRAM_PREFIX}patch -${PLIST.gpatch}bin/gpatch -man/man1/${GNU_PROGRAM_PREFIX}patch.1 +@comment $NetBSD: PLIST,v 1.6 2012/05/29 21:19:30 cheusov Exp $ +bin/gpatch +gnu/bin/patch +man/man1/gpatch.1 |