Ticket #2657: patch-colordiff

File patch-colordiff, 4.0 KB (added by kballard (Lily Ballard), 20 years ago)

Patch for Portfile and patch-Makefile

Line 
1Index: Portfile
2===================================================================
3RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/devel/colordiff/Portfile,v
4retrieving revision 1.3
5diff -u -r1.3 Portfile
6--- Portfile    26 Apr 2004 22:35:19 -0000      1.3
7+++ Portfile    1 Feb 2005 08:29:17 -0000
8@@ -1,7 +1,7 @@
9 # $Id: Portfile,v 1.3 2004/04/26 22:35:19 mww Exp $
10 PortSystem 1.0
11 name                   colordiff
12-version                        1.0.2
13+version                        1.0.4
14 categories             devel textproc
15 maintainers            landonf@opendarwin.org
16 description            Color-highlighted diff(1) output
17@@ -11,12 +11,13 @@
18 homepage               http://colordiff.sourceforge.net/
19 platforms              darwin
20 master_sites           ${homepage}
21-checksums              md5 ac8eb1433fc817d6044ae8c0916b8f53
22-patchfiles             patch-Makefile; # for case-insensitive file systems
23+checksums              md5 e167adf7e37c426e2305d097c7055f79
24+patchfiles             patch-Makefile
25 build.type             bsd
26 build                  {}
27-destroot.args          INSTALL_DIR=${destroot}/${prefix}/bin \
28-                       MAN_DIR=${destroot}/${prefix}/share/man/man1 \
29-                       ETC_DIR=${destroot}/${prefix}/etc
30+destroot.args          INSTALL_DIR=${prefix}/bin \
31+                       MAN_DIR=${prefix}/share/man/man1 \
32+                       ETC_DIR=${prefix}/etc \
33+                       DESTROOT_DIR=${destroot}
34 
35-configure { reinplace s|/etc|${prefix}/etc|g ${worksrcpath}/colordiff.pl }
36+use_configure  no
37Index: files/patch-Makefile
38===================================================================
39RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/devel/colordiff/files/patch-Makefile,v
40retrieving revision 1.1
41diff -u -r1.1 patch-Makefile
42--- files/patch-Makefile        5 May 2003 10:16:36 -0000       1.1
43+++ files/patch-Makefile        1 Feb 2005 08:29:18 -0000
44@@ -1,25 +1,62 @@
45---- Makefile   Mon May  5 02:51:59 2003
46-+++ Makefile   Mon May  5 02:51:12 2003
47-@@ -9,6 +9,7 @@
48- TMPDIR=colordiff-${VERSION}
49- TARBALL=${TMPDIR}.tar.gz
50+--- Makefile.old       2005-02-01 03:11:04.000000000 -0500
51++++ Makefile   2005-02-01 03:12:06.000000000 -0500
52+@@ -3,12 +3,22 @@
53+ INSTALL_DIR=/usr/local/bin
54+ MAN_DIR=/usr/local/man/man1
55+ ETC_DIR=/etc
56++.ifdef DESTROOT_DIR
57++TARGET_INSTALL_DIR=$(DESTROOT_DIR)/$(INSTALL_DIR)
58++TARGET_MAN_DIR=$(DESTROOT_DIR)/$(MAN_DIR)
59++TARGET_ETC_DIR=$(DESTROOT_DIR)/$(ETC_DIR)
60++.else
61++TARGET_INSTALL_DIR=$(INSTALL_DIR)
62++TARGET_MAN_DIR=$(MAN_DIR)
63++TARGET_ETC_DIR=$(ETC_DIR)
64++.endif
65+ VERSION=1.0.4
66+ DIST_FILES=COPYING INSTALL Makefile README \
67+       colordiff.pl colordiffrc colordiffrc-lightbg BUGS TODO CHANGES colordiff.1
68+-TMPDIR=colordiff-${VERSION}
69+-TARBALL=${TMPDIR}.tar.gz
70++TMPDIR=colordiff-$(VERSION)
71++TARBALL=$(TMPDIR).tar.gz
72 
73-+.PHONY : install
74++.PHONY: install
75 
76  doc: colordiff.xml
77        xmlto -vv man colordiff.xml
78-@@ -21,11 +22,9 @@
79-       mv colordiff.html ../htdocs
80+@@ -22,23 +32,22 @@
81 
82- install:
83--      install -D colordiff.pl ${INSTALL_DIR}/colordiff
84+ etc:
85+       sed -e "s%/etc%$(ETC_DIR)%g" colordiff.pl > colordiff.pl.for.install
86++      sed -e "s%/etc%$(ETC_DIR)%g" colordiff.1 > colordiff.1.for.install
87+
88+ install: etc
89+-      install -D colordiff.pl.for.install ${INSTALL_DIR}/colordiff
90 -      install -D colordiff.1 ${MAN_DIR}/colordiff.1
91+-      if [ -f ${ETC_DIR}/colordiffrc ]; then \
92+-        mv -f ${ETC_DIR}/colordiffrc ${ETC_DIR}/colordiffrc.old; \
93++      install colordiff.pl.for.install $(TARGET_INSTALL_DIR)/colordiff
94++      install colordiff.1.for.install $(TARGET_MAN_DIR)/colordiff.1
95++      if [ -f $(TARGET_ETC_DIR)/colordiffrc ]; then \
96++        mv -f $(TARGET_ETC_DIR)/colordiffrc $(TARGET_ETC_DIR)/colordiffrc.old; \
97+       fi
98 -      cp colordiffrc ${ETC_DIR}/colordiffrc
99 -      chown root.root ${ETC_DIR}/colordiffrc
100 -      chmod 644 ${ETC_DIR}/colordiffrc
101-+      install colordiff.pl ${INSTALL_DIR}/colordiff
102-+      install colordiff.1 ${MAN_DIR}/colordiff.1
103-+      cp colordiffrc-lightbg ${ETC_DIR}/colordiffrc
104+-      rm -f colordiff.pl.for.install
105++      cp colordiffrc-lightbg $(TARGET_ETC_DIR)/colordiffrc
106++      rm -f colordiff.pl.for.install colordiff.1.for.install
107 
108  dist:
109-       mkdir ${TMPDIR}
110+-      mkdir ${TMPDIR}
111+-      cp -p ${DIST_FILES} ${TMPDIR}
112+-      tar -zcvf ${TARBALL} ${TMPDIR}
113+-      rm -fR ${TMPDIR}
114++      mkdir $(TMPDIR)
115++      cp -p $(DIST_FILES) $(TMPDIR)
116++      tar -zcvf $(TARBALL) $(TMPDIR)
117++      rm -fR $(TMPDIR)
118+
119+ clean:
120+       rm -f README colordiff.1 colordiff.html