[21375] trunk/dports/devel/colordiff

[source_changes at macosforge.org]

Revision: 21375
          http://trac.macosforge.org/projects/macports/changeset/21375
Author:   ryandesign at macports.org
Date:     2007-01-21 23:25:30 -0800 (Sun, 21 Jan 2007)

Log Message:
-----------
- Upgrade to 1.0.6 with permission of maintainer.
- Delete patch-colordiff.pl (from #4130, r17135): it's no longer needed as the fix is already in 1.0.6.
- Update patch-Makefile to update it for the changes in the 1.0.6 Makefile.
- Now use sha1 and rmd160 hashes in addition to the md5 hash.

Modified Paths:
--------------
    trunk/dports/devel/colordiff/Portfile
    trunk/dports/devel/colordiff/files/patch-Makefile

Removed Paths:
-------------
    trunk/dports/devel/colordiff/files/patch-colordiff.pl

Modified: trunk/dports/devel/colordiff/Portfile
===================================================================
--- trunk/dports/devel/colordiff/Portfile	2007-01-22 06:43:02 UTC (rev 21374)
+++ trunk/dports/devel/colordiff/Portfile	2007-01-22 07:25:30 UTC (rev 21375)
@@ -1,8 +1,7 @@
 # $Id$
 PortSystem 1.0
 name			colordiff
-version			1.0.4
-revision		1
+version			1.0.6
 categories		devel textproc
 maintainers		landonf at opendarwin.org
 description		Color-highlighted diff(1) output
@@ -12,8 +11,10 @@
 homepage		http://colordiff.sourceforge.net/
 platforms		darwin
 master_sites		${homepage}
-checksums		md5 e167adf7e37c426e2305d097c7055f79
-patchfiles		patch-Makefile patch-colordiff.pl
+checksums		md5 a27bfccc24cd9874eb1d1abe40dc2457 \
+				sha1 8428fa6218504c5f4af5121c5e27436c8aaadcca \
+				rmd160 89ef3179d02c9142d7855e0952e8cc4b71a4ec2b
+patchfiles		patch-Makefile
 build.type		bsd
 build			{}
 destroot.args		INSTALL_DIR=${prefix}/bin \

Modified: trunk/dports/devel/colordiff/files/patch-Makefile
===================================================================
--- trunk/dports/devel/colordiff/files/patch-Makefile	2007-01-22 06:43:02 UTC (rev 21374)
+++ trunk/dports/devel/colordiff/files/patch-Makefile	2007-01-22 07:25:30 UTC (rev 21375)
@@ -1,6 +1,6 @@
---- Makefile.old	2005-02-01 03:11:04.000000000 -0500
-+++ Makefile	2005-02-01 03:12:06.000000000 -0500
-@@ -3,12 +3,22 @@
+--- Makefile.orig	2007-01-22 01:08:35.000000000 -0600
++++ Makefile	2007-01-22 01:29:54.000000000 -0600
+@@ -1,13 +1,23 @@
  INSTALL_DIR=/usr/local/bin
  MAN_DIR=/usr/local/man/man1
  ETC_DIR=/etc
@@ -13,9 +13,10 @@
 +TARGET_MAN_DIR=$(MAN_DIR)
 +TARGET_ETC_DIR=$(ETC_DIR)
 +.endif
- VERSION=1.0.4
+ VERSION=1.0.6
  DIST_FILES=COPYING INSTALL Makefile README \
- 	colordiff.pl colordiffrc colordiffrc-lightbg BUGS TODO CHANGES colordiff.1
+ 	colordiff.pl colordiffrc colordiffrc-lightbg cdiff.sh BUGS TODO CHANGES colordiff.1 \
+ 	colordiff.xml cdiff.xml
 -TMPDIR=colordiff-${VERSION}
 -TARBALL=${TMPDIR}.tar.gz
 +TMPDIR=colordiff-$(VERSION)
@@ -23,9 +24,9 @@
  
 +.PHONY: install
  
- doc: colordiff.xml
+ doc: colordiff.xml cdiff.xml
  	xmlto -vv man colordiff.xml
-@@ -22,23 +32,22 @@
+@@ -22,26 +32,25 @@
  
  etc:
  	sed -e "s%/etc%$(ETC_DIR)%g" colordiff.pl > colordiff.pl.for.install
@@ -33,10 +34,15 @@
  
  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; \
+ 	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.pl.for.install $(TARGET_INSTALL_DIR)/colordiff
 +	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; \
@@ -59,4 +65,4 @@
 +	rm -fR $(TMPDIR)
  
  clean:
- 	rm -f README colordiff.1 colordiff.html
+ 	rm -f README colordiff.1 colordiff.html cdiff.1

Deleted: trunk/dports/devel/colordiff/files/patch-colordiff.pl
===================================================================
--- trunk/dports/devel/colordiff/files/patch-colordiff.pl	2007-01-22 06:43:02 UTC (rev 21374)
+++ trunk/dports/devel/colordiff/files/patch-colordiff.pl	2007-01-22 07:25:30 UTC (rev 21375)
@@ -1,11 +0,0 @@
---- colordiff.pl.org	2006-03-22 18:02:26.000000000 -0800
-+++ colordiff.pl	2006-03-22 18:03:26.000000000 -0800
-@@ -153,7 +153,7 @@
-     }
-     # Context diffs are the only flavour having '***'
-     # at the start of a line
--    elsif ($record =~ /\*\*\*/) {
-+    elsif ($record =~ /^\*\*\*/) {
-         $diff_type = 'diffc';
-     }
-     # Plain diffs have NcN, NdN and NaN etc.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070121/b758cc38/attachment.html