- Update to version 1.0.0 New file: files/patch-GNUmakefile files/patch-config.h.in
State Changed From-To: open->feedback
Hello, Could you please approve this patch: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/57359 Edwin -- Edwin Groothuis edwin@freebsd.org http://www.mavetju.org
Here is an up-to-date patch. diff -urN /usr/ports/textproc/wv/Makefile textproc/wv/Makefile --- /usr/ports/textproc/wv/Makefile Tue Nov 4 11:20:23 2003 +++ textproc/wv/Makefile Mon Nov 10 21:58:46 2003 @@ -6,7 +6,7 @@ # PORTNAME= wv -PORTVERSION= 0.7.6 +PORTVERSION= 1.0.0 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= wvware @@ -18,13 +18,11 @@ RUN_DEPENDS= lynx:${PORTSDIR}/www/lynx USE_GETOPT_LONG= yes -USE_REINPLACE= yes +USE_GNOME= gnometarget pkgconfig USE_GMAKE= yes USE_LIBTOOL= yes -LIBTOOLFLAGS= --disable-ltlibs --release-ignore -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --with-exporter --without-glib +CONFIGURE_ARGS= --with-exporter --without-glib --with-libwmf=${LOCALBASE} MAKEFILE= GNUmakefile INSTALLS_SHLIB= yes @@ -34,8 +32,5 @@ CPPFLAGS= -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib - -post-patch: - @${REINPLACE_CMD} -e '/HAVE_MALLOC_H/d' ${WRKSRC}/config.h.in .include <bsd.port.mk> diff -urN /usr/ports/textproc/wv/distinfo textproc/wv/distinfo --- /usr/ports/textproc/wv/distinfo Sat Jul 12 12:27:57 2003 +++ textproc/wv/distinfo Sun Sep 14 17:30:03 2003 @@ -1 +1 @@ -MD5 (wv-0.7.6.tar.gz) = 28c46d6676e0fce6a19e3cb730b04556 +MD5 (wv-1.0.0.tar.gz) = 5e9675a8676cb1c1f6b8ab05af883178 diff -urN /usr/ports/textproc/wv/files/patch-GNUmakefile.in textproc/wv/files/patch-GNUmakefile.in --- /usr/ports/textproc/wv/files/patch-GNUmakefile.in Thu Jan 1 09:00:00 1970 +++ textproc/wv/files/patch-GNUmakefile.in Sun Sep 14 18:13:08 2003 @@ -0,0 +1,11 @@ +--- GNUmakefile.in.orig Sat Sep 13 09:37:27 2003 ++++ GNUmakefile.in Sun Sep 14 18:12:59 2003 +@@ -281,7 +281,7 @@ + + OTHERSCRIPTS = wvMime + +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + + pkgconfig_DATA = wv-1.0.pc + diff -urN /usr/ports/textproc/wv/files/patch-config.h.in textproc/wv/files/patch-config.h.in --- /usr/ports/textproc/wv/files/patch-config.h.in Thu Jan 1 09:00:00 1970 +++ textproc/wv/files/patch-config.h.in Sun Sep 14 18:13:59 2003 @@ -0,0 +1,12 @@ +--- config.h.in.orig Sat Sep 13 09:37:53 2003 ++++ config.h.in Sun Sep 14 18:13:35 2003 +@@ -38,9 +38,6 @@ + /* Define if you have libxml2 */ + #undef HAVE_LIBXML2 + +-/* Define to 1 if you have the <malloc.h> header file. */ +-#undef HAVE_MALLOC_H +- + /* Define to 1 if you have the `memcpy' function. */ + #undef HAVE_MEMCPY + diff -urN /usr/ports/textproc/wv/pkg-plist textproc/wv/pkg-plist --- /usr/ports/textproc/wv/pkg-plist Sat Jul 12 12:27:58 2003 +++ textproc/wv/pkg-plist Sun Sep 14 18:25:06 2003 @@ -1,4 +1,3 @@ -bin/libwv-config bin/wvAbw bin/wvCleanLatex bin/wvConvert @@ -15,11 +14,14 @@ bin/wvVersion bin/wvWare bin/wvWml -include/wv.h -include/wvexporter.h +include/wv/libole2/ms-ole-summary.h +include/wv/libole2/ms-ole.h +include/wv/wv.h +include/wv/wvexporter.h lib/libwv.a lib/libwv.so -lib/libwv.so.6 +lib/libwv-1.0.so.0 +libdata/pkgconfig/wv-1.0.pc share/wv/patterns/100.gif share/wv/patterns/101.gif share/wv/patterns/102.gif @@ -471,3 +473,5 @@ @dirrm share/wv/wingdingfont @dirrm share/wv/patterns @dirrm share/wv +@dirrm include/wv/libole2 +@dirrm include/wv
State Changed From-To: feedback->closed Committed, thanks!