ports/93289: Maintainer update: www/resin2 and www/resin3: honour PTHREAD_LIBS to fix build failure on FreeBSD 7

[Jean-Baptiste Quenot]

>Number:         93289
>Category:       ports
>Synopsis:       Maintainer update: www/resin2 and www/resin3: honour PTHREAD_LIBS to fix build failure on FreeBSD 7
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 13 14:50:07 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Baptiste Quenot
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD vision.anyware 5.4-STABLE FreeBSD 5.4-STABLE #0: Wed Oct 5 09:32:29 CEST 2005 jbq at vision.anyware:/usr/src/sys/i386/compile/VISION i386
>Description:
This is an attempt to fix the following errors:

ports-i386 at FreeBSD.org: resin-2.1.17 failed on i386 7
ports-i386 at FreeBSD.org: resin-3.0.17 failed on i386 7

cc -rpath=/usr/lib:/usr/local/lib -L/usr/lib -lcrypto -lssl -o resin resin.o ../common/common.o std.o memory.o ssl.o -lc_r
/usr/bin/ld: cannot find -lc_r
*** Error code 1

A new patch is added to remove hardcoded reference to -lc_r.  The CFLAGS
variable is augmented with PTHREAD_LIBS.
>How-To-Repeat:
>Fix:
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/Makefile ./Makefile
--- /usr/ports/www/resin2/Makefile	Thu Dec 22 00:11:27 2005
+++ ./Makefile	Mon Feb 13 15:22:59 2006
@@ -60,6 +60,7 @@
 			--with-openssl-lib=${OPENSSLLIB} \
 			--with-openssl-include=${OPENSSLINC}
 LDFLAGS+=		-L${OPENSSLLIB} -lcrypto -lssl
+CFLAGS+=		${PTHREAD_LIBS}
 
 # Install the Apache plugin if needed
 .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/files/patch-configure-cflags ./files/patch-configure-cflags
--- /usr/ports/www/resin2/files/patch-configure-cflags	Thu Jan  1 01:00:00 1970
+++ ./files/patch-configure-cflags	Mon Feb 13 15:20:57 2006
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Dec  9 00:09:15 2005
++++ configure	Mon Feb 13 15:20:48 2006
+@@ -3671,7 +3671,6 @@
+ 	;;
+ 
+   *freebsd*)
+-	PROXY_LIBS='-lc_r'
+         jni_os=freebsd
+ 	;;
+ 
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/Makefile ./Makefile
--- /usr/ports/www/resin3/Makefile	Sun Jan  8 00:12:46 2006
+++ ./Makefile	Mon Feb 13 15:27:30 2006
@@ -60,6 +60,7 @@
 			--with-openssl-lib=${OPENSSLLIB} \
 			--with-openssl-include=${OPENSSLINC}
 LDFLAGS+=		-L${OPENSSLLIB} -lcrypto -lssl
+CFLAGS+=		${PTHREAD_LIBS}
 
 # Install the Apache plugin if needed
 .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-configure-cflags ./files/patch-configure-cflags
--- /usr/ports/www/resin3/files/patch-configure-cflags	Thu Jan  1 01:00:00 1970
+++ ./files/patch-configure-cflags	Mon Feb 13 15:28:35 2006
@@ -0,0 +1,10 @@
+--- configure.orig	Mon Feb 13 15:28:10 2006
++++ configure	Mon Feb 13 15:28:12 2006
+@@ -9012,7 +9012,6 @@
+ 	;;
+ 
+   *freebsd*)
+-	PROXY_LIBS='-lc_r'
+         jni_os=freebsd
+ 	;;
+ 
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/www/resin3/files/pkg-message.in	Sun Jan  8 00:12:46 2006
+++ ./files/pkg-message.in	Fri Dec 16 13:11:27 2005
@@ -41,7 +41,7 @@
   %%APP_NAME%%_flags="-Djava.awt.headless=true"
 
   # Increase memory limit of the Java virtual machine
-  %%APP_NAME%%_flags="-Xms32m -Xmx256m"
+  %%APP_NAME%%_flags="-Xms32m -Xmx256m"
 
   # Run Java with remote debugging turned on on port 8000
   %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
>Release-Note:
>Audit-Trail:
>Unformatted: