diff options
| author | cheusov <cheusov@pkgsrc.org> | 2012-05-30 11:55:54 +0000 |
|---|---|---|
| committer | cheusov <cheusov@pkgsrc.org> | 2012-05-30 11:55:54 +0000 |
| commit | 4de5db91c067dbf5076993020e09d32917408976 (patch) | |
| tree | b6418b3d91141bc61e4d15368fa70f98484fd31d /devel | |
| parent | eb0d8bea5e32ca2a6aa4f0dc791891c2dc30fc3a (diff) | |
| download | pkgsrc-4de5db91c067dbf5076993020e09d32917408976.tar.gz | |
Remove GNU_PROGRAM_PREFIX as discussed in pkgsrc-users@
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ArX/Makefile | 9 | ||||
| -rw-r--r-- | devel/rcs/Makefile | 4 | ||||
| -rw-r--r-- | devel/tla/Makefile | 10 |
3 files changed, 11 insertions, 12 deletions
diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile index 47bfc5a1122..53edb5c1a3a 100644 --- a/devel/ArX/Makefile +++ b/devel/ArX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2012/04/07 17:32:40 dholland Exp $ +# $NetBSD: Makefile,v 1.34 2012/05/30 11:58:52 cheusov Exp $ # DISTNAME= ArX-2.2.4 @@ -17,7 +17,6 @@ DEPENDS+= patch-[0-9]*:../../devel/patch DEPENDS+= diffutils-[0-9]*:../../devel/diffutils DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base -BUILD_DEFS+= GNU_PROGRAM_PREFIX EVAL_PREFIX+= PREFIX.diffutils=diffutils EVAL_PREFIX+= PREFIX.gtar-base=gtar-base @@ -25,9 +24,9 @@ USE_TOOLS+= pkg-config USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= ARXDIFF=${PREFIX.diffutils}/bin/${GNU_PROGRAM_PREFIX}diff -CONFIGURE_ARGS+= ARXPATCH=${PREFIX.diffutils}/bin/${GNU_PROGRAM_PREFIX}patch -CONFIGURE_ARGS+= ARXTAR=${PREFIX.gtar-base}/bin/${GNU_PROGRAM_PREFIX}tar +CONFIGURE_ARGS+= ARXDIFF=${PREFIX.diffutils}/bin/gdiff +CONFIGURE_ARGS+= ARXPATCH=${PREFIX.diffutils}/bin/gpatch +CONFIGURE_ARGS+= ARXTAR=${PREFIX.gtar-base}/bin/gtar CONFIGURE_ARGS+= ARXPKGCONFIG=${PKG_CONFIG:Q} # XXX Python is needed for build only; this is handled by devel/scons CONFIGURE_ARGS+= ARXPYTHON=${TRUE:Q} diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile index 4354dcdc83a..221a75a7df1 100644 --- a/devel/rcs/Makefile +++ b/devel/rcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2009/12/11 01:41:53 asau Exp $ +# $NetBSD: Makefile,v 1.29 2012/05/30 11:57:27 cheusov Exp $ # DISTNAME= rcs-5.7 @@ -18,7 +18,7 @@ MAKE_JOBS_SAFE= no DEPENDS+= diffutils>=2.7:../../devel/diffutils CONFIGURE_ARGS+= --with-diffutils # the native diff/diff3 is not sufficient for rcs -TOOLS_PLATFORM.diff= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}diff +TOOLS_PLATFORM.diff= ${LOCALBASE}/bin/gdiff .endif GNU_CONFIGURE= yes diff --git a/devel/tla/Makefile b/devel/tla/Makefile index 959c594224e..fb30d2ca5e1 100644 --- a/devel/tla/Makefile +++ b/devel/tla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2011/11/26 04:39:51 sbd Exp $ +# $NetBSD: Makefile,v 1.39 2012/05/30 11:55:54 cheusov Exp $ # DISTNAME= tla-1.3.5 @@ -33,10 +33,10 @@ OVERRIDE_DIRDEPTH= 3 CONFIGURE_DIRS= src/=build CONFIGURE_SCRIPT= ../configure CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ARGS+= --with-gnu-diff=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff -CONFIGURE_ARGS+= --with-gnu-diff3=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff3 -CONFIGURE_ARGS+= --with-gnu-patch=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch -CONFIGURE_ARGS+= --with-gnu-tar=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}tar +CONFIGURE_ARGS+= --with-gnu-diff=${PREFIX}/bin/gdiff +CONFIGURE_ARGS+= --with-gnu-diff3=${PREFIX}/bin/gdiff3 +CONFIGURE_ARGS+= --with-gnu-patch=${PREFIX}/bin/gpatch +CONFIGURE_ARGS+= --with-gnu-tar=${PREFIX}/bin/gtar DOCDIR= ${PREFIX}/share/doc/tla |