aboutsummaryrefslogtreecommitdiff
path: root/lang/gawk
diff options
context:
space:
mode:
authorAntoine Brodin <antoine@FreeBSD.org>2015-05-01 07:48:43 +0000
committerAntoine Brodin <antoine@FreeBSD.org>2015-05-01 07:48:43 +0000
commite89f09225a41eed6e9cb501efcd98351394f3508 (patch)
tree1ee3ddf524670de8965f04202c26777edd38b260 /lang/gawk
parentb39dac4d01eab0d013ae34bf3592e9a28e0e3dbd (diff)
downloadports-e89f09225a41eed6e9cb501efcd98351394f3508.tar.gz
ports-e89f09225a41eed6e9cb501efcd98351394f3508.zip
Backout r385089 and unbreak again
With hat: portmgr
Notes
Notes: svn path=/head/; revision=385090
Diffstat (limited to 'lang/gawk')
-rw-r--r--lang/gawk/files/patch-Makefile10
-rw-r--r--lang/gawk/files/patch-extension_Makefile.in12
2 files changed, 17 insertions, 5 deletions
diff --git a/lang/gawk/files/patch-Makefile b/lang/gawk/files/patch-Makefile
index 552403e37ece..7736ac45dc94 100644
--- a/lang/gawk/files/patch-Makefile
+++ b/lang/gawk/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.in.orig 2015-04-29 07:35:51.000000000 +0200
-+++ Makefile.in 2015-05-01 09:30:45.000000000 +0200
-@@ -1175,7 +1175,7 @@ uninstall-am: uninstall-binPROGRAMS unin
+--- Makefile.in.orig 2014-04-08 18:12:38.000000000 +0200
++++ Makefile.in 2014-04-21 14:23:45.000000000 +0200
+@@ -1151,7 +1151,7 @@ uninstall-am: uninstall-binPROGRAMS unin
install-exec-hook:
(cd $(DESTDIR)$(bindir); \
$(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
-- if [ ! -f awk$(EXEEXT) ]; \
+- if [ ! -f awk ]; \
+ if ! /usr/bin/which -s awk; \
- then $(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
+ then $(LN_S) gawk$(EXEEXT) awk; \
fi; exit 0)
diff --git a/lang/gawk/files/patch-extension_Makefile.in b/lang/gawk/files/patch-extension_Makefile.in
new file mode 100644
index 000000000000..a86458d7f03c
--- /dev/null
+++ b/lang/gawk/files/patch-extension_Makefile.in
@@ -0,0 +1,12 @@
+--- extension/Makefile.in.orig 2014-04-08 18:13:03.000000000 +0200
++++ extension/Makefile.in 2014-04-21 14:26:04.000000000 +0200
+@@ -1230,9 +1230,6 @@ uninstall-man: uninstall-man3
+
+
+ install-data-hook:
+- for i in $(pkgextension_LTLIBRARIES) ; do \
+- $(RM) $(pkgextensiondir)/$$i ; \
+- done
+
+ # Keep the uninstall check working:
+ uninstall-so: