4 files changed, 42 insertions, 28 deletions

diff --git a/print/gv/Makefile b/print/gv/Makefile
index cb512adbcd0e..103a9e3ca253 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gv
-PORTVERSION=	3.6.5
+PORTVERSION=	3.6.7
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,24 +24,18 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/X11 \
 			--enable-setenv-code
 
-MAN1=		gv.1
+MAN1=		gv.1 gv-update-userconfig.1
 INFO=		gv
 PLIST_FILES=	bin/gv \
-		lib/X11/gv/gv_class.ad \
-		lib/X11/gv/gv_copyright.dat \
-		lib/X11/gv/gv_spartan.dat \
-		lib/X11/gv/gv_system.ad \
-		lib/X11/gv/gv_user.ad \
-		lib/X11/gv/gv_user_res.dat \
-		lib/X11/gv/gv_widgetless.dat \
+		bin/gv-update-userconfig \
+		${DATADIR_REL}/gv_class.ad \
+		${DATADIR_REL}/gv_copyright.dat \
+		${DATADIR_REL}/gv_spartan.dat \
+		${DATADIR_REL}/gv_system.ad \
+		${DATADIR_REL}/gv_user.ad \
+		${DATADIR_REL}/gv_user_res.dat \
+		${DATADIR_REL}/gv_widgetless.dat \
 		lib/X11/app-defaults/GV
-PLIST_DIRS=	lib/X11/gv
-
-post-install:
-		@${ECHO_MSG} ""
-		@${ECHO_MSG} " Don't forget to remove ${HOME}/.gv if it was created "
-		@${ECHO_MSG} " when a different version of gv was installed: otherwise "
-		@${ECHO_MSG} " gv may fail to run. "
-		@${ECHO_MSG} ""
+PLIST_DIRS=	${DATADIR_REL}
 
 .include <bsd.port.mk>
diff --git a/print/gv/distinfo b/print/gv/distinfo
index 7c66b7db58c3..e84fc876a745 100644
--- a/print/gv/distinfo
+++ b/print/gv/distinfo
@@ -1,3 +1,3 @@
-MD5 (gv-3.6.5.tar.gz) = ce3081b1b3e6258607f2de70f39cbcd2
-SHA256 (gv-3.6.5.tar.gz) = edd4fe40f65e4722736fc1d6f6d3b9c9f1f919e5da4835873d65e95b92c1bd73
-SIZE (gv-3.6.5.tar.gz) = 537336
+MD5 (gv-3.6.7.tar.gz) = fdad147dd0440446cf9daaffca83343f
+SHA256 (gv-3.6.7.tar.gz) = ee71a4f1604fe00388242c3f3c055aa067cd60bf72e6d5249897455d559fb3b1
+SIZE (gv-3.6.7.tar.gz) = 545104
diff --git a/print/gv/files/patch-src-Makefile.in b/print/gv/files/patch-src-Makefile.in
index 54a0228dbfca..4c25e995faf1 100644
--- a/print/gv/files/patch-src-Makefile.in
+++ b/print/gv/files/patch-src-Makefile.in
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	2008-07-07 23:01:11.532113493 -0400
-+++ src/Makefile.in	2008-07-07 23:02:16.119805505 -0400
-@@ -256,7 +256,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat
--appdefaultsdir = $(pkglibdir)
+--- src/Makefile.in.orig	2009-03-21 20:18:50.000000000 +0900
++++ src/Makefile.in	2009-03-29 17:59:16.000000000 +0900
+@@ -263,7 +263,7 @@
+ bin_SCRIPTS = gv-update-userconfig
+ dist_pkgdata_DATA = gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat
+ pkgdata_DATA = gv_system.ad gv_user.ad gv_class.ad
+-appdefaultsdir = $(pkgdatadir)
 +appdefaultsdir = $(libdir)/app-defaults
- appdefaults_DATA = GV
+ appdefaults_DATA = ../GV
  EXTRA_DIST = ad2c gv_font_res.dat gv_layout_res.dat gv_misc_res.dat Aaa_bison.yacc \
             gv_current.xbm gv_doc.xbm gv_empty.xbm gv_even.xbm gv_icon.xbm gv_odd.xbm \
diff --git a/print/gv/files/patch-src-callbacks.c b/print/gv/files/patch-src-callbacks.c
new file mode 100644
index 000000000000..0a831b464243
--- /dev/null
+++ b/print/gv/files/patch-src-callbacks.c
@@ -0,0 +1,20 @@
+--- src/callbacks.c.orig	2009-04-10 00:01:22.379498762 -0400
++++ src/callbacks.c	2009-04-10 00:02:32.330844813 -0400
+@@ -957,7 +957,7 @@
+     
+     BEGINMESSAGE(cb_presentation)
+ 
+-    sigold = signal(SIGCLD, SIG_IGN); /* Avoid zombies */
++    sigold = signal(SIGCHLD, SIG_IGN); /* Avoid zombies */
+     if (!(pid = fork()))
+     {
+        /* We have to close all open file descriptors so the child does not
+@@ -969,7 +969,7 @@
+        printf("Cannot exec %s\n", gv_bin);
+        exit(1);
+     }
+-    signal(SIGCLD, sigold); /* restore signal handler */
++    signal(SIGCHLD, sigold); /* restore signal handler */
+     
+     ENDMESSAGE(cb_presentation)
+ }