From 60cd29afbb95f51762adf20b2783dd37436f82fa Mon Sep 17 00:00:00 2001 From: jasper Date: Sun, 21 Aug 2011 16:41:07 +0000 Subject: [PATCH] - update to latest version 0.6.5 * this removes the experimental unify(1) program; in case anyone was using this it can be added back if needed. - clarify license - remove groff (manpage checked) - remove now unnecessary patches, CONFIGURE_ENV etc. from pascal stumpf --- textproc/wdiff/Makefile | 16 ++--- textproc/wdiff/distinfo | 10 +-- textproc/wdiff/patches/patch-Makefile_in | 14 ---- textproc/wdiff/patches/patch-configure | 21 ------ textproc/wdiff/patches/patch-doc_Makefile_in | 12 ---- textproc/wdiff/patches/patch-lib_Makefile_in | 16 +++++ textproc/wdiff/patches/patch-src_Makefile_in | 23 ------ textproc/wdiff/pkg/PLIST | 73 ++++++++++++++++++-- 8 files changed, 95 insertions(+), 90 deletions(-) delete mode 100644 textproc/wdiff/patches/patch-Makefile_in delete mode 100644 textproc/wdiff/patches/patch-configure delete mode 100644 textproc/wdiff/patches/patch-doc_Makefile_in create mode 100644 textproc/wdiff/patches/patch-lib_Makefile_in delete mode 100644 textproc/wdiff/patches/patch-src_Makefile_in diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile index b6c8734338e..0460b25169c 100644 --- a/textproc/wdiff/Makefile +++ b/textproc/wdiff/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.24 2010/11/20 19:56:52 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2011/08/21 16:41:07 jasper Exp $ 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 diff --git a/textproc/wdiff/distinfo b/textproc/wdiff/distinfo index 6da8a80aa82..b4b91368c54 100644 --- a/textproc/wdiff/distinfo +++ b/textproc/wdiff/distinfo @@ -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 diff --git a/textproc/wdiff/patches/patch-Makefile_in b/textproc/wdiff/patches/patch-Makefile_in deleted file mode 100644 index 540fd26096b..00000000000 --- a/textproc/wdiff/patches/patch-Makefile_in +++ /dev/null @@ -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@ diff --git a/textproc/wdiff/patches/patch-configure b/textproc/wdiff/patches/patch-configure deleted file mode 100644 index 530a844897f..00000000000 --- a/textproc/wdiff/patches/patch-configure +++ /dev/null @@ -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 <&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 diff --git a/textproc/wdiff/patches/patch-doc_Makefile_in b/textproc/wdiff/patches/patch-doc_Makefile_in deleted file mode 100644 index 000dbf3c312..00000000000 --- a/textproc/wdiff/patches/patch-doc_Makefile_in +++ /dev/null @@ -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@ diff --git a/textproc/wdiff/patches/patch-lib_Makefile_in b/textproc/wdiff/patches/patch-lib_Makefile_in new file mode 100644 index 00000000000..6a1131da44c --- /dev/null +++ b/textproc/wdiff/patches/patch-lib_Makefile_in @@ -0,0 +1,16 @@ +$OpenBSD: patch-lib_Makefile_in,v 1.1 2011/08/21 16:41:07 jasper Exp $ + +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 ;; \ diff --git a/textproc/wdiff/patches/patch-src_Makefile_in b/textproc/wdiff/patches/patch-src_Makefile_in deleted file mode 100644 index 88b0928d817..00000000000 --- a/textproc/wdiff/patches/patch-src_Makefile_in +++ /dev/null @@ -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 - diff --git a/textproc/wdiff/pkg/PLIST b/textproc/wdiff/pkg/PLIST index 5d5517e6689..01d7be24d94 100644 --- a/textproc/wdiff/pkg/PLIST +++ b/textproc/wdiff/pkg/PLIST @@ -1,15 +1,78 @@ -@comment $OpenBSD: PLIST,v 1.5 2007/11/24 14:46:29 simon Exp $ -bin/unify -bin/wdiff +@comment $OpenBSD: PLIST,v 1.6 2011/08/21 16:41:07 jasper Exp $ +@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