From 42034a997e9bbb7dd2e66f6719377aebbe4c7abd Mon Sep 17 00:00:00 2001 From: bapt Date: Fri, 29 Jun 2012 12:42:04 +0000 Subject: Convert to new option framework --- audio/gimmix/Makefile | 4 ++-- chinese/auto-cn-l10n/Makefile | 26 ++++++++++++++------------ chinese/fireflyttf/Makefile | 17 +++++++++-------- chinese/wenju/Makefile | 4 ++-- chinese/zhcon/Makefile | 7 ++++--- games/hinversi/Makefile | 14 +++++++------- games/znibbles/Makefile | 15 ++++++++------- graphics/swftools/Makefile | 11 +++++------ japanese/jed/Makefile | 30 ++++++++++++++++-------------- japanese/jvim3/Makefile | 35 ++++++++++++++++++----------------- japanese/skk-tools/Makefile | 14 ++++++++------ math/calctool/Makefile | 18 ++++++++++-------- math/pgcalc/Makefile | 9 +++++---- math/yacas/Makefile | 14 ++++++++------ misc/hotkeys/Makefile | 9 +++++---- misc/mc-light/Makefile | 16 ++++++++-------- misc/xosd/Makefile | 8 +++++--- multimedia/abby/Makefile | 10 ++++++---- multimedia/beep-media-player/Makefile | 24 ++++++++++-------------- multimedia/gxine/Makefile | 11 +++++------ multimedia/kdemultimedia3/Makefile | 14 ++++++++------ multimedia/kino/Makefile | 15 ++++++++------- multimedia/kmplayer/Makefile | 29 +++++++++++++++-------------- multimedia/libmpeg3/Makefile | 10 +++++----- multimedia/openquicktime/Makefile | 8 ++++---- 25 files changed, 195 insertions(+), 177 deletions(-) diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile index 8cce6adc8f89..ac616134f868 100644 --- a/audio/gimmix/Makefile +++ b/audio/gimmix/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= mpd.4:${PORTSDIR}/audio/libmpd \ LICENSE= GPLv2 -OPTIONS= NLS "Native Language Support" on +OPTIONS_DEFIEN= NLS .include @@ -36,7 +36,7 @@ MAN1= gimmix.1 CONFIGURE_ENV= DATADIRNAME=share -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl CONFIGURE_ARGS+= --enable-nls diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile index ff31c99dd67c..01fb4f6bc063 100644 --- a/chinese/auto-cn-l10n/Makefile +++ b/chinese/auto-cn-l10n/Makefile @@ -19,37 +19,39 @@ NO_BUILD= yes PKGMESSAGE= ${WRKDIR}/pkg-message REINPLACE_ARGS= -i "" -OPTIONS= WQY "WenQuanYi Bitmap Song Font" on \ - FIREFLYTTF "Firefly TrueType Font" off \ - FCITX "GBK Chinese XIM server" off \ - SCIM "Smart Common Input Method platform" on \ - MINICHINPUT "A tiny version of Chinput" off \ - RELAXCONF "A set of utilities for FreeBSD LiveCD" on +OPTIONS_DEFINE= WQY FIREFLYTTF FCITX SCIM MINICHINPUT RELAXCONF +OPTIONS_DEFAULT= WQY SCIM RELAXCONF +WQY_DESC= WenQuanYi Bitmap Song Font +FIREFLYTTF_DESC= Firefly TrueType Font +FCITX_DESC= GBK Chinese XIM server +SCIM_DESC= Smart Common Input Method platform +MINICHINPUT_DESC= A tiny version of Chinput +RELAXCONF_DESC= A set of utilities for FreeBSD LiveCD .include -.if !defined(WITHOUT_WQY) +.if ${PORT_OPTIONS:MWQY} RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy .endif -.if defined(WITH_FIREFLYTTF) +.if ${PORT_OPTIONS:MFIREFLYTTF} RUN_DEPENDS+= ${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chinese/fireflyttf .endif -.if defined(WITH_FCITX) +.if ${PORT_OPTIONS:MFCITX} RUN_DEPENDS+= fcitx:${PORTSDIR}/chinese/fcitx .endif -.if !defined(WITHOUT_SCIM) +.if ${PORT_OPTIONS:MSCIM} RUN_DEPENDS+= ${LOCALBASE}/share/scim/tables/Wubi.bin:${PORTSDIR}/chinese/scim-tables RUN_DEPENDS+= ${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/pinyin.so:${PORTSDIR}/chinese/scim-pinyin .endif -.if defined(WITH_MINICHINPUT) +.if ${PORT_OPTIONS:MMINICHINPUT} RUN_DEPENDS+= chinput:${PORTSDIR}/chinese/miniChinput .endif -.if !defined(WITHOUT_RELAXCONF) +.if ${PORT_OPTIONS:MRELAXCONF} RUN_DEPENDS+= relaxconf:${PORTSDIR}/sysutils/relaxconf .endif diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile index c5108075b643..a7babae564a0 100644 --- a/chinese/fireflyttf/Makefile +++ b/chinese/fireflyttf/Makefile @@ -20,40 +20,41 @@ CONFLICTS= zh-opendesktop-fonts-* NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME} -OPTIONS= LGJ_FONT "Patch for Taiwan horn" on +OPTIONS_DEFINE= LGJ_FONT X11 +OPTIONS_DEFAULT= LGJ_FONT X11 +LGJ_FONT_DESC= Patch for Taiwan horn TTF= fireflysung.ttf .include -.if defined(WITHOUT_LGJ_FONT) -.else +.if ${PORT_OPTIONS:MLGJ_FONT} PKGNAMESUFFIX+= -LGJ MASTER_SITES= http://edt1023.sayya.org/fonts/ DISTNAME= fireflysung-1.3.0p1 .endif -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} PLIST_SUB+= X11="" .else PLIST_SUB+= X11="@comment " .endif post-extract: -.if defined(WITHOUT_LGJ_FONT) - @${DO_NADA} -.else +.if ${PORT_OPTIONS:MLGJ_FONT} @${TAR} -C ${WRKSRC} -zxf ${DISTDIR}/fireflysung-1.3.0p1.tar.gz \ fireflysung-1.3.0p1/fireflysung.ttf @${MV} ${WRKSRC}/fireflysung-1.3.0p1/fireflysung.ttf ${WRKSRC} @${RM} -rf ${WRKSRC}/fireflysung-1.3.0p1 +.else + ${DO_NADA} .endif do-install: ${MKDIR} ${FONTSDIR} ${INSTALL_DATA} ${WRKSRC}/${TTF} ${FONTSDIR} ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${FONTSDIR} -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${LOCALBASE}/etc/fonts/local.conf .endif diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile index 38d496623244..85730a5c100f 100644 --- a/chinese/wenju/Makefile +++ b/chinese/wenju/Makefile @@ -18,11 +18,11 @@ GNU_CONFIGURE= yes USE_GNOME= gtk20 USE_LDCONFIG= yes -OPTIONS= NLS "Build with Native Language Support" on +OPTIONS_DEFINE= NLS .include -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile index 6bec8a322a09..62c655c2bace 100644 --- a/chinese/zhcon/Makefile +++ b/chinese/zhcon/Makefile @@ -34,7 +34,8 @@ SUB_FILES= pkg-message MAN1= zhcon.1 PORTDOCS= * -OPTIONS= BIG5 "Use Big5 by default (Taiwan, Hong Kong, Macau)" off +OPTIONS_DEFINE= BIG5 DOCS +BIG5_DESC= Use Big5 by default (Taiwan, Hong Kong, Macau) .include @@ -49,13 +50,13 @@ post-patch: ${WRKSRC}/src/zhcon.conf @${REINPLACE_CMD} -e 's,$$enable_debug = ,x&x,' \ ${WRKSRC}/configure -.if defined(WITH_BIG5) +.if ${PORT_OPTIONS:MBIG5} @${REINPLACE_CMD} -e '/defaultencode =/s,gb2312,big5,' \ ${WRKSRC}/src/zhcon.conf .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/README.html ${WRKSRC}/doc/bpsf.txt \ ${WRKSRC}/doc/poem.* ${WRKSRC}/ChangeLog ${WRKSRC}/NEWS \ diff --git a/games/hinversi/Makefile b/games/hinversi/Makefile index 3cfc810c349c..51f05acbf7ee 100644 --- a/games/hinversi/Makefile +++ b/games/hinversi/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= SF/${PORTNAME}/latest MAINTAINER= ports@FreeBSD.org COMMENT= Reversi/Othello clone -OPTIONS= NLS "Native Language Support via gettext utilities" on +OPTIONS_DEFINE= NLS LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual @@ -24,15 +24,15 @@ USE_LDCONFIG= yes MAN1= hinversi-cli.1 -.include +.include -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes CONFIGURE_ARGS+=--with-libintl-prefix=${LOCALBASE} PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif post-patch: @@ -42,4 +42,4 @@ post-patch: /_la_LIBADD/s|=$$|= $$(LTLIBINTL)|' ${WRKSRC}/${file} .endfor -.include +.include diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile index a4fff68eaa46..5beea89c4e2e 100644 --- a/games/znibbles/Makefile +++ b/games/znibbles/Makefile @@ -18,7 +18,8 @@ COMMENT= A multi-player networked nibbles game LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -OPTIONS= GTK "Build GTK+ client" on +OPTIONS_DEFINE= GTK1 +OPTIONS_DEFAULT= GTK1 USE_MOTIF= yes WANT_GNOME= yes @@ -28,14 +29,14 @@ MAKE_JOBS_SAFE= yes MAN6= nibbles.6 znibbles.6 znibblesX.6 PLIST_FILES= bin/nibbles bin/znibbles bin/znibblesX -.include +.include -.if defined(WITHOUT_GTK) -CONFIGURE_ARGS+=--disable-gtk -.else +.if ${PORT_OPTIONS:MGTK1} USE_GNOME+= gtk12 MAN6+= gznibbles.6 PLIST_FILES+= bin/gznibbles +.else +CONFIGURE_ARGS+=--disable-gtk .endif post-extract: @@ -58,8 +59,8 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/nibbles.6 ${MAN6PREFIX}/man/man6 ${INSTALL_MAN} ${WRKSRC}/doc/znibbles.6 ${MAN6PREFIX}/man/man6 ${INSTALL_MAN} ${WRKSRC}/doc/znibblesX.6 ${MAN6PREFIX}/man/man6 -.if !defined(WITHOUT_GTK) +.if ${PORT_OPTIONS:MGTK1} ${INSTALL_MAN} ${WRKSRC}/doc/gznibbles.6 ${MAN6PREFIX}/man/man6 .endif -.include +.include diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile index 8dcf6ef14b79..d481db45e899 100644 --- a/graphics/swftools/Makefile +++ b/graphics/swftools/Makefile @@ -24,8 +24,7 @@ LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \ freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -OPTIONS= LAME "LAME MP3 audio encoder support" off \ - PDF "PDFlib support" off +OPTIONS_DEFINE= LAME PDF USE_GNOME= pkgconfig USE_GL= glut @@ -42,16 +41,16 @@ MAN1= as3compile.1 font2swf.1 gif2swf.1 jpeg2swf.1 pdf2swf.1 \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include +.include -.if defined(WITH_LAME) +.if ${PORT_OPTIONS:MLAME} LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame .else #CONFIGURE_ARGS+= --disable-lame CONFIGURE_ENV+= ac_cv_lib_mp3lame_lame_init=no .endif -.if defined(WITH_PDF) +.if ${PORT_OPTIONS:MPDF} LIB_DEPENDS+= pdf.6:${PORTSDIR}/print/pdflib PLIST_SUB+= PDF="" MAN1+= pdf2pdf.1 @@ -68,4 +67,4 @@ post-patch: @${REINPLACE_CMD} -e '/python/d ; \ /avi2swf/d' ${WRKSRC}/Makefile.in -.include +.include diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile index 7eb52e3acb9c..7014ab8c5fc8 100644 --- a/japanese/jed/Makefile +++ b/japanese/jed/Makefile @@ -30,33 +30,35 @@ CONFIGURE_ENV= JED_ROOT="${JED_ROOT}" X_EXTRA_LIBS="-lcurses" CONFIGURE_ARGS= --enable-x-locale=no ALL_TARGET= ${BINSTUFF} getmail MAN1= jed.1 rgrep.1 -.if !defined(NOPORTDOCS) -INFO= jed -.endif MAKE_JOBS_UNSAFE= yes JED_ROOT= ${DATADIR} BINSTUFF= jed rgrep -OPTIONS= CANNA "Canna support" on \ - X11 "X11 support" on +OPTIONS_DEFINE= DOCS X11 CANNA +OPTIONS_DEFAULT= CANNA X11 +CANNA_DESC= Canna support -.include +.include -.if defined(WITHOUT_CANNA) -CONFIGURE_ARGS+= --with-canna=no -.else +.if ${PORT_OPTIONS:MDOCS} +INFO= jed +.endif + +.if ${PORT_OPTIONS:MCANNA} CONFIGURE_ARGS+= --with-canna=yes LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib +.else +CONFIGURE_ARGS+= --with-canna=no .endif -.if defined(WITHOUT_X11) -PLIST_SUB= X11="@comment " -.else +.if ${PORT_OPTIONS:MX11} USE_XORG= x11 xext xt BINSTUFF+= xjed PLIST_SUB= X11="bin/xjed" +.else +PLIST_SUB= X11="@comment " .endif _OBJDIR= ${WRKSRC}/src/${ARCH}objs @@ -90,7 +92,7 @@ do-install: ${INSTALL_DATA} ${_LIBDIR}/colors/* ${JED_ROOT}/lib/colors/ ${INSTALL_DATA} ${_LIBDIR}/tm/* ${JED_ROOT}/lib/tm/ cd ${_DOCDIR} && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${INSTALL_DATA} ${_INFODIR}/jed.info ${PREFIX}/info/ ${INSTALL_DATA} ${_INFODIR}/jed.1in ${PREFIX}/info/jed.info-1 ${INSTALL_DATA} ${_INFODIR}/jed.2in ${PREFIX}/info/jed.info-2 @@ -102,4 +104,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include +.include diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile index a80eaf213b51..efe3ccf06d06 100644 --- a/japanese/jvim3/Makefile +++ b/japanese/jvim3/Makefile @@ -32,12 +32,13 @@ MAKE_ARGS= FEPOPT='${FEPOPT}' \ MAN1= jvim3.1 -OPTIONS= X11 "X11 support" on \ - CANNA "Canna support (via ONEW library)" on \ - DIRECT_CANNA "Canna support (direct)" off \ - FREEWNN "FreeWnn support (via ONEW library)" on \ - WNN6 "Wnn6 support" off \ - WNN7 "Wnn7 support" off +OPTIONS_DEFINE= X11 CANNA DIRECT_CANNA WNN6 WNN7 FREEWNN +OPTIONS_DEFAULT= CANNA FREEWNN X11 +CANNA_DESC= Canna support (via ONEW library) +DIRECT_CANNA_DESC= Canna support (direct) +FREEWNN_DESC= FreeWnn support (via ONEW library) +WNN6_DESC= Wnn6 support +WNN7_DESC= Wnn7 support PORTDOCS= cygwin.txt differen.doc fepctrl.doc readme.doc \ termcap.dos uganda.jp vim-jp.htm vim32.ini tutor.j @@ -46,9 +47,9 @@ PORTDOCS= cygwin.txt differen.doc fepctrl.doc readme.doc \ MACHINE= -DBSD_UNIX -DUSE_LOCALE LIBS= -ltermlib -L${PREFIX}/lib -.include +.include -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} USE_XORG= x11 MACHINE+= -DUSE_X11 CC+= -I${LOCALBASE}/include @@ -56,17 +57,17 @@ LIBS+= -L${LOCALBASE}/lib -lX11 .endif # Direct connection to Canna -.if !defined(WITHOUT_DIRECT_CANNA) +.if ${PORT_OPTIONS:MDIRECT_CANNA} INPUT_METHOD+= direct_canna LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib FEPOPT+= -DJP_DEF=\"EEE\" -DCANNA -DFEPCTRL FEPLIBS= -lcanna FEPOBJS= fepcanna.o JVIM3RC= "set fepctrl" -.else # !WITHOUT_DIRECT_CANNA +.else # Connection by using ONEW library -.if !defined(WITHOUT_CANNA) +.if ${PORT_OPTIONS:MCANNA} INPUT_METHOD+= canna LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib FEPLIBS+= -L${LOCALBASE}/lib -lonew-canna -lcanna @@ -75,7 +76,7 @@ FEPOBJS= feponew.o JVIM3RC= "set fepctrl onewredraw" .endif -.if !defined(WITHOUT_FREEWNN) +.if ${PORT_OPTIONS:MFREEWNN} LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew-freewnn.a:${PORTSDIR}/japanese/onew FEPLIBS+= -L${LOCALBASE}/lib -lonew-freewnn -ljd -lcrypt @@ -84,7 +85,7 @@ FEPOBJS= feponew.o JVIM3RC= "set fepctrl onewredraw" .endif -.if !defined(WITHOUT_WNN6) +.if ${PORT_OPTIONS:MWNN6} LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew-wnn6.a:${PORTSDIR}/japanese/onew FEPLIBS+= -L${LOCALBASE}/lib -lonew-wnn6 -ljd -lcrypt @@ -93,7 +94,7 @@ FEPOBJS= feponew.o JVIM3RC= "set fepctrl onewredraw" .endif -.if !defined(WITHOUT_WNN7) +.if ${PORT_OPTIONS:MWNN7} LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew-wnn7.a:${PORTSDIR}/japanese/onew FEPLIBS+= -L${LOCALBASE}/lib -lonew-wnn7 -ljd -lcrypt @@ -101,7 +102,7 @@ FEPOPT+= -DJP_DEF=\"EEE\" -DONEW -DFEPCTRL FEPOBJS= feponew.o JVIM3RC= "set fepctrl onewredraw" .endif -.endif # !WITHOUT_DIRECT_CANNA +.endif post-build: ${CP} ${WRKSRC}/doc.j/tutor/tutor.j ${WRKSRC}/doc.j @@ -114,9 +115,9 @@ post-install: .if !exists(${PREFIX}/etc/jvim3rc) ${INSTALL_DATA} ${PREFIX}/etc/jvim3rc.dist ${PREFIX}/etc/jvim3rc .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/doc.j && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif -.include +.include diff --git a/japanese/skk-tools/Makefile b/japanese/skk-tools/Makefile index 87336a42d080..904c414cd9f0 100644 --- a/japanese/skk-tools/Makefile +++ b/japanese/skk-tools/Makefile @@ -18,7 +18,9 @@ COMMENT= Jisyo-tools for the SKK Japanese-input software LICENSE= GPLv2 -OPTIONS= EXPR2 "Build skkdic-expr2 (needs glib-2.x)" on +OPTIONS_DEFINE= EXPR2 +OPTIONS_DEFAULT= EXPR2 +EXPR2_DESC= Build skkdic-expr2 (needs glib-2.x) GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes @@ -30,19 +32,19 @@ PLIST_FILES= bin/skkdic-count bin/skkdic-expr bin/skkdic-sort .include -.if defined(WITHOUT_EXPR2) -CONFIGURE_ARGS= --without-skkdic-expr2 -.else +.if ${PORT_OPTIONS:MEXPR2} USE_GNOME= glib20 PORTDOCS+= README.skkdic-expr2 PLIST_FILES+= bin/skkdic-expr2 +.else +CONFIGURE_ARGS= --without-skkdic-expr2 .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/READMEs/README.C ${DOCSDIR}/README.skktools -.if !defined(WITHOUT_EXPR2) +.if ${PORT_OPTIONS:MEXPR2} ${INSTALL_DATA} ${WRKSRC}/READMEs/README.skkdic-expr2 ${DOCSDIR} .endif .endif diff --git a/math/calctool/Makefile b/math/calctool/Makefile index 1d55cd7654ea..fd9ba5b187a8 100644 --- a/math/calctool/Makefile +++ b/math/calctool/Makefile @@ -18,15 +18,17 @@ COMMENT= A multi-GUI (terminal, X, XView) calculator program USE_LDCONFIG= yes -OPTIONS= X11 "Build X11 version of calctool" on \ - TTY "Build tty version of calctool" on \ - XVIEW "Build tty version of calctool" off +OPTIONS_DEFINE= X11 TTY XVIEW +OPTIONS_DEFAULT= X11 TTY +X11_DESC= Build X11 version of calctool +TTY_DESC= Build tty version of calctool +XVIEW_DESC= Build tty version of calctool MAN1= calctool.1 -.include +.include -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} USE_XORG= x11 BINARIES+= xcalctool PLIST_SUB+= X11="" @@ -34,14 +36,14 @@ PLIST_SUB+= X11="" PLIST_SUB+= X11="@comment " .endif -.if !defined(WITHOUT_TTY) +.if ${PORT_OPTIONS:MTTY} BINARIES+= tty_calctool PLIST_SUB+= TTY="" .else PLIST_SUB+= TTY="@comment " .endif -.if defined(WITH_XVIEW) +.if ${PORT_OPTIONS:MXVIEW} BINARIES+= xv_calctool LIB_DEPENDS+= xview.3:${PORTSDIR}/x11-toolkits/xview PLIST_SUB+= XVIEW="" @@ -72,4 +74,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/calctool.1 ${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/calctool.help ${DATADIR} -.include +.include diff --git a/math/pgcalc/Makefile b/math/pgcalc/Makefile index 232eb595af60..e6b3a0ad8efd 100644 --- a/math/pgcalc/Makefile +++ b/math/pgcalc/Makefile @@ -22,11 +22,12 @@ INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= ARTS "Build with aRts support" on +OPTIONS_DEFINE= ARTS +OPTIONS_DEFAULT= ARTS -.include +.include -.if !defined(WITH_ARTS) +.if ${PORT_OPTIONS:MARTS} CONFIGURE_ARGS+= --without-arts .endif @@ -43,4 +44,4 @@ post-extract: @${REINPLACE_CMD} -e 's,SkinPath =,& QString("${PREFIX}/share/apps/${PORTNAME}/skins/"); //,' \ ${WRKSRC}/src/pgcalc.cpp -.include +.include diff --git a/math/yacas/Makefile b/math/yacas/Makefile index 8e03a5181c49..902e6ecb2978 100644 --- a/math/yacas/Makefile +++ b/math/yacas/Makefile @@ -17,26 +17,28 @@ COMMENT= Yet Another Computer Algebra System LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS= TESTS "Run bundled self-tests after build" on +OPTIONS_DEFINE= TESTS DOCS +OPTIONS_DEFAULT= TESTS +TESTS_DESC= Run bundled self-tests after build USE_PERL5_BUILD=yes USE_GMAKE= yes USE_AUTOTOOLS= libtool MAKE_JOBS_SAFE= yes -.include +.include .if ${ARCH} == "sparc64" BROKEN= Does not compile with GCC 4.2 .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+= --enable-html-doc --with-html-dir=${DOCSDIR} .else CONFIGURE_ARGS+= --disable-html-doc .endif -.if !defined(WITHOUT_TESTS) +.if ${PORT_OPTIONS:MTESTS} BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash .endif @@ -45,9 +47,9 @@ post-patch: 's| /bin/bash| ${LOCALBASE}/bin/bash|' ${WRKSRC}/tests/test-yacas post-build: -.if !defined(WITHOUT_TESTS) +.if ${PORT_OPTIONS:MTESTS} @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ ${MAKEFILE} check ${MAKE_ARGS}) .endif -.include +.include diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile index 8203730a1150..1883e181a722 100644 --- a/misc/hotkeys/Makefile +++ b/misc/hotkeys/Makefile @@ -28,11 +28,12 @@ USE_GMAKE= yes MAN1= hotkeys.1 -OPTIONS= XOSD "Enable On-Screen-Display support" on +OPTIONS_DEFINE= OSD +OPTIONS_DEFAULT= OSD -.include +.include -.if !defined(WITHOUT_XOSD) +.if ${PORT_OPTIONS:MOSD} LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd CONFIGURE_ARGS+= --with-xosd .endif @@ -53,4 +54,4 @@ post-install: fi @${CAT} ${PKGMESSAGE} -.include +.include diff --git a/misc/mc-light/Makefile b/misc/mc-light/Makefile index e75c679da0e3..b9c804104263 100644 --- a/misc/mc-light/Makefile +++ b/misc/mc-light/Makefile @@ -19,9 +19,9 @@ RUN_DEPENDS+= gawk:${PORTSDIR}/lang/gawk CONFLICTS= mc-4.7* -OPTIONS= NLS "Enable gettext support" on \ - SUBSHELL "Build with subshell support (only for bash!)" off \ - MC_IN_MC "Allow run mc inside mc (useful for mcedit)" off +OPTIONS_DEFINE= NLS SUBSHELL MC_IN_MC +SUBSHELL_DESC= Build with subshell support (only for bash!) +MC_IN_MC_DESC= Allow run mc inside mc (useful for mcedit) USE_GMAKE= yes USE_ICONV= yes @@ -37,13 +37,13 @@ CONFIGURE_ARGS+=--with-included-slang \ MAN1= mc.1 mcedit.1 MAN8= mcserv.8 -.include +.include -.if !defined(WITH_SUBSHELL) +.if ${PORT_OPTIONS:MSUBSHELL} CONFIGURE_ARGS+=--without-subshell .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else @@ -51,7 +51,7 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif -.if defined(WITH_MC_IN_MC) +.if ${PORT_OPTIONS:MMC_IN_MC} CPPFLAGS+= -DMC_IN_MC_ALLOWED .endif @@ -60,4 +60,4 @@ post-install: ${CHMOD} 755 ${PREFIX}/share/mc/extfs/${i} .endfor -.include +.include diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile index dd5e7c2c540c..4d07d8f03f74 100644 --- a/misc/xosd/Makefile +++ b/misc/xosd/Makefile @@ -34,11 +34,13 @@ MAN3= xosd.3 xosd_create.3 xosd_destroy.3 xosd_display.3 \ xosd_set_shadow_offset.3 xosd_set_vertical_offset.3 \ xosd_show.3 xosd_uninit.3 -OPTIONS= XMMS "Install XMMS-OSD plugin" on +OPTIONS_DEFINE= XMMS +OPTIONS_DEFAULT= XMMS +XMMS_DESC= Install XMMS-OSD plugin .include -.if !defined(WITHOUT_XMMS) +.if ${PORT_OPTIONS:MXMMS} LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms \ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf PLIST_SUB= WITH_XMMS="" @@ -54,4 +56,4 @@ pre-patch: @${REINPLACE_CMD} -e 's,^\(CFLAGS =\)\(.*\)$$,\1 -I.. \2,g' ${WRKSRC}/$f .endfor -.include +.include diff --git a/multimedia/abby/Makefile b/multimedia/abby/Makefile index c67d2215eb84..eff38c2a5309 100644 --- a/multimedia/abby/Makefile +++ b/multimedia/abby/Makefile @@ -14,7 +14,9 @@ MASTER_SITES= GOOGLE_CODE MAINTAINER= ports@FreeBSD.org COMMENT= Front-end for c/clive -OPTIONS= CCLIVE "Use cclive backend (instead of clive)" on +OPTIONS_DEFINE= CCLIVE +OPTIONS_DEFAULT= CCLIVE +CCLIVE_DESC= Use cclive backend (instead of clive) USE_BZIP2= yes USE_QT4= gui network xml moc_build qmake_build rcc_build uic_build @@ -24,9 +26,9 @@ QMAKE_PRO= abby.pro PLIST_FILES= bin/abby -.include +.include -.if defined(WITH_CCLIVE) +.if ${PORT_OPTIONS:MCCLIVE} RUN_DEPENDS+= cclive>=0.5.6:${PORTSDIR}/multimedia/cclive .else RUN_DEPENDS+= clive>=2.2.5:${PORTSDIR}/multimedia/clive @@ -38,4 +40,4 @@ do-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/abby ${PREFIX}/bin/abby -.include +.include diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile index a65d98e9f09d..22dceedb4a67 100644 --- a/multimedia/beep-media-player/Makefile +++ b/multimedia/beep-media-player/Makefile @@ -34,15 +34,15 @@ INPUT_PLUGINS= cdaudio,mpg123,wav OUTPUT_PLUGINS= OSS VISUALIZATION_PLUGINS= blur_scope -OPTIONS= VORBIS "Enable Ogg Vorbis support" on \ - ESOUND "Enable Esound support" off \ - 3DNOW "Enable 3DNow! optimized decoding routines" on \ - IPV6 "Enable IPv6 support" off +OPTIONS_DEFINE= VORBIS ESOUND 3DNOW IPV6 +OTPIONS_DEFAULT= VORBIS 3DNOW -.include +3DNOW_DESC= 3DNow! optimized decoding routines + +.include # Enable IPv6 support -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} PATCH_SITES+= http://izb.knu.ac.kr/~bh/diffs/ PATCHFILES+= bmp-0.9.7-ipv6-simple.diff PATCH_DIST_STRIP+= -p1 @@ -51,7 +51,7 @@ PATCH_DIST_STRIP+= -p1 CONFIGURE_ARGS+= --disable-mikmod PLIST_SUB+= MIKMODPLUGIN:="@comment " -.if !defined(WITHOUT_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis INPUT_PLUGINS+= vorbis PLIST_SUB+= VORBISPLUGIN:="" @@ -60,7 +60,7 @@ CONFIGURE_ARGS+= --disable-vorbis PLIST_SUB+= VORBISPLUGIN:="@comment " .endif -.if defined(WITH_ESOUND) +.if ${PORT_OPTIONS:MESOUND} USE_GNOME+= esound OUTPUT_PLUGINS+= esd PLIST_SUB+= ESDPLUGIN:="" @@ -74,11 +74,7 @@ CONFIGURE_ARGS+= --disable-esd PLIST_SUB+= ESDPLUGIN:="@comment " .endif -.if ${ARCH} != "i386" -WITHOUT_3DNOW= yes -.endif - -.if !defined(WITHOUT_3DNOW) +.if ${PORT_OPTIONS:M3DNOW} && ${ARCH} != "i386" CONFIGURE_ARGS+= --enable-3dnow .endif @@ -97,4 +93,4 @@ post-install: -@update-desktop-database @${CAT} ${PKGMESSAGE} -.include +.include diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index 1929bda49c43..8813b81f61ad 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -19,9 +19,8 @@ LICENSE= GPLv2 LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \ xine.2:${PORTSDIR}/multimedia/libxine -OPTIONS= MOZILLA_PLUGIN "Install Mozilla plugin" off \ - GNOME "Enable Gnome integration" off \ - LIRC "Enable lirc support" off +OPTIONS_DEFINE= MOZILLA_PLUGIN GNOME LIRC +MOZILLA_PLUGIN_DESC= Mozilla plugin USE_XZ= yes USE_GNOME= gnomehack gtk20 @@ -43,7 +42,7 @@ MANCOMPRESSED= no .include -.if defined(WITH_MOZILLA_PLUGIN) +.if ${PORT_OPTIONS:MMOZILLA_PLUGIN} USE_XORG+= xaw USE_WEBPLUGINS= native WEBPLUGINS_DIR= ${PREFIX}/lib/gxine @@ -55,7 +54,7 @@ CONFIGURE_ARGS+=--without-browser-plugin PLIST_SUB+= MOZILLA_PLUGIN="@comment " .endif -.if defined(WITH_GNOME) +.if ${PORT_OPTIONS:MGNOME} BUILD_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver @@ -64,7 +63,7 @@ CONFIGURE_ARGS+=--with-dbus CONFIGURE_ARGS+=--disable-integration-wizard --without-dbus .endif -.if defined(WITH_LIRC) +.if ${PORT_OPTIONS:MLIRC} LIB_DEPENDS+= lirc_client.2:${PORTSDIR}/comms/lirc CONFIGURE_ARGS+=--enable-lirc .else diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index ca10c8dc88ad..664baeb84553 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -42,14 +42,16 @@ CONFIGURE_ENV+= AKODE_CONFIG=${LOCALBASE}/bin/akode-config USE_LDCONFIG= yes DO_NOT_COMPILE+=akode juk mpeglib mpeglib_artsplug xine_artsplugin -OPTIONS= AKODE "Use akode for audio playback" on \ - MPEGLIB "Use mpeglib for audio playback" off \ - XINE "Enable support for video playback using libxine" off +OPTIONS_DEFINE= AKODE MPEGLIB XINE +OPTIONS_DEFAULT= AKODE +AKODE_DESC= akode for audio playback +MPEGLIB_DESC= Use mpeglib for audio playback +XINE_DESC= support for video playback using libxine .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include -.if !defined(WITHOUT_AKODE) +.if ${PORT_OPTIONS:MAKODE} LIB_DEPENDS+= akode:${PORTSDIR}/audio/akode RUN_DEPENDS+= ${LOCALBASE}/lib/libakode.so:${PORTSDIR}/audio/akode PLIST_SUB+= AKODE="" @@ -58,11 +60,11 @@ DO_NOT_COMPILE+=akode_artsplugin PLIST_SUB+= AKODE="@comment " .endif -.if defined(WITH_XINE) +.if ${PORT_OPTIONS:MXINE} RUN_DEPENDS+= ${LOCALBASE}/lib/libarts_xine.la:${PORTSDIR}/multimedia/xine_artsplugin .endif -.if defined(WITH_MPEGLIB) +.if ${PORT_OPTIONS:MMPEGLIB} RUN_DEPENDS+= mpeglibartsplay:${PORTSDIR}/audio/mpeglib_artsplug .endif diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile index 34e63e0a56d1..7769540af203 100644 --- a/multimedia/kino/Makefile +++ b/multimedia/kino/Makefile @@ -20,8 +20,9 @@ LIB_DEPENDS= dv.4:${PORTSDIR}/multimedia/libdv \ RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder \ mplex:${PORTSDIR}/multimedia/mjpegtools -OPTIONS= QUICKTIME "With Quicktime support" off \ - FFMPEG_KINO "With ffmpeg-kino" off +OPTIONS_DEFINE= QUICKTIME FFMPEG_KINO +QUICKTIME_DESC= With Quicktime support +FFMPEG_KINO_DESC= With ffmpeg-kino USE_XORG= x11 xv ice USE_AUTOTOOLS= autoconf @@ -38,18 +39,18 @@ LDFLAGS+= -L${LOCALBASE}/lib/libquicktime \ CONFIGURE_ARGS= --with-dv1394 MAN1= kino.1 kino2raw.1 -.include +.include -.if defined(WITH_FFMPEG_KINO) +.if ${PORT_OPTIONS:MFFMPEG_KINO} MAN1+= ffmpeg-kino.1 .endif -.if defined(WITH_QUICKTIME) +.if ${PORT_OPTIONS:MQUICKTIME} LIB_DEPENDS+= quicktime.0:${PORTSDIR}/multimedia/libquicktime CONFIGURE_ARGS+= --enable-quicktime .endif -.if defined(WITH_FFMPEG_KINO) +.if ${PORT_OPTIONS:MFFMPEG_KINO} PLIST_SUB+= FFMPEG_KINO="" .else CONFIGURE_ARGS+= --disable-local-ffmpeg @@ -57,4 +58,4 @@ PLIST_SUB+= FFMPEG_KINO="@comment " LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg .endif -.include +.include diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index c0006cd6cb38..4bc87a17d88f 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -35,10 +35,11 @@ USE_AUTOTOOLS= libtool USE_GNOME= atk glib20 gtk20 libxml2 pango # See above USE_XORG= xv -OPTIONS= ARTS "ARts audio system support" on \ - GSTREAMER "GStreamer playback support" off \ - TUBESTUFF "YouTube and other 'download & play' support" off \ - XINE "Xine playback support" off +OPTIONS_DEFINE= ARTS GSTREAMER TUBESTUFF XINE DOCS +OPTIONS_DEFAULT= ARTS +GSTREAMER_DESC= GStreamer playback support +TUBESTUFF_DESC= YouTube and other 'download & play' support +XINE_DESC= Xine playback support CONFIGURE_ENV+= PKG_CONFIG=${LOCALBASE}/bin/pkg-config @@ -49,25 +50,25 @@ post-patch: .include -.if defined(WITHOUT_ARTS) +.if empty(PORT_OPTIONS:MARTS) CONFIGURE_ARGS+=--without-arts -.endif # WITHOUT_ARTS +.endif -.if defined(WITH_GSTREAMER) +.if ${PORT_OPTIONS:MGSTREAMER} USE_GSTREAMER+= yes PLIST_FILES+= bin/kgstplayer .else CONFIGURE_ARGS+=--without-gstreamer -.endif # WITH_GSTREAMER +.endif -.if defined(WITH_XINE) +.if ${PORT_OPTIONS:MXINE} LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine PLIST_FILES+= bin/kxineplayer .else CONFIGURE_ARGS+=--without-xine .endif # WITH_XINE -.if defined(WITH_TUBESTUFF) +.if ${PORT_OPTIONS:MTUBESTUFF} TUBESTUFF_VER= 20080314 DISTFILES+= tubestuff-${TUBESTUFF_VER}.tbz BUILD_DEPENDS+= mencoder:${PORTSDIR}/multimedia/mencoder @@ -88,11 +89,11 @@ pre-install: post-install: cd ${WRKDIR}/tubestuff && ./make_install -.if defined(NOPORTDOCS) - ${RM} ${PREFIX}/share/apps/kmplayer/tubestuff/README -.else +.if ${PORT_OPTIONS:MDOCs} PLIST_FILES+= share/apps/kmplayer/tubestuff/README -.endif # NOPORTDOCS +.else + ${RM} ${PREFIX}/share/apps/kmplayer/tubestuff/README +.endif PLIST_FILES+= share/apps/kmplayer/tubestuff/altertube-dl \ share/apps/kmplayer/tubestuff/blip-dl \ diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile index c270ffa6f2cf..632e4ad4ee41 100644 --- a/multimedia/libmpeg3/Makefile +++ b/multimedia/libmpeg3/Makefile @@ -16,7 +16,7 @@ COMMENT= Advanced editing and manipulation of MPEG streams LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 -OPTIONS= MMX "Enable MMX instruction set (i386 only)" off +OPTIONS_DEFINE= MMX DOCS WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -38,9 +38,9 @@ LDFLAGS+= -lm -L${LOCALBASE}/lib -la52 ${PTHREAD_LIBS} NASM?= ${LOCALBASE}/bin/nasm -.include +.include -.if defined(WITH_MMX) && (${ARCH} == "i386") +.if ${PORT_OPTIONS:MMMX} && (${ARCH} == "i386") BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm MAKE_ARGS+= USE_MMX=1 NASM="${NASM}" CFLAGS+= -DHAVE_MMX @@ -65,11 +65,11 @@ do-install: .for file in ${LIB_FILES} cd ${WRKSRC}/obj && ${INSTALL_DATA} ${file} ${PREFIX}/lib .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in ${PORTDOCS} cd ${WRKSRC}/docs && ${INSTALL_DATA} ${file} ${DOCSDIR} .endfor .endif -.include +.include diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile index 8b80f2b5f801..6355aee310ce 100644 --- a/multimedia/openquicktime/Makefile +++ b/multimedia/openquicktime/Makefile @@ -24,11 +24,11 @@ USE_GMAKE= yes USE_LDCONFIG= yes PKGDEINSTALL= ${PKGINSTALL} -OPTIONS= DEBUG "Turn on debugging" off +OPTIONS_DEFINE= DEBUG -.include +.include -.if !defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug=no .endif @@ -50,4 +50,4 @@ post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \ ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include +.include -- cgit