aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/swfdec/Makefile5
-rw-r--r--mail/libmapi/Makefile13
-rw-r--r--science/gchemutils/Makefile5
3 files changed, 11 insertions, 12 deletions
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 754c82b8b081..4f263dd3da9b 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -27,11 +27,12 @@ LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION:R}
-OPTIONS= PULSEAUDIO "Enable the PulseAudio sound module" off
+OPTIONS_DEFINE= PULSEAUDIO
+PULSEAUDIO_DESC="Enable the PulseAudio sound module"
.include <bsd.port.pre.mk>
-.if defined(WITH_PULSEAUDIO)
+.if ${PORT_OPTIONS:MPULSEAUDIO}
LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
CONFIGURE_ARGS+= --with-audio=pulse
.else
diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
index 17f9500c9186..f7b2e130fc2d 100644
--- a/mail/libmapi/Makefile
+++ b/mail/libmapi/Makefile
@@ -36,26 +36,23 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-samba=${LOCALBASE}
-OPTIONS= BOOST "Enable libmapi++ (needs boost)" yes \
- DOXYGEN "Enble building documentation" no
+OPTIONS_DEFINE= BOOST DOXYGEN
+OPTIONS_DEFAULT= BOOST
+BOOST_DESC= Enable libmapi++ (needs boost)
.include <bsd.port.pre.mk>
CONFIGURE_ARGS+= --disable-swig-perl
CONFIGURE_ARGS+= --disable-pymapi
-.if exists(${LOCALBASE}/lib/libboost_thread.so)
-WITH_BOOST=yes
-.endif
-
-.if defined(WITH_BOOST)
+.if ${PORT_OPTIONS:MBOOST} || exists(${LOCALBASE}/lib/libboost_thread.so)
LIB_DEPENDS+= boost_thread.4:${PORTSDIR}/devel/boost-libs
PLIST_SUB+= BOOST=""
.else
PLIST_SUB+= BOOST="@comment "
.endif
-.if defined(WITH_DOXYGEN) || exists(${LOCALBASE}/bin/doxygen)
+.if ${PORT_OPTIONS:MDOXYGEN} || exists(${LOCALBASE}/bin/doxygen)
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
PLIST_SUB+= DOXYGEN=""
.else
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index f9a42b002bde..4b393c6d16b3 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -47,11 +47,12 @@ MAN1= gchem3d.1 gchemcalc.1 gchempaint.1 gchemtable.1 gcrystal.1 \
PLIST_SUB= VER=0.12 GOFFICE=0.8.17 GNUMERIC_VER=1.10.17
-OPTIONS= XUL "Build browser plugin (requires Xulrunner)" off
+OPTIONS_DEFINE= XUL
+XUL_DESC= Build browser plugin (requires Xulrunner)
.include <bsd.port.pre.mk>
-.if defined(WITH_XUL)
+.if ${PORT_OPTIONS:MXUL}
USE_GECKO= libxul
CONFIGURE_ARGS+=--enable-mozilla-plugin
PLIST_SUB+= XUL=""