summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>2000-07-10 10:40:39 +0000
committeragc <agc>2000-07-10 10:40:39 +0000
commit2f0b09b588eff52a3b5220f8f4761fcc47fe8801 (patch)
treeeb8c75c4d78a779a039aa1995f70225e25ce9df1
parentba0f4a0faaf07ab1fae22236bcfedcff16165e50 (diff)
downloadpkgsrc-2f0b09b588eff52a3b5220f8f4761fcc47fe8801.tar.gz
Hardcoding X11PREFIX into package Makefiles forces the user to install
xpkgwedge once, before any other packages have been installed, and never to delete it. This change finds the prefix of the installed pre-req package using pkg_info(1), and allows packages to be found in ${X11BASE} and ${LOCALBASE}, not just ${X11PREFIX} - from mail from Dave Sainty <dave@dtsp.co.nz>, munged slightly by myself.
Diffstat
-rw-r--r--comms/jpilot/Makefile4
-rw-r--r--games/baduki/Makefile9
-rw-r--r--games/xarchon/Makefile9
-rw-r--r--graphics/gimp-current/Makefile4
-rw-r--r--graphics/gimp-helpbrowser/Makefile4
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/giram/Makefile4
-rw-r--r--net/ethereal/Makefile4
-rw-r--r--net/gtk-gnutella/Makefile4
-rw-r--r--net/xtraceroute/Makefile4
-rw-r--r--x11/gtkglarea/Makefile4
-rw-r--r--x11/scwm/Makefile4
-rw-r--r--x11/xmove/Makefile6
13 files changed, 35 insertions, 29 deletions
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index f8840de61f9..072b55b3681 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/06/30 10:04:46 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/07/10 10:40:39 agc Exp $
#
DISTNAME= jpilot-0.98.1
@@ -16,7 +16,7 @@ USE_LIBTOOL= YES
USE_X11= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX}
+CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`"
CONFIGURE_ARGS+= --with-pilot-prefix=${LOCALBASE}
post-install:
diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 4f218ccdbd9..20d3ac96024 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/06/30 10:04:46 agc Exp $
+# $NetBSD: Makefile,v 1.9 2000/07/10 10:40:40 agc Exp $
DISTNAME= baduki-0.2.9
CATEGORIES= games
@@ -11,10 +11,13 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk
USE_X11= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX} --without-included-gettext
-CONFIGURE_ENV+= GTK_CONFIG="${X11PREFIX}/bin/gtk-config"
+CONFIGURE_ARGS+= --with-gtk-prefix=${GTK_PREFIX}
+CONFIGURE_ARGS+= --without-included-gettext
+CONFIGURE_ENV+= GTK_CONFIG="${GTK_PREFIX}/bin/gtk-config"
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
+GTK_PREFIX!= ${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'
+
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index 237bdef9c7b..12fcdf8b33b 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/06/30 10:04:46 agc Exp $
+# $NetBSD: Makefile,v 1.10 2000/07/10 10:40:40 agc Exp $
#
DISTNAME= xarchon-0.50
@@ -14,10 +14,13 @@ DEPENDS+= gtk+-1.2.*:../../x11/gtk
DEPENDS+= esound-*:../../audio/esound
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-xpm-prefix=${X11PREFIX} \
- --with-gtk-prefix=${X11PREFIX} \
+CONFIGURE_ARGS+=--with-xpm-prefix=${XPM_PREFIX} \
+ --with-gtk-prefix=${GTK_PREFIX} \
--with-esd-prefix=${LOCALBASE}
+GTK_PREFIX!= ${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'
+XPM_PREFIX!= ${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'
+
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile
index 374ba7a796d..49e5bf664d8 100644
--- a/graphics/gimp-current/Makefile
+++ b/graphics/gimp-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/07/06 07:12:47 tron Exp $
+# $NetBSD: Makefile,v 1.19 2000/07/10 10:40:40 agc Exp $
DISTNAME= gimp-1.1.24
CATEGORIES= graphics
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX} \
+CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" \
--disable-perl \
--disable-python
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \
diff --git a/graphics/gimp-helpbrowser/Makefile b/graphics/gimp-helpbrowser/Makefile
index 0bef920ec21..de0ff526786 100644
--- a/graphics/gimp-helpbrowser/Makefile
+++ b/graphics/gimp-helpbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/05 03:40:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/10 10:40:40 agc Exp $
DISTNAME= gimp-1.1.24
PKGNAME= ${DISTNAME:S/-/-helpbrowser-/}
@@ -18,7 +18,7 @@ USE_X11BASE= yes
USE_GMAKE= yes
USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX} \
+CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" \
--disable-perl \
--disable-python
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index e4bad7a8b7a..2e64d5b34e9 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2000/06/30 10:04:47 agc Exp $
+# $NetBSD: Makefile,v 1.53 2000/07/10 10:40:41 agc Exp $
DISTNAME= gimp-1.0.4
CATEGORIES= graphics
@@ -28,7 +28,7 @@ USE_X11BASE= yes
USE_GMAKE= yes
USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX}
+CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`"
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
INFO_FILES= pdb.info
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index cb168fa5af5..7ba067d7de1 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/06/30 10:04:47 agc Exp $
+# $NetBSD: Makefile,v 1.9 2000/07/10 10:40:41 agc Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $
DISTNAME= Giram-0.1.2
@@ -17,7 +17,7 @@ DEPENDS+= povray-*:../../graphics/povray
USE_X11= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= GTK_CONFIG="${X11PREFIX}/bin/gtk-config" \
+CONFIGURE_ENV= GTK_CONFIG="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`/bin/gtk-config" \
CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
ALL_TARGET= install-strip
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 28ee39b5b33..ec4b57ca7a0 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/07/05 21:52:43 frueauf Exp $
+# $NetBSD: Makefile,v 1.26 2000/07/10 10:40:41 agc Exp $
#
DISTNAME= ethereal-0.8.10
@@ -13,6 +13,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5
USE_X11= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX}
+CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{ print $$2 }'`"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 7156aea005d..accacba8e70 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/06/30 10:04:47 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/10 10:40:42 agc Exp $
#
DISTNAME= gtk-gnutella-0.12
@@ -14,6 +14,6 @@ DEPENDS= gtk+-1.2.*:../../x11/gtk
USE_GMAKE= yes
USE_X11= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX}
+CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 5b2b5d95e18..a7ffed0682f 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/06/30 10:04:48 agc Exp $
+# $NetBSD: Makefile,v 1.11 2000/07/10 10:40:42 agc Exp $
#
DISTNAME= xtraceroute-0.8.14
@@ -15,7 +15,7 @@ DEPENDS+= tiff-*:../../graphics/tiff
USE_X11= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX}
+CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`"
# XXX Actually, Mesa's in X11PREFIX too, but as our tiff is in LOCALBASE
# and xtraceroute doesn't have a switch to tell it so (yet?), we abuse
# the --with-GL-prefix switch for this.
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index 70e196d2738..2a070e6c4a5 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/06/30 10:04:48 agc Exp $
+# $NetBSD: Makefile,v 1.16 2000/07/10 10:40:42 agc Exp $
DISTNAME= gtkglarea-1.2.1
CATEGORIES= x11 graphics
@@ -15,7 +15,7 @@ USE_LIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= # defined
-CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX}
+CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`"
CONFIGURE_ARGS+= --with-GL-prefix=${X11BASE}
CONFIGURE_ARGS+= --with-lib-MesaGL
diff --git a/x11/scwm/Makefile b/x11/scwm/Makefile
index 2e204fa0e4e..34993044714 100644
--- a/x11/scwm/Makefile
+++ b/x11/scwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/06/30 10:04:48 agc Exp $
+# $NetBSD: Makefile,v 1.10 2000/07/10 10:40:43 agc Exp $
#
DISTNAME= scwm-0.9
@@ -15,7 +15,7 @@ DEPENDS+= readline-4.0:../../devel/readline
DEPENDS+= xpm-3.4k:../../graphics/xpm
CONFIGURE_ARGS+= --with-guile-prefix=${LOCALBASE} \
- --with-gtk-prefix=${X11PREFIX} \
+ --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" \
--enable-multibyte
USE_X11BASE= yes
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 516e66ed025..b89b7e28875 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/06/22 13:21:06 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/10 10:40:43 agc Exp $
#
DISTNAME= xmove.2.0beta2
@@ -10,10 +10,10 @@ MAINTAINER= packages@netbsd.org
WRKSRC= ${WRKDIR}/xmove
USE_IMAKE= yes
-XMOVEDOCDIR= ${X11BASE}/share/doc/xmove
+XMOVEDOCDIR= ${X11PREFIX}/share/doc/xmove
pre-configure:
- @${SED} -e 's|@x11base@|'${X11BASE}'|' < ${WRKSRC}/xmove/Imakefile > ${WRKSRC}/xmove/Imakefile.new && \
+ @${SED} -e 's|@x11base@|'${X11PREFIX}'|' < ${WRKSRC}/xmove/Imakefile > ${WRKSRC}/xmove/Imakefile.new && \
${MV} ${WRKSRC}/xmove/Imakefile.new ${WRKSRC}/xmove/Imakefile
${CP} ${WRKSRC}/man/man1/xmove.1 ${WRKSRC}/xmove/xmove.man
${CP} ${WRKSRC}/man/man1/xmovectrl.1 ${WRKSRC}/xmovectrl/xmovectrl.man
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 15:30:07 +0000