CVS commit: pkgsrc/textproc/xxdiff

["Brian Ginsbach" <ginsbach%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ginsbach
Date:           Sun Mar 11 20:52:38 UTC 2018

Added Files:
        pkgsrc/textproc/xxdiff: DESCR Makefile Makefile.common PLIST distinfo

Log Message:
textproc/xxdiff: add xxdiff-4.0.1

xxdiff is a graphical file and directories comparator and merge tool.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/xxdiff/DESCR \
    pkgsrc/textproc/xxdiff/Makefile pkgsrc/textproc/xxdiff/Makefile.common \
    pkgsrc/textproc/xxdiff/PLIST pkgsrc/textproc/xxdiff/distinfo

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

Added files:

Index: pkgsrc/textproc/xxdiff/DESCR
diff -u /dev/null pkgsrc/textproc/xxdiff/DESCR:1.1
--- /dev/null   Sun Mar 11 20:52:38 2018
+++ pkgsrc/textproc/xxdiff/DESCR        Sun Mar 11 20:52:38 2018
@@ -0,0 +1,23 @@
+xxdiff is a graphical file and directories comparator and merge tool.
+
+Features
+
+ * Comparing two files, three files, or two directories (shallow and
+   recursive);
+ * Horizontal diffs highlighting; Files can be merged interactively and
+ * resulting output visualized and saved;
+ * Has features to assist in performing merge reviews/policing; Can
+ * unmerge CVS conflicts in automatically merged file and display
+   them as two files, to help resolve conflicts;
+ * Uses external diff program to compute differences: works with GNU
+   diff, SGI diff and ClearCase's cleardiff, and any other diff whose
+   output is similar to those;
+ * Fully customizable with a resource file; Look-and-feel similar to
+ * Rudy Wortel's/SGI xdiff, it is desktop agnostic (i.e. will work
+   equally well with KDE or Gnome);
+ * Features and output that ease integration with scripts.
+
+xxdiff does not support comparing files encoded with Unicode. Also, it
+does not support inline editing of the diffed files. If you need these
+features, you could try emacs or Meld (although both of these lack some
+of the most interesting features of xxdiff).
Index: pkgsrc/textproc/xxdiff/Makefile
diff -u /dev/null pkgsrc/textproc/xxdiff/Makefile:1.1
--- /dev/null   Sun Mar 11 20:52:38 2018
+++ pkgsrc/textproc/xxdiff/Makefile     Sun Mar 11 20:52:38 2018
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.1 2018/03/11 20:52:38 ginsbach Exp $
+
+.include "../../textproc/xxdiff/Makefile.common"
+
+COMMENT=       Graphical file comparator and merge tool
+
+USE_LANGUAGES= c c++
+USE_TOOLS+=    bison flex gmake
+
+HAS_CONFIGURE= yes
+CONFIG_SHELL=  # empty
+CONFIGURE_DIRS=        src
+CONFIGURE_SCRIPT= ${MAKE_PROGRAM}
+CONFIGURE_ARGS=        -f Makefile.bootstrap
+
+BUILD_DIRS=    src
+BUILD_TARGET=  doc.h all
+
+INSTALLATION_DIRS+=    bin ${XXDIFFDOCDIR} ${PKGMANDIR}/man1
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/bin/xxdiff ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/src/xxdiff.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_DATA} ${WRKSRC}/doc/xxdiff-doc.html ${DESTDIR}${PREFIX}/${XXDIFFDOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/doc/xxdiff-integration.html ${DESTDIR}${PREFIX}/${XXDIFFDOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/doc/xxdiff-secrets.html ${DESTDIR}${PREFIX}/${XXDIFFDOCDIR}
+
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/xxdiff/Makefile.common
diff -u /dev/null pkgsrc/textproc/xxdiff/Makefile.common:1.1
--- /dev/null   Sun Mar 11 20:52:38 2018
+++ pkgsrc/textproc/xxdiff/Makefile.common      Sun Mar 11 20:52:38 2018
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile.common,v 1.1 2018/03/11 20:52:38 ginsbach Exp $
+# used by textproc/xxdiff/Makefile
+# used by textproc/xxdiff-scripts/Makefile
+
+
+XXDIFFVERSION= 4.0.1
+DISTNAME=      xxdiff-${XXDIFFVERSION}
+CATEGORIES=    textproc
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xxdiff/}
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://furius.ca/xxdiff/
+LICENSE=       gnu-gpl-v2
+
+DISTINFO_FILE= ${.CURDIR}/../../textproc/xxdiff/distinfo
+
+XXDIFFDOCDIR=  share/doc/xxdiff
Index: pkgsrc/textproc/xxdiff/PLIST
diff -u /dev/null pkgsrc/textproc/xxdiff/PLIST:1.1
--- /dev/null   Sun Mar 11 20:52:38 2018
+++ pkgsrc/textproc/xxdiff/PLIST        Sun Mar 11 20:52:38 2018
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2018/03/11 20:52:38 ginsbach Exp $
+bin/xxdiff
+man/man1/xxdiff.1
+share/doc/xxdiff/xxdiff-doc.html
+share/doc/xxdiff/xxdiff-integration.html
+share/doc/xxdiff/xxdiff-secrets.html
Index: pkgsrc/textproc/xxdiff/distinfo
diff -u /dev/null pkgsrc/textproc/xxdiff/distinfo:1.1
--- /dev/null   Sun Mar 11 20:52:38 2018
+++ pkgsrc/textproc/xxdiff/distinfo     Sun Mar 11 20:52:38 2018
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2018/03/11 20:52:38 ginsbach Exp $
+
+SHA1 (xxdiff-4.0.1.tar.bz2) = 560cd1ca8b947a9dca14938595905ef31ee18eee
+RMD160 (xxdiff-4.0.1.tar.bz2) = 1bd4a5bde100026e562d540f230c609f9b3c06cc
+SHA512 (xxdiff-4.0.1.tar.bz2) = bcc2b528a0ebf273677d74aa3a971feb9052a01a8187a5d8abe3bce744520a3fa61bd842a9d4ba465abbf00f6da62868a1f18adeb7d8eccee6f76df4a1e4db3a
+Size (xxdiff-4.0.1.tar.bz2) = 1981869 bytes