* buildlink1 -> buildlink2.

* Make this build properly even if gnome-print and/or bonoba and/or oaf are
  installed (building the bonobo extensions is currently broken anyway).
* Remove an obvious debugging message.

6 files changed, 62 insertions, 26 deletions

diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile
index 33065723a31..ddfa73cc4c3 100644
--- a/graphics/gnome-iconedit/Makefile
+++ b/graphics/gnome-iconedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/07/14 13:49:11 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/08 07:53:46 jlam Exp $
 #
 
 DISTNAME=		gnome-iconedit-1.2.0
@@ -9,19 +9,18 @@ MASTER_SITES=		http://www.webtribe.net/i/iain/
 MAINTAINER=		wiz@netbsd.org
 COMMENT=		icon editor based on GNOME libraries
 
-BUILD_USES_MSGFMT=	yes
+BUILD_USES_MSGFMT=	YES
 
-GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_GMAKE=		YES
+GNU_CONFIGURE=		YES
 
 post-configure:
-	cd ${WRKSRC}/src && ${GMAKE} clean
+	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} clean
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/oaf/buildlink.mk"
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../x11/gnome-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gnome-iconedit/PLIST b/graphics/gnome-iconedit/PLIST
index 97d14dde97f..31e82c0f57a 100644
--- a/graphics/gnome-iconedit/PLIST
+++ b/graphics/gnome-iconedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/19 04:54:24 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/10/08 07:53:46 jlam Exp $
 bin/gnome-iconedit
 etc/CORBA/servers/gnome-iconedit.gnorba
 share/gnome/apps/Graphics/gnome-iconedit.desktop
@@ -30,4 +30,4 @@ share/pixmaps/gnome-iconedit/selector.png
 @dirrm share/pixmaps/gnome-iconedit
 @dirrm share/gnome/help/gnome-iconedit/C
 @dirrm share/gnome/help/gnome-iconedit
-@unexec ${RMDIR} -p %D/share/gnome/apps/Graphics 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/gnome/apps/Graphics 2>/dev/null || ${TRUE}
diff --git a/graphics/gnome-iconedit/distinfo b/graphics/gnome-iconedit/distinfo
index d7ae4743ee9..8f658c4637b 100644
--- a/graphics/gnome-iconedit/distinfo
+++ b/graphics/gnome-iconedit/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:15 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/10/08 07:53:46 jlam Exp $
 
 SHA1 (gnome-iconedit-1.2.0.tar.gz) = eed36cd64bf7a07bdc2aa604f1e714b4f25bd7ac
 Size (gnome-iconedit-1.2.0.tar.gz) = 205360 bytes
-SHA1 (patch-aa) = a3ece4df3f21e274ee76fb5cfd9625814e4bae6f
+SHA1 (patch-aa) = 6bea8b8a9683ad0f840b25bbc00bffdeb27f4574
+SHA1 (patch-ab) = c35a3b1243136ef82ca1e1d49af8f70cbb774115
+SHA1 (patch-ac) = 5293a22901cc713fdd349986bfde9797347ff122
diff --git a/graphics/gnome-iconedit/patches/patch-aa b/graphics/gnome-iconedit/patches/patch-aa
index 883fd16a582..092817a800b 100644
--- a/graphics/gnome-iconedit/patches/patch-aa
+++ b/graphics/gnome-iconedit/patches/patch-aa
@@ -1,12 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/03 15:07:23 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2002/10/08 07:53:46 jlam Exp $
 
---- src/menus.c.orig	Thu Jun 22 19:31:59 2000
-+++ src/menus.c
-@@ -36,7 +36,6 @@
- #include <libgnomeprint/gnome-print-preview.h>
- #include <libgnomeprint/gnome-print-pixbuf.h>
- #include <libgnomeprint/gnome-font.h>
--#include <libgnomeprint/gnome-printer-profile.h>
- #include <libgnomeprint/gnome-printer-dialog.h>
- #include <libgnomeprint/gnome-print-master.h>
- #include <libgnomeprint/gnome-print-master-preview.h>
+--- configure.orig	Sat Jul  8 12:33:34 2000
++++ configure
+@@ -2513,7 +2513,7 @@ help_yes_print=no
+ 
+ echo $ac_n "checking for static libgnomeprint""... $ac_c" 1>&6
+ echo "configure:2516: checking for static libgnomeprint" >&5
+-if test -e $GNOME_PRINT_PREFIX/lib/libgnomeprint.a ; then
++if false; then
+ 	echo "$ac_t""yes" 1>&6
+ 	cat >> confdefs.h <<\EOF
+ #define HAVE_GNOME_PRINT 1
+@@ -2537,7 +2537,7 @@ fi
+ 
+ echo $ac_n "checking if Bonobo uses OAF""... $ac_c" 1>&6
+ echo "configure:2540: checking if Bonobo uses OAF" >&5
+-if ( gnome-config --libs bonobo | grep oaf ) > /dev/null 2>&1; then
++if false; then
+ 	enable_oaf="yes"
+ else
+ 	enable_oaf="no"
diff --git a/graphics/gnome-iconedit/patches/patch-ab b/graphics/gnome-iconedit/patches/patch-ab
new file mode 100644
index 00000000000..5617647366c
--- /dev/null
+++ b/graphics/gnome-iconedit/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/10/08 07:54:21 jlam Exp $
+
+--- src/Makefile.in.orig	Sat Jul  8 12:33:57 2000
++++ src/Makefile.in
+@@ -132,7 +132,7 @@ gnome_iconedit_SOURCES = app.c					$(COR
+ 
+ @USE_GNOME_PRINT_TRUE@print_libs = $(GNOME_PRINT_PREFIX)/lib/libgnomeprint.a
+ 
+-gnome_iconedit_LDADD =  	widgets/libwidgets.a		$(GNOME_LIBDIR) 	$(GNOMEUI_LIBS) 	$(GNORBA_LIBS)		-lgdk_pixbuf -lz -lpng -lXpm -lxml -lz 	$(OAF_LIBS)		$(print_libs)
++gnome_iconedit_LDADD =  	widgets/libwidgets.a		$(GNOME_LIBDIR) 	$(GNOMEUI_LIBS) 	$(GNORBA_LIBS)		-lgdk_pixbuf -lz -lpng -lXpm -lz 	$(OAF_LIBS)		$(print_libs)
+ 
+ 
+ @BONOBO_TRUE@gnome_iconedit_component_SOURCES = 	gnome-iconedit-component.c		grid.c					grid.h					edit.h					edit.c					selection.h				view.c					view.h					art_rgba.c				art_rgba.h				art_misc.h
diff --git a/graphics/gnome-iconedit/patches/patch-ac b/graphics/gnome-iconedit/patches/patch-ac
new file mode 100644
index 00000000000..a3e6199387e
--- /dev/null
+++ b/graphics/gnome-iconedit/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2002/10/08 07:54:22 jlam Exp $
+
+--- src/corba.c.orig	Thu Jun 22 17:06:10 2000
++++ src/corba.c
+@@ -337,7 +337,6 @@ register_goad (CORBA_Object obj)
+ 
+   switch (result) {
+   case 0:
+-    g_message ("Here");
+     return FALSE;
+   case -2:
+     IconeditFactory_destroy (obj, poa, &ev);