Wed Aug 26 15:55:14 2009 UTC ()
Update to 0.9.3.  This version kills win32 support, pulls in a bunch of
patches from Debian, and now uses gtk2.

While here, PKG_DESTDIR=user-destdir'ify and use the proper framework
for handling configuration files instead of just sticking them in
share/grun as they were before.


(snj)
diff -r1.18 -r1.19 pkgsrc/sysutils/grun/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/grun/PLIST
diff -r1.2 -r1.3 pkgsrc/sysutils/grun/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/grun/patches/patch-aa
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/grun/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/grun/Makefile 2007/01/07 09:14:11 1.18
+++ pkgsrc/sysutils/grun/Makefile 2009/08/26 15:55:14 1.19
@@ -1,23 +1,35 @@ @@ -1,23 +1,35 @@
1# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:11 rillig Exp $ 1# $NetBSD: Makefile,v 1.19 2009/08/26 15:55:14 snj Exp $
2 2
3DISTNAME= grun-0.9.2 3DISTNAME= grun-0.9.3
4PKGREVISION= 5 
5CATEGORIES= misc 4CATEGORIES= misc
6MASTER_SITES= http://www.geocities.com/ResearchTriangle/Facility/1468/sg/ 5MASTER_SITES= http://grun.googlecode.com/files/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
 8HOMEPAGE= http://code.google.com/p/grun/
9HOMEPAGE= ${MASTER_SITES}/grun.html 9HOMEPAGE= ${MASTER_SITES}/grun.html
10COMMENT= GTK+ based Run dialog 10COMMENT= GTK+ based Run dialog
11 11
12GNU_CONFIGURE= YES 12GNU_CONFIGURE= YES
13USE_PKGLOCALEDIR= YES 13USE_PKGLOCALEDIR= YES
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake pkg-config
15PTHREAD_OPTS+= require 15
 16PKG_DESTDIR_SUPPORT= user-destdir
 17
 18PKG_SYSCONFSUBDIR= grun
 19EGDIR= ${PREFIX}/share/examples/grun
 20CONF_FILES= ${EGDIR}/gassoc ${PKG_SYSCONFDIR}/gassoc
 21CONF_FILES+= ${EGDIR}/consfile ${PKG_SYSCONFDIR}/consfile
 22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
 23
 24INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/grun
16 25
17post-install: 26post-install:
18 ${MV} ${PREFIX}/${PKGMANDIR}/man1/grun.1x ${PREFIX}/${PKGMANDIR}/man1/grun.1 27 ${INSTALL_MAN} ${WRKSRC}/grun.1x \
 28 ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1/grun.1
 29 ${INSTALL_DATA} ${WRKSRC}/gassoc ${DESTDIR}/${EGDIR}
 30 ${INSTALL_DATA} ${WRKSRC}/consfile ${DESTDIR}/${EGDIR}
19 31
20.include "../../x11/gtk/buildlink3.mk" 32.include "../../x11/gtk2/buildlink3.mk"
21.include "../../mk/pthread.buildlink3.mk" 33.include "../../mk/pthread.buildlink3.mk"
22 34
23.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/grun/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/grun/PLIST 2009/06/14 18:16:07 1.4
+++ pkgsrc/sysutils/grun/PLIST 2009/08/26 15:55:14 1.5
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:16:07 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.5 2009/08/26 15:55:14 snj Exp $
2bin/grun 2bin/grun
3man/man1/grun.1 3man/man1/grun.1
4share/grun/consfile 4share/examples/grun/consfile
5share/grun/gassoc 5share/examples/grun/gassoc
6share/locale/de/LC_MESSAGES/grun.mo 6share/locale/de/LC_MESSAGES/grun.mo
 7share/locale/en@boldquot/LC_MESSAGES/grun.mo
 8share/locale/en@quot/LC_MESSAGES/grun.mo
7share/locale/es/LC_MESSAGES/grun.mo 9share/locale/es/LC_MESSAGES/grun.mo
8share/locale/fr/LC_MESSAGES/grun.mo 10share/locale/fr/LC_MESSAGES/grun.mo
9share/locale/pt/LC_MESSAGES/grun.mo 11share/locale/pt/LC_MESSAGES/grun.mo
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/grun/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/grun/distinfo 2005/02/24 13:40:53 1.2
+++ pkgsrc/sysutils/grun/distinfo 2009/08/26 15:55:14 1.3
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.2 2005/02/24 13:40:53 agc Exp $ 1$NetBSD: distinfo,v 1.3 2009/08/26 15:55:14 snj Exp $
2 2
3SHA1 (grun-0.9.2.tar.gz) = 3b4a06b75aa07aa5d19a4594566773db34ea937d 3SHA1 (grun-0.9.3.tar.gz) = 53ed0f6d449331b6967d3f49d67072c8714a1305
4RMD160 (grun-0.9.2.tar.gz) = 16b97485badd41da671012538b19388975ee9670 4RMD160 (grun-0.9.3.tar.gz) = efb7c197de41c2060042b9111ceba3aa8e02b67c
5Size (grun-0.9.2.tar.gz) = 113745 bytes 5Size (grun-0.9.3.tar.gz) = 368318 bytes
6SHA1 (patch-aa) = cd9b0f80c3144403fddd59446918bf59db356131 6SHA1 (patch-aa) = 505acaf3f2b9dd4b416b73fcd7a6e912dda6eb55
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/grun/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/grun/patches/patch-aa 2001/11/18 22:41:41 1.1.1.1
+++ pkgsrc/sysutils/grun/patches/patch-aa 2009/08/26 15:55:14 1.2
@@ -1,27 +1,22 @@ @@ -1,27 +1,22 @@
1$NetBSD: patch-aa,v 1.1.1.1 2001/11/18 22:41:41 agc Exp $ 1$NetBSD: patch-aa,v 1.2 2009/08/26 15:55:14 snj Exp $
2 2
3Use correct header file for locale information 3--- Makefile.in.orig 2008-01-13 22:18:12.000000000 -0800
4 4+++ Makefile.in 2009-08-26 08:30:31.000000000 -0700
5--- grun.c 2001/11/13 14:57:16 1.1 5@@ -718,7 +718,7 @@ install-data: install-data-recursive
6+++ grun.c 2001/11/13 14:57:44 6 uninstall: uninstall-recursive
7@@ -50,6 +50,10 @@ 7
8 #define ARG_BASE 1 8 install-am: all-am
9 #endif 9- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
10  10+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
11+#ifdef HAVE_LOCALE_H 11
12+#include <locale.h> 12 installcheck: installcheck-recursive
13+#endif 13 install-strip:
14+ 14@@ -760,7 +760,7 @@ install-data-am: install-man
15 #include <sys/stat.h> 15
16  16 install-dvi: install-dvi-recursive
17 #define MAX_BUFF 1024 17
18@@ -894,7 +898,9 @@ 18-install-exec-am: install-binPROGRAMS install-dist_sysconfDATA
19  19+install-exec-am: install-binPROGRAMS
20 gtk_init(&argc, &argv); 20
21 #ifndef WIN32 21 install-html: install-html-recursive
22+#ifdef HAVE_SETLOCALE 22
23 setlocale (LC_ALL, ""); 
24+#endif 
25 bindtextdomain (PACKAGE, LOCALEDIR); 
26 textdomain (PACKAGE); 
27 #endif /* WIN32 */