An updated version of wdiff with gettext support
and some improvements.
Comments ? Ok ?
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/wdiff/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 7 Dec 2004 00:23:24 -0000 1.17
+++ Makefile 9 Sep 2007 17:20:37 -0000
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.17 2004/12/07 00:23:24 alek Exp $
-COMMENT= "word differences between text files"
+COMMENT= word differences between text files
-DISTNAME= wdiff-0.5
+DISTNAME= wdiff-0.5g
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GNU:=wdiff/}
+MASTER_SITES= http://wdiff.progiciels-bpi.ca/archives/
# License: GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -13,6 +13,13 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c termcap
+MODULES= gettext
CONFIGURE_STYLE=gnu dest old
+CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS= --without-included-gettext
+USE_GMAKE= Yes
+FAKE_FLAGS= DESTDIR=${WRKINST} \
+ PREFIX=${PREFIX}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/wdiff/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 5 Apr 2007 17:26:20 -0000 1.3
+++ distinfo 9 Sep 2007 17:20:37 -0000
@@ -1,5 +1,5 @@
-MD5 (wdiff-0.5.tar.gz) = f5x49d1vtPPavij71NFDGQ==
-RMD160 (wdiff-0.5.tar.gz) = ezE8+souw3WQSIiLvboL4c2IpeE=
-SHA1 (wdiff-0.5.tar.gz) = ROGIUOFlGGMxOc8kqDFl5i47qpU=
-SHA256 (wdiff-0.5.tar.gz) = 7P2nShfRLISHOheUOw86UJrAEsw1cIhkRipTgKjStCg=
-SIZE (wdiff-0.5.tar.gz) = 129267
+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
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/wdiff/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 23 Dec 2002 09:09:12 -0000 1.1
+++ patches/patch-Makefile_in 9 Sep 2007 17:20:37 -0000
@@ -1,12 +1,14 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2002/12/23 09:09:12 pvalchev Exp $
---- Makefile.in.orig Sun Nov 6 00:45:13 1994
-+++ Makefile.in Mon Dec 23 02:06:10 2002
-@@ -129,7 +129,7 @@ getopt.o getopt1.o: getopt.h
- check: wdiff
- $(srcdir)/check_it
+$OpenBSD$
+--- 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}
--install: all
-+install: all install-man
- $(srcdir)/mkinstalldirs $(bindir) $(infodir)
- for name in $(PROGRAMS); do \
- $(INSTALL_PROGRAM) $$name \
+ bindir = @bindir@
+ sbindir = @sbindir@
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/textproc/wdiff/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- patches/patch-configure 23 Dec 2002 09:09:12 -0000 1.1
+++ patches/patch-configure 9 Sep 2007 17:20:37 -0000
@@ -1,11 +1,21 @@
-$OpenBSD: patch-configure,v 1.1 2002/12/23 09:09:12 pvalchev Exp $
---- configure.orig Sun Nov 6 00:59:26 1994
-+++ configure Mon Dec 23 02:06:10 2002
-@@ -1159,6 +1159,7 @@ EOF
+$OpenBSD$
+--- 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
-
-
-+LIBS="$saved_LIBS -ltermcap"
- for ac_func in strerror tputs
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
+ 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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_Makefile_in 9 Sep 2007 17:20:37 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- 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-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile_in 9 Sep 2007 17:20:37 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/Makefile.in.orig Sat Sep 8 15:54:25 2007
++++ src/Makefile.in Sat Sep 8 15:54:54 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: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/wdiff/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 15 Sep 2004 18:44:08 -0000 1.4
+++ pkg/PLIST 9 Sep 2007 17:20:37 -0000
@@ -1,4 +1,16 @@
@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:44:08 espie Exp $
+bin/unify
bin/wdiff
@info info/wdiff.info
[EMAIL PROTECTED] man/man1/mdiff.1
[EMAIL PROTECTED] man/man1/unify.1
@man man/man1/wdiff.1
+share/locale/cs/LC_MESSAGES/wdiff.mo
+share/locale/de/LC_MESSAGES/wdiff.mo
+share/locale/es/LC_MESSAGES/wdiff.mo
+share/locale/fr/LC_MESSAGES/wdiff.mo
+share/locale/nl/LC_MESSAGES/wdiff.mo
+share/locale/no/LC_MESSAGES/wdiff.mo
+share/locale/pl/LC_MESSAGES/wdiff.mo
+share/locale/ru/LC_MESSAGES/wdiff.mo
+share/locale/sv/LC_MESSAGES/wdiff.mo
