- Update to 4.0.5

- Fix build on 6.x
- Utilize %%DATADIR%% in pkg-plist
- Refine Makefile

4 files changed, 97 insertions, 93 deletions

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 3df1f15644b6..85a484d3a003 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	omniORB
-PORTVERSION=	4.0.3
-PORTREVISION=	3
+PORTVERSION=	4.0.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -16,6 +15,7 @@ MAINTAINER=	sem@FreeBSD.org
 COMMENT=	A robust high performance CORBA ORB for C++ and Python
 
 CONFIGURE_WRKSRC=	${WRKSRC}/build
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 USE_GMAKE=	yes
@@ -41,28 +41,22 @@ PLIST_SUB+=	STATIC=""
 
 MAN1=		catior.1 genior.1 nameclt.1 omniNames.1 omniidl.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 600000
-BROKEN=		"Does not compile on FreeBSD >= 6.x"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#' \
 		${WRKSRC}/mk/beforeauto.mk.in
 
 pre-configure:
-	@ ${MKDIR} ${CONFIGURE_WRKSRC}
+	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-install:
 .for manpage in ${MAN1}
-	@ ${INSTALL_MAN} ${WRKSRC}/man/man1/${manpage} ${MANPREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/man/man1/${manpage} ${MANPREFIX}/man/man1
 .endfor
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
-	@ cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST README.unix \
-	  ReleaseNotes_${PORTVERSION}.txt ${DOCSDIR}
-	@ ${TAR} cCf ${WRKSRC}/doc - . | ${TAR} xUCf ${DOCSDIR} -
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST.txt README.unix \
+	 ReleaseNotes_${PORTVERSION}.txt ${DOCSDIR}
+	@${TAR} cCf ${WRKSRC}/doc - . | ${TAR} xUCf ${DOCSDIR} -
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/omniORB/distinfo b/devel/omniORB/distinfo
index ed8f169412a0..6b2e3c17a784 100644
--- a/devel/omniORB/distinfo
+++ b/devel/omniORB/distinfo
@@ -1,2 +1,2 @@
-MD5 (omniORB-4.0.3.tar.gz) = 96adc272e0a9a32daee24bd8491c3abe
-SIZE (omniORB-4.0.3.tar.gz) = 2727808
+MD5 (omniORB-4.0.5.tar.gz) = c6a05df107fe5021dd0470a2e9c89e90
+SIZE (omniORB-4.0.5.tar.gz) = 2769030
diff --git a/devel/omniORB/files/patch-configure b/devel/omniORB/files/patch-configure
new file mode 100644
index 000000000000..5ad8217164da
--- /dev/null
+++ b/devel/omniORB/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Nov 20 12:35:49 2004
++++ configure	Sat Nov 20 12:36:13 2004
+@@ -11797,6 +11797,7 @@
+   *-*-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";;
+   *-*-openbsd*)  plat_name="OpenBSD";  plat_def="__openbsd__";  os_v="3";;
+   *-*-sco*)      plat_name="OSR5";     plat_def="__osr5__";     os_v="5";;
+ esac
diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
index 6464ef17cf41..5c46397ffb20 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -172,19 +172,19 @@ include/omnithread/solaris.h
 %%STATIC%%lib/libomnithread.a
 lib/libCOS4.so
 lib/libCOS4.so.0
-lib/libCOS4.so.0.3
+lib/libCOS4.so.0.5
 lib/libCOSDynamic4.so
 lib/libCOSDynamic4.so.0
-lib/libCOSDynamic4.so.0.3
+lib/libCOSDynamic4.so.0.5
 lib/libomniCodeSets4.so
 lib/libomniCodeSets4.so.0
-lib/libomniCodeSets4.so.0.3
+lib/libomniCodeSets4.so.0.5
 lib/libomniDynamic4.so
 lib/libomniDynamic4.so.0
-lib/libomniDynamic4.so.0.3
+lib/libomniDynamic4.so.0.5
 lib/libomniORB4.so
 lib/libomniORB4.so.0
-lib/libomniORB4.so.0.3
+lib/libomniORB4.so.0.5
 lib/libomnisslTP.so
 lib/libomnisslTP.so.4
 lib/libomnisslTP.so.4.0
@@ -292,9 +292,9 @@ libdata/pkgconfig/omnithread3.pc
 %%PYTHON_SITELIBDIR%%/omniidl_be/interactive.py
 %%PYTHON_SITELIBDIR%%/omniidl_be/interactive.pyc
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/README.FIRST
+%%PORTDOCS%%%%DOCSDIR%%/README.FIRST.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.unix
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes_4.0.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes_4.0.5.txt
 %%PORTDOCS%%%%DOCSDIR%%/omniNames.html
 %%PORTDOCS%%%%DOCSDIR%%/omniNames.pdf
 %%PORTDOCS%%%%DOCSDIR%%/omniNames.ps
@@ -315,6 +315,7 @@ libdata/pkgconfig/omnithread3.pc
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB010.html
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB011.html
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB012.html
+%%PORTDOCS%%%%DOCSDIR%%/omniORB/omniORB013.html
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/previous_motif.gif
 %%PORTDOCS%%%%DOCSDIR%%/omniidl.html
 %%PORTDOCS%%%%DOCSDIR%%/omniidl.pdf
@@ -334,75 +335,74 @@ libdata/pkgconfig/omnithread3.pc
 %%PORTDOCS%%%%DOCSDIR%%/utilities.html
 %%PORTDOCS%%%%DOCSDIR%%/utilities.pdf
 %%PORTDOCS%%%%DOCSDIR%%/utilities.ps
-share/omniORB/idl/COS/CosCollection.idl
-share/omniORB/idl/COS/CosCompoundLifeCycle.idl
-share/omniORB/idl/COS/CosConcurrencyControl.idl
-share/omniORB/idl/COS/CosContainment.idl
-share/omniORB/idl/COS/CosEventChannelAdmin.idl
-share/omniORB/idl/COS/CosEventComm.idl
-share/omniORB/idl/COS/CosExternalization.idl
-share/omniORB/idl/COS/CosExternalizationContainment.idl
-share/omniORB/idl/COS/CosExternalizationReference.idl
-share/omniORB/idl/COS/CosGraphs.idl
-share/omniORB/idl/COS/CosLicensingManager.idl
-share/omniORB/idl/COS/CosLifeCycle.idl
-share/omniORB/idl/COS/CosLifeCycleContainment.idl
-share/omniORB/idl/COS/CosLifeCycleReference.idl
-share/omniORB/idl/COS/CosNaming.idl
-share/omniORB/idl/COS/CosNotification.idl
-share/omniORB/idl/COS/CosNotifyChannelAdmin.idl
-share/omniORB/idl/COS/CosNotifyComm.idl
-share/omniORB/idl/COS/CosNotifyFilter.idl
-share/omniORB/idl/COS/CosObjectIdentity.idl
-share/omniORB/idl/COS/CosPersistenceDDO.idl
-share/omniORB/idl/COS/CosPersistenceDS_CLI.idl
-share/omniORB/idl/COS/CosPersistencePDS.idl
-share/omniORB/idl/COS/CosPersistencePDS_DA.idl
-share/omniORB/idl/COS/CosPersistencePID.idl
-share/omniORB/idl/COS/CosPersistencePO.idl
-share/omniORB/idl/COS/CosPersistencePOM.idl
-share/omniORB/idl/COS/CosPropertyService.idl
-share/omniORB/idl/COS/CosQuery.idl
-share/omniORB/idl/COS/CosQueryCollection.idl
-share/omniORB/idl/COS/CosReference.idl
-share/omniORB/idl/COS/CosRelationships.idl
-share/omniORB/idl/COS/CosStream.idl
-share/omniORB/idl/COS/CosTSPortability.idl
-share/omniORB/idl/COS/CosTime.idl
-share/omniORB/idl/COS/CosTimerEvent.idl
-share/omniORB/idl/COS/CosTrading.idl
-share/omniORB/idl/COS/CosTradingDynamic.idl
-share/omniORB/idl/COS/CosTradingRepos.idl
-share/omniORB/idl/COS/CosTransactions.idl
-share/omniORB/idl/COS/CosTypedEventChannelAdmin.idl
-share/omniORB/idl/COS/CosTypedEventComm.idl
-share/omniORB/idl/COS/CosTypedNotifyChannelAdmin.idl
-share/omniORB/idl/COS/CosTypedNotifyComm.idl
-share/omniORB/idl/COS/DCE_CIOPSecurity.idl
-share/omniORB/idl/COS/LifeCycleService.idl
-share/omniORB/idl/COS/Lname-library.idl
-share/omniORB/idl/COS/NRService.idl
-share/omniORB/idl/COS/RDITestTypes.idl
-share/omniORB/idl/COS/SECIOP.idl
-share/omniORB/idl/COS/SSLIOP.idl
-share/omniORB/idl/COS/Security.idl
-share/omniORB/idl/COS/SecurityAdmin.idl
-share/omniORB/idl/COS/SecurityLevel1.idl
-share/omniORB/idl/COS/SecurityLevel2.idl
-share/omniORB/idl/COS/SecurityReplaceable.idl
-share/omniORB/idl/COS/TimeBase.idl
-share/omniORB/idl/Naming.idl
-share/omniORB/idl/bootstrap.idl
-share/omniORB/idl/corbaidl.idl
-share/omniORB/idl/echo.idl
-share/omniORB/idl/ir.idl
-share/omniORB/idl/orb.idl
-share/omniORB/idl/poa.idl
-share/omniORB/idl/poa_include.idl
-@dirrm share/omniORB/idl/COS
-@dirrm share/omniORB/idl
-@dirrm share/omniORB
-@dirrm libdata/pkgconfig
+%%DATADIR%%/idl/COS/CosCollection.idl
+%%DATADIR%%/idl/COS/CosCompoundLifeCycle.idl
+%%DATADIR%%/idl/COS/CosConcurrencyControl.idl
+%%DATADIR%%/idl/COS/CosContainment.idl
+%%DATADIR%%/idl/COS/CosEventChannelAdmin.idl
+%%DATADIR%%/idl/COS/CosEventComm.idl
+%%DATADIR%%/idl/COS/CosExternalization.idl
+%%DATADIR%%/idl/COS/CosExternalizationContainment.idl
+%%DATADIR%%/idl/COS/CosExternalizationReference.idl
+%%DATADIR%%/idl/COS/CosGraphs.idl
+%%DATADIR%%/idl/COS/CosLicensingManager.idl
+%%DATADIR%%/idl/COS/CosLifeCycle.idl
+%%DATADIR%%/idl/COS/CosLifeCycleContainment.idl
+%%DATADIR%%/idl/COS/CosLifeCycleReference.idl
+%%DATADIR%%/idl/COS/CosNaming.idl
+%%DATADIR%%/idl/COS/CosNotification.idl
+%%DATADIR%%/idl/COS/CosNotifyChannelAdmin.idl
+%%DATADIR%%/idl/COS/CosNotifyComm.idl
+%%DATADIR%%/idl/COS/CosNotifyFilter.idl
+%%DATADIR%%/idl/COS/CosObjectIdentity.idl
+%%DATADIR%%/idl/COS/CosPersistenceDDO.idl
+%%DATADIR%%/idl/COS/CosPersistenceDS_CLI.idl
+%%DATADIR%%/idl/COS/CosPersistencePDS.idl
+%%DATADIR%%/idl/COS/CosPersistencePDS_DA.idl
+%%DATADIR%%/idl/COS/CosPersistencePID.idl
+%%DATADIR%%/idl/COS/CosPersistencePO.idl
+%%DATADIR%%/idl/COS/CosPersistencePOM.idl
+%%DATADIR%%/idl/COS/CosPropertyService.idl
+%%DATADIR%%/idl/COS/CosQuery.idl
+%%DATADIR%%/idl/COS/CosQueryCollection.idl
+%%DATADIR%%/idl/COS/CosReference.idl
+%%DATADIR%%/idl/COS/CosRelationships.idl
+%%DATADIR%%/idl/COS/CosStream.idl
+%%DATADIR%%/idl/COS/CosTSPortability.idl
+%%DATADIR%%/idl/COS/CosTime.idl
+%%DATADIR%%/idl/COS/CosTimerEvent.idl
+%%DATADIR%%/idl/COS/CosTrading.idl
+%%DATADIR%%/idl/COS/CosTradingDynamic.idl
+%%DATADIR%%/idl/COS/CosTradingRepos.idl
+%%DATADIR%%/idl/COS/CosTransactions.idl
+%%DATADIR%%/idl/COS/CosTypedEventChannelAdmin.idl
+%%DATADIR%%/idl/COS/CosTypedEventComm.idl
+%%DATADIR%%/idl/COS/CosTypedNotifyChannelAdmin.idl
+%%DATADIR%%/idl/COS/CosTypedNotifyComm.idl
+%%DATADIR%%/idl/COS/DCE_CIOPSecurity.idl
+%%DATADIR%%/idl/COS/LifeCycleService.idl
+%%DATADIR%%/idl/COS/Lname-library.idl
+%%DATADIR%%/idl/COS/NRService.idl
+%%DATADIR%%/idl/COS/RDITestTypes.idl
+%%DATADIR%%/idl/COS/SECIOP.idl
+%%DATADIR%%/idl/COS/SSLIOP.idl
+%%DATADIR%%/idl/COS/Security.idl
+%%DATADIR%%/idl/COS/SecurityAdmin.idl
+%%DATADIR%%/idl/COS/SecurityLevel1.idl
+%%DATADIR%%/idl/COS/SecurityLevel2.idl
+%%DATADIR%%/idl/COS/SecurityReplaceable.idl
+%%DATADIR%%/idl/COS/TimeBase.idl
+%%DATADIR%%/idl/Naming.idl
+%%DATADIR%%/idl/bootstrap.idl
+%%DATADIR%%/idl/corbaidl.idl
+%%DATADIR%%/idl/echo.idl
+%%DATADIR%%/idl/ir.idl
+%%DATADIR%%/idl/orb.idl
+%%DATADIR%%/idl/poa.idl
+%%DATADIR%%/idl/poa_include.idl
+@dirrm %%DATADIR%%/idl/COS
+@dirrm %%DATADIR%%/idl
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/tex
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/omniORB
 %%PORTDOCS%%@dirrm %%DOCSDIR%%