diff -ruN beaver.orig/Makefile beaver/Makefile --- beaver.orig/Makefile Tue Jun 17 16:02:03 2003 +++ beaver/Makefile Tue Jun 17 16:53:03 2003 @@ -6,27 +6,24 @@ # PORTNAME= beaver -PORTVERSION= 0.3.0 +PORTVERSION= 0.3.1 CATEGORIES= editors MASTER_SITES= http://savannah.nongnu.org/download/beaver/ MAINTAINER= jylefort@brutele.be COMMENT= A programmer's text editor for GTK+ 2.0 -BUILD_WRKSRC= ${WRKSRC}/src USE_GNOME= gtk20 -INSTALL_WRKSRC= ${WRKSRC}/src USE_X_PREFIX= yes USE_GMAKE= yes +GNU_CONFIGURE= yes +USE_REINPLACE= yes -MANCOMPRESSED= yes -MAN1= beaver.1x +LIB_DEPENDS= gtksourceview-1.0.0:${PORTSDIR}/x11-toolkits/gtksourceview -MAKE_ENV= PREFIX="${PREFIX}" \ - MKDIR="${MKDIR}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - INSTALL_MAN="${INSTALL_MAN}" +post-patch: + @${REINPLACE_CMD} -e 's|/applications|/gnome/applications|' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|/pixmaps|/gnome/pixmaps|' ${WRKSRC}/Makefile.in .include diff -ruN beaver.orig/distinfo beaver/distinfo --- beaver.orig/distinfo Tue Jun 17 16:02:03 2003 +++ beaver/distinfo Tue Jun 17 16:02:36 2003 @@ -1 +1 @@ -MD5 (beaver-0.3.0.tar.gz) = cb32ad10b1550528469f93939dc07423 +MD5 (beaver-0.3.1.tar.gz) = b7281a4e9a4a802111aa2854fa5e7541 diff -ruN beaver.orig/files/patch-Makefile.am beaver/files/patch-Makefile.am --- beaver.orig/files/patch-Makefile.am Thu Jan 1 03:00:00 1970 +++ beaver/files/patch-Makefile.am Tue Jun 17 16:36:44 2003 @@ -0,0 +1,11 @@ +--- Makefile.in.orig Tue Jun 17 16:36:06 2003 ++++ Makefile.in Tue Jun 17 16:36:19 2003 +@@ -148,7 +148,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = m4 src po intl ++SUBDIRS = m4 intl src po + EXTRA_DIST = \ + ABOUT-NLS \ + BUGS \ diff -ruN beaver.orig/files/patch-aa beaver/files/patch-aa --- beaver.orig/files/patch-aa Tue Jun 17 16:02:03 2003 +++ beaver/files/patch-aa Thu Jan 1 03:00:00 1970 @@ -1,74 +0,0 @@ ---- src/Makefile.orig Fri Apr 11 02:00:20 2003 -+++ src/Makefile Fri Apr 11 03:24:53 2003 -@@ -7,11 +7,11 @@ - - ############## Public section. Modify according to your needs. ############### - --CC = gcc -+#CC = gcc - RM = rm -f - CP = cp - --DESTDIR = /usr/local -+DESTDIR = $(PREFIX) - IPATH = - LPATH = - OPTI = -Wall -O3 -funroll-loops -fomit-frame-pointer #-DDEBUG_FCN -@@ -19,8 +19,8 @@ - WARN = #-W -Wall #-pedantic -ansi - - ### Unix version ### --CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH} `pkg-config gtk+-2.0 --cflags` --LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} `pkg-config gtk+-2.0 --libs` -+CFLAGS += ${DBUG} ${WARN} ${IPATH} $(shell pkg-config gtk+-2.0 --cflags) -+LDFLAGS = ${DBUG} ${WARN} ${LPATH} $(shell pkg-config gtk+-2.0 --libs) - NAME = beaver - - ### Windows version ### -@@ -43,7 +43,7 @@ - - all : ${OBJ} - ${CC} -o ${NAME} ${OBJ} ${LDFLAGS} -- @${STRIP} -+# @${STRIP} - - .c.o : - ${CC} ${CFLAGS} -c $< -o $@ -@@ -51,16 +51,17 @@ - ${OBJ} : ${INC} - - install : -- install -d $(DESTDIR)/bin -- install beaver $(DESTDIR)/bin -- 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) ../beaver.desktop $(DESTDIR)/share/applications -+ -$(MKDIR) $(DESTDIR)/bin -+ $(INSTALL_PROGRAM) beaver $(DESTDIR)/bin -+ -$(MKDIR) $(DESTDIR)/share/beaver/bl -+ $(INSTALL_DATA) ../bl/* $(DESTDIR)/share/beaver/bl -+ -$(MKDIR) $(DESTDIR)/share/gnome/pixmaps -+ $(INSTALL_DATA) ../pixmaps/beaver.png $(DESTDIR)/share/gnome/pixmaps -+ -$(MKDIR) $(DESTDIR)/share/gnome/applications -+ $(INSTALL_DATA) ../beaver.desktop $(DESTDIR)/share/gnome/applications - gzip -c9 ../beaver.1x > ../beaver.1x.gz -- install -d $(DESTDIR)/man/man1 -- $(CP) ../beaver.1x.gz $(DESTDIR)/man/man1 -+ -$(MKDIR) $(DESTDIR)/man/man1 -+ $(INSTALL_MAN) ../beaver.1x.gz $(DESTDIR)/man/man1 - @echo - @echo "Files installed :" - @echo "-----------------" -@@ -69,8 +70,8 @@ - @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/applications/beaver.desktop" -+ @echo "$(DESTDIR)/share/gnome/pixmaps/beaver.png" -+ @echo "$(DESTDIR)/share/gnome/applications/beaver.desktop" - @echo "$(DESTDIR)/man/man1/beaver.1x.gz" - @echo - @echo ",----------------------------------." diff -ruN beaver.orig/files/patch-ba beaver/files/patch-ba --- beaver.orig/files/patch-ba Tue Jun 17 16:02:03 2003 +++ beaver/files/patch-ba Thu Jan 1 03:00:00 1970 @@ -1,18 +0,0 @@ ---- src/languages.c.orig Fri Apr 11 02:04:36 2003 -+++ src/languages.c Fri Apr 11 02:04:37 2003 -@@ -88,13 +88,13 @@ - { - gchar *fixed = g_strdup (Prefs.L[lang].Description); - gchar *s; -+ GtkItemFactoryEntry NewEntry = {s, NULL, languages_treatment, -+ lang, ""}; - - fixed = str_replace_tokens (&fixed, '/', "\\"); - s = g_strconcat("/Language/", - fixed, - NULL); -- GtkItemFactoryEntry NewEntry = {s, NULL, languages_treatment, -- lang, ""}; - - gtk_item_factory_create_items - (gtk_item_factory_from_path ("
"), 1, &NewEntry, NULL); diff -ruN beaver.orig/files/patch-src-search.c beaver/files/patch-src-search.c --- beaver.orig/files/patch-src-search.c Thu Jan 1 03:00:00 1970 +++ beaver/files/patch-src-search.c Tue Jun 17 16:26:31 2003 @@ -0,0 +1,51 @@ +--- src/search.c.orig Tue Jun 17 16:18:40 2003 ++++ src/search.c Tue Jun 17 16:25:24 2003 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include "tools.h" + #include "editor.h" + #include "struct.h" +@@ -375,7 +375,7 @@ + static gchar **get_files_for_search (const gchar *directory, const gchar *regexp, gint pre) + { + gchar **answer; +- wordexp_t word; ++ glob_t word; + + START_FCN + +@@ -387,8 +387,8 @@ + */ + chdir (directory); + +- word.we_offs = pre; +- if (wordexp (regexp, &word, WRDE_DOOFFS)) ++ word.gl_offs = pre; ++ if (glob (regexp, GLOB_DOOFFS, NULL, &word)) + { + gint i; + +@@ -408,15 +408,15 @@ + + /* fill out our array with results */ + answer = g_malloc (sizeof (gchar *) * +- (word.we_wordc + word.we_offs + 1)); +- for (i = word.we_offs; i < word.we_offs + word.we_wordc; i++) ++ (word.gl_pathc + word.gl_offs + 1)); ++ for (i = word.gl_offs; i < word.gl_offs + word.gl_pathc; i++) + { +- answer[i] = g_strdup (word.we_wordv[i]); ++ answer[i] = g_strdup (word.gl_pathv[i]); + } + answer[i] = NULL; + } + +- wordfree (&word); ++ globfree (&word); + + END_FCN + return answer; diff -ruN beaver.orig/pkg-plist beaver/pkg-plist --- beaver.orig/pkg-plist Tue Jun 17 16:02:03 2003 +++ beaver/pkg-plist Tue Jun 17 16:52:40 2003 @@ -1,8 +1,4 @@ bin/beaver -share/beaver/bl/example1.bl -share/beaver/bl/example2.bl -share/beaver/bl/glib.bl share/gnome/pixmaps/beaver.png share/gnome/applications/beaver.desktop -@dirrm share/beaver/bl @dirrm share/beaver