* respect CC, CXX, CFLAGS, CXXFLAGS.

* turn on USE_NEWGCC.
* don't use mkdirhier (to avoid implicit BUILD_DEPENDS on XFree86)
* define ONLY_FOR_ARCHS=i386.
* tweak do-install rules.
* revise some patch for the socklen_t issue.
* fit library file names in the ELF world to enable making package on -STABLE and -CURRENT.

PR:		168006
Submitted by:	OKAZAKI Tetsurou <okazaki@be.to>

3 files changed, 27 insertions, 10 deletions

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index a50f3d8e3f43..46be3bd55f7e 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -18,27 +18,44 @@ MAN1=		catior.1 genior.1 nameclt.1 obuildtree.1 ols.1 omake.1 \
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
+USE_NEWGCC=	YES
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	export
+MAKE_ENV=	CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" \
+		MKDIRHIER="${WRKSRC}/../bin/scripts/omkdirhier"
+ONLY_FOR_ARCHS=	i386
+CONFIG_TARGET=	x86_freebsd_3.2
+
+post-patch:
+	@${SETENV} LANG=C ${PERL} -pi -e 's/__PLATFORM__/${CONFIG_TARGET}/;' \
+		${WRKSRC}/../config/config.mk
+	@${SETENV} LANG=C ${PERL} -pi -e 's/^(MKDIRHIER[^=]*)=/$$1?=/;' \
+		${WRKSRC}/../mk/unix.mk
 
 do-install:
-	(cd ${WRKSRC}/../bin/x86_freebsd_3.2; find . |cpio -pdum ${PREFIX}/bin)
-	(cd ${WRKSRC}/../lib/x86_freebsd_3.2; find . |cpio -pdum ${PREFIX}/lib)
-	${INSTALL_MAN} ${WRKSRC}/../man/man1/* ${PREFIX}/man/man1
+	cd ${WRKSRC}/../bin && \
+		${INSTALL_PROGRAM} ${CONFIG_TARGET}/* ${PREFIX}/bin
+	cd ${WRKSRC}/../lib/${CONFIG_TARGET} && \
+		find . |cpio -pdum -R ${BINOWN}:${BINGRP} ${PREFIX}/lib
+.for m in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/../man/man1/${m} ${PREFIX}/man/man1
+.endfor
 	${MKDIR} ${PREFIX}/include/omniORB2
 	${MKDIR} ${PREFIX}/include/omnithread
 	${INSTALL_DATA} ${WRKSRC}/../include/omnithread.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/../include/omnithread/* ${PREFIX}/include/omnithread
-	${INSTALL_DATA} ${WRKSRC}/../include/omniORB2/* ${PREFIX}/include/omniORB2
+	cd ${WRKSRC}/../include && \
+		${INSTALL_DATA} omnithread/* ${PREFIX}/include/omnithread; \
+		${INSTALL_DATA} omniORB2/* ${PREFIX}/include/omniORB2
+	@ 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_280 ${PREFIX}/share/doc/omniORB
-	(cd ${WRKSRC}/../doc; find . |cpio -pdum ${PREFIX}/share/doc/omniORB)
+	cd ${WRKSRC}/../doc && \
+		find . |cpio -pdum -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/omniORB
 .endif
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
-
diff --git a/devel/omniORB/files/patch-aa b/devel/omniORB/files/patch-aa
index c12708d4e740..a92ac6b329ff 100644
--- a/devel/omniORB/files/patch-aa
+++ b/devel/omniORB/files/patch-aa
@@ -5,7 +5,7 @@
  #platform = x86_sco5
  #platform = x86_uw7
 -#platform = i386_freebsd_3.2
-+platform = x86_freebsd_3.2
++platform = __PLATFORM__
  
  # On Win32 platforms, uncomment the following line to build all the binaries
  # with debugging information. Useful if you want to debug the binaries under
diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
index 26d7b8eacd98..f3fdedd74281 100644
--- a/devel/omniORB/pkg-plist
+++ b/devel/omniORB/pkg-plist
@@ -52,6 +52,8 @@ lib/libomnithread.so.2.1
 lib/libtcpwrapGK.a
 lib/libtcpwrapGK.so
 lib/libtcpwrapGK.so.1.0
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/doc/omniORB/README.unix
 share/doc/omniORB/README.FreeBSD
 share/doc/omniORB/ReleaseNote_omniORB_280
@@ -175,5 +177,3 @@ share/doc/omniORB/utilities/utilities.html
 @dirrm share/doc/omniORB/utilities
 @dirrm share/doc/omniORB/tex
 @dirrm share/doc/omniORB
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R