- Add gnometarget. [1]

- Better eplanation in a BROKEN message (does not support <5.0) [1]
- Change patch-pkgconfig with a REPLACE_CMD in Makefile [1]
- Improve do-configure target to respect CC,CXX, etc. [1]
- Back shared libraries versioning that was removed by developers [2]

Submitted by:	mezz [1]
Noted by:	pav  [2]

3 files changed, 42 insertions, 104 deletions

diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index 1644fca09f49..2ad9fd0f2288 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ace
 PORTVERSION=	5.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://deuce.doc.wustl.edu/pub/previous_versions/ \
 		http://deuce.doc.wustl.edu/old_distribution/ \
@@ -23,7 +24,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--program-transform-name s,^,ace-,
-USE_GNOME=	pkgconfig
+USE_GNOME=	gnometarget pkgconfig
 
 WRKSRC=		${WRKDIR}/ACE_wrappers
 BUILD_WRKSRC=	${WRKSRC}/objdir
@@ -35,7 +36,7 @@ MAN1=		ace-gperf.1
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		does not support
+BROKEN=		does not support FreeBSD 4.x
 .endif
 
 .if ${OSVERSION} >= 700015 || (${OSVERSION} < 700000 && ${OSVERSION} >= 601103)
@@ -45,8 +46,28 @@ EXTRA_PATCHES=	${FILESDIR}/extra-ace-OS_NS_netdb.inl
 post-extract:
 	@${MKDIR} ${BUILD_WRKSRC}
 
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g'
+
 do-configure:
-	@cd ${BUILD_WRKSRC}; \
-	${CONFIGURE_ENV} ../${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+	@(cd ${BUILD_WRKSRC} && \
+		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
+	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
+	    INSTALL_DATA="${INSTALL_DATA}" \
+	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+	    ${CONFIGURE_ENV} ../${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
+			 ${ECHO_CMD} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
+			 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
+			 ${FALSE}; \
+		fi)
+
+post-install:
+	@for f in `${GREP} "${PORTVERSION}.*\.so$$" ${PLIST}`; do \
+		n=`echo $${f}|sed -e 's/-${PORTVERSION}//'`; \
+		${LN} -fs ${PREFIX}/$$f ${PREFIX}/$${n}.5; \
+	done
 
 .include <bsd.port.post.mk>
diff --git a/devel/ace/files/patch-pkgconfig b/devel/ace/files/patch-pkgconfig
deleted file mode 100644
index 0d1e4552ead4..000000000000
--- a/devel/ace/files/patch-pkgconfig
+++ /dev/null
@@ -1,99 +0,0 @@
---- ./ACEXML/common/Makefile.in.orig	Mon Mar 13 20:35:58 2006
-+++ ./ACEXML/common/Makefile.in	Mon Mar 13 20:36:47 2006
-@@ -357,7 +357,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--pkgconfigdir = @libdir@/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- ACE_BUILDDIR = $(top_builddir)
- ACE_ROOT = $(top_srcdir)
- lib_LTLIBRARIES = libACEXML.la
---- ./ACEXML/parser/parser/Makefile.in.orig	Mon Mar 13 20:35:58 2006
-+++ ./ACEXML/parser/parser/Makefile.in	Mon Mar 13 20:36:55 2006
-@@ -346,7 +346,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--pkgconfigdir = @libdir@/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- ACE_BUILDDIR = $(top_builddir)
- ACE_ROOT = $(top_srcdir)
- lib_LTLIBRARIES = libACEXML_Parser.la
---- ./ace/QoS/Makefile.in.orig	Mon Mar 13 20:35:58 2006
-+++ ./ace/QoS/Makefile.in	Mon Mar 13 20:37:02 2006
-@@ -354,7 +354,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--pkgconfigdir = @libdir@/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- ACE_BUILDDIR = $(top_builddir)
- ACE_ROOT = $(top_srcdir)
- @BUILD_QOS_TRUE@lib_LTLIBRARIES = libACE_QoS.la
---- ./ace/SSL/Makefile.in.orig	Mon Mar 13 20:35:58 2006
-+++ ./ace/SSL/Makefile.in	Mon Mar 13 20:37:10 2006
-@@ -358,7 +358,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--pkgconfigdir = @libdir@/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- ACE_BUILDDIR = $(top_builddir)
- ACE_ROOT = $(top_srcdir)
- @BUILD_SSL_TRUE@lib_LTLIBRARIES = libACE_SSL.la
---- ace/Makefile.in.orig	Sun Jul  9 16:39:28 2006
-+++ ace/Makefile.in	Sun Jan 28 13:57:44 2007
-@@ -1977,7 +1977,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--pkgconfigdir = @libdir@/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- ACE_BUILDDIR = $(top_builddir)
- ACE_ROOT = $(top_srcdir)
- SUBDIRS = \
---- ./Kokyu/Makefile.in.orig	Mon Mar 13 20:35:58 2006
-+++ ./Kokyu/Makefile.in	Mon Mar 13 20:37:24 2006
-@@ -349,7 +349,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--pkgconfigdir = @libdir@/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- ACE_BUILDDIR = $(top_builddir)
- ACE_ROOT = $(top_srcdir)
- SUBDIRS = \
---- ./protocols/ace/HTBP/Makefile.in.orig	Mon Mar 13 20:35:58 2006
-+++ ./protocols/ace/HTBP/Makefile.in	Mon Mar 13 20:37:31 2006
-@@ -349,7 +349,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--pkgconfigdir = @libdir@/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- ACE_BUILDDIR = $(top_builddir)
- ACE_ROOT = $(top_srcdir)
- lib_LTLIBRARIES = libACE_HTBP.la
---- ./protocols/ace/RMCast/Makefile.in.orig	Mon Mar 13 20:35:58 2006
-+++ ./protocols/ace/RMCast/Makefile.in	Mon Mar 13 20:37:37 2006
-@@ -360,7 +360,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--pkgconfigdir = @libdir@/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- ACE_BUILDDIR = $(top_builddir)
- ACE_ROOT = $(top_srcdir)
- @BUILD_THREADS_TRUE@lib_LTLIBRARIES = libACE_RMCast.la
---- ./protocols/ace/TMCast/Makefile.in.orig	Mon Mar 13 20:35:58 2006
-+++ ./protocols/ace/TMCast/Makefile.in	Mon Mar 13 20:37:46 2006
-@@ -350,7 +350,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--pkgconfigdir = @libdir@/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- ACE_BUILDDIR = $(top_builddir)
- ACE_ROOT = $(top_srcdir)
- @BUILD_EXCEPTIONS_TRUE@@BUILD_THREADS_TRUE@lib_LTLIBRARIES = libACE_TMCast.la
diff --git a/devel/ace/pkg-plist b/devel/ace/pkg-plist
index 018522b0b464..1dd98e9c3549 100644
--- a/devel/ace/pkg-plist
+++ b/devel/ace/pkg-plist
@@ -984,30 +984,46 @@ include/protocols/ace/TMCast/MTQueue.hpp
 include/protocols/ace/TMCast/Messaging.hpp
 include/protocols/ace/TMCast/Protocol.hpp
 include/protocols/ace/TMCast/TransactionController.hpp
+lib/libACE.so.5
 lib/libACE-5.5.2.so
 lib/libACE.la
 lib/libACE.so
+@exec ln -fs %F %F.5
+lib/libACEXML.so.5
 lib/libACEXML-5.5.2.so
 lib/libACEXML.la
 lib/libACEXML.so
+@exec ln -fs %F %F.5
+lib/libACEXML_Parser.so.5
 lib/libACEXML_Parser-5.5.2.so
+@exec ln -fs %F %F.5
 lib/libACEXML_Parser.la
 lib/libACEXML_Parser.so
+lib/libACEXML_XML_Svc_Conf_Parser.so.5
 lib/libACEXML_XML_Svc_Conf_Parser-5.5.2.so
 lib/libACEXML_XML_Svc_Conf_Parser.la
 lib/libACEXML_XML_Svc_Conf_Parser.so
+@exec ln -fs %F %F.5
+lib/libACE_HTBP.so.5
 lib/libACE_HTBP-5.5.2.so
 lib/libACE_HTBP.la
 lib/libACE_HTBP.so
+@exec ln -fs %F %F.5
+lib/libACE_RMCast.so.5
 lib/libACE_RMCast-5.5.2.so
 lib/libACE_RMCast.la
 lib/libACE_RMCast.so
+@exec ln -fs %F %F.5
+lib/libACE_SSL.so.5
 lib/libACE_SSL-5.5.2.so
 lib/libACE_SSL.la
 lib/libACE_SSL.so
+@exec ln -fs %F %F.5
+lib/libACE_TMCast.so.5
 lib/libACE_TMCast-5.5.2.so
 lib/libACE_TMCast.la
 lib/libACE_TMCast.so
+@exec ln -fs %F %F.5
 lib/libKokyu.la
 lib/libKokyu.so
 lib/libKokyu.so.5
@@ -1030,7 +1046,7 @@ libdata/pkgconfig/Kokyu.pc
 @dirrm include/ace/os_include/arpa
 @dirrm include/ace/os_include
 @dirrm include/ace/SSL
-@dirrm include/ace/QoS
+@dirrmtry include/ace/QoS
 @dirrm include/ace
 @dirrm include/Kokyu
 @dirrm include/ACEXML/parser/parser