svn commit: r318829 - in head/graphics: kipi-plugins libgltext ocaml-lablgl opencv osg osg-devel panoglview pfstools pinpoint povray31 py-imaging py-sorl-thumbnail showimg squish
Jason Helfman
jgh at FreeBSD.org
Thu May 23 02:35:28 UTC 2013
Author: jgh
Date: Thu May 23 02:35:26 2013
New Revision: 318829
URL: http://svnweb.freebsd.org/changeset/ports/318829
Log:
- adoption of optionsNG
- convert to USES in some cases (pkgconfig,pathfix)
- trim COMMENT/historical headers in some cases
Approved by: portmgr (miwi)
Modified:
head/graphics/kipi-plugins/Makefile
head/graphics/libgltext/Makefile
head/graphics/ocaml-lablgl/Makefile
head/graphics/opencv/Makefile
head/graphics/osg-devel/Makefile
head/graphics/osg/Makefile
head/graphics/panoglview/Makefile
head/graphics/pfstools/Makefile
head/graphics/pinpoint/Makefile
head/graphics/povray31/Makefile
head/graphics/py-imaging/Makefile
head/graphics/py-sorl-thumbnail/Makefile
head/graphics/showimg/Makefile
head/graphics/squish/Makefile
Modified: head/graphics/kipi-plugins/Makefile
==============================================================================
--- head/graphics/kipi-plugins/Makefile Thu May 23 02:27:22 2013 (r318828)
+++ head/graphics/kipi-plugins/Makefile Thu May 23 02:35:26 2013 (r318829)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: digikam-plugins
-# Date created: 15 February 2004
-# Whom: Arjan van Leeuwen <avleeuwen at piwebs.com>
-#
+# Created by: Arjan van Leeuwen <avleeuwen at piwebs.com>
# $FreeBSD$
-#
PORTNAME= kipi-plugins
PORTVERSION= 0.1.7
@@ -20,28 +16,37 @@ LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics
png15:${PORTSDIR}/graphics/png \
kdcraw.4:${PORTSDIR}/graphics/libkdcraw
-OPTIONS= ACQUIREIMAGES "scanner/screenshot plugin" on \
- BATCHPROCESSIMAGES "batch processing on images" on \
- CALENDAR "create calendars" on \
- CDARCHIVING "create album CDs" on \
- FINDIMAGES "find duplicate images in albums" on \
- FLICKREXPORT "export images to flickr account" on \
- GALLERYEXPORT "export images to remote Gallery server" on \
- GPSSYNC "geolocalize pictures" on \
- HTMLEXPORT "export images collections into HTML page" on \
- IMAGEVIEWER "OpenGL based image viewer" on \
- JPEGLOSSLESS "batch processing without losing metainfo" on \
- KAMERAKLIENT "GPhoto2 interface (import from cameras)" on \
- METADATAEDIT "edit EXIF and IPTC pictures metadata" on \
- MPEGENCODER "tool to build a video from images" on \
- PICASAWEBEXPORT "export images to Picasa web service" on \
- PRINTWIZARD "a print wizard" on \
- RAWCONVERTER "convert RAW images from digital cameras" on \
- SENDIMAGES "send images by email" on \
- SIMPLEVIEWEREXPORT "export images to SimpleViewer" on \
- SLIDESHOW "create a slideshow" on \
- TIMEADJUST "adjust image file time and date" on \
- WALLPAPER "set your image as wallpaper" on
+OPTIONS_DEFINE= ACQUIREIMAGES BATCHPROCESSIMAGES CALENDAR CDARCHIVING FINDIMAGES \
+ FLICKREXPORT GALLERYEXPORT GPSSYNC HTMLEXPORT IMAGEVIEWER JPEGLOSSLESS \
+ KAMERAKLIENT METADATAEDIT MPEGENCODER PICASAWEBEXPORT PRINTWIZARD RAWCONVERTER \
+ SENDIMAGES SIMPLEVIEWEREXPORT SLIDESHOW TIMEADJUST WALLPAPER
+ACQUIREIMAGES_DESC= scanner/screenshot plugin
+BATCHPROCESSIMAGES_DESC= batch processing on images
+CALENDAR_DESC= create calendars
+CDARCHIVING_DESC= create album CDs
+FINDIMAGES_DESC= find duplicate images in albums
+FLICKREXPORT_DESC= export images to flickr account
+GALLERYEXPORT_DESC= export images to remote Gallery server
+GPSSYNC_DESC= geolocalize pictures
+HTMLEXPORT_DESC= export images collections into HTML page
+IMAGEVIEWER_DESC= OpenGL based image viewer
+JPEGLOSSLESS_DESC= batch processing without losing metainfo
+KAMERAKLIENT_DESC= GPhoto2 interface (import from cameras)
+METADATAEDIT_DESC= edit EXIF and IPTC pictures metadata
+MPEGENCODER_DESC= tool to build a video from images
+PICASAWEBEXPORT_DESC= export images to Picasa web service
+PRINTWIZARD_DESC= a print wizard
+RAWCONVERTER_DESC= convert RAW images from digital cameras
+SENDIMAGES_DESC= send images by email
+SIMPLEVIEWEREXPORT_DESC= export images to SimpleViewer
+SLIDESHOW_DESC= create a slideshow
+TIMEADJUST_DESC= adjust image file time and date
+WALLPAPER_DESC= set your image as wallpaper
+
+OPTIONS_DEFAULT= ACQUIREIMAGES BATCHPROCESSIMAGES CALENDAR CDARCHIVING FINDIMAGES \
+ FLICKREXPORT GALLERYEXPORT GPSSYNC HTMLEXPORT IMAGEVIEWER JPEGLOSSLESS \
+ KAMERAKLIENT METADATAEDIT MPEGENCODER PICASAWEBEXPORT PRINTWIZARD RAWCONVERTER \
+ SENDIMAGES SIMPLEVIEWEREXPORT SLIDESHOW TIMEADJUST WALLPAPER
PORTSCOUT= limit:^0\.1\.
@@ -53,9 +58,9 @@ USES= gettext
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-ipodexport
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_ACQUIREIMAGES)
+.if ${PORT_OPTIONS:MACQUIREIMAGES}
PLIST_SUB+= ACQUIREIMAGES:=""
LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
.else
@@ -63,7 +68,7 @@ PLIST_SUB+= ACQUIREIMAGES:="@comment "
CONFIGURE_ARGS+=--disable-acquireimages
.endif
-.if !defined(WITHOUT_BATCHPROCESSIMAGES)
+.if ${PORT_OPTIONS:MBATCHPROCESSIMAGES}
PLIST_SUB+= BATCHPROCESSIMAGES:=""
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
.else
@@ -71,7 +76,7 @@ PLIST_SUB+= BATCHPROCESSIMAGES:="@commen
CONFIGURE_ARGS+=--disable-batchprocessimages
.endif
-.if !defined(WITHOUT_CALENDAR)
+.if ${PORT_OPTIONS:MCALENDAR}
PLIST_SUB+= CALENDAR:=""
LIB_DEPENDS+= kcal.2:${PORTSDIR}/deskutils/kdepim3
.else
@@ -79,7 +84,7 @@ PLIST_SUB+= CALENDAR:="@comment "
CONFIGURE_ARGS+=--disable-calendar
.endif
-.if !defined(WITHOUT_CDARCHIVING)
+.if ${PORT_OPTIONS:MCDARCHIVING}
PLIST_SUB+= CDARCHIVING:=""
RUN_DEPENDS+= k3b:${PORTSDIR}/sysutils/k3b
.else
@@ -87,35 +92,35 @@ PLIST_SUB+= CDARCHIVING:="@comment "
CONFIGURE_ARGS+=--disable-cdarchiving
.endif
-.if !defined(WITHOUT_FINDIMAGES)
+.if ${PORT_OPTIONS:MFINDIMAGES}
PLIST_SUB+= FINDIMAGES:=""
.else
PLIST_SUB+= FINDIMAGES:="@comment "
CONFIGURE_ARGS+=--disable-findimages
.endif
-.if !defined(WITHOUT_FLICKREXPORT)
+.if ${PORT_OPTIONS:MFLICKREXPORT}
PLIST_SUB+= FLICKREXPORT:=""
.else
PLIST_SUB+= FLICKREXPORT:="@comment "
CONFIGURE_ARGS+=--disable-flickrexport
.endif
-.if !defined(WITHOUT_GALLERYEXPORT)
+.if ${PORT_OPTIONS:MGALLERYEXPORT}
PLIST_SUB+= GALLERYEXPORT:=""
.else
PLIST_SUB+= GALLERYEXPORT:="@comment "
CONFIGURE_ARGS+=--disable-galleryexport
.endif
-.if !defined(WITHOUT_GPSSYNC)
+.if ${PORT_OPTIONS:MGPSSYNC}
PLIST_SUB+= GPSSYNC:=""
.else
PLIST_SUB+= GPSSYNC:="@comment "
CONFIGURE_ARGS+=--disable-gpssync
.endif
-.if !defined(WITHOUT_HTMLEXPORT)
+.if ${PORT_OPTIONS:MHTMLEXPORT}
PLIST_SUB+= HTMLEXPORT:=""
LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
.else
@@ -123,14 +128,14 @@ PLIST_SUB+= HTMLEXPORT:="@comment "
CONFIGURE_ARGS+=--disable-htmlexport
.endif
-.if !defined(WITHOUT_IMAGEVIEWER)
+.if ${PORT_OPTIONS:MIMAGEVIEWER}
PLIST_SUB+= IMAGEVIEWER:=""
.else
PLIST_SUB+= IMAGEVIEWER:="@comment "
CONFIGURE_ARGS+=--disable-imageviewer
.endif
-.if !defined(WITHOUT_JPEGLOSSLESS)
+.if ${PORT_OPTIONS:MJPEGLOSSLESS}
PLIST_SUB+= JPEGLOSSLESS:=""
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
.else
@@ -138,7 +143,7 @@ PLIST_SUB+= JPEGLOSSLESS:="@comment "
CONFIGURE_ARGS+=--disable-jpeglossless
.endif
-.if !defined(WITHOUT_KAMERAKLIENT)
+.if ${PORT_OPTIONS:MKAMERAKLIENT}
PLIST_SUB+= KAMERAKLIENT:=""
LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2
.else
@@ -146,14 +151,14 @@ PLIST_SUB+= KAMERAKLIENT:="@comment "
CONFIGURE_ARGS+=--disable-kameraklient
.endif
-.if !defined(WITHOUT_METADATAEDIT)
+.if ${PORT_OPTIONS:MMETADATAEDIT}
PLIST_SUB+= METADATAEDIT:=""
.else
PLIST_SUB+= METADATAEDIT:="@comment "
CONFIGURE_ARGS+=--disable-metadataedit
.endif
-.if !defined(WITHOUT_MPEGENCODER)
+.if ${PORT_OPTIONS:MMPEGENCODER}
PLIST_SUB+= MPEGENCODER:=""
RUN_DEPENDS+= mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
convert:${PORTSDIR}/graphics/ImageMagick
@@ -163,21 +168,21 @@ PLIST_SUB+= MPEGENCODER:="@comment "
CONFIGURE_ARGS+=--disable-mpegencoder
.endif
-.if !defined(WITHOUT_PICASAWEBEXPORT)
+.if ${PORT_OPTIONS:MPICASAWEBEXPORT}
PLIST_SUB+= PICASAWEBEXPORT:=""
.else
PLIST_SUB+= PICASAWEBEXPORT:="@comment "
CONFIGURE_ARGS+=--disable-picasawebexport
.endif
-.if !defined(WITHOUT_PRINTWIZARD)
+.if ${PORT_OPTIONS:MPRINTWIZARD}
PLIST_SUB+= PRINTWIZARD:=""
.else
PLIST_SUB+= PRINTWIZARD:="@comment "
CONFIGURE_ARGS+=--disable-printwizard
.endif
-.if !defined(WITHOUT_RAWCONVERTER)
+.if ${PORT_OPTIONS:MRAWCONVERTER}
PLIST_SUB+= RAWCONVERTER:=""
LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
.else
@@ -185,35 +190,35 @@ PLIST_SUB+= RAWCONVERTER:="@comment "
CONFIGURE_ARGS+=--disable-rawconverter
.endif
-.if !defined(WITHOUT_SENDIMAGES)
+.if ${PORT_OPTIONS:MSENDIMAGES}
PLIST_SUB+= SENDIMAGES:=""
.else
PLIST_SUB+= SENDIMAGES:="@comment "
CONFIGURE_ARGS+=--disable-sendimages
.endif
-.if !defined(WITHOUT_SIMPLEVIEWEREXPORT)
+.if ${PORT_OPTIONS:MSIMPLEVIEWEREXPORT}
PLIST_SUB+= SIMPLEVIEWEREXPORT:=""
.else
PLIST_SUB+= SIMPLEVIEWEREXPORT:="@comment "
CONFIGURE_ARGS+=--disable-simpleviewerexport
.endif
-.if !defined(WITHOUT_SLIDESHOW)
+.if ${PORT_OPTIONS:MSLIDESHOW}
PLIST_SUB+= SLIDESHOW:=""
.else
PLIST_SUB+= SLIDESHOW:="@comment "
CONFIGURE_ARGS+=--disable-slideshow
.endif
-.if !defined(WITHOUT_TIMEADJUST)
+.if ${PORT_OPTIONS:MTIMEADJUST}
PLIST_SUB+= TIMEADJUST:=""
.else
PLIST_SUB+= TIMEADJUST:="@comment "
CONFIGURE_ARGS+=--disable-timeadjust
.endif
-.if !defined(WITHOUT_WALLPAPER)
+.if ${PORT_OPTIONS:MWALLPAPER}
PLIST_SUB+= WALLPAPER:=""
.else
PLIST_SUB+= WALLPAPER:="@comment "
@@ -225,4 +230,4 @@ post-patch::
${WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's at -lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/libgltext/Makefile
==============================================================================
--- head/graphics/libgltext/Makefile Thu May 23 02:27:22 2013 (r318828)
+++ head/graphics/libgltext/Makefile Thu May 23 02:35:26 2013 (r318829)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: libgltext
-# Date created: 2006-02-20
-# Whom: Jose Alonso Cardenas Marquez <acardenas at bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas at bsd.org.pe>
# $FreeBSD$
-#
PORTNAME= libgltext
PORTVERSION= 0.3.1
@@ -24,11 +20,12 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
-OPTIONS= EXAMPLES "Compile examples, need libglut" off
+OPTIONS_DEFINE= EXAMPLES
+EXAMPLES_DESC= Compile examples, need libglut
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_EXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
USE_GL= glut
FLAG_EXAMPLES= true
PLIST_SUB+= EXAMPLES=""
@@ -49,7 +46,7 @@ do-install:
${LN} -s ${PORTNAME}.so.0 ${PORTNAME}.so
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/doc/tutorial.txt ${DOCSDIR}
.endif
@@ -65,4 +62,4 @@ post-install:
@${ECHO_MSG} ""
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/ocaml-lablgl/Makefile
==============================================================================
--- head/graphics/ocaml-lablgl/Makefile Thu May 23 02:27:22 2013 (r318828)
+++ head/graphics/ocaml-lablgl/Makefile Thu May 23 02:35:26 2013 (r318829)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: lablgl
-# Date created: 13. January 2002
-# Whom: Ronald Kuehn <rk at ronald.org>
-#
+# Created by: Ronald Kuehn <rk at ronald.org>
# $FreeBSD$
-#
PORTNAME= lablgl
PORTVERSION= 20120306
@@ -27,7 +23,10 @@ USE_OCAML_WASH= yes
ALL_TARGET= all opt
MAKE_JOBS_UNSAFE= yes
-OPTIONS= THREADS "Use a threaded Tcl/Tk (must match lang/ocaml)" on
+OPTIONS_DEFINE= THREADS
+THREADS_DESC= Threaded Tcl/Tk (must match lang/ocaml)
+
+OPTIONS_DEFAULT= THREADS
PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
@@ -36,11 +35,11 @@ EXAMPLESDIR= ${PREFIX}/share/examples/oc
CONFLICTS= ocaml-notk-[0-9]* ocaml-nox11-[0-9]*
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
USE_TK= 84+
INVALID_TK_VER = 86
-.if defined(WITH_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
THR_CPP= ${PTHREAD_CFLAGS}
THR_LD = ${PTHREAD_LIBS}
.endif
@@ -88,9 +87,9 @@ post-install:
${EXAMPLESDIR}/lablglut '! -name Makefile')
@(cd ${WRKSRC}/Togl/examples && ${COPYTREE_SHARE} \* \
${EXAMPLESDIR}/togl '! -name Makefile')
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/opencv/Makefile
==============================================================================
--- head/graphics/opencv/Makefile Thu May 23 02:27:22 2013 (r318828)
+++ head/graphics/opencv/Makefile Thu May 23 02:35:26 2013 (r318829)
@@ -36,91 +36,86 @@ LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= *
-OPTIONS= EIGEN2 "Include Eigen 2 support" on \
- FFMPEG "Include FFmpeg support" off \
- GSTREAMER "Include Gstreamer support" off \
- GTK "Include GTK+ support" off \
- JASPER "Include JPEG 2000 support" on \
- JPEG "Include JPEG support" on \
- OPENEXR "Include OpenEXR support" off \
- PNG "Include PNG support" on \
- QT4 "Build with Qt backend support" off \
- TBB "Include TBB support" off \
- TIFF "Include TIFF support" on \
- V4L "Include Video4Linux support" on \
- XINE "Include XINE support" off
+OPTIONS_DEFINE= EIGEN2 FFMPEG GSTREAMER GTK JASPER JPEG OPENEXR PNG \
+ QT4 TBB TIFF V4L XINE EXAMPLES
+EIGEN2_DESC= Eigen 2 support
+GTK_DESC= GTK+ support
+OPENEXR_DESC= OpenEXR support
+TBB_DESC= TBB support
+
+OPTIONS_DEFAULT= EIGEN2 JASPER JPEG PNG TIFF V4L
.include <bsd.port.options.mk>
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
CMAKE_ARGS+= -DBUILD_EXAMPLES:BOOL=On -DINSTALL_C_EXAMPLES:BOOL=On
PORTEXAMPLES+= c cpp gpu
.endif
-.if !defined(WITHOUT_EIGEN2)
+.if ${PORT_OPTIONS:MEIGEN2}
BUILD_DEPENDS+= ${LOCALBASE}/include/eigen2/Eigen/Eigen:${PORTSDIR}/math/eigen2
CMAKE_ARGS+= -DWITH_EIGEN2:BOOL=On
.else
CMAKE_ARGS+= -DDWITH_EIGEN2:BOOL=Off
.endif
-.if defined(WITH_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
CMAKE_ARGS+= -DWITH_FFMPEG:BOOL=On
.else
CMAKE_ARGS+= -DWITH_FFMPEG:BOOL=Off
.endif
-.if defined(WITH_GSTREAMER)
+.if ${PORT_OPTIONS:MGSTREAMER}
USE_GSTREAMER= yes
CMAKE_ARGS+= -DWITH_GSTREAMER:BOOL=On
.else
CMAKE_ARGS+= -DWITH_GSTREAMER:BOOL=Off
.endif
-.if defined(WITH_GTK)
+.if ${PORT_OPTIONS:MGTK}
USE_GNOME= gtk20
CMAKE_ARGS+= -DWITH_GTK:BOOL=On
.else
CMAKE_ARGS+= -DWITH_GTK:BOOL=Off
.endif
-.if !defined(WITHOUT_JASPER)
+.if ${PORT_OPTIONS:MJASPER}
LIB_DEPENDS+= jasper.4:${PORTSDIR}/graphics/jasper
CMAKE_ARGS+= -DWITH_JASPER:BOOL=On
.else
CMAKE_ARGS+= -DWITH_JASPER:BOOL=Off
.endif
-.if !defined(WITHOUT_JPEG)
+.if ${PORT_OPTIONS:MJPEG}
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
CMAKE_ARGS+= -DWITH_JPEG:BOOL=On
.else
CMAKE_ARGS+= -DWITH_JPEG:BOOL=Off
.endif
-.if defined(WITH_OPENEXR)
+.if ${PORT_OPTIONS:MOPENEXR}
LIB_DEPENDS+= IlmImf:${PORTSDIR}/graphics/OpenEXR
CMAKE_ARGS+= -DWITH_OPENEXR:BOOL=On
.else
CMAKE_ARGS+= -DWITH_OPENEXR:BOOL=Off
.endif
-.if !defined(WITHOUT_PNG)
+.if ${PORT_OPTIONS:MPNG}
LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
CMAKE_ARGS+= -DWITH_PNG:BOOL=On
.else
CMAKE_ARGS+= -DWITH_PNG:BOOL=Off
.endif
-.if defined(WITH_QT4)
+.if ${PORT_OPTIONS:MQT4}
USE_QT4+= opengl moc_build qmake_build rcc_build uic_build qtestlib
CMAKE_ARGS+= -DWITH_QT:BOOL=On -DWITH_QT_OPENGL:BOOL=On
.else
CMAKE_ARGS+= -DWITH_QT:BOOL=Off
.endif
-.if defined(WITH_TBB)
+.if ${PORT_OPTIONS:MTBB}
LIB_DEPENDS+= tbb.4:${PORTSDIR}/devel/tbb
CMAKE_ARGS+= -DWITH_TBB:BOOL=On \
-DTBBLIB_FOUND:BOOL=1 -DTBB_FOUND:BOOL=On \
@@ -131,14 +126,14 @@ CMAKE_ARGS+= -DWITH_TBB:BOOL=On \
CMAKE_ARGS+= -DWITH_TBB:BOOL=Off
.endif
-.if !defined(WITHOUT_TIFF)
+.if ${PORT_OPTIONS:MTIFF}
LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
CMAKE_ARGS+= -DWITH_TIFF:BOOL=On
.else
CMAKE_ARGS+= -DWITH_TIFF:BOOL=Off
.endif
-.if !defined(WITHOUT_V4L)
+.if ${PORT_OPTIONS:MV4L}
LIB_DEPENDS+= v4l2.0:${PORTSDIR}/multimedia/libv4l
BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
CMAKE_ARGS+= -DWITH_V4L:BOOL=On \
@@ -147,7 +142,7 @@ CMAKE_ARGS+= -DWITH_V4L:BOOL=On \
CMAKE_ARGS+= -DWITH_V4L:BOOL=Off
.endif
-.if defined(WITH_XINE)
+.if ${PORT_OPTIONS:MXINE}
LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine
CMAKE_ARGS+= -DWITH_XINE:BOOL=On
.else
@@ -238,7 +233,7 @@ post-patch:
${WRKSRC}/OpenCVConfig.cmake.in > ${WRKSRC}/OpenCVConfig-core.cmake.in
@${LN} -sf OpenCVConfig-version.cmake.in ${WRKSRC}/OpenCVConfig-core-version.cmake.in
.endif
-.if defined(NOPORTDOCS) || defined(_BUILDING_OPENCV_CORE) || defined(_BUILDING_OPENCV_PYTHON)
+.if ! ${PORT_OPTIONS:MDOCS} || defined(_BUILDING_OPENCV_CORE) || defined(_BUILDING_OPENCV_PYTHON)
@${REINPLACE_CMD} -e '/add_subdirectory(doc)/ d' \
${WRKSRC}/CMakeLists.txt
.endif
Modified: head/graphics/osg-devel/Makefile
==============================================================================
--- head/graphics/osg-devel/Makefile Thu May 23 02:27:22 2013 (r318828)
+++ head/graphics/osg-devel/Makefile Thu May 23 02:35:26 2013 (r318829)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Open Scene Graph
-# Date created: 26 Apr 2001
-# Whom: Randall Hopper <aa8vb at nc.rr.com>
-#
+# Created by: Randall Hopper <aa8vb at nc.rr.com>
# $FreeBSD$
-#
PORTNAME= osg
PORTVERSION= 3.1.3
@@ -24,9 +20,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphic
CONFLICTS= osg-[0-9]*
USE_ZIP= yes
-USES= cmake
+USES= cmake pkgconfig
USE_GL= gl glu
-USE_GNOME= pkgconfig
USE_XORG= x11
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
@@ -38,21 +33,15 @@ PLIST_SUB= OSG_VERSION=${PORTVERSION} \
PORTSCOUT= limitw:1,odd
-OPTIONS= CURL "Support for cURL" off \
- FREETYPE "Support for FreeType" on \
- GDAL "Support for GDAL" off \
- GIF "Support for giflib" on \
- INVENTOR "Support for SGI OpenInventor" off \
- JASPER "Support for JPEG2000" off \
- XINE "Support for Xine" off \
- ITK "Support for InsightToolkit" off \
- VNC "Support for LibVNCServer" off \
- OPENEXR "Support for OpenEXR" off \
- FFMPEG "Support for FFmpeg" off \
- SVG "Support for SVG through librsvg2" off \
- PDF "Support for PDF through poppler" off \
- XRANDR "Use Xrandr" on \
- SDL "Use SDL (joystick support in present3d)" off
+OPTIONS_DEFINE= CURL FREETYPE GDAL GIF INVENTOR JASPER XINE ITK \
+ VNC OPENEXR FFMPEG SVG PDF XRANDR SDL
+GDAL_DESC= GDAL support
+INVENTOR_DESC= SGI OpenInventor support
+ITK_DESC= InsightToolkit support
+VNC_DESC= LibVNCServer support
+SDL_DESC= Use SDL (joystick support in present3d)
+
+OPTIONS_DEFAULT= FREETYPE GIF XRANDR
# broken (openvrml from ports is too old)
# OPENVRML "Support for OpenVRML" off
@@ -65,7 +54,7 @@ FORCE_IGNORE+= COLLADA Performer OurDCMT
FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight
# options that affect FIND_PACKAGE
-.if defined(WITH_CURL)
+.if ${PORT_OPTIONS:MCURL}
FORCE_REQUIRE+= CURL
LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
PLIST_SUB+= CURL=""
@@ -74,7 +63,7 @@ FORCE_IGNORE+= CURL
PLIST_SUB+= CURL="@comment "
.endif
-.if !defined(WITHOUT_FREETYPE)
+.if ${PORT_OPTIONS:MFREETYPE}
FORCE_REQUIRE+= FreeType
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
PLIST_SUB+= FREETYPE=""
@@ -83,7 +72,7 @@ FORCE_IGNORE+= FreeType
PLIST_SUB+= FREETYPE="@comment "
.endif
-.if defined(WITH_GDAL)
+.if ${PORT_OPTIONS:MGDAL}
FORCE_REQUIRE+= GDAL
LIB_DEPENDS+= gdal.17:${PORTSDIR}/graphics/gdal
PLIST_SUB+= GDAL=""
@@ -92,7 +81,7 @@ FORCE_IGNORE+= GDAL
PLIST_SUB+= GDAL="@comment "
.endif
-.if defined(WITH_GIF)
+.if ${PORT_OPTIONS:MGIF}
FORCE_REQUIRE+= GIFLIB
LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib
PLIST_SUB+= GIF=""
@@ -101,7 +90,7 @@ FORCE_IGNORE+= GIFLIB
PLIST_SUB+= GIF="@comment "
.endif
-.if defined(WITH_INVENTOR)
+.if ${PORT_OPTIONS:MINVENTOR}
FORCE_REQUIRE+= Inventor
BUILD_DEPENDS+= ${LOCALBASE}/lib/libInventor.so:${PORTSDIR}/graphics/inventor
RUN_DEPENDS+= ${LOCALBASE}/lib/libInventor.so:${PORTSDIR}/graphics/inventor
@@ -111,7 +100,7 @@ FORCE_IGNORE+= Inventor
PLIST_SUB+= INVENTOR="@comment "
.endif
-.if defined(WITH_JASPER)
+.if ${PORT_OPTIONS:MJASPER}
FORCE_REQUIRE+= Jasper
LIB_DEPENDS+= jasper.4:${PORTSDIR}/graphics/jasper
PLIST_SUB+= JASPER=""
@@ -120,7 +109,7 @@ FORCE_IGNORE+= Jasper
PLIST_SUB+= JASPER="@comment "
.endif
-#.if defined(WITH_OPENVRML)
+#.if ${PORT_OPTIONS:MOPENVRML}
#FORCE_REQUIRE+= OpenVRML
#LIB_DEPENDS+= openvrml.8:${PORTSDIR}/www/openvrml
#PLIST_SUB+= OPENVRML=""
@@ -129,7 +118,7 @@ FORCE_IGNORE+= OpenVRML
PLIST_SUB+= OPENVRML="@comment "
#.endif
-.if defined(WITH_XINE)
+.if ${PORT_OPTIONS:MXINE}
FORCE_REQUIRE+= Xine
LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine
PLIST_SUB+= XINE=""
@@ -138,7 +127,7 @@ FORCE_IGNORE+= Xine
PLIST_SUB+= XINE="@comment "
.endif
-.if defined(WITH_ITK)
+.if ${PORT_OPTIONS:MITK}
FORCE_REQUIRE+= ITK
BUILD_DEPENDS+= ${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
RUN_DEPENDS+= ${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
@@ -149,7 +138,7 @@ FORCE_IGNORE+= ITK
PLIST_SUB+= ITK="@comment "
.endif
-.if defined(WITH_VNC)
+.if ${PORT_OPTIONS:MVNC}
FORCE_REQUIRE+= LibVNCServer
LIB_DEPENDS+= vncserver.0:${PORTSDIR}/net/libvncserver
PLIST_SUB+= VNC=""
@@ -158,7 +147,7 @@ FORCE_IGNORE+= LibVNCServer
PLIST_SUB+= VNC="@comment "
.endif
-.if defined(WITH_OPENEXR)
+.if ${PORT_OPTIONS:MOPENEXR}
FORCE_REQUIRE+= OpenEXR
LIB_DEPENDS+= IlmImf.6:${PORTSDIR}/graphics/OpenEXR
PLIST_SUB+= OPENEXR=""
@@ -167,7 +156,7 @@ FORCE_IGNORE+= OpenEXR
PLIST_SUB+= OPENEXR="@comment "
.endif
-.if defined(WITH_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
FORCE_REQUIRE+= FFmpeg
LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+= FFMPEG=""
@@ -176,7 +165,7 @@ FORCE_IGNORE+= FFmpeg
PLIST_SUB+= FFMPEG="@comment "
.endif
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
FORCE_REQUIRE+= SDL
USE_SDL= sdl
.else
@@ -184,7 +173,7 @@ FORCE_IGNORE+= SDL
.endif
# options that affect PKG_CHECK_MODULES
-.if defined(WITH_SVG)
+.if ${PORT_OPTIONS:MSVG}
FORCE_REQUIRE+= RSVG
LIB_DEPENDS+= rsvg-2:${PORTSDIR}/graphics/librsvg2
PLIST_SUB+= SVG=""
@@ -193,7 +182,7 @@ FORCE_IGNORE+= RSVG
PLIST_SUB+= SVG="@comment "
.endif
-.if defined(WITH_PDF)
+.if ${PORT_OPTIONS:MPDF}
FORCE_REQUIRE+= Poppler-glib
LIB_DEPENDS+= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
PLIST_SUB+= PDF=""
@@ -202,23 +191,23 @@ FORCE_IGNORE+= Poppler-glib
PLIST_SUB+= PDF="@comment "
.endif
-.if defined(WITH_SVG) || defined(WITH_PDF)
+.if ${PORT_OPTIONS:MSVG} || ${PORT_OPTIONS:MPDF}
LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
.endif
# other options
-.if defined(WITHOUT_XRANDR)
-CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
-.else
+.if ${PORT_OPTIONS:MXRANDR}
CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=ON
USE_XORG+= xrandr
+.else
+CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
.endif
-.if defined(WITHOUT_XRANDR)
-CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
-.else
+.if ${PORT_OPTIONS:MXRANDR}
CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=ON
USE_XORG+= xrandr
+.else
+CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
.endif
post-patch:
Modified: head/graphics/osg/Makefile
==============================================================================
--- head/graphics/osg/Makefile Thu May 23 02:27:22 2013 (r318828)
+++ head/graphics/osg/Makefile Thu May 23 02:35:26 2013 (r318829)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Open Scene Graph
-# Date created: 26 Apr 2001
-# Whom: Randall Hopper <aa8vb at nc.rr.com>
-#
+# Created by: Randall Hopper <aa8vb at nc.rr.com>
# $FreeBSD$
-#
PORTNAME= osg
PORTVERSION= 3.0.1
@@ -24,9 +20,8 @@ CONFLICTS= osg-devel-[0-9]*
USE_GCC= any
USE_ZIP= yes
-USES= cmake
+USES= cmake pkgconfig
USE_GL= gl glu
-USE_GNOME= pkgconfig
USE_XORG= x11
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
@@ -39,21 +34,15 @@ PLIST_SUB= OSG_VERSION=${PORTVERSION} \
PORTSCOUT= limitw:1,even
-OPTIONS= CURL "Support for cURL" off \
- FREETYPE "Support for FreeType" on \
- GDAL "Support for GDAL" off \
- GIF "Support for giflib" on \
- INVENTOR "Support for SGI OpenInventor" off \
- JASPER "Support for JPEG2000" off \
- XINE "Support for Xine" off \
- ITK "Support for InsightToolkit" off \
- VNC "Support for LibVNCServer" off \
- OPENEXR "Support for OpenEXR" off \
- FFMPEG "Support for FFmpeg" off \
- SVG "Support for SVG through librsvg2" off \
- PDF "Support for PDF through poppler" off \
- XRANDR "Use Xrandr" on \
- SDL "Use SDL (joystick support in present3d)" off
+OPTIONS_DEFINE= CURL FREETYPE GDAL GIF INVENTOR JASPER XINE ITK \
+ VNC OPENEXR FFMPEG SVG PDF XRANDR SDL
+GDAL_DESC= GDAL support
+INVENTOR_DESC= SGI OpenInventor support
+ITK_DESC= InsightToolkit support
+VNC_DESC= LibVNCServer support
+SDL_DESC= Use SDL (joystick support in present3d)
+
+OPTIONS_DEFAULT= FREETYPE GIF XRANDR
# broken (openvrml from ports is too old)
# OPENVRML "Support for OpenVRML" off
@@ -66,7 +55,7 @@ FORCE_IGNORE+= COLLADA Performer OurDCMT
FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight
# options that affect FIND_PACKAGE
-.if defined(WITH_CURL)
+.if ${PORT_OPTIONS:MCURL}
FORCE_REQUIRE+= CURL
LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
PLIST_SUB+= CURL=""
@@ -75,7 +64,7 @@ FORCE_IGNORE+= CURL
PLIST_SUB+= CURL="@comment "
.endif
-.if !defined(WITHOUT_FREETYPE)
+.if ${PORT_OPTIONS:MFREETYPE}
FORCE_REQUIRE+= FreeType
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
PLIST_SUB+= FREETYPE=""
@@ -84,7 +73,7 @@ FORCE_IGNORE+= FreeType
PLIST_SUB+= FREETYPE="@comment "
.endif
-.if defined(WITH_GDAL)
+.if ${PORT_OPTIONS:MGDAL}
FORCE_REQUIRE+= GDAL
LIB_DEPENDS+= gdal.17:${PORTSDIR}/graphics/gdal
PLIST_SUB+= GDAL=""
@@ -93,7 +82,7 @@ FORCE_IGNORE+= GDAL
PLIST_SUB+= GDAL="@comment "
.endif
-.if defined(WITH_GIF)
+.if ${PORT_OPTIONS:MGIF}
FORCE_REQUIRE+= GIFLIB
LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib
PLIST_SUB+= GIF=""
@@ -102,7 +91,7 @@ FORCE_IGNORE+= GIFLIB
PLIST_SUB+= GIF="@comment "
.endif
-.if defined(WITH_INVENTOR)
+.if ${PORT_OPTIONS:MINVENTOR}
FORCE_REQUIRE+= Inventor
BUILD_DEPENDS+= ${LOCALBASE}/lib/libInventor.so:${PORTSDIR}/graphics/inventor
RUN_DEPENDS+= ${LOCALBASE}/lib/libInventor.so:${PORTSDIR}/graphics/inventor
@@ -112,7 +101,7 @@ FORCE_IGNORE+= Inventor
PLIST_SUB+= INVENTOR="@comment "
.endif
-.if defined(WITH_JASPER)
+.if ${PORT_OPTIONS:MJASPER}
FORCE_REQUIRE+= Jasper
LIB_DEPENDS+= jasper.4:${PORTSDIR}/graphics/jasper
PLIST_SUB+= JASPER=""
@@ -121,7 +110,7 @@ FORCE_IGNORE+= Jasper
PLIST_SUB+= JASPER="@comment "
.endif
-#.if defined(WITH_OPENVRML)
+#.if ${PORT_OPTIONS:MOPENVRML}
#FORCE_REQUIRE+= OpenVRML
#LIB_DEPENDS+= openvrml.8:${PORTSDIR}/www/openvrml
#PLIST_SUB+= OPENVRML=""
@@ -130,7 +119,7 @@ FORCE_IGNORE+= OpenVRML
PLIST_SUB+= OPENVRML="@comment "
#.endif
-.if defined(WITH_XINE)
+.if ${PORT_OPTIONS:MXINE}
FORCE_REQUIRE+= Xine
LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine
PLIST_SUB+= XINE=""
@@ -139,7 +128,7 @@ FORCE_IGNORE+= Xine
PLIST_SUB+= XINE="@comment "
.endif
-.if defined(WITH_ITK)
+.if ${PORT_OPTIONS:MITK}
FORCE_REQUIRE+= ITK
BUILD_DEPENDS+= ${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
RUN_DEPENDS+= ${LOCALBASE}/lib/InsightToolkit/UseITK.cmake:${PORTSDIR}/science/InsightToolkit
@@ -150,7 +139,7 @@ FORCE_IGNORE+= ITK
PLIST_SUB+= ITK="@comment "
.endif
-.if defined(WITH_VNC)
+.if ${PORT_OPTIONS:MVNC}
FORCE_REQUIRE+= LibVNCServer
LIB_DEPENDS+= vncserver.0:${PORTSDIR}/net/libvncserver
PLIST_SUB+= VNC=""
@@ -159,7 +148,7 @@ FORCE_IGNORE+= LibVNCServer
PLIST_SUB+= VNC="@comment "
.endif
-.if defined(WITH_OPENEXR)
+.if ${PORT_OPTIONS:MOPENEXR}
FORCE_REQUIRE+= OpenEXR
LIB_DEPENDS+= IlmImf.6:${PORTSDIR}/graphics/OpenEXR
PLIST_SUB+= OPENEXR=""
@@ -168,7 +157,7 @@ FORCE_IGNORE+= OpenEXR
PLIST_SUB+= OPENEXR="@comment "
.endif
-.if defined(WITH_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
FORCE_REQUIRE+= FFmpeg
LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+= FFMPEG=""
@@ -177,7 +166,7 @@ FORCE_IGNORE+= FFmpeg
PLIST_SUB+= FFMPEG="@comment "
.endif
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
FORCE_REQUIRE+= SDL
USE_SDL= sdl
.else
@@ -185,7 +174,7 @@ FORCE_IGNORE+= SDL
.endif
# options that affect PKG_CHECK_MODULES
-.if defined(WITH_SVG)
+.if ${PORT_OPTIONS:MSVG}
FORCE_REQUIRE+= RSVG
LIB_DEPENDS+= rsvg-2:${PORTSDIR}/graphics/librsvg2
PLIST_SUB+= SVG=""
@@ -194,7 +183,7 @@ FORCE_IGNORE+= RSVG
PLIST_SUB+= SVG="@comment "
.endif
-.if defined(WITH_PDF)
+.if ${PORT_OPTIONS:MPDF}
FORCE_REQUIRE+= Poppler-glib
LIB_DEPENDS+= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
PLIST_SUB+= PDF=""
@@ -203,23 +192,23 @@ FORCE_IGNORE+= Poppler-glib
PLIST_SUB+= PDF="@comment "
.endif
-.if defined(WITH_SVG) || defined(WITH_PDF)
+.if ${PORT_OPTIONS:MSVG} || ${PORT_OPTIONS:MPDF}
LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
.endif
# other options
-.if defined(WITHOUT_XRANDR)
-CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
-.else
+.if ${PORT_OPTIONS:MXRANDR}
CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=ON
USE_XORG+= xrandr
+.else
+CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
.endif
-.if defined(WITHOUT_XRANDR)
-CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
-.else
+.if ${PORT_OPTIONS:MXRANDR}
CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=ON
USE_XORG+= xrandr
+.else
+CMAKE_ARGS+= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
.endif
post-patch:
Modified: head/graphics/panoglview/Makefile
==============================================================================
--- head/graphics/panoglview/Makefile Thu May 23 02:27:22 2013 (r318828)
+++ head/graphics/panoglview/Makefile Thu May 23 02:35:26 2013 (r318829)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: panoglview
-# Date created: Sat Apr 28 07:59:00 UTC 2007
-# Whom: argv[0] (Iouri V. Ivliev)
-#
+# Created by: argv[0] (Iouri V. Ivliev)
# $FreeBSD$
-#
PORTNAME= panoglview
PORTVERSION= 0.2.2
@@ -28,15 +24,16 @@ WX_CONF_ARGS= relative
PLIST_FILES= bin/panoglview
-OPTIONS= UNICODE "Use UNICODE version of the wxgtk" on
+OPTIONS_DEFINE= UNICODE
+OPTIONS_DEFAULT= UNICODE
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${ARCH} == "powerpc"
BROKEN= Does not configure on powerpc
.endif
-.if defined(WITH_UNICODE)
+.if ${PORT_OPTIONS:MUNICODE}
WX_UNICODE= yes
CONFIGURE_ARGS+= --with-unicode
.else
@@ -44,4 +41,4 @@ CONFIGURE_ARGS+= --with-unicode
CONFIGURE_ARGS+= --without-unicode
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/pfstools/Makefile
==============================================================================
--- head/graphics/pfstools/Makefile Thu May 23 02:27:22 2013 (r318828)
+++ head/graphics/pfstools/Makefile Thu May 23 02:35:26 2013 (r318829)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pfstools
-# Date created: 25 September 2007
-# Whom: Daniel O'Connor <darius at dons.net.au>
-#
+# Created by: Daniel O'Connor <darius at dons.net.au>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list