From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 19 04:40:01 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 64BC1B6C for ; Mon, 19 May 2014 04:40:01 +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 4214A2D4A for ; Mon, 19 May 2014 04:40:01 +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 s4J4e1qH077625 for ; Mon, 19 May 2014 04:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4J4e1bX077624; Mon, 19 May 2014 04:40:01 GMT (envelope-from gnats) Resent-Date: Mon, 19 May 2014 04:40:01 GMT Resent-Message-Id: <201405190440.s4J4e1bX077624@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 238FBAD7 for ; Mon, 19 May 2014 04:32:37 +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 ECE572CF5 for ; Mon, 19 May 2014 04:32:36 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4J4WarM056228 for ; Mon, 19 May 2014 04:32:36 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4J4WaFS056223; Mon, 19 May 2014 04:32:36 GMT (envelope-from nobody) Message-Id: <201405190432.s4J4WaFS056223@cgiserv.freebsd.org> Date: Mon, 19 May 2014 04:32:36 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189936: [patch] Add staging support to www/middleman 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: Mon, 19 May 2014 04:40:01 -0000 >Number: 189936 >Category: ports >Synopsis: [patch] Add staging support to www/middleman >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: Mon May 19 04:40: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/middleman. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/middleman/Makefile b/www/middleman/Makefile index 55b8dc6..8aca14d 100644 --- a/www/middleman/Makefile +++ b/www/middleman/Makefile @@ -35,7 +35,6 @@ CONFIGURE_ARGS+= --enable-mtime MMAN_CACHE= /var/cache/mman PLIST_SUB+= MMAN_CACHE=${MMAN_CACHE} -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|/usr/bin/mman|${PREFIX}/bin/mman|g ; \ @@ -44,17 +43,17 @@ post-patch: ${WRKSRC}/man/mman.8 do-install: - @${MKDIR} ${MMAN_CACHE} - ${INSTALL_MAN} ${WRKSRC}/man/mman.8 ${MANPREFIX}/man/man8 - ${INSTALL_PROGRAM} ${WRKSRC}/mman ${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${MMAN_CACHE} + ${INSTALL_MAN} ${WRKSRC}/man/mman.8 ${STAGEDIR}${MANPREFIX}/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/mman ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/config.xml \ - ${PREFIX}/etc/mman.xml.dist + ${STAGEDIR}${PREFIX}/etc/mman.xml.dist ${INSTALL_DATA} ${WRKSRC}/scripts/mman.init \ - ${PREFIX}/etc/rc.d/mman.sh.sample + ${STAGEDIR}${PREFIX}/etc/rc.d/mman.sh.sample .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/scripts/filter.pl ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.html ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/scripts/filter.pl ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.html ${STAGEDIR}${DOCSDIR} .endif .include diff --git a/www/middleman/pkg-plist b/www/middleman/pkg-plist index 4d9e2ee..2da8478 100644 --- a/www/middleman/pkg-plist +++ b/www/middleman/pkg-plist @@ -1,6 +1,7 @@ bin/mman etc/rc.d/mman.sh.sample etc/mman.xml.dist +man/man8/mman.8.gz %%PORTDOCS%%%%DOCSDIR%%/README.html %%PORTDOCS%%%%DOCSDIR%%/filter.pl %%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: