hi,
in preparation of the upcoming gnome diffs, here is an ORBit2 update.
please test and comment.
cheers,
jasper
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/ORBit2/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile 16 Sep 2007 02:52:56 -0000 1.25
+++ Makefile 19 Oct 2007 19:51:14 -0000
@@ -2,10 +2,11 @@
COMMENT= high-performance CORBA Object Request Broker
-DISTNAME= ORBit2-2.14.7
-SHARED_LIBS += ORBit-2 2.0 # .0.0
-SHARED_LIBS += ORBitCosNaming-2 2.0 # .0.0
-SHARED_LIBS += ORBit-imodule-2 2.0 # .0.0
+GNOME_PROJECT= ORBit2
+GNOME_VERSION= 2.14.10
+SHARED_LIBS += ORBit-2 3.0 # .1.0
+SHARED_LIBS += ORBitCosNaming-2 3.0 # .1.0
+SHARED_LIBS += ORBit-imodule-2 2.1 # .0.0
CATEGORIES= devel
@@ -17,20 +18,19 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m pthread
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ORBit2/2.14/}
-EXTRACT_SUFX= .tar.bz2
-
-MODULES= devel/gettext
+MODULES= devel/gettext \
+ x11/gnome
LIB_DEPENDS= IDL-2::devel/libIDL \
glib-2.0,gmodule-2.0,gobject-2.0,gthread-2.0::devel/glib2
+REGRESS_DEPENDS= :${PKGNAME}:${BUILD_PKGPATH}
-USE_GMAKE= Yes
-USE_LIBTOOL= Yes
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.61
+AUTOCONF_VERSION= 2.60
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${WRKBUILD}/src/services/name/.libs \
+ -L${WRKBUILD}/src/services/imodule/.libs \
+ -L${WRKBUILD}/src/orb/.libs -L${LOCALBASE}/lib"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/ORBit2/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo 24 Apr 2007 12:41:34 -0000 1.14
+++ distinfo 19 Oct 2007 19:51:14 -0000
@@ -1,5 +1,5 @@
-MD5 (ORBit2-2.14.7.tar.bz2) = NEDESq7xTdluTM184ip+bg==
-RMD160 (ORBit2-2.14.7.tar.bz2) = SsADdUwDfsi7FRuzRNsxwIiKhSw=
-SHA1 (ORBit2-2.14.7.tar.bz2) = 1bLmPQLU3PCrew7kgCGzZcJzEC4=
-SHA256 (ORBit2-2.14.7.tar.bz2) = dRt2NERidIsax5tznOLgJR/phcbI1loLnzJG5Ksd1vo=
-SIZE (ORBit2-2.14.7.tar.bz2) = 729469
+MD5 (ORBit2-2.14.10.tar.bz2) = GA9IbwfW24SsoPcfaOVGGA==
+RMD160 (ORBit2-2.14.10.tar.bz2) = 9t8L84IYug0C4uMy1XDPPhgx7FM=
+SHA1 (ORBit2-2.14.10.tar.bz2) = 9de742VitdqtSLksxbF6+hLSEe4=
+SHA256 (ORBit2-2.14.10.tar.bz2) = 1M3RgKT2uKdA02uOtsUUC60xJHSESFqNNMmRMsnEBu8=
+SIZE (ORBit2-2.14.10.tar.bz2) = 734630
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/devel/ORBit2/patches/patch-configure_in,v
retrieving revision 1.4
diff -u -r1.4 patch-configure_in
--- patches/patch-configure_in 24 Apr 2007 12:41:34 -0000 1.4
+++ patches/patch-configure_in 19 Oct 2007 19:51:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.4 2007/04/24 12:41:34 jasper Exp $
---- configure.in.orig Mon Feb 12 13:05:10 2007
-+++ configure.in Sat Mar 17 23:32:43 2007
-@@ -262,7 +262,18 @@ AC_HEADER_STDC
+--- configure.in.orig Sat Sep 29 02:46:08 2007
++++ configure.in Fri Oct 19 13:22:02 2007
+@@ -261,7 +261,18 @@ AC_HEADER_STDC
AC_CHECK_HEADERS(fcntl.h unistd.h sys/endian.h endian.h machine/endian.h
sys/machine.h sys/isa_defs.h sys/poll.h)
AC_CHECK_HEADERS(stddef.h wchar.h wcstr.h wctype.h machine/types.h)
AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h sys/un.h)
Index: patches/patch-test_timeout_sh
===================================================================
RCS file: patches/patch-test_timeout_sh
diff -N patches/patch-test_timeout_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_timeout_sh 19 Oct 2007 19:51:14 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- test/timeout.sh.orig Fri Oct 19 13:31:53 2007
++++ test/timeout.sh Fri Oct 19 13:32:01 2007
+@@ -12,6 +12,6 @@ echo "Running timeout client..."
+ retv=$?
+
+
+-killall lt-timeout-server
++pkill lt-timeout-server
+
+ exit $retv
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/ORBit2/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DESCR
--- pkg/DESCR 31 Jan 2003 18:25:37 -0000 1.1.1.1
+++ pkg/DESCR 19 Oct 2007 19:51:14 -0000
@@ -1,7 +1,6 @@
ORBit is a high-performance CORBA (Common Object Request Broker
-Architecture) ORB (object request broker). It allows programs to
-send requests and receive replies from other programs, regardless
-of the locations of the two programs. CORBA is an architecture that
-enables communication between program objects, regardless of the
-programming language they're written in or the operating system they
-run on.
+Architecture) ORB (object request broker). It allows programs to send
+requests and receive replies from other programs, regardless of the
+locations of the two programs. CORBA is an architecture that enables
+communication between program objects, regardless of the programming
+language they're written in or the operating system they run on.
--
"The good life is one inspired by love and guided by knowledge."
-- Bertrand Russel