From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 27 15:30:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A310B8AF for ; Tue, 27 May 2014 15:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 8013225C3 for ; Tue, 27 May 2014 15:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RFU0no011474 for ; Tue, 27 May 2014 15:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4RFU0kU011473; Tue, 27 May 2014 15:30:00 GMT (envelope-from gnats) Resent-Date: Tue, 27 May 2014 15:30:00 GMT Resent-Message-Id: <201405271530.s4RFU0kU011473@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joseph Benden Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 766197A6 for ; Tue, 27 May 2014 15:23:28 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A4832575 for ; Tue, 27 May 2014 15:23:28 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RFNS3E002732 for ; Tue, 27 May 2014 15:23:28 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4RFNSdL002729; Tue, 27 May 2014 15:23:28 GMT (envelope-from nobody) Message-Id: <201405271523.s4RFNSdL002729@cgiserv.freebsd.org> Date: Tue, 27 May 2014 15:23:28 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190313: [patch] Add staging support to www/pebble X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 May 2014 15:30:00 -0000 >Number: 190313 >Category: ports >Synopsis: [patch] Add staging support to www/pebble >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue May 27 15:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Joseph Benden >Release: FreeBSD 11 >Organization: >Environment: FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014 root@lucy:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Adds staging support to www/pebble. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/pebble/Makefile b/www/pebble/Makefile index 065563b..3eb76a9 100644 --- a/www/pebble/Makefile +++ b/www/pebble/Makefile @@ -37,21 +37,20 @@ PORTDOCS= configuration.html credits.html images index.html \ PLIST_FILES= ${WEBAPP_SUBDIR}/${PORTNAME}.war PEBBLE_CONTEXT= WEB-INF/applicationContext-pebble.xml -NO_STAGE= yes do-patch: cd ${WRKSRC} && ${UNZIP_CMD} -o pebble.war "${PEBBLE_CONTEXT}" ${SED} -i.bak 's,/WEB-INF/pebble\.properties,file:${PEBBLE_PROPERTIES},' "${WRKSRC}/${PEBBLE_CONTEXT}" cd ${WRKSRC} && ${LOCALBASE}/bin/zip -u pebble.war ${PEBBLE_CONTEXT} do-install: - ${MKDIR} "${PEBBLE_HOME}" - ${CHOWN} "www:www" "${PEBBLE_HOME}" - ${INSTALL_DATA} ${WRKDIR}/pebble.properties ${PEBBLE_PROPERTIES}.sample - if [ ! -f ${PEBBLE_PROPERTIES} ]; then ${INSTALL_DATA} ${WRKDIR}/pebble.properties ${PEBBLE_PROPERTIES} ; fi - ${INSTALL_DATA} ${WRKSRC}/pebble.war ${WEBAPP_DIR}/${PORTNAME}.war + ${MKDIR} "${STAGEDIR}${PEBBLE_HOME}" + ${CHOWN} "www:www" "${STAGEDIR}${PEBBLE_HOME}" + ${INSTALL_DATA} ${WRKDIR}/pebble.properties ${STAGEDIR}${PEBBLE_PROPERTIES}.sample + ${MKDIR} ${STAGEDIR}${WEBAPP_DIR} + ${INSTALL_DATA} ${WRKSRC}/pebble.war ${STAGEDIR}${WEBAPP_DIR}/${PORTNAME}.war .if !defined(NOPORTDOCS) - cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; - cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; + cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; + cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \; .endif post-install: diff --git a/www/pebble/pkg-plist b/www/pebble/pkg-plist index 6547158..b57a142 100644 --- a/www/pebble/pkg-plist +++ b/www/pebble/pkg-plist @@ -1,3 +1,6 @@ @exec mkdir -p %%PEBBLE_HOME%% @unexec if cmp -s %D/etc/pebble.properties.sample %D/etc/pebble.properties; then rm -f %D/etc/pebble.properties; fi etc/pebble.properties.sample +@exec cp -n %D/%F %B/pebble.properties +@unexec rmdir "/var/lib/pebble" >/dev/null 2>&1 || : +@unexec rmdir "/var/lib" >/dev/null 2>&1 || : >Release-Note: >Audit-Trail: >Unformatted: