Attachment 95211 Details for Bug 133560 – file.diff

[patch] file.diff

file.diff (text/plain), 3.75 KB, created by bf on 2009-04-10 07:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bf

Created: 2009-04-10 07:30:11 UTC

Size: 3.75 KB

patch

obsolete

>diff -ruN gv.orig/Makefile gv/Makefile
>--- gv.orig/Makefile	2008-08-20 03:01:15.000000000 -0400
>+++ gv/Makefile	2009-04-10 00:33:37.102101718 -0400
>@@ -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}
>@@ -27,21 +27,14 @@
> MAN1=		gv.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 \
>+		${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 -ruN gv.orig/distinfo gv/distinfo
>--- gv.orig/distinfo	2008-07-26 12:36:41.000000000 -0400
>+++ gv/distinfo	2009-04-10 00:33:37.102101718 -0400
>@@ -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 -ruN gv.orig/files/patch-src-Makefile.in gv/files/patch-src-Makefile.in
>--- gv.orig/files/patch-src-Makefile.in	2008-07-26 12:36:41.000000000 -0400
>+++ gv/files/patch-src-Makefile.in	2009-04-10 00:33:37.101103267 -0400
>@@ -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 -ruN gv.orig/files/patch-src-callbacks.c gv/files/patch-src-callbacks.c
>--- gv.orig/files/patch-src-callbacks.c	1969-12-31 19:00:00.000000000 -0500
>+++ gv/files/patch-src-callbacks.c	2009-04-10 00:33:37.101103267 -0400
>@@ -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)
>+ }

Actions: View | Diff

Attachments on bug 133560: 95211