head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.26 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.24 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.22 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.20 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.18 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.16 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.14 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.12 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.10 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.8 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.6 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.4 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.2 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.6.0.18 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.16 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.14 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.12 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.10 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.8 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.6 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.4 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.2 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.5.0.10 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.8 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.6 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 buildlink2-base:1.2 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.8 date 2007.05.28.07.57.47; author obache; state dead; branches; next 1.7; 1.7 date 2007.05.12.00.52.29; author obache; state Exp; branches; next 1.6; 1.6 date 2005.03.03.07.51.40; author grant; state Exp; branches; next 1.5; 1.5 date 2003.11.12.01.25.25; author salo; state Exp; branches; next 1.4; 1.4 date 2002.11.26.06.50.22; author jlam; state Exp; branches; next 1.3; 1.3 date 2002.10.19.18.08.59; author martti; state Exp; branches; next 1.2; 1.2 date 2001.06.14.12.55.18; author mjl; state dead; branches; next 1.1; 1.1 date 2001.04.24.12.29.03; author wulf; state Exp; branches; next ; desc @@ 1.8 log @Remove unneeded patches. @ text @$NetBSD: patch-ab,v 1.7 2007/05/12 00:52:29 obache Exp $ --- Makefile.in.orig 2006-10-15 14:29:45.000000000 +0000 +++ Makefile.in @@@@ -183,7 +183,7 @@@@ LDFLAGS = @@LDFLAGS@@ LIBICONV = @@LIBICONV@@ LIBINTL = @@LIBINTL@@ LIBOBJS = @@LIBOBJS@@ -LIBS = @@LIBS@@ +LIBS = @@LIBS@@ @@INTLLIBS@@ LIBTOOL = @@LIBTOOL@@ LN_S = @@LN_S@@ LTLIBICONV = @@LTLIBICONV@@ @@@@ -277,13 +277,13 @@@@ INCLUDES = -I. -I$(top_srcdir) noinst_HEADERS = findme.h poptint.h system.h test1_SOURCES = test1.c test1_LDFLAGS = -test1_LDADD = $(usrlib_LTLIBRARIES) +test1_LDADD = $(usrlib_LTLIBRARIES) $(LIBINTL) test2_SOURCES = test2.c test2_LDFLAGS = -test2_LDADD = $(usrlib_LTLIBRARIES) +test2_LDADD = $(usrlib_LTLIBRARIES) $(LIBINTL) test3_SOURCES = test3.c test3_LDFLAGS = -test3_LDADD = $(usrlib_LTLIBRARIES) +test3_LDADD = $(usrlib_LTLIBRARIES) $(LIBINTL) noinst_SCRIPTS = testit.sh TESTS_ENVIRONMENT = \ test1="./test1" @ 1.7 log @Update popt to 1.10.7. Changes are unavailable. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2005/03/03 07:51:40 grant Exp $ @ 1.6 log @don't attempt to statically link system libraries. from Eric Boutilier in PR pkg/29470. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.in.orig 2002-08-31 23:22:18.000000000 +1000 d5 11 a15 3 @@@@ -132,14 +132,14 @@@@ noinst_HEADERS = findme.h poptint.h syst noinst_PROGRAMS = test1 test2 test3 d17 3 a19 4 -test1_LDFLAGS = -all-static -test1_LDADD = $(lib_LTLIBRARIES) +test1_LDFLAGS = +test1_LDADD = $(lib_LTLIBRARIES) $(LIBINTL) d21 3 a23 4 -test2_LDFLAGS = -all-static -test2_LDADD = $(lib_LTLIBRARIES) +test2_LDFLAGS = +test2_LDADD = $(lib_LTLIBRARIES) $(LIBINTL) d25 3 a27 5 -test3_LDFLAGS = -all-static -test3_LDADD = $(lib_LTLIBRARIES) +test3_LDFLAGS = +test3_LDADD = $(lib_LTLIBRARIES) $(LIBINTL) d29 2 a30 10 @@@@ -187,7 +187,7 @@@@ DEFS = @@DEFS@@ 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 \ @ 1.5 log @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. @ text @d3 4 a6 3 --- 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 @@@@ d9 1 a9 1 test1_LDFLAGS = -all-static d11 1 d14 1 a14 1 test2_LDFLAGS = -all-static d16 1 d19 1 a19 1 test3_LDFLAGS = -all-static d21 1 d26 1 a26 1 @@@@ -187,7 +187,7 @@@@ @ 1.4 log @Don't force the use of "-lintl"...use "$(LIBINTL)" instead, which may be empty on some systems that provide gettext() functions directly in libc. Fix by Jeremy Reed in PR 19171. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2002/10/19 18:08:59 martti Exp $ d3 2 a4 2 --- Makefile.in.orig Sat Oct 19 18:32:02 2002 +++ Makefile.in Sat Oct 19 19:07:20 2002 d22 9 @ 1.3 log @Fix build failure (PR#18795) @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 +test1_LDADD = $(lib_LTLIBRARIES) -lintl d14 1 a14 1 +test2_LDADD = $(lib_LTLIBRARIES) -lintl d18 1 a18 1 +test3_LDADD = $(lib_LTLIBRARIES) -lintl @ 1.2 log @Update to 1.5. (Incomplete, alas) changes: - heavy dose of const's - poptParseArgvString() now NULL terminates the list - added support for single - - misc bug fixes - portability improvements - fixed memset() in help message generation - added extern "C" stuff to popt.h for C++ compilers - const'ified poptParseArgvString - fixed bug in chaind alias happens which seems to have only affected --triggers in rpm - added POPT_ARG_VAL - popt.3 installed by default - added POPT_ARG_INTL_DOMAIN - updated Makefile's to be more GNUish @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2001/04/24 12:29:03 wulf Exp $ d3 16 a18 5 --- popt.h.orig Mon Apr 23 23:13:20 2001 +++ popt.h Mon Apr 23 23:15:20 2001 @@@@ -76,6 +76,9 @@@@ const struct poptOption * opt, const char * arg, void * data); d20 1 a20 13 +#ifdef __cplusplus +extern "C" { +#endif poptContext poptGetContext(char * name, int argc, char ** argv, const struct poptOption * options, int flags); void poptResetContext(poptContext con); @@@@ -106,5 +109,8 @@@@ void poptPrintUsage(poptContext con, FILE * f, int flags); void poptSetOtherOptionHelp(poptContext con, const char * text); const char * poptGetInvocationName(poptContext con); +#ifdef __cplusplus +} +#endif a21 1 #endif @ 1.1 log @Modified popt.h to support linking of libpopt with C++ applications @ text @d1 1 a1 1 $NetBSD$ @