[pkgsrc/trunk]: pkgsrc/devel/popt PKGREVISION++

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba83cd398afe
branches:  trunk
changeset: 463460:ba83cd398afe
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Nov 12 01:25:25 2003 +0000

description:
PKGREVISION++
Link against libintl correctly so it doesn't exhibit unresolved gettext
symbols to binaries trying to link with libpopt.

Fixes (at least) fonts/chkfontpath as seen in recent bulk builds.

diffstat:

 devel/popt/Makefile         |   4 ++--
 devel/popt/buildlink2.mk    |   4 ++--
 devel/popt/distinfo         |   4 ++--
 devel/popt/patches/patch-ab |  15 ++++++++++++---
 4 files changed, 18 insertions(+), 9 deletions(-)

diffs (70 lines):

diff -r 66b27eb74900 -r ba83cd398afe devel/popt/Makefile
--- a/devel/popt/Makefile       Tue Nov 11 22:15:01 2003 +0000
+++ b/devel/popt/Makefile       Wed Nov 12 01:25:25 2003 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2003/07/17 21:33:09 grant Exp $
+# $NetBSD: Makefile,v 1.22 2003/11/12 01:25:25 salo Exp $
 #
 
 DISTNAME=      popt-1.7
-PKGREVISION=   2
+PKGREVISION=   3
 WRKSRC=                ${WRKDIR}/${DISTNAME}
 CATEGORIES=    devel
 MASTER_SITES=  ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/               \
diff -r 66b27eb74900 -r ba83cd398afe devel/popt/buildlink2.mk
--- a/devel/popt/buildlink2.mk  Tue Nov 11 22:15:01 2003 +0000
+++ b/devel/popt/buildlink2.mk  Wed Nov 12 01:25:25 2003 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:51:25 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/11/12 01:25:25 salo Exp $
 
 .if !defined(POPT_BUILDLINK2_MK)
 POPT_BUILDLINK2_MK=    # defined
 
 BUILDLINK_PACKAGES+=           popt
-BUILDLINK_DEPENDS.popt?=       popt>=1.7nb2
+BUILDLINK_DEPENDS.popt?=       popt>=1.7nb3
 BUILDLINK_PKGSRCDIR.popt?=     ../../devel/popt
 
 EVAL_PREFIX+=                  BUILDLINK_PREFIX.popt=popt
diff -r 66b27eb74900 -r ba83cd398afe devel/popt/distinfo
--- a/devel/popt/distinfo       Tue Nov 11 22:15:01 2003 +0000
+++ b/devel/popt/distinfo       Wed Nov 12 01:25:25 2003 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2003/05/06 13:08:37 grant Exp $
+$NetBSD: distinfo,v 1.13 2003/11/12 01:25:25 salo Exp $
 
 SHA1 (popt-1.7.tar.gz) = 66f3c77b87a160951b180447f4a6dce68ad2f71b
 Size (popt-1.7.tar.gz) = 574549 bytes
-SHA1 (patch-ab) = 7c9ad516baeb6343dfc21f8611f132592575d084
+SHA1 (patch-ab) = e3f4376c7090b59fbe4b2ef4404560f28bcc3079
 SHA1 (patch-ac) = d95914024999789d60bd530865bb8613ed13f17c
 SHA1 (patch-ad) = 33ac94c57ad05d2fe99c9620181b59ce1402c21e
diff -r 66b27eb74900 -r ba83cd398afe devel/popt/patches/patch-ab
--- a/devel/popt/patches/patch-ab       Tue Nov 11 22:15:01 2003 +0000
+++ b/devel/popt/patches/patch-ab       Wed Nov 12 01:25:25 2003 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2002/11/26 06:50:22 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2003/11/12 01:25:25 salo Exp $
 
---- Makefile.in.orig   Sat Oct 19 18:32:02 2002
-+++ Makefile.in        Sat Oct 19 19:07:20 2002
+--- Makefile.in.orig   2002-08-31 15:22:18.000000000 +0200
++++ Makefile.in        2003-11-11 16:20:23.000000000 +0100
 @@ -133,13 +133,13 @@
  noinst_PROGRAMS = test1 test2 test3
  test1_SOURCES = test1.c
@@ -19,3 +19,12 @@
  
  noinst_SCRIPTS = testit.sh
  
+@@ -187,7 +187,7 @@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ @INTLLIBS@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/findme.Plo ./$(DEPDIR)/popt.Plo \