From owner-svn-ports-all@FreeBSD.ORG Tue Jul 15 17:00:58 2014 Return-Path: Delivered-To: svn-ports-all@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 7B945554; Tue, 15 Jul 2014 17:00:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 59B432C0E; Tue, 15 Jul 2014 17:00:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6FH0wQ0081843; Tue, 15 Jul 2014 17:00:58 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6FH0uWZ081830; Tue, 15 Jul 2014 17:00:56 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407151700.s6FH0uWZ081830@svn.freebsd.org> From: Adam Weinberger Date: Tue, 15 Jul 2014 17:00:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361978 - in head/sysutils: cdrdao hal heartbeat hoz ipmitool nut password-store ucspi-ipc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2014 17:00:58 -0000 Author: adamw Date: Tue Jul 15 17:00:56 2014 New Revision: 361978 URL: http://svnweb.freebsd.org/changeset/ports/361978 QAT: https://qat.redports.org/buildarchive/r361978/ Log: Add DOCS to OPTIONS_DEFINE to ports that check for PORT_OPTIONS:MDOCS. Modified: head/sysutils/cdrdao/Makefile head/sysutils/hal/Makefile head/sysutils/heartbeat/Makefile head/sysutils/hoz/Makefile head/sysutils/ipmitool/Makefile head/sysutils/nut/Makefile head/sysutils/password-store/Makefile head/sysutils/password-store/pkg-plist head/sysutils/ucspi-ipc/Makefile Modified: head/sysutils/cdrdao/Makefile ============================================================================== --- head/sysutils/cdrdao/Makefile Tue Jul 15 16:57:39 2014 (r361977) +++ head/sysutils/cdrdao/Makefile Tue Jul 15 17:00:56 2014 (r361978) @@ -20,7 +20,10 @@ MP3OGG_LIB_DEPENDS= libao.so:${PORTSDIR} libmad.so:${PORTSDIR}/audio/libmad \ libvorbis.so:${PORTSDIR}/audio/libvorbis -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS TOC2MP3 MP3OGG +OPTIONS_DEFAULT=MP3OGG +TOC2MP3_DESC= Build with toc2mp3 +MP3OGG_DESC= MP3 and Ogg Vorbis support .if ${PORTNAME} == "gcdmaster" USES+= pkgconfig Modified: head/sysutils/hal/Makefile ============================================================================== --- head/sysutils/hal/Makefile Tue Jul 15 16:57:39 2014 (r361977) +++ head/sysutils/hal/Makefile Tue Jul 15 17:00:56 2014 (r361978) @@ -65,7 +65,7 @@ SUB_LIST= RC_FILES="${RC_FILES}" INSTALL_TARGET= install-strip -OPTIONS_DEFINE= FIXED_MOUNTPOINTS +OPTIONS_DEFINE= FIXED_MOUNTPOINTS DOCS FIXED_MOUNTPOINTS_DESC= use fixed mountpoints FIXED_MOUNTPOINTS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-tools_hal-storage-mount.c Modified: head/sysutils/heartbeat/Makefile ============================================================================== --- head/sysutils/heartbeat/Makefile Tue Jul 15 16:57:39 2014 (r361977) +++ head/sysutils/heartbeat/Makefile Tue Jul 15 17:00:56 2014 (r361978) @@ -59,7 +59,7 @@ PKGDEINSTALL= ${PKGINSTALL} PLIST_SUB= USER=${USERS} GROUP=${GROUPS} -OPTIONS_DEFINE= MGMT LDIRECTORD APCSNMP DRAC3 +OPTIONS_DEFINE= MGMT LDIRECTORD APCSNMP DRAC3 DOCS MGMT_DESC= Enable X11 Management Utilities LDIRECTORD_DESC= Enable Linux Director Daemon APCSNMP_DESC= Enable APC SNMP Stonith Device Modified: head/sysutils/hoz/Makefile ============================================================================== --- head/sysutils/hoz/Makefile Tue Jul 15 16:57:39 2014 (r361977) +++ head/sysutils/hoz/Makefile Tue Jul 15 17:00:56 2014 (r361978) @@ -18,7 +18,7 @@ MAKE_ARGS= CC="${CC}" PORTDOCS= README -OPTIONS_DEFINE= CLI GTK2 LANG_ES LANG_EN LANG_FR +OPTIONS_DEFINE= CLI GTK2 LANG_ES LANG_EN LANG_FR DOCS OPTIONS_DEFAULT= CLI GTK2 LANG_EN LANG_EN_DESC= language support Modified: head/sysutils/ipmitool/Makefile ============================================================================== --- head/sysutils/ipmitool/Makefile Tue Jul 15 16:57:39 2014 (r361977) +++ head/sysutils/ipmitool/Makefile Tue Jul 15 17:00:56 2014 (r361978) @@ -27,7 +27,7 @@ PORTDOCS= AUTHORS COPYING ChangeLog READ PERIODIC_DIR= etc/periodic/daily -OPTIONS_DEFINE= FREEIPMI +OPTIONS_DEFINE= FREEIPMI DOCS FREEIPMI_DESC= Enable support for freeipmi .if defined(WITH_DEBUG) Modified: head/sysutils/nut/Makefile ============================================================================== --- head/sysutils/nut/Makefile Tue Jul 15 16:57:39 2014 (r361977) +++ head/sysutils/nut/Makefile Tue Jul 15 17:00:56 2014 (r361978) @@ -24,7 +24,7 @@ PLIST_SUB+= NUT_USER=${NUT_USER} PLIST_SUB+= NUT_GROUP=${NUT_GROUP} OPTIONS_DEFAULT=SERIAL USB SNMP NEON IPMI_OFF -OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI OPENSSL +OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI OPENSSL DOCS OPTIONS_SINGLE= IPMI OPTIONS_SINGLE_IPMI= IPMI_OFF IPMIPSU FREEIPMI Modified: head/sysutils/password-store/Makefile ============================================================================== --- head/sysutils/password-store/Makefile Tue Jul 15 16:57:39 2014 (r361977) +++ head/sysutils/password-store/Makefile Tue Jul 15 17:00:56 2014 (r361978) @@ -16,7 +16,7 @@ RUN_DEPENDS= bash>=0:${PORTSDIR}/shells/ pwgen>=0:${PORTSDIR}/sysutils/pwgen \ tree>=1.7:${PORTSDIR}/sysutils/tree -OPTIONS_DEFINE= GIT XCLIP CONTRIB +OPTIONS_DEFINE= GIT XCLIP CONTRIB EXAMPLES OPTIONS_SUB= yes GIT_DESC= Enable git storage @@ -58,10 +58,10 @@ do-install: @(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) @(cd ${WRKSRC}/src/completion && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) .endif -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @${INSTALL_MAN} ${WRKSRC}/man/example-filter.sh ${STAGEDIR}${EXAMPLESDIR} - @${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${MANPREFIX}/man/man1/pass.1 + @${INSTALL_DATA} ${WRKSRC}/man/example-filter.sh ${STAGEDIR}${EXAMPLESDIR} .endif + @${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${MANPREFIX}/man/man1/pass.1 .include Modified: head/sysutils/password-store/pkg-plist ============================================================================== --- head/sysutils/password-store/pkg-plist Tue Jul 15 16:57:39 2014 (r361977) +++ head/sysutils/password-store/pkg-plist Tue Jul 15 17:00:56 2014 (r361978) @@ -22,8 +22,8 @@ %%CONTRIB%%@dirrmtry %%DATADIR%%/dmenu %%CONTRIB%%@dirrmtry %%DATADIR%%/emacs %%CONTRIB%%@dirrmtry %%DATADIR%%/importers -%%PORTDOCS%%man/man1/pass.1.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-filter.sh %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% bin/pass libexec/pass +man/man1/pass.1.gz Modified: head/sysutils/ucspi-ipc/Makefile ============================================================================== --- head/sysutils/ucspi-ipc/Makefile Tue Jul 15 16:57:39 2014 (r361977) +++ head/sysutils/ucspi-ipc/Makefile Tue Jul 15 17:00:56 2014 (r361978) @@ -17,6 +17,8 @@ DOCS= CHANGES WRKSRC= ${WRKDIR}/host/superscript.com/net/${DISTNAME} +OPTIONS_DEFINE= DOCS + .include do-configure: