From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 18 22:50: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 B90BD856 for ; Sun, 18 May 2014 22:50: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 95AAB234B for ; Sun, 18 May 2014 22:50: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 s4IMo0bV036215 for ; Sun, 18 May 2014 22:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4IMo04C036214; Sun, 18 May 2014 22:50:00 GMT (envelope-from gnats) Resent-Date: Sun, 18 May 2014 22:50:00 GMT Resent-Message-Id: <201405182250.s4IMo04C036214@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 [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 1A68781E for ; Sun, 18 May 2014 22:45:34 +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 E28D82326 for ; Sun, 18 May 2014 22:45:33 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4IMjX65052163 for ; Sun, 18 May 2014 22:45:33 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4IMjXLJ052159; Sun, 18 May 2014 22:45:33 GMT (envelope-from nobody) Message-Id: <201405182245.s4IMjXLJ052159@cgiserv.freebsd.org> Date: Sun, 18 May 2014 22:45:33 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189929: [patch] Add staging support to www/abyssws 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: Sun, 18 May 2014 22:50:00 -0000 >Number: 189929 >Category: ports >Synopsis: [patch] Add staging support to www/abyssws >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: Sun May 18 22:50: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 and unbreak build for www/abyssws. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/abyssws/Makefile b/www/abyssws/Makefile index 3b925d8..722e648 100644 --- a/www/abyssws/Makefile +++ b/www/abyssws/Makefile @@ -12,21 +12,22 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Abyss Web Server is a compact and easy to use web server -BROKEN= Fails to install - -WRKSRC= ${WRKDIR}/abyssws -ONLY_FOR_ARCHS= i386 +WRKSRC= ${WRKDIR}/abyssws-${PORTVERSION} +ONLY_FOR_ARCHS= i386 amd64 NO_BUILD= yes USE_RC_SUBR= abyssws +USER= abyssws -NO_STAGE= yes .include .if ${OSVERSION} >= 700043 LIB_DEPENDS+= c.6:${PORTSDIR}/misc/compat6x .endif +post-extract: + @${MV} ${WRKDIR}/abyssws ${WRKDIR}/abyssws-${PORTVERSION} + pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL @@ -36,17 +37,15 @@ pre-install: fi do-install: - @${INSTALL} -d ${PREFIX}/lib/abyssws - ${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${PREFIX}/lib/abyssws -xf - - @ ${CHOWN} -R abyssws:abyssws ${PREFIX}/lib/abyssws/ - @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST} - -post-install: - @if [ ! -f ${PREFIX}/lib/abyssws/htdocs/index.html ]; then \ - ${CP} -p ${PREFIX}/lib/abyssws/htdocs/index.html-dist \ - ${PREFIX}/lib/abyssws/htdocs/index.html ; \ + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/abyssws + @${INSTALL} -d ${STAGEDIR}${PREFIX}/lib/abyssws + ${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${STAGEDIR}${PREFIX}/lib/abyssws -xf - + ${CHOWN} -R abyssws:abyssws ${STAGEDIR}${PREFIX}/lib/abyssws + @${ECHO_CMD} "@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} lib/abyssws" >> ${TMPPLIST} + if [ ! -f ${STAGEDIR}${PREFIX}/lib/abyssws/htdocs/index.html ]; then \ + ${CP} -p ${STAGEDIR}${PREFIX}/lib/abyssws/htdocs/index.html-dist \ + ${STAGEDIR}${PREFIX}/lib/abyssws/htdocs/index.html ; \ + ${ECHO_CMD} "lib/abyssws/htdocs/index.html" >> ${TMPPLIST}; \ fi - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL .include >Release-Note: >Audit-Trail: >Unformatted: