Date: Tue, 27 Oct 2015 23:51:19 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400362 - in head/devel/omniORB: . files Message-ID: <201510272351.t9RNpJff015454@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Tue Oct 27 23:51:18 2015 New Revision: 400362 URL: https://svnweb.freebsd.org/changeset/ports/400362 Log: devel/omniORB: Update version 4.2.0=>4.2.1 - Remove OPTIONS EXAMPLES as the mentioned file is a config file which has been moved to @sample framework - Remove <bsd.port.options.mk> in lieu of OPTIONSNG - Fix patch files to reflect 'make makepatch' Added: head/devel/omniORB/files/patch-idl_COS_GNUmakefile.in (contents, props changed) head/devel/omniORB/files/patch-idl_GNUmakefile.in (contents, props changed) head/devel/omniORB/files/patch-src_appl_utils_catior_catior.cc (contents, props changed) head/devel/omniORB/files/patch-src_appl_utils_convertior_convertior.cc (contents, props changed) head/devel/omniORB/files/patch-src_tool_omniidl_cxx_idlutil.cc (contents, props changed) Deleted: head/devel/omniORB/files/patch-ak head/devel/omniORB/files/patch-idl__COS__Gnumakefile.in head/devel/omniORB/files/patch-idl__Gnumakefile.in head/devel/omniORB/files/patch-undef_minor_macro Modified: head/devel/omniORB/Makefile head/devel/omniORB/distinfo head/devel/omniORB/files/patch-configure head/devel/omniORB/files/patch-contrib__pkgconfig__GNUmakefile.in head/devel/omniORB/pkg-plist Modified: head/devel/omniORB/Makefile ============================================================================== --- head/devel/omniORB/Makefile Tue Oct 27 23:50:39 2015 (r400361) +++ head/devel/omniORB/Makefile Tue Oct 27 23:51:18 2015 (r400362) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= omniORB -PORTVERSION= 4.2.0 +PORTVERSION= 4.2.1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -22,12 +22,11 @@ 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_DEFINE= DOCS STATIC +OPTIONS_DEFAULT= DOCS STATIC OPTIONS_SUB= yes STATIC_CONFIGURE_OFF= --disable-static -.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' \ @@ -36,17 +35,24 @@ post-patch: 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')" + ${INSTALL_DATA} ${WRKSRC}/sample.cfg ${STAGEDIR}${PREFIX}/etc/omniORB.cfg.sample @cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} *.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @cd ${WRKSRC}/man/man8 && ${INSTALL_MAN} *.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 -.if ${PORT_OPTIONS:MDOCS} +.for i in catior convertior omniMapper omniNames omnicpp nameclt omkdepend genior + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} +.endfor +.for i in libomniDynamic4.so.2.1 libomnisslTP4.so.2.1 libCOS4.so.2.1 \ + libomniCodeSets4.so.2.1 libomniZIOPDynamic4.so.2.1 libomniZIOP4.so.2.1 \ + libomniConnectionMgmt4.so.2.1 libomniORB4.so.2.1 libCOSDynamic4.so.2.1 \ + libomnithread.so.4.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${i} +.endfor + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_omniidlmodule.so.4.2 + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST.txt README.unix.txt \ ReleaseNotes.txt ${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 -.endif .include <bsd.port.mk> Modified: head/devel/omniORB/distinfo ============================================================================== --- head/devel/omniORB/distinfo Tue Oct 27 23:50:39 2015 (r400361) +++ head/devel/omniORB/distinfo Tue Oct 27 23:51:18 2015 (r400362) @@ -1,2 +1,2 @@ -SHA256 (omniORB-4.2.0.tar.bz2) = 74c273fc997c2881b128feb52182dbe067acfecc4cf37475f43c104338eba8bc -SIZE (omniORB-4.2.0.tar.bz2) = 2649182 +SHA256 (omniORB-4.2.1.tar.bz2) = e877e8766f25c98309eef8fa22d900fbf6b15ed372cdcc3e2ad7d100bff43cbd +SIZE (omniORB-4.2.1.tar.bz2) = 2657144 Modified: head/devel/omniORB/files/patch-configure ============================================================================== --- head/devel/omniORB/files/patch-configure Tue Oct 27 23:50:39 2015 (r400361) +++ head/devel/omniORB/files/patch-configure Tue Oct 27 23:51:18 2015 (r400362) @@ -1,6 +1,6 @@ ---- configure.orig 2011-06-24 16:37:28.000000000 -0500 +--- configure.orig 2015-09-28 11:16:10 UTC +++ configure -@@ -7444,12 +7444,16 @@ +@@ -7445,12 +7445,16 @@ case "$host" in *-*-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";; Modified: head/devel/omniORB/files/patch-contrib__pkgconfig__GNUmakefile.in ============================================================================== --- head/devel/omniORB/files/patch-contrib__pkgconfig__GNUmakefile.in Tue Oct 27 23:50:39 2015 (r400361) +++ head/devel/omniORB/files/patch-contrib__pkgconfig__GNUmakefile.in Tue Oct 27 23:51:18 2015 (r400362) @@ -1,11 +1,11 @@ ---- contrib/pkgconfig/GNUmakefile.in.orig Fri Jul 16 15:33:32 2004 -+++ contrib/pkgconfig/GNUmakefile.in Fri Jul 16 15:33:53 2004 -@@ -4,7 +4,7 @@ +--- contrib/pkgconfig/GNUmakefile.in.orig 2014-03-25 15:18:18 UTC ++++ contrib/pkgconfig/GNUmakefile.in +@@ -4,7 +4,7 @@ BASE_OMNI_TREE=@top_srcdir@ VPATH=@srcdir@ INSTALL=@INSTALL@ - + -INSTALLDIR = $(INSTALLLIBDIR)/pkgconfig +INSTALLDIR = %%STAGEDIR%%%%PREFIX%%/libdata/pkgconfig - + PKGFILES = omnithread3.pc omniORB4.pc omniDynamic4.pc \ - omniCOS4.pc omniCOSDynamic4.pc + omniCOS4.pc omniCOSDynamic4.pc omniConnectionMgmt4.pc \ Added: head/devel/omniORB/files/patch-idl_COS_GNUmakefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/omniORB/files/patch-idl_COS_GNUmakefile.in Tue Oct 27 23:51:18 2015 (r400362) @@ -0,0 +1,11 @@ +--- idl/COS/GNUmakefile.in.orig 2005-01-06 23:11:24 UTC ++++ idl/COS/GNUmakefile.in +@@ -4,7 +4,7 @@ BASE_OMNI_TREE=@top_srcdir@ + VPATH=@srcdir@ + INSTALL=@INSTALL@ + +-INSTALLDIR = $(INSTALLIDLDIR)/omniORB/COS ++INSTALLDIR = $(INSTALLIDLDIR)/COS + + FILES = CosCollection.idl \ + CosCompoundLifeCycle.idl CosConcurrencyControl.idl \ Added: head/devel/omniORB/files/patch-idl_GNUmakefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/omniORB/files/patch-idl_GNUmakefile.in Tue Oct 27 23:51:18 2015 (r400362) @@ -0,0 +1,11 @@ +--- idl/GNUmakefile.in.orig 2012-12-31 14:57:16 UTC ++++ idl/GNUmakefile.in +@@ -4,7 +4,7 @@ BASE_OMNI_TREE=@top_srcdir@ + VPATH=@srcdir@ + INSTALL=@INSTALL@ + +-INSTALLDIR = $(INSTALLIDLDIR)/omniORB ++INSTALLDIR = $(INSTALLIDLDIR) + + FILES = Naming.idl bootstrap.idl corbaidl.idl echo.idl ir.idl orb.idl \ + poa.idl poa_include.idl boxes.idl pollable.idl \ Added: head/devel/omniORB/files/patch-src_appl_utils_catior_catior.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/omniORB/files/patch-src_appl_utils_catior_catior.cc Tue Oct 27 23:51:18 2015 (r400362) @@ -0,0 +1,15 @@ +--- src/appl/utils/catior/catior.cc.orig 2013-10-29 18:17:16 UTC ++++ src/appl/utils/catior/catior.cc +@@ -55,6 +55,12 @@ + // macro called minor. + #undef minor + ++#ifdef minor ++ // Digital Unix 3.2, and may be others as well, defines minor() as ++ // a macro in its sys/types.h. Get rid of it! ++#undef minor ++#endif ++ + #ifndef Swap16 + #define Swap16(s) ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) + #else Added: head/devel/omniORB/files/patch-src_appl_utils_convertior_convertior.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/omniORB/files/patch-src_appl_utils_convertior_convertior.cc Tue Oct 27 23:51:18 2015 (r400362) @@ -0,0 +1,15 @@ +--- src/appl/utils/convertior/convertior.cc.orig 2009-05-28 09:30:13 UTC ++++ src/appl/utils/convertior/convertior.cc +@@ -44,6 +44,12 @@ + // macro called minor. + #undef minor + ++#ifdef minor ++ // Digital Unix 3.2, and may be others as well, defines minor() as ++ // a macro in its sys/types.h. Get rid of it! ++#undef minor ++#endif ++ + #ifndef Swap16 + #define Swap16(s) ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) + #else Added: head/devel/omniORB/files/patch-src_tool_omniidl_cxx_idlutil.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/omniORB/files/patch-src_tool_omniidl_cxx_idlutil.cc Tue Oct 27 23:51:18 2015 (r400362) @@ -0,0 +1,19 @@ +--- src/tool/omniidl/cxx/idlutil.cc.orig 2013-07-18 11:28:03 UTC ++++ src/tool/omniidl/cxx/idlutil.cc +@@ -108,13 +108,13 @@ idl_strtoul(const char* text, int base) + 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/pkg-plist ============================================================================== --- head/devel/omniORB/pkg-plist Tue Oct 27 23:50:39 2015 (r400361) +++ head/devel/omniORB/pkg-plist Tue Oct 27 23:51:18 2015 (r400362) @@ -8,6 +8,7 @@ bin/omniNames bin/omnicpp bin/omniidl bin/omniidlrun.py +@sample etc/omniORB.cfg.sample include/COS/COS_sysdep.h include/COS/CosEventChannelAdmin.hh include/COS/CosEventComm.hh @@ -108,6 +109,7 @@ include/omniORB4/internal/giopWorker.h include/omniORB4/internal/inProcessIdentity.h include/omniORB4/internal/initRefs.h include/omniORB4/internal/initialiser.h +include/omniORB4/internal/interceptors.h include/omniORB4/internal/invoker.h include/omniORB4/internal/libcWrapper.h include/omniORB4/internal/localIdentity.h @@ -127,8 +129,11 @@ include/omniORB4/internal/request.h include/omniORB4/internal/rmutex.h include/omniORB4/internal/shutdownIdentity.h include/omniORB4/internal/tcParser.h +include/omniORB4/internal/tcpSocket.h include/omniORB4/internal/transportRules.h include/omniORB4/internal/typecode.h +include/omniORB4/internal/unknownValue.h +include/omniORB4/internal/valueTrackerImpl.h include/omniORB4/ir_defs.hh include/omniORB4/ir_operators.hh include/omniORB4/ir_poa.hh @@ -400,7 +405,6 @@ man/man1/omniidl.1.gz %%PORTDOCS%%%%DOCSDIR%%/tex/utilities.tex %%PORTDOCS%%%%DOCSDIR%%/utilities.html %%PORTDOCS%%%%DOCSDIR%%/utilities.pdf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/omniORB.cfg %%DATADIR%%/idl/COS/CosCollection.idl %%DATADIR%%/idl/COS/CosCompoundLifeCycle.idl %%DATADIR%%/idl/COS/CosConcurrencyControl.idl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510272351.t9RNpJff015454>