- Update to 3.0.14 [1]

- Fix the install target creating files in ${WRKSRC} that could not be removed
  without superuser rights [2]

PR:		84577 [1]
Submitted by:	maintainer [1], me [2]
Approved by:	maintainer [2]
Discussed in:	ports/79707 [2]

4 files changed, 7 insertions, 52 deletions

diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index 39436521e7ec..9e66f1faa3cd 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		resin
-PORTVERSION=		3.0.13
+PORTVERSION=		3.0.14
 CATEGORIES=		www java
 MASTER_SITES=		http://www.caucho.com/download/
 
@@ -127,8 +127,10 @@ defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
 	@${ECHO_CMD} "</IfModule>" >> ${PKGMESSAGE}
 .endif
 
-# Resin does not handle installation, so proceed now
-post-install:
+post-build:
+	cd ${WRKSRC}/modules/c/src && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install
+
+do-install:
 	@${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO_MSG}
diff --git a/www/resin3/distinfo b/www/resin3/distinfo
index 6f32ceaa10c8..5fe13ad97f49 100644
--- a/www/resin3/distinfo
+++ b/www/resin3/distinfo
@@ -1,2 +1,2 @@
-MD5 (resin-3.0.13.tar.gz) = 4e5a07b29b6b8ed86630c169bf62aba2
-SIZE (resin-3.0.13.tar.gz) = 6858367
+MD5 (resin-3.0.14.tar.gz) = 1348ca83d945a8905238989ba0eb7d23
+SIZE (resin-3.0.14.tar.gz) = 6275586
diff --git a/www/resin3/files/patch-configure b/www/resin3/files/patch-configure
deleted file mode 100644
index ffa7617a3bcd..000000000000
--- a/www/resin3/files/patch-configure
+++ /dev/null
@@ -1,45 +0,0 @@
-$FreeBSD$
-
---- configure.orig	Wed Jan 12 00:00:26 2005
-+++ configure	Mon Apr 25 11:21:46 2005
-@@ -8669,20 +8669,6 @@
- # Using Perl if it's available.
- #
- PERL=`which perl`
--if test -z "${LD_SHLIB}"; then
--  if test -z "${LD_SHLIB}" -a "x`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != "x"; then
--    PCC="`$PERL -V:cc | cut -d\' -f2`"
--    if test "${PCC}" = "${CC}"; then
--      CFLAGS_SHLIB="`$PERL -V:cccdlflags | cut -d\' -f2`"
--      LDFLAGS_SHLIB="`$PERL -V:lddlflags | cut -d\' -f2`"
--      LD_SHLIB="`$PERL -V:ld | cut -d\' -f2`"
--
--      has_clflags=1
--
--      echo "Using shared library flags from Perl"
--    fi
--  fi
--fi
- 
- #if test -z "${LD_SHLIB}"; then
- #  AC_MSG_ERROR([Can't determine compilation flags.]);
-@@ -8947,8 +8933,8 @@
- 
- if test -z "${OPENSSL_LIB}"; then
-   foo=bar
--elif test -r "${OPENSSL_LIB}/libcrypt.so"; then
--  SSL_LIBS="${SSL_LIBS} -lcrypt"
-+elif test -r "${OPENSSL_LIB}/libcrypto.so"; then
-+  SSL_LIBS="${SSL_LIBS} -lcrypto"
- elif test -r "${OPENSSL_LIB}/libcrypt.dylib"; then
-   SSL_LIBS="${SSL_LIBS} -lcrypt"
- elif test -r "${OPENSSL_LIB}/libcrypt.a"; then
-@@ -8983,7 +8969,7 @@
-   foo=bar
- elif test -z "${OPENSSL_LIB}"; then
-   foo=bar
--elif test ! -r "${OPENSSL_LIB}/libcrypt.so" -a \
-+elif test ! -r "${OPENSSL_LIB}/libcrypto.so" -a \
-           ! -r "${OPENSSL_LIB}/libcrypt.dylib" -a \
-           ! -r "${OPENSSL_LIB}/libcrypt.a" ; then
-   { { echo "$as_me:$LINENO: error: Can't find valid OpenSSL library in ${OPENSSL_LIB}" >&5
diff --git a/www/resin3/pkg-plist b/www/resin3/pkg-plist
index 5eb30bf30642..e9f0b8dbf4a4 100644
--- a/www/resin3/pkg-plist
+++ b/www/resin3/pkg-plist
@@ -1,9 +1,7 @@
 @comment $FreeBSD$
-%%APP_NAME%%/lib/LICENSE.isorelax
 %%APP_NAME%%/lib/aopalliance.jar
 %%APP_NAME%%/lib/ejb-20.jar
 %%APP_NAME%%/lib/ejb-30.jar
-%%APP_NAME%%/lib/isorelax.jar
 %%APP_NAME%%/lib/j2eedeploy.jar
 %%APP_NAME%%/lib/jca-15.jar
 %%APP_NAME%%/lib/jms-11.jar