1 files changed, 47 insertions, 55 deletions

diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index b2d098cac225..0b8678788993 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -28,57 +28,49 @@ SAMBA_PORT?=	net/samba34
 MAN1=		elinks.1
 MAN5=		elinkskeys.5 elinks.conf.5
 
-OPTIONS=	88COLORS	"Enable 88 color support"	on \
-		256COLORS	"Enable 256 color support"	on \
-		SPIDERMONKEY	"Enable ECMAScript support (via SpiderMonkey)" off \
-		XBELMARKS	"Enable XBEL bookmarks (via expat)" off \
-		LOCAL_CGI	"Enable local CGI support" off \
-		FINGER		"Enable finger protocol support" off \
-		GOPHER		"Enable gopher protocol support" off \
-		BITTORRENT	"Enable BitTorrent protocol support" off \
-		NNTP		"Enable NNTP (News) protocol support" off \
-		FTP		"Enable FTP protocol support" on \
-		FSP		"Enable FSP protocol support (via fsplib)" off \
-		SMB		"Enable SMB protocol support (via smbclient)" off \
-		EXMODE		"Enable exmode (CLI) support" on \
-		HIGHLIGHT	"Enable HTML highlighting using DOM engine" on \
-		IDN		"Enable international domain name support" off \
-		NOROOT		"Enable prevention of usage by root" off \
-		FASTMEM		"Enable fast memory allocation functions" on \
-		PERLSCRIPT	"Enable Perl scripting support" off \
-		RUBYSCRIPT	"Enable Ruby scripting support" off \
-		LUASCRIPT	"Enable Lua scripting support" off \
-		GUILESCRIPT	"Enable Guile scripting support" off \
-		ICONV		"Enable iconv support" off \
-		MOUSE		"Enable mouse support" on
-
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=		88COLORS 256COLORS SPIDERMONKEY XBELMARKS LOCAL_CGI \
+			FINGER GOPHER BITTORRENT NNTP FTP FSP SMB EXMODE \
+			HIGHLIGHT IDN NOROOT FASTMEM PERL RUBY \
+			LUA GUILE ICONV MOUSE NLS
+OPTIONS_DEFAULT=	88COLORS 88COLORS FTP EXMODE HIGHLIGHT FASTMEM MOUSE
+88COLORS_DESC=		88 color support
+256COLORS_DESC=		256 color support
+SPIDERMONKEY_DESC=	ECMAScript support (via SpiderMonkey)
+XBELMARKS_DESC=		XBEL bookmarks (via expat)
+LOCAL_CGI_DESC=		Local CGI support
+FSP_DESC=		FSP protocol support (via fsplib)
+EXMODE_DESC=		Exmode (CLI) support
+HIGHLIGHT_DESC=		HTML highlighting using DOM engine
+NOROOT_DESC=		Prevention of usage by root
+FASTMEM_DESC=		Fast memory allocation functions
+
+.include <bsd.port.options.mk>
 
 CONFIGURE_ARGS+=	--without-zlib
 
-.if defined(WITHOUT_NLS)
-PLIST_SUB+=	NLS="@comment "
-CONFIGURE_ARGS+=	--disable-nls
-.else
+.if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
 USE_GETTEXT=	yes
+.else
+PLIST_SUB+=	NLS="@comment "
+CONFIGURE_ARGS+=	--disable-nls
 .endif
 
-.if defined(WITH_RUBYSCRIPT)
+.if ${PORT_OPTIONS:MRUBY}
 LIB_DEPENDS+=	ruby18:${PORTSDIR}/lang/ruby18
 CONFIGURE_ARGS+=	--with-ruby
 .else
 CONFIGURE_ARGS+=	--without-ruby
 .endif
 
-.if defined(WITH_GUILESCRIPT)
+.if ${PORT_OPTIONS:MGUILE}
 LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
 CONFIGURE_ARGS+=	--with-guile
 .else
 CONFIGURE_ARGS+=	--without-guile
 .endif
 
-.if defined(WITH_LUASCRIPT)
+.if ${PORT_OPTIONS:MLUA}
 USE_LUA=	5.0
 CONFIGURE_ARGS+=	--with-lua
 CPPFLAGS+=	-I${LUA_INCDIR}
@@ -87,37 +79,37 @@ LDFLAGS+=	-L${LUA_LIBDIR}
 CONFIGURE_ARGS+=	--without-lua
 .endif
 
-.if defined(WITH_PERLSCRIPT)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-perl
 .else
 CONFIGURE_ARGS+=	--without-perl
 .endif
 
-.if defined(WITH_FASTMEM)
+.if ${PORT_OPTIONS:MFASTMEM}
 CONFIGURE_ARGS+=	--enable-fastmem
 .endif
 
-.if defined(WITH_IDN)
+.if ${PORT_OPTIONS:MIDN}
 LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
 CONFIGURE_ARGS+=	--with-idn
 .else
 CONFIGURE_ARGS+=	--without-idn
 .endif
 
-.if defined(WITH_NOROOT)
+.if ${PORT_OPTIONS:MNOROOT}
 CONFIGURE_ARGS+=	--enable-no-root
 .endif
 
-.if defined(WITH_HIGHLIGHT)
+.if ${PORT_OPTIONS:MHIGHLIGHT}
 CONFIGURE_ARGS+=	--enable-html-highlight
 .endif
 
-.if defined(WITH_EXMODE)
+.if ${PORT_OPTIONS:MEXMODE}
 CONFIGURE_ARGS+=	--enable-exmode
 .endif
 
-.if defined(WITH_SMB)
+.if ${PORT_OPTIONS:MSMB}
 RUN_DEPENDS+=	smbclient:${PORTSDIR}/${SAMBA_PORT}
 BUILD_DEPENDS+=	smbclient:${PORTSDIR}/${SAMBA_PORT}
 CONFIGURE_ARGS+=	--enable-smb
@@ -125,7 +117,7 @@ CONFIGURE_ARGS+=	--enable-smb
 CONFIGURE_ARGS+=	--disable-smb
 .endif
 
-.if defined(WITH_FSP)
+.if ${PORT_OPTIONS:MFSP}
 RUN_DEPENDS+=	${LOCALBASE}/lib/libfsplib.a:${PORTSDIR}/net/fsplib
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libfsplib.a:${PORTSDIR}/net/fsplib
 CONFIGURE_ARGS+=	--enable-fsp
@@ -133,66 +125,66 @@ CONFIGURE_ARGS+=	--enable-fsp
 CONFIGURE_ARGS+=	--disable-fsp
 .endif
 
-.if defined(WITH_FTP)
+.if ${PORT_OPTIONS:MFTP}
 CONFIGURE_ARGS+=	--enable-ftp
 .else
 CONFIGURE_ARGS+=	--disable-ftp
 .endif
 
-.if defined(WITH_NNTP)
+.if ${PORT_OPTIONS:MNNTP}
 CONFIGURE_ARGS+=	--enable-nntp
 .else
 CONFIGURE_ARGS+=	--disable-nntp
 .endif
 
-.if defined(WITH_BITTORRENT)
+.if ${PORT_OPTIONS:MBITTORRENT}
 CONFIGURE_ARGS+=	--enable-bittorrent
 .else
 CONFIGURE_ARGS+=	--disable-bittorrent
 .endif
 
-.if defined(WITH_GOPHER)
+.if ${PORT_OPTIONS:MGOPHER}
 CONFIGURE_ARGS+=	--enable-gopher
 .else
 CONFIGURE_ARGS+=	--disable-gopher
 .endif
 
-.if defined(WITH_MOUSE)
+.if ${PORT_OPTIONS:MMOUSE}
 CONFIGURE_ARGS+=	--enable-mouse
 .else
 CONFIGURE_ARGS+=	--disable-mouse
 .endif
 
-.if defined(WITH_FINGER)
+.if ${PORT_OPTIONS:MFINGER}
 CONFIGURE_ARGS+=	--enable-finger
 .else
 CONFIGURE_ARGS+=	--disable-finger
 .endif
 
-.if defined(WITH_LOCAL_CGI)
+.if ${PORT_OPTIONS:MLOCAL_CGI}
 CONFIGURE_ARGS+=	--enable-cgi
 .else
 CONFIGURE_ARGS+=	--disable-cgi
 .endif
 
-.if defined(WITH_XBELMARKS)
+.if ${PORT_OPTIONS:MXBELMARKS}
 LIB_DEPENDS+=	expat:${PORTSDIR}/textproc/expat2
 CONFIGURE_ARGS+=	--enable-xbel --with-expat
 .else
 CONFIGURE_ARGS+=	--disable-xbel
 .endif
 
-.if defined(WITH_256COLORS)
+.if ${PORT_OPTIONS:M256COLORS}
 CONFIGURE_ARGS+=	--enable-256-colors
 .endif
 
-.if defined(WITH_88COLORS)
+.if ${PORT_OPTIONS:M88COLORS}
 CONFIGURE_ARGS+=	--enable-88-colors
 .endif
 
-.if defined(WITH_SPIDERMONKEY)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libjs.so:${PORTSDIR}/lang/spidermonkey
-RUN_DEPENDS+=	js:${PORTSDIR}/lang/spidermonkey
+.if ${PORT_OPTIONS:MSPIDERMONKEY}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libjs.so:${PORTSDIR}/lang/spidermonkey17
+RUN_DEPENDS+=	js:${PORTSDIR}/lang/spidermonkey17
 LIB_DEPENDS+=	nspr4:${PORTSDIR}/devel/nspr
 CFLAGS+=	-I${LOCALBASE}/include/nspr
 LDFLAGS+=	-lnspr4 -pthread -lpthread -lm
@@ -201,7 +193,7 @@ CONFIGURE_ARGS+=	--enable-sm-scripting --with-spidermonkey
 CONFIGURE_ARGS+=	--disable-sm-scripting --without-spidermonkey
 .endif
 
-.if defined(WITH_ICONV)
+.if ${PORT_OPTIONS:MICONV}
 USE_ICONV=	yes
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
 .endif
@@ -214,4 +206,4 @@ LIB_DEPENDS+=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>