From 1c7521fb6280b81cb866d0d843dd257b0f91a65d Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 15 Jul 2014 17:37:38 +0000 Subject: [PATCH] Correct all instances where OPTIONS_DEFINE was being overwritten by multiple definitions. --- audio/festival-freebsoft-utils/Makefile | 2 -- audio/funktrackergold/Makefile | 2 -- audio/hawkvoice/Makefile | 4 +--- audio/lxmusic/Makefile | 2 -- audio/py-openal/Makefile | 4 +--- audio/py-pyaudio/Makefile | 2 -- chinese/gcin/Makefile | 4 +--- devel/libfirm/Makefile | 2 -- devel/lua-lunit/Makefile | 2 -- devel/ocaml-extlib/Makefile | 2 -- finance/grisbi/Makefile | 2 -- games/naev/Makefile | 2 -- games/warsow/Makefile | 3 +-- lang/huc/Makefile | 2 -- print/lilypond/Makefile | 2 -- print/yatex/Makefile | 2 -- textproc/saxon-devel/Makefile | 2 -- www/eaccelerator/Makefile | 4 +--- 18 files changed, 5 insertions(+), 40 deletions(-) diff --git a/audio/festival-freebsoft-utils/Makefile b/audio/festival-freebsoft-utils/Makefile index f15d569e1503..6faf7f51c630 100644 --- a/audio/festival-freebsoft-utils/Makefile +++ b/audio/festival-freebsoft-utils/Makefile @@ -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 diff --git a/audio/funktrackergold/Makefile b/audio/funktrackergold/Makefile index 7cc9dd2d619f..1244e5f801db 100644 --- a/audio/funktrackergold/Makefile +++ b/audio/funktrackergold/Makefile @@ -26,8 +26,6 @@ MAKE_ARGS= EXTRA_CFLAGS="${PTHREAD_CFLAGS}" \ PORTDOCS= INSTALL PLIST_FILES= bin/funkgold -OPTIONS_DEFINE= DOCS - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/funkgold ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/audio/hawkvoice/Makefile b/audio/hawkvoice/Makefile index 2a69b1ddb23c..b567ca74e827 100644 --- a/audio/hawkvoice/Makefile +++ b/audio/hawkvoice/Makefile @@ -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}/lib INCDIR=${STAGEDIR}${PREFIX}/include WRKSRC= ${WRKDIR}/HawkVoiceDI/src -OPTIONS_DEFINE= OPTIMIZED_CFLAGS +OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS CFLAGS_amd64= -fPIC -DPIC CFLAGS_ia64= -fPIC -DPIC diff --git a/audio/lxmusic/Makefile b/audio/lxmusic/Makefile index 4e73b99feaa5..66d9eaddb2bf 100644 --- a/audio/lxmusic/Makefile +++ b/audio/lxmusic/Makefile @@ -10,8 +10,6 @@ MASTER_SITES= SF/ghostbsdproject/package/LXMusic/ MAINTAINER= ericturgeon@ghostbsd.org COMMENT= LXDE music player based on xmms2 -OPTIONS_DEFINE= DOCS NLS - LICENSE= MIT GPLv2 LICENSE_COMB= dual diff --git a/audio/py-openal/Makefile b/audio/py-openal/Makefile index 8a9b2816b791..1aa86942ded0 100644 --- a/audio/py-openal/Makefile +++ b/audio/py-openal/Makefile @@ -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-${PORTVERSION} EXAMPLESDIR= ${PREFIX}/share/examples/py-openal PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/setup.py diff --git a/audio/py-pyaudio/Makefile b/audio/py-pyaudio/Makefile index 4eb03681a667..822df3b3b134 100644 --- a/audio/py-pyaudio/Makefile +++ b/audio/py-pyaudio/Makefile @@ -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 diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile index 01d023d39aa6..6ba7fa070dc2 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -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} diff --git a/devel/libfirm/Makefile b/devel/libfirm/Makefile index 31de051a5383..3725eec02daa 100644 --- a/devel/libfirm/Makefile +++ b/devel/libfirm/Makefile @@ -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 diff --git a/devel/lua-lunit/Makefile b/devel/lua-lunit/Makefile index 57d7a2bdebe8..77b520dcdbef 100644 --- a/devel/lua-lunit/Makefile +++ b/devel/lua-lunit/Makefile @@ -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 diff --git a/devel/ocaml-extlib/Makefile b/devel/ocaml-extlib/Makefile index 042d3579c353..33a749a902d8 100644 --- a/devel/ocaml-extlib/Makefile +++ b/devel/ocaml-extlib/Makefile @@ -27,8 +27,6 @@ DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= * -OPTIONS_DEFINE= DOCS - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}) diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile index 45961cc602b0..a4ffd85c23a5 100644 --- a/finance/grisbi/Makefile +++ b/finance/grisbi/Makefile @@ -26,8 +26,6 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} OPTIONS_DEFINE= DOCS NLS -OPTIONS_DEFINE= DOCS NLS - .include .if ${PORT_OPTIONS:MNLS} diff --git a/games/naev/Makefile b/games/naev/Makefile index b18e31ce9c28..e4e87944397c 100644 --- a/games/naev/Makefile +++ b/games/naev/Makefile @@ -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} diff --git a/games/warsow/Makefile b/games/warsow/Makefile index 83c2c9be8a11..7bc76ede9171 100644 --- a/games/warsow/Makefile +++ b/games/warsow/Makefile @@ -30,7 +30,7 @@ PLIST_FILES= %%DATADIR%%/basewsw/game_${ARCH}.so \ %%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 module TV_SRV_DESC= Build Warsow TV server PORTDOCS= *.rtf *.doc sourcecode_quickstart.txt -OPTIONS_DEFINE= DOCS .include diff --git a/lang/huc/Makefile b/lang/huc/Makefile index 8278c781a1ac..89b7997ad11c 100644 --- a/lang/huc/Makefile +++ b/lang/huc/Makefile @@ -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 diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 747019943abc..6e7eaadaabcf 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -69,8 +69,6 @@ NO_CCACHE= yes PLIST_SUB= PORTVERSION=${PORTVERSION} -OPTIONS_DEFINE= NLS - .include .if ${PORT_OPTIONS:MNLS} diff --git a/print/yatex/Makefile b/print/yatex/Makefile index 6c504a70825a..7354ce4e760b 100644 --- a/print/yatex/Makefile +++ b/print/yatex/Makefile @@ -32,8 +32,6 @@ ELFILES= comment.el yatex.el yatexadd.el yatexgen.el \ yatexm-o.el yatexsec.el yatexpkg.el yatexhie.el yahtml.el \ yatex19.el -OPTIONS_DEFINE= DOCS - post-extract: @${INSTALL_DATA} ${WRKSRC}/docs/* ${WRKSRC} diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile index d469b889a75f..024ce07c52cd 100644 --- a/textproc/saxon-devel/Makefile +++ b/textproc/saxon-devel/Makefile @@ -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 diff --git a/www/eaccelerator/Makefile b/www/eaccelerator/Makefile index 91cf91e76bc6..e9f6b674b11e 100644 --- a/www/eaccelerator/Makefile +++ b/www/eaccelerator/Makefile @@ -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