Update to colordiff 1.0.18.

The default config now uses red and green for - and + lines, which is
something :)

OK?

Index: Makefile
===================================================================
RCS file: /home/edd/source/OpenBSD-CVS/ports/devel/colordiff/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile    29 Apr 2015 12:03:20 -0000      1.5
+++ Makefile    27 Oct 2017 18:48:21 -0000
@@ -1,8 +1,7 @@
 # $OpenBSD: Makefile,v 1.5 2015/04/29 12:03:20 ajacoutot Exp $
 
 COMMENT =              colorized diff tool
-DISTNAME =             colordiff-1.0.13
-REVISION =             1
+DISTNAME =             colordiff-1.0.18
 CATEGORIES =           devel
 HOMEPAGE =             http://www.colordiff.org/
 MAINTAINER =           Edd Barrett <[email protected]>
@@ -18,8 +17,9 @@ MODULES =             perl
 NO_BUILD =             Yes
 NO_TEST =              Yes
 
-pre-configure:
-       ${SUBST_CMD} ${WRKSRC}/Makefile
+MAKE_ENV +=            INSTALL_DIR=${PREFIX}/bin \
+                       MAN_DIR=${PREFIX}/man/man1 \
+                       ETC_DIR=${SYSCONFDIR}
 
 EXAMPLES_DIR =         ${PREFIX}/share/examples/colordiff
 post-install:
Index: distinfo
===================================================================
RCS file: /home/edd/source/OpenBSD-CVS/ports/devel/colordiff/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    18 Aug 2014 17:32:40 -0000      1.1.1.1
+++ distinfo    27 Oct 2017 18:48:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (colordiff-1.0.13.tar.gz) = zigFoTDIFUVxHflLwAqTVF2j8yPYNcw4tFLTOW74bCo=
-SIZE (colordiff-1.0.13.tar.gz) = 19960
+SHA256 (colordiff-1.0.18.tar.gz) = Kc/s2IVNbhnJYYLuE3BrhGIteyVgd98Z+9alRSww1uA=
+SIZE (colordiff-1.0.18.tar.gz) = 21695
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile      18 Aug 2014 17:32:40 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2014/08/18 17:32:40 edd Exp $
---- Makefile.orig      Wed Oct 17 21:14:35 2012
-+++ Makefile   Sun Aug 17 21:37:32 2014
-@@ -1,6 +1,6 @@
--INSTALL_DIR=/usr/local/bin
--MAN_DIR=/usr/local/man/man1
--ETC_DIR=/etc
-+INSTALL_DIR=${TRUEPREFIX}/bin
-+MAN_DIR=${TRUEPREFIX}/man/man1
-+ETC_DIR=${SYSCONFDIR}
- VERSION=$(shell egrep '^my .version' colordiff.pl |cut -f 2 -d "'")
- DIST_FILES=COPYING INSTALL Makefile README \
-       colordiff.pl colordiffrc colordiffrc-lightbg cdiff.sh BUGS CHANGES 
colordiff.1 \
-@@ -27,8 +27,8 @@ install:
-       if [ ! -f ${DESTDIR}${INSTALL_DIR}/cdiff ] ; then \
-         install cdiff.sh ${DESTDIR}${INSTALL_DIR}/cdiff; \
-       fi
--      install -Dm 644 colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
--      install -Dm 644 cdiff.1 ${DESTDIR}${MAN_DIR}/cdiff.1
-+      install -m 644 colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
-+      install -m 644 cdiff.1 ${DESTDIR}${MAN_DIR}/cdiff.1
-       if [ -f ${DESTDIR}${ETC_DIR}/colordiffrc ]; then \
-         mv -f ${DESTDIR}${ETC_DIR}/colordiffrc \
-           ${DESTDIR}${ETC_DIR}/colordiffrc.old; \
-@@ -36,7 +36,7 @@ install:
-         install -d ${DESTDIR}${ETC_DIR}; \
-       fi
-       cp colordiffrc ${DESTDIR}${ETC_DIR}/colordiffrc
--      -chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc
-+      -chown root.wheel ${DESTDIR}${ETC_DIR}/colordiffrc
-       chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc
- 
- uninstall:
Index: patches/patch-cdiff_sh
===================================================================
RCS file: 
/home/edd/source/OpenBSD-CVS/ports/devel/colordiff/patches/patch-cdiff_sh,v
retrieving revision 1.1
diff -u -p -r1.1 patch-cdiff_sh
--- patches/patch-cdiff_sh      18 Aug 2014 19:28:50 -0000      1.1
+++ patches/patch-cdiff_sh      27 Oct 2017 18:48:21 -0000
@@ -1,17 +1,18 @@
-$OpenBSD: patch-cdiff_sh,v 1.1 2014/08/18 19:28:50 jca Exp $
+$OpenBSD$
 
 Use ftp(1) instead of tools from the ports tree.
 
---- cdiff.sh.orig      Wed Oct 17 22:14:35 2012
-+++ cdiff.sh   Mon Aug 18 20:53:33 2014
+Index: cdiff.sh
+--- cdiff.sh.orig
++++ cdiff.sh
 @@ -30,7 +30,9 @@
          case `echo "$file" | perl -ne 'print lc $_'` in
          http:*|https:*|ftp:*)
              if [ -z "$CDIFF_FETCH" ]; then
--                if which curl >/dev/null 2>&1; then
-+                if which ftp >/dev/null 2>&1; then
+-                if type curl >/dev/null 2>&1; then
++                if type ftp >/dev/null 2>&1; then
 +                    CDIFF_FETCH="ftp -V -o -"
-+                elif which curl >/dev/null 2>&1; then
++                elif type curl >/dev/null 2>&1; then
                      CDIFF_FETCH="curl -s"
-                 elif which wget >/dev/null 2>&1; then
+                 elif type wget >/dev/null 2>&1; then
                      CDIFF_FETCH="wget -e timestamping=off -qO -"
Index: pkg/PLIST
===================================================================
RCS file: /home/edd/source/OpenBSD-CVS/ports/devel/colordiff/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   29 Apr 2015 12:03:20 -0000      1.2
+++ pkg/PLIST   27 Oct 2017 18:48:21 -0000
@@ -7,4 +7,5 @@ bin/colordiff
 share/examples/colordiff/
 share/examples/colordiff/colordiffrc
 @sample ${SYSCONFDIR}/colordiffrc
+share/examples/colordiff/colordiffrc-gitdiff
 share/examples/colordiff/colordiffrc-lightbg

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Reply via email to