Bump version to 0.4nb1:

    * bluefish uses GTK+, so define USE_X11BASE;
    * use package gettext instead of included gettext library;
    * remove unnecessary linking against graphics libraries - gdk_imlib is
      sufficient;
    * put pixmaps in directory where desktops/window managers expect to find
      them.

5 files changed, 58 insertions, 27 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 4d4bf7b161c..2395d8e5d05 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,26 +1,31 @@
-# $NetBSD: Makefile,v 1.3 2000/06/15 11:29:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/16 05:38:35 jlam Exp $
 #
 
-DISTNAME=       bluefish-0.4
-CATEGORIES=     www
-MASTER_SITES=   http://bluefish.openoffice.nl/download/
+DISTNAME=	bluefish-0.4
+PKGNAME=	${DISTNAME}nb1
+CATEGORIES=	www
+MASTER_SITES=	http://bluefish.openoffice.nl/download/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=     wulf@ping.net.au
-HOMEPAGE=       http://bluefish.openoffice.nl/
+MAINTAINER=	wulf@ping.net.au
+HOMEPAGE=	http://bluefish.openoffice.nl/
 
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:../../devel/gettext
+BUILD_DEPENDS+=	autoreconf:../../devel/autoconf
+DEPENDS+=	gettext>=0.10.35nb1:../../devel/gettext
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	imlib-*:../../graphics/imlib
 DEPENDS+=	weblint-*:../../www/weblint
 
 MANCOMPRESSED=	yes
 
-USE_GMAKE=      yes
-GNU_CONFIGURE=  yes
+USE_X11BASE=	# defined
+USE_GMAKE=	# defined
 
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lz -lm -ljpeg -lungif -ltiff -lpng
-CONFIGURE_ENV+=  CPPFLAGS="${CFLAGS}"
+GNU_CONFIGURE=	# defined
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/bluefish/files/patch-sum b/www/bluefish/files/patch-sum
index 12756549bb9..f88cd854ed4 100644
--- a/www/bluefish/files/patch-sum
+++ b/www/bluefish/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/05/21 11:39:44 wulf Exp $
+$NetBSD: patch-sum,v 1.3 2000/08/16 05:38:35 jlam Exp $
 
-MD5 (patch-ab) = b9274ce749acb65b9f0bc60235021294
+MD5 (patch-aa) = 04ec21b10306759780aa201b686a3b3f
+MD5 (patch-ab) = fcf9e8d3ff134bbb4850ecb30e79a04c
diff --git a/www/bluefish/patches/patch-aa b/www/bluefish/patches/patch-aa
new file mode 100644
index 00000000000..e92d5d20ac6
--- /dev/null
+++ b/www/bluefish/patches/patch-aa
@@ -0,0 +1,25 @@
+$NetBSD: patch-aa,v 1.3 2000/08/16 05:38:35 jlam Exp $
+
+--- configure.in.orig	Sun May 14 11:36:13 2000
++++ configure.in	Tue Aug 15 09:13:11 2000
+@@ -94,6 +94,7 @@
+   AC_MSG_ERROR(GTK was not detected, or a sufficent version was not found. This is a bad thing)
+ fi
+ 
++if false; then
+ AC_CHECK_LIB(gdk_imlib, main,  
+    [ LIBS="$LIBS -lgdk_imlib"
+    AC_SUBST(IMLIB)
+@@ -109,6 +110,12 @@
+ ,
+ AC_DEFINE(HAVE_LIBGDK_IMLIB,0)
+ )
++else
++   GDK_IMLIB_CFLAGS="`imlib-config --cflags-gdk`"
++   GDK_IMLIB_LIBS="`imlib-config --libs-gdk`"
++   CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS"
++   LIBS="$LIBS $GDK_IMLIB_LIBS"
++fi
+ 
+ AC_CHECK_LIB(posix4, nanosleep, 
+ 	LIBS="$LIBS -lposix4"
diff --git a/www/bluefish/patches/patch-ab b/www/bluefish/patches/patch-ab
index 6e03394986b..c28fb65a54d 100644
--- a/www/bluefish/patches/patch-ab
+++ b/www/bluefish/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2000/05/21 11:51:28 wulf Exp $
+$NetBSD: patch-ab,v 1.2 2000/08/16 05:38:36 jlam Exp $
 
 --- Makefile.in.orig	Sun May 21 14:26:55 2000
 +++ Makefile.in	Tue Apr 18 07:01:14 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2000/05/21 11:51:28 wulf Exp $
  datadir = @datadir@
  pkgdatadir = @pkgdatadir@
 -pixmapsdir = /usr/share/pixmaps
-+pixmapsdir = @pkgdatadir@
++pixmapsdir = @datadir@/pixmaps
  
  INSTALL = @INSTALL@
  
diff --git a/www/bluefish/pkg/PLIST b/www/bluefish/pkg/PLIST
index ff68d220439..45d6afc39f1 100644
--- a/www/bluefish/pkg/PLIST
+++ b/www/bluefish/pkg/PLIST
@@ -1,20 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2000/05/21 11:39:45 wulf Exp $
-
+@comment $NetBSD: PLIST,v 1.3 2000/08/16 05:38:36 jlam Exp $
 bin/bluefish
 man/man1/bluefish.1
-share/bluefish/bluefish_icon.xpm
 share/bluefish/php3_functions
-share/bluefish/ssi_functions
 share/bluefish/rxml_functions
-share/locale/de/LC_MESSAGES/bluefish.mo
-share/locale/da/LC_MESSAGES/bluefish.mo
-share/locale/fr/LC_MESSAGES/bluefish.mo
-share/locale/ru/LC_MESSAGES/bluefish.mo
-share/locale/es/LC_MESSAGES/bluefish.mo
-share/locale/ro/LC_MESSAGES/bluefish.mo
+share/bluefish/ssi_functions
 share/locale/cs/LC_MESSAGES/bluefish.mo
+share/locale/da/LC_MESSAGES/bluefish.mo
+share/locale/de/LC_MESSAGES/bluefish.mo
 share/locale/el/LC_MESSAGES/bluefish.mo
 share/locale/en/LC_MESSAGES/bluefish.mo
-share/locale/ja/LC_MESSAGES/bluefish.mo
+share/locale/es/LC_MESSAGES/bluefish.mo
+share/locale/fr/LC_MESSAGES/bluefish.mo
 share/locale/it/LC_MESSAGES/bluefish.mo
+share/locale/ja/LC_MESSAGES/bluefish.mo
+share/locale/ro/LC_MESSAGES/bluefish.mo
+share/locale/ru/LC_MESSAGES/bluefish.mo
+share/pixmaps/bluefish_icon.xpm
+@unexec rmdir -p %D/share/pixmaps 2>/dev/null || true
 @dirrm share/bluefish