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.

4 files changed, 48 insertions, 39 deletions

diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
index f8d1417fc17..fb067c9acb5 100644
--- a/sysutils/grun/Makefile
+++ b/sysutils/grun/Makefile
@@ -1,23 +1,35 @@
-# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:11 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2009/08/26 15:55:14 snj Exp $
 
-DISTNAME=	grun-0.9.2
-PKGREVISION=	5
+DISTNAME=	grun-0.9.3
 CATEGORIES=	misc
-MASTER_SITES=	http://www.geocities.com/ResearchTriangle/Facility/1468/sg/
+MASTER_SITES=	http://grun.googlecode.com/files/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://code.google.com/p/grun/
 HOMEPAGE=	${MASTER_SITES}/grun.html
 COMMENT=	GTK+ based Run dialog
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake
-PTHREAD_OPTS+=		require
+USE_TOOLS+=		gmake pkg-config
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+PKG_SYSCONFSUBDIR=	grun
+EGDIR=			${PREFIX}/share/examples/grun
+CONF_FILES=		${EGDIR}/gassoc ${PKG_SYSCONFDIR}/gassoc
+CONF_FILES+=		${EGDIR}/consfile ${PKG_SYSCONFDIR}/consfile
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/grun
 
 post-install:
-	${MV} ${PREFIX}/${PKGMANDIR}/man1/grun.1x ${PREFIX}/${PKGMANDIR}/man1/grun.1
+	${INSTALL_MAN} ${WRKSRC}/grun.1x \
+		${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1/grun.1
+	${INSTALL_DATA} ${WRKSRC}/gassoc ${DESTDIR}/${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/consfile ${DESTDIR}/${EGDIR}
 
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/grun/PLIST b/sysutils/grun/PLIST
index 26a75b671a2..6f2fd174ad4 100644
--- a/sysutils/grun/PLIST
+++ b/sysutils/grun/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:16:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/08/26 15:55:14 snj Exp $
 bin/grun
 man/man1/grun.1
-share/grun/consfile
-share/grun/gassoc
+share/examples/grun/consfile
+share/examples/grun/gassoc
 share/locale/de/LC_MESSAGES/grun.mo
+share/locale/en@boldquot/LC_MESSAGES/grun.mo
+share/locale/en@quot/LC_MESSAGES/grun.mo
 share/locale/es/LC_MESSAGES/grun.mo
 share/locale/fr/LC_MESSAGES/grun.mo
 share/locale/pt/LC_MESSAGES/grun.mo
diff --git a/sysutils/grun/distinfo b/sysutils/grun/distinfo
index 2b0d6a4aafa..2f560beb9c4 100644
--- a/sysutils/grun/distinfo
+++ b/sysutils/grun/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:40:53 agc Exp $
+$NetBSD: distinfo,v 1.3 2009/08/26 15:55:14 snj Exp $
 
-SHA1 (grun-0.9.2.tar.gz) = 3b4a06b75aa07aa5d19a4594566773db34ea937d
-RMD160 (grun-0.9.2.tar.gz) = 16b97485badd41da671012538b19388975ee9670
-Size (grun-0.9.2.tar.gz) = 113745 bytes
-SHA1 (patch-aa) = cd9b0f80c3144403fddd59446918bf59db356131
+SHA1 (grun-0.9.3.tar.gz) = 53ed0f6d449331b6967d3f49d67072c8714a1305
+RMD160 (grun-0.9.3.tar.gz) = efb7c197de41c2060042b9111ceba3aa8e02b67c
+Size (grun-0.9.3.tar.gz) = 368318 bytes
+SHA1 (patch-aa) = 505acaf3f2b9dd4b416b73fcd7a6e912dda6eb55
diff --git a/sysutils/grun/patches/patch-aa b/sysutils/grun/patches/patch-aa
index 0a52698120f..da9d0cdafb6 100644
--- a/sysutils/grun/patches/patch-aa
+++ b/sysutils/grun/patches/patch-aa
@@ -1,27 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/11/18 22:41:41 agc Exp $
+$NetBSD: patch-aa,v 1.2 2009/08/26 15:55:14 snj Exp $
 
-Use correct header file for locale information
-
---- grun.c	2001/11/13 14:57:16	1.1
-+++ grun.c	2001/11/13 14:57:44
-@@ -50,6 +50,10 @@
- #define ARG_BASE	1
- #endif
+--- Makefile.in.orig	2008-01-13 22:18:12.000000000 -0800
++++ Makefile.in	2009-08-26 08:30:31.000000000 -0700
+@@ -718,7 +718,7 @@ install-data: install-data-recursive
+ uninstall: uninstall-recursive
+ 
+ install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ 
+ installcheck: installcheck-recursive
+ install-strip:
+@@ -760,7 +760,7 @@ install-data-am: install-man
+ 
+ install-dvi: install-dvi-recursive
  
-+#ifdef HAVE_LOCALE_H
-+#include <locale.h>
-+#endif
-+
- #include <sys/stat.h>
+-install-exec-am: install-binPROGRAMS install-dist_sysconfDATA
++install-exec-am: install-binPROGRAMS
  
- #define MAX_BUFF	1024
-@@ -894,7 +898,9 @@
+ install-html: install-html-recursive
  
- 	gtk_init(&argc, &argv);
- #ifndef WIN32
-+#ifdef HAVE_SETLOCALE
- 	setlocale (LC_ALL, "");
-+#endif
- 	bindtextdomain (PACKAGE, LOCALEDIR);
- 	textdomain (PACKAGE);
- #endif /* WIN32 */