summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseb <seb@pkgsrc.org>2001-10-29 12:30:06 +0000
committerseb <seb@pkgsrc.org>2001-10-29 12:30:06 +0000
commitc977cb995a675f741d8e9e612d1a4b50410ef5c5 (patch)
tree02feac79537aeb0cbda5f44592971836b52c85ae
parent66771163d1f1e86345c204e2cce342ecb3d96d4c (diff)
downloadpkgsrc-c977cb995a675f741d8e9e612d1a4b50410ef5c5.tar.gz
To avoid build dependencies on auto* tools a patch on configure script
(manually regenerated from patched configure.in) is added, AUTOMAKE_OVERRIDE is also defined hence custom pre-configure target is removed. To avoid useless makeinfo run sed.info, version.texi and stamp-vti are added to AUTOMAKE_PATTERNS (this also fix a hidden and forgotten build dependency on ../../devel/gtexinfo). While here my email address as maintainer is updated.
-rw-r--r--textproc/gsed/Makefile15
-rw-r--r--textproc/gsed/distinfo3
-rw-r--r--textproc/gsed/patches/patch-ab30
3 files changed, 36 insertions, 12 deletions
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 4f1ca36af0c..bd44e7bf6c0 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/09/28 02:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/29 12:30:06 seb Exp $
#
DISTNAME= sed-3.02
@@ -6,21 +6,14 @@ PKGNAME= g${DISTNAME}
CATEGORIES= textproc editors
MASTER_SITES= ${MASTER_SITE_GNU:=sed/}
-MAINTAINER= seb@pbox.org
+MAINTAINER= seb@netbsd.org
HOMEPAGE= http://www.gnu.org/software/sed/sed.html
COMMENT= GNU version of sed
-BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf
-BUILD_DEPENDS+= automake>=1.4:../../devel/automake
-
GNU_CONFIGURE= YES
+AUTOMAKE_OVERRIDE= YES
CONFIGURE_ARGS= --program-prefix=g
INFO_FILES= sed.info
-
-pre-configure:
- cd ${WRKSRC} && \
- ${LOCALBASE}/bin/aclocal && \
- ${LOCALBASE}/bin/autoreconf && \
- ${LOCALBASE}/bin/automake -i
+AUTOMAKE_PATTERNS+= sed.info version.texi stamp-vti
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gsed/distinfo b/textproc/gsed/distinfo
index f3d0e53095e..a32a6fdcc88 100644
--- a/textproc/gsed/distinfo
+++ b/textproc/gsed/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/26 12:45:38 wiz Exp $
+$NetBSD: distinfo,v 1.2 2001/10/29 12:30:07 seb Exp $
SHA1 (sed-3.02.tar.gz) = 049d525abe926a7eec9d210d49181f5bf046f7b7
Size (sed-3.02.tar.gz) = 264236 bytes
SHA1 (patch-aa) = 5dac905e585762bd4cc0fe46712e8b239c1ff4be
+SHA1 (patch-ab) = a162210aeac44b7c0627f2ed76d4bfe6884ada6e
diff --git a/textproc/gsed/patches/patch-ab b/textproc/gsed/patches/patch-ab
new file mode 100644
index 00000000000..e0995fbf6a1
--- /dev/null
+++ b/textproc/gsed/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2001/10/29 12:30:07 seb Exp $
+
+--- configure.orig Mon Oct 29 12:29:47 2001
++++ configure
+@@ -2297,25 +2297,6 @@
+ done
+
+
+-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