Update to 0.3.1.

PR:	53413
Submitted by:	Sergey Akifyev <asa@gascom.ru>
Approved by:	maintainer

5 files changed, 8 insertions, 107 deletions

diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index 2b99b1613b4c..1ec25998d35e 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -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 <bsd.port.mk>
diff --git a/editors/beaver/distinfo b/editors/beaver/distinfo
index 4582c4eb4089..08100162ece2 100644
--- a/editors/beaver/distinfo
+++ b/editors/beaver/distinfo
@@ -1 +1 @@
-MD5 (beaver-0.3.0.tar.gz) = cb32ad10b1550528469f93939dc07423
+MD5 (beaver-0.3.1.tar.gz) = b7281a4e9a4a802111aa2854fa5e7541
diff --git a/editors/beaver/files/patch-aa b/editors/beaver/files/patch-aa
deleted file mode 100644
index 3e207061e4da..000000000000
--- a/editors/beaver/files/patch-aa
+++ /dev/null
@@ -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 --git a/editors/beaver/files/patch-ba b/editors/beaver/files/patch-ba
deleted file mode 100644
index 300df8e06579..000000000000
--- a/editors/beaver/files/patch-ba
+++ /dev/null
@@ -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, "<Item>"};
- 	  
- 	  fixed = str_replace_tokens (&fixed, '/', "\\");
- 	  s = g_strconcat("/Language/",
- 				 fixed,
- 				 NULL);
--	  GtkItemFactoryEntry NewEntry = {s, NULL, languages_treatment,
--					  lang, "<Item>"};
- 
- 	  gtk_item_factory_create_items
- 	    (gtk_item_factory_from_path  ("<main>"), 1, &NewEntry, NULL);
diff --git a/editors/beaver/pkg-plist b/editors/beaver/pkg-plist
index 9b6c8f710308..3474d50331cc 100644
--- a/editors/beaver/pkg-plist
+++ b/editors/beaver/pkg-plist
@@ -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