4 files changed, 30 insertions, 16 deletions

diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index 924ae46bb7d4..9793fc8e26a7 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		resin
-PORTVERSION=		3.1.0
-PORTREVISION=	1
+PORTVERSION=		3.1.2
 CATEGORIES=		www java
 MASTER_SITES=		http://www.caucho.com/download/
 
@@ -53,10 +52,19 @@ REPLACE_FILES=		${FILESDIR}/pkg-install \
 			${WRKSRC}/conf/resin.conf \
 			${FILESDIR}/resinctl \
 			${FILESDIR}/resin.sh.in
-COPYDIRS=		lib libexec webapps
 
 .include <bsd.port.pre.mk>
 
+.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64")
+COPYDIRS=		lib libexec64 webapps
+CFLAGS+=		-fPIC
+CONFIGURE_ARGS+=	--enable-64bit
+RESIN_LIBEXEC=		libexec64
+.else
+COPYDIRS=		lib libexec webapps
+RESIN_LIBEXEC=		libexec
+.endif
+
 # Pass JAVA_HOME as determined by bsd.java.mk
 CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME} \
 			--with-openssl-lib=${OPENSSLLIB} \
@@ -93,6 +101,7 @@ PLIST_SUB+=		APACHE="@comment "
 
 PLIST_SUB+=		APP_NAME=${APP_NAME}
 PLIST_SUB+=		APXS=${APXS}
+PLIST_SUB+=		RESIN_LIBEXEC=${RESIN_LIBEXEC}
 
 SUBSTITUTIONS=		-e "s|%%APP_HOME%%|${APP_HOME}|g" \
 			-e "s|%%APP_NAME%%|${APP_NAME}|g" \
@@ -115,11 +124,6 @@ SUBSTITUTIONS=		-e "s|%%APP_HOME%%|${APP_HOME}|g" \
 			-e "s|%%WRKDIR%%|${WRKDIR}|g" \
 			-e "s|%%WRKSRC%%|${WRKSRC}|g"
 
-# Avoid build error on 64-bit architectures
-.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64")
-CFLAGS+=	-fPIC
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${REINPLACE_FILES}
 	@for FILE in ${REPLACE_FILES} ; do \
@@ -139,6 +143,8 @@ defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
 	@${ECHO_CMD} "    ResinConfigServer localhost 6802" >> ${PKGMESSAGE}
 	@${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE}
 .endif
+	@${REINPLACE_CMD} -e 's,libexec/,${RESIN_LIBEXEC}/,' \
+		${WRKSRC}/Makefile.in
 
 post-build:
 	cd ${WRKSRC}/modules/c/src/resin_os && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install
diff --git a/www/resin3/distinfo b/www/resin3/distinfo
index 659e831500b7..059cf01241de 100644
--- a/www/resin3/distinfo
+++ b/www/resin3/distinfo
@@ -1,3 +1,3 @@
-MD5 (resin-3.1.0.tar.gz) = ed16e0645adbef9c6ba69f4e4b881b44
-SHA256 (resin-3.1.0.tar.gz) = 1eb207d20db0af81b150ed3f40f1f21ffc26cb19b21cb8a545095818175ff5a0
-SIZE (resin-3.1.0.tar.gz) = 13065031
+MD5 (resin-3.1.2.tar.gz) = 2887635b1c7939689e4ed2e817a85725
+SHA256 (resin-3.1.2.tar.gz) = 65f4e254c2169bd6167f4916d96429572a0e3b60c26f13805981316081bd683a
+SIZE (resin-3.1.2.tar.gz) = 10768781
diff --git a/www/resin3/files/patch-modules-c-src-common-Makefile.in b/www/resin3/files/patch-modules-c-src-common-Makefile.in
new file mode 100644
index 000000000000..765b7f7ba0b5
--- /dev/null
+++ b/www/resin3/files/patch-modules-c-src-common-Makefile.in
@@ -0,0 +1,11 @@
+--- modules/c/src/common/Makefile.in.orig	2007-07-17 18:37:16.000000000 +0000
++++ modules/c/src/common/Makefile.in	2007-08-27 04:04:48.776074307 +0000
+@@ -13,7 +13,7 @@
+ OBJ_PICS=stream.lo config.lo memory.lo
+ INCLUDES=@INCLUDES@
+ 
+-all	: common.o $(OBJ_PICS)
++all	: $(OBJ) $(OBJ_PICS)
+ 
+ common.o	: $(OBJ)
+ 	$(LD) -r -o $@ $(OBJ)
diff --git a/www/resin3/pkg-plist b/www/resin3/pkg-plist
index 85fbe3e15cee..b571da86ea87 100644
--- a/www/resin3/pkg-plist
+++ b/www/resin3/pkg-plist
@@ -5,9 +5,6 @@
 %%APP_NAME%%/lib/j2ee-management-10.jar
 %%APP_NAME%%/lib/javamail-14.jar
 %%APP_NAME%%/lib/jaxb-api.jar
-%%APP_NAME%%/lib/jaxb-impl.jar
-%%APP_NAME%%/lib/jaxb-xjc.jar
-%%APP_NAME%%/lib/jaxb1-impl.jar
 %%APP_NAME%%/lib/jaxrpc-15.jar
 %%APP_NAME%%/lib/jca-15.jar
 %%APP_NAME%%/lib/jms-11.jar
@@ -23,7 +20,7 @@
 %%APP_NAME%%/lib/webutil.jar
 %%APP_NAME%%/webapps/ROOT/index.jsp
 %%APP_NAME%%/webapps/resin-doc.war
-%%APP_NAME%%/libexec/libresin_os.so
+%%APP_NAME%%/%%RESIN_LIBEXEC%%/libresin_os.so
 etc/%%APP_NAME%%/app-default.xml
 etc/rc.d/%%APP_NAME%%.sh
 sbin/%%APP_NAME%%ctl
@@ -33,7 +30,7 @@ sbin/%%APP_NAME%%ctl
 @dirrm %%APP_NAME%%/lib
 @dirrm %%APP_NAME%%/webapps/ROOT
 @dirrm %%APP_NAME%%/webapps
-@dirrm %%APP_NAME%%/libexec
+@dirrm %%APP_NAME%%/%%RESIN_LIBEXEC%%
 @dirrm %%APP_NAME%%
 @unexec if cmp -s %D/etc/%%APP_NAME%%/resin.xml %D/etc/%%APP_NAME%%/resin.xml-dist; then rm -f %D/etc/%%APP_NAME%%/resin.xml ; else echo If permanently deleting this package, %D/etc/%%APP_NAME%%/resin.xml must be removed manually; fi
 etc/%%APP_NAME%%/resin.xml-dist