beaver: Update to 0.4.1. Only about 10 years late.

Changes: - Interface rewritten using GtkUiManager - Plugin system with API for most important plugin tasks - Beaver tools (eg. base converter, color picker) went into 'tools' plugin - Auto-indent - Smart HOME and END keys - 80-character marker
2020-03-23 19:57:29 +00:00 · 2020-03-23 19:57:29 +00:00 · 0a4580ea94
commit 0a4580ea94
parent b69dde3be2
6 changed files with 37 additions and 221 deletions
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@ -1,31 +1,21 @@
-# $NetBSD: Makefile,v 1.48 2020/03/10 22:09:40 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.49 2020/03/23 19:57:29 nia Exp $

-DISTNAME=	beaver${BEAVER_VERSION:S/./_/g}
-PKGNAME=	beaver-${BEAVER_VERSION}
-PKGREVISION=	31
+DISTNAME=	beaver-0.4.1
 CATEGORIES=	editors
-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
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=beaver-editor/}
+EXTRACT_SUFX=	.tar.bz2

 MAINTAINER=	vincent.derrien@ahoup.net
-HOMEPAGE=	https://www.nongnu.org/beaver/
-COMMENT=	Lightweight GTK+ text editor with syntax highlighting
+HOMEPAGE=	http://beaver-editor.sourceforge.net/
+COMMENT=	Lightweight GTK+2 text editor with syntax highlighting
+LICENSE=	gnu-gpl-v2

-BUILD_DIRS=	src
+GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config perl
+USE_TOOLS+=	intltool msgfmt msgmerge xgettext

-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
-
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/editors/beaver/PLIST
+++ b/editors/beaver/PLIST
@ -1,9 +1,23 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:50:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/03/23 19:57:29 nia Exp $
 bin/beaver
+include/beaver.h
+lib/beaver/plugins/ascii.la
+lib/beaver/plugins/sample.la
+lib/beaver/plugins/tools.la
 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/about.xpm
-share/pixmaps/beaver/beaver.png
+share/beaver/pixmaps/about.xpm
+share/beaver/pixmaps/beaver-old.png
+share/beaver/pixmaps/beaver-project-icon.svg
+share/beaver/pixmaps/beaver-project-icon_16.svg
+share/beaver/pixmaps/beaver-project-icon_22.svg
+share/beaver/pixmaps/beaver-project-icon_32.svg
+share/beaver/pixmaps/beaver-project-icon_48.svg
+share/beaver/resource/beaver.conf.default
+share/beaver/resource/standard.xml
+share/beaver/resource/wordfile.default
+share/icons/hicolor/16x16/apps/beaver.png
+share/icons/hicolor/22x22/apps/beaver.png
+share/icons/hicolor/32x32/apps/beaver.png
+share/icons/hicolor/48x48/apps/beaver.png
+share/pixmaps/beaver.png
--- a/editors/beaver/distinfo
+++ b/editors/beaver/distinfo
@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 03:32:14 agc Exp $
+$NetBSD: distinfo,v 1.8 2020/03/23 19:57:29 nia Exp $

-SHA1 (beaver0_3_0_1.tgz) = 7df51cd68367ad0f02d472647e5df23a32108f78
-RMD160 (beaver0_3_0_1.tgz) = 58b8d48340e3aee5a0ce980d74e339b12e1f9189
-SHA512 (beaver0_3_0_1.tgz) = b4b2dec06bd0a3b4155d4dd0df491410cce8d16c8cb57bf5c73138fcb4db9beeb4e3ba104a872468f8a1cd3405c695130707cfe64b0900b120636c1dad8eae1b
-Size (beaver0_3_0_1.tgz) = 142255 bytes
-SHA1 (patch-aa) = 8e15159bc5ce32d46c0139bcae2a732aee5223f6
-SHA1 (patch-ab) = e2ce6fd1166d052b09fb042a9fcc6d35a32613e3
-SHA1 (patch-src_editor.c) = 0c1e366b63a2c328566671d84301c61df3ec47de
+SHA1 (beaver-0.4.1.tar.bz2) = 93b331d182d50cb3f59b9d7467229c24271d7f80
+RMD160 (beaver-0.4.1.tar.bz2) = 096563b5a1add9ad965408576de1df434cce5c89
+SHA512 (beaver-0.4.1.tar.bz2) = 3000bed3aa2a67d6c38a68a7782a9d5423bcec0b8420272b0f0dade604c094a7b52058b43222af38d56313f0aa27998028c984f69340bf28eeaa8b8a93548a1e
+Size (beaver-0.4.1.tar.bz2) = 436321 bytes
--- a/editors/beaver/patches/patch-aa
+++ b/editors/beaver/patches/patch-aa
@ -1,123 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2013/04/28 03:15:37 dholland Exp $
-
- configure for pkgsrc
- use libtool (why?)
- rearrange installation
- honor PKGMANDIR
-
--- src/Makefile.orig	2008-06-27 03:33:36.000000000 +0000
-+++ src/Makefile
-@@ -7,20 +7,19 @@
- 
- ############## Public section. Modify according to your needs.  ###############
- 
-CC      = gcc
-RM      = rm -f
-CP      = cp
-+#CC      = gcc
-+#RM      = rm -f
-+#CP      = cp
- 
-DESTDIR = /usr/local
- IPATH   = 
- LPATH   = 
-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} `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,66 +31,38 @@ NAME    = beaver
- 
- ###################### Private section. Do not modify  ########################
- 
-ifndef DBUG
-	STRIP = strip --strip-all ${NAME}
-endif
-
- 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
- OBJ	= ${SRC:.c=.o}
- 
- all	: ${OBJ}
-	${CC} -o ${NAME} ${OBJ} ${LDFLAGS}
-	@${STRIP}
-+	${LIBTOOL} --mode=link --tag=CC \
-+		${CC} -o ${NAME} ${OBJ:.o=.lo} ${LDFLAGS}
- 
- .c.o	:
-	${CC} ${CFLAGS} -c $< -o $@
-+	${LIBTOOL} --mode=compile --tag=CC \
-+		${CC} ${CFLAGS} -c $< -o ${@:.o=.lo}
- 
- ${OBJ}	: ${INC}
- 
- install :
-	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/*.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/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_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/*.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}/${PKGMANDIR}/man1
-+	${BSD_INSTALL_MAN} ../beaver.1x \
-+		$(DESTDIR)${PREFIX}/${PKGMANDIR}/man1/beaver.1
- .PHONY: clean re
- 
- clean	:
--- a/editors/beaver/patches/patch-ab
+++ b/editors/beaver/patches/patch-ab
@ -1,22 +0,0 @@
-$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,
--- a/editors/beaver/patches/patch-src_editor.c
+++ b/editors/beaver/patches/patch-src_editor.c
@ -1,40 +0,0 @@
-$NetBSD: patch-src_editor.c,v 1.1 2012/07/03 18:10:51 joerg Exp $
-
--- src/editor.c.orig	2012-07-03 12:25:51.000000000 +0000
-+++ src/editor.c
-@@ -404,7 +404,7 @@ extern void		refresh_editor(GtkWidget *E
- /* preconditions:  iter points to possible start of interesting word  
- postconditions: end is set to the end of the word in the buffer if it was found.
- if word found, returns TRUE, else FALSE*/
-inline gboolean starts_string (gchar *text, gint i, gchar *word, gint *end)
-+static inline gboolean starts_string (gchar *text, gint i, gchar *word, gint *end)
- {
- 	gunichar ch;
- 	gunichar k;
-@@ -438,7 +438,7 @@ inline gboolean starts_string (gchar *te
- 
- 
- /* returns color index of match, or -1 if none */
-inline gint is_matching_keyword (gint Lg, const gchar *str)
-+static inline gint is_matching_keyword (gint Lg, const gchar *str)
- {
- 	gint rv = -1;
- 	gpointer val;
-@@ -454,7 +454,7 @@ inline gint is_matching_keyword (gint Lg
- }
- 
- 
-inline void refresh_markers (GtkTextBuffer *Buffer)
-+static inline void refresh_markers (GtkTextBuffer *Buffer)
- {
- 	gint CurrentPage;
- 	gint Lg;
-@@ -780,7 +780,7 @@ void search_for_keyword_correctly (gint 
- }
- 
- 
-inline void search_for_keyword_fastly (gint page, GtkTextBuffer *Buffer, gchar *text, gint *i, gint offset, gint Lg)
-+static void search_for_keyword_fastly (gint page, GtkTextBuffer *Buffer, gchar *text, gint *i, gint offset, gint Lg)
- {
- 	/* search for a keyword */
- 	gint tmp, next;