Update to beaver-0.3.0.1.

pkgsrc changes:
	-- Use correct master site.
	-- Use SUBST framework where appropriate, correcting hard-coded
	   path to pixmaps in interface.c.
	-- Use desktop-file-utils to install new beaver.desktop.
	-- Uses GTK+2 (much better!)

Changes since beaver-0.2.6:
  * First implementation of Python highlighting
  * New About window
  * Massive interface changes to comply with the GNOME HIG
  * Ported to GTK+ 2

5 files changed, 115 insertions, 41 deletions

diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index 4460262391e..2c299dd8a8f 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:17 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/08/04 21:34:39 bjs Exp $
 #
 
-DISTNAME=	beaver-0.2.6
-PKGREVISION=	5
+DISTNAME=	beaver${BEAVER_VERSION:S/./_/g}
+PKGNAME=	beaver-${BEAVER_VERSION}
 CATEGORIES=	editors
-MASTER_SITES=	http://savannah.nongnu.org/download/beaver/
+MASTER_SITES=	http://download.savannah.gnu.org/releases/beaver/0.3.0.1%20-%202008.06.26/
+EXTRACT_SUFX=	.tgz
+
+BEAVER_VERSION=	0.3.0.1
 
 MAINTAINER=	vincent.derrien@ahoup.net
 HOMEPAGE=	http://www.nongnu.org/beaver/
@@ -12,10 +15,19 @@ COMMENT=	Lightweight GTK+ text editor with syntax highlighting
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-USE_DIRS+=	xdg-1.1
+BUILD_DIRS=	src
+USE_DIRS+=	xdg-1.4
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+SUBST_CLASSES+=		iconpath
+SUBST_FILES.iconpath=	beaver.desktop src/interface.c
+SUBST_MESSAGE.iconpath=	Substituting hard-coded pathnames.
+SUBST_STAGE.iconpath=	pre-build
+SUBST_SED.iconpath=	-e 's,Icon=,&${PREFIX}/share/pixmaps/beaver/,'
+SUBST_VARS.iconpath=	PREFIX
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/pixmaps
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 
-.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/beaver/PLIST b/editors/beaver/PLIST
index 5067cfed2f4..366e53536e4 100644
--- a/editors/beaver/PLIST
+++ b/editors/beaver/PLIST
@@ -1,9 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/19 08:36:38 salo Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/08/04 21:34:39 bjs Exp $
 bin/beaver
 man/man1/beaver.1
+share/applications/beaver.desktop
 share/beaver/bl/example1.bl
 share/beaver/bl/example2.bl
 share/beaver/bl/glib.bl
-share/pixmaps/beaver.png
+share/pixmaps/beaver/about.xpm
+share/pixmaps/beaver/beaver.png
+@dirrm share/pixmaps/beaver
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/beaver/bl
 @dirrm share/beaver
+@comment in xdg-dirs: @dirrm share/applications
diff --git a/editors/beaver/distinfo b/editors/beaver/distinfo
index 235796c3369..c1e17381ee9 100644
--- a/editors/beaver/distinfo
+++ b/editors/beaver/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2008/06/20 01:09:17 joerg Exp $
+$NetBSD: distinfo,v 1.4 2008/08/04 21:34:39 bjs Exp $
 
-SHA1 (beaver-0.2.6.tar.gz) = 608231b84871d26133eb8c20b3ce0ec6b754434c
-RMD160 (beaver-0.2.6.tar.gz) = 1db93234f9b47c10667b16f26a8d1d61f6c8d8f0
-Size (beaver-0.2.6.tar.gz) = 133938 bytes
-SHA1 (patch-aa) = ffe1817995d7e14e7137b59f5ea520a52cc5a77e
+SHA1 (beaver0_3_0_1.tgz) = 7df51cd68367ad0f02d472647e5df23a32108f78
+RMD160 (beaver0_3_0_1.tgz) = 58b8d48340e3aee5a0ce980d74e339b12e1f9189
+Size (beaver0_3_0_1.tgz) = 142255 bytes
+SHA1 (patch-aa) = d1704ecd08ca1839050dd4d623cbc86f3d0b10f8
+SHA1 (patch-ab) = e2ce6fd1166d052b09fb042a9fcc6d35a32613e3
diff --git a/editors/beaver/patches/patch-aa b/editors/beaver/patches/patch-aa
index f4cd65721f8..f37aa88476e 100644
--- a/editors/beaver/patches/patch-aa
+++ b/editors/beaver/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2008/06/20 01:09:17 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2008/08/04 21:34:39 bjs Exp $
 
---- Makefile.orig	2002-07-18 15:20:32.000000000 +0200
-+++ Makefile	2003-04-19 10:14:12.000000000 +0200
-@@ -7,11 +7,10 @@
+--- src/Makefile.orig	2008-06-26 23:33:36.000000000 -0400
++++ src/Makefile
+@@ -7,20 +7,19 @@
  
  ############## Public section. Modify according to your needs.  ###############
  
@@ -16,19 +16,20 @@ $NetBSD: patch-aa,v 1.2 2008/06/20 01:09:17 joerg Exp $
 -DESTDIR = /usr/local
  IPATH   = 
  LPATH   = 
- OPTI    = -O3 -funroll-loops -fomit-frame-pointer #-mcpu=i686
-@@ -19,8 +19,8 @@
+-OPTI    = -Wall -O3 -funroll-loops -fomit-frame-pointer #-DDEBUG_FCN
++OPTI    = -Wall #-O3 -funroll-loops -fomit-frame-pointer #-DDEBUG_FCN
+ DBUG    = #-ggdb -pg -fbounds-check
  WARN	= #-W -Wall #-pedantic -ansi
  
  ### Unix version ###
--CFLAGS  = ${OPTI} ${DBUG} ${WARN} ${IPATH} `gtk-config --cflags`
--LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} `gtk-config --libs`
-+CFLAGS  += `gtk-config --cflags`
-+LDFLAGS += `gtk-config --libs`
+-CFLAGS  = ${OPTI} ${DBUG} ${WARN} ${IPATH} `pkg-config gtk+-2.0 --cflags`
+-LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} `pkg-config gtk+-2.0 --libs`
++CFLAGS  += `pkg-config gtk+-2.0 --cflags` -prefer-pic
++LDFLAGS += `pkg-config gtk+-2.0 --libs`
  NAME    = beaver
  
  ### Windows version ###
-@@ -32,10 +32,6 @@
+@@ -32,66 +31,38 @@ NAME    = beaver
  
  ###################### Private section. Do not modify  ########################
  
@@ -39,46 +40,79 @@ $NetBSD: patch-aa,v 1.2 2008/06/20 01:09:17 joerg Exp $
  SRC	= main.c search.c tools.c languages.c editor.c prefs.c conf.c msgbar.c\
  	  toolbar.c interface.c filesops.c completion.c undoredo.c
  INC	= ${SRC:.c=.h} struct.h wordfile.h
-@@ -43,7 +39,6 @@
+ OBJ	= ${SRC:.c=.o}
  
  all	: ${OBJ}
- 	${CC} -o ${NAME} ${OBJ} ${LDFLAGS}
+-	${CC} -o ${NAME} ${OBJ} ${LDFLAGS}
 -	@${STRIP}
++	${LIBTOOL} --mode=link --tag=CC \
++		${CC} -o ${NAME} ${OBJ:.o=.lo} ${LDFLAGS}
  
  .c.o	:
- 	${CC} ${CFLAGS} -c $< -o $@
-@@ -51,29 +46,11 @@
+-	${CC} ${CFLAGS} -c $< -o $@
++	${LIBTOOL} --mode=compile --tag=CC \
++		${CC} ${CFLAGS} -c $< -o ${@:.o=.lo}
+ 
  ${OBJ}	: ${INC}
  
  install :
--	install -d $(DESTDIR)/bin
--	install beaver $(DESTDIR)/bin
+-	install -d $(DESTDIR)/share/beaver/bin
+-	install beaver $(DESTDIR)/share/beaver/bin
+-	$(CP) $(DESTDIR)/share/beaver/bin/beaver $(DESTDIR)/share/beaver/bin/beaver.orig
+-	echo "#!/bin/bash" > $(DESTDIR)/share/beaver/bin/beaver
+-	echo "cd $(DESTDIR)/share/beaver/bin/" >> $(DESTDIR)/share/beaver/bin/beaver
+-	echo "./beaver.orig" >> $(DESTDIR)/share/beaver/bin/beaver
+-	ln -sf $(DESTDIR)/share/beaver/bin/beaver $(DESTDIR)/bin/beaver
 -	install -d $(DESTDIR)/share/beaver/bl
--	$(CP) ../bl/* $(DESTDIR)/share/beaver/bl
--	install -d $(DESTDIR)/share/pixmaps
--	$(CP) ../pixmaps/beaver.png $(DESTDIR)/share/pixmaps
+-	$(CP) ../bl/*.bl $(DESTDIR)/share/beaver/bl
+-	install -d $(DESTDIR)/share/beaver/pixmaps
+-	$(CP) ../pixmaps/beaver.png $(DESTDIR)/share/beaver/pixmaps
+-	$(CP) ../pixmaps/about.xpm $(DESTDIR)/share/beaver/pixmaps
+-	chmod 644 $(DESTDIR)/share/beaver/pixmaps/beaver.png
+-	chmod 644 $(DESTDIR)/share/beaver/pixmaps/about.xpm
+-	install -d $(DESTDIR)/share/applications
+-	$(CP) ../beaver.desktop $(DESTDIR)/share/applications/beaver.desktop
+-	chmod 644 $(DESTDIR)/share/applications/beaver.desktop
+-	sed -i $(DESTDIR)/share/applications/beaver.desktop -e "s/Icon=/Icon=`echo $(DESTDIR) | sed -e 's/\//\\\\\//g'`\/share\/beaver\/pixmaps\//g" 
 -	gzip -c9 ../beaver.1x > ../beaver.1x.gz
 -	install -d $(DESTDIR)/man/man1
 -	$(CP) ../beaver.1x.gz $(DESTDIR)/man/man1
+-	chmod 644 $(DESTDIR)/man/man1/beaver.1x.gz
 -	@echo
 -	@echo "Files installed :"
 -	@echo "-----------------"
 -	@echo
 -	@echo "$(DESTDIR)/bin/beaver"
+-	@echo "$(DESTDIR)/bin/beaver.orig"
+-	@echo "$(DESTDIR)/share/beaver/bin/beaver"
 -	@echo "$(DESTDIR)/share/beaver/bl/example1.bl"
 -	@echo "$(DESTDIR)/share/beaver/bl/example2.bl"
 -	@echo "$(DESTDIR)/share/beaver/bl/glib.bl"
--	@echo "$(DESTDIR)/share/pixmaps/beaver.png"
+-	@echo "$(DESTDIR)/share/beaver/pixmaps/beaver.png"
+-	@echo "$(DESTDIR)/share/beaver/pixmaps/about.xpm"
+-	@echo "$(DESTDIR)/share/applications/beaver.desktop"
 -	@echo "$(DESTDIR)/man/man1/beaver.1x.gz"
 -	@echo
 -	@echo ",----------------------------------."
 -	@echo "| Beaver succesfully installed ^_^ |"
 -	@echo "\`----------------------------------'"
-+	${BSD_INSTALL_PROGRAM} beaver $(DESTDIR)${PREFIX}/bin
+-
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/bin
++	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} \
++		beaver $(DESTDIR)${PREFIX}/bin/beaver
 +	${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/beaver/bl
-+	${BSD_INSTALL_DATA} ../bl/* $(DESTDIR)${PREFIX}/share/beaver/bl
-+	${BSD_INSTALL_DATA} ../pixmaps/beaver.png $(DESTDIR)${PREFIX}/share/pixmaps
-+	${BSD_INSTALL_MAN} ../beaver.1x $(DESTDIR)${PREFIX}/man/man1/beaver.1
- 
++	${BSD_INSTALL_DATA} ../bl/*.bl $(DESTDIR)${PREFIX}/share/beaver/bl
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/pixmaps/beaver
++	${BSD_INSTALL_DATA} ../pixmaps/beaver.png \
++		$(DESTDIR)${PREFIX}/share/pixmaps/beaver
++	${BSD_INSTALL_DATA} ../pixmaps/about.xpm \
++		$(DESTDIR)${PREFIX}/share/pixmaps/beaver
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/applications
++	${BSD_INSTALL_DATA} ../beaver.desktop \
++		$(DESTDIR)${PREFIX}/share/applications/beaver.desktop
++	${BSD_INSTALL_MAN_DIR} $(DESTDIR)${PREFIX}/man/man1
++	${BSD_INSTALL_MAN} ../beaver.1x \
++		$(DESTDIR)${PREFIX}/man/man1/beaver.1
  .PHONY: clean re
  
+ clean	:
diff --git a/editors/beaver/patches/patch-ab b/editors/beaver/patches/patch-ab
new file mode 100644
index 00000000000..6d616f9bd95
--- /dev/null
+++ b/editors/beaver/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2008/08/04 21:34:39 bjs Exp $
+
+--- src/interface.c.orig	2008-06-26 23:33:36.000000000 -0400
++++ src/interface.c
+@@ -1166,7 +1166,7 @@ void interface (gint argc, gchar *argv[]
+   gtk_set_locale();  
+   gtk_init (&argc, &argv);
+   Settings = init_settings ();
+-  gtk_window_set_default_icon_from_file("../pixmaps/beaver.png", NULL); // set beaver icon for all windows in Beaver
++  gtk_window_set_default_icon_from_file("@PREFIX@/share/pixmaps/beaver/beaver.png", NULL); // set beaver icon for all windows in Beaver
+   MainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+   gtk_window_set_policy (GTK_WINDOW(MainWindow), TRUE, TRUE, FALSE);
+   gtk_window_set_default_size (GTK_WINDOW (MainWindow), MAIN_WINDOW_WIDTH, MAIN_WINDOW_HEIGHT);
+@@ -1265,7 +1265,7 @@ void about (void)
+ {
+ 	const char *AUTHORS[] = {"Damien Terrier", "Marc Bevand", "Emmanuel Turquin", "Michael Terry", "Leslie Polzer", "Trevor Brown", "Double 12", "Tobias Heinzen", NULL};
+ 	const char *ARTISTS[] = {"Tigert (logo)", "Remy Turquin (website logo)", NULL};
+-	GdkPixbuf *logo = gdk_pixbuf_new_from_file ("../pixmaps/about.xpm", NULL);
++	GdkPixbuf *logo = gdk_pixbuf_new_from_file ("@PREFIX@/share/pixmaps/beaver/about.xpm", NULL);
+     GtkWidget *AboutWindow = g_object_new (GTK_TYPE_ABOUT_DIALOG,
+                                      "name", APP_NAME, 
+                                      "version", VERSION_NUMBER,