svn commit: r385057 - head/lang/gawk

[Jan Beich]

Johan van Selst <johans at FreeBSD.org> writes:

>   - Use readline from base
[...]
>  CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
>  		--with-libintl-prefix=${LOCALBASE} \
> +		--with-readline=/usr \

readline is gone since base r268461 (11.0-CURRENT only) which means you
have to add USES=readline. Maybe depend on devel/readline unconditionally.

Also, fails to build:

  $ make
  ===>  Found saved configuration for gawk-4.1.1_1
  ===>   gawk-4.1.2 depends on file: /usr/local/sbin/pkg - found
  ===> Fetching all distfiles required by gawk-4.1.2 for building
  ===>  Extracting for gawk-4.1.2
  => SHA256 Checksum OK for gawk-4.1.2.tar.xz.
  ===>  Patching for gawk-4.1.2
  ===>  Applying FreeBSD patches for gawk-4.1.2
  1 out of 1 hunks failed--saving rejects to Makefile.in.rej
  => Patch patch-Makefile failed to apply cleanly.
  *** Error code 1

Index: lang/gawk/Makefile
===================================================================
--- lang/gawk/Makefile	(revision 385061)
+++ lang/gawk/Makefile	(working copy)
@@ -22,10 +22,10 @@ MPFR_CONFIGURE_OFF=	--without-gmp --without-mpfr
 INFO=		gawk gawkinet
 
 GNU_CONFIGURE=	yes
-USES=		iconv libtool makeinfo tar:xz
+USES=		iconv libtool makeinfo readline:port tar:xz
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-libintl-prefix=${LOCALBASE} \
-		--with-readline=/usr \
+		--with-readline=${LOCALBASE} \
 		AWK=${AWK}
 
 PLIST_SUB+=	VERSION=${PORTVERSION}
Index: lang/gawk/files/patch-Makefile
===================================================================
--- lang/gawk/files/patch-Makefile	(revision 385061)
+++ lang/gawk/files/patch-Makefile	(working copy)
@@ -1,11 +1,11 @@
 --- 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
+@@ -1175,7 +1175,7 @@ uninstall-am: uninstall-binPROGRAMS unin
  install-exec-hook:
  	(cd $(DESTDIR)$(bindir); \
  	$(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
--	if [ ! -f awk ]; \
-+	if ! /usr/bin/which -s awk; \
- 	then	$(LN_S) gawk$(EXEEXT) awk; \
+-	if [ ! -f awk$(EXEEXT) ]; \
++	if ! /usr/bin/which -s awk$(EXEEXT); \
+ 	then	$(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
  	fi; exit 0)
  
Index: lang/gawk/files/patch-extension_Makefile.in
===================================================================
--- lang/gawk/files/patch-extension_Makefile.in	(revision 385061)
+++ lang/gawk/files/patch-extension_Makefile.in	(working copy)
@@ -5,7 +5,7 @@
  
  install-data-hook:
 -	for i in $(pkgextension_LTLIBRARIES) ; do \
--		$(RM) $(pkgextensiondir)/$$i ; \
+-		$(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \
 -	done
  
  # Keep the uninstall check working:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 602 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20150430/1afeb54b/attachment.sig>