Date: Thu, 6 Mar 2014 18:31:48 -0600 (CST) From: Lawrence "The Dreamer" Chen <beastie@tardisi.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/187337: [patch] databases/memcached: install error with or without DOCS Message-ID: <201403070031.s270VmN7074149@zen.lhaven.homeip.net> Resent-Message-ID: <201403070040.s270e05q004489@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187337
>Category: ports
>Synopsis: [patch] databases/memcached: install error with or without DOCS
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 07 00:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Lawrence "The Dreamer" Chen
>Release: FreeBSD 9.2-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD zen.lhaven.homeip.net 9.2-RELEASE-p3 FreeBSD 9.2-RELEASE-p3 #0: Sat Jan 11 03:25:02 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Revision bump results in portmaster uninstalling memcached and failing
to install.
>How-To-Repeat:
Did portmaster -a, and now I have no memcached.
In my make.conf on my servers, I have "OPTIONS_UNSET= DOCS", but its
trying to install DOCS anyways. And, even if I remove the install
lines, it registers that it had installed the man page, which it didn't.
Later when I updated on my workstation with default options, it also
failed to (re)install.
MAN1 isn't set. post-install doesn't check DOCS option. FILES_PLIST
always lists the man page whether it installs or not.
>Fix:
This patch tries to address all the issues.
--- patch begins here ---
--- Makefile.orig 2014-03-05 10:28:10.000000000 -0600
+++ Makefile 2014-03-06 18:20:49.658873553 -0600
@@ -32,10 +32,11 @@
CONFIGURE_ARGS= --with-libevent=${LOCALBASE}/lib/event2 --program-prefix= \
--disable-coverage
+MAN1= memcached.1
+
PLIST_FILES= bin/memcached \
bin/memcached-tool \
- include/memcached/protocol_binary.h \
- man/man1/memcached.1.gz
+ include/memcached/protocol_binary.h
PLIST_DIRS= include/memcached
PORTDOCS= protocol.txt readme.txt
@@ -58,6 +59,10 @@
CONFIGURE_ARGS+= --enable-64bit
.endif
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_FILES+= man/man1/memcached.1.gz
+.endif
+
.if ${PORT_OPTIONS:MDTRACE}
BROKEN= DTRACE broken with gcc/clang - reported upstream
.endif
@@ -70,11 +75,13 @@
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${STAGEDIR}${PREFIX}/bin
+.if ${PORT_OPTIONS:MDOCS}
${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${STAGEDIR}${MAN1PREFIX}/man/man1
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
.endfor
+.endif
regression-test: test
test: build
--- patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403070031.s270VmN7074149>