From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 21 02:50:09 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A97B1065692 for ; Thu, 21 Jan 2010 02:50:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 07E968FC24 for ; Thu, 21 Jan 2010 02:50:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0L2o8Mp027730 for ; Thu, 21 Jan 2010 02:50:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0L2o8RD027729; Thu, 21 Jan 2010 02:50:08 GMT (envelope-from gnats) Resent-Date: Thu, 21 Jan 2010 02:50:08 GMT Resent-Message-Id: <201001210250.o0L2o8RD027729@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, bf Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA8371065670 for ; Thu, 21 Jan 2010 02:45:01 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id B593E8FC1D for ; Thu, 21 Jan 2010 02:45:01 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o0L2j1ri003668 for ; Thu, 21 Jan 2010 02:45:01 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o0L2j1oF003667; Thu, 21 Jan 2010 02:45:01 GMT (envelope-from nobody) Message-Id: <201001210245.o0L2j1oF003667@www.freebsd.org> Date: Thu, 21 Jan 2010 02:45:01 GMT From: bf To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/143044: [PATCH]textproc/unrtf: update to 0.21.1, minor fixes, add test target, adopt X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2010 02:50:09 -0000 >Number: 143044 >Category: ports >Synopsis: [PATCH]textproc/unrtf: update to 0.21.1, minor fixes, add test target, adopt >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jan 21 02:50:08 UTC 2010 >Closed-Date: >Last-Modified: >Originator: bf >Release: 9-CURRENT amd64 >Organization: - >Environment: >Description: >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN unrtf.orig/Makefile unrtf/Makefile --- unrtf.orig/Makefile 2010-01-20 21:16:10.000000000 -0500 +++ unrtf/Makefile 2010-01-20 21:07:06.000000000 -0500 @@ -5,11 +5,11 @@ # $FreeBSD: ports/textproc/unrtf/Makefile,v 1.20 2009/02/20 16:25:30 miwi Exp $ PORTNAME= unrtf -PORTVERSION= 0.21.0 +PORTVERSION= 0.21.1 CATEGORIES= textproc MASTER_SITES= GNU -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bf1783@gmail.com COMMENT= A converter from RTF to several formats, including HTML and LaTeX USE_ICONV= yes @@ -20,22 +20,23 @@ MAN1= unrtf.1 PLIST_FILES= bin/unrtf \ - %%DATADIR%%/charmaps/SYMBOL \ - %%DATADIR%%/outputs/html \ - %%DATADIR%%/outputs/latex \ - %%DATADIR%%/outputs/rtf \ - %%DATADIR%%/outputs/text \ - %%DATADIR%%/outputs/vt -PLIST_DIRS= %%DATADIR%%/outputs \ - %%DATADIR%%/charmaps \ - %%DATADIR%% + %%DATADIR%%/SYMBOL.charmap \ + %%DATADIR%%/html.conf \ + %%DATADIR%%/latex.conf \ + %%DATADIR%%/rtf.conf \ + %%DATADIR%%/text.conf \ + %%DATADIR%%/vt.conf +PLIST_DIRS= %%DATADIR%% -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -liconv +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -liconv post-patch: - @${FIND} ${WRKSRC} -name "*.[1h]" -print0 | ${XARGS} -0 \ + @${FIND} -X ${WRKSRC} -type f -and -name "*.[1h]" | ${XARGS} \ ${REINPLACE_CMD} -e \ 's|/usr/local/lib/unrtf/|${DATADIR}/|g' +test: build + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} check) + .include diff -ruN unrtf.orig/distinfo unrtf/distinfo --- unrtf.orig/distinfo 2010-01-20 21:16:10.000000000 -0500 +++ unrtf/distinfo 2010-01-20 17:51:15.000000000 -0500 @@ -1,3 +1,3 @@ -MD5 (unrtf-0.21.0.tar.gz) = 8d1f8617d6813308c310f111145c7cb9 -SHA256 (unrtf-0.21.0.tar.gz) = 3be1b49b7d3b1f7d915cf1821d2916444c45034a3a79dd46dbb4fc0453ca97f0 -SIZE (unrtf-0.21.0.tar.gz) = 626157 +MD5 (unrtf-0.21.1.tar.gz) = ce069646837d0a2c15b439a5529afde8 +SHA256 (unrtf-0.21.1.tar.gz) = f0db720484c3d371e3448f9ab35f9c158a0488a9f38181780b8a755fde28a53d +SIZE (unrtf-0.21.1.tar.gz) = 609261 diff -ruN unrtf.orig/files/patch-src-my_iconv.c unrtf/files/patch-src-my_iconv.c --- unrtf.orig/files/patch-src-my_iconv.c 2010-01-20 21:16:10.000000000 -0500 +++ unrtf/files/patch-src-my_iconv.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,11 +0,0 @@ -diff -ruN src.old/my_iconv.c src/my_iconv.c ---- src.old/my_iconv.c 2009-08-10 14:02:54.000000000 +0600 -+++ src/my_iconv.c 2009-08-10 14:03:26.000000000 +0600 -@@ -10,6 +10,7 @@ - #include "malloc.h" - #include "my_iconv.h" - #include "util.h" -+#include "unicode.h" - - my_iconv_t - my_iconv_open(const char *tocode, const char *fromcode) diff -ruN unrtf.orig/files/patch-tests__Makefile.in unrtf/files/patch-tests__Makefile.in --- unrtf.orig/files/patch-tests__Makefile.in 1969-12-31 19:00:00.000000000 -0500 +++ unrtf/files/patch-tests__Makefile.in 2010-01-20 21:14:14.000000000 -0500 @@ -0,0 +1,11 @@ +--- tests/Makefile.in.orig 2010-01-20 21:04:39.000000000 -0500 ++++ tests/Makefile.in 2010-01-20 21:04:14.000000000 -0500 +@@ -208,7 +208,7 @@ + + # add the test scripts and the test data to the distributed files + EXTRA_DIST = $(TESTS) $(testdata) +-TESTS_ENVIRONMENT = UNRTF=$(top_builddir)/src/unrtf ++TESTS_ENVIRONMENT = UNRTF="$(top_builddir)/src/unrtf -P $(top_builddir)/outputs:$(top_builddir)/charmaps" + all: all-am + + .SUFFIXES: >Release-Note: >Audit-Trail: >Unformatted: