Date: Thu, 30 Apr 2015 22:32:35 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Johan van Selst <johans@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r385057 - head/lang/gawk Message-ID: <8ud9-z7a4-wny@FreeBSD.org> In-Reply-To: <201504301939.t3UJdjvC008965@svn.freebsd.org> (Johan van Selst's message of "Thu, 30 Apr 2015 19:39:45 %2B0000 (UTC)") References: <201504301939.t3UJdjvC008965@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Johan van Selst <johans@FreeBSD.org> writes:
> - Use readline from base
[...]
> CONFIGURE_ARGS=3D ${ICONV_CONFIGURE_ARG} \
> --with-libintl-prefix=3D${LOCALBASE} \
> + --with-readline=3D/usr \
readline is gone since base r268461 (11.0-CURRENT only) which means you
have to add USES=3Dreadline. Maybe depend on devel/readline unconditionally.
Also, fails to build:
$ make
=3D=3D=3D> Found saved configuration for gawk-4.1.1_1
=3D=3D=3D> gawk-4.1.2 depends on file: /usr/local/sbin/pkg - found
=3D=3D=3D> Fetching all distfiles required by gawk-4.1.2 for building
=3D=3D=3D> Extracting for gawk-4.1.2
=3D> SHA256 Checksum OK for gawk-4.1.2.tar.xz.
=3D=3D=3D> Patching for gawk-4.1.2
=3D=3D=3D> Applying FreeBSD patches for gawk-4.1.2
1 out of 1 hunks failed--saving rejects to Makefile.in.rej
=3D> Patch patch-Makefile failed to apply cleanly.
*** Error code 1
Index: lang/gawk/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- lang/gawk/Makefile (revision 385061)
+++ lang/gawk/Makefile (working copy)
@@ -22,10 +22,10 @@ MPFR_CONFIGURE_OFF=3D --without-gmp --without-mpfr
INFO=3D gawk gawkinet
=20
GNU_CONFIGURE=3D yes
=2DUSES=3D iconv libtool makeinfo tar:xz
+USES=3D iconv libtool makeinfo readline:port tar:xz
CONFIGURE_ARGS=3D ${ICONV_CONFIGURE_ARG} \
--with-libintl-prefix=3D${LOCALBASE} \
=2D --with-readline=3D/usr \
+ --with-readline=3D${LOCALBASE} \
AWK=3D${AWK}
=20
PLIST_SUB+=3D VERSION=3D${PORTVERSION}
Index: lang/gawk/files/patch-Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- 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
=2D@@ -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 ; \
=2D- if [ ! -f awk ]; \
=2D+ if ! /usr/bin/which -s awk; \
=2D 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)
=20=20
Index: lang/gawk/files/patch-extension_Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- lang/gawk/files/patch-extension_Makefile.in (revision 385061)
+++ lang/gawk/files/patch-extension_Makefile.in (working copy)
@@ -5,7 +5,7 @@
=20=20
install-data-hook:
- for i in $(pkgextension_LTLIBRARIES) ; do \
=2D- $(RM) $(pkgextensiondir)/$$i ; \
+- $(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \
- done
=20=20
# Keep the uninstall check working:
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQF8BAEBCgBmBQJVQpFkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF
NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bC5gH/19w1J/b4G2JnBG+kfRLu1W9
3FkJlFu0RgX6S2UsCoC/Kix626/PNxRbX19qmA9Yc9twYtKMUKxj1/FXlNbeWSgq
XGUj18obvbogIjxu7+r4tp5utnypx41iFRxWULXXINcXdhrxfaHxoYok0mwn8TG1
hJ+abh0s0NHwNWOj9xpjriMTuyxA2YFKizWnIcfVEesAjIo1zZAgCjDz6HUWou2d
PkAwmi2rxxA42EfMJxiPPwvAc/wisEntAhWTAt4p0TQpO+qwfD7TJuvpvjd3EmA1
k757LMsgJkP1dusWTFh3a7LRiI9aspYXcKtWmlrJLZpg/paG8jE4agc01ZizoNc=
=NOyw
-----END PGP SIGNATURE-----
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8ud9-z7a4-wny>