From a412d5e141896dcb9c0d498e64dca845993b3810 Mon Sep 17 00:00:00 2001
From: "James E. Housley" <jeh@FreeBSD.org>
Date: Fri, 23 Mar 2001 00:35:26 +0000
Subject: - Update of devel/omniORB to 3.0.3; also fixes significant problems
 with the   port (see below). - Submitted this to current maintainer on
 Wednesday 14 March; no response yet - The Python modules were not correctly
 installed to the Python site library   directory before.  They are now. 
 (Thanks to Michael Ewe <m.ewe@t-online.de>   for pointing out the issue.) -
 Used PORTDOCS pragma in $PLIST.

PR:		25934
Submitted by:	Johann Visagie <johann@egenetics.com>
---
 devel/omniORB/Makefile | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

(limited to 'devel/omniORB/Makefile')

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 94817724b841..c1efdd43b160 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	omniORB
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.orl.co.uk/pub/omniORB/omniORB3/
+MASTER_SITES=	ftp://ftp.uk.research.att.com/pub/omniORB/omniORB3/
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//g}
 
 MAINTAINER=	ejc@bazzle.com
@@ -16,13 +16,14 @@ MAINTAINER=	ejc@bazzle.com
 MAN1=		catior.1 genior.1 nameclt.1 obuildtree.1 ols.1 omake.1 \
 		omniNames.1 opriv.1 oshadow.1
 
-WRKSRC=		${WRKDIR}/omni/src
+WRKSRC=		${WRKDIR}/omni
+BUILD_WRKSRC=	${WRKSRC}/src
 
 USE_PYTHON=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-NO_FILTER_SHLIBS=yes
+NO_FILTER_SHLIBS=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	export
 MAKE_ENV+=	CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" \
@@ -31,15 +32,17 @@ MAKE_ENV+=	CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" \
 ONLY_FOR_ARCHS=	i386
 
 # Setting ${CONFIG_TARGET} to this value  and patching it into
-# ${WRKSRC}/../config/config.mk via the post-patch target ensures that the
+# ${WRKSRC}/config/config.mk via the post-patch target ensures that the
 # internal make variable __OSVERSION__ is set to 4.  This activates gcc
 # 2.9.5-specific code, and obviates the need for most of the patches
 # previously required since there are now version checks in the source.
 CONFIG_TARGET=	x86_freebsd_4.0
 
+CPIO=		cpio --quiet -pdum -R
+
 post-patch:
 	@${SETENV} LANG=C ${PERL} -pi -e 's/__PLATFORM__/${CONFIG_TARGET}/;' \
-		${WRKSRC}/../config/config.mk
+		${WRKSRC}/config/config.mk
 
 binfiles=	catior convertior genior nameclt omkdepend omniMapper \
 		omniNames
@@ -47,32 +50,36 @@ scriptfiles=	omniidl omniidlrun.py
 
 do-install:
 .for binfile in ${binfiles}
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/${CONFIG_TARGET}/${binfile} \
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${CONFIG_TARGET}/${binfile} \
 		${PREFIX}/bin
 .endfor
 .for scriptfile in ${scriptfiles}
-	${INSTALL_SCRIPT} ${WRKSRC}/../bin/${CONFIG_TARGET}/${scriptfile} \
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${CONFIG_TARGET}/${scriptfile} \
 		${PREFIX}/bin
 .endfor
-	cd ${WRKSRC}/../lib/${CONFIG_TARGET} && \
-		find . |cpio -pdum -R ${BINOWN}:${BINGRP} ${PREFIX}/lib
+	cd ${WRKSRC}/lib/${CONFIG_TARGET} && \
+		find . | ${CPIO} ${BINOWN}:${BINGRP} ${PREFIX}/lib
 .for m in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/../man/man1/${m} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/${m} ${PREFIX}/man/man1
 .endfor
 	${MKDIR} ${PREFIX}/include/omniORB3
 	${MKDIR} ${PREFIX}/include/omnithread
-	${INSTALL_DATA} ${WRKSRC}/../include/omnithread.h ${PREFIX}/include
-	cd ${WRKSRC}/../include && \
+	${INSTALL_DATA} ${WRKSRC}/include/omnithread.h ${PREFIX}/include
+	cd ${WRKSRC}/include && ( \
 		${INSTALL_DATA} omnithread/* ${PREFIX}/include/omnithread; \
-		${INSTALL_DATA} omniORB3/* ${PREFIX}/include/omniORB3
+		${INSTALL_DATA} omniORB3/* ${PREFIX}/include/omniORB3 )
+	cd ${WRKSRC}/lib/python && \
+		find . | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${PYTHON_SITELIBDIR}
 	@ cd ${.CURDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/omniORB
-	${INSTALL_DATA} ${WRKSRC}/../README.unix ${PREFIX}/share/doc/omniORB
-	${INSTALL_DATA} ${WRKSRC}/../README.FreeBSD ${PREFIX}/share/doc/omniORB
-	${INSTALL_DATA} ${WRKSRC}/../ReleaseNote_omniORB_302 ${PREFIX}/share/doc/omniORB
-	cd ${WRKSRC}/../doc && \
-		find . |cpio -pdum -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/omniORB
+	${INSTALL_DATA} ${WRKSRC}/README.unix ${PREFIX}/share/doc/omniORB
+	${INSTALL_DATA} ${WRKSRC}/README.FreeBSD ${PREFIX}/share/doc/omniORB
+	${INSTALL_DATA} ${WRKSRC}/ReleaseNote_omniORB_${PORTVERSION:S/.//g} \
+		${PREFIX}/share/doc/omniORB
+	cd ${WRKSRC}/doc && \
+		find . | ${CPIO} ${SHAREOWN}:${SHAREGRP} \
+		${PREFIX}/share/doc/omniORB
 .endif
 
 .include <bsd.port.mk>
-- 
cgit v1.2.3