[49991] trunk/dports/textproc/colordiff

nox at macports.org nox at macports.org
Tue Apr 21 17:05:19 PDT 2009


Revision: 49991
          http://trac.macports.org/changeset/49991
Author:   nox at macports.org
Date:     2009-04-21 17:05:18 -0700 (Tue, 21 Apr 2009)
Log Message:
-----------
colordiff: Update to 1.0.9.

Modified Paths:
--------------
    trunk/dports/textproc/colordiff/Portfile
    trunk/dports/textproc/colordiff/files/patch-Makefile.diff

Modified: trunk/dports/textproc/colordiff/Portfile
===================================================================
--- trunk/dports/textproc/colordiff/Portfile	2009-04-21 23:54:39 UTC (rev 49990)
+++ trunk/dports/textproc/colordiff/Portfile	2009-04-22 00:05:18 UTC (rev 49991)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem      1.0
@@ -3,34 +4,33 @@
 
 name            colordiff
-version         1.0.7
-epoch           20070425
+version         1.0.9
+epoch           20090422
 categories      textproc
-maintainers     nox
+maintainers     nox openmaintainer
 description     Color-highlighted diff(1) output
 
 long_description \
     The Perl script colordiff is a wrapper for diff(1) \
-	and produces the same output but with pretty 'syntax' \
-	highlighting. Colour schemes can be customized.
+    and produces the same output but with pretty 'syntax' \
+    highlighting. Colour schemes can be customized.
 
 homepage        http://colordiff.sourceforge.net/
 platforms       darwin
 master_sites    ${homepage}
 
-checksums       md5 940d4d1c388e66d352bce0887a39a3c5 \
-                sha1 ecf5530e435d50a21c7aa77076c3d6cafdca1afa \
-                rmd160 141f9626c4f074460687ef38bcb46a528ea9bf49
+checksums       md5     31864847eaa4e900f72bbb6bbc64f1ec \
+                sha1    52aa37957660b8060b186b949de58790ba816ab8 \
+                rmd160  b736f01e4107f368a7d98468a17ff8d4cb53bdb9
 
 patchfiles      patch-Makefile.diff
 
 use_configure   no
 
-build.type      bsd
-build           {}
+build {}
 
-destroot.args   INSTALL_DIR=${prefix}/bin \
+destroot.args   --always-make \
+                INSTALL_DIR=${prefix}/bin \
                 MAN_DIR=${prefix}/share/man/man1 \
-                ETC_DIR=${prefix}/etc \
-                DESTROOT_DIR=${destroot}
+                ETC_DIR=${prefix}/etc
 
 post-destroot {
@@ -44,4 +44,3 @@
 
 livecheck.check regex
 livecheck.regex {<h4>.*version ([^ ]*).*</h4>}
-

Modified: trunk/dports/textproc/colordiff/files/patch-Makefile.diff
===================================================================
--- trunk/dports/textproc/colordiff/files/patch-Makefile.diff	2009-04-21 23:54:39 UTC (rev 49990)
+++ trunk/dports/textproc/colordiff/files/patch-Makefile.diff	2009-04-22 00:05:18 UTC (rev 49991)
@@ -1,48 +1,13 @@
---- Makefile.orig	2007-08-19 15:19:46.000000000 +0200
-+++ Makefile	2007-11-08 14:38:50.000000000 +0100
-@@ -1,6 +1,15 @@
- INSTALL_DIR=/usr/local/bin
- MAN_DIR=/usr/local/man/man1
- ETC_DIR=/etc
-+.ifdef DESTROOT_DIR
-+TARGET_INSTALL_DIR=$(DESTROOT_DIR)$(INSTALL_DIR)
-+TARGET_MAN_DIR=$(DESTROOT_DIR)$(MAN_DIR)
-+TARGET_ETC_DIR=$(DESTROOT_DIR)$(ETC_DIR)
-+.else
-+TARGET_INSTALL_DIR=$(INSTALL_DIR)
-+TARGET_MAN_DIR=$(MAN_DIR)
-+TARGET_ETC_DIR=$(ETC_DIR)
-+.endif
- VERSION=1.0.7
- DIST_FILES=COPYING INSTALL Makefile README \
- 	colordiff.pl colordiffrc colordiffrc-lightbg cdiff.sh BUGS TODO CHANGES colordiff.1 \
-@@ -22,20 +31,19 @@
- 
- etc:
- 	sed -e "s%/etc%$(ETC_DIR)%g" colordiff.pl > colordiff.pl.for.install
-+	sed -e "s%/etc%$(ETC_DIR)%g" colordiff.1 > colordiff.1.for.install
- 
- install: etc
--	install -D colordiff.pl.for.install ${INSTALL_DIR}/colordiff
--	if [ ! -f ${INSTALL_DIR}/cdiff ] ; then \
--	  install cdiff.sh ${INSTALL_DIR}/cdiff; \
-+	install colordiff.pl.for.install $(TARGET_INSTALL_DIR)/colordiff
-+	if [ ! -f $(TARGET_INSTALL_DIR)/cdiff ] ; then \
-+	  install cdiff.sh $(TARGET_INSTALL_DIR)/cdiff; \
+--- Makefile.orig	2009-04-22 02:00:01.000000000 +0200
++++ Makefile	2009-04-22 02:00:24.000000000 +0200
+@@ -28,8 +28,8 @@
+ 	if [ ! -f ${DESTDIR}${INSTALL_DIR}/cdiff ] ; then \
+ 	  install cdiff.sh ${DESTDIR}${INSTALL_DIR}/cdiff; \
  	fi
--	install -D colordiff.1 ${MAN_DIR}/colordiff.1
--	if [ -f ${ETC_DIR}/colordiffrc ]; then \
--	  mv -f ${ETC_DIR}/colordiffrc ${ETC_DIR}/colordiffrc.old; \
-+	install colordiff.1.for.install $(TARGET_MAN_DIR)/colordiff.1
-+	if [ -f $(TARGET_ETC_DIR)/colordiffrc ]; then \
-+	  mv -f $(TARGET_ETC_DIR)/colordiffrc $(TARGET_ETC_DIR)/colordiffrc.old; \
- 	fi
--	cp colordiffrc ${ETC_DIR}/colordiffrc
--	chown root.root ${ETC_DIR}/colordiffrc
--	chmod 644 ${ETC_DIR}/colordiffrc
--	rm -f colordiff.pl.for.install
-+	cp colordiffrc{,-lightbg} $(TARGET_ETC_DIR)
-+	rm -f colordiff.pl.for.install colordiff.1.for.install
- 
- dist:
- 	mkdir ${TMPDIR}
+-	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; \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090421/b13c147f/attachment.html>


More information about the macports-changes mailing list