ports/158446: Update port: textproc/gutenmark to 20090510

[KATO Tsuguru]

>Number:         158446
>Category:       ports
>Synopsis:       Update port: textproc/gutenmark to 20090510
>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:   Wed Jun 29 18:20:05 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 20090510

Remove file:
files/patch-MatchWordlists.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/textproc/gutenmark/Makefile textproc/gutenmark/Makefile
--- /usr/ports/textproc/gutenmark/Makefile	2011-06-18 18:44:01.000000000 +0900
+++ textproc/gutenmark/Makefile	2011-06-18 20:35:31.000000000 +0900
@@ -6,27 +6,41 @@
 # $FreeBSD: ports/textproc/gutenmark/Makefile,v 1.11 2011/06/17 15:37:20 bapt Exp $
 
 PORTNAME=	gutenmark
-PORTVERSION=	20020714
-PORTREVISION=	1
+PORTVERSION=	20090510
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.sandroid.org/GutenMark/SoftwareSnapshots/
-DISTNAME=	GutenMark_source_${PORTVERSION}
+MASTER_SITES=	http://www.sandroid.org/GutenMark/wasftp.GutenMark/SoftwareSnapshots/
+DISTNAME=	GutenMark_source_dev-${PORTVERSION}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Attractively formatting Project Gutenberg texts
 
-BROKEN=	Does not fetch
-
-PLIST_FILES=	bin/GutenMark
 WRKSRC=		${WRKDIR}/GutenMark-source
+
+USE_WX=		2.8
 USE_GMAKE=	yes
-ALL_TARGET=	# empty
+ALL_TARGET=	default
+
+PLIST_FILES=	bin/GutenMark bin/GutenSplit bin/GUItenMark \
+		%%DATADIR%%/convert.jpg %%DATADIR%%/logo.jpg
+PLIST_DIRS=	%%DATADIR%%
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,cc,${CC},g" \
-		-e "s,-O3 -Wall,${CFLAGS},g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|cc|${CC}|g ; \
+		 s|-O3|${CFLAGS}|g ; \
+		 /strip /d' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|-Wall|${CFLAGS} -Wall|g ; \
+		 /strip /d' ${WRKSRC}/GutenUtilities/Makefile
+	@${REINPLACE_CMD} -e 's|g++|${CXX}|g ; \
+		 s|`wx-config|`${WX_CONFIG}|g ; \
+		 /strip /d' ${WRKSRC}/GUItenMark/Makefile
+	@${REINPLACE_CMD} -e 's|\./convert.jpg|${DATADIR}/convert.jpg|g ; \
+		 s|\./logo.jpg|${DATADIR}/logo.jpg|g' ${WRKSRC}/GUItenMark/GUItenMark.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/GutenMark ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/GutenUtilities/GutenSplit ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/GUItenMark/GUItenMark ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/GUItenMark/*.jpg ${DATADIR}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/textproc/gutenmark/distinfo textproc/gutenmark/distinfo
--- /usr/ports/textproc/gutenmark/distinfo	2005-11-26 19:32:08.000000000 +0900
+++ textproc/gutenmark/distinfo	2011-06-18 19:24:06.000000000 +0900
@@ -1,3 +1,2 @@
-MD5 (GutenMark_source_20020714.tar.gz) = 0880c41be3ed866f4a2d6f0fcf44a655
-SHA256 (GutenMark_source_20020714.tar.gz) = 79ea27ae88b5a4762364352c360113aa3012dfaced4d6daa6acf08f85847094e
-SIZE (GutenMark_source_20020714.tar.gz) = 192099
+SHA256 (GutenMark_source_dev-20090510.tar.gz) = 85120b2dd00e6fe34cf2e92715ada8961f47d24bc97bc90e277ae83ce2c67ce5
+SIZE (GutenMark_source_dev-20090510.tar.gz) = 432065
diff -urN /usr/ports/textproc/gutenmark/files/patch-MatchWordlists.c textproc/gutenmark/files/patch-MatchWordlists.c
--- /usr/ports/textproc/gutenmark/files/patch-MatchWordlists.c	2002-10-14 09:58:40.000000000 +0900
+++ textproc/gutenmark/files/patch-MatchWordlists.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,16 +0,0 @@
---- libGutenSpell/MatchWordlists.c.orig	Mon Oct  7 15:30:33 2002
-+++ libGutenSpell/MatchWordlists.c	Mon Oct  7 15:30:00 2002
-@@ -430,11 +430,13 @@
- 	  if (LogFile != NULL)
- 	    fprintf (LogFile, "MatchWordlists:  GLOB_NOSPACE for \"%s\"\n", ss);
- 	  break;
-+#ifndef __FreeBSD__
- 	case GLOB_ABEND:
-           fprintf (stderr, "Possible disk-read error.\n");
- 	  if (LogFile != NULL)
- 	    fprintf (LogFile, "MatchWordlists:  GLOB_ABEND for \"%s\"\n", ss);
-    	  break;
-+#endif
- 	default:
- 	  fprintf (stderr, "Unknown globbing error.\n");
- 	  if (LogFile != NULL)
>Release-Note:
>Audit-Trail:
>Unformatted: