pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Remove GNU_PROGRAM_PREFIX variable (discussed in pkgsr...
details: https://anonhg.NetBSD.org/pkgsrc/rev/53235aec27c4
branches: trunk
changeset: 604385:53235aec27c4
user: cheusov <cheusov%pkgsrc.org@localhost>
date: Tue May 29 22:58:52 2012 +0000
description:
Remove GNU_PROGRAM_PREFIX variable (discussed in pkgsrc-users@)
diffstat:
archivers/pax/Makefile | 16 ++--------------
databases/geneweb/Makefile | 9 +++------
devel/cogito/Makefile | 4 ++--
devel/quilt/Makefile | 11 +++++------
meta-pkgs/xfce4/Makefile.common | 4 ++--
misc/kdeutils3/Makefile | 4 ++--
net/rabbitmq/Makefile | 6 +++---
pkgtools/pkgdiff/Makefile | 4 ++--
sysutils/9base/Makefile | 9 ++-------
x11/gtk2/Makefile | 4 ++--
10 files changed, 25 insertions(+), 46 deletions(-)
diffs (228 lines):
diff -r c56f3832d9ae -r 53235aec27c4 archivers/pax/Makefile
--- a/archivers/pax/Makefile Tue May 29 22:52:04 2012 +0000
+++ b/archivers/pax/Makefile Tue May 29 22:58:52 2012 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2012/03/09 10:20:15 fhajny Exp $
+# $NetBSD: Makefile,v 1.46 2012/05/29 22:58:53 cheusov Exp $
DISTNAME= pax-20080110
+PKGREVISION= 1
CATEGORIES= archivers
MASTER_SITES= # empty
DISTFILES= # empty
@@ -22,19 +23,6 @@
.if defined(NBPAX_PROGRAM_PREFIX) && ${NBPAX_PROGRAM_PREFIX} != ""
CONFIGURE_ARGS+= --program-prefix=${NBPAX_PROGRAM_PREFIX:Q}
-
-.else
-
-# pax installs "tar" and "cpio"
-.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX) && \
- (!defined(NBPAX_PROGRAM_PREFIX) || empty(NBPAX_PROGRAM_PREFIX))
-CONFLICTS+= gcpio-[0-9]*
-.endif
-.if defined(GTAR_PROGRAM_PREFIX) && empty(GTAR_PROGRAM_PREFIX) && \
- (!defined(NBPAX_PROGRAM_PREFIX) || empty(NBPAX_PROGRAM_PREFIX))
-CONFLICTS+= gtar-base-[0-9]*
-.endif
-
.endif
PLIST_SUBST+= NBPAX_PROGRAM_PREFIX=${NBPAX_PROGRAM_PREFIX:Q}
diff -r c56f3832d9ae -r 53235aec27c4 databases/geneweb/Makefile
--- a/databases/geneweb/Makefile Tue May 29 22:52:04 2012 +0000
+++ b/databases/geneweb/Makefile Tue May 29 22:58:52 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2011/12/06 00:19:22 sbd Exp $
+# $NetBSD: Makefile,v 1.35 2012/05/29 22:58:53 cheusov Exp $
#
DISTNAME= geneweb-5.01
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= databases
EXTRACT_SUFX= .tgz
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/geneweb/Src/ \
@@ -31,11 +31,8 @@
.include "../../mk/bsd.prefs.mk"
-# sysutils/coreutils a 'gwc' program, so conflict with it if
-# ${GNU_PROGRAM_PREFIX} == "g"
-.if ${GNU_PROGRAM_PREFIX} == "g"
+# sysutils/coreutils installs a 'gwc' program, so conflict with it
CONFLICTS+= coreutils-[0-9]*
-.endif
# Stripped OCAML binaries don't seem to work any more.
# Installing unstripped binaries until this is fixed.
diff -r c56f3832d9ae -r 53235aec27c4 devel/cogito/Makefile
--- a/devel/cogito/Makefile Tue May 29 22:52:04 2012 +0000
+++ b/devel/cogito/Makefile Tue May 29 22:58:52 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/06/19 19:34:52 dholland Exp $
+# $NetBSD: Makefile,v 1.14 2012/05/29 22:58:53 cheusov Exp $
#
DISTNAME= cogito-0.18.2
@@ -40,7 +40,7 @@
.if ${OPSYS} == "SunOS"
DEPENDS+= findutils>=4.1:../../sysutils/findutils
-TOOLS_PLATFORM.xargs= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}xargs
+TOOLS_PLATFORM.xargs= ${LOCALBASE}/bin/gxargs
.endif
diff -r c56f3832d9ae -r 53235aec27c4 devel/quilt/Makefile
--- a/devel/quilt/Makefile Tue May 29 22:52:04 2012 +0000
+++ b/devel/quilt/Makefile Tue May 29 22:58:52 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/11/22 09:32:24 ahoka Exp $
+# $NetBSD: Makefile,v 1.7 2012/05/29 22:58:53 cheusov Exp $
#
DISTNAME= quilt-0.48
@@ -15,14 +15,13 @@
DEPENDS+= gsed-[0-9]*:../../textproc/gsed
DEPENDS+= patch>=2.4:../../devel/patch
-BUILD_DEFS+= GNU_PROGRAM_PREFIX
GNU_CONFIGURE= yes
USE_TOOLS+= bash:run gettext-tools gmake msgfmt perl:run
-CONFIGURE_ARGS+= --with-cp=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}cp
-CONFIGURE_ARGS+= --with-date=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}date
-CONFIGURE_ARGS+= --with-patch=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch
-CONFIGURE_ARGS+= --with-sed=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}sed
+CONFIGURE_ARGS+= --with-cp=${PREFIX}/bin/gcp
+CONFIGURE_ARGS+= --with-date=${PREFIX}/bin/gdate
+CONFIGURE_ARGS+= --with-patch=${PREFIX}/bin/gpatch
+CONFIGURE_ARGS+= --with-sed=${PREFIX}/bin/gsed
CONFIGURE_ARGS+= --with-sendmail=/usr/sbin/sendmail
CONFIGURE_ARGS+= --without-rpmbuild
CONFIGURE_ARGS+= --without-getopt
diff -r c56f3832d9ae -r 53235aec27c4 meta-pkgs/xfce4/Makefile.common
--- a/meta-pkgs/xfce4/Makefile.common Tue May 29 22:52:04 2012 +0000
+++ b/meta-pkgs/xfce4/Makefile.common Tue May 29 22:58:52 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2009/09/16 02:25:34 reed Exp $
+# $NetBSD: Makefile.common,v 1.44 2012/05/29 22:58:52 cheusov Exp $
# used by audio/xfce4-mixer/Makefile
# used by devel/xfce4-dev-tools/Makefile
@@ -53,5 +53,5 @@
## # Use the latest GNU tar when the native tar is buggy
## .if !empty(MACHINE_PLATFORM:MNetBSD-1.6*)
## BUILD_DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base
-## GTAR= ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}tar
+## GTAR= ${PREFIX}/bin/gtar
## .endif
diff -r c56f3832d9ae -r 53235aec27c4 misc/kdeutils3/Makefile
--- a/misc/kdeutils3/Makefile Tue May 29 22:52:04 2012 +0000
+++ b/misc/kdeutils3/Makefile Tue May 29 22:58:52 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2012/04/06 12:55:23 marino Exp $
+# $NetBSD: Makefile,v 1.86 2012/05/29 22:58:52 cheusov Exp $
DISTNAME= kdeutils-${_KDE_VERSION}
PKGREVISION= 18
@@ -23,7 +23,7 @@
SUBST_STAGE.tarexe= pre-configure
SUBST_MESSAGE.tarexe= Use GNU tar in ark
SUBST_FILES.tarexe= ark/ark.kcfg
-SUBST_SED.tarexe= -e 's:<default>tar</default>:<default>${PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar</default>:'
+SUBST_SED.tarexe= -e 's:<default>tar</default>:<default>${PREFIX.gtar}/bin/gtar</default>:'
.include "../../mk/bsd.prefs.mk"
diff -r c56f3832d9ae -r 53235aec27c4 net/rabbitmq/Makefile
--- a/net/rabbitmq/Makefile Tue May 29 22:52:04 2012 +0000
+++ b/net/rabbitmq/Makefile Tue May 29 22:58:52 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/03/22 11:58:58 fhajny Exp $
+# $NetBSD: Makefile,v 1.8 2012/05/29 22:58:52 cheusov Exp $
#
PKGNAME= rabbitmq-${RMQ_VERSION}
@@ -23,7 +23,7 @@
.include "version.mk"
.include "../../lang/python/pyversion.mk"
-BUILD_DEFS+= VARBASE GNU_PROGRAM_PREFIX
+BUILD_DEFS+= VARBASE
.include "../../mk/bsd.prefs.mk"
@@ -63,7 +63,7 @@
SUBST_SED.paths+= -e 's|/var/log|${VARBASE}/log|g'
SUBST_SED.paths+= -e 's|@PREFIX@|${PREFIX}|g'
SUBST_SED.paths+= -e 's|erl|${PREFIX}/bin/erl|g'
-SUBST_SED.paths+= -e 's|readlink|${PREFIX}/bin/${GNU_PROGRAM_PREFIX}readlink|g'
+SUBST_SED.paths+= -e 's|readlink|${PREFIX}/bin/greadlink|g'
REPLACE_BASH+= ${SCRIPTS_DIR}/rabbitmqctl
REPLACE_BASH+= ${SCRIPTS_DIR}/rabbitmq-env
diff -r c56f3832d9ae -r 53235aec27c4 pkgtools/pkgdiff/Makefile
--- a/pkgtools/pkgdiff/Makefile Tue May 29 22:52:04 2012 +0000
+++ b/pkgtools/pkgdiff/Makefile Tue May 29 22:58:52 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2011/08/23 21:47:18 abs Exp $
+# $NetBSD: Makefile,v 1.76 2012/05/29 22:58:52 cheusov Exp $
#
DISTNAME= pkgdiff-1.3
@@ -28,7 +28,7 @@
.if ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1"
DEPENDS+= diffutils-[0-9]*:../../devel/diffutils
-DIFF?= ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff
+DIFF?= ${PREFIX}/bin/gdiff
.else
DIFF?= diff
.endif
diff -r c56f3832d9ae -r 53235aec27c4 sysutils/9base/Makefile
--- a/sysutils/9base/Makefile Tue May 29 22:52:04 2012 +0000
+++ b/sysutils/9base/Makefile Tue May 29 22:58:52 2012 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2011/10/27 09:58:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2012/05/29 22:58:52 cheusov Exp $
#
DISTNAME= 9base-6
+PKGREVISION= 1
PKGNAME= 9base-20100604
CATEGORIES= sysutils shells
MASTER_SITES= http://dl.suckless.org/tools/
@@ -34,12 +35,6 @@
BUILDLINK_TRANSFORM+= rm:-static
.endif
-.if ${GNU_PROGRAM_PREFIX} == ""
-CONFLICTS+= coreutils-[0-9]*
-CONFLICTS+= grep-[0-9]*
-CONFLICTS+= gsed-[0-9]*
-.endif
-
MAKE_FLAGS+= PREFIX=${PREFIX} \
MANPREFIX=${PREFIX}/${PKGMANDIR}
diff -r c56f3832d9ae -r 53235aec27c4 x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Tue May 29 22:52:04 2012 +0000
+++ b/x11/gtk2/Makefile Tue May 29 22:58:52 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.230 2012/03/10 10:56:12 obache Exp $
+# $NetBSD: Makefile,v 1.231 2012/05/29 22:58:52 cheusov Exp $
DISTNAME= gtk+-2.24.10
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
@@ -68,7 +68,7 @@
# which do not have it.
.if ${OPSYS} == "SunOS"
BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep
-TOOLS_PATH.grep= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep
+TOOLS_PATH.grep= ${LOCALBASE}/bin/ggrep
.endif
CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
Home |
Main Index |
Thread Index |
Old Index