From 32c3a06762201ec506f3285e06879240a1dc19a0 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 23 May 1999 19:48:46 +0000 Subject: [PATCH] We don't use libtool to make shared objects, so don't add an unnecessary dependence on pkglibtool. --- devel/gettext/Makefile | 7 +++---- devel/gettext/patches/patch-aa | 20 -------------------- 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 devel/gettext/patches/patch-aa diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 1fa314915b9c..5c114534c290 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1999/05/20 20:09:50 tron Exp $ +# $NetBSD: Makefile,v 1.11 1999/05/23 19:48:46 tv Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp # @@ -9,7 +9,6 @@ MASTER_SITES= ftp://alpha.gnu.org/gnu/ MAINTAINER= tron@netbsd.org GNU_CONFIGURE= yes -USE_LIBTOOL= yes INFO_FILES= gettext.info @@ -22,8 +21,8 @@ INFO_FILES= gettext.info .if ${OPSYS} == "SunOS" PLIST_SRC= ${WRKDIR}/PLIST-src -post-install: - ${SED} -e '/^include\/libintl\.h$$/d' -e '/^lib\/libintl\.a$$/d' \ +pre-install: + @${SED} -e '/^include\/libintl\.h$$/d' -e '/^lib\/libintl\.a$$/d' \ ${PKGDIR}/PLIST > ${PLIST_SRC} .endif # SunOS diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa deleted file mode 100644 index ccec20292928..000000000000 --- a/devel/gettext/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.5 1998/12/29 18:10:34 tron Exp $ - ---- configure.orig Fri May 1 07:48:25 1998 -+++ configure Tue Dec 29 19:06:57 1998 -@@ -1320,6 +1320,7 @@ - fi - - # Always use our own libtool. -+if false; then - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - # Check for any special flags to pass to ltconfig. -@@ -1364,6 +1365,7 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -+fi - - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2