Date: Sat, 5 Apr 2014 03:48:50 +0600 (BDT) From: Muhammad Moinur Rahman <5u623l20@gmail.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/188268: [PATCH] www/resin3: update to 3.1.14 Message-ID: <201404042148.s34Lmoi3000657@bofh.1asiacom.net> Resent-Message-ID: <201404042150.s34Lo2Er070676@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188268 >Category: ports >Synopsis: [PATCH] www/resin3: update to 3.1.14 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Apr 04 21:50:01 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Muhammad Moinur Rahman >Release: FreeBSD 11.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD bofh.1asiacom.net 11.0-CURRENT FreeBSD 11.0-CURRENT #1 r263870: Fri Mar 28 16:37:49 BDT >Description: - Added STAGE support - Update to 3.1.14 Superseeds ports/188096. For Committer's reference: https://redports.org/~subzero/20140404205302-39093-194186/resin-3.1.14.log https://redports.org/~subzero/20140404205302-39093-194185/resin-3.1.14.log https://redports.org/~subzero/20140404205302-39093-194184/resin-3.1.14.log https://redports.org/~subzero/20140404205302-39093-194183/resin-3.1.14.log https://redports.org/~subzero/20140404205302-39093-194182/resin-3.1.14.log https://redports.org/~subzero/20140404205302-39093-194181/resin-3.1.14.log https://redports.org/~subzero/20140404205302-39093-194180/resin-3.1.14.log https://redports.org/~subzero/20140404205302-39093-194179/resin-3.1.14.log Generated with FreeBSD Port Tools 1.00.2014.03.23 (mode: update, diff: ports) >How-To-Repeat: >Fix: --- resin-3.1.14.patch begins here --- diff -ruN /usr/ports//www/resin3/Makefile ./Makefile --- /usr/ports//www/resin3/Makefile 2013-09-21 05:36:50.000000000 +0600 +++ ./Makefile 2014-04-05 03:46:17.417882155 +0600 @@ -1,18 +1,19 @@ # Created by: Jean-Baptiste Quenot <jb.quenot@caraldi.com> # $FreeBSD: head/www/resin3/Makefile 327776 2013-09-20 23:36:50Z bapt $ -PORTNAME= resin -PORTVERSION= 3.1.13 -CATEGORIES= www java -MASTER_SITES= http://www.caucho.com/download/ +PORTNAME= resin +PORTVERSION= 3.1.14 +CATEGORIES= www java +MASTER_SITES= http://www.caucho.com/download/ -MAINTAINER= 5u623l20@gmail.com -COMMENT= Java-based Application Server, 3.x branch +MAINTAINER= 5u623l20@gmail.com +COMMENT= Java-based Application Server, 3.x branch + +LICENSE= GPLv2 OPTIONS_DEFINE= APACHE22 APACHE22_DESC= Use Apache 2.2 -NO_STAGE= yes .include <bsd.port.options.mk> USE_JAVA= yes @@ -35,7 +36,7 @@ APP_NAME_SUFFIX= ${PORTVERSION:C/\..*$//} APP_NAME?= ${PORTNAME}${APP_NAME_SUFFIX} LATEST_LINK= ${APP_NAME} -APP_HOME?= ${PREFIX}/${APP_NAME} +APP_HOME?= ${STAGEDIR}${PREFIX}/${APP_NAME} PID_FILE?= ${APP_HOME}/${APP_NAME}.pid LOG_FILE?= ${APP_HOME}/${APP_NAME}.log @@ -80,7 +81,7 @@ LOG_FILE=${LOG_FILE} \ PID_FILE=${PID_FILE} \ PORT=${PORT} \ - PREFIX=${PREFIX} \ + PREFIX=${STAGEDIR}${PREFIX} \ PYTHON_CMD=${PYTHON_CMD} \ USERS=${USERS} @@ -89,7 +90,7 @@ @${TAR} xf ${WRKSRC}/webapps/resin-doc.war -C ${WRKSRC}/webapps/resin-doc && ${RM} ${WRKSRC}/webapps/resin-doc.war post-patch: - @${REINPLACE_CMD} -e 's|$${resin.home}/conf/app-default.xml|${PREFIX}/etc/${APP_NAME}/app-default.xml|' \ + @${REINPLACE_CMD} -e 's|$${resin.home}/conf/app-default.xml|${STAGEDIR}${PREFIX}/etc/${APP_NAME}/app-default.xml|' \ ${WRKSRC}/conf/resin.conf post-build: @@ -97,28 +98,23 @@ # Resin does not handle installation, so proceed now do-install: -.for i in ${APP_HOME} ${APP_HOME}/lib ${PREFIX}/etc/${APP_NAME} +.for i in ${APP_HOME} ${APP_HOME}/lib ${STAGEDIR}${PREFIX}/etc/${APP_NAME} @install -d -g ${WWWOWN} -o ${WWWGRP} ${i} .endfor - if [ ! -e ${PREFIX}/etc/${APP_NAME}/resin.xml ]; then \ - ${ECHO_MSG} " Installing local configuration file: ${PREFIX}/etc/${APP_NAME}/resin.xml" ;\ - ${INSTALL_DATA} ${WRKSRC}/conf/resin.conf ${PREFIX}/etc/${APP_NAME}/resin.xml ;\ + if [ ! -e ${STAGEDIR}${PREFIX}/etc/${APP_NAME}/resin.xml ]; then \ + ${ECHO_MSG} " Installing local configuration file: ${STAGEDIR}${PREFIX}/etc/${APP_NAME}/resin.xml" ;\ + ${INSTALL_DATA} ${WRKSRC}/conf/resin.conf ${STAGEDIR}${PREFIX}/etc/${APP_NAME}/resin.xml ;\ else \ - ${ECHO_MSG} " Preserving local configuration file: ${PREFIX}/etc/${APP_NAME}/resin.xml" ;\ + ${ECHO_MSG} " Preserving local configuration file: ${STAGEDIR}${PREFIX}/etc/${APP_NAME}/resin.xml" ;\ fi - ${INSTALL_DATA} ${WRKSRC}/conf/resin.conf ${PREFIX}/etc/${APP_NAME}/resin.xml-dist - ${INSTALL_DATA} ${WRKSRC}/conf/app-default.xml ${PREFIX}/etc/${APP_NAME} - ${INSTALL_SCRIPT} ${WRKDIR}/resin3ctl ${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/conf/resin.conf ${STAGEDIR}${PREFIX}/etc/${APP_NAME}/resin.xml-dist + ${INSTALL_DATA} ${WRKSRC}/conf/app-default.xml ${STAGEDIR}${PREFIX}/etc/${APP_NAME} + ${INSTALL_SCRIPT} ${WRKDIR}/resin3ctl ${STAGEDIR}${PREFIX}/sbin cd ${WRKSRC}/webapps && ${COPYTREE_SHARE} \* ${APP_HOME}/webapps cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${APP_HOME}/lib .if ${PORT_OPTIONS:MAPACHE22} ${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache2/.libs/mod_caucho.so .endif - @${ECHO_MSG} - @${ECHO_MSG} "********************************************************************************" - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} "********************************************************************************" - @${ECHO_MSG} .include <bsd.port.post.mk> diff -ruN /usr/ports//www/resin3/distinfo ./distinfo --- /usr/ports//www/resin3/distinfo 2013-01-08 11:10:44.000000000 +0600 +++ ./distinfo 2014-03-30 16:16:38.286507301 +0600 @@ -1,2 +1,2 @@ -SHA256 (resin-3.1.13.tar.gz) = f51b0acad197d44f69c1f722f07ab10efd046d52decef34ab0dd5d6194196b0b -SIZE (resin-3.1.13.tar.gz) = 10273075 +SHA256 (resin-3.1.14.tar.gz) = 6ad8218caa6f1d3333cbeaad2a6839691f211746578fbb3a45321246e211c348 +SIZE (resin-3.1.14.tar.gz) = 10276901 --- resin-3.1.14.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404042148.s34Lmoi3000657>