diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | textproc/gsed/Makefile | 9 | ||||
| -rw-r--r-- | textproc/gsed/PLIST | 37 | ||||
| -rw-r--r-- | textproc/gsed/distinfo | 10 | ||||
| -rw-r--r-- | textproc/gsed/patches/patch-aa | 23 | ||||
| -rw-r--r-- | textproc/gsed/patches/patch-ab | 37 |
6 files changed, 67 insertions, 52 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 071d1433bc2..052adc5d5ea 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.2500 2003/06/13 20:57:15 tron Exp $ +$NetBSD: CHANGES,v 1.2501 2003/06/14 00:06:14 grant Exp $ Changes to the packages collection and infrastructure in 2003: @@ -2451,3 +2451,4 @@ Changes to the packages collection and infrastructure in 2003: Updated libgnomedb to 0.12.2 [jmmv 2003-06-13] Updated linuxsms to 0.65 [jmmv 2003-06-13] Updated BasiliskII to 1.0 [tron 2003-06-13] + Updated gsed to 4.0.7 [grant 2003-06-14] diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile index f10c62c9fa3..ecbfad56f1c 100644 --- a/textproc/gsed/Makefile +++ b/textproc/gsed/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2003/02/18 17:43:07 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2003/06/14 00:04:55 grant Exp $ # -DISTNAME= sed-3.02 +DISTNAME= sed-4.0.7 PKGNAME= g${DISTNAME} CATEGORIES= textproc editors MASTER_SITES= ${MASTER_SITE_GNU:=sed/} @@ -10,8 +10,9 @@ MAINTAINER= seb@netbsd.org HOMEPAGE= http://www.gnu.org/software/sed/sed.html COMMENT= GNU version of sed -USE_BUILDLINK2= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_PKGLOCALEDIR= YES +GNU_CONFIGURE= YES INFO_FILES= sed.info diff --git a/textproc/gsed/PLIST b/textproc/gsed/PLIST index 489ebe69521..0305b2e2db3 100644 --- a/textproc/gsed/PLIST +++ b/textproc/gsed/PLIST @@ -1,6 +1,35 @@ -@comment $NetBSD: PLIST,v 1.3 2002/12/25 18:10:59 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/06/14 00:04:55 grant Exp $ bin/${GNU_PROGRAM_PREFIX}sed -man/man1/${GNU_PROGRAM_PREFIX}sed.1 -@unexec ${INSTALL_INFO} --delete %D/info/sed.info %D/info/dir +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/sed.info info/sed.info -@exec ${INSTALL_INFO} %D/info/sed.info %D/info/dir +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/sed.info +info/sed.info-1 +info/sed.info-2 +man/man1/${GNU_PROGRAM_PREFIX}sed.1 +${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/el/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/et/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/he/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/id/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/sed.mo +${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/sed.mo diff --git a/textproc/gsed/distinfo b/textproc/gsed/distinfo index a32a6fdcc88..afdd57bd06d 100644 --- a/textproc/gsed/distinfo +++ b/textproc/gsed/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/10/29 12:30:07 seb Exp $ +$NetBSD: distinfo,v 1.3 2003/06/14 00:04:55 grant Exp $ -SHA1 (sed-3.02.tar.gz) = 049d525abe926a7eec9d210d49181f5bf046f7b7 -Size (sed-3.02.tar.gz) = 264236 bytes -SHA1 (patch-aa) = 5dac905e585762bd4cc0fe46712e8b239c1ff4be -SHA1 (patch-ab) = a162210aeac44b7c0627f2ed76d4bfe6884ada6e +SHA1 (sed-4.0.7.tar.gz) = 8b5c421b1496b01d97e43551fc961590cfe55aa6 +Size (sed-4.0.7.tar.gz) = 693903 bytes +SHA1 (patch-aa) = 781e0da47d5107eb8c24072e1ffefe258fa1fd49 +SHA1 (patch-ab) = f6444085f93339afa41ab7a5cc6e8f6a6fd05f40 diff --git a/textproc/gsed/patches/patch-aa b/textproc/gsed/patches/patch-aa index 581c2a64207..034dfac2e73 100644 --- a/textproc/gsed/patches/patch-aa +++ b/textproc/gsed/patches/patch-aa @@ -1,12 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/06/26 12:45:38 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2003/06/14 00:04:56 grant Exp $ ---- configure.in.orig Sun Aug 2 02:38:33 1998 -+++ configure.in -@@ -101,7 +101,6 @@ - AC_REPLACE_FUNCS(memchr memcmp memmove strerror) - AC_CHECK_FUNCS(isatty bcopy bzero isascii memcpy) - --AC_ARG_PROGRAM - AC_OUTPUT(Makefile djgpp/Makefile doc/Makefile dnl - lib/Makefile sed/Makefile testsuite/Makefile - dnl testsuite/version.good:testsuite/version.gin dnl +--- configure.orig Fri Apr 11 16:21:09 2003 ++++ configure +@@ -5257,7 +5257,7 @@ else + fi + + +-: ${TEXI2HTML=texi2html -monolithic} ++TEXI2HTML="texi2html -monolithic" + + + echo "$as_me:$LINENO: checking how to build HTML documentation" >&5 diff --git a/textproc/gsed/patches/patch-ab b/textproc/gsed/patches/patch-ab index e0995fbf6a1..7e2c0fb0bf4 100644 --- a/textproc/gsed/patches/patch-ab +++ b/textproc/gsed/patches/patch-ab @@ -1,30 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2001/10/29 12:30:07 seb Exp $ +$NetBSD: patch-ab,v 1.2 2003/06/14 00:04:56 grant Exp $ ---- configure.orig Mon Oct 29 12:29:47 2001 -+++ configure -@@ -2297,25 +2297,6 @@ - done +--- intl/Makefile.in.orig Sun Mar 10 07:37:20 2002 ++++ intl/Makefile.in +@@ -39,7 +39,7 @@ subdir = intl + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs + + l = @INTL_LIBTOOL_SUFFIX_PREFIX@ --if test "$program_transform_name" = s,x,x,; then -- program_transform_name= --else -- # Double any \ or $. echo might interpret backslashes. -- cat <<\EOF_SED > conftestsed --s,\\,\\\\,g; s,\$,$$,g --EOF_SED -- program_transform_name="`echo $program_transform_name|sed -f conftestsed`" -- rm -f conftestsed --fi --test "$program_prefix" != NONE && -- program_transform_name="s,^,${program_prefix},; $program_transform_name" --# Use a double $ so make ignores it. --test "$program_suffix" != NONE && -- program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" -- --# sed with no file args requires a program. --test "$program_transform_name" = "" && program_transform_name="s,x,x," -- - trap '' 1 2 15 - cat > confcache <<\EOF - # This file is a shell script that caches the results of configure |