Mon Aug 4 21:34:40 2008 UTC ()
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


(bjs)
diff -r1.13 -r1.14 pkgsrc/editors/beaver/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/editors/beaver/PLIST
diff -r1.3 -r1.4 pkgsrc/editors/beaver/distinfo
diff -r1.2 -r1.3 pkgsrc/editors/beaver/patches/patch-aa
diff -r0 -r1.1 pkgsrc/editors/beaver/patches/patch-ab
cvs diff -r1.13 -r1.14 pkgsrc/editors/beaver/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/beaver/Makefile 2008/06/20 01:09:17 1.13
+++ pkgsrc/editors/beaver/Makefile 2008/08/04 21:34:39 1.14
@@ -1,21 +1,33 @@ @@ -1,21 +1,33 @@
1# $NetBSD: Makefile,v 1.13 2008/06/20 01:09:17 joerg Exp $ 1# $NetBSD: Makefile,v 1.14 2008/08/04 21:34:39 bjs Exp $
2# 2#
3 3
4DISTNAME= beaver-0.2.6 4DISTNAME= beaver${BEAVER_VERSION:S/./_/g}
5PKGREVISION= 5 5PKGNAME= beaver-${BEAVER_VERSION}
6CATEGORIES= editors 6CATEGORIES= editors
7MASTER_SITES= http://savannah.nongnu.org/download/beaver/ 7MASTER_SITES= http://download.savannah.gnu.org/releases/beaver/0.3.0.1%20-%202008.06.26/
 8EXTRACT_SUFX= .tgz
 9
 10BEAVER_VERSION= 0.3.0.1
8 11
9MAINTAINER= vincent.derrien@ahoup.net 12MAINTAINER= vincent.derrien@ahoup.net
10HOMEPAGE= http://www.nongnu.org/beaver/ 13HOMEPAGE= http://www.nongnu.org/beaver/
11COMMENT= Lightweight GTK+ text editor with syntax highlighting 14COMMENT= Lightweight GTK+ text editor with syntax highlighting
12 15
13PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
14 17
15WRKSRC= ${WRKDIR}/${DISTNAME}/src 18BUILD_DIRS= src
16USE_DIRS+= xdg-1.1 19USE_DIRS+= xdg-1.4
 20USE_LIBTOOL= yes
 21USE_TOOLS+= pkg-config
 22
 23SUBST_CLASSES+= iconpath
 24SUBST_FILES.iconpath= beaver.desktop src/interface.c
 25SUBST_MESSAGE.iconpath= Substituting hard-coded pathnames.
 26SUBST_STAGE.iconpath= pre-build
 27SUBST_SED.iconpath= -e 's,Icon=,&${PREFIX}/share/pixmaps/beaver/,'
 28SUBST_VARS.iconpath= PREFIX
17 29
18INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/pixmaps 30.include "../../x11/gtk2/buildlink3.mk"
 31.include "../../sysutils/desktop-file-utils/desktopdb.mk"
19 32
20.include "../../x11/gtk/buildlink3.mk" 
21.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/editors/beaver/PLIST (expand / switch to unified diff)

--- pkgsrc/editors/beaver/PLIST 2003/04/19 08:36:38 1.1.1.1
+++ pkgsrc/editors/beaver/PLIST 2008/08/04 21:34:39 1.2
@@ -1,9 +1,14 @@ @@ -1,9 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/19 08:36:38 salo Exp $ 1@comment $NetBSD: PLIST,v 1.2 2008/08/04 21:34:39 bjs Exp $
2bin/beaver 2bin/beaver
3man/man1/beaver.1 3man/man1/beaver.1
 4share/applications/beaver.desktop
4share/beaver/bl/example1.bl 5share/beaver/bl/example1.bl
5share/beaver/bl/example2.bl 6share/beaver/bl/example2.bl
6share/beaver/bl/glib.bl 7share/beaver/bl/glib.bl
7share/pixmaps/beaver.png 8share/pixmaps/beaver/about.xpm
 9share/pixmaps/beaver/beaver.png
 10@dirrm share/pixmaps/beaver
 11@comment in xdg-dirs: @dirrm share/pixmaps
8@dirrm share/beaver/bl 12@dirrm share/beaver/bl
9@dirrm share/beaver 13@dirrm share/beaver
 14@comment in xdg-dirs: @dirrm share/applications
cvs diff -r1.3 -r1.4 pkgsrc/editors/beaver/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/beaver/distinfo 2008/06/20 01:09:17 1.3
+++ pkgsrc/editors/beaver/distinfo 2008/08/04 21:34:39 1.4
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.3 2008/06/20 01:09:17 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2008/08/04 21:34:39 bjs Exp $
2 2
3SHA1 (beaver-0.2.6.tar.gz) = 608231b84871d26133eb8c20b3ce0ec6b754434c 3SHA1 (beaver0_3_0_1.tgz) = 7df51cd68367ad0f02d472647e5df23a32108f78
4RMD160 (beaver-0.2.6.tar.gz) = 1db93234f9b47c10667b16f26a8d1d61f6c8d8f0 4RMD160 (beaver0_3_0_1.tgz) = 58b8d48340e3aee5a0ce980d74e339b12e1f9189
5Size (beaver-0.2.6.tar.gz) = 133938 bytes 5Size (beaver0_3_0_1.tgz) = 142255 bytes
6SHA1 (patch-aa) = ffe1817995d7e14e7137b59f5ea520a52cc5a77e 6SHA1 (patch-aa) = d1704ecd08ca1839050dd4d623cbc86f3d0b10f8
 7SHA1 (patch-ab) = e2ce6fd1166d052b09fb042a9fcc6d35a32613e3
cvs diff -r1.2 -r1.3 pkgsrc/editors/beaver/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/editors/beaver/patches/Attic/patch-aa 2008/06/20 01:09:17 1.2
+++ pkgsrc/editors/beaver/patches/Attic/patch-aa 2008/08/04 21:34:39 1.3
@@ -1,84 +1,118 @@ @@ -1,84 +1,118 @@
1$NetBSD: patch-aa,v 1.2 2008/06/20 01:09:17 joerg Exp $ 1$NetBSD: patch-aa,v 1.3 2008/08/04 21:34:39 bjs Exp $
2 2
3--- Makefile.orig 2002-07-18 15:20:32.000000000 +0200 3--- src/Makefile.orig 2008-06-26 23:33:36.000000000 -0400
4+++ Makefile 2003-04-19 10:14:12.000000000 +0200 4+++ src/Makefile
5@@ -7,11 +7,10 @@ 5@@ -7,20 +7,19 @@
6  6
7 ############## Public section. Modify according to your needs. ############### 7 ############## Public section. Modify according to your needs. ###############
8  8
9-CC = gcc 9-CC = gcc
10-RM = rm -f 10-RM = rm -f
11-CP = cp 11-CP = cp
12+#CC = gcc 12+#CC = gcc
13+#RM = rm -f 13+#RM = rm -f
14+#CP = cp 14+#CP = cp
15  15
16-DESTDIR = /usr/local 16-DESTDIR = /usr/local
17 IPATH =  17 IPATH =
18 LPATH =  18 LPATH =
19 OPTI = -O3 -funroll-loops -fomit-frame-pointer #-mcpu=i686 19-OPTI = -Wall -O3 -funroll-loops -fomit-frame-pointer #-DDEBUG_FCN
20@@ -19,8 +19,8 @@ 20+OPTI = -Wall #-O3 -funroll-loops -fomit-frame-pointer #-DDEBUG_FCN
 21 DBUG = #-ggdb -pg -fbounds-check
21 WARN = #-W -Wall #-pedantic -ansi 22 WARN = #-W -Wall #-pedantic -ansi
22  23
23 ### Unix version ### 24 ### Unix version ###
24-CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH} `gtk-config --cflags` 25-CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH} `pkg-config gtk+-2.0 --cflags`
25-LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} `gtk-config --libs` 26-LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} `pkg-config gtk+-2.0 --libs`
26+CFLAGS += `gtk-config --cflags` 27+CFLAGS += `pkg-config gtk+-2.0 --cflags` -prefer-pic
27+LDFLAGS += `gtk-config --libs` 28+LDFLAGS += `pkg-config gtk+-2.0 --libs`
28 NAME = beaver 29 NAME = beaver
29  30
30 ### Windows version ### 31 ### Windows version ###
31@@ -32,10 +32,6 @@ 32@@ -32,66 +31,38 @@ NAME = beaver
32  33
33 ###################### Private section. Do not modify ######################## 34 ###################### Private section. Do not modify ########################
34  35
35-ifndef DBUG 36-ifndef DBUG
36- STRIP = strip --strip-all ${NAME} 37- STRIP = strip --strip-all ${NAME}
37-endif 38-endif
38- 39-
39 SRC = main.c search.c tools.c languages.c editor.c prefs.c conf.c msgbar.c\ 40 SRC = main.c search.c tools.c languages.c editor.c prefs.c conf.c msgbar.c\
40 toolbar.c interface.c filesops.c completion.c undoredo.c 41 toolbar.c interface.c filesops.c completion.c undoredo.c
41 INC = ${SRC:.c=.h} struct.h wordfile.h 42 INC = ${SRC:.c=.h} struct.h wordfile.h
42@@ -43,7 +39,6 @@ 43 OBJ = ${SRC:.c=.o}
43  44
44 all : ${OBJ} 45 all : ${OBJ}
45 ${CC} -o ${NAME} ${OBJ} ${LDFLAGS} 46- ${CC} -o ${NAME} ${OBJ} ${LDFLAGS}
46- @${STRIP} 47- @${STRIP}
 48+ ${LIBTOOL} --mode=link --tag=CC \
 49+ ${CC} -o ${NAME} ${OBJ:.o=.lo} ${LDFLAGS}
47  50
48 .c.o : 51 .c.o :
49 ${CC} ${CFLAGS} -c $< -o $@ 52- ${CC} ${CFLAGS} -c $< -o $@
50@@ -51,29 +46,11 @@ 53+ ${LIBTOOL} --mode=compile --tag=CC \
 54+ ${CC} ${CFLAGS} -c $< -o ${@:.o=.lo}
 55
51 ${OBJ} : ${INC} 56 ${OBJ} : ${INC}
52  57
53 install : 58 install :
54- install -d $(DESTDIR)/bin 59- install -d $(DESTDIR)/share/beaver/bin
55- install beaver $(DESTDIR)/bin 60- install beaver $(DESTDIR)/share/beaver/bin
 61- $(CP) $(DESTDIR)/share/beaver/bin/beaver $(DESTDIR)/share/beaver/bin/beaver.orig
 62- echo "#!/bin/bash" > $(DESTDIR)/share/beaver/bin/beaver
 63- echo "cd $(DESTDIR)/share/beaver/bin/" >> $(DESTDIR)/share/beaver/bin/beaver
 64- echo "./beaver.orig" >> $(DESTDIR)/share/beaver/bin/beaver
 65- ln -sf $(DESTDIR)/share/beaver/bin/beaver $(DESTDIR)/bin/beaver
56- install -d $(DESTDIR)/share/beaver/bl 66- install -d $(DESTDIR)/share/beaver/bl
57- $(CP) ../bl/* $(DESTDIR)/share/beaver/bl 67- $(CP) ../bl/*.bl $(DESTDIR)/share/beaver/bl
58- install -d $(DESTDIR)/share/pixmaps 68- install -d $(DESTDIR)/share/beaver/pixmaps
59- $(CP) ../pixmaps/beaver.png $(DESTDIR)/share/pixmaps 69- $(CP) ../pixmaps/beaver.png $(DESTDIR)/share/beaver/pixmaps
 70- $(CP) ../pixmaps/about.xpm $(DESTDIR)/share/beaver/pixmaps
 71- chmod 644 $(DESTDIR)/share/beaver/pixmaps/beaver.png
 72- chmod 644 $(DESTDIR)/share/beaver/pixmaps/about.xpm
 73- install -d $(DESTDIR)/share/applications
 74- $(CP) ../beaver.desktop $(DESTDIR)/share/applications/beaver.desktop
 75- chmod 644 $(DESTDIR)/share/applications/beaver.desktop
 76- sed -i $(DESTDIR)/share/applications/beaver.desktop -e "s/Icon=/Icon=`echo $(DESTDIR) | sed -e 's/\//\\\\\//g'`\/share\/beaver\/pixmaps\//g"
60- gzip -c9 ../beaver.1x > ../beaver.1x.gz 77- gzip -c9 ../beaver.1x > ../beaver.1x.gz
61- install -d $(DESTDIR)/man/man1 78- install -d $(DESTDIR)/man/man1
62- $(CP) ../beaver.1x.gz $(DESTDIR)/man/man1 79- $(CP) ../beaver.1x.gz $(DESTDIR)/man/man1
 80- chmod 644 $(DESTDIR)/man/man1/beaver.1x.gz
63- @echo 81- @echo
64- @echo "Files installed :" 82- @echo "Files installed :"
65- @echo "-----------------" 83- @echo "-----------------"
66- @echo 84- @echo
67- @echo "$(DESTDIR)/bin/beaver" 85- @echo "$(DESTDIR)/bin/beaver"
 86- @echo "$(DESTDIR)/bin/beaver.orig"
 87- @echo "$(DESTDIR)/share/beaver/bin/beaver"
68- @echo "$(DESTDIR)/share/beaver/bl/example1.bl" 88- @echo "$(DESTDIR)/share/beaver/bl/example1.bl"
69- @echo "$(DESTDIR)/share/beaver/bl/example2.bl" 89- @echo "$(DESTDIR)/share/beaver/bl/example2.bl"
70- @echo "$(DESTDIR)/share/beaver/bl/glib.bl" 90- @echo "$(DESTDIR)/share/beaver/bl/glib.bl"
71- @echo "$(DESTDIR)/share/pixmaps/beaver.png" 91- @echo "$(DESTDIR)/share/beaver/pixmaps/beaver.png"
 92- @echo "$(DESTDIR)/share/beaver/pixmaps/about.xpm"
 93- @echo "$(DESTDIR)/share/applications/beaver.desktop"
72- @echo "$(DESTDIR)/man/man1/beaver.1x.gz" 94- @echo "$(DESTDIR)/man/man1/beaver.1x.gz"
73- @echo 95- @echo
74- @echo ",----------------------------------." 96- @echo ",----------------------------------."
75- @echo "| Beaver succesfully installed ^_^ |" 97- @echo "| Beaver succesfully installed ^_^ |"
76- @echo "\`----------------------------------'" 98- @echo "\`----------------------------------'"
77+ ${BSD_INSTALL_PROGRAM} beaver $(DESTDIR)${PREFIX}/bin 99-
 100+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/bin
 101+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} \
 102+ beaver $(DESTDIR)${PREFIX}/bin/beaver
78+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/beaver/bl 103+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/beaver/bl
79+ ${BSD_INSTALL_DATA} ../bl/* $(DESTDIR)${PREFIX}/share/beaver/bl 104+ ${BSD_INSTALL_DATA} ../bl/*.bl $(DESTDIR)${PREFIX}/share/beaver/bl
80+ ${BSD_INSTALL_DATA} ../pixmaps/beaver.png $(DESTDIR)${PREFIX}/share/pixmaps 105+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/pixmaps/beaver
81+ ${BSD_INSTALL_MAN} ../beaver.1x $(DESTDIR)${PREFIX}/man/man1/beaver.1 106+ ${BSD_INSTALL_DATA} ../pixmaps/beaver.png \
82  107+ $(DESTDIR)${PREFIX}/share/pixmaps/beaver
 108+ ${BSD_INSTALL_DATA} ../pixmaps/about.xpm \
 109+ $(DESTDIR)${PREFIX}/share/pixmaps/beaver
 110+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/applications
 111+ ${BSD_INSTALL_DATA} ../beaver.desktop \
 112+ $(DESTDIR)${PREFIX}/share/applications/beaver.desktop
 113+ ${BSD_INSTALL_MAN_DIR} $(DESTDIR)${PREFIX}/man/man1
 114+ ${BSD_INSTALL_MAN} ../beaver.1x \
 115+ $(DESTDIR)${PREFIX}/man/man1/beaver.1
83 .PHONY: clean re 116 .PHONY: clean re
84  117
 118 clean :
File Added: pkgsrc/editors/beaver/patches/Attic/patch-ab
$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,