svn commit: r497165 - in head/ftp/curl: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Mar 29 16:34:34 2019
New Revision: 497165
URL: https://svnweb.freebsd.org/changeset/ports/497165

Log:
  Do not install curl.fish to avoid conflicts with shells/fish
  
  - Bump PORTREVISION for package change
  
  PR:		236878
  Reported by:	Laszlo Karolyi <laszlo at karolyi.hu>

Added:
  head/ftp/curl/files/patch-scripts-Makefile.in   (contents, props changed)
Modified:
  head/ftp/curl/Makefile
  head/ftp/curl/pkg-plist

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Fri Mar 29 16:34:01 2019	(r497164)
+++ head/ftp/curl/Makefile	Fri Mar 29 16:34:34 2019	(r497165)
@@ -3,6 +3,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.64.1
+PORTREVISION=	1
 CATEGORIES=	ftp net www
 MASTER_SITES=	https://curl.haxx.se/download/ \
 		LOCAL/sunpoet

Added: head/ftp/curl/files/patch-scripts-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/curl/files/patch-scripts-Makefile.in	Fri Mar 29 16:34:34 2019	(r497165)
@@ -0,0 +1,21 @@
+--- scripts/Makefile.in.orig	2019-03-25 21:03:52 UTC
++++ scripts/Makefile.in
+@@ -558,7 +558,7 @@ uninstall-am:
+ .PRECIOUS: Makefile
+ 
+ 
+-all-local: $(ZSH_COMPLETION_FUNCTION_FILENAME) $(FISH_COMPLETION_FUNCTION_FILENAME)
++all-local: $(ZSH_COMPLETION_FUNCTION_FILENAME)
+ 
+ $(ZSH_COMPLETION_FUNCTION_FILENAME): completion.pl
+ @CROSSCOMPILING_TRUE@	@echo "NOTICE: we can't generate zsh completion when cross-compiling!"
+@@ -573,9 +573,7 @@ $(FISH_COMPLETION_FUNCTION_FILENAME): co
+ install-data-local:
+ @CROSSCOMPILING_TRUE@	@echo "NOTICE: we can't install zsh completion when cross-compiling!"
+ @CROSSCOMPILING_FALSE@	$(MKDIR_P) $(DESTDIR)$(ZSH_FUNCTIONS_DIR)
+- at CROSSCOMPILING_FALSE@	$(MKDIR_P) $(DESTDIR)$(FISH_FUNCTIONS_DIR)
+ @CROSSCOMPILING_FALSE@	$(INSTALL_DATA) $(ZSH_COMPLETION_FUNCTION_FILENAME) $(DESTDIR)$(ZSH_FUNCTIONS_DIR)/$(ZSH_COMPLETION_FUNCTION_FILENAME)
+- at CROSSCOMPILING_FALSE@	$(INSTALL_DATA) $(FISH_COMPLETION_FUNCTION_FILENAME) $(DESTDIR)$(FISH_FUNCTIONS_DIR)/$(FISH_COMPLETION_FUNCTION_FILENAME)
+ 
+ # 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.

Modified: head/ftp/curl/pkg-plist
==============================================================================
--- head/ftp/curl/pkg-plist	Fri Mar 29 16:34:01 2019	(r497164)
+++ head/ftp/curl/pkg-plist	Fri Mar 29 16:34:34 2019	(r497165)
@@ -443,5 +443,4 @@ man/man3/libcurl-tutorial.3.gz
 man/man3/libcurl-url.3.gz
 man/man3/libcurl.3.gz
 share/aclocal/libcurl.m4
-share/fish/completions/curl.fish
 share/zsh/site-functions/_curl