Thu Oct 9 20:22:23 2008 UTC ()
Update to 2.14.16:

ORBit2-2.14.16

	- bug fixes
		+ fix make check on Mac OS/X
		+ The ORBNetID option was not consistent in relation to
		  ORBIIOPIPName. This fix ensures that ORBIIOPIPName always
		  takes precedence. (Jules Colding)

ORBit2-2.14.15

	- bug fixes
		+ fix some leaks (Jules Colding)
		+ fix for Mike's recent fixes (Mike Gorse)
		+ fix potential make loop (Diego Petten嘆)


(wiz)
diff -r1.64 -r1.65 pkgsrc/net/ORBit2/Makefile
diff -r1.42 -r1.43 pkgsrc/net/ORBit2/distinfo
diff -r1.6 -r1.7 pkgsrc/net/ORBit2/patches/patch-ab
cvs diff -r1.64 -r1.65 pkgsrc/net/ORBit2/Makefile (switch to unified diff)

--- pkgsrc/net/ORBit2/Makefile 2008/09/06 15:10:18 1.64
+++ pkgsrc/net/ORBit2/Makefile 2008/10/09 20:22:23 1.65
@@ -1,55 +1,55 @@ @@ -1,55 +1,55 @@
1# $NetBSD: Makefile,v 1.64 2008/09/06 15:10:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.65 2008/10/09 20:22:23 wiz Exp $
2# 2#
3 3
4DISTNAME= ORBit2-2.14.14 4DISTNAME= ORBit2-2.14.16
5CATEGORIES= net gnome 5CATEGORIES= net gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ORBit2/2.14/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ORBit2/2.14/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= rh@NetBSD.org 9MAINTAINER= rh@NetBSD.org
10HOMEPAGE= http://orbit-resource.sourceforge.net/ 10HOMEPAGE= http://orbit-resource.sourceforge.net/
11COMMENT= High-performance CORBA ORB with C language support 11COMMENT= High-performance CORBA ORB with C language support
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16CONFLICTS= linc>=1.1 16CONFLICTS= linc>=1.1
17 17
18# make sometimes spins forever 18# make sometimes spins forever
19MAKE_JOBS_SAFE= no 19MAKE_JOBS_SAFE= no
20 20
21USE_TOOLS+= gmake pkg-config 21USE_TOOLS+= gmake pkg-config
22USE_LIBTOOL= YES 22USE_LIBTOOL= YES
23GNU_CONFIGURE= YES 23GNU_CONFIGURE= YES
24# needs interaction 24# needs interaction
25#TEST_TARGET= check 25#TEST_TARGET= check
26 26
27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
28 28
29PKG_OPTIONS_VAR= PKG_OPTIONS.ORBit2 29PKG_OPTIONS_VAR= PKG_OPTIONS.ORBit2
30PKG_SUPPORTED_OPTIONS= inet6 30PKG_SUPPORTED_OPTIONS= inet6
31PKG_SUGGESTED_OPTIONS= inet6 31PKG_SUGGESTED_OPTIONS= inet6
32 32
33.include "../../mk/bsd.prefs.mk" 33.include "../../mk/bsd.prefs.mk"
34.include "../../mk/bsd.options.mk" 34.include "../../mk/bsd.options.mk"
35 35
36.if !empty(PKG_OPTIONS:Minet6) 36.if !empty(PKG_OPTIONS:Minet6)
37CPPFLAGS+= -DINET6 37CPPFLAGS+= -DINET6
38.endif 38.endif
39 39
40PKGCONFIG_OVERRIDE= ORBit-2.0.pc.in 40PKGCONFIG_OVERRIDE= ORBit-2.0.pc.in
41PKGCONFIG_OVERRIDE+= ORBit-CosNaming-2.0.pc.in 41PKGCONFIG_OVERRIDE+= ORBit-CosNaming-2.0.pc.in
42PKGCONFIG_OVERRIDE+= ORBit-imodule-2.0.pc.in 42PKGCONFIG_OVERRIDE+= ORBit-imodule-2.0.pc.in
43PKGCONFIG_OVERRIDE+= src/idl-compiler/ORBit-idl-2.0.pc.in 43PKGCONFIG_OVERRIDE+= src/idl-compiler/ORBit-idl-2.0.pc.in
44 44
45CPPFLAGS.Darwin+= -DBIND_8_COMPAT 45CPPFLAGS.Darwin+= -DBIND_8_COMPAT
46 46
47PRINT_PLIST_AWK+= /^@dirrm share\/idl$$/ \ 47PRINT_PLIST_AWK+= /^@dirrm share\/idl$$/ \
48 { print "@unexec $${RMDIR} %D/" $$2 \ 48 { print "@unexec $${RMDIR} %D/" $$2 \
49 " 2>/dev/null || $${TRUE}"; next; } 49 " 2>/dev/null || $${TRUE}"; next; }
50 50
51BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 51BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
52 52
53.include "../../devel/glib2/buildlink3.mk" 53.include "../../devel/glib2/buildlink3.mk"
54.include "../../net/libIDL/buildlink3.mk" 54.include "../../net/libIDL/buildlink3.mk"
55.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.42 -r1.43 pkgsrc/net/ORBit2/distinfo (switch to unified diff)

--- pkgsrc/net/ORBit2/distinfo 2008/09/06 15:10:18 1.42
+++ pkgsrc/net/ORBit2/distinfo 2008/10/09 20:22:23 1.43
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.42 2008/09/06 15:10:18 wiz Exp $ 1$NetBSD: distinfo,v 1.43 2008/10/09 20:22:23 wiz Exp $
2 2
3SHA1 (ORBit2-2.14.14.tar.bz2) = 263ab65c72133775306f2279e666245ad8fad9da 3SHA1 (ORBit2-2.14.16.tar.bz2) = d366a92f8ce1989caf21cc6884f90cbcad42ea59
4RMD160 (ORBit2-2.14.14.tar.bz2) = c09b43e7b66380f25857f7e2570c51958108f3e5 4RMD160 (ORBit2-2.14.16.tar.bz2) = 69a76a246d06f10708cfda9c420be173e0746b39
5Size (ORBit2-2.14.14.tar.bz2) = 739599 bytes 5Size (ORBit2-2.14.16.tar.bz2) = 739458 bytes
6SHA1 (patch-aa) = 6e87e28e3634908f35c219f81a47d0353cfaf551 6SHA1 (patch-aa) = 6e87e28e3634908f35c219f81a47d0353cfaf551
7SHA1 (patch-ab) = 1661eaaa0119895a860e0c667990ea71b80e8ace 7SHA1 (patch-ab) = efd6a945b3ac65823a36bb8301fa8d0c8ff99960
8SHA1 (patch-ac) = 075a11883b9d0a3ec7d5d93b37007ba64e1baf41 8SHA1 (patch-ac) = 075a11883b9d0a3ec7d5d93b37007ba64e1baf41
9SHA1 (patch-ae) = d92c0c8985be666e6ec60b46ff8007447ffc4275 9SHA1 (patch-ae) = d92c0c8985be666e6ec60b46ff8007447ffc4275
cvs diff -r1.6 -r1.7 pkgsrc/net/ORBit2/patches/patch-ab (switch to unified diff)

--- pkgsrc/net/ORBit2/patches/patch-ab 2007/08/05 20:48:48 1.6
+++ pkgsrc/net/ORBit2/patches/patch-ab 2008/10/09 20:22:23 1.7
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.6 2007/08/05 20:48:48 joerg Exp $ 1$NetBSD: patch-ab,v 1.7 2008/10/09 20:22:23 wiz Exp $
2 2
3--- src/orb/orb-core/Makefile.in.orig 2007-08-05 20:18:06.000000000 +0000 3--- src/orb/orb-core/Makefile.in.orig 2008-09-16 13:11:18.000000000 +0000
4+++ src/orb/orb-core/Makefile.in 4+++ src/orb/orb-core/Makefile.in
5@@ -625,7 +625,7 @@ distclean-local: 5@@ -623,7 +623,7 @@ distclean-local:
 6 -rm -rf .deps
6 $(OPS_IDLOUT_C): $(OPS_IDLOUT_H) 7 $(OPS_IDLOUT_C): $(OPS_IDLOUT_H)
7 true 
8  8
9-$(OPS_IDLOUT_H): corba-ops.idl $(IDL_COMPILER) 9-$(OPS_IDLOUT_H): corba-ops.idl $(IDL_COMPILER)
10+$(OPS_IDLOUT_H): corba-ops.idl 10+$(OPS_IDLOUT_H): corba-ops.idl
11 -(rm -f $(OPS_IDLOUT_C) $(OPS_IDLOUT_H) || true) > /dev/null 11 -(rm -f $(OPS_IDLOUT_C) $(OPS_IDLOUT_H) || true) > /dev/null
12 $(IDL_COMPILER) $(IDL_FLAGS_CORBA_OPS) --deps .deps/corba-ops.idl.P $< 12 $(IDL_COMPILER) $(IDL_FLAGS_CORBA_OPS) --deps .deps/corba-ops.idl.P $<
13 for I in $(OPS_IDLOUT_C) $(OPS_IDLOUT_H); do \ 13 for I in $(OPS_IDLOUT_C) $(OPS_IDLOUT_H); do \