- update to latest version 0.6.5 - clarify license - remove groff (manpage checked) - remove now unnecessary patches, CONFIGURE_ENV etc.
Since the update removes unify(1), should we pass --enable-experimental to also get the mdiff, unify and wdiff2 programs? Does anyone need it? Index: Makefile =================================================================== RCS file: /cvs/ports/textproc/wdiff/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile 20 Nov 2010 19:56:52 -0000 1.24 +++ Makefile 21 Aug 2011 15:03:08 -0000 @@ -2,11 +2,11 @@ COMMENT= word differences between text files -DISTNAME= wdiff-0.5g +DISTNAME= wdiff-0.6.5 CATEGORIES= textproc -MASTER_SITES= http://distfiles.nl/ +MASTER_SITES= ${MASTER_SITE_GNU:=wdiff/} -# License: GPL +# GPLv3+ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -14,12 +14,8 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c termcap MODULES= devel/gettext -CONFIGURE_STYLE=gnu dest old -CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \ - LDFLAGS=-L${LOCALBASE}/lib -CONFIGURE_ARGS= --without-included-gettext +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS= --prefix="${PREFIX}" USE_GMAKE= Yes -USE_GROFF = Yes -FAKE_FLAGS= PREFIX=${PREFIX} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/textproc/wdiff/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 24 Nov 2007 14:46:29 -0000 1.4 +++ distinfo 21 Aug 2011 15:03:08 -0000 @@ -1,5 +1,5 @@ -MD5 (wdiff-0.5g.tar.gz) = O5uOzSjHdZgkehRubmAi3g== -RMD160 (wdiff-0.5g.tar.gz) = LqvAk+Dn3GFdDGjuxKmTtCejk2M= -SHA1 (wdiff-0.5g.tar.gz) = 9h+KEkfUwASjK8Lz2Bg6xcz6shI= -SHA256 (wdiff-0.5g.tar.gz) = WDNfOMgwcgp35pL4czZ0A2EIAjLSgY0VQDV3bCXMyfE= -SIZE (wdiff-0.5g.tar.gz) = 377446 +MD5 (wdiff-0.6.5.tar.gz) = GCggmhTQGtOMcmeYXzZcvw== +RMD160 (wdiff-0.6.5.tar.gz) = rq1DZZyNg2gxjxsRRYJgeK7sNto= +SHA1 (wdiff-0.6.5.tar.gz) = ih1ddvf6qZmlVzYZufPwp3EeHQg= +SHA256 (wdiff-0.6.5.tar.gz) = VYdWlvX1SBA7gxjPgr3XmqUY8kQ6FnfjD7GSaCE5Mro= +SIZE (wdiff-0.6.5.tar.gz) = 1232434 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- patches/patch-Makefile_in 24 Nov 2007 14:46:29 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2007/11/24 14:46:29 simon Exp $ ---- Makefile.in.orig Sat Sep 8 15:49:56 2007 -+++ Makefile.in Sat Sep 8 15:55:05 2007 -@@ -34,8 +34,8 @@ SHELL = @SHELL@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -+prefix = ${PREFIX} -+exec_prefix = ${PREFIX} - - bindir = @bindir@ - sbindir = @sbindir@ Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 24 Nov 2007 14:46:29 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-configure,v 1.2 2007/11/24 14:46:29 simon Exp $ ---- configure.orig Fri Sep 7 19:47:52 2007 -+++ configure Fri Sep 7 19:58:26 2007 -@@ -2962,7 +2962,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lintl $LIBS" -+LIBS=" -lintl -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 2968 "configure" - #include "confdefs.h" -@@ -3008,7 +3008,7 @@ fi - - echo "$ac_t""$with_included_gettext" 1>&6 - if test $with_included_gettext$ac_cv_func_gettext = nono; then -- LIBS="$LIBS -lintl" -+ LIBS="$LIBS -lintl -liconv" - fi - else - with_included_gettext=yes Index: patches/patch-doc_Makefile_in =================================================================== RCS file: patches/patch-doc_Makefile_in diff -N patches/patch-doc_Makefile_in --- patches/patch-doc_Makefile_in 24 Nov 2007 14:46:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.1 2007/11/24 14:46:29 simon Exp $ ---- doc/Makefile.in.orig Sat Sep 8 16:29:38 2007 -+++ doc/Makefile.in Sat Sep 8 16:30:07 2007 -@@ -33,7 +33,7 @@ SHELL = @SHELL@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ -+prefix = ${PREFIX} - exec_prefix = @exec_prefix@ - - bindir = @bindir@ Index: patches/patch-lib_Makefile_in =================================================================== RCS file: patches/patch-lib_Makefile_in diff -N patches/patch-lib_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-lib_Makefile_in 21 Aug 2011 15:03:08 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Do not install charset.alias, which is already provided by +converters/libiconv + +--- lib/Makefile.in.orig Sun Aug 21 16:57:37 2011 ++++ lib/Makefile.in Sun Aug 21 16:58:08 2011 +@@ -1470,7 +1470,7 @@ install-exec-localcharset: all-local + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | mingw* | pw32* | cegcc* | openbsd*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ Index: patches/patch-src_Makefile_in =================================================================== RCS file: patches/patch-src_Makefile_in diff -N patches/patch-src_Makefile_in --- patches/patch-src_Makefile_in 24 Nov 2007 14:46:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.1 2007/11/24 14:46:29 simon Exp $ ---- src/Makefile.in.orig Tue Jul 6 02:42:50 1999 -+++ src/Makefile.in Mon Nov 12 09:00:51 2007 -@@ -34,8 +34,8 @@ SHELL = @SHELL@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -+prefix = ${PREFIX} -+exec_prefix = ${PREFIX} - - bindir = @bindir@ - sbindir = @sbindir@ -@@ -114,7 +114,7 @@ l = @l@ - - AUTOMAKE_OPTIONS = gnits ansi2knr - bin_PROGRAMS = unify wdiff --man_MANS = mdiff.1 unify.1 wdiff.1 -+man_MANS = unify.1 wdiff.1 - noinst_PROGRAMS = mdiff wdiff2 - noinst_SCRIPTS = cbars - Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/wdiff/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 24 Nov 2007 14:46:29 -0000 1.5 +++ pkg/PLIST 21 Aug 2011 15:03:08 -0000 @@ -1,15 +1,78 @@ @comment $OpenBSD: PLIST,v 1.5 2007/11/24 14:46:29 simon Exp $ -bin/unify -bin/wdiff +@bin bin/wdiff @info info/wdiff.info -@man man/man1/unify.1 @man man/man1/wdiff.1 +share/locale/af/ +share/locale/af/LC_MESSAGES/ +share/locale/af/LC_MESSAGES/wdiff-gnulib.mo +share/locale/be/LC_MESSAGES/wdiff-gnulib.mo +share/locale/bg/LC_MESSAGES/wdiff-gnulib.mo +share/locale/ca/LC_MESSAGES/wdiff-gnulib.mo +share/locale/ca/LC_MESSAGES/wdiff.mo +share/locale/cs/LC_MESSAGES/wdiff-gnulib.mo share/locale/cs/LC_MESSAGES/wdiff.mo +share/locale/da/LC_MESSAGES/wdiff-gnulib.mo +share/locale/da/LC_MESSAGES/wdiff.mo +share/locale/de/LC_MESSAGES/wdiff-gnulib.mo share/locale/de/LC_MESSAGES/wdiff.mo +share/locale/el/LC_MESSAGES/wdiff-gnulib.mo +share/locale/en@boldquot/LC_MESSAGES/wdiff.mo +share/locale/en@quot/LC_MESSAGES/wdiff.mo +share/locale/en_GB/ +share/locale/en_GB/LC_MESSAGES/ +share/locale/en_GB/LC_MESSAGES/wdiff.mo +share/locale/es/LC_MESSAGES/wdiff-gnulib.mo share/locale/es/LC_MESSAGES/wdiff.mo +share/locale/et/LC_MESSAGES/wdiff-gnulib.mo +share/locale/et/LC_MESSAGES/wdiff.mo +share/locale/eu/LC_MESSAGES/wdiff-gnulib.mo +share/locale/fi/LC_MESSAGES/wdiff-gnulib.mo +share/locale/fi/LC_MESSAGES/wdiff.mo +share/locale/fr/LC_MESSAGES/wdiff-gnulib.mo share/locale/fr/LC_MESSAGES/wdiff.mo +share/locale/ga/LC_MESSAGES/wdiff-gnulib.mo +share/locale/ga/LC_MESSAGES/wdiff.mo +share/locale/gl/LC_MESSAGES/wdiff-gnulib.mo +share/locale/gl/LC_MESSAGES/wdiff.mo +share/locale/hu/LC_MESSAGES/wdiff-gnulib.mo +share/locale/hu/LC_MESSAGES/wdiff.mo +share/locale/id/LC_MESSAGES/wdiff.mo +share/locale/it/LC_MESSAGES/wdiff-gnulib.mo +share/locale/it/LC_MESSAGES/wdiff.mo +share/locale/ja/LC_MESSAGES/wdiff-gnulib.mo +share/locale/ko/LC_MESSAGES/wdiff-gnulib.mo +share/locale/ms/ +share/locale/ms/LC_MESSAGES/ +share/locale/ms/LC_MESSAGES/wdiff-gnulib.mo +share/locale/ms/LC_MESSAGES/wdiff.mo +share/locale/nb/LC_MESSAGES/wdiff-gnulib.mo +share/locale/nb/LC_MESSAGES/wdiff.mo +share/locale/nl/LC_MESSAGES/wdiff-gnulib.mo share/locale/nl/LC_MESSAGES/wdiff.mo -share/locale/no/LC_MESSAGES/wdiff.mo +share/locale/pl/LC_MESSAGES/wdiff-gnulib.mo share/locale/pl/LC_MESSAGES/wdiff.mo +share/locale/pt/LC_MESSAGES/wdiff-gnulib.mo +share/locale/pt_BR/LC_MESSAGES/wdiff-gnulib.mo +share/locale/pt_BR/LC_MESSAGES/wdiff.mo +share/locale/ro/LC_MESSAGES/wdiff-gnulib.mo +share/locale/ro/LC_MESSAGES/wdiff.mo +share/locale/ru/LC_MESSAGES/wdiff-gnulib.mo share/locale/ru/LC_MESSAGES/wdiff.mo +share/locale/rw/ +share/locale/rw/LC_MESSAGES/ +share/locale/rw/LC_MESSAGES/wdiff-gnulib.mo +share/locale/sk/LC_MESSAGES/wdiff-gnulib.mo +share/locale/sk/LC_MESSAGES/wdiff.mo +share/locale/sl/LC_MESSAGES/wdiff-gnulib.mo +share/locale/sl/LC_MESSAGES/wdiff.mo +share/locale/sv/LC_MESSAGES/wdiff-gnulib.mo share/locale/sv/LC_MESSAGES/wdiff.mo +share/locale/tr/LC_MESSAGES/wdiff-gnulib.mo +share/locale/tr/LC_MESSAGES/wdiff.mo +share/locale/uk/LC_MESSAGES/wdiff-gnulib.mo +share/locale/vi/LC_MESSAGES/wdiff-gnulib.mo +share/locale/vi/LC_MESSAGES/wdiff.mo +share/locale/zh_CN/LC_MESSAGES/wdiff-gnulib.mo +share/locale/zh_CN/LC_MESSAGES/wdiff.mo +share/locale/zh_TW/LC_MESSAGES/wdiff-gnulib.mo +share/locale/zh_TW/LC_MESSAGES/wdiff.mo
