diff options
Diffstat (limited to 'devel/gettext/patches/patch-ai')
| -rw-r--r-- | devel/gettext/patches/patch-ai | 83 |
1 files changed, 23 insertions, 60 deletions
diff --git a/devel/gettext/patches/patch-ai b/devel/gettext/patches/patch-ai index 473b39a007e..6771c00f6c4 100644 --- a/devel/gettext/patches/patch-ai +++ b/devel/gettext/patches/patch-ai @@ -1,63 +1,26 @@ -$NetBSD: patch-ai,v 1.1 2000/10/31 17:06:18 itojun Exp $ +$NetBSD: patch-ai,v 1.2 2002/11/27 17:41:07 drochner Exp $ -use already-installed libintl, not in-tree libintl - ---- src/Makefile.in.orig Fri May 1 15:47:25 1998 -+++ src/Makefile.in Wed Nov 1 01:25:11 2000 -@@ -108,7 +108,7 @@ - - INCLUDES = -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl - DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ --LDADD = ../lib/libnlsut.a ../intl/libintl.$la -+LDADD = ../lib/libnlsut.a +--- 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 - SED = sed - YACC = @YACC@ -@@ -136,39 +136,39 @@ + msguniq_LDADD = libgettextsrc.la - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lintl - gettext_OBJECTS = gettextp.o - gettext_LDADD = $(LDADD) --gettext_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+gettext_DEPENDENCIES = ../lib/libnlsut.a - gettext_LDFLAGS = - msgcmp_OBJECTS = message.o msgcmp.o open-po.o po-gram.gen.o \ - po-hash.gen.o po-lex.o po.o str-list.o dir-list.o - msgcmp_LDADD = $(LDADD) --msgcmp_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+msgcmp_DEPENDENCIES = ../lib/libnlsut.a - msgcmp_LDFLAGS = - msgfmt_OBJECTS = msgfmt.o open-po.o po-gram.gen.o po-hash.gen.o \ - po-lex.o po.o str-list.o message.o dir-list.o - msgfmt_LDADD = $(LDADD) --msgfmt_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+msgfmt_DEPENDENCIES = ../lib/libnlsut.a - msgfmt_LDFLAGS = - msgmerge_OBJECTS = message.o msgmerge.o open-po.o po-gram.gen.o \ - po-hash.gen.o po-lex.o po.o str-list.o dir-list.o - msgmerge_LDADD = $(LDADD) --msgmerge_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+msgmerge_DEPENDENCIES = ../lib/libnlsut.a - msgmerge_LDFLAGS = - msgunfmt_OBJECTS = message.o msgunfmt.o str-list.o - msgunfmt_LDADD = $(LDADD) --msgunfmt_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+msgunfmt_DEPENDENCIES = ../lib/libnlsut.a - msgunfmt_LDFLAGS = - xgettext_OBJECTS = message.o open-po.o po-gram.gen.o po-hash.gen.o \ - po-lex.o po.o str-list.o xget-lex.o xgettext.o dir-list.o - xgettext_LDADD = $(LDADD) --xgettext_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+xgettext_DEPENDENCIES = ../lib/libnlsut.a - xgettext_LDFLAGS = - msgcomm_OBJECTS = msgcomm.o message.o po-gram.gen.o po-hash.gen.o \ - po-lex.o open-po.o po.o str-list.o dir-list.o - msgcomm_LDADD = $(LDADD) --msgcomm_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+msgcomm_DEPENDENCIES = ../lib/libnlsut.a - msgcomm_LDFLAGS = - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +@@ -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) |