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'

12 files changed, 79 insertions, 69 deletions

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 746605d..acab5fd 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -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>
diff --git a/devel/omniORB/distinfo b/devel/omniORB/distinfo
index ed21250..cbc7093 100644
--- a/devel/omniORB/distinfo
+++ b/devel/omniORB/distinfo
@@ -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
diff --git a/devel/omniORB/files/patch-configure b/devel/omniORB/files/patch-configure
index ff83300..f01720b 100644
--- a/devel/omniORB/files/patch-configure
+++ b/devel/omniORB/files/patch-configure
@@ -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";;
diff --git a/devel/omniORB/files/patch-contrib__pkgconfig__GNUmakefile.in b/devel/omniORB/files/patch-contrib__pkgconfig__GNUmakefile.in
index ea4b598..cebb373 100644
--- a/devel/omniORB/files/patch-contrib__pkgconfig__GNUmakefile.in
+++ b/devel/omniORB/files/patch-contrib__pkgconfig__GNUmakefile.in
@@ -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 \
diff --git a/devel/omniORB/files/patch-idl_COS_GNUmakefile.in b/devel/omniORB/files/patch-idl_COS_GNUmakefile.in
new file mode 100644
index 0000000..cee2e22
--- /dev/null
+++ b/devel/omniORB/files/patch-idl_COS_GNUmakefile.in
@@ -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		\
diff --git a/devel/omniORB/files/patch-idl__Gnumakefile.in b/devel/omniORB/files/patch-idl_GNUmakefile.in
index d0aa376..64b999b 100644
--- a/devel/omniORB/files/patch-idl__Gnumakefile.in
+++ b/devel/omniORB/files/patch-idl_GNUmakefile.in
@@ -1,6 +1,6 @@
---- idl/GNUmakefile.in.orig	Sun Aug 18 17:38:33 2002
-+++ idl/GNUmakefile.in	Fri Oct 18 17:32:26 2002
-@@ -4,7 +4,7 @@
+--- 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@
  
@@ -8,4 +8,4 @@
 +INSTALLDIR = $(INSTALLIDLDIR)
  
  FILES = Naming.idl bootstrap.idl corbaidl.idl echo.idl ir.idl orb.idl \
-         poa.idl poa_include.idl
+         poa.idl poa_include.idl boxes.idl pollable.idl \
diff --git a/devel/omniORB/files/patch-idl__COS__Gnumakefile.in b/devel/omniORB/files/patch-idl__COS__Gnumakefile.in
deleted file mode 100644
index 18f578c..0000000
--- a/devel/omniORB/files/patch-idl__COS__Gnumakefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- idl/COS/GNUmakefile.in.orig	Sun Aug 18 17:38:33 2002
-+++ idl/COS/GNUmakefile.in	Fri Oct 18 20:27:23 2002
-@@ -4,7 +4,7 @@
- VPATH=@srcdir@
- INSTALL=@INSTALL@
- 
--INSTALLDIR = $(INSTALLIDLDIR)/omniORB/COS
-+INSTALLDIR = $(INSTALLIDLDIR)/COS
- 
- FILES = AttNotifyChannelAdmin.idl CosCollection.idl			\
-         CosCompoundLifeCycle.idl CosConcurrencyControl.idl		\
diff --git a/devel/omniORB/files/patch-src_appl_utils_catior_catior.cc b/devel/omniORB/files/patch-src_appl_utils_catior_catior.cc
new file mode 100644
index 0000000..5a46f94
--- /dev/null
+++ b/devel/omniORB/files/patch-src_appl_utils_catior_catior.cc
@@ -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
diff --git a/devel/omniORB/files/patch-src_appl_utils_convertior_convertior.cc b/devel/omniORB/files/patch-src_appl_utils_convertior_convertior.cc
new file mode 100644
index 0000000..0506819
--- /dev/null
+++ b/devel/omniORB/files/patch-src_appl_utils_convertior_convertior.cc
@@ -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
diff --git a/devel/omniORB/files/patch-ak b/devel/omniORB/files/patch-src_tool_omniidl_cxx_idlutil.cc
index ddc0a85..4383d60 100644
--- a/devel/omniORB/files/patch-ak
+++ b/devel/omniORB/files/patch-src_tool_omniidl_cxx_idlutil.cc
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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:
diff --git a/devel/omniORB/files/patch-undef_minor_macro b/devel/omniORB/files/patch-undef_minor_macro
deleted file mode 100644
index bf23657..0000000
--- a/devel/omniORB/files/patch-undef_minor_macro
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/appl/utils/catior/catior.cc.orig	Mon Nov  7 22:38:04 2005
-+++ src/appl/utils/catior/catior.cc	Mon Nov  7 22:38:55 2005
-@@ -42,6 +42,12 @@
- #  include <unistd.h>
- #endif
- 
-+#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
---- src/appl/utils/convertior/convertior.cc.orig	Mon Nov  7 22:39:11 2005
-+++ src/appl/utils/convertior/convertior.cc	Mon Nov  7 22:39:28 2005
-@@ -40,6 +40,12 @@
- #  include <unistd.h>
- #endif
- 
-+#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
diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
index 38fc01b..6a59426 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -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