Date: Sat, 23 Mar 2019 12:40:42 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496656 - in head/www/resin3: . files Message-ID: <201903231240.x2NCegOv059760@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Sat Mar 23 12:40:42 2019 New Revision: 496656 URL: https://svnweb.freebsd.org/changeset/ports/496656 Log: www/resin3: Fix build on 12.X and later - Updatee veersion 3.1.15=>3.1.16 - Remove APACHE22 options as 3.X doesn't support APACHE24 MFH: 2019Q1 (Build fix) Modified: head/www/resin3/Makefile head/www/resin3/distinfo head/www/resin3/files/pkg-message.in head/www/resin3/pkg-plist Modified: head/www/resin3/Makefile ============================================================================== --- head/www/resin3/Makefile Sat Mar 23 12:40:38 2019 (r496655) +++ head/www/resin3/Makefile Sat Mar 23 12:40:42 2019 (r496656) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= resin -PORTVERSION= 3.1.15 +PORTVERSION= 3.1.16 CATEGORIES= www java MASTER_SITES= http://www.caucho.com/download/ @@ -11,15 +11,12 @@ COMMENT= Java-based Application Server, 3.x branch LICENSE= GPLv2 -OPTIONS_DEFINE= APACHE22 -APACHE22_DESC= Use Apache 2.2 - -GNU_CONFIGURE= yes USES= libtool python ssl USE_JAVA= yes -JAVA_VERSION= 1.6+ # Pass JAVA_HOME as determined by bsd.java.mk +JAVA_VERSION= 1.6+ +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-java-home=${JAVA_HOME} \ --with-openssl-lib=${OPENSSLLIB} \ --with-openssl-include=${OPENSSLINC} @@ -56,23 +53,9 @@ APXS?= ${LOCALBASE}/sbin/apxs SUB_FILES= pkg-message resin3ctl USE_RC_SUBR= resin3 NO_ARCH= yes -APACHE22_BROKEN=The Apache 2.2 port has been deleted .include <bsd.port.options.mk> -# Install the Apache plugin if needed -.if ${PORT_OPTIONS:MAPACHE22} -BUILD_DEPENDS+= ${APXS}:www/apache22 -CONFIGURE_ARGS+=--with-apxs=${APXS} -PLIST_SUB+= MOD_DIR=libexec/apache22 -# Allow apxs invocations -PLIST_SUB+= APACHE="" -.else -PLIST_SUB+= MOD_DIR="@comment " -# Prevent apxs invocations -PLIST_SUB+= APACHE="@comment " -.endif - post-extract: @${MKDIR} ${WRKSRC}/webapps/resin-doc @${TAR} xf ${WRKSRC}/webapps/resin-doc.war -C ${WRKSRC}/webapps/resin-doc && ${RM} ${WRKSRC}/webapps/resin-doc.war @@ -80,6 +63,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|$${resin.home}/conf/app-default.xml|${PREFIX}/etc/${APP_NAME}/app-default.xml|' \ ${WRKSRC}/conf/resin.conf + @${REINPLACE_CMD} -e 's|ssl23.h|ssl3.h|' ${WRKSRC}/configure post-build: (cd ${WRKSRC}/modules/c/src/resin_os && ${SETENV} ${MAKE_ENV} \ @@ -93,8 +77,5 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/resin3ctl ${STAGEDIR}${PREFIX}/sbin (cd ${WRKSRC}/webapps && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}/webapps) (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}/lib) -.if ${PORT_OPTIONS:MAPACHE22} - ${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache2/.libs/mod_caucho.so -.endif .include <bsd.port.mk> Modified: head/www/resin3/distinfo ============================================================================== --- head/www/resin3/distinfo Sat Mar 23 12:40:38 2019 (r496655) +++ head/www/resin3/distinfo Sat Mar 23 12:40:42 2019 (r496656) @@ -1,3 +1,3 @@ -TIMESTAMP = 1515447849 -SHA256 (resin-3.1.15.tar.gz) = de7de4b9631e1b63663a9935ce2c0dda95087e82a8220b7c3c1df1fd61550e62 -SIZE (resin-3.1.15.tar.gz) = 10294837 +TIMESTAMP = 1553212312 +SHA256 (resin-3.1.16.tar.gz) = e71f3fb8b75bf78c9663381be32e747e5f0ae75acf5a883b5c46d455d86aff67 +SIZE (resin-3.1.16.tar.gz) = 10284634 Modified: head/www/resin3/files/pkg-message.in ============================================================================== --- head/www/resin3/files/pkg-message.in Sat Mar 23 12:40:38 2019 (r496655) +++ head/www/resin3/files/pkg-message.in Sat Mar 23 12:40:42 2019 (r496656) @@ -50,14 +50,3 @@ If you need to pass special options to Java, please se To specify the java version to use, please use %%APP_NAME%%_java_version: %%APP_NAME%%_java_version="1.4" - -------------------------------------------------------------------------------- - -APACHE MODULE - -If you have enabled the mod_caucho module, you may activate it in the following -manner by adding it to your Apache configuration file: - -<IfModule mod_caucho.c>" - ResinConfigServer localhost 6802" -</IfModule>" Modified: head/www/resin3/pkg-plist ============================================================================== --- head/www/resin3/pkg-plist Sat Mar 23 12:40:38 2019 (r496655) +++ head/www/resin3/pkg-plist Sat Mar 23 12:40:42 2019 (r496656) @@ -1074,6 +1074,3 @@ etc/%%APP_NAME%%/app-default.xml @owner @group sbin/resin3ctl -%%MOD_DIR%%/mod_caucho.so -%%APACHE%%@exec %%APXS%% -e -a -n caucho %f -%%APACHE%%@unexec %%APXS%% -e -A -n caucho %f
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903231240.x2NCegOv059760>