ports/172020: graphics/pho: Update to version 0.9.8

[KATO Tsuguru]

>Number:         172020
>Category:       ports
>Synopsis:       graphics/pho: Update to version 0.9.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 25 18:10:30 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 0.9.8

New file:
files/patch-pho.c

Remove file:
files/patch-options

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/pho/Makefile graphics/pho/Makefile
--- /usr/ports/graphics/pho/Makefile	2012-06-01 14:20:33.000000000 +0900
+++ graphics/pho/Makefile	2012-09-25 03:35:03.000000000 +0900
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	pho
-# Date created:				10 April 2003
-# Whom:					Roland Jesse <roland.jesse at gmx.net>
-#
+# Created by: Roland Jesse <roland.jesse at gmx.net>
 # $FreeBSD: ports/graphics/pho/Makefile,v 1.23 2012/06/01 05:20:33 dinoex Exp $
-#
 
 PORTNAME=	pho
-DISTVERSION=	0.9.7-pre7
-PORTREVISION=	1
+PORTVERSION=	0.9.8
 CATEGORIES=	graphics
 MASTER_SITES=	http://shallowsky.com/software/pho/
 
@@ -16,20 +11,25 @@
 
 LICENSE=	GPLv2
 
-USE_GMAKE=	yes
-USE_GNOME=	gtk20
-MAKE_ARGS=	INSTALLPREFIX="${PREFIX}"
-ALL_TARGET=	pho
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USE_GNOME=	gtk20
+USE_GMAKE=	yes
+MAKE_ENV=	INSTALLPREFIX="${PREFIX}"
+ALL_TARGET=	${PORTNAME}
+MAKE_JOBS_SAFE=	yes
+
 MAN1=		pho.1
 PLIST_FILES=	bin/pho
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|make|$$(MAKE)| ; \
-		/bin/s|$$(INSTALL)|${INSTALL_PROGRAM}| ; \
-		/man/s|$$(INSTALL)|${INSTALL_MAN}| ; \
-		/CFLAGS/s|-g|| ; s|^G1FLAGS|#&|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|-Wall -g -O2 ||' ${WRKSRC}/exif/Makefile
+	@${REINPLACE_CMD} -e \
+		'/^CFLAGS/s|-g -Wall -pedantic|-Wall| ; \
+		 s|^INSTALL|#INSTALL| ; \
+		 s| make | $$(MAKE) | ; \
+		 /bin/s|$$(INSTALL)|$${BSD_INSTALL_PROGRAM}| ; \
+		 /man/s|$$(INSTALL)|$${BSD_INSTALL_MAN}|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		'/^CFLAGS/s|-Wall -g -O2|-Wall|' ${WRKSRC}/exif/Makefile
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/pho/distinfo graphics/pho/distinfo
--- /usr/ports/graphics/pho/distinfo	2011-12-16 23:36:43.000000000 +0900
+++ graphics/pho/distinfo	2012-09-12 18:37:19.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (pho-0.9.7-pre7.tar.gz) = 71db5a3824627b400d2feedf752da45a69804a0ce7b14bb789d25674b602c87a
-SIZE (pho-0.9.7-pre7.tar.gz) = 127940
+SHA256 (pho-0.9.8.tar.gz) = 33d9ce822e4cf009d8fd3d0f1545960779ab099cadd8a8b5cac30b29f369e18e
+SIZE (pho-0.9.8.tar.gz) = 129487
diff -urN /usr/ports/graphics/pho/files/patch-options graphics/pho/files/patch-options
--- /usr/ports/graphics/pho/files/patch-options	2009-08-16 07:04:50.000000000 +0900
+++ graphics/pho/files/patch-options	1970-01-01 09:00:00.000000000 +0900
@@ -1,34 +0,0 @@
---- gmain.c.orig	Mon Jul 25 12:18:05 2005
-+++ gmain.c	Mon Sep 11 16:05:05 2006
-@@ -668,6 +668,7 @@
- 
- int main(int argc, char** argv)
- {
-+    int options = 1;
-     /* Initialize some defaults from environment variables,
-      * before reading cmdline args.
-      */
-@@ -877,8 +877,11 @@
- 
-     while (argc > 1)
-     {
--        if (argv[1][0] == '-')
--            CheckArg(argv[1]);
-+        if (argv[1][0] == '-' && options)
-+            if (strcmp(argv[1], "--"))
-+                CheckArg(argv[1]);
-+            else
-+                options = 0;
-         else {
-             AddImage(argv[1]);
-         }
---- pho.c.orig	Mon Mar 21 07:28:03 2005
-+++ pho.c	Mon Sep 11 16:05:05 2006
-@@ -439,6 +439,7 @@
-     printf("\t-d: Debug messages\n");
-     printf("\t-h: Help: Print this summary\n");
-     printf("\t-v: Verbose help: Print a summary of key bindings\n");
-+    printf("\t--: Assume no more options are given\n");
-     exit(1);
- }
- 
diff -urN /usr/ports/graphics/pho/files/patch-pho.c graphics/pho/files/patch-pho.c
--- /usr/ports/graphics/pho/files/patch-pho.c	1970-01-01 09:00:00.000000000 +0900
+++ graphics/pho/files/patch-pho.c	2012-09-12 18:43:20.000000000 +0900
@@ -0,0 +1,10 @@
+--- pho.c.orig	Mon Mar 21 07:28:03 2005
++++ pho.c	Mon Sep 11 16:05:05 2006
+@@ -439,6 +439,7 @@
+     printf("\t-d: Debug messages\n");
+     printf("\t-h: Help: Print this summary\n");
+     printf("\t-v: Verbose help: Print a summary of key bindings\n");
++    printf("\t--: Assume no more options are given\n");
+     exit(1);
+ }
+ 
>Release-Note:
>Audit-Trail:
>Unformatted: