diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ORBit2/Makefile | 7 | ||||
| -rw-r--r-- | devel/ORBit2/distinfo | 2 | ||||
| -rw-r--r-- | devel/ORBit2/files/patch-ab | 14 | ||||
| -rw-r--r-- | devel/ORBit2/files/patch-src::orb::util::Makefile.in | 22 | ||||
| -rw-r--r-- | devel/ORBit2/pkg-plist | 10 |
5 files changed, 21 insertions, 34 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index ab3ce0114..4188ec85f 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= ORBit2 -PORTVERSION= 2.7.1 -PORTREVISION= 1 +PORTVERSION= 2.7.2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.7 @@ -23,10 +22,10 @@ USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes -USE_GNOME= gnomehack libidl linc +USE_GNOME= gnomehack libidl CONFIGURE_ARGS= --disable-indent CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${GREP} -l LINC_THREADSAFE | \ diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index 8a0db0490..5202ae763 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1 +1 @@ -MD5 (gnome2/ORBit2-2.7.1.tar.bz2) = 55564fc4c8c6825ff71bdbcec77b7e42 +MD5 (gnome2/ORBit2-2.7.2.tar.bz2) = 65461a4e2bc9e533253ee602a81aa62d diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab index 308fddd87..57f1e2d4c 100644 --- a/devel/ORBit2/files/patch-ab +++ b/devel/ORBit2/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sat Oct 19 15:24:09 2002 -+++ Makefile.in Sat Oct 19 15:25:58 2002 +--- Makefile.in.orig Sat Jun 14 01:50:29 2003 ++++ Makefile.in Sat Jun 14 01:51:03 2003 @@ -35,7 +35,7 @@ DESTDIR = @@ -9,16 +9,12 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -@@ -97,11 +97,10 @@ - STRIP = @STRIP@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ --pkglibdir = @pkglibdir@ +@@ -115,7 +115,7 @@ AUTOMAKE_OPTIONS = 1.3 --SUBDIRS = src include test docs -+SUBDIRS = src include docs +-SUBDIRS = linc2 src include test docs ++SUBDIRS = linc2 src include docs bin_SCRIPTS = orbit2-config diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src::orb::util::Makefile.in index 7934fe0db..047a15842 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 Sun May 4 12:42:16 2003 -+++ src/orb/util/Makefile.in Sun May 4 12:43:38 2003 -@@ -104,7 +104,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) \ +--- 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 diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index 7b378aaf3..31fec669a 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -1,3 +1,4 @@ +bin/linc-cleanup-sockets bin/orbit-idl-2 bin/orbit2-config @unexec if cmp -s %D/etc/orbit2rc.default %D/etc/orbit2rc; then rm -f %D/etc/orbit2rc; fi @@ -7,14 +8,6 @@ include/orbit-2.0/ORBitservices/CosNaming.h include/orbit-2.0/ORBitservices/CosNaming_impl.h include/orbit-2.0/ORBitservices/orbit-imodule.h include/orbit-2.0/orbit-idl/orbit-idl-backend.h -include/orbit-2.0/orbit/GIOP/giop-basics.h -include/orbit-2.0/orbit/GIOP/giop-connection.h -include/orbit-2.0/orbit/GIOP/giop-endian.h -include/orbit-2.0/orbit/GIOP/giop-recv-buffer.h -include/orbit-2.0/orbit/GIOP/giop-send-buffer.h -include/orbit-2.0/orbit/GIOP/giop-server.h -include/orbit-2.0/orbit/GIOP/giop-types.h -include/orbit-2.0/orbit/GIOP/giop.h include/orbit-2.0/orbit/dynamic/dynamic-defs.h include/orbit-2.0/orbit/dynamic/dynamic.h include/orbit-2.0/orbit/orb-core/allocators.h @@ -78,7 +71,6 @@ share/idl/orbit-2.0/CosNaming.idl @dirrm include/orbit-2.0/orbit/poa @dirrm include/orbit-2.0/orbit/orb-core @dirrm include/orbit-2.0/orbit/dynamic -@dirrm include/orbit-2.0/orbit/GIOP @dirrm include/orbit-2.0/orbit @dirrm include/orbit-2.0/orbit-idl @dirrm include/orbit-2.0/ORBitservices |