Unbreak (no longer hard codes -lc_r).

Some nonfunctional tidying.
Bump PORTREVISION, since the package may have been installed prior to
being marked BROKEN.

PR:		ports/93289
Submitted by:	Jean-Baptiste Quenot <jb.quenot@caraldi.com> (maintainer), vd

4 files changed, 34 insertions, 7 deletions

diff --git a/www/resin2/Makefile b/www/resin2/Makefile
index 10514fcbe80b..152b38387fd4 100644
--- a/www/resin2/Makefile
+++ b/www/resin2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		resin
 PORTVERSION=		2.1.17
+PORTREVISION=		1
 CATEGORIES=		www java
 MASTER_SITES=		http://www.caucho.com/download/
 
@@ -17,11 +18,8 @@ USE_JAVA=		yes
 JAVA_VERSION=		1.2+
 HAS_CONFIGURE=		yes
 USE_PYTHON=		yes
-USE_REINPLACE=		yes
 USE_OPENSSL=		yes
 
-BROKEN=			Hard-codes libc_r linkage
-
 # Customizable settings
 RUNASUSER?=		www
 RUNASUID?=		80
@@ -62,6 +60,9 @@ CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME} \
 			--with-openssl-lib=${OPENSSLLIB} \
 			--with-openssl-include=${OPENSSLINC}
 LDFLAGS+=		-L${OPENSSLLIB} -lcrypto -lssl
+# We need to link with cc instead of ld for the FreeBSD specific options used
+# by threading libraries
+CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS="${LDFLAGS}"
 
 # Install the Apache plugin if needed
 .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
@@ -96,16 +97,16 @@ SUBSTITUTIONS=		-e "s|%%APP_HOME%%|${APP_HOME}|g" \
 			-e "s|%%APXS%%|${APXS}|g" \
 			-e "s|%%COPYDIRS%%|${COPYDIRS}|g" \
 			-e "s|%%FILESDIR%%|${FILESDIR}|g" \
-			-e "s|%%GROUP%%|${GROUP}|g" \
 			-e "s|%%GID%%|${GID}|g" \
-			-e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \
+			-e "s|%%GROUP%%|${GROUP}|g" \
 			-e "s|%%JAVA%%|${JAVA}|g" \
+			-e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \
 			-e "s|%%LOG_FILE%%|${LOG_FILE}|g" \
-			-e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|g" \
 			-e "s|%%PID_FILE%%|${PID_FILE}|g" \
 			-e "s|%%PORT%%|${PORT}|g" \
 			-e "s|%%PORTNAME%%|${PORTNAME}|g" \
 			-e "s|%%PREFIX%%|${PREFIX}|g" \
+			-e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|g" \
 			-e "s|%%RUNASUID%%|${RUNASUID}|g" \
 			-e "s|%%RUNASUSER%%|${RUNASUSER}|g" \
 			-e "s|%%WRKDIR%%|${WRKDIR}|g" \
diff --git a/www/resin2/files/patch-configure b/www/resin2/files/patch-configure
new file mode 100644
index 000000000000..89faadd8a1f1
--- /dev/null
+++ b/www/resin2/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Fri Dec  9 00:09:15 2005
++++ configure	Mon Apr  3 11:06:18 2006
+@@ -3671,7 +3671,7 @@
+ 	;;
+ 
+   *freebsd*)
+-	PROXY_LIBS='-lc_r'
++	PROXY_LIBS="${PTHREAD_LIBS}"
+         jni_os=freebsd
+ 	;;
+ 
diff --git a/www/resin2/files/patch-src_c_plugin_common_Makefile.in b/www/resin2/files/patch-src_c_plugin_common_Makefile.in
new file mode 100644
index 000000000000..45dcfc61813c
--- /dev/null
+++ b/www/resin2/files/patch-src_c_plugin_common_Makefile.in
@@ -0,0 +1,15 @@
+--- src/c/plugin/common/Makefile.in.orig	Fri Dec  9 10:09:13 2005
++++ src/c/plugin/common/Makefile.in	Tue Apr  4 23:01:30 2006
+@@ -14,10 +14,10 @@
+ all	: common.o common.lo
+ 
+ common.o	: $(OBJ)
+-	$(LD) -r -o $@ $(OBJ)
++	$(LD) $(LDFLAGS_SHLIB) -o $@ $(OBJ)
+ 
+ common.lo	: $(OBJ_PICS)
+-	$(LD) -r -o $@ $(OBJ_PICS)
++	$(LD) $(LDFLAGS_SHLIB) -o $@ $(OBJ_PICS)
+ 
+ .c.lo	:
+ 	$(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $< && mv $*.o $*.lo
diff --git a/www/resin2/files/pkg-message.in b/www/resin2/files/pkg-message.in
index 01fddd99d84a..490862390511 100644
--- a/www/resin2/files/pkg-message.in
+++ b/www/resin2/files/pkg-message.in
@@ -41,7 +41,7 @@ If you need to pass special options to Java, please set the
   %%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"