svn commit: r364941 - in head/textproc/rtfx: . files

[John Marino]

Author: marino
Date: Fri Aug 15 07:06:28 2014
New Revision: 364941
URL: http://svnweb.freebsd.org/changeset/ports/364941
QAT: https://qat.redports.org/buildarchive/r364941/

Log:
  Stage textproc/rtfx and unbreak 64-bit arches
  
  PR:		192667
  Submitted by:	Jan Beich

Added:
  head/textproc/rtfx/files/patch-src-xmlfixups.cpp   (contents, props changed)
Modified:
  head/textproc/rtfx/Makefile
  head/textproc/rtfx/pkg-descr

Modified: head/textproc/rtfx/Makefile
==============================================================================
--- head/textproc/rtfx/Makefile	Fri Aug 15 07:05:34 2014	(r364940)
+++ head/textproc/rtfx/Makefile	Fri Aug 15 07:06:28 2014	(r364941)
@@ -5,7 +5,7 @@ PORTNAME=	rtfx
 PORTVERSION=	1.1
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	http://memberwebs.com/stef/software/rtfx/
+MASTER_SITES=	http://thewalter.net/stef/software/rtfx/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	RTF to XML converter
@@ -13,18 +13,10 @@ COMMENT=	RTF to XML converter
 LIB_DEPENDS=	libmba.so:${PORTSDIR}/devel/libmba \
 		libdomc.so:${PORTSDIR}/textproc/domc
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --datarootdir=${PREFIX}
+GNU_CONFIGURE=	yes
 USES=		gmake
 
-PLIST_FILES=	bin/rtfx
-MAN1=		rtfx.1
+PLIST_FILES=	bin/${PORTNAME} \
+		man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == amd64 || ${ARCH} == sparc64
-BROKEN=		Does not compile on sparc64
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/textproc/rtfx/files/patch-src-xmlfixups.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/rtfx/files/patch-src-xmlfixups.cpp	Fri Aug 15 07:06:28 2014	(r364941)
@@ -0,0 +1,11 @@
+--- src/xmlfixups.cpp~
++++ src/xmlfixups.cpp
+@@ -453,7 +453,7 @@ void XmlFixups::runPassTwo(const DOM::Do
+ 
+         // Mark each node as we've seen it so we don't 
+         // do a given element twice
+-        if((int)el.getUserData() == PASS_TWO)
++        if((intptr_t)el.getUserData() == (intptr_t)PASS_TWO)
+             continue;
+ 
+         el.setUserData((void*)PASS_TWO);

Modified: head/textproc/rtfx/pkg-descr
==============================================================================
--- head/textproc/rtfx/pkg-descr	Fri Aug 15 07:05:34 2014	(r364940)
+++ head/textproc/rtfx/pkg-descr	Fri Aug 15 07:06:28 2014	(r364941)
@@ -7,5 +7,4 @@ RTF features supported: page breaks, sec
 lists (various types), tables, footnotes, info block, bold, italic, 
 underline, super/sub script, hidden text, strike out, text color, fonts.
 
-Author:	Nielsen <nielsen at memberwebs.com>
-WWW:	http://memberwebs.com/nielsen/software/rtfx/
+WWW: http://thewalter.net/stef/software/rtfx/