- Update omniORB to 4.1.4 and py-omniorb to 3.4

- Adapt to 9-CURRENT.

PR:		ports/138934 (partitionaly)
Submitted by:	Andrey Ignatov <rdna at rdna.ru>

4 files changed, 19 insertions, 29 deletions

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 3ef30925f175..17b2e42b3ad1 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	omniORB
-PORTVERSION=	4.1.3
+PORTVERSION=	4.1.4
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
-
+MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	A robust high performance CORBA ORB for C++ and Python
 
@@ -21,12 +20,8 @@ USE_OPENSSL=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 MAKEFILE=	GNUmakefile
-BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
-CONFIGURE_WRKSRC=	${WRKSRC}/build
-CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
-		CPP=${CPP} PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CPP=${CPP} \
+		PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \
 		--with-omniORB-config=${PREFIX}/etc/omniORB.cfg \
 		--with-omniNames-logdir=/var/log
@@ -37,21 +32,18 @@ PLIST_SUB+=	STATIC="@comment "
 PLIST_SUB+=	STATIC=""
 .endif
 
-MAN1=		catior.1 genior.1 nameclt.1 omniNames.1 omniidl.1
+MAN1=		catior.1 convertior.1 genior.1 nameclt.1 omniidl.1
+MAN8=		omniMapper.8 omniNames.8
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#-pthread|-lc_r#${PTHREAD_LIBS}#' \
 		-e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in
 
-pre-configure:
-	@${MKDIR} ${CONFIGURE_WRKSRC}
-
 post-install:
 	@${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${PYTHON_SITELIBDIR}/omniidl')"
 	@${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${PYTHON_SITELIBDIR}/omniidl_be')"
-.for manpage in ${MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/man/man1/${manpage} ${MANPREFIX}/man/man1
-.endfor
+	@cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
+	@cd ${WRKSRC}/man/man8 && ${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST.txt README.unix \
diff --git a/devel/omniORB/distinfo b/devel/omniORB/distinfo
index 9b4b7013136d..f6a2f644e2e0 100644
--- a/devel/omniORB/distinfo
+++ b/devel/omniORB/distinfo
@@ -1,3 +1,3 @@
-MD5 (omniORB-4.1.3.tar.gz) = 8a7b583e98ee78f10d8c43014dcaa923
-SHA256 (omniORB-4.1.3.tar.gz) = b9668cb4b0f1abe81065d726fac8a3df2e6df7425fee7aa5affbd3699fe52f8a
-SIZE (omniORB-4.1.3.tar.gz) = 3268141
+MD5 (omniORB-4.1.4.tar.gz) = 1f6070ff9b6339876976d61981eeaa6a
+SHA256 (omniORB-4.1.4.tar.gz) = 84fb9790c25d6e46248c9773747e393b429573190da2150850d4a49debda4e8e
+SIZE (omniORB-4.1.4.tar.gz) = 3093814
diff --git a/devel/omniORB/files/patch-configure b/devel/omniORB/files/patch-configure
index 3130d1f2161d..7a930f038a14 100644
--- a/devel/omniORB/files/patch-configure
+++ b/devel/omniORB/files/patch-configure
@@ -1,10 +1,11 @@
---- configure.orig	2008-09-16 13:22:10.000000000 +0400
-+++ configure	2008-10-02 00:37:42.000000000 +0400
-@@ -12635,6 +12635,7 @@
+--- configure.orig	2009-07-16 17:11:17.000000000 +0400
++++ configure	2009-11-26 15:46:43.000000000 +0300
+@@ -13077,6 +13077,8 @@
    *-*-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";;
    *-*-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";;
diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
index 94676e3a7dfe..87e57139fd3d 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -238,6 +238,8 @@ libdata/pkgconfig/omnithread3.pc
 %%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
@@ -338,9 +340,7 @@ libdata/pkgconfig/omnithread3.pc
 %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes.txt
 %%PORTDOCS%%%%DOCSDIR%%/omniNames.html
 %%PORTDOCS%%%%DOCSDIR%%/omniNames.pdf
-%%PORTDOCS%%%%DOCSDIR%%/omniNames.ps
 %%PORTDOCS%%%%DOCSDIR%%/omniORB.pdf
-%%PORTDOCS%%%%DOCSDIR%%/omniORB.ps
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/contents_motif.gif
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/index.html
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/next_motif.gif
@@ -364,10 +364,8 @@ libdata/pkgconfig/omnithread3.pc
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/previous_motif.gif
 %%PORTDOCS%%%%DOCSDIR%%/omniidl.html
 %%PORTDOCS%%%%DOCSDIR%%/omniidl.pdf
-%%PORTDOCS%%%%DOCSDIR%%/omniidl.ps
 %%PORTDOCS%%%%DOCSDIR%%/omnithread.html
 %%PORTDOCS%%%%DOCSDIR%%/omnithread.pdf
-%%PORTDOCS%%%%DOCSDIR%%/omnithread.ps
 %%PORTDOCS%%%%DOCSDIR%%/tex/cover.tex
 %%PORTDOCS%%%%DOCSDIR%%/tex/ode.tex
 %%PORTDOCS%%%%DOCSDIR%%/tex/omniNames.tex
@@ -378,8 +376,7 @@ libdata/pkgconfig/omnithread3.pc
 %%PORTDOCS%%%%DOCSDIR%%/tex/utilities.tex
 %%PORTDOCS%%%%DOCSDIR%%/utilities.html
 %%PORTDOCS%%%%DOCSDIR%%/utilities.pdf
-%%PORTDOCS%%%%DOCSDIR%%/utilities.ps
-%%PORTDOCS%%%%EXAMPLESDIR%%/omniORB.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/omniORB.cfg
 %%DATADIR%%/idl/COS/CosCollection.idl
 %%DATADIR%%/idl/COS/CosCompoundLifeCycle.idl
 %%DATADIR%%/idl/COS/CosConcurrencyControl.idl
@@ -452,7 +449,7 @@ libdata/pkgconfig/omnithread3.pc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/tex
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/omniORB
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel
 @dirrm %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl
 @dirrm %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header