aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/eboard/Makefile11
-rw-r--r--games/freeciv/Makefile36
-rw-r--r--games/ldmud/Makefile4
-rw-r--r--lang/cduce/Makefile32
-rw-r--r--lang/pike76/Makefile110
-rw-r--r--lang/pike78/Makefile7
-rw-r--r--lang/smalltalk/Makefile49
-rw-r--r--math/coq/Makefile34
-rw-r--r--security/xmlsec1/Makefile21
9 files changed, 158 insertions, 146 deletions
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index 287d88227ede..4cd2b89c08f4 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -39,7 +39,8 @@ INSTALL_TARGET= install install-man
MAN1= eboard-config.1 eboard-addtheme.1
MAN6= eboard.6
-OPTIONS= JOYSTICK "joystick support" off
+OPTIONS_DEFINE= JOYSTICK
+JOYSTICK_DESC= Enable joystick support
DESKTOP_ENTRIES="eboard" \
"Play chess" \
@@ -48,9 +49,9 @@ DESKTOP_ENTRIES="eboard" \
"Application;Game;" \
true
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_JOYSTICK)
+.if ${PORT_OPTIONS:MJOYSTICK}
BUILD_DEPENDS+= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
RUN_DEPENDS+= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
.endif
@@ -65,7 +66,7 @@ post-patch:
@${REINPLACE_CMD} -e 's,g++,${CXX},' -e 's,-O6,${CXXFLAGS},' \
${WRKSRC}/configure
-.if !defined(WITH_JOYSTICK)
+.if empty(PORT_OPTIONS:MJOYSTICK)
post-configure:
@${REINPLACE_CMD} -e '/^#define HAVE_LINUX_JOYSTICK_H 1/ d' \
${WRKSRC}/config.h
@@ -89,4 +90,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/icon-eboard.xpm ${PREFIX}/share/pixmaps/eboard.xpm
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index a79edb25293d..3191bc0ab017 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -29,13 +29,22 @@ MAN6= freeciv-server.6 freeciv-client.6 \
freeciv-xaw.6 freeciv-sdl.6 freeciv-gtk2.6 \
freeciv-modpack.6
-.ifndef WITHOUT_X11
-LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
+OPTIONS_DEFINE?= X11 SDL MYSQL IPV6
+OPTIONS_DEFAULT?= X11 MYSQL IPV6
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSDL} && empty(PORT_OPTIONS:MX11)
+IGNORE= cannot use SDL without X11: re-run make config
+.endif
+
+.if ${PORT_OPTIONS:MX11}
+LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff \
png15:${PORTSDIR}/graphics/png \
- ggz.5:${PORTSDIR}/games/libggz \
- ggz-gtk.1:${PORTSDIR}/games/ggz-gtk-client \
- ggzcore.9:${PORTSDIR}/games/ggz-client-libs \
- ggzmod.5:${PORTSDIR}/games/ggz-client-libs
+ ggz:${PORTSDIR}/games/libggz \
+ ggz-gtk:${PORTSDIR}/games/ggz-gtk-client \
+ ggzcore:${PORTSDIR}/games/ggz-client-libs \
+ ggzmod:${PORTSDIR}/games/ggz-client-libs
USE_XORG= xpm
USE_SDL= mixer
USE_GNOME= gtk20
@@ -49,7 +58,7 @@ CONFLICTS= freeciv-[0-9]*
PLIST_SUB+= X11="@comment " GTK="@comment "
.endif
-.ifdef WITH_SDL
+.if ${PORT_OPTIONS:MSDL}
CONFIGURE_ARGS+=--enable-client=gtk,sdl
USE_SDL= sdl image ttf
PLIST_SUB+= SDL=""
@@ -57,20 +66,21 @@ PLIST_SUB+= SDL=""
PLIST_SUB+= SDL="@comment "
.endif
-.ifndef WITHOUT_MYSQL
+.if ${PORT_OPTIONS:MMYSQL}
CONFIGURE_ARGS+=--enable-auth --with-mysql-prefix=${LOCALBASE}
USE_MYSQL= yes
.endif
-.ifdef WITHOUT_IPV6
+.if empty(PORT_OPTIONS:MIPV6)
CONFIGURE_ARGS+=--disable-ipv6
.endif
-.ifdef WITHOUT_NLS
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
-.else
-PLIST_SUB+= NLS=""
.endif
post-patch:
@@ -79,7 +89,7 @@ post-patch:
@${FIND} ${WRKSRC} -name Makefile.in|${XARGS} ${REINPLACE_CMD} -e\
'/pkgdatadir/s|$$[(]datadir[)]/@PACKAGE@|${DATADIR}|'
-.ifndef WITHOUT_X11
+.if ${PORT_OPTIONS:MX11}
post-install:
@${INSTALL_DATA} ${WRKSRC}/data/civclient.dsc ${DATADIR}/
@cd ${PREFIX}/bin && ${LN} -s freeciv-gtk2 freeciv-client
diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile
index f10e49594e98..d3bad27a09e0 100644
--- a/games/ldmud/Makefile
+++ b/games/ldmud/Makefile
@@ -82,14 +82,14 @@ post-install:
# # Install mudlib and other directories
@${MKDIR} ${DATADIR} /var/log/${PORTNAME} /var/run/${PORTNAME}
@${CHOWN} ${USERS}:${GROUPS} /var/log/${PORTNAME} /var/run/${PORTNAME}
-.ifdef WITH_LPMUD
+.if ${PORT_OPTIONS:MLPMUD}
@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mud/lp-245 && ${FIND} . \
| ${CPIO} -pdmu -R ${USERS}:${GROUPS} ${DATADIR}
.else
@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mudlib && ${FIND} . \
| ${CPIO} -pdmu -R ${USERS}:${GROUPS} ${DATADIR}
.endif
-.ifndef NOPORTDOCS
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc && ${FIND} . \
| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
diff --git a/lang/cduce/Makefile b/lang/cduce/Makefile
index 29737da87345..3db2b70d84e2 100644
--- a/lang/cduce/Makefile
+++ b/lang/cduce/Makefile
@@ -22,9 +22,11 @@ USE_OCAML= true
USE_OCAML_FINDLIB= true
USE_OCAML_LDCONFIG= true
-OPTIONS= OCURL "Enable url support via ftp/ocaml-ocurl" Off \
- OCAML_EXPAT "Enable support for the Expat XML parser" Off \
- MLIFACE "Enable building OCaml/CDuce interface" On
+OPTIONS_DEFINE= OCURL OCAML_EXPAT MLIFACE
+OPTIONS_DEFAULT=MLIFACE
+OCURL_DESC= Enable url support via ftp/ocaml-ocurl
+OCAML_EXPAT_DESC= Enable support for the Expat XML parser
+MLIFACE_DESC= Enable building OCaml/CDuce interface
USE_GMAKE= yes
ALL_TARGET= all
@@ -37,15 +39,17 @@ MAN1= cduce.1 cduce_mktop.1 dtd2cduce.1
PLIST_FILES= bin/cduce
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
# Support for url via ftp/ocaml-ocurl
-.if defined(WITH_OCURL)
+.if ${PORT_OPTIONS:MOCURL}
BUILD_DEPENDS+= ${SITELIBDIR}/curl/curl.cmi:${PORTSDIR}/ftp/ocaml-ocurl
+.else
+CONFIGURE_ARGS+= --without-curl
.endif
# Support for the PXP XML parser
-.if defined(WITH_OCAML_EXPAT)
+.if ${PORT_OPTIONS:MOCAML_EXPAT}
CONFIGURE_ARGS+= --with-expat --without-pxp
BUILD_DEPENDS+= ${SITELIBDIR}/expat/expat.cmi:${PORTSDIR}/textproc/ocaml-expat
.else
@@ -53,20 +57,14 @@ CONFIGURE_ARGS+= --without-expat --with-pxp
BUILD_DEPENDS+= ${SITELIBDIR}/pxp-engine/pxp_engine.cma:${PORTSDIR}/textproc/ocaml-pxp
.endif
-# Be sure to not build ocurl support if WITH_OCURL is not defined,
-# even if ocurl is present.
-.if !defined(WITH_OCURL)
-CONFIGURE_ARGS+= --without-curl
-.endif
-
# Support for OCaml/CDuce interface
-.if !defined(WITHOUT_MLIFACE)
+.if ${PORT_OPTIONS:MMLIFACE}
PLIST_FILES+= bin/cduce_mktop
BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/lang/ocaml:patch
CONFIGURE_ARGS+= --mliface=`cd ${PORTSDIR}/lang/ocaml; ${MAKE} -V WRKSRC`
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
ALL_TARGET+= doc
INSTALL_TARGET+= install_doc
PORTDOCS= *
@@ -77,16 +75,16 @@ post-patch:
${WRKSRC}/Makefile ${WRKSRC}/configure.ml
post-install:
-.if defined(WITH_OCAML_EXPAT)
+.if ${PORT_OPTIONS:MOCAML_EXPAT}
@${ECHO_CMD} "****************************************************************"
@${ECHO_CMD} "* You choose Expat as XML parser, you may encounter some error *"
@${ECHO_CMD} "* when loading XML files with external DTD. *"
@${ECHO_CMD} "****************************************************************"
.endif
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
. for i in ${MAN1}
${INSTALL_MAN} ${WRKSRC}/doc/${i} ${MANPREFIX}/man/man${i:E}/
. endfor
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile
index 6158dde43e88..3af7974cf221 100644
--- a/lang/pike76/Makefile
+++ b/lang/pike76/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pike76
PORTVERSION= 7.6.112
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= lang
MASTER_SITES= ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
http://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
@@ -20,29 +20,34 @@ DISTNAME= Pike-v${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
COMMENT= A dynamic programming language with a syntax similar to C++
-LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
- tiff.4:${PORTSDIR}/graphics/tiff \
- gdbm.4:${PORTSDIR}/databases/gdbm \
- pcre.1:${PORTSDIR}/devel/pcre \
- mird.1:${PORTSDIR}/databases/mird \
- gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
+ tiff:${PORTSDIR}/graphics/tiff \
+ gdbm:${PORTSDIR}/databases/gdbm \
+ pcre:${PORTSDIR}/devel/pcre \
+ mird:${PORTSDIR}/databases/mird \
+ gmp:${PORTSDIR}/math/gmp
CONFLICTS= pike7[28]-[0-9]*
CONFLICTS_BUILD=nettle-[2-9]*
-OPTIONS= TTF "Add FreeType 1 support" on \
- FREETYPE "Add FreeType 2 support" on \
- OPT_CFLAGS "Enable additional compiliation optimizations" on \
- MYSQL "Add MySQL support" on \
- FFMPEG "Add FFmpeg support" off \
- POSTGRESQL "Add Postgres SQL support" off \
- UNIXODBC "Add UnixODBC support (incompatible with IODBC)" off \
- IODBC "Add iODBC support (incompatible with UnixODBC)" off \
- SANE "Add SANE support" off \
- PDF "Add PDF support" off \
- SVG2 "Add SVG2 support" off \
- TDS "Add FreeTDS (Sybase and MSSQL) support" off \
- FFTW "Add libFFTW support" off
+OPTIONS_DEFINE= TTF FREETYPE OPT_CFLAGS MYSQL FFMPEG PGSQL \
+ SANE PDF SVG2 TDS FFTW
+OPTIONS_DEFAULT=TTF FREETYPE OPT_CFLAGS MYSQL NOODBC
+OPTIONS_SINGLE= ODBC
+OPTIONS_SINGLE_ODBC= NOODBC UNIXODBC IODBC
+
+TTF_DESC?= Add FreeType 1 support
+FREETYPE_DESC?= Add FreeType 2 support
+OPT_CFLAGS_DESC?= Enable additional compiliation optimizations
+FFMPEG_DESC?= Add FFmpeg support
+NOODBC_DESC?= No ODBC support (default)
+UNIXODBC_DESC?= Add UnixODBC support
+IODBC_DESC?= Add iODBC support
+SANE_DESC?= Add SANE support
+PDF_DESC?= Add PDF support
+SVG2_DESC?= Add SVG2 support
+TDS_DESC?= Add FreeTDS (Sybase and MSSQL) support
+FFTW_DESC?= Add libFFTW support
MAN1= pike.1
@@ -76,6 +81,7 @@ CONFIGURE_ARGS+= --without-debug \
--without-glade \
--without-libglade-config \
--without-machine-code \
+ --with-relocatable-dumped-modules \
--prefix=${PREFIX}
MAKE_ARGS= CONFIGUREARGS="${CONFIGURE_ARGS}"
@@ -98,13 +104,7 @@ ONLY_FOR_ARCHS= i386 amd64
BROKEN= segfaults during build
.endif
-.if defined(WITHOUT_RELOCATABLE_DUMPED_MODULES)
-CONFIGURE_ARGS+= --without-relocatable-dumped-modules
-.else
-CONFIGURE_ARGS+= --with-relocatable-dumped-modules
-.endif
-
-.if defined(WITH_EXPERIMENTAL_FEATURES)
+.if ${PORT_OPTIONS:MEXPERIMENTAL_FEATURES}
CONFIGURE_ARGS+= --with-computed-goto \
--with-pg \
--with-long-long-int \
@@ -115,7 +115,7 @@ CONFIGURE_ARGS+= --with-computed-goto \
--with-new-multisets
.endif
-.if defined(WITH_OPT_CFLAGS)
+.if ${PORT_OPTIONS:MOPT_CFLAGS}
.if (${MACHINE} == "i386")
CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
.else
@@ -123,90 +123,90 @@ CFLAGS+= -ffast-math -fomit-frame-pointer
.endif
.endif
-.if defined(WITH_FFMPEG)
-LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+.if ${PORT_OPTIONS:MFFMPEG}
+LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg
CONFIGURE_ARGS+= --with-ffmpeg
.else
CONFIGURE_ARGS+= --without-ffmpeg
.endif
-.if defined(WITH_FFTW)
-LIB_DEPENDS+= fftw.2:${PORTSDIR}/math/fftw
+.if ${PORT_OPTIONS:MFFTW}
+LIB_DEPENDS+= fftw:${PORTSDIR}/math/fftw
.endif
-.if defined(WITH_TTF)
-LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype
+.if ${PORT_OPTIONS:MTTF}
+LIB_DEPENDS+= ttf:${PORTSDIR}/print/freetype
CONFIGURE_ARGS+= --with-ttflib
.else
CONFIGURE_ARGS+= --without-ttflib
.endif
-.if defined(WITH_FREETYPE)
-LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
+.if ${PORT_OPTIONS:MFREETYPE}
+LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2
CONFIGURE_ARGS+= --with-freetype
.else
CONFIGURE_ARGS+= --without-freetype
.endif
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql=${PREFIX}
.else
CONFIGURE_ARGS+= --without-mysql
.endif
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
CONFIGURE_ARGS+= --with-pgsql=${PREFIX}
.else
CONFIGURE_ARGS+= --without-pgsql
.endif
-.if defined(WITH_MSQL)
+.if ${PORT_OPTIONS:MMSQL}
BUILD_DEPENDS+= msql:${PORTSDIR}/databases/msql
CONFIGURE_ARGS+= --with-msql=${PREFIX}
.else
CONFIGURE_ARGS+= --without-msql
.endif
-.if defined(WITH_UNIXODBC)
-LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC
+.if ${PORT_OPTIONS:MUNIXODBC}
+LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC
CONFIGURE_ARGS+= --with-odbc
.endif
-.if defined(WITH_IODBC)
-LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
+.if ${PORT_OPTIONS:MIODBC}
+LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc
CONFIGURE_ARGS+= --with-odbc
.endif
-.if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC)
+.if ${PORT_OPTIONS:MNOODBC}
CONFIGURE_ARGS+= --without-odbc
.endif
-.if defined(WITH_SANE)
-LIB_DEPENDS+= sane.1:${PORTSDIR}/graphics/sane-backends
+.if ${PORT_OPTIONS:MSANE}
+LIB_DEPENDS+= sane:${PORTSDIR}/graphics/sane-backends
CONFIGURE_ARGS+= --with-sane
.else
CONFIGURE_ARGS+= --without-sane
.endif
-.if defined(WITH_PDF)
-LIB_DEPENDS+= pdf.6:${PORTSDIR}/print/pdflib \
- panda.0:${PORTSDIR}/print/panda
+.if ${PORT_OPTIONS:MPDF}
+LIB_DEPENDS+= pdf:${PORTSDIR}/print/pdflib \
+ panda:${PORTSDIR}/print/panda
CONFIGURE_ARGS+= --with-libpdf --with-libpanda
.else
CONFIGURE_ARGS+= --without-libpdf --without-libpanda
.endif
-.if defined(WITH_SVG2)
-LIB_DEPENDS+= rsvg-2.10:${PORTSDIR}/graphics/librsvg2
+.if ${PORT_OPTIONS:MSVG2}
+LIB_DEPENDS+= rsvg-2:${PORTSDIR}/graphics/librsvg2
CONFIGURE_ARGS+= --with-svg
.else
CONFIGURE_ARGS+= --without-svg
.endif
-.if defined(WITH_TDS)
-LIB_DEPENDS+= ct.4:${PORTSDIR}/databases/freetds
+.if ${PORT_OPTIONS:MTDS}
+LIB_DEPENDS+= ct:${PORTSDIR}/databases/freetds
CONFIGURE_ARGS+= --with-sybase
PLIST_SUB+= SYBASE:=""
.else
@@ -214,9 +214,9 @@ CONFIGURE_ARGS+= --without-sybase
PLIST_SUB+= SYBASE:="@comment "
.endif
-.if defined(HAVE_MESA) || defined(WITH_MESA)
+.if ${PORT_OPTIONS:MMESA}
USE_GL= yes
-LIB_DEPENDS+= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
+LIB_DEPENDS+= gtkgl:${PORTSDIR}/x11-toolkits/gtkglarea
CONFIGURE_ARGS+= --with-GL --with-GLUT
.else
CONFIGURE_ARGS+= --without-GL --without-GLUT
diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile
index 2a63abe9e578..9a8dfb05b12f 100644
--- a/lang/pike78/Makefile
+++ b/lang/pike78/Makefile
@@ -56,6 +56,7 @@ CONFIGURE_ARGS+= --without-debug \
--with-jpeg \
--with-tiff \
--with-gdbm \
+ --with-relocatable-dumped-modules \
--without-GL --without-GLUT \
--without-GTK \
--without-ffmpeg \
@@ -95,12 +96,6 @@ ONLY_FOR_ARCHS= i386 amd64
BROKEN= Does not build on FreeBSD < 8.x
.endif
-.ifdef(WITHOUT_RELOCATABLE_DUMPED_MODULES)
-CONFIGURE_ARGS+= --without-relocatable-dumped-modules
-.else
-CONFIGURE_ARGS+= --with-relocatable-dumped-modules
-.endif
-
.if ${PORT_OPTIONS:MTTF}
LIB_DEPENDS+= ttf:${PORTSDIR}/print/freetype
CONFIGURE_ARGS+= --with-ttflib
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index d6ceca50a8e3..26dc53837acb 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -17,13 +17,12 @@ COMMENT= GNU Smalltalk
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
gawk:${PORTSDIR}/lang/gawk
-LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm \
- execinfo.1:${PORTSDIR}/devel/libexecinfo \
- cairo.2:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm \
+ execinfo:${PORTSDIR}/devel/libexecinfo \
+ cairo:${PORTSDIR}/graphics/cairo
-OPTIONS= TCLTK "Enable Tcl/Tk binding" on \
- PGSQL "PostgreSQL binding" on \
- SDL "SDL binding" on
+OPTIONS_DEFINE= TCL PGSQL SDL
+OPTIONS_DEFAULT=TCL PGSQL SDL
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pkgconfig pango
@@ -53,35 +52,37 @@ INFO= gst gst-base gst-libs
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN= Fails to install on sparc64
-.endif
+.include <bsd.port.options.mk>
-.if defined(WITHOUT_TCLTK)
-CONFIGURE_ARGS+= --with-tcl=no
-PLIST_SUB+= TCLTK="@comment "
-.else
-LIB_DEPENDS+= tk84.1:${PORTSDIR}/x11-toolkits/tk84
+.if ${PORT_OPTIONS:MTCL}
+LIB_DEPENDS+= tk84:${PORTSDIR}/x11-toolkits/tk84
CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl8.4 \
--with-tk=${LOCALBASE}/lib/tk8.4
-PLIST_SUB+= TCLTK=""
+PLIST_SUB+= TCLTK=""
+.else
+CONFIGURE_ARGS+= --with-tcl=no
+PLIST_SUB+= TCLTK="@comment "
.endif
-.if defined(WITHOUT_PGSQL)
-PLIST_SUB+= PGSQL="@comment "
-.else
+.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
-.include "${PORTSDIR}/Mk/bsd.database.mk"
+. include "${PORTSDIR}/Mk/bsd.database.mk"
PLIST_SUB+= PGSQL=""
+.else
+PLIST_SUB+= PGSQL="@comment "
.endif
-.if defined(WITHOUT_SDL)
-PLIST_SUB+= SDL="@comment "
-.else
+.if ${PORT_OPTIONS:MSDL}
USE_SDL= image mixer sdl sound ttf
PLIST_SUB+= SDL=""
+.else
+PLIST_SUB+= SDL="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "sparc64"
+BROKEN= Fails to install on sparc64
.endif
post-patch:
diff --git a/math/coq/Makefile b/math/coq/Makefile
index 03ce68ca9707..e2e2dd04896c 100644
--- a/math/coq/Makefile
+++ b/math/coq/Makefile
@@ -23,38 +23,44 @@ COQVERSION= ${PORTVERSION:R}pl${PORTVERSION:E}
USE_OCAML= yes
USE_GMAKE= yes
ALL_TARGET= world
-WITH_IDE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix ${PREFIX}
CONFIGURE_ARGS+=--emacslib ${PREFIX}/share/emacs/site-lisp
CONFIGURE_ARGS+=--opt
-.ifdef NOPORTDOCS
-CONFIGURE_ARGS+=--with-doc none
-.else
-BUILD_DEPENDS+= hevea:${PORTSDIR}/textproc/hevea \
- latex:${PORTSDIR}/print/teTeX \
- ${LOCALBASE}/share/texmf/tex/latex/ucs/utf8x.def:${PORTSDIR}/print/latex-ucs
-PORTDOCS= *
-.endif
-
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE= IDE
+OPTIONS_DEFAULT=IDE
+IDE_DESC= Include desktop environment (coqide)
MAN1= coq-tex.1 coq_makefile.1 coqc.1 coqchk.1 coqdep.1 coqdoc.1 \
coqmktop.1 coqtop.1 coqtop.byte.1 coqtop.opt.1 coqwc.1 gallina.1
-.if ${ARCH} == "powerpc"
-BROKEN= Does not link on powerpc
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+= hevea:${PORTSDIR}/textproc/hevea \
+ latex:${PORTSDIR}/print/teTeX \
+ ${LOCALBASE}/share/texmf/tex/latex/ucs/utf8x.def:${PORTSDIR}/print/latex-ucs
+PORTDOCS= *
+.else
+CONFIGURE_ARGS+=--with-doc none
.endif
-.if defined(WITH_IDE) || exists(${LOCALBASE}/bin/lablgtk2)
+.if ${PORT_OPTIONS:MIDE}
BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
RUN_DEPENDS+= ${BUILD_DEPENDS}
PLIST_SUB+= IDE=""
MAN1+= coqide.1
.else
PLIST_SUB+= IDE="@comment "
+CONFIGURE_ARGS+=--coqide no
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "powerpc"
+BROKEN= Does not link on powerpc
.endif
post-patch:
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index d0c1c03b3c55..14b203122c71 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -20,8 +20,9 @@ COMMENT= XML Security Library
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
BUILD_DEPENDS:= ${RUN_DEPENDS}
-OPTIONS= GNUTLS "Enable GNUTLS support" off \
- NSS "Enable Mozilla's NSS support" off
+OPTIONS_DEFINE= GNUTLS NSS
+GNUTLS_DESC= Enable GNUTLS support
+NSS_DESC= Enable Mozilla's NSS support
USE_OPENSSL= yes
USE_GNOME= gnomehack lthack libxslt
@@ -35,14 +36,14 @@ MAKE_ENV+= ABS_BUILDDIR=${WRKSRC} TMPFOLDER=${WRKSRC}
MAKE_ARGS+= -EABS_BUILDDIR
USE_AUTOTOOLS= libltdl
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= *
MAKE_ENV+= DOCS=docs
.endif
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_GNUTLS)
+.if ${PORT_OPTIONS:MGNUTLS}
CONFIGURE_ARGS+= --with-gnutls="${LOCALBASE}"
LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
PLIST_SUB+= GNUTLS=""
@@ -51,7 +52,7 @@ CONFIGURE_ARGS+= --without-gnutls
PLIST_SUB+= GNUTLS="@comment "
.endif
-.if defined(WITH_NSS)
+.if ${PORT_OPTIONS:MNSS}
CONFIGURE_ARGS+= --with-nss="${LOCALBASE}" --with-nspr="${LOCALBASE}"
LIB_DEPENDS+= nss3:${PORTSDIR}/security/nss
PLIST_SUB+= NSS=""
@@ -83,17 +84,17 @@ post-patch:
-e 's,total_time.*/ 1000),total_time*1000/CLOCKS_PER_SEC,' \
${WRKSRC}/apps/xmlsec.c
@${REINPLACE_CMD} -e 's,\\\\\\,\\,g' ${WRKSRC}/*.pc.in
-.if defined(WITH_GNUTLS)
+.if ${PORT_OPTIONS:MGNUTLS}
# Don't rely on broken autodetection
@${REINPLACE_CMD} -e '/^GNUTLS_FOUND/s/no/yes/' \
-e '/^GNUTLS_LIBS=/s,"","-L${LOCALBASE}/lib -lgnutls",' \
${WRKSRC}/${CONFIGURE_SCRIPT}
.endif
-.if defined(WITH_NSS)
+.if ${PORT_OPTIONS:MNSS}
# Makeing the xmlsec1 executable multi-threaded to let load -lnss,
# when needed.
@${REINPLACE_CMD} -e 's,^\(xmlsec1_LDADD = \)\\$$,\1 -L${LOCALBASE}/lib ${PTHREAD_LIBS}\\,' \
${WRKSRC}/apps/Makefile.in
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 10:02:06 +0000