Attachment 103159 Details for Bug 143044 – file.diff

[patch] file.diff

file.diff (text/plain), 3.29 KB, created by bf on 2010-01-21 02:50:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bf

Created: 2010-01-21 02:50:08 UTC

Size: 3.29 KB

patch

obsolete

>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 <bsd.port.mk>
>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:

Actions: View | Diff

Attachments on bug 143044: 103159