From owner-svn-ports-all@FreeBSD.ORG Tue Jul 15 17:37:43 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 3F5D6F4F; Tue, 15 Jul 2014 17:37:43 +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 1FBF12041; Tue, 15 Jul 2014 17:37:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6FHbgFe001447; Tue, 15 Jul 2014 17:37:42 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6FHbdga001424; Tue, 15 Jul 2014 17:37:39 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407151737.s6FHbdga001424@svn.freebsd.org> From: Adam Weinberger Date: Tue, 15 Jul 2014 17:37:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361986 - in head: audio/festival-freebsoft-utils audio/funktrackergold audio/hawkvoice audio/lxmusic audio/py-openal audio/py-pyaudio chinese/gcin devel/libfirm devel/lua-lunit devel/o... 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:37:43 -0000 Author: adamw Date: Tue Jul 15 17:37:38 2014 New Revision: 361986 URL: http://svnweb.freebsd.org/changeset/ports/361986 QAT: https://qat.redports.org/buildarchive/r361986/ Log: Correct all instances where OPTIONS_DEFINE was being overwritten by multiple definitions. Modified: head/audio/festival-freebsoft-utils/Makefile head/audio/funktrackergold/Makefile head/audio/hawkvoice/Makefile head/audio/lxmusic/Makefile head/audio/py-openal/Makefile head/audio/py-pyaudio/Makefile head/chinese/gcin/Makefile head/devel/libfirm/Makefile head/devel/lua-lunit/Makefile head/devel/ocaml-extlib/Makefile head/finance/grisbi/Makefile head/games/naev/Makefile head/games/warsow/Makefile head/lang/huc/Makefile head/print/lilypond/Makefile head/print/yatex/Makefile head/textproc/saxon-devel/Makefile head/www/eaccelerator/Makefile Modified: head/audio/festival-freebsoft-utils/Makefile ============================================================================== --- head/audio/festival-freebsoft-utils/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/audio/festival-freebsoft-utils/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -21,8 +21,6 @@ PORTDOCS= ANNOUNCE NEWS README INFO= ${PORTNAME} -OPTIONS_DEFINE= DOCS - do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/festival/lib cd ${WRKSRC} && ${INSTALL_DATA} *.scm ${STAGEDIR}${PREFIX}/share/festival/lib Modified: head/audio/funktrackergold/Makefile ============================================================================== --- head/audio/funktrackergold/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/audio/funktrackergold/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -26,8 +26,6 @@ MAKE_ARGS= EXTRA_CFLAGS="${PTHREAD_CFLAG PORTDOCS= INSTALL PLIST_FILES= bin/funkgold -OPTIONS_DEFINE= DOCS - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/funkgold ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/audio/hawkvoice/Makefile ============================================================================== --- head/audio/hawkvoice/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/audio/hawkvoice/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -11,8 +11,6 @@ DISTNAME= HawkVoiceDI091src MAINTAINER= acm@FreeBSD.org COMMENT= Portable sound and speech compression library -OPTIONS_DEFINE= DOCS - USES= gmake dos2unix zip MAKEFILE= makefile.linux USE_CSTD= gnu89 @@ -24,7 +22,7 @@ MAKE_ARGS= LIBDIR=${STAGEDIR}${PREFIX}/l WRKSRC= ${WRKDIR}/HawkVoiceDI/src -OPTIONS_DEFINE= OPTIMIZED_CFLAGS +OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS CFLAGS_amd64= -fPIC -DPIC CFLAGS_ia64= -fPIC -DPIC Modified: head/audio/lxmusic/Makefile ============================================================================== --- head/audio/lxmusic/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/audio/lxmusic/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -10,8 +10,6 @@ MASTER_SITES= SF/ghostbsdproject/package MAINTAINER= ericturgeon@ghostbsd.org COMMENT= LXDE music player based on xmms2 -OPTIONS_DEFINE= DOCS NLS - LICENSE= MIT GPLv2 LICENSE_COMB= dual Modified: head/audio/py-openal/Makefile ============================================================================== --- head/audio/py-openal/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/audio/py-openal/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -12,7 +12,7 @@ DISTNAME= PyOpenAL-${PORTVERSION} MAINTAINER= acm@FreeBSD.org COMMENT= PyOpenAL is a binding of OpenAL for Python -OPTIONS_DEFINE= EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES DIST_SUBDIR= python USES= openal:al,alut @@ -23,8 +23,6 @@ WRKSRC= ${WRKDIR}/PyOpenAL-${PORTVERSIO EXAMPLESDIR= ${PREFIX}/share/examples/py-openal PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/setup.py Modified: head/audio/py-pyaudio/Makefile ============================================================================== --- head/audio/py-pyaudio/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/audio/py-pyaudio/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -10,8 +10,6 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= jaap@NLnetLabs.nl COMMENT= Portaudio toolkit bindings for Python -OPTIONS_DEFINE= DOCS - LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio2 USE_PYTHON= yes Modified: head/chinese/gcin/Makefile ============================================================================== --- head/chinese/gcin/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/chinese/gcin/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -20,12 +20,10 @@ USES= gmake pkgconfig tar:xz USE_XORG= x11 xtst xext INSTALLS_ICONS= YES USE_LDCONFIG= YES -OPTIONS_DEFINE= ANTHY QT_IM_MODULE +OPTIONS_DEFINE= ANTHY QT_IM_MODULE DOCS ANTHY_DESC= Japanese anthy IM module QT_IM_MODULE_DESC= QT IM module -OPTIONS_DEFINE= DOCS - .include .if ${PORT_OPTIONS:MQT_IM_MODULE} Modified: head/devel/libfirm/Makefile ============================================================================== --- head/devel/libfirm/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/devel/libfirm/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -10,8 +10,6 @@ MASTER_SITES= SF MAINTAINER= sperber@FreeBSD.org COMMENT= Graph-based SSA intermediate representation library for compilers -OPTIONS_DEFINE= DEBUG - LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi Modified: head/devel/lua-lunit/Makefile ============================================================================== --- head/devel/lua-lunit/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/devel/lua-lunit/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -22,8 +22,6 @@ DOCFILES= DOCUMENTATION README EXAMPLES= example.lua LUNIT_FILES= lunit-console.lua lunit-tests.lua lunit.lua -OPTIONS_DEFINE= DOCS EXAMPLES - post-patch: ${REINPLACE_CMD} -e 's|"lua"|"${LUA_CMD}"|g' ${WRKSRC}/lunit Modified: head/devel/ocaml-extlib/Makefile ============================================================================== --- head/devel/ocaml-extlib/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/devel/ocaml-extlib/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -27,8 +27,6 @@ DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= * -OPTIONS_DEFINE= DOCS - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}) Modified: head/finance/grisbi/Makefile ============================================================================== --- head/finance/grisbi/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/finance/grisbi/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -26,8 +26,6 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_L OPTIONS_DEFINE= DOCS NLS -OPTIONS_DEFINE= DOCS NLS - .include .if ${PORT_OPTIONS:MNLS} Modified: head/games/naev/Makefile ============================================================================== --- head/games/naev/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/games/naev/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -34,8 +34,6 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= OPENAL SDL_MIXER SDL_MIXER_DESC= SDL_mixer sound backend -OPTIONS_DEFINE= OPENAL SDL_MIXER - .include .if ${PORT_OPTIONS:MOPENAL} Modified: head/games/warsow/Makefile ============================================================================== --- head/games/warsow/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/games/warsow/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -30,7 +30,7 @@ PLIST_FILES= %%DATADIR%%/basewsw/game_${ %%DATADIR%%/libs/angelwrap_${ARCH}.so PLIST_DIRS= %%DATADIR%%/basewsw %%DATADIR%%/libs %%DATADIR%% -OPTIONS_DEFINE= CLIENT SERVER FTLIB REF_GL QF OPENAL IRC CIN TV_SRV +OPTIONS_DEFINE= CLIENT SERVER FTLIB REF_GL QF OPENAL IRC CIN TV_SRV DOCS OPTIONS_DEFAULT= CLIENT SERVER FTLIB REF_GL QF OPENAL IRC CIN TV_SRV CLIENT_DESC= Build game client @@ -44,7 +44,6 @@ CIN_DESC= Build Cinematics playback modu TV_SRV_DESC= Build Warsow TV server PORTDOCS= *.rtf *.doc sourcecode_quickstart.txt -OPTIONS_DEFINE= DOCS .include Modified: head/lang/huc/Makefile ============================================================================== --- head/lang/huc/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/lang/huc/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -18,8 +18,6 @@ USES= gmake zip MAKE_ARGS= CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -OPTIONS_DEFINE= DOCS - do-install: .for file in huc isolink nesasm pceas pcxtool ${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${STAGEDIR}${PREFIX}/bin Modified: head/print/lilypond/Makefile ============================================================================== --- head/print/lilypond/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/print/lilypond/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -69,8 +69,6 @@ NO_CCACHE= yes PLIST_SUB= PORTVERSION=${PORTVERSION} -OPTIONS_DEFINE= NLS - .include .if ${PORT_OPTIONS:MNLS} Modified: head/print/yatex/Makefile ============================================================================== --- head/print/yatex/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/print/yatex/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -32,8 +32,6 @@ ELFILES= comment.el yatex.el yatexadd.el yatexm-o.el yatexsec.el yatexpkg.el yatexhie.el yahtml.el \ yatex19.el -OPTIONS_DEFINE= DOCS - post-extract: @${INSTALL_DATA} ${WRKSRC}/docs/* ${WRKSRC} Modified: head/textproc/saxon-devel/Makefile ============================================================================== --- head/textproc/saxon-devel/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/textproc/saxon-devel/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -29,8 +29,6 @@ NO_BUILD= yes CONFLICTS= saxon-6.* -OPTIONS_DEFINE= DOCS - JARFILES= saxon9-sql.jar saxon9.jar saxon9-xpath.jar saxon9-dom.jar \ saxon9-xqj.jar saxon9-s9api.jar PLIST_FILES+= ${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon bin/saxon-xquery Modified: head/www/eaccelerator/Makefile ============================================================================== --- head/www/eaccelerator/Makefile Tue Jul 15 17:28:52 2014 (r361985) +++ head/www/eaccelerator/Makefile Tue Jul 15 17:37:38 2014 (r361986) @@ -9,7 +9,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT= A free open-source PHP accelerator & optimizer LICENSE= GPLv2 -OPTIONS_DEFINE= DOCCOMM +OPTIONS_DEFINE= DOCCOMM DOCS EXAMPLES DOCCOMM_DESC= Retain doc-comments in internal php structures USE_GITHUB= yes @@ -17,8 +17,6 @@ GH_ACCOUNT= ${PORTNAME} GH_TAGNAME= ${GH_COMMIT} GH_COMMIT= 42067ac -OPTIONS_DEFINE= DOCCOMM DOCS EXAMPLES - DOCCOMM_DESC= Retain doc-comments in internal php structures DOCCOMM_CONFIGURE_WITH= eaccelerator-doc-comment-inclusion