[116136] trunk/dports/shells/rc

[jmr at macports.org]

Revision: 116136
          https://trac.macports.org/changeset/116136
Author:   jmr at macports.org
Date:     2014-01-18 22:47:18 -0800 (Sat, 18 Jan 2014)
Log Message:
-----------
rc: fix installation bypassing destroot

Modified Paths:
--------------
    trunk/dports/shells/rc/Portfile

Added Paths:
-----------
    trunk/dports/shells/rc/files/
    trunk/dports/shells/rc/files/Makefile.in.patch

Modified: trunk/dports/shells/rc/Portfile
===================================================================
--- trunk/dports/shells/rc/Portfile	2014-01-19 05:12:46 UTC (rev 116135)
+++ trunk/dports/shells/rc/Portfile	2014-01-19 06:47:18 UTC (rev 116136)
@@ -4,6 +4,7 @@
 
 name		rc
 version		1.7.2
+revision	1
 categories	shells
 maintainers	nomaintainer
 description	A Plan 9 shell
@@ -24,6 +25,8 @@
 checksums	rmd160  e245de754a6ada3f99e243acd7f87da9fce864d0 \
 		sha256  d4b552b6652a2f85400b61b970c9034b17fcb59b74a0f242bbea12959e8939c7
 
+patchfiles	Makefile.in.patch
+
 configure.args	--mandir=${prefix}/share/man --with-history
 
 test.run	yes
@@ -39,3 +42,11 @@
 	configure.args-append  --with-editline
 }
 
+pre-activate {
+    foreach f {- -- -p --p} {
+        set path ${prefix}/bin/${f}
+        if {![catch {file type $path} ftype] && ($ftype eq "file" || $ftype eq "link") && [registry_file_registered $path] eq "0"} {
+            file delete -force $path
+        }
+    }
+}

Added: trunk/dports/shells/rc/files/Makefile.in.patch
===================================================================
--- trunk/dports/shells/rc/files/Makefile.in.patch	                        (rev 0)
+++ trunk/dports/shells/rc/files/Makefile.in.patch	2014-01-19 06:47:18 UTC (rev 116136)
@@ -0,0 +1,17 @@
+--- Makefile.in.orig	2003-07-17 22:24:25.000000000 +1000
++++ Makefile.in	2014-01-19 17:32:03.000000000 +1100
+@@ -716,10 +716,10 @@
+ 	./rc -p < $(srcdir)/trip.rc
+ 
+ install-exec-hook:
+- at AMC_HISTORY_TRUE@	$(INSTALL_PROGRAM) history $(bindir)/- ;\
+- at AMC_HISTORY_TRUE@	rm -f $(bindir)/--;  $(LN) $(bindir)/- $(bindir)/-- ;\
+- at AMC_HISTORY_TRUE@	rm -f $(bindir)/-p;  $(LN) $(bindir)/- $(bindir)/-p ;\
+- at AMC_HISTORY_TRUE@	rm -f $(bindir)/--p; $(LN) $(bindir)/- $(bindir)/--p
++ at AMC_HISTORY_TRUE@	$(INSTALL_PROGRAM) history $(DESTDIR)$(bindir)/- ;\
++ at AMC_HISTORY_TRUE@	rm -f $(DESTDIR)$(bindir)/--;  $(LN) $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/-- ;\
++ at AMC_HISTORY_TRUE@	rm -f $(DESTDIR)$(bindir)/-p;  $(LN) $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/-p ;\
++ at AMC_HISTORY_TRUE@	rm -f $(DESTDIR)$(bindir)/--p; $(LN) $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/--p
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140118/e537b53c/attachment.html>