From d9d6fa548aeb060ee97aea8b5f3cb74f48d360f0 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 15 Jul 2003 17:31:49 +0000 Subject: Update to 2.7.3. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@979 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/ORBit2/Makefile | 8 ++++---- devel/ORBit2/distinfo | 2 +- devel/ORBit2/files/patch-include_orbit_poa_poa.h | 12 ------------ .../ORBit2/files/patch-src::orb::util::Makefile.in | 22 +++++++++++----------- devel/ORBit2/pkg-plist | 11 +++++++++++ 5 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 devel/ORBit2/files/patch-include_orbit_poa_poa.h (limited to 'devel') diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 62afaea5e..d0269a66d 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -6,9 +6,7 @@ # PORTNAME= ORBit2 -PORTVERSION= 2.7.2 -PORTREVISION= 2 -#PORTREVISION= 0 +PORTVERSION= 2.7.3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.7 @@ -25,7 +23,9 @@ USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes USE_GNOME= gnomehack libidl -CONFIGURE_ARGS= --disable-indent +CONFIGURE_ARGS= --disable-indent \ + --with-html-dir=${PREFIX}/share/doc \ + --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index 5202ae763..a06a141ea 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1 +1 @@ -MD5 (gnome2/ORBit2-2.7.2.tar.bz2) = 65461a4e2bc9e533253ee602a81aa62d +MD5 (gnome2/ORBit2-2.7.3.tar.bz2) = 927f8f8b5726aa426aff783cb5b4ab7e diff --git a/devel/ORBit2/files/patch-include_orbit_poa_poa.h b/devel/ORBit2/files/patch-include_orbit_poa_poa.h deleted file mode 100644 index 2a0d6d989..000000000 --- a/devel/ORBit2/files/patch-include_orbit_poa_poa.h +++ /dev/null @@ -1,12 +0,0 @@ ---- include/orbit/poa/poa.h.orig Tue Jun 17 01:34:57 2003 -+++ include/orbit/poa/poa.h Tue Jun 17 01:35:58 2003 -@@ -143,6 +143,9 @@ - - /* DEPRECATED */ - void ORBit_classinfo_register (PortableServer_ClassInfo *ci); -+#define ORBIT_SERVANT_SET_CLASSINFO(servant,ci) G_STMT_START { \ -+ ((PortableServer_ServantBase *)(servant))->vepv[0]->_private = (ci);\ -+} G_STMT_END - - #endif /* defined(ORBIT2_INTERNAL_API) || defined (ORBIT2_STUBS_API) */ - diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src::orb::util::Makefile.in index 047a15842..0c2cb69a9 100644 --- a/devel/ORBit2/files/patch-src::orb::util::Makefile.in +++ b/devel/ORBit2/files/patch-src::orb::util::Makefile.in @@ -1,11 +1,11 @@ ---- src/orb/util/Makefile.in.orig Sat Jun 14 01:51:30 2003 -+++ src/orb/util/Makefile.in Sat Jun 14 01:52:28 2003 -@@ -115,7 +115,7 @@ - - noinst_LTLIBRARIES = liborb-util.la - --INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\" -DORBIT2_INTERNAL_API $(WARN_CFLAGS) $(ORBIT_DEBUG_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(LOCAL_LINC_CFLAGS) $(ORBIT_CFLAGS) -+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbit2rc\" -DORBIT2_INTERNAL_API $(WARN_CFLAGS) $(ORBIT_DEBUG_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(LOCAL_LINC_CFLAGS) $(ORBIT_CFLAGS) - - - liborb_util_la_SOURCES = orbit-purify.h genrand.c orbit-options.c orbit-options.h orbit-util.c +--- src/orb/util/Makefile.in.orig Tue Jul 15 13:16:53 2003 ++++ src/orb/util/Makefile.in Tue Jul 15 13:17:32 2003 +@@ -189,7 +189,7 @@ + INCLUDES = \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ +- -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\" \ ++ -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbit2rc\" \ + -DORBIT2_INTERNAL_API \ + $(WARN_CFLAGS) \ + $(ORBIT_DEBUG_CFLAGS) \ diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index 31fec669a..723579770 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -64,8 +64,19 @@ libdata/pkgconfig/ORBit-idl-2.0.pc libdata/pkgconfig/ORBit-imodule-2.0.pc libdata/pkgconfig/ORBit-CosNaming-2.0.pc share/aclocal/ORBit2.m4 +share/doc/ORBit2/ORBit2-orbit2-allocators.html +share/doc/ORBit2/ORBit2-orbit2-small.html +share/doc/ORBit2/ORBit2.devhelp +share/doc/ORBit2/general.html +share/doc/ORBit2/home.png +share/doc/ORBit2/index.html +share/doc/ORBit2/index.sgml +share/doc/ORBit2/left.png +share/doc/ORBit2/right.png +share/doc/ORBit2/up.png share/idl/orbit-2.0/CosNaming.idl @dirrm share/idl/orbit-2.0 +@dirrm share/doc/ORBit2 @unexec /bin/rmdir %D/share/idl 2>/dev/null || /usr/bin/true @dirrm include/orbit-2.0/orbit/util @dirrm include/orbit-2.0/orbit/poa -- cgit v1.2.3