3 files changed, 12 insertions, 89 deletions
diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile
index 7062e42521a..3c44bef8df5 100644
--- a/graphics/gimp-base/Makefile
+++ b/graphics/gimp-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/04 14:47:36 agc Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/24 09:34:37 jlam Exp $
 
 DISTNAME=		gimp-1.2.3
 PKGNAME=		gimp-base-1.2.3
@@ -15,11 +15,13 @@ COMMENT=		Image manipulation program similar to Photoshop[tm]
 
 CONFLICTS+=		gimp<=1.2.3
 
-USE_BUILDLINK_ONLY=	yes
+BUILD_USES_MSGFMT=	yes
+USE_BUILDLINK2=		yes
+USE_X11=		yes
 USE_GMAKE=		yes
+
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-perl
@@ -37,56 +39,19 @@ CONFIGURE_ENV+=		GAP_DECODE_MPEG="gap_decode_mpeg"
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
 MAKE_ENV+=		X11BASE=${X11BASE}
-
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
-CONFIG_EXISTS!=		/bin/sh -c "type gtk-config glib-config > /dev/null"; \
-			if [ $$? = 0 ]; then echo yes; else echo no; fi
-.if (${CONFIG_EXISTS} == "yes") 
-# make sure the installed "gimptool" doesn't refer to .buildlink
-ORIG_GTK_CFLAGS!=	gtk-config --cflags
-GIMPTOOL_SUBST=		-e "s|@ORIG_GTK_CFLAGS@|${ORIG_GTK_CFLAGS}|g"
-ORIG_GTK_LIBS!=		gtk-config --libs
-GIMPTOOL_SUBST+=	-e "s|@ORIG_GTK_LIBS@|${ORIG_GTK_LIBS}|g"
-ORIG_GLIB_CFLAGS!=	glib-config --cflags
-GIMPTOOL_SUBST+=	-e "s|@ORIG_GLIB_CFLAGS@|${ORIG_GLIB_CFLAGS}|g"
-ORIG_GLIB_LIBS!=	glib-config --libs
-GIMPTOOL_SUBST+=	-e "s|@ORIG_GLIB_LIBS@|${ORIG_GLIB_LIBS}|g"
-ORIG_CFLAGS=		-I${PREFIX}/include -I${X11BASE}/include
-GIMPTOOL_SUBST+=	-e "s|@ORIG_CFLAGS@|${ORIG_CFLAGS}|g"
-ORIG_LDFLAGS=		-L${PREFIX}/lib -Wl,-R${PREFIX}/lib
-ORIG_LDFLAGS+=		-L${X11BASE}/lib -Wl,-R${X11BASE}/lib
-GIMPTOOL_SUBST+=	-e "s|@ORIG_LDFLAGS@|${ORIG_LDFLAGS}|g"
-.endif
-
-# 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
-
-post-configure:
-	${SED} ${GIMPTOOL_SUBST} <${WRKSRC}/gimptool-1.2 \
-	 >${WRKSRC}/gimptool-1.2.tmp && \
-	${MV} ${WRKSRC}/gimptool-1.2.tmp ${WRKSRC}/gimptool-1.2
-
 pre-build:
-	${LINK.c} -o ${WRKSRC}/docs/pdb_self_doc ${FILESDIR}/pdb_self_doc.c
+	${BUILDLINK_CC} -o ${WRKSRC}/docs/pdb_self_doc			\
+		${FILESDIR}/pdb_self_doc.c
 
 post-install:
 	${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/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/mpeg-lib/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp-base/distinfo b/graphics/gimp-base/distinfo
index 421e61716e3..55e13934999 100644
--- a/graphics/gimp-base/distinfo
+++ b/graphics/gimp-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/02/15 20:52:36 drochner Exp $
+$NetBSD: distinfo,v 1.2 2002/09/24 09:34:38 jlam Exp $
 
 SHA1 (gimp-1.2.3.tar.bz2) = 3cb2686fcdc7995888b76d175e1c7bc33b2b4707
 Size (gimp-1.2.3.tar.bz2) = 10795020 bytes
@@ -6,4 +6,3 @@ SHA1 (gimp-data-extras-1.2.0.tar.bz2) = 93e966544a4f507e2b9045e0cc0745bd0ae1ee81
 Size (gimp-data-extras-1.2.0.tar.bz2) = 4432926 bytes
 SHA1 (patch-aa) = 2d2f7ce110822522314aebfd86c06ebcbdbabb9d
 SHA1 (patch-ab) = fd8dcdaffc70e4fc905f98d1af82b2ee13e3eed1
-SHA1 (patch-ac) = 1534c73e3fe0144f38c633663e46bdf622c3bd65
diff --git a/graphics/gimp-base/patches/patch-ac b/graphics/gimp-base/patches/patch-ac
deleted file mode 100644
index 1efe4d07532..00000000000
--- a/graphics/gimp-base/patches/patch-ac
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/02/15 20:52:36 drochner Exp $
-
---- gimptool-1.2.in.orig	Fri Feb 15 17:38:29 2002
-+++ gimptool-1.2.in	Fri Feb 15 17:41:42 2002
-@@ -90,16 +90,16 @@
- fi
- 
- if test x${GTK_CONFIG+set} != xset ; then
--  gtk_cflags='@GTK_CFLAGS@'
--  gtk_libs='@GTK_LIBS@'
-+  gtk_cflags='@ORIG_GTK_CFLAGS@'
-+  gtk_libs='@ORIG_GTK_LIBS@'
- else
-   gtk_cflags=`$GTK_CONFIG --cflags`
-   gtk_libs=`$GTK_CONFIG --libs`
- fi
- 
- if test x${GLIB_CONFIG+set} != xset ; then
--  glib_cflags='@GLIB_CFLAGS@'
--  glib_libs='@GLIB_LIBS@'
-+  glib_cflags='@ORIG_GLIB_CFLAGS@'
-+  glib_libs='@ORIG_GLIB_LIBS@'
- else
-   glib_cflags=`$GLIB_CONFIG --cflags`
-   glib_libs=`$GLIB_CONFIG --libs`
-@@ -120,13 +120,13 @@
- fi
- 
- if test x${CFLAGS+set} != xset ; then
--  cflags='@CFLAGS@'
-+  cflags='@ORIG_CFLAGS@'
- else
-   cflags="$CFLAGS"
- fi
- 
- if test x${LDFLAGS+set} != xset ; then
--  ldflags='@LDFLAGS@'
-+  ldflags='@ORIG_LDFLAGS@'
- else
-   ldflags="$LDFLAGS"
- fi