* Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. We now

  avoid a hidden dependency on libiconv.so if it's installed in ${LOCALBASE}.
  It's also possible now to build gimp without accidentally pulling in older
  gimp headers from an installed gimp package.  Also allow
  gnome-libs/buildlink.mk to pull in much of the dependencies.

* Remove patch to pass $(INTLDEPS) to the compiler in modules/Makefile as
  the gettext headers are found in ${BUILDLINK_DIR}/include which is already
  passed through in CFLAGS.

* Remove GNOME_CONFIG=no from CONFIGURE_ENV.  This was a leftover from when
  there was a separate gimp-helpbrowser package that depended on gnome-libs
  while the main gimp package only needed GTK+ and graphics libs.  Since
  there is only one consolidated gimp package now, we need the gnome-libs
  dependency (more specifically, libgtkxhtml.so) to be correctly found for
  the helpbrowser plugin to be built.

* Add settings for MPEG, LIBMPEG, and GAP_DECODE_MPEG to properly support
  the MPEG library from graphics/mpeg-lib that changed it's name.

* Change -Wl,-E (conditionalized on ELF) to -Wl,--export-dynamic which works
  across both the ELF and a.out linkers.

3 files changed, 37 insertions, 45 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 662b8b3947c..ebce341908b 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2001/07/29 14:54:56 tron Exp $
+# $NetBSD: Makefile,v 1.72 2001/08/02 13:33:09 jlam Exp $
 
 DISTNAME=		gimp-1.2.2
 CATEGORIES=		graphics
@@ -13,54 +13,60 @@ MAINTAINER=		hubertf@netbsd.org
 HOMEPAGE=		http://www.gimp.org/
 COMMENT=		Image manipulation program similar to Photoshop[tm]
 
-DEPENDS+=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		gnome-libs>=1.2.0:../../x11/gnome-libs
-DEPENDS+=		gtk+-1.2.*:../../x11/gtk
-DEPENDS+=		png>=1.0.11:../../graphics/png
-DEPENDS+=		tiff-*:../../graphics/tiff
-
 GIMP_DATA=		gimp-data-extras-1.2.0
 
+USE_BUILDLINK_ONLY=	yes
+REPLACE_BUILDLINK=	gimptool
+
 USE_X11BASE=		yes
-USE_XPM=		yes
 USE_GMAKE=		yes
-USE_LIBINTL=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 BUILD_USES_MSGFMT=	yes
 
-EVAL_PREFIX+=		GTKDIR=gtk+
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}" \
-			--disable-perl \
-			--disable-python
-CONFIGURE_ENV=		GNOME_CONFIG=no \
-			INTLDEPS="-I${BUILDLINK_DIR}/include"
+CONFIGURE_ARGS+=	--disable-perl
+CONFIGURE_ARGS+=	--disable-python
 
-CPPFLAGS=		-I${BUILDLINK_DIR}/include
-LDFLAGS+=		-L${BUILDLINK_DIR}/lib
-PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
+# Add settings for MPEG, LIBMPEG, and GAP_DECODE_MPEG to properly support
+# the MPEG library from graphics/mpeg-lib that changed it's name, as the
+# configure script will default to searching from -lmpeg.
+#
+CONFIGURE_ENV+=		MPEG="mpeg"
+CONFIGURE_ENV+=		LIBMPEG="-lmpeg_lib"
+CONFIGURE_ENV+=		GAP_DECODE_MPEG="gap_decode_mpeg"
 
-.include "../../mk/bsd.prefs.mk"
+LDFLAGS+=		-Wl,--export-dynamic
 
-.if (${OBJECT_FMT} == ELF)
-LDFLAGS+=		-Wl,-E
-.endif
+PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
+
+# Remove -I$(includedir) from the INCLUDES passed to the compiler as this
+# defeats buildlink.
+#
+post-patch:
+	cd ${WRKSRC};							\
+	files=`${FIND} . -name "Makefile.in" -print`;			\
+	for file in $${files}; do					\
+		${MV} -f $${file} $${file}.fixme;			\
+		${SED} -e "/^INCLUDES.*=.*/s|[ 	]*-I\$$(includedir)||"	\
+			$${file}.fixme > $${file};			\
+		${RM} $${file}.fixme;					\
+	done
 
 pre-build:
 	${LINK.c} -o ${WRKSRC}/docs/pdb_self_doc ${FILESDIR}/pdb_self_doc.c
 
 post-install:
 	@${ECHO_MSG} "--> now configuring in ${GIMP_DATA}"
-	(cd ${WRKDIR}/${GIMP_DATA} && ${SETENV} ${CONFIGURE_ENV} \
-		./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
-	(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
+	cd ${WRKDIR}/${GIMP_DATA} && ${SETENV} ${CONFIGURE_ENV}		\
+		${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+	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 "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/mpeg-lib/buildlink.mk"
-
+.include "../../x11/gnome-libs/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 62025993bc5..78e3f34f998 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/07/29 01:27:02 hubertf Exp $
+$NetBSD: distinfo,v 1.4 2001/08/02 13:33:09 jlam Exp $
 
 SHA1 (gimp-1.2.2.tar.bz2) = f15e282f1dec5e2b6e08faf95b52e31459a1956f
 Size (gimp-1.2.2.tar.bz2) = 9846904 bytes
 SHA1 (gimp-data-extras-1.2.0.tar.bz2) = 93e966544a4f507e2b9045e0cc0745bd0ae1ee81
 Size (gimp-data-extras-1.2.0.tar.bz2) = 4432926 bytes
-SHA1 (patch-aa) = 0ae8628c25550be60e88b8f0470051b63aba57d3
diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
deleted file mode 100644
index 02b980d9a8a..00000000000
--- a/graphics/gimp/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2000/12/26 18:25:33 hubertf Exp $
-
---- modules/Makefile.in.orig	Tue Dec 26 14:20:44 2000
-+++ modules/Makefile.in
-@@ -180,7 +180,7 @@
- CPPFLAGS =  	-DMODULE_COMPILATION
- 
- 
--INCLUDES =          -I$(top_srcdir)		        -I$(top_srcdir)/intl	        $(GTK_CFLAGS)		        -I$(includedir)
-+INCLUDES =          -I$(top_srcdir)		        -I$(top_srcdir)/intl	        $(GTK_CFLAGS)		        -I$(includedir) $(INTLDEPS)
- 
- 
- EXTRA_DIST =  	makefile.mingw			makefile.mingw.in		makefile.msc			module.def			gimpmodregister.c		gimpmodregister.h