Do not build profiled libraries on 5-CURRENT, where g++ -pg produces

strange function calls that the assembler cannot understand.

Submitted by:	bento, kris

http://bento.freebsd.org/errorlogs/i386-5-latest/sqlrelay-0.32.log

4 files changed, 65 insertions, 3 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 50a463b62ccb..066050ca0ba5 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -132,6 +132,16 @@ PLIST_SUB=	IF_SQLITE=${IF_SQLITE} \
 #  --with-interbase-prefix       Location of Interbase
 #  --with-db2-prefix             Location of DB2
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-*
+
+PLIST_SUB+=	PROFILE="@comment "
+.else
+PLIST_SUB+=	PROFILE=""
+.endif
+
 post-extract:
 	${MKDIR} ${WRKDIR}/prefixes/libxml
 	${LN} -s ${LOCALBASE}/include/libxml2 ${WRKDIR}/prefixes/libxml/include
@@ -152,4 +162,4 @@ post-install:
 	cd ${WRKSRC} && ${MAKE} install-doc
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/sqlrelay/files/extra-patch-src+api+c+++src+Makefile b/databases/sqlrelay/files/extra-patch-src+api+c+++src+Makefile
new file mode 100644
index 000000000000..b20316d8d48e
--- /dev/null
+++ b/databases/sqlrelay/files/extra-patch-src+api+c+++src+Makefile
@@ -0,0 +1,26 @@
+--- src/api/c++/src/Makefile.orig	Sat Apr 13 16:37:18 2002
++++ src/api/c++/src/Makefile	Wed Dec 18 21:53:01 2002
+@@ -11,7 +11,6 @@
+ 
+ all: 
+ 	$(MAKE) ../lib/libsqlrclient.a; \
+-	$(MAKE) ../lib/libsqlrclient_p.a; \
+ 	if ( test "$(MINGW32)" != "yes" -a "$(CYGWIN)" != "yes" -a "$(UWIN)" != "yes" ); then \
+ 		$(MAKE) ../lib/libsqlrclient.so.$(SQLR_VERSION); \
+ 	else \
+@@ -54,7 +53,6 @@
+ install:
+ 	$(top_srcdir)/mkinstalldirs $(libdir)
+ 	$(INSTALL) -m 644 ../lib/libsqlrclient.a $(libdir); \
+-	$(INSTALL) -m 644 ../lib/libsqlrclient_p.a $(libdir); \
+ 	if ( test "$(MINGW32)" != "yes" -a "$(CYGWIN)" != "yes" -a "$(UWIN)" != "yes" ); then \
+ 		$(RM) $(libdir)/libsqlrclient.so*; \
+ 		$(INSTALL) ../lib/libsqlrclient.so.$(SQLR_VERSION) $(libdir); \
+@@ -70,7 +68,6 @@
+ uninstall:
+ 	$(RM) $(libdir)/libsqlrclient.so*
+ 	$(RM) $(libdir)/libsqlrclient.a
+-	$(RM) $(libdir)/libsqlrclient_p.a
+ 	$(RM) $(libdir)/libsqlrclient.dll
+ 	$(RM) $(libdir)/libsqlrclient.lib
+ 	$(RMTREE) $(cachedir)
diff --git a/databases/sqlrelay/files/extra-patch-src+api+c+src+Makefile b/databases/sqlrelay/files/extra-patch-src+api+c+src+Makefile
new file mode 100644
index 000000000000..6c0c55424a83
--- /dev/null
+++ b/databases/sqlrelay/files/extra-patch-src+api+c+src+Makefile
@@ -0,0 +1,26 @@
+--- src/api/c/src/Makefile.orig	Sat Apr 13 16:37:08 2002
++++ src/api/c/src/Makefile	Wed Dec 18 21:52:24 2002
+@@ -11,7 +11,6 @@
+ 
+ all:
+ 	$(MAKE) ../lib/libsqlrclientwrapper.a; \
+-	$(MAKE) ../lib/libsqlrclientwrapper_p.a; \
+ 	if ( test "$(MINGW32)" != "yes" -a "$(CYGWIN)" != "yes" -a "$(UWIN)" != "yes" ); then \
+ 		$(MAKE) ../lib/libsqlrclientwrapper.so.$(SQLR_VERSION); \
+ 	else \
+@@ -51,7 +50,6 @@
+ install:
+ 	$(top_srcdir)/mkinstalldirs $(libdir)
+ 	$(INSTALL) -m 644 ../lib/libsqlrclientwrapper.a $(libdir); \
+-	$(INSTALL) -m 644 ../lib/libsqlrclientwrapper_p.a $(libdir); \
+ 	if ( test "$(MINGW32)" != "yes" -a "$(CYGWIN)" != "yes" -a "$(UWIN)" != "yes" ); then \
+ 		$(RM) $(libdir)/libsqlrclientwrapper.so*; \
+ 		$(INSTALL) ../lib/libsqlrclientwrapper.so.$(SQLR_VERSION) $(libdir); \
+@@ -67,7 +65,6 @@
+ uninstall:
+ 	$(RM) $(libdir)/libsqlrclientwrapper.so*
+ 	$(RM) $(libdir)/libsqlrclientwrapper.a
+-	$(RM) $(libdir)/libsqlrclientwrapper_p.a
+ 	$(RM) $(libdir)/libsqlrclientwrapper.dll
+ 	$(RM) $(libdir)/libsqlrclientwrapper.lib
+ 	$(RMTREE) $(cachedir)
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index a930cc6ab670..bd8a582edf14 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -30,11 +30,11 @@ include/sqlrelay/sqlrclientwrapper.h
 lib/libsqlrclient.a
 lib/libsqlrclient.so
 lib/libsqlrclient.so.0
-lib/libsqlrclient_p.a
+%%PROFILE%%lib/libsqlrclient_p.a
 lib/libsqlrclientwrapper.a
 lib/libsqlrclientwrapper.so
 lib/libsqlrclientwrapper.so.0
-lib/libsqlrclientwrapper_p.a
+%%PROFILE%%lib/libsqlrclientwrapper_p.a
 @dirrm sqlrelay/tmp
 @dirrm sqlrelay/debug
 @dirrm sqlrelay/cache