diff options
author | bapt <bapt@FreeBSD.org> | 2012-06-01 09:38:09 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2012-06-01 09:38:09 +0000 |
commit | 6eb3adc7280e328312ae2583378f4a12b4339477 (patch) | |
tree | bbc7a0b1d0eb0b2a2665f9014bf686cbf040f79e | |
parent | 5705c7427ed0aa5ee02e35df1212e28cbfb74663 (diff) | |
download | FreeBSD-ports-6eb3adc7280e328312ae2583378f4a12b4339477.zip FreeBSD-ports-6eb3adc7280e328312ae2583378f4a12b4339477.tar.gz |
Convert to new options framework
-rw-r--r-- | audio/amarok/Makefile | 72 | ||||
-rw-r--r-- | audio/arts/Makefile | 11 | ||||
-rw-r--r-- | audio/juk/Makefile | 4 | ||||
-rw-r--r-- | audio/libmtp/Makefile | 10 | ||||
-rw-r--r-- | audio/linuxsampler/Makefile | 23 | ||||
-rw-r--r-- | audio/mixxx/Makefile | 17 | ||||
-rw-r--r-- | audio/mp3stat/Makefile | 18 |
7 files changed, 72 insertions, 83 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index 2eeb5fc..e2c0330 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -30,17 +30,15 @@ USE_SDL= sdl USE_RUBY= yes USE_LDCONFIG= yes -OPTIONS= GPOD "iPod support" on \ - NJB "Creative Nomad and Dell support" on \ - MTP "MTP device support" on \ - LIBVISUAL "libvisual support" off \ - OPENGL "OpenGL support" on \ - AMAZON "Amazon cover fetching support" on \ - MYSQL "Use MySQL as collection backend" off \ - POSTGRESQL "Use PostgreSQL as collection backend" off \ - HIDEMENUBAR "Revert the 'Hide Menubar' feature" off \ - -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= GPOD NJB MTP LIBVISUAL OPENGL AMAZON MYSQL PGSQL HIDEMENUBAR +OPTIONS_DEFAULT= GPOD NJB MTP OPENGL AMAZON +GPOD_DESC= Enable Ipod support +NJB_DESC= Enable Creative Nomad and Dell support +LIBVISUAL_DESC= Enable libvisual support +AMAZON_DESC= Enable Amazon cover fetching support +HIDEMENUBAR_DESC= Revert the 'Hide Menubar' feature + +.include <bsd.port.options.mk> CONFIGURE_ARGS+=--without-exscalibar \ --without-musicbrainz \ @@ -49,60 +47,60 @@ CONFIGURE_ARGS+=--without-exscalibar \ CFLAGS+= -I${LOCALBASE}/include/ruby-${RUBY_VER} -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH} -.if !defined(WITH_GPOD) -PLIST_SUB+= GPOD="@comment " -CONFIGURE_ARGS+=--without-libgpod -.else +.if ${PORT_OPTIONS:MGPOD} LIB_DEPENDS+= gpod.7:${PORTSDIR}/audio/libgpod CONFIGURE_ARGS+=--with-libgpod PLIST_SUB+= GPOD="" +.else +PLIST_SUB+= GPOD="@comment " +CONFIGURE_ARGS+=--without-libgpod .endif -.if !defined(WITH_NJB) -PLIST_SUB+= NJB="@comment " -.else +.if ${PORT_OPTIONS:MNJB} LIB_DEPENDS+= njb.6:${PORTSDIR}/audio/libnjb CONFIGURE_ARGS+=--with-libnjb PLIST_SUB+= NJB="" +.else +PLIST_SUB+= NJB="@comment " .endif -.if !defined(WITH_MTP) -PLIST_SUB+= MTP="@comment " -.else +.if ${PORT_OPTIONS:MMTP} LIB_DEPENDS+= mtp.9:${PORTSDIR}/audio/libmtp CONFIGURE_ARGS+=--with-libmtp PLIST_SUB+= MTP="" +.else +PLIST_SUB+= MTP="@comment " .endif -.if defined(WITHOUT_LIBVISUAL) -CONFIGURE_ARGS+=--without-libvisual -.else +.if ${PORT_OPTIONS:MLIBVISUAL} LIB_DEPENDS+= visual-0.4:${PORTSDIR}/graphics/libvisual04 +.else +CONFIGURE_ARGS+=--without-libvisual .endif -.if defined(WITHOUT_OPENGL) +.if empty(PORT_OPTIONS:MOPENGL) CONFIGURE_ARGS+=--without-opengl .endif -.if defined(WITHOUT_AMAZON) +.if empty(PORT_OPTIONS:MAMAZON) CONFIGURE_ARGS+=--disable-amazon .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+=--enable-mysql .endif -.if defined(WITH_POSTGRESQL) +.if ${PORT_OPTIONS:MPOSTGRESQL} USE_PGSQL= yes CONFIGURE_ARGS+=--enable-postgresql .endif -.if defined(WITH_HIDEMENUBAR) +.if ${PORT_OPTIONS:MHIDEMENUBAR} EXTRA_PATCHES= ${PATCHDIR}/hide-main-menu-bar-feature.patch .endif -.if defined(DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug=full STRIP= # none .endif @@ -121,18 +119,8 @@ post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${TOUCH} post-install: -.if defined(WITH_MTP) || defined(WITH_NJB) || defined(WITH_GPOD) +.if !empty(PORT_OPTIONS:MMTP) || !empty${PORT_OPTIONS:MNJB} || !empty(PORT_OPTIONS:MGPOD) @${CAT} ${PKGMESSAGE} .endif -check-options-version: -.ifdef(_OPTIONS_READ) - @(if ${PKG_VERSION} -t ${_OPTIONS_READ} ${MIN_OPTIONS_VER} | ${GREP} -q '<'; \ - then ${ECHO_CMD} ""; \ - ${ECHO_CMD} "===> You have unsupported (old) OPTIONS, please do a 'make rmconfig; make'"; \ - ${ECHO_CMD} ""; \ - exit 1; \ - fi) -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/arts/Makefile b/audio/arts/Makefile index 942e444..6ca4396 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -38,8 +38,7 @@ _NO_KDE_FINAL= yes CFLAGS+= -DHAVE_VASPRINTF CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" -OPTIONS= ESD "Enable esound support" off \ - NAS "Enable NAS support" off +OPTIONS_DEFINE= ESOUND NAS .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -48,11 +47,11 @@ OPTIONS= ESD "Enable esound support" off \ LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack .endif -.if defined(WITH_ESD) +.if ${PORT_OPTIONS:MESOUND} USE_GNOME+= esound .endif -.if defined(WITH_NAS) +.if ${PORT_OPTIONS:MNAS} LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas .endif @@ -64,11 +63,11 @@ pre-configure: ${WRKSRC}/configure .endif -.if defined(WITH_NAS) +.if ${PORT_OPTIONS:MNAS} ${REINPLACE_CMD} \ -e 's|LIBS="-laudio $$LIBS"|LIBS="-laudio -lm -lXt -lXau $$LIBS"|g' \ ${WRKSRC}/configure -.elif defined(WITHOUT_NAS) +.else ${REINPLACE_CMD} \ -e 's|ac_cv_lib_audio_AuOpenServer=yes|ac_cv_lib_audio_AuOpenServer=no|g' \ ${WRKSRC}/configure diff --git a/audio/juk/Makefile b/audio/juk/Makefile index 8c83942..94185c9 100644 --- a/audio/juk/Makefile +++ b/audio/juk/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= akode:${PORTSDIR}/audio/akode \ CONFLICTS= kdemultimedia-3.3* -OPTIONS= GSTREAMER "Enable gstreamer support" off +OPTIONS_DEFINE= GSTREAMER USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} @@ -39,7 +39,7 @@ WANT_GSTREAMER= yes .include <bsd.port.pre.mk> -.if defined(WITH_GSTREAMER) || exists(${LOCALBASE}/lib/libgstreamer-0.10.so) +.if ${PORT_OPTIONS:MGSTREAMER} || exists(${LOCALBASE}/lib/libgstreamer-0.10.so) GSTREAMER_OVERRIDE=yes USE_GSTREAMER= yes .endif diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile index 2bfa203..98423eb 100644 --- a/audio/libmtp/Makefile +++ b/audio/libmtp/Makefile @@ -15,7 +15,9 @@ COMMENT= Media Transfer Protocol (MTP) library LICENSE= LGPL21 -OPTIONS= MTPZ "Enable functionality to connect to MTPZ devices" on +OPTIONS_DEFINE= MTPZ +OPTIONS_DEFAULT= MTPZ +MTPZ_DESC= Enable functionality to connect to MTPZ devices USE_GNOME= gnomehack USE_ICONV= yes @@ -28,10 +30,10 @@ LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.options.mk> -.if defined(WITHOUT_MTPZ) -CONFIGURE_ARGS+=--disable-mtpz -.else +.if ${PORT_OPTIONS:MMTPZ} LIB_DEPENDS+= gcrypt.18:${PORTSDIR}/security/libgcrypt +.else +CONFIGURE_ARGS+=--disable-mtpz .endif .include <bsd.port.pre.mk> diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile index 13002ea..2b3ce2e 100644 --- a/audio/linuxsampler/Makefile +++ b/audio/linuxsampler/Makefile @@ -21,11 +21,10 @@ RESTRICTED= no commercial use ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= "not yet ported" -OPTIONS= JACK "Enable JACK support" on \ - ALSA "Enable ALSA support" off \ - ARTS "Enable aRts support" off \ - DSSI "Enable DSSI support" off \ - LV2CORE "Enable LV2 support" off +OPTIONS_DEFINE= JACK ALSA ARTS DSSI LV2CORE +OPTIONS_DEFAULT= JACK +DSSI_DESC= Enable DSSI support +LV2CORE_DESC= Enable LV2 support USE_BZIP2= yes USE_GNOME= gnomehack @@ -43,25 +42,25 @@ LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> -.if defined(WITHOUT_JACK) -CONFIGURE_ARGS+=--disable-jack-driver -.else +.if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +.else +CONFIGURE_ARGS+=--disable-jack-driver .endif -.if defined(WITH_ALSA) +.if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib .else CONFIGURE_ARGS+=--disable-alsa-driver .endif -.if defined(WITH_ARTS) +.if ${PORT_OPTIONS:MARTS} LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts .else CONFIGURE_ARGS+=--disable-arts-driver .endif -.if defined(WITH_DSSI) +.if ${PORT_OPTIONS:MDSSI} BUILD_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi RUN_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi PLIST_SUB+= DSSI="" @@ -70,7 +69,7 @@ CONFIGURE_ENV+= ac_cv_header_dssi_h=no PLIST_SUB+= DSSI="@comment " .endif -.if defined(WITH_LV2CORE) +.if ${PORT_OPTIONS:MLV2CORE} BUILD_DEPENDS+= lv2core>=0:${PORTSDIR}/audio/lv2core RUN_DEPENDS+= lv2core>=0:${PORTSDIR}/audio/lv2core PLIST_SUB+= LV2CORE="" diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index e382837..81c9172 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -29,10 +29,9 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \ portaudio.2:${PORTSDIR}/audio/portaudio2 \ tag.1:${PORTSDIR}/audio/taglib -OPTIONS= LAME "LAME MP3 audio encoder support" off \ - SHOUTCAST "Shoutcast Broadcasting" off \ - FAAD "FAAD AAC audio decoder plugin" off \ - WAVPACK "WavPack audio support plugin" off +OPTIONS_DEFINE= LAME FAAD WAVPACK SHOUTCAST DOCS +SHOUTCAST_DESC= Enable Shoutcast Broadcasting +WAVPACK_DESC= Enable WavPack audio support plugin WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -48,18 +47,18 @@ MAKE_JOBS_SAFE= yes .include <bsd.port.options.mk> -.if defined(WITH_LAME) +.if ${PORT_OPTIONS:MLAME} RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame .endif -.if defined(WITH_SHOUTCAST) +.if ${PORT_OPTIONS:MSHOUTCAST} LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2 SCONS_ARGS+= shoutcast=1 .else SCONS_ARGS+= shoutcast=0 .endif -.if defined(WITH_FAAD) +.if ${PORT_OPTIONS:MFAAD} LIB_DEPENDS+= faad.2:${PORTSDIR}/audio/faad \ mp4v2.10:${PORTSDIR}/multimedia/mp4v2 SCONS_ARGS+= faad=1 @@ -69,7 +68,7 @@ SCONS_ARGS+= faad=0 PLIST_SUB+= FAAD="@comment " .endif -.if defined(WITH_WAVPACK) +.if ${PORT_OPTIONS:MWAVPACK} LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack SCONS_ARGS+= wv=1 PLIST_SUB+= WAVPACK="" @@ -91,7 +90,7 @@ post-patch: post-install: @${STRIP_CMD} ${PREFIX}/bin/mixxx -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for FILE in Mixxx-Manual.pdf README ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} diff --git a/audio/mp3stat/Makefile b/audio/mp3stat/Makefile index e13741d..10aca00 100644 --- a/audio/mp3stat/Makefile +++ b/audio/mp3stat/Makefile @@ -32,18 +32,20 @@ PLIST_DIRS= lib/mp3stat CXX+= -I${LOCALBASE}/include -L${LOCALBASE}/lib \ -Wl,--rpath,${LOCALBASE}/lib -OPTIONS= VORBIS "Ogg/Vorbis support" on +OPTIONS_DEFINE= VORBIS DOCS +OPTIONS_DEFAULT= VORBIS -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(WITHOUT_VORBIS) -MAKE_ARGS+= VORBIS="" -.else +.if ${PÖRT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis PLIST_FILES+= lib/mp3stat/input_vorb.so +.else +MAKE_ARGS+= VORBIS="" .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= README .endif @@ -61,12 +63,12 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/ui/gtk/ui_gtk2.so ${PREFIX}/lib/mp3stat ${INSTALL_DATA} ${WRKSRC}/ui/console/ui_console.so ${PREFIX}/lib/mp3stat ${INSTALL_DATA} ${WRKSRC}/input/mp3/input_mp3.so ${PREFIX}/lib/mp3stat -.if !defined(WITHOUT_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} ${INSTALL_DATA} ${WRKSRC}/input/vorbis/input_vorb.so ${PREFIX}/lib/mp3stat .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> |