Date: Mon, 19 May 2014 04:32:36 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189936: [patch] Add staging support to www/middleman Message-ID: <201405190432.s4J4WaFS056223@cgiserv.freebsd.org> Resent-Message-ID: <201405190440.s4J4e1bX077624@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405190432.s4J4WaFS056223>