From 3ce45813133af855a2f0816eed34f5e1b5289402 Mon Sep 17 00:00:00 2001 From: ryoon Date: Wed, 19 Apr 2017 16:37:32 +0000 Subject: Do not use GNU make syntax. Fix build with bmake --- www/curl/distinfo | 3 ++- www/curl/patches/patch-src_Makefile.in | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 www/curl/patches/patch-src_Makefile.in (limited to 'www') diff --git a/www/curl/distinfo b/www/curl/distinfo index b179608cc3e..b6ac3ab745e 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.130 2017/04/19 10:28:07 wiz Exp $ +$NetBSD: distinfo,v 1.131 2017/04/19 16:37:32 ryoon Exp $ SHA1 (curl-7.54.0.tar.bz2) = e1cc251508e98bc5a8b9d5c40d8a4f6e48465d1c RMD160 (curl-7.54.0.tar.bz2) = 853ff262182b071c5cf93ffecaf6ee049c3fffc7 @@ -7,3 +7,4 @@ Size (curl-7.54.0.tar.bz2) = 2602286 bytes SHA1 (patch-configure) = 0f065d05cdf9b36e49253481b90ee7c057e87998 SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308 +SHA1 (patch-src_Makefile.in) = 74a11ec9bfcdba9fb07bd4338fb3025f24bafe0e diff --git a/www/curl/patches/patch-src_Makefile.in b/www/curl/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..5bf8810dd02 --- /dev/null +++ b/www/curl/patches/patch-src_Makefile.in @@ -0,0 +1,22 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2017/04/19 16:37:32 ryoon Exp $ + +--- src/Makefile.in.orig 2017-04-18 11:42:47.000000000 +0000 ++++ src/Makefile.in +@@ -2039,14 +2039,14 @@ uninstall-am: uninstall-binPROGRAMS + @HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@$(HUGE): $(MANPAGE) $(README) $(MKHELP) + @HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ echo '#include "tool_setup.h"' > $(HUGE) + @HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ echo '#ifndef HAVE_LIBZ' >> $(HUGE) +-@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ $(NROFF) $< | $(PERL) $(MKHELP) $(README) >> $(HUGE) ++@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) + @HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ echo '#else' >> $(HUGE) +-@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ $(NROFF) $< | $(PERL) $(MKHELP) -c $(README) >> $(HUGE) ++@HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE) + @HAVE_LIBZ_TRUE@@USE_MANUAL_TRUE@ echo '#endif /* HAVE_LIBZ */' >> $(HUGE) + # This generates the tool_hugehelp.c file uncompressed only + @HAVE_LIBZ_FALSE@@USE_MANUAL_TRUE@$(HUGE): $(MANPAGE) $(README) mkhelp.pl + @HAVE_LIBZ_FALSE@@USE_MANUAL_TRUE@ echo '#include "tool_setup.h"' > $(HUGE) +-@HAVE_LIBZ_FALSE@@USE_MANUAL_TRUE@ $(NROFF) $< | $(PERL) $(MKHELP) $(README) >> $(HUGE) ++@HAVE_LIBZ_FALSE@@USE_MANUAL_TRUE@ $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) + + # built-in manual has been disabled, make a blank file + @USE_MANUAL_FALSE@$(HUGE): -- cgit v1.2.3