head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.8 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.6 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.4 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.2 pkgsrc-2011Q2-base:1.8 pkgsrc-2010Q1:1.7.0.10 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.8 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.6 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.4 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.2 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.6.0.38 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.36 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.34 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.32 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.30 pkgsrc-2008Q1:1.6.0.28 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.26 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.24 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.22 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.20 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.18 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.16 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.14 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.12 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.10 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.8 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.6 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.4 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.2 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.5.0.4 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.2 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.0.2; locks; strict; comment @# @; 1.8 date 2010.06.11.13.49.00; author drochner; state dead; branches; next 1.7; 1.7 date 2009.03.06.14.02.32; author wiz; state Exp; branches; next 1.6; 1.6 date 2004.11.05.10.19.10; author sketch; state Exp; branches; next 1.5; 1.5 date 2004.05.23.14.12.45; author tron; state dead; branches; next 1.4; 1.4 date 2004.05.22.17.41.31; author tron; state Exp; branches; next 1.3; 1.3 date 2002.10.30.03.09.35; author rh; state dead; branches; next 1.2; 1.2 date 2002.08.25.19.23.10; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.21.12.06.08; author rh; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.05.21.12.06.08; author jlam; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2002.06.23.18.54.48; author jlam; state Exp; branches; next ; desc @@ 1.8 log @update to 2.14.18 changes: bugfixes @ text @$NetBSD: patch-aa,v 1.7 2009/03/06 14:02:32 wiz Exp $ --- src/idl-compiler/orbit-idl-c-headers.c.orig 2008-08-31 14:04:43.000000000 +0000 +++ src/idl-compiler/orbit-idl-c-headers.c @@@@ -587,6 +587,16 @@@@ ch_output_codefrag(IDL_tree tree, OIDL_R while(*cte && !isspace((int)*cte) && *cte != '"') cte++; *cte = '\0'; fprintf(ci->fh, "#include <%s>\n", ctmp); + } else if(!strncmp(list->data, + "#pragma\tinclude_defs", + sizeof("#pragma\tinclude_defs")-1)) { + char *ctmp, *cte; + ctmp = ((char *)list->data) + sizeof("#pragma\tinclude_defs"); + while(*ctmp && (isspace((int)*ctmp) || *ctmp == '"')) ctmp++; + cte = ctmp; + while(*cte && !isspace((int)*cte) && *cte != '"') cte++; + *cte = '\0'; + fprintf(ci->fh, "#include <%s>\n", ctmp); } else fprintf(ci->fh, "%s\n", (char *)list->data); } @ 1.7 log @Update to 2.14.17: ORBit2-2.14.17 - bug fixes + fix glib single includes (Cosimo Cecchi) + various fixes for cross-compiling (Fridrich Strba) + do fewer DNS lookups in linc (Jules Colding) + fix compiler warnings (Kjartan) + threading fixes (Tor Lillqvist) + win32 portability fixes (Tor Lillqvist) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2004/11/05 10:19:10 sketch Exp $ @ 1.6 log @Sunpro (and possibly other compilers') preprocessor takes the input of "#pragmafoo..." and outputs "#pragmafoo...", breaking the ORBit preprocessor which only looks for the former. Ensure the latter case is handled. Fixes build on Solaris/Sunpro. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- src/idl-compiler/orbit-idl-c-headers.c.orig Wed Nov 3 13:10:51 2004 +++ src/idl-compiler/orbit-idl-c-headers.c Wed Nov 3 13:11:53 2004 @@@@ -447,6 +447,16 @@@@ @ 1.5 log @Backout last change. It is no longer necessary with revision 1.24 of "src/include/resolv.h" as pointed out by Markus W. Kilbinger in private e-mail. @ text @d1 21 a21 31 --- linc2/src/linc-protocols.c.orig 2004-02-02 17:29:05.000000000 +0100 +++ linc2/src/linc-protocols.c 2004-05-22 19:37:12.000000000 +0200 @@@@ -21,6 +21,10 @@@@ static char *link_tmpdir = NULL; +#if defined(__NetBSD__) && defined(__RES__) && (__RES >= 20030124) +extern struct __res_state _res; +#endif + /* * make_local_tmpdir: * @@dirname: directory name. @@@@ -359,7 +363,7 @@@@ int i; LINK_RESOLV_UNSET_IPV6; -#ifdef HAVE_RESOLV_H +#if defined(HAVE_RESOLV_H) if (!(_res.options & RES_INIT)) res_init(); #endif @@@@ -455,7 +459,7 @@@@ return (struct sockaddr *)saddr; #else -#ifdef HAVE_RESOLV_H +#if defined(HAVE_RESOLV_H) if (!(_res.options & RES_INIT)) res_init(); #endif @ 1.4 log @Make this build and work under NetBSD 2.0E and above with the bind9 resolver library. @ text @@ 1.3 log @Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE. @ text @d1 31 a31 11 $NetBSD: patch-aa,v 1.2 2002/08/25 19:23:10 jlam Exp $ --- ORBit-2.0.pc.in.orig Sat Apr 27 18:24:08 2002 +++ ORBit-2.0.pc.in @@@@ -9,5 +9,5 @@@@ Description: High-performance CORBA Object Request Broker. Version: @@ORBIT_VERSION@@ Requires: linc glib-2.0 gmodule-2.0 -Libs: -L${libdir} -lORBit-2 @@ORBIT_LIBS@@ @@LIBS@@ -lm +Libs: -Wl,-R${libdir} -L${libdir} -lORBit-2 @@ORBIT_LIBS@@ @@LIBS@@ -lm Cflags: -I${includedir}/orbit-2.0 -DORBIT2=1 @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.2.1 2002/06/23 18:54:48 jlam Exp $ @ 1.1 log @Commit the missing patch that should have been here all along. This patch adds a missing -Wl,-R to the pkg-config template. Regen distinfo. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-aa was added on branch buildlink2 on 2002-06-23 18:54:48 +0000 @ text @d1 11 @ 1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 11 $NetBSD: patch-aa,v 1.1.2.1 2002/06/23 18:54:48 jlam Exp $ --- ORBit-2.0.pc.in.orig Sat Apr 27 18:24:08 2002 +++ ORBit-2.0.pc.in @@@@ -9,5 +9,5 @@@@ Description: High-performance CORBA Object Request Broker. Version: @@ORBIT_VERSION@@ Requires: linc glib-2.0 gmodule-2.0 -Libs: -L${libdir} -lORBit-2 @@ORBIT_LIBS@@ @@LIBS@@ -lm +Libs: -Wl,-R${libdir} -L${libdir} -lORBit-2 @@ORBIT_LIBS@@ @@LIBS@@ -lm Cflags: -I${includedir}/orbit-2.0 -DORBIT2=1 @