Update to version 0.98.1

PR:		ports/70635
Submitted by:	Ports Fury

5 files changed, 28 insertions, 27 deletions

diff --git a/textproc/xmlppm/Makefile b/textproc/xmlppm/Makefile
index f6949b663674..2cf652b9d82c 100644
--- a/textproc/xmlppm/Makefile
+++ b/textproc/xmlppm/Makefile
@@ -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 @@ LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 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 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/../README ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/xmlppm/distinfo b/textproc/xmlppm/distinfo
index 6b9ffbd0bc24..e06aa5aa3c72 100644
--- a/textproc/xmlppm/distinfo
+++ b/textproc/xmlppm/distinfo
@@ -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 --git a/textproc/xmlppm/files/patch-IFile.cpp b/textproc/xmlppm/files/patch-IFile.cpp
index d50b235eb71b..910e4dcf30ec 100644
--- a/textproc/xmlppm/files/patch-IFile.cpp
+++ b/textproc/xmlppm/files/patch-IFile.cpp
@@ -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 --git a/textproc/xmlppm/pkg-descr b/textproc/xmlppm/pkg-descr
index bcee1485b302..8ce3ba86cb9e 100644
--- a/textproc/xmlppm/pkg-descr
+++ b/textproc/xmlppm/pkg-descr
@@ -5,4 +5,4 @@ for text compression, first described by Cleary and Witten in 1984, and an
 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 --git a/textproc/xmlppm/pkg-plist b/textproc/xmlppm/pkg-plist
deleted file mode 100644
index 54d4e7335aac..000000000000
--- a/textproc/xmlppm/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/xmlppm
-bin/xmlunppm
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%