From owner-svn-ports-all@FreeBSD.ORG Sat Apr 26 18:13:01 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E60668F; Sat, 26 Apr 2014 18:13:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F1B9155F; Sat, 26 Apr 2014 18:13:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3QID0LC073993; Sat, 26 Apr 2014 18:13:00 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3QID0Pu073990; Sat, 26 Apr 2014 18:13:00 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201404261813.s3QID0Pu073990@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sat, 26 Apr 2014 18:13:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352317 - head/www/resin3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Apr 2014 18:13:01 -0000 Author: sunpoet Date: Sat Apr 26 18:13:00 2014 New Revision: 352317 URL: http://svnweb.freebsd.org/changeset/ports/352317 QAT: https://qat.redports.org/buildarchive/r352317/ Log: - Update to 3.1.14 - Add LICENSE - Space/Tab twiddle - Support STAGEDIR - While I'm here, use . for COPYTREE_SHARE PR: ports/188268 Submitted by: Muhammad Moinur Rahman <5u623l20@gmail.com> (maintainer) Modified: head/www/resin3/Makefile head/www/resin3/distinfo Modified: head/www/resin3/Makefile ============================================================================== --- head/www/resin3/Makefile Sat Apr 26 18:12:55 2014 (r352316) +++ head/www/resin3/Makefile Sat Apr 26 18:13:00 2014 (r352317) @@ -1,18 +1,19 @@ # Created by: Jean-Baptiste Quenot # $FreeBSD$ -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 USE_JAVA= yes @@ -35,7 +36,7 @@ PORT?= 8080 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 @@ SUB_LIST= APP_HOME=${APP_HOME} \ 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 @@ post-extract: @${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,20 @@ post-build: # Resin does not handle installation, so proceed now do-install: -.for i in ${APP_HOME} ${APP_HOME}/lib ${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 ;\ - else \ - ${ECHO_MSG} " Preserving local configuration file: ${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 - cd ${WRKSRC}/webapps && ${COPYTREE_SHARE} \* ${APP_HOME}/webapps - cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${APP_HOME}/lib +#.for i in ${APP_HOME} ${APP_HOME}/lib ${STAGEDIR}${PREFIX}/etc/${APP_NAME} +# @install -d -g ${WWWOWN} -o ${WWWGRP} ${i} +#.endfor + install -d -g ${WWWOWN} -o ${WWWGRP} ${i} ${APP_HOME} ${APP_HOME}/lib ${STAGEDIR}${PREFIX}/etc/${APP_NAME} + ${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 + ${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 Modified: head/www/resin3/distinfo ============================================================================== --- head/www/resin3/distinfo Sat Apr 26 18:12:55 2014 (r352316) +++ head/www/resin3/distinfo Sat Apr 26 18:13:00 2014 (r352317) @@ -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