[65227] trunk/dports/sysutils/moreutils

[ryandesign at macports.org]

Revision: 65227
          http://trac.macports.org/changeset/65227
Author:   ryandesign at macports.org
Date:     2010-03-23 21:10:34 -0700 (Tue, 23 Mar 2010)
Log Message:
-----------
moreutils: use a patchfile instead of reinplaces which can break in unpredictable ways in future updates; fixes doc variant (see #24174)

Modified Paths:
--------------
    trunk/dports/sysutils/moreutils/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/moreutils/files/
    trunk/dports/sysutils/moreutils/files/patch-Makefile.diff

Modified: trunk/dports/sysutils/moreutils/Portfile
===================================================================
--- trunk/dports/sysutils/moreutils/Portfile	2010-03-24 03:54:55 UTC (rev 65226)
+++ trunk/dports/sysutils/moreutils/Portfile	2010-03-24 04:10:34 UTC (rev 65227)
@@ -30,18 +30,14 @@
                 rmd160  5b7be7b4b07497c04f5792021bf1dc54ec5d07a8
 depends_run     path:bin/perl:perl5
 
+patchfiles      patch-Makefile.diff
+
 post-patch {
         reinplace "s|/usr/bin/perl|${prefix}/bin/perl|" \
         ${worksrcpath}/vidir ${worksrcpath}/vipe \
         ${worksrcpath}/ts ${worksrcpath}/combine \
         ${worksrcpath}/zrun
-        reinplace "s|docbook2x-man|docbook2man|" ${worksrcpath}/Makefile
-	reinplace -E "s/ifdata.*ifne\[^ \]*//" ${worksrcpath}/Makefile
 	reinplace "s|PREFIX=.*|PREFIX=${prefix}|" ${worksrcpath}/Makefile
-	reinplace "s/ \$(MANS)/\\\ndoc: DOCS \$(MANS)/" ${worksrcpath}/Makefile
-	reinplace "/mkdir.*man1/i\\
-DOCS:
-" ${worksrcpath}/Makefile
 }
 
 use_configure   no

Added: trunk/dports/sysutils/moreutils/files/patch-Makefile.diff
===================================================================
--- trunk/dports/sysutils/moreutils/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/sysutils/moreutils/files/patch-Makefile.diff	2010-03-24 04:10:34 UTC (rev 65227)
@@ -0,0 +1,29 @@
+--- Makefile.orig	2009-07-02 14:00:44.000000000 -0500
++++ Makefile	2010-03-23 23:06:18.000000000 -0500
+@@ -1,13 +1,14 @@
+-BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel
++BINS=isutf8 pee sponge mispipe lckdo parallel
+ PERLSCRIPTS=vidir vipe ts combine zrun
+-MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 mispipe.1 lckdo.1 parallel.1
++MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 pee.1 zrun.1 mispipe.1 lckdo.1 parallel.1
+ CFLAGS=-O2 -g -Wall
+ INSTALL_BIN?=install -s
+ PREFIX=/usr
+ 
+-DOCBOOK2XMAN=docbook2x-man
++DOCBOOK2XMAN=docbook2man
+ 
+-all: $(BINS) $(MANS)
++all: $(BINS)
++doc: $(MANS)
+ 
+ clean:
+ 	rm -f $(BINS) $(MANS)
+@@ -17,6 +18,7 @@
+ 	$(INSTALL_BIN) $(BINS) $(DESTDIR)$(PREFIX)/bin
+ 	install $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin
+ 	
++install-doc:
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
+ 	install $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100323/8b2f3291/attachment-0001.html>