- update gawk to 3.1.6

* license changed to GPLv3 among other changes

ok wilfried@ (MAINTAINER)
This commit is contained in:
jasper 2009-01-07 16:35:08 +00:00
parent a8ffe175ec
commit 75a1acdf6e
4 changed files with 51 additions and 40 deletions

View File

@ -1,15 +1,16 @@
# $OpenBSD: Makefile,v 1.11 2007/09/16 00:27:05 merdely Exp $
# $OpenBSD: Makefile,v 1.12 2009/01/07 16:35:08 jasper Exp $
COMMENT= GNU awk
DISTNAME= gawk-3.1.5
V= 3.1.6
DISTNAME= gawk-$V
CATEGORIES= lang
HOMEPAGE= http://www.gnu.org/software/gawk/gawk.html
MAINTAINER= Peter Stromberg <wilfried@openbsd.org>
# GPL
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -21,10 +22,12 @@ MASTER_SITES= ${MASTER_SITE_GNU:=gawk/}
MODULES= devel/gettext
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
AUTOCONF_VERSION= 2.61
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
SUBST_VARS+= V
pre-build:
@touch -r ${WRKSRC}/test/Makefile.am ${WRKSRC}/test/Maketests

View File

@ -1,5 +1,5 @@
MD5 (gawk-3.1.5.tar.gz) = R2AyVIlHnKwX/gEUuPYvMA==
RMD160 (gawk-3.1.5.tar.gz) = jYdfTqnp71yTJGjPQ8aR9uCCsZc=
SHA1 (gawk-3.1.5.tar.gz) = bLOFtLwzeApaQoi3h1I8vUowqQA=
SHA256 (gawk-3.1.5.tar.gz) = Rj3LnQyjmLHU9aMy9s2c7FZEEmX8phby6htE1Fnp8Pg=
SIZE (gawk-3.1.5.tar.gz) = 2310919
MD5 (gawk-3.1.6.tar.gz) = sjd1Gu9TyerZZE43a8Uzhg==
RMD160 (gawk-3.1.6.tar.gz) = oNlItB5ymG+3rSmTN7EoZ8to3X0=
SHA1 (gawk-3.1.6.tar.gz) = /6R+5tXcjPmJ5YyF68eS0H6RTOY=
SHA256 (gawk-3.1.6.tar.gz) = Bt2HLacUUIiuCEdfexHluegQuOrX140DkAPmcbt27GU=
SIZE (gawk-3.1.6.tar.gz) = 2488684

View File

@ -1,27 +1,37 @@
$OpenBSD: patch-m4_lib-link_m4,v 1.1 2005/10/07 14:08:34 wilfried Exp $
--- m4/lib-link.m4.orig Wed May 11 17:28:16 2005
+++ m4/lib-link.m4 Fri Oct 7 16:02:34 2005
@@ -197,9 +197,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
found_so=
$OpenBSD: patch-m4_lib-link_m4,v 1.2 2009/01/07 16:35:08 jasper Exp $
--- m4/lib-link.m4.orig Tue Dec 23 14:20:59 2008
+++ m4/lib-link.m4 Tue Dec 23 14:37:44 2008
@@ -199,12 +199,14 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
found_a=
if test $use_additional = yes; then
- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ if test -n "$shlibext" && test "`echo $additional_libdir/lib$name.$shlibext*`" != "$additional_libdir/lib$name.$shlibext*"; then
if test -n "$shlibext" \
- && { test -f "$additional_libdir/lib$name.$shlibext" \
+ && { test "`echo $additional_libdir/lib$name.$shlibext*`" != \
+ "$additional_libdir/lib$name.$shlibext*" \
|| { test "$shlibext" = dll \
&& test -f "$additional_libdir/lib$name.dll.a"; }; }; then
found_dir="$additional_libdir"
- found_so="$additional_libdir/lib$name.$shlibext"
+ found_so="-l$name"
if test -f "$additional_libdir/lib$name.la"; then
found_la="$additional_libdir/lib$name.la"
- if test -f "$additional_libdir/lib$name.$shlibext"; then
- found_so="$additional_libdir/lib$name.$shlibext"
+ if test "`echo $additional_libdir/lib$name.$shlibext*`" != \
+ "$additional_libdir/lib$name.$shlibext*"; then
+ found_so="-l$name"
else
found_so="$additional_libdir/lib$name.dll.a"
fi
@@ -219,9 +219,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
case "$x" in
@@ -228,12 +230,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-L*)
dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+ if test -n "$shlibext" && test "`echo $dir/lib$name.$shlibext*`" != "$dir/lib$name.$shlibext*"; then
if test -n "$shlibext" \
- && { test -f "$dir/lib$name.$shlibext" \
+ && { test "`echo $dir/lib$name.$shlibext*`" != "$dir/lib$name.$shlibext*" \
|| { test "$shlibext" = dll \
&& test -f "$dir/lib$name.dll.a"; }; }; then
found_dir="$dir"
- found_so="$dir/lib$name.$shlibext"
+ found_so="-l$name"
if test -f "$dir/lib$name.la"; then
found_la="$dir/lib$name.la"
- if test -f "$dir/lib$name.$shlibext"; then
- found_so="$dir/lib$name.$shlibext"
+ if test "`echo $dir/lib$name.$shlibext*`" != "$dir/lib$name.$shlibext*"; then
+ found_so="-l$name"
else
found_so="$dir/lib$name.dll.a"
fi

View File

@ -1,15 +1,15 @@
@comment $OpenBSD: PLIST,v 1.7 2005/10/07 14:08:34 wilfried Exp $
@comment $OpenBSD: PLIST,v 1.8 2009/01/07 16:35:08 jasper Exp $
bin/awk
bin/gawk
bin/gawk-3.1.5
@bin bin/gawk
@bin bin/gawk-${V}
bin/igawk
bin/pgawk
bin/pgawk-3.1.5
@info info/gawk.info
@info info/gawkinet.info
@bin bin/pgawk
@bin bin/pgawk-${V}
info/gawk.info
info/gawkinet.info
libexec/awk/
libexec/awk/grcat
libexec/awk/pwcat
@bin libexec/awk/grcat
@bin libexec/awk/pwcat
@man man/man1/gawk.1
@man man/man1/igawk.1
@man man/man1/pgawk.1
@ -33,14 +33,12 @@ share/awk/rewind.awk
share/awk/round.awk
share/awk/strtonum.awk
share/awk/zerofile.awk
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/gawk.mo
share/locale/da/LC_MESSAGES/gawk.mo
share/locale/de/LC_MESSAGES/gawk.mo
share/locale/es/LC_MESSAGES/gawk.mo
share/locale/fr/LC_MESSAGES/gawk.mo
share/locale/ga/
share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/gawk.mo
share/locale/he/LC_MESSAGES/gawk.mo
@ -55,6 +53,6 @@ share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/gawk.mo
share/locale/sv/LC_MESSAGES/gawk.mo
share/locale/tr/LC_MESSAGES/gawk.mo
share/locale/vi/
share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/gawk.mo
share/locale/zh_CN/LC_MESSAGES/gawk.mo