From 56f01f3c4c7c898264682015db92a4bde4e8d38c Mon Sep 17 00:00:00 2001 From: erh Date: Fri, 5 Dec 2003 18:15:49 +0000 Subject: If we're on AIX, don't remove the .a library: it's the shared library. Combine patch-ai into patch-ah to make future updates easier. --- devel/gettext/Makefile | 4 +++- devel/gettext/distinfo | 7 +++---- devel/gettext/patches/patch-ag | 21 +++++++++++++++++---- devel/gettext/patches/patch-ah | 43 ++++++++++++++++++++++++++++++++++++++---- devel/gettext/patches/patch-ai | 26 ------------------------- 5 files changed, 62 insertions(+), 39 deletions(-) delete mode 100644 devel/gettext/patches/patch-ai (limited to 'devel') diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 6ac89cb7ec1..75d150259ae 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2003/10/19 01:34:13 heinz Exp $ +# $NetBSD: Makefile,v 1.53 2003/12/05 18:15:49 erh Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp # @@ -31,6 +31,8 @@ CONFIGURE_ENV+= HAVE_GCJ_IN_PATH= CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH= CONFIGURE_ENV+= HAVE_JIKES_IN_PATH= +MAKE_ENV+= OPSYS="${OPSYS}" + TEST_TARGET= check post-install: diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo index 6454822dcdc..3268b05e190 100644 --- a/devel/gettext/distinfo +++ b/devel/gettext/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.9 2003/04/27 19:18:20 jmmv Exp $ +$NetBSD: distinfo,v 1.10 2003/12/05 18:15:49 erh Exp $ SHA1 (gettext-0.11.5.tar.gz) = 4d17534afac106bc0f2310a9fd77a291d433234b Size (gettext-0.11.5.tar.gz) = 3724099 bytes SHA1 (patch-aa) = faa6d71599703d20ac7652637c83a0c713467a32 SHA1 (patch-ab) = 6e9eec0ff3bbab05df5a6b513ee9f8d3b39ad385 SHA1 (patch-ac) = 1703e08d31fb31b99f6496ef56f4c405f1baefab -SHA1 (patch-ag) = cf14f276a6fb6def0ea5bffcd76c4ee35ddb1b1e -SHA1 (patch-ah) = b7bcc53f243596165f2f0906a5f7687d05f2faae -SHA1 (patch-ai) = 97b824ed5e8b776a6b9e5a75287c6349e8e345d4 +SHA1 (patch-ag) = ec7477b6d66dbbb6bc3169f700ced6b117a6db27 +SHA1 (patch-ah) = 3de0f7bdffb57352cbfc361729d463ed53b53886 SHA1 (patch-aj) = 8c8cf6fcc6f23a54b5e20e1ab741d4a7d92a11a7 SHA1 (patch-ak) = 6ba1e5c4180cfc76b3545551f18c16f2c1bdbb15 SHA1 (patch-al) = de803407110c28b044aad8c122ff42181510a0e3 diff --git a/devel/gettext/patches/patch-ag b/devel/gettext/patches/patch-ag index dd728e3667f..1c1204847bd 100644 --- a/devel/gettext/patches/patch-ag +++ b/devel/gettext/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.4 2002/12/11 22:27:26 jlam Exp $ +$NetBSD: patch-ag,v 1.5 2003/12/05 18:15:49 erh Exp $ ---- lib/Makefile.in.orig Tue Aug 6 06:58:14 2002 -+++ lib/Makefile.in -@@ -227,7 +227,7 @@ libgettextlib_la_LIBADD = @LTALLOCA@ @LT +--- lib/Makefile.in.orig 2002-08-06 08:58:14.000000000 -0500 ++++ lib/Makefile.in 2003-12-04 17:16:55.000000000 -0600 +@@ -227,7 +227,7 @@ # Need @LTLIBICONV@ because linebreak.c uses iconv(). libgettextlib_la_LDFLAGS = \ -release @VERSION@ \ @@ -11,3 +11,16 @@ $NetBSD: patch-ag,v 1.4 2002/12/11 22:27:26 jlam Exp $ +@@ -517,9 +517,12 @@ + + + # No need to install libgettextlib.a. ++# Unless we're on AIX, where .a's are shared libraries. + install-exec-am: install-exec-clean + install-exec-clean: ++.if ${OPSYS} != "AIX" + $(RM) $(DESTDIR)$(libdir)/libgettextlib.a ++.endif + + all-local c-ctype.lo execute.lo javacomp.lo javaexec.lo pipe-bidi.lo pipe-in.lo pipe-out.lo progname.lo tmpdir.lo wait-process.lo xerror.lo: @STDBOOL_H@ + stdbool.h: stdbool.h.in diff --git a/devel/gettext/patches/patch-ah b/devel/gettext/patches/patch-ah index c66114de52b..2982d8bd7fc 100644 --- a/devel/gettext/patches/patch-ah +++ b/devel/gettext/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.3 2002/12/11 22:27:26 jlam Exp $ +$NetBSD: patch-ah,v 1.4 2003/12/05 18:15:49 erh Exp $ ---- src/Makefile.in.orig Tue Aug 6 06:59:06 2002 -+++ src/Makefile.in -@@ -248,7 +248,7 @@ urlget_SOURCES = urlget.c +--- src/Makefile.in.orig 2002-08-06 08:59:06.000000000 -0500 ++++ src/Makefile.in 2003-12-04 17:34:23.000000000 -0600 +@@ -248,7 +248,7 @@ # use iconv(). libgettextsrc_la_LDFLAGS = \ -release @VERSION@ \ @@ -11,3 +11,38 @@ $NetBSD: patch-ah,v 1.3 2002/12/11 22:27:26 jlam Exp $ # Link dependencies. +@@ -267,9 +267,7 @@ + msgexec_LDADD = libgettextsrc.la + msgfilter_LDADD = libgettextsrc.la + msggrep_LDADD = libgettextsrc.la +-msginit_LDADD = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- libgettextsrc.la ++msginit_LDADD = libgettextsrc.la + + msguniq_LDADD = libgettextsrc.la + +@@ -367,9 +365,7 @@ + msggrep_LDFLAGS = + am_msginit_OBJECTS = msginit.$(OBJEXT) + msginit_OBJECTS = $(am_msginit_OBJECTS) +-msginit_DEPENDENCIES = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- libgettextsrc.la ++msginit_DEPENDENCIES = libgettextsrc.la + msginit_LDFLAGS = + am_msgmerge_OBJECTS = msgmerge.$(OBJEXT) + msgmerge_OBJECTS = $(am_msgmerge_OBJECTS) +@@ -731,9 +727,12 @@ + + + # No need to install libgettextsrc.a. ++# Unless we're on AIX, where .a's are shared libraries. + install-exec-am: install-exec-clean + install-exec-clean: ++.if ${OPSYS} != "AIX" + $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a ++.endif + + po-lex.o po-lex.lo: po-gram-gen2.h + po-gram-gen2.h: po-gram-gen.h diff --git a/devel/gettext/patches/patch-ai b/devel/gettext/patches/patch-ai deleted file mode 100644 index 6771c00f6c4..00000000000 --- a/devel/gettext/patches/patch-ai +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2002/11/27 17:41:07 drochner Exp $ - ---- src/Makefile.in.orig Tue Aug 6 15:59:06 2002 -+++ src/Makefile.in Sun Sep 1 16:27:46 2002 -@@ -267,9 +267,7 @@ - msgexec_LDADD = libgettextsrc.la - msgfilter_LDADD = libgettextsrc.la - msggrep_LDADD = libgettextsrc.la --msginit_LDADD = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ -- ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ -- libgettextsrc.la -+msginit_LDADD = libgettextsrc.la - - msguniq_LDADD = libgettextsrc.la - -@@ -367,9 +365,7 @@ - msggrep_LDFLAGS = - am_msginit_OBJECTS = msginit.$(OBJEXT) - msginit_OBJECTS = $(am_msginit_OBJECTS) --msginit_DEPENDENCIES = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ -- ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ -- libgettextsrc.la -+msginit_DEPENDENCIES = libgettextsrc.la - msginit_LDFLAGS = - am_msgmerge_OBJECTS = msgmerge.$(OBJEXT) - msgmerge_OBJECTS = $(am_msgmerge_OBJECTS) -- cgit v1.2.3