- Update to 2.5

- Fix build on 6.x
- Refine Makefile

4 files changed, 27 insertions, 22 deletions

diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile
index ee7d2188de12..b8db78424495 100644
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	omniorb
-PORTVERSION=	2.3
-PORTREVISION=	1
+PORTVERSION=	2.5
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -32,25 +31,21 @@ OMNIORB_WRKSRC!=	cd ${.CURDIR}/../omniORB && ${MAKE} -V WRKSRC
 
 USE_PYTHON=	yes
 USE_GMAKE=	yes
+USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
 CONFIGURE_SCRIPT=	../configure
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
 		CPP=${CPP} PYTHON=${PYTHON_CMD}
-CONFIGURE_ARGS=	--with-openssl=/usr --with-omniorb=${LOCALBASE}
-
-CPIO=		cpio --quiet -pdum
-
-MODULEDIRS=	CosNaming CosNaming__POA omniORB
-DOCSDIR=	${PREFIX}/share/doc/omniORBpy
-EXAMPLESDIR=	${PREFIX}/share/examples/omniORBpy
+CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE}
 
 pre-configure:
-	@ ${MKDIR} ${CONFIGURE_WRKSRC}
-	@ cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} ${WRKSRC}
+	@${MKDIR} ${CONFIGURE_WRKSRC}
+	@cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#' \
@@ -58,14 +53,14 @@ post-patch:
 
 pre-install:
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}/html
-	@ ${MKDIR} ${DOCSDIR}/tex
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy.* ${DOCSDIR}
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy/* ${DOCSDIR}/html
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/tex/* ${DOCSDIR}/tex
-	@ ${MKDIR} ${EXAMPLESDIR}
-	@ cd ${WRKSRC}/examples && ${FIND} . \
-	  | ${CPIO} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+	@${MKDIR} ${DOCSDIR}/html
+	@${MKDIR} ${DOCSDIR}/tex
+	@${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy.* ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy/* ${DOCSDIR}/html
+	@${INSTALL_DATA} ${WRKSRC}/doc/tex/* ${DOCSDIR}/tex
+	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC}/examples && ${FIND} . \
+	  | ${CPIO} --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-omniorb/distinfo b/devel/py-omniorb/distinfo
index abfc1ec7ee3d..8905efbe616c 100644
--- a/devel/py-omniorb/distinfo
+++ b/devel/py-omniorb/distinfo
@@ -1,2 +1,2 @@
-MD5 (omniORBpy-2.3.tar.gz) = 81587117a49a92739b626c7687c61fdc
-SIZE (omniORBpy-2.3.tar.gz) = 648789
+MD5 (omniORBpy-2.5.tar.gz) = 10a3e12d2030302d027fdb3da25bce13
+SIZE (omniORBpy-2.5.tar.gz) = 634706
diff --git a/devel/py-omniorb/files/patch-configure b/devel/py-omniorb/files/patch-configure
new file mode 100644
index 000000000000..8ecbc76cfce1
--- /dev/null
+++ b/devel/py-omniorb/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Nov 20 13:52:01 2004
++++ configure	Sat Nov 20 13:52:12 2004
+@@ -3623,6 +3623,7 @@
+   *-*-freebsd3*) platform_name="FreeBSD";  os_version="3";;
+   *-*-freebsd4*) platform_name="FreeBSD";  os_version="4";;
+   *-*-freebsd5*) platform_name="FreeBSD";  os_version="5";;
++  *-*-freebsd6*) platform_name="FreeBSD";  os_version="6";;
+   *-*-sco*)      platform_name="OSR5";     os_version="5";;
+   *-*-cygwin*)   platform_name="Cygwin";   os_version="2";;
+ esac
diff --git a/devel/py-omniorb/pkg-plist b/devel/py-omniorb/pkg-plist
index f561b92cf6da..bcf99e65fa17 100644
--- a/devel/py-omniorb/pkg-plist
+++ b/devel/py-omniorb/pkg-plist
@@ -17,7 +17,7 @@ include/omniORBpy.h
 %%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.2.0
 %%PYTHON_SITELIBDIR%%/_omnipymodule.so
 %%PYTHON_SITELIBDIR%%/_omnipymodule.so.2
-%%PYTHON_SITELIBDIR%%/_omnipymodule.so.2.3
+%%PYTHON_SITELIBDIR%%/_omnipymodule.so.2.4
 %%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so
 %%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.2
 %%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.2.0