diff options
author | bouyer <bouyer@pkgsrc.org> | 2003-03-31 16:26:20 +0000 |
---|---|---|
committer | bouyer <bouyer@pkgsrc.org> | 2003-03-31 16:26:20 +0000 |
commit | 05996df950c430109182b4e87b92f9191f8c821e (patch) | |
tree | 502b2fae57071005bf774cb75d9d6e660fee6436 | |
parent | 6d5f0d86048fd6c0e24ae9dfbbedd87d2fa391f1 (diff) | |
download | pkgsrc-05996df950c430109182b4e87b92f9191f8c821e.tar.gz |
textutils uses gettext, include gettext-lib/buildlink2.mk so it works
on systems where an appropriate libintl is not in /usr/lib.
Remove $(LDADD) from dependacies, it may contain linker flags.
-rw-r--r-- | textproc/textutils/Makefile | 3 | ||||
-rw-r--r-- | textproc/textutils/distinfo | 3 | ||||
-rw-r--r-- | textproc/textutils/patches/patch-aa | 31 |
3 files changed, 35 insertions, 2 deletions
diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile index 718ed8fa0c0..3c82e8899d8 100644 --- a/textproc/textutils/Makefile +++ b/textproc/textutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/01/09 17:07:55 cjep Exp $ +# $NetBSD: Makefile,v 1.14 2003/03/31 16:26:20 bouyer Exp $ # DISTNAME= textutils-2.0 @@ -26,5 +26,6 @@ BUILD_DEFS+= GNU_PROGRAM_PREFIX post-install: ${INSTALL_INFO} ${PREFIX}/info/textutils.info ${PREFIX}/info/dir +.include "../../devel/gettext-lib/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/textutils/distinfo b/textproc/textutils/distinfo index ccb249231f4..7a51d004985 100644 --- a/textproc/textutils/distinfo +++ b/textproc/textutils/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 15:05:11 skrll Exp $ +$NetBSD: distinfo,v 1.3 2003/03/31 16:26:20 bouyer Exp $ SHA1 (textutils-2.0.tar.gz) = c36e37f77bac412c6e245e5ba41fc2b2f9ed75ac Size (textutils-2.0.tar.gz) = 1532425 bytes +SHA1 (patch-aa) = 39044295263886354afae87e626094f725bf5fda SHA1 (patch-ab) = 73318127866d2026ed70ff7dda60b56e3734ef1f diff --git a/textproc/textutils/patches/patch-aa b/textproc/textutils/patches/patch-aa new file mode 100644 index 00000000000..68e6e0b3f3a --- /dev/null +++ b/textproc/textutils/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.1 2003/03/31 16:26:21 bouyer Exp $ + +--- src/Makefile.in.orig Fri Aug 6 22:56:33 1999 ++++ src/Makefile.in Sun Mar 30 18:56:56 2003 +@@ -104,14 +104,14 @@ + EXTRA_DIST = tac-pipe.c + + datadir = $(prefix)/@DATADIRNAME@ +-localedir = $(datadir)/locale ++localedir = /usr/local/lib/locale + + INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl +-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ ++DEFS = -DLOCALEDIR="\"/usr/local/lib/locale\"" @DEFS@ + LDADD = @INTLLIBS@ ../lib/libtu.a + + sort_LDADD = $(LDADD) @POW_LIBM@ +-sort_DEPENDENCIES = $(LDADD) ++sort_DEPENDENCIES = ../lib/libtu.a + subdir = src + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +@@ -704,8 +704,6 @@ + mostlyclean distclean maintainer-clean + + +-$(PROGRAMS): $(LDADD) +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |