diff options
| author | tron <tron@pkgsrc.org> | 1999-10-22 23:57:52 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 1999-10-22 23:57:52 +0000 |
| commit | 7119e66e3dca959d63df1fa0939bfeffe6b08d90 (patch) | |
| tree | 975339cbd0f51aa2a09cd8e6a68bde4689b92e0e | |
| parent | dac52b7e09d1cbb6a1927c9c6c191fa39341c390 (diff) | |
| download | pkgsrc-7119e66e3dca959d63df1fa0939bfeffe6b08d90.tar.gz | |
Use wildcard dependence for "gtk+" package and create a link for
"libart.m4" in "${LOCALBASE}/share/aclocal" if "${LOCALBASE}" is not
identical with "${X11BASE}". Fixes PR pkg/7649 by Wolfgang Rupprecht.
| -rw-r--r-- | graphics/gimp/Makefile | 13 | ||||
| -rw-r--r-- | graphics/gimp/pkg/PLIST | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 1477b4d044d..960d60637e5 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 1999/10/08 21:12:48 jlam Exp $ +# $NetBSD: Makefile,v 1.42 1999/10/22 23:57:52 tron Exp $ DISTNAME= gimp-1.0.4 CATEGORIES= graphics @@ -13,7 +13,7 @@ MAINTAINER= bsieker@techfak.uni-bielefeld.de HOMEPAGE= http://www.gimp.org/ DEPENDS+= jpeg-6b:../../graphics/jpeg -DEPENDS+= gtk+-1.2.4:../../x11/gtk +DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= mpeg-1.2.1:../../graphics/mpeg-lib DEPENDS+= png-1.0.3:../../graphics/png DEPENDS+= tiff-*:../../graphics/tiff @@ -28,13 +28,15 @@ USE_X11BASE= yes USE_GMAKE= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INFO_FILES= pdb.info +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +PLIST_SUBST+= LOCALBASE=${LOCALBASE} + post-configure: @${ECHO_MSG} "--> now configuring in ${GIMP_DATA}" @(cd ${WRKDIR}/${GIMP_DATA} && ${SETENV} ${CONFIGURE_ENV} \ @@ -52,5 +54,8 @@ post-install: @(cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET}) @(cd ${WRKDIR}/${GIMP_DATA} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET}) + ${TEST} ${PREFIX} = ${LOCALBASE} || \ + ${LN} -fs ${PREFIX}/share/aclocal/gimp.m4 \ + ${LOCALBASE}/share/aclocal/gimp.m4 .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gimp/pkg/PLIST b/graphics/gimp/pkg/PLIST index 8687cdcabda..878645a6528 100644 --- a/graphics/gimp/pkg/PLIST +++ b/graphics/gimp/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 1999/05/04 22:47:22 tron Exp $ +@comment $NetBSD: PLIST,v 1.13 1999/10/22 23:57:53 tron Exp $ bin/gimp bin/gimptool include/gck/gck.h @@ -631,6 +631,8 @@ share/gimp/scripts/weave.scm share/gimp/scripts/web-browser.scm share/gimp/scripts/xach-effect.scm share/gimp/user_install +@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gimp.m4 ${LOCALBASE}/share/aclocal/gimp.m4 +@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gimp.m4 @dirrm include/libgimp @dirrm include/gck @dirrm lib/gimp/1.0/plug-ins |