CVS commit: pkgsrc/textproc/dwdiff

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Jun  5 12:43:54 UTC 2020

Added Files:
        pkgsrc/textproc/dwdiff: DESCR Makefile PLIST distinfo
        pkgsrc/textproc/dwdiff/patches: patch-config.pkg

Log Message:
textproc/dwdiff: import dwdiff-2.1.2

dwdiff is a diff program that operates at the word level instead of the line
level. It is different from wdiff in that it allows the user to specify what
should be considered whitespace, and in that it takes an optional list of
characters that should be considered delimiters. Delimiters are single
characters that are treated as if they are words, even when there is no
whitespace separating them from preceding words or delimiters. dwdiff is mostly
commandline compatible with wdiff. Only the --autopager, --terminal and
--avoid-wraps options are not supported.

The default output from dwdiff is the new text, with the deleted and inserted
parts annotated with markers. Command line options are available to change
both what is printed, and the markers.

dwdiff is licensed under the GNU General Public License version 3. See the file
COPYING for details.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/dwdiff/DESCR \
    pkgsrc/textproc/dwdiff/Makefile pkgsrc/textproc/dwdiff/PLIST \
    pkgsrc/textproc/dwdiff/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/dwdiff/patches/patch-config.pkg

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/textproc/dwdiff/DESCR
diff -u /dev/null pkgsrc/textproc/dwdiff/DESCR:1.1
--- /dev/null   Fri Jun  5 12:43:54 2020
+++ pkgsrc/textproc/dwdiff/DESCR        Fri Jun  5 12:43:53 2020
@@ -0,0 +1,16 @@
+
+dwdiff is a diff program that operates at the word level instead of the line
+level. It is different from wdiff in that it allows the user to specify what
+should be considered whitespace, and in that it takes an optional list of
+characters that should be considered delimiters. Delimiters are single
+characters that are treated as if they are words, even when there is no
+whitespace separating them from preceding words or delimiters. dwdiff is mostly
+commandline compatible with wdiff. Only the --autopager, --terminal and
+--avoid-wraps options are not supported.
+
+The default output from dwdiff is the new text, with the deleted and inserted
+parts annotated with markers. Command line options are available to change
+both what is printed, and the markers.
+
+dwdiff is licensed under the GNU General Public License version 3. See the file
+COPYING for details.
Index: pkgsrc/textproc/dwdiff/Makefile
diff -u /dev/null pkgsrc/textproc/dwdiff/Makefile:1.1
--- /dev/null   Fri Jun  5 12:43:54 2020
+++ pkgsrc/textproc/dwdiff/Makefile     Fri Jun  5 12:43:53 2020
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2020/06/05 12:43:53 ryoon Exp $
+
+DISTNAME=      dwdiff-2.1.2
+CATEGORIES=    textproc
+MASTER_SITES=  https://os.ghalkes.nl/dist/
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    ryoon%NetBSD.org@localhost
+HOMEPAGE=      https://os.ghalkes.nl/dwdiff.html
+COMMENT=       Word level diff program
+LICENSE=       gnu-gpl-v3
+
+GNU_CONFIGURE=         yes
+USE_PKGLOCALEDIR=      yes
+MAKE_FLAGS+=           mandir=${PREFIX}/${PKGMANDIR}
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/dwdiff/PLIST
diff -u /dev/null pkgsrc/textproc/dwdiff/PLIST:1.1
--- /dev/null   Fri Jun  5 12:43:54 2020
+++ pkgsrc/textproc/dwdiff/PLIST        Fri Jun  5 12:43:53 2020
@@ -0,0 +1,16 @@
+@comment $NetBSD: PLIST,v 1.1 2020/06/05 12:43:53 ryoon Exp $
+bin/dwdiff
+bin/dwfilter
+man/man1/dwdiff.1
+man/man1/dwfilter.1
+man/nl.UTF-8/man1/dwdiff.1
+man/nl.UTF-8/man1/dwfilter.1
+man/nl/man1/dwdiff.1
+man/nl/man1/dwfilter.1
+share/doc/${PKGNAME}/COPYING
+share/doc/${PKGNAME}/Changelog
+share/doc/${PKGNAME}/README
+share/locale/de/LC_MESSAGES/dwdiff.mo
+share/locale/es/LC_MESSAGES/dwdiff.mo
+share/locale/fr/LC_MESSAGES/dwdiff.mo
+share/locale/nl/LC_MESSAGES/dwdiff.mo
Index: pkgsrc/textproc/dwdiff/distinfo
diff -u /dev/null pkgsrc/textproc/dwdiff/distinfo:1.1
--- /dev/null   Fri Jun  5 12:43:54 2020
+++ pkgsrc/textproc/dwdiff/distinfo     Fri Jun  5 12:43:53 2020
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2020/06/05 12:43:53 ryoon Exp $
+
+SHA1 (dwdiff-2.1.2.tar.bz2) = f44d63d95e4df7e8acfeb57473552c0c15ca5a3b
+RMD160 (dwdiff-2.1.2.tar.bz2) = 4fdb32536a86a4c08c5a01c1f83b62ad62bce091
+SHA512 (dwdiff-2.1.2.tar.bz2) = e4897ec3990261ddadf1fd4287902dd74c8350d11448714be8ea4b7808fc7d419ca2fd7fe65f347f46fdb1090d2d116c180a53fde3ff095027765f40acaa1c91
+Size (dwdiff-2.1.2.tar.bz2) = 79282 bytes
+SHA1 (patch-config.pkg) = d65cabaf94ebd0283ccce54b7e982e2b3395b59d

Index: pkgsrc/textproc/dwdiff/patches/patch-config.pkg
diff -u /dev/null pkgsrc/textproc/dwdiff/patches/patch-config.pkg:1.1
--- /dev/null   Fri Jun  5 12:43:54 2020
+++ pkgsrc/textproc/dwdiff/patches/patch-config.pkg     Fri Jun  5 12:43:53 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-config.pkg,v 1.1 2020/06/05 12:43:53 ryoon Exp $
+
+* Fix libintl detection during configure.
+
+--- config.pkg.orig    2018-12-10 18:25:15.000000000 +0000
++++ config.pkg
+@@ -15,8 +15,8 @@ EXTENSIONS="c verbose_compile gettext"
+ 
+ SWITCHES="+unicode +dwfilter"
+ 
+-COMPILERULE='$(CC) $(CFLAGS) $(GETTEXTFLAGS) $(ICUFLAGS) -c -o $@ $<'
+-LINKRULE='$(CC) $(CFLAGS) $(LDFLAGS) -o .config .config.o $(LDLIBS) $(GETTEXTLIBS) $(ICULIBS)'
++COMPILERULE='$(CC) $(CFLAGS) $(GETTEXTFLAGS) $(ICUFLAGS) $(TESTLIBS) -c -o $@ $<'
++LINKRULE='$(CC) $(CFLAGS) $(LDFLAGS) -o .config .config.o $(LDLIBS) $(GETTEXTLIBS) $(ICULIBS) $(TESTLIBS)'
+ 
+ DEFAULT_LINGUAS="de es fr nl"
+ [ -f config.pkg.langpack ] && . config.pkg.langpack