diff options
| author | agc <agc@pkgsrc.org> | 2000-07-10 10:40:39 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-07-10 10:40:39 +0000 |
| commit | e05e4735ddf3f9207384f7ffab7fa66a65f20df7 (patch) | |
| tree | eb8c75c4d78a779a039aa1995f70225e25ce9df1 /x11 | |
| parent | b16e065ccc96b67b06741355aaed54c93e111998 (diff) | |
| download | pkgsrc-e05e4735ddf3f9207384f7ffab7fa66a65f20df7.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 (limited to 'x11')
| -rw-r--r-- | x11/gtkglarea/Makefile | 4 | ||||
| -rw-r--r-- | x11/scwm/Makefile | 4 | ||||
| -rw-r--r-- | x11/xmove/Makefile | 6 |
3 files changed, 7 insertions, 7 deletions
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 |