Date: Mon, 20 Oct 2014 19:59:29 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371295 - in head/devel: . omniNotify omniORB omniORB-4.1 omniORB-4.1/files Message-ID: <201410201959.s9KJxTCJ068995@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Mon Oct 20 19:59:28 2014 New Revision: 371295 URL: https://svnweb.freebsd.org/changeset/ports/371295 QAT: https://qat.redports.org/buildarchive/r371295/ Log: - Recopy devel/omniORB to devel/omniORB-4.1 - Downgrade it to 4.1.7 - Unbreak devel/omniNotify - Add CONFLICTS CR: D970 Approved by: pfg Added: head/devel/omniORB-4.1/ - copied from r371291, head/devel/omniORB/ head/devel/omniORB-4.1/files/patch-src_tool_omniidl_cxx_idlutil.cc - copied unchanged from r371291, head/devel/omniORB/files/patch-ak Deleted: head/devel/omniORB-4.1/files/patch-ak Modified: head/devel/Makefile head/devel/omniNotify/Makefile head/devel/omniNotify/pkg-plist head/devel/omniORB-4.1/Makefile head/devel/omniORB-4.1/distinfo head/devel/omniORB-4.1/files/patch-configure head/devel/omniORB-4.1/pkg-descr head/devel/omniORB-4.1/pkg-plist head/devel/omniORB/Makefile Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Mon Oct 20 19:48:58 2014 (r371294) +++ head/devel/Makefile Mon Oct 20 19:59:28 2014 (r371295) @@ -1371,6 +1371,7 @@ SUBDIR += omake SUBDIR += omniNotify SUBDIR += omniORB + SUBDIR += omniORB-4.1 SUBDIR += oniguruma SUBDIR += oniguruma4 SUBDIR += oniguruma5 Modified: head/devel/omniNotify/Makefile ============================================================================== --- head/devel/omniNotify/Makefile Mon Oct 20 19:48:58 2014 (r371294) +++ head/devel/omniNotify/Makefile Mon Oct 20 19:59:28 2014 (r371295) @@ -13,18 +13,15 @@ COMMENT= CORBA Notification Service (Cos LICENSE= GPLv2 -BROKEN= Fails to build with new omniORB - -LIB_DEPENDS= libomniORB4.so:${PORTSDIR}/devel/omniORB -RUN_DEPENDS= omniidl:${PORTSDIR}/devel/omniORB -# parts of omniORB4 source tree is required to build -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/omniORB:patch +LIB_DEPENDS= libomniORB4.so:${PORTSDIR}/devel/omniORB-4.1 +# parts of omniORB4-4.1 source tree is required to build +BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/omniORB-4.1:patch WRKSRC= ${WRKDIR}/${PORTNAME} CONFIGURE_WRKSRC= ${WRKSRC}/build BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} -OMNIORB_WRKSRC= `cd ${PORTSDIR}/devel/omniORB && ${MAKE} -V WRKSRC` +OMNIORB_WRKSRC= `cd ${PORTSDIR}/devel/omniORB-4.1 && ${MAKE} -V WRKSRC` USES= gmake python GNU_CONFIGURE= yes @@ -36,16 +33,19 @@ CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} CONFIGURE_ARGS= --with-omniorb=${LOCALBASE} OPTIONS_DEFINE= EXAMPLES -pre-configure: - @${MKDIR} ${CONFIGURE_WRKSRC} - @cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC} +.include <bsd.port.options.mk> -post-patch: - @${REINPLACE_CMD} -Ee 's/-O2/${CFLAGS}/' \ +pre-configure: + ${REINPLACE_CMD} -Ee 's|-O2|${CFLAGS}|' \ ${WRKSRC}/mk/beforeauto.mk.in + ${MKDIR} ${CONFIGURE_WRKSRC} + cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC} post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notifd +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! ( -name \.cvsignore -o -name *\.orig )" + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! ( -name \.cvsignore -o -name *\.orig )" +.endif .include <bsd.port.mk> Modified: head/devel/omniNotify/pkg-plist ============================================================================== --- head/devel/omniNotify/pkg-plist Mon Oct 20 19:48:58 2014 (r371294) +++ head/devel/omniNotify/pkg-plist Mon Oct 20 19:59:28 2014 (r371295) @@ -216,12 +216,3 @@ lib/libCOSNotify4.so.0.1 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/struct_push_consumer.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/struct_push_supplier.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ten_any_pull_consumers.cc -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/idl -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/Utils -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/Stubs -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/Helpers -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/Config -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests/Clients -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cosnotify_tests -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -@dirrm include/omniNotify Modified: head/devel/omniORB-4.1/Makefile ============================================================================== --- head/devel/omniORB/Makefile Mon Oct 20 18:51:29 2014 (r371291) +++ head/devel/omniORB-4.1/Makefile Mon Oct 20 19:59:28 2014 (r371295) @@ -2,15 +2,17 @@ # $FreeBSD$ PORTNAME= omniORB -PORTVERSION= 4.2.0 +PORTVERSION= 4.1.7 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER= 5u623l20@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= Robust high performance CORBA ORB for C++ and Python LICENSE= GPLv2 +CONFLICTS= omniORB-4.2.* + PLIST_SUB+= SONUM=${PORTVERSION:C/.*\.//} GNU_CONFIGURE= yes USE_OPENSSL= yes @@ -21,31 +23,38 @@ CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} CONFIGURE_ARGS= --datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \ --with-omniORB-config=${PREFIX}/etc/omniORB.cfg \ --with-omniNames-logdir=/var/log + OPTIONS_DEFINE= DOCS EXAMPLES STATIC OPTIONS_DEFAULT= DOCS EXAMPLES STATIC OPTIONS_SUB= yes STATIC_CONFIGURE_OFF= --disable-static +BINS= catior convertior genior nameclt omkdepend omniMapper omniNames omnicpp + .include <bsd.port.options.mk> -post-patch: - @${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in - @${REINPLACE_CMD} -e 's#%%STAGEDIR%%%%PREFIX%%#${STAGEDIR}${PREFIX}#g' \ + +pre-configure: + ${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in + ${REINPLACE_CMD} -e 's#%%STAGEDIR%%%%PREFIX%%#${STAGEDIR}${PREFIX}#g' \ ${WRKSRC}/contrib/pkgconfig/GNUmakefile.in post-install: - @${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl')" - @${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be')" - @cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} *.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - @cd ${WRKSRC}/man/man8 && ${INSTALL_MAN} *.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl')" + ${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be')" + cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} *.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + cd ${WRKSRC}/man/man8 && ${INSTALL_MAN} *.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 +.for bin in ${BINS} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${bin} +.endfor .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST.txt README.unix.txt \ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST.txt README.unix \ ReleaseNotes.txt ${STAGEDIR}${DOCSDIR} - @${TAR} cCf ${WRKSRC}/doc - . | ${TAR} xUCf ${STAGEDIR}${DOCSDIR} - + ${TAR} cCf ${WRKSRC}/doc - . | ${TAR} xUCf ${STAGEDIR}${DOCSDIR} - .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/sample.cfg ${STAGEDIR}${EXAMPLESDIR}/omniORB.cfg + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/sample.cfg ${STAGEDIR}${EXAMPLESDIR}/omniORB.cfg .endif .include <bsd.port.mk> Modified: head/devel/omniORB-4.1/distinfo ============================================================================== --- head/devel/omniORB/distinfo Mon Oct 20 18:51:29 2014 (r371291) +++ head/devel/omniORB-4.1/distinfo Mon Oct 20 19:59:28 2014 (r371295) @@ -1,2 +1,2 @@ -SHA256 (omniORB-4.2.0.tar.bz2) = 74c273fc997c2881b128feb52182dbe067acfecc4cf37475f43c104338eba8bc -SIZE (omniORB-4.2.0.tar.bz2) = 2649182 +SHA256 (omniORB-4.1.7.tar.bz2) = 2c589ae4e1d814c81f994f1c3da10afb09e3173213b870e9056162b7331e273c +SIZE (omniORB-4.1.7.tar.bz2) = 2625287 Modified: head/devel/omniORB-4.1/files/patch-configure ============================================================================== --- head/devel/omniORB/files/patch-configure Mon Oct 20 18:51:29 2014 (r371291) +++ head/devel/omniORB-4.1/files/patch-configure Mon Oct 20 19:59:28 2014 (r371295) @@ -1,25 +1,12 @@ ---- configure.orig 2011-06-24 16:37:28.000000000 -0500 -+++ configure -@@ -7444,12 +7444,16 @@ - *-*-irix*) plat_name="IRIX"; plat_def="__irix__"; os_v="6";; - *-*-aix*) plat_name="AIX"; plat_def="__aix__"; os_v="4";; - *-*-darwin*) plat_name="Darwin"; plat_def="__darwin__"; os_v="1";; -- *-*-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";; -- *-*-freebsd7*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="7";; -- *-*-freebsd8*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="8";; -+ *-*-dragonfly*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="9";; -+ *-*-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";; -+ *-*-freebsd7.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="7";; -+ *-*-freebsd8.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="8";; -+ *-*-freebsd9.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="9";; -+ *-*-freebsd10.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="10";; -+ *-*-freebsd11.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="11";; +--- configure.orig 2013-06-24 12:16:01.000000000 +0200 ++++ configure 2014-10-19 21:25:59.000000000 +0200 +@@ -7254,6 +7254,9 @@ + *-*-freebsd6*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="6";; + *-*-freebsd7*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="7";; + *-*-freebsd8*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="8";; ++ *-*-freebsd9*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="9";; ++ *-*-freebsd10*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="10";; ++ *-*-freebsd11*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="11";; *-*-kfreebsd*) plat_name="kFreeBSD"; plat_def="__FreeBSD_kernel__"; os_v="6";; *-*-netbsd*) plat_name="NetBSD"; plat_def="__netbsd__"; os_v="1";; *-*-openbsd*) plat_name="OpenBSD"; plat_def="__openbsd__"; os_v="3";; Copied: head/devel/omniORB-4.1/files/patch-src_tool_omniidl_cxx_idlutil.cc (from r371291, head/devel/omniORB/files/patch-ak) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/omniORB-4.1/files/patch-src_tool_omniidl_cxx_idlutil.cc Mon Oct 20 19:59:28 2014 (r371295, copy of r371291, head/devel/omniORB/files/patch-ak) @@ -0,0 +1,19 @@ +--- src/tool/omniidl/cxx/idlutil.cc.orig Thu Jul 25 16:49:13 2002 ++++ src/tool/omniidl/cxx/idlutil.cc Thu Jul 25 16:49:25 2002 +@@ -139,13 +139,13 @@ + IdlIntLiteral ull; + switch (base) { + case 8: +- sscanf(text, "%I64o", &ull); ++ sscanf(text, "%qo", &ull); + break; + case 10: +- sscanf(text, "%I64d", &ull); ++ sscanf(text, "%qd", &ull); + break; + case 16: +- sscanf(text, "%I64x", &ull); ++ sscanf(text, "%qx", &ull); + break; + default: + abort(); Modified: head/devel/omniORB-4.1/pkg-descr ============================================================================== --- head/devel/omniORB/pkg-descr Mon Oct 20 18:51:29 2014 (r371291) +++ head/devel/omniORB-4.1/pkg-descr Mon Oct 20 19:59:28 2014 (r371295) @@ -1,4 +1,10 @@ -omniORB is a GPL'd Object Request Broker (ORB) which implements -specification 2.6 of the Common Object Request Broker Architecture (CORBA). +omniORB is a robust high performance CORBA ORB for C++ and Python. + +It is freely available under the terms of the GNU Lesser General Public +License (for the libraries), and GNU General Public License (for the tools). +omniORB is largely CORBA 2.6 compliant. + +It offers mainly the same features as the port devel/omniORB, but this +legacy version is compatible with devel/omniNotify. WWW: http://omniorb.sourceforge.net/ Modified: head/devel/omniORB-4.1/pkg-plist ============================================================================== --- head/devel/omniORB/pkg-plist Mon Oct 20 18:51:29 2014 (r371291) +++ head/devel/omniORB-4.1/pkg-plist Mon Oct 20 19:59:28 2014 (r371295) @@ -62,7 +62,6 @@ include/omniORB4/IOP_S.h include/omniORB4/Naming.hh include/omniORB4/acconfig.h include/omniORB4/anyStream.h -include/omniORB4/ami.h include/omniORB4/boa.h include/omniORB4/bootstrap.hh include/omniORB4/boxes_defs.hh @@ -72,7 +71,6 @@ include/omniORB4/callDescriptor.h include/omniORB4/callHandle.h include/omniORB4/cdrStream.h include/omniORB4/codeSets.h -include/omniORB4/compression.hh include/omniORB4/corba_operators.h include/omniORB4/corbaidl_defs.hh include/omniORB4/corbaidl_operators.hh @@ -90,6 +88,7 @@ include/omniORB4/internal/codeSetUtil.h include/omniORB4/internal/context.h include/omniORB4/internal/corbaBoa.h include/omniORB4/internal/corbaOrb.h +include/omniORB4/internal/deferredRequest.h include/omniORB4/internal/dynAnyImpl.h include/omniORB4/internal/dynamicImplementation.h include/omniORB4/internal/dynamicLib.h @@ -134,8 +133,6 @@ include/omniORB4/ir_operators.hh include/omniORB4/ir_poa.hh include/omniORB4/linkHacks.h include/omniORB4/local_config.h -include/omniORB4/messaging.hh -include/omniORB4/messaging_policy.hh include/omniORB4/minorCode.h include/omniORB4/objTracker.h include/omniORB4/omniAsyncInvoker.h @@ -163,9 +160,6 @@ include/omniORB4/poa_enums_defs.hh include/omniORB4/poa_enums_operators.hh include/omniORB4/poa_enums_poa.hh include/omniORB4/poa_poa.h -include/omniORB4/pollable_defs.hh -include/omniORB4/pollable_operators.hh -include/omniORB4/pollable_poa.hh include/omniORB4/proxyFactory.h include/omniORB4/seqTemplatedecls.h include/omniORB4/seqTemplatedefns.h @@ -194,77 +188,54 @@ include/omniORB4/valueTemplatedefns.h include/omniORB4/valueType.h include/omniORB4/wstringtypes.h include/omniORB4/ziopStubs.h -include/omniORB4/ziop_defs.hh -include/omniORB4/ziop_operators.hh include/omniconfig.h include/omnithread.h -include/omnithread/atomic.h +include/omnithread/mach.h include/omnithread/nt.h include/omnithread/posix.h include/omnithread/pthread_nt.h +include/omnithread/solaris.h %%STATIC%%lib/libCOS4.a -%%STATIC%%lib/libCOSDynamic4.a -%%STATIC%%lib/libomniCodeSets4.a -%%STATIC%%lib/libomniConnectionMgmt4.a -%%STATIC%%lib/libomniDynamic4.a -%%STATIC%%lib/libomniORB4.a -%%STATIC%%lib/libomnisslTP4.a -%%STATIC%%lib/libomnithread.a lib/libCOS4.so -lib/libCOS4.so.2 -lib/libCOS4.so.2.%%SONUM%% +lib/libCOS4.so.1 +lib/libCOS4.so.1.%%SONUM%% +%%STATIC%%lib/libCOSDynamic4.a lib/libCOSDynamic4.so -lib/libCOSDynamic4.so.2 -lib/libCOSDynamic4.so.2.%%SONUM%% +lib/libCOSDynamic4.so.1 +lib/libCOSDynamic4.so.1.%%SONUM%% +%%STATIC%%lib/libomniCodeSets4.a lib/libomniCodeSets4.so -lib/libomniCodeSets4.so.2 -lib/libomniCodeSets4.so.2.%%SONUM%% +lib/libomniCodeSets4.so.1 +lib/libomniCodeSets4.so.1.%%SONUM%% +%%STATIC%%lib/libomniConnectionMgmt4.a lib/libomniConnectionMgmt4.so -lib/libomniConnectionMgmt4.so.2 -lib/libomniConnectionMgmt4.so.2.%%SONUM%% +lib/libomniConnectionMgmt4.so.1 +lib/libomniConnectionMgmt4.so.1.%%SONUM%% +%%STATIC%%lib/libomniDynamic4.a lib/libomniDynamic4.so -lib/libomniDynamic4.so.2 -lib/libomniDynamic4.so.2.%%SONUM%% +lib/libomniDynamic4.so.1 +lib/libomniDynamic4.so.1.%%SONUM%% +%%STATIC%%lib/libomniORB4.a lib/libomniORB4.so -lib/libomniORB4.so.2 -lib/libomniORB4.so.2.%%SONUM%% -lib/libomniZIOP4.a -lib/libomniZIOP4.so -lib/libomniZIOP4.so.2 -lib/libomniZIOP4.so.2.%%SONUM%% -lib/libomniZIOPDynamic4.a -lib/libomniZIOPDynamic4.so -lib/libomniZIOPDynamic4.so.2 -lib/libomniZIOPDynamic4.so.2.%%SONUM%% +lib/libomniORB4.so.1 +lib/libomniORB4.so.1.%%SONUM%% +%%STATIC%%lib/libomnisslTP4.a lib/libomnisslTP4.so -lib/libomnisslTP4.so.2 -lib/libomnisslTP4.so.2.%%SONUM%% +lib/libomnisslTP4.so.1 +lib/libomnisslTP4.so.1.%%SONUM%% +%%STATIC%%lib/libomnithread.a lib/libomnithread.so -lib/libomnithread.so.4 -lib/libomnithread.so.4.0 -libdata/pkgconfig/omniCOS4.pc -libdata/pkgconfig/omniCOSDynamic4.pc -libdata/pkgconfig/omniConnectionMgmt4.pc -libdata/pkgconfig/omniDynamic4.pc -libdata/pkgconfig/omniORB4.pc -libdata/pkgconfig/omniZIOP4.pc -libdata/pkgconfig/omniZIOPDynamic4.pc -libdata/pkgconfig/omnithread3.pc -man/man1/catior.1.gz -man/man1/convertior.1.gz -man/man1/genior.1.gz -man/man1/nameclt.1.gz -man/man8/omniMapper.8.gz -man/man8/omniNames.8.gz -man/man1/omnicpp.1.gz -man/man1/omniidl.1.gz +lib/libomnithread.so.3 +lib/libomnithread.so.3.4 %%PYTHON_SITELIBDIR%%/_omniidlmodule.so %%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4 -%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4.2 +%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4.1 %%PYTHON_SITELIBDIR%%/omniidl/__init__.py %%PYTHON_SITELIBDIR%%/omniidl/__init__.pyc %%PYTHON_SITELIBDIR%%/omniidl/idlast.py %%PYTHON_SITELIBDIR%%/omniidl/idlast.pyc +%%PYTHON_SITELIBDIR%%/omniidl/idlstring.py +%%PYTHON_SITELIBDIR%%/omniidl/idlstring.pyc %%PYTHON_SITELIBDIR%%/omniidl/idltype.py %%PYTHON_SITELIBDIR%%/omniidl/idltype.pyc %%PYTHON_SITELIBDIR%%/omniidl/idlutil.py @@ -277,8 +248,6 @@ man/man1/omniidl.1.gz %%PYTHON_SITELIBDIR%%/omniidl/output.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/__init__.py %%PYTHON_SITELIBDIR%%/omniidl_be/__init__.pyc -%%PYTHON_SITELIBDIR%%/omniidl_be/ami.py -%%PYTHON_SITELIBDIR%%/omniidl_be/ami.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/__init__.py %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/__init__.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/ast.py @@ -295,6 +264,8 @@ man/man1/omniidl.1.gz %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/__init__.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/main.py %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/main.pyc +%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/tcstring.py +%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/tcstring.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/template.py %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/template.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel/typecode.py @@ -313,6 +284,8 @@ man/man1/omniidl.1.gz %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/opers.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/poa.py %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/poa.pyc +%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/tcstring.py +%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/tcstring.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/template.py %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/template.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header/tie.py @@ -327,8 +300,6 @@ man/man1/omniidl.1.gz %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl/main.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl/template.py %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl/template.pyc -%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/mangler.py -%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/mangler.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/mapping.py %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/mapping.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/output.py @@ -337,6 +308,8 @@ man/man1/omniidl.1.gz %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/__init__.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/main.py %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/main.pyc +%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/mangler.py +%%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/mangler.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/poa.py %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/poa.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel/template.py @@ -357,9 +330,23 @@ man/man1/omniidl.1.gz %%PYTHON_SITELIBDIR%%/omniidl_be/example.pyc %%PYTHON_SITELIBDIR%%/omniidl_be/interactive.py %%PYTHON_SITELIBDIR%%/omniidl_be/interactive.pyc +libdata/pkgconfig/omniCOS4.pc +libdata/pkgconfig/omniCOSDynamic4.pc +libdata/pkgconfig/omniConnectionMgmt4.pc +libdata/pkgconfig/omniDynamic4.pc +libdata/pkgconfig/omniORB4.pc +libdata/pkgconfig/omnithread3.pc +man/man1/catior.1.gz +man/man1/convertior.1.gz +man/man1/genior.1.gz +man/man1/nameclt.1.gz +man/man1/omnicpp.1.gz +man/man1/omniidl.1.gz +man/man8/omniMapper.8.gz +man/man8/omniNames.8.gz %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README.FIRST.txt -%%PORTDOCS%%%%DOCSDIR%%/README.unix.txt +%%PORTDOCS%%%%DOCSDIR%%/README.unix %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes.txt %%PORTDOCS%%%%DOCSDIR%%/omniNames.html %%PORTDOCS%%%%DOCSDIR%%/omniNames.pdf @@ -384,7 +371,6 @@ man/man1/omniidl.1.gz %%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB013.html %%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB014.html %%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB015.html -%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB016.html %%PORTDOCS%%%%DOCSDIR%%/omniORB/previous_motif.gif %%PORTDOCS%%%%DOCSDIR%%/omniidl.html %%PORTDOCS%%%%DOCSDIR%%/omniidl.pdf @@ -466,27 +452,7 @@ man/man1/omniidl.1.gz %%DATADIR%%/idl/echo.idl %%DATADIR%%/idl/ir.idl %%DATADIR%%/idl/messaging.idl -%%DATADIR%%/idl/messaging_policy.idl %%DATADIR%%/idl/orb.idl %%DATADIR%%/idl/poa.idl %%DATADIR%%/idl/poa_include.idl -%%DATADIR%%/idl/pollable.idl %%DATADIR%%/idl/ziop.idl -@dirrm %%DATADIR%%/idl/COS -@dirrm %%DATADIR%%/idl -@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/tex -%%PORTDOCS%%@dirrm %%DOCSDIR%%/omniORB -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -@dirrm %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel -@dirrm %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl -@dirrm %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header -@dirrm %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/dynskel -@dirrm %%PYTHON_SITELIBDIR%%/omniidl_be/cxx -@dirrm %%PYTHON_SITELIBDIR%%/omniidl_be -@dirrm %%PYTHON_SITELIBDIR%%/omniidl -@dirrm include/omnithread -@dirrm include/omniORB4/internal -@dirrm include/omniORB4 -@dirrm include/COS Modified: head/devel/omniORB/Makefile ============================================================================== --- head/devel/omniORB/Makefile Mon Oct 20 19:48:58 2014 (r371294) +++ head/devel/omniORB/Makefile Mon Oct 20 19:59:28 2014 (r371295) @@ -11,6 +11,7 @@ COMMENT= Robust high performance CORBA O LICENSE= GPLv2 +CONFLICTS= omniORB-4.1.* PLIST_SUB+= SONUM=${PORTVERSION:C/.*\.//} GNU_CONFIGURE= yes USE_OPENSSL= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410201959.s9KJxTCJ068995>