- Update to version 0.9.8, remove patches included upstream

- Clean up Makefile (trim header, etc.) while I am here
- Use double space after dot (full stop) in port description

Feature safe:	yes

4 files changed, 10 insertions, 49 deletions

diff --git a/graphics/pho/Makefile b/graphics/pho/Makefile
index f4a6b03a9d0d..0ba9edc3a908 100644
--- a/graphics/pho/Makefile
+++ b/graphics/pho/Makefile
@@ -1,35 +1,30 @@
-# New ports collection makefile for:	pho
-# Date created:				10 April 2003
-# Whom:					Roland Jesse <roland.jesse@gmx.net>
-#
+# Created by: Roland Jesse <roland.jesse@gmx.net>
 # $FreeBSD$
-#
 
 PORTNAME=	pho
-DISTVERSION=	0.9.7-pre7
-PORTREVISION=	1
+DISTVERSION=	0.9.8
 CATEGORIES=	graphics
 MASTER_SITES=	http://shallowsky.com/software/pho/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A lightweight image viewer
+COMMENT=	Lightweight image viewer
 
 LICENSE=	GPLv2
 
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 MAKE_ARGS=	INSTALLPREFIX="${PREFIX}"
-ALL_TARGET=	pho
+ALL_TARGET=	${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MAN1=		pho.1
-PLIST_FILES=	bin/pho
+MAN1=		${PORTNAME}.1
+PLIST_FILES=	bin/${PORTNAME}
 
 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
+		/CFLAGS/s|-g ||' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|-Wall -g -O2 ||' ${WRKSRC}/exif/Makefile
 
 .include <bsd.port.mk>
diff --git a/graphics/pho/distinfo b/graphics/pho/distinfo
index d5b18667adcd..721c1200b6bb 100644
--- a/graphics/pho/distinfo
+++ b/graphics/pho/distinfo
@@ -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 --git a/graphics/pho/files/patch-options b/graphics/pho/files/patch-options
deleted file mode 100644
index 49b94db39da4..000000000000
--- a/graphics/pho/files/patch-options
+++ /dev/null
@@ -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 --git a/graphics/pho/pkg-descr b/graphics/pho/pkg-descr
index 8c65160fe3da..c85c4fef250c 100644
--- a/graphics/pho/pkg-descr
+++ b/graphics/pho/pkg-descr
@@ -1,6 +1,6 @@
 Pho is a lightweight utility for viewing, rotating, or deleting large
 numbers of images quickly, and making notes about what to do with each
-of them. It is particularly useful for processing hundreds of images
+of them.  It is particularly useful for processing hundreds of images
 after uploading them from a digital camera.
 
 WWW: http://shallowsky.com/software/pho/