aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2012-05-30 20:38:59 +0800
committerbapt <bapt@FreeBSD.org>2012-05-30 20:38:59 +0800
commit78b607c5e49d03c2d2ca58c63ed29cab25abb2ee (patch)
tree7baaa20543fd03210214856c3195211a1640b600
parent2ce77a0322ccfd3aa5810625f3bdf4d27eadbd2a (diff)
downloadfreebsd-ports-gnome-78b607c5e49d03c2d2ca58c63ed29cab25abb2ee.tar.gz
freebsd-ports-gnome-78b607c5e49d03c2d2ca58c63ed29cab25abb2ee.tar.zst
freebsd-ports-gnome-78b607c5e49d03c2d2ca58c63ed29cab25abb2ee.zip
Convert to new options framework
-rw-r--r--multimedia/gpac-libgpac/Makefile20
-rw-r--r--multimedia/iriverter/Makefile9
-rw-r--r--multimedia/libfame/Makefile14
3 files changed, 21 insertions, 22 deletions
diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile
index abb222824ada..6a9a21f3995c 100644
--- a/multimedia/gpac-libgpac/Makefile
+++ b/multimedia/gpac-libgpac/Makefile
@@ -27,12 +27,8 @@ BUILD_WRKSRC= ${WRKSRC}/src
INSTALL_WRKSRC= ${WRKSRC}/bin/gcc
LIBVER= 1
-OPTIONS= IPV6 "IPv6 support" on \
- JPEG "JPEG support" on \
- OPENGL "OpenGL support" off \
- OPENSSL "OpenSSL support" on \
- PNG "PNG support" on \
- XVIDEO "Xvideo support (libXv)" off
+OPTIONS_DEFINE= IPV6 JPEG OPENGL SSL PNG XVIDEO
+OPTIONS_DEFAULT= IPV6 JPEG SSL PNG
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -49,19 +45,19 @@ CONFIGURE_ENV+= LIBVER="${LIBVER}" PTHREAD_LIBS="${PTHREAD_LIBS}"
.include <bsd.port.options.mk>
-.if !defined(WITHOUT_OPENSSL)
+.if ${PORT_OPTIONS:MSSL}
USE_OPENSSL= yes
.else
CONFIGURE_ARGS+= --disable-ssl
.endif
-.if defined(WITH_OPENGL)
+.if ${PORT_OPTIONS:MOPENGL}
USE_GL= gl glu
.else
CONFIGURE_ARGS+= --disable-opengl
.endif
-.if defined(WITH_XVIDEO)
+.if ${PORT_OPTIONS:MXVIDEO}
LIB_DEPENDS+= Xv.1:${PORTSDIR}/x11/libXv
.else
CONFIGURE_ARGS+= --disable-x11-xv --disable-x11-shm
@@ -69,18 +65,18 @@ CONFIGURE_ARGS+= --disable-x11-xv --disable-x11-shm
.include <bsd.port.pre.mk>
-.if defined(WITHOUT_IPV6)
+.if empty(PORT_OPTIONS:MIPV6)
CONFIGURE_ARGS+= --disable-ipv6
.endif
-.if !defined(WITHOUT_JPEG)
+.if ${PORT_OPTIONS:MJPEG}
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
CONFIGURE_ARGS+= --use-jpeg=local
.else
CONFIGURE_ARGS+= --use-jpeg=no
.endif
-.if !defined(WITHOUT_PNG)
+.if ${PORT_OPTIONS:MPNG}
LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
CONFIGURE_ARGS+= --use-png=local
.else
diff --git a/multimedia/iriverter/Makefile b/multimedia/iriverter/Makefile
index e03d6fec42bc..72931c4257e0 100644
--- a/multimedia/iriverter/Makefile
+++ b/multimedia/iriverter/Makefile
@@ -21,13 +21,14 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-OPTIONS= SWTDEVEL "Use SWT Development port" off
+OPTIONS_DEFINE= SWTDEVEL
+SWTDEVEL_DESC= Use SWT Development port
CONFIGURE_ARGS= --with-swt="${JAVALIBDIR}/${SWT_JAR}"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_SWTDEVEL)
+.if ${PORT_OPTIONS:MSWTDEVEL}
BUILD_DEPENDS+= \
${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
RUN_DEPENDS+= \
@@ -41,4 +42,4 @@ RUN_DEPENDS+= \
SWT_JAR= swt.jar
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index c1bb7bfbf045..89a765c2acec 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -23,16 +23,18 @@ MAN3= fame_close.3 fame_encode_frame.3 fame_get_object.3 fame_init.3 \
fame_open.3 fame_register.3 fame_unregister.3 fame_encode_slice.3 \
fame_start_frame.3 fame_end_frame.3
-OPTIONS= SSE "SSE optimized routines (no effect in this release)" off \
- MMX "MMX optimized routines" on
+OPTIONS_DEFINE= SSE MMX
+OPTIONS_DEFAULT= MMX
-.include <bsd.port.pre.mk>
+SSE_DESC= "SSE optimized routines (no effect in this release)"
-.if defined(WITH_SSE)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSSE}
CONFIGURE_ARGS+= --enable-sse
.endif
-.if defined(WITHOUT_MMX)
+.if empty(PORT_OPTIONS:MMMX)
CONFIGURE_ARGS+= --disable-mmx
.endif
@@ -43,4 +45,4 @@ post-patch:
-e 's|AC_DEFUN(AM_PATH_LIBFAME|AC_DEFUN([AM_PATH_LIBFAME]|g' \
${WRKSRC}/libfame.m4 ${WRKSRC}/libfame.m4.in
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>