ports/70635: Update port: textproc/xmlppm to 0.98.1

[KATO Tsuguru]

>Number:         70635
>Category:       ports
>Synopsis:       Update port: textproc/xmlppm to 0.98.1
>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 Aug 18 17:40:09 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.10-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 0.98.1

Remove file:
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/textproc/xmlppm/Makefile textproc/xmlppm/Makefile
--- /usr/ports/textproc/xmlppm/Makefile	Mon Aug 16 22:46:06 2004
+++ textproc/xmlppm/Makefile	Tue Aug 17 23:14:45 2004
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	xmlppm
-PORTVERSION=	0.97
-PORTREVISION=	2
+PORTVERSION=	0.98.1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.cs.cornell.edu/People/jcheney/xmlppm/
@@ -22,16 +21,22 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
-USE_GMAKE=	yes
 USE_ICONV=	yes
-MAKE_ARGS=	CC="${CXX}" OPT_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"
 
-.include <bsd.port.pre.mk>
+PORTDOCS=	README
+PLIST_FILES=	bin/xmlppm bin/xmlunppm
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile with gcc 3.4.2"
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^CC|#CC|g ; \
+		 s|^CPPFLAGS|#CPPFLAGS|g ; \
+		 s|^CFLAGS|#CFLAGS|g ; \
+		 s|$$(CC)|$$(CXX)|g ; \
+		 s|$$(CFLAGS)|$$(CXXFLAGS)|g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmlppm ${PREFIX}/bin
@@ -41,4 +46,4 @@
 	${INSTALL_DATA} ${WRKSRC}/../README ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/textproc/xmlppm/distinfo textproc/xmlppm/distinfo
--- /usr/ports/textproc/xmlppm/distinfo	Fri Jan 30 14:54:45 2004
+++ textproc/xmlppm/distinfo	Tue Aug 17 22:42:46 2004
@@ -1,2 +1,2 @@
-MD5 (xmlppm-0.97-src.tar.gz) = 89a5aa7f2ff5a96e3894f3a97aec0f1d
-SIZE (xmlppm-0.97-src.tar.gz) = 36440
+MD5 (xmlppm-0.98.1-src.tar.gz) = 242c073527ec09c70669bf2b22b692e3
+SIZE (xmlppm-0.98.1-src.tar.gz) = 38197
diff -urN /usr/ports/textproc/xmlppm/files/patch-IFile.cpp textproc/xmlppm/files/patch-IFile.cpp
--- /usr/ports/textproc/xmlppm/files/patch-IFile.cpp	Fri Jul 25 00:10:05 2003
+++ textproc/xmlppm/files/patch-IFile.cpp	Tue Aug 17 23:21:10 2004
@@ -1,11 +1,11 @@
---- IFile.cpp.orig	Wed Jul 23 04:32:54 2003
-+++ IFile.cpp	Wed Jul 23 04:35:43 2003
-@@ -100,7 +100,7 @@
-   while(insz > 0) {
-     size_t result;
-     outsz = BUFFSIZE;
--    result = iconv(ifile->iconv, &(char*)inptr, &insz, &outptr, &outsz);
-+    result = iconv(ifile->iconv, &inptr, &insz, &outptr, &outsz);
-     total += fwrite(outbuf, sizeof(char), BUFFSIZE-outsz, ifile->file);
-     if(result == (size_t)-1 && errno != E2BIG) {
-       return total;
+--- IFile.cpp.orig	Thu Jun 10 04:16:13 2004
++++ IFile.cpp	Tue Aug 17 23:21:02 2004
+@@ -73,7 +73,7 @@
+    writing the output.  Then flush the file.  */
+ void ifflush(IFILE* ifile) {
+   static char outbuf[BUFFSIZE];
+-  char* inptr = ifile->buf;
++  const char* inptr = ifile->buf;
+   char* outptr = outbuf;
+   size_t insz = ifile->bufsiz;
+   size_t outsz;
diff -urN /usr/ports/textproc/xmlppm/pkg-descr textproc/xmlppm/pkg-descr
--- /usr/ports/textproc/xmlppm/pkg-descr	Tue May 15 13:09:08 2001
+++ textproc/xmlppm/pkg-descr	Tue Aug 17 22:35:43 2004
@@ -5,4 +5,4 @@
 approach to modeling tree-structured data called Multiplexed Hierarchical
 Modeling (MHM) that I have developed.
 
-WWW: http://xmlppm.sourceforge.net/
+WWW: http://www.cs.cornell.edu/People/jcheney/xmlppm/xmlppm.html
diff -urN /usr/ports/textproc/xmlppm/pkg-plist textproc/xmlppm/pkg-plist
--- /usr/ports/textproc/xmlppm/pkg-plist	Fri Jul 25 10:40:36 2003
+++ textproc/xmlppm/pkg-plist	Thu Jan  1 09:00:00 1970
@@ -1,4 +0,0 @@
-bin/xmlppm
-bin/xmlunppm
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: