[133701] trunk/dports/devel/git-extras

[ryandesign at macports.org]

Revision: 133701
          https://trac.macports.org/changeset/133701
Author:   ryandesign at macports.org
Date:     2015-03-08 23:35:12 -0700 (Sun, 08 Mar 2015)
Log Message:
-----------
git-extras: use patchfile instead of reinplace

Modified Paths:
--------------
    trunk/dports/devel/git-extras/Portfile

Added Paths:
-----------
    trunk/dports/devel/git-extras/files/patch-Makefile.diff

Removed Paths:
-------------
    trunk/dports/devel/git-extras/files/patch-fix-mktemp-invocation.diff

Modified: trunk/dports/devel/git-extras/Portfile
===================================================================
--- trunk/dports/devel/git-extras/Portfile	2015-03-09 06:25:38 UTC (rev 133700)
+++ trunk/dports/devel/git-extras/Portfile	2015-03-09 06:35:12 UTC (rev 133701)
@@ -21,13 +21,12 @@
                         sha256  bcd0aed2f6675929f59d4be386a34f71023c7851f69d60f2d9360131705b40b7
 
 patchfiles              patch-remove-auto-updater.diff \
-                        patch-fix-mktemp-invocation.diff
+                        patch-Makefile.diff
 
-configure {
-    reinplace "s| /etc| ${prefix}/etc|g" ${worksrcpath}/Makefile
-    reinplace "s|\$(DESTDIR)/etc|\$(DESTDIR)\$(PREFIX)/etc|g" ${worksrcpath}/Makefile
-}
+use_configure           no
+
 build {}
+
 destroot.destdir        PREFIX=${destroot}${prefix}
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${subport}

Copied: trunk/dports/devel/git-extras/files/patch-Makefile.diff (from rev 133653, trunk/dports/devel/git-extras/files/patch-fix-mktemp-invocation.diff)
===================================================================
--- trunk/dports/devel/git-extras/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/git-extras/files/patch-Makefile.diff	2015-03-09 06:35:12 UTC (rev 133701)
@@ -0,0 +1,31 @@
+--- Makefile	2015-03-09 01:31:30.000000000 -0500
++++ Makefile	2015-03-09 01:31:43.000000000 -0500
+@@ -17,7 +17,7 @@
+ 	@mkdir -p $(DESTDIR)$(BINPREFIX)
+ 	@echo "... installing bins to $(DESTDIR)$(BINPREFIX)"
+ 	@echo "... installing man pages to $(DESTDIR)$(MANPREFIX)"
+-	$(eval TEMPFILE := $(shell mktemp))
++	$(eval TEMPFILE := $(shell mktemp tmp.XXXXXXXXXX))
+ 	@# chmod from rw-------(default) to rwxrwxr-x, so that users can exec the scripts
+ 	@chmod 775 $(TEMPFILE)
+ 	@$(foreach COMMAND, $(COMMANDS_USED_WITH_GIT_REPO), \
+@@ -31,8 +31,8 @@
+ 		cp -f bin/$(COMMAND) $(DESTDIR)$(BINPREFIX); \
+ 	)
+ 	cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)
+-	@mkdir -p $(DESTDIR)/etc/bash_completion.d
+-	cp -f etc/bash_completion.sh $(DESTDIR)/etc/bash_completion.d/git-extras
++	@mkdir -p $(DESTDIR)$(PREFIX)/etc/bash_completion.d
++	cp -f etc/bash_completion.sh $(DESTDIR)$(PREFIX)/etc/bash_completion.d/git-extras
+ 
+ man/%.html: man/%.md
+ 	ronn \
+@@ -56,7 +56,7 @@
+ 		echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN))"; \
+ 		rm -f $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN)); \
+ 	)
+-	rm -f $(DESTDIR)/etc/bash_completion.d/git-extras
++	rm -f $(DESTDIR)$(PREFIX)/etc/bash_completion.d/git-extras
+ 
+ clean: docclean
+ 

Deleted: trunk/dports/devel/git-extras/files/patch-fix-mktemp-invocation.diff
===================================================================
--- trunk/dports/devel/git-extras/files/patch-fix-mktemp-invocation.diff	2015-03-09 06:25:38 UTC (rev 133700)
+++ trunk/dports/devel/git-extras/files/patch-fix-mktemp-invocation.diff	2015-03-09 06:35:12 UTC (rev 133701)
@@ -1,11 +0,0 @@
---- Makefile.orig	2014-10-24 15:29:43.000000000 +0000
-+++ Makefile	2014-10-24 15:29:56.000000000 +0000
-@@ -17,7 +17,7 @@
- 	@mkdir -p $(DESTDIR)$(BINPREFIX)
- 	@echo "... installing bins to $(DESTDIR)$(BINPREFIX)"
- 	@echo "... installing man pages to $(DESTDIR)$(MANPREFIX)"
--	$(eval TEMPFILE := $(shell mktemp))
-+	$(eval TEMPFILE := $(shell mktemp tmp.XXXXXXXXXX))
- 	@# chmod from rw-------(default) to rwxrwxr-x, so that users can exec the scripts
- 	@chmod 775 $(TEMPFILE)
- 	@$(foreach COMMAND, $(COMMANDS_USED_WITH_GIT_REPO), \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150308/b990ae66/attachment.html>