From owner-svn-ports-head@FreeBSD.ORG Fri Aug 15 07:06:29 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D7FDC1CB; Fri, 15 Aug 2014 07:06:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A90FF2089; Fri, 15 Aug 2014 07:06:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7F76TmA086361; Fri, 15 Aug 2014 07:06:29 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7F76TTc086358; Fri, 15 Aug 2014 07:06:29 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201408150706.s7F76TTc086358@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 15 Aug 2014 07:06:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364941 - in head/textproc/rtfx: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2014 07:06:30 -0000 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@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 - -.if ${ARCH} == amd64 || ${ARCH} == sparc64 -BROKEN= Does not compile on sparc64 -.endif - -.include +.include 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 -WWW: http://memberwebs.com/nielsen/software/rtfx/ +WWW: http://thewalter.net/stef/software/rtfx/