aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsem <sem@FreeBSD.org>2005-06-09 15:28:56 +0800
committersem <sem@FreeBSD.org>2005-06-09 15:28:56 +0800
commit152ce815c8df568e8a941c01b7edb917ad3a0046 (patch)
treea455adeeebebbd67066057125f36a57b5ec519e2
parent84b464b1f7a34a656c8186c9769fe5e7beae48c1 (diff)
downloadfreebsd-ports-gnome-152ce815c8df568e8a941c01b7edb917ad3a0046.tar.gz
freebsd-ports-gnome-152ce815c8df568e8a941c01b7edb917ad3a0046.tar.zst
freebsd-ports-gnome-152ce815c8df568e8a941c01b7edb917ad3a0046.zip
- Update to 4.0.6
- Flexiblize pkg-plist a little
-rw-r--r--devel/omniORB/Makefile11
-rw-r--r--devel/omniORB/distinfo4
-rw-r--r--devel/omniORB/files/patch-configure8
-rw-r--r--devel/omniORB/pkg-plist15
4 files changed, 20 insertions, 18 deletions
diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 520bb9f3b863..117733414a2d 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= omniORB
-PORTVERSION= 4.0.5
+PORTVERSION= 4.0.6
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
@@ -14,10 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME:L}
MAINTAINER= sem@FreeBSD.org
COMMENT= A robust high performance CORBA ORB for C++ and Python
-CONFIGURE_WRKSRC= ${WRKSRC}/build
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
+PLIST_SUB+= SONUM=${PORTVERSION:C/.*\.//}
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
@@ -27,6 +24,10 @@ USE_GNOME= pkgconfig
INSTALLS_SHLIB= yes
NO_FILTER_SHLIBS= yes
MAKEFILE= GNUmakefile
+BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
+CONFIGURE_WRKSRC= ${WRKSRC}/build
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_SCRIPT= ../configure
CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
CPP=${CPP} PYTHON=${PYTHON_CMD}
diff --git a/devel/omniORB/distinfo b/devel/omniORB/distinfo
index 6b2e3c17a784..ef1c2b538934 100644
--- a/devel/omniORB/distinfo
+++ b/devel/omniORB/distinfo
@@ -1,2 +1,2 @@
-MD5 (omniORB-4.0.5.tar.gz) = c6a05df107fe5021dd0470a2e9c89e90
-SIZE (omniORB-4.0.5.tar.gz) = 2769030
+MD5 (omniORB-4.0.6.tar.gz) = 9fc17e2d91abef27f75728874fa09dd6
+SIZE (omniORB-4.0.6.tar.gz) = 2795062
diff --git a/devel/omniORB/files/patch-configure b/devel/omniORB/files/patch-configure
index 5ad8217164da..10ec1ea168f3 100644
--- a/devel/omniORB/files/patch-configure
+++ b/devel/omniORB/files/patch-configure
@@ -1,10 +1,10 @@
---- configure.orig Sat Nov 20 12:35:49 2004
-+++ configure Sat Nov 20 12:36:13 2004
-@@ -11797,6 +11797,7 @@
+--- configure.orig Thu Apr 14 19:05:43 2005
++++ configure Thu Jun 9 10:28:02 2005
+@@ -11872,6 +11872,7 @@
*-*-freebsd3*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="3";;
*-*-freebsd4*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="4";;
*-*-freebsd5*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="5";;
+ *-*-freebsd6*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="6";;
+ *-*-netbsd*) plat_name="NetBSD"; plat_def="__netbsd__"; os_v="1";;
*-*-openbsd*) plat_name="OpenBSD"; plat_def="__openbsd__"; os_v="3";;
*-*-sco*) plat_name="OSR5"; plat_def="__osr5__"; os_v="5";;
- esac
diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
index 04168c92a922..c788628cfb61 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -172,30 +172,31 @@ include/omnithread/solaris.h
%%STATIC%%lib/libomnithread.a
lib/libCOS4.so
lib/libCOS4.so.0
-lib/libCOS4.so.0.5
+lib/libCOS4.so.0.%%SONUM%%
lib/libCOSDynamic4.so
lib/libCOSDynamic4.so.0
-lib/libCOSDynamic4.so.0.5
+lib/libCOSDynamic4.so.0.%%SONUM%%
lib/libomniCodeSets4.so
lib/libomniCodeSets4.so.0
-lib/libomniCodeSets4.so.0.5
+lib/libomniCodeSets4.so.0.%%SONUM%%
lib/libomniDynamic4.so
lib/libomniDynamic4.so.0
-lib/libomniDynamic4.so.0.5
+lib/libomniDynamic4.so.0.%%SONUM%%
lib/libomniORB4.so
lib/libomniORB4.so.0
-lib/libomniORB4.so.0.5
+lib/libomniORB4.so.0.%%SONUM%%
lib/libomnisslTP.so
lib/libomnisslTP.so.4
lib/libomnisslTP.so.4.0
lib/libomnithread.so
lib/libomnithread.so.3
-lib/libomnithread.so.3.0
+lib/libomnithread.so.3.1
libdata/pkgconfig/omniCOS4.pc
libdata/pkgconfig/omniCOSDynamic4.pc
libdata/pkgconfig/omniDynamic4.pc
libdata/pkgconfig/omniORB4.pc
libdata/pkgconfig/omnithread3.pc
+@unexec rmdir %B 2>/dev/null || true
%%PYTHON_SITELIBDIR%%/_omniidlmodule.so
%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.1
%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.1.0
@@ -294,7 +295,7 @@ libdata/pkgconfig/omnithread3.pc
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/README.FIRST.txt
%%PORTDOCS%%%%DOCSDIR%%/README.unix
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes_4.0.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes_4.0.%%SONUM%%.txt
%%PORTDOCS%%%%DOCSDIR%%/omniNames.html
%%PORTDOCS%%%%DOCSDIR%%/omniNames.pdf
%%PORTDOCS%%%%DOCSDIR%%/omniNames.ps