Index: head/deskutils/logjam/Makefile
===================================================================
--- head/deskutils/logjam/Makefile	(revision 396828)
+++ head/deskutils/logjam/Makefile	(revision 396829)
@@ -1,67 +1,51 @@
 # Created by: alanp@unixpower.org
 # $FreeBSD$
 
 PORTNAME=	logjam
 PORTVERSION=	4.6.2
 PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	http://andy-shev.github.com/LogJam/download/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	GTK2 interface to livejournals, ie www.livejournal.com
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
+OPTIONS_DEFINE=	GTKSPELL SQLITE XMMS GTKHTML RSVG
+OPTIONS_DEFAULT=	GTKSPELL
+OPTIONS_SUB=	yes
+
+GTKSPELL_DESC=	Support spell checking
+GTKHTML_DESC=	Support rendering HTML
+RSVG_DESC=	Support rendering SVG
+SQLITE_DESC=	Use sqlite3 as a backend
+XMMS_DESC=	Enable XMMS music detection
+
 USES=		gettext gmake pathfix pkgconfig tar:bzip2
-WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gtk20 libxml2 intlhack
 CONFIGURE_ARGS=	--program-transform-name="s/$$//"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-.ifndef(WITHOUT_GTKSPELL)
-LIB_DEPENDS+=		libgtkspell.so:${PORTSDIR}/textproc/gtkspell
-.else
-CONFIGURE_ARGS+=	--without-gtkspell
-.endif
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_CONFIGURE_WITH=	gtkspell
 
-.if defined(WITH_SQLITE)
-CONFIGURE_ARGS+=	--with-sqlite3
-LIB_DEPENDS+=		libsqlite3.so:${PORTSDIR}/databases/sqlite3
-.endif
+SQLITE_CONFIGURE_WITH=	sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
-.if defined(WITH_XMMS)
-LIB_DEPENDS+=		libxmms.so:${PORTSDIR}/multimedia/xmms
-PLIST_SUB+=		WITH_XMMS=""
-.else
-PLIST_SUB+=		WITH_XMMS="@comment "
-CONFIGURE_ARGS+=	--without-xmms
-.endif
+XMMS_LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_CONFIGURE_WITH=	xmms
 
-.include <bsd.port.pre.mk>
+GTKHTML_USE=	GNOME=gtkhtml3
+GTKHTML_CONFIGURE_WITH=	gtkhtml
 
-.if ${HAVE_GNOME:Mgtkhtml3}!=""
-USE_GNOME+=		gtkhtml3
-.else
-CONFIGURE_ARGS+=	--without-gtkhtml
-.endif
+RSVG_USE=	GNOME=librsvg2
+RSVG_CONFIGURE_WITH=	librsvg
 
-.if ${HAVE_GNOME:Mlibrsvg2}!=""
-USE_GNOME+=		librsvg2
-.else
-CONFIGURE_ARGS+=	--without-librsvg
-.endif
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "logjam has the following tunable option(s):"
-	@${ECHO_MSG} "		WITHOUT_GTKSPELL	Disable spell checking"
-	@${ECHO_MSG} "		WITH_XMMS		Enable XMMS music detection"
-	@${ECHO_MSG} ""
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|libgtkhtml-3.0|libgtkhtml-3.18|g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/deskutils/logjam/pkg-plist
===================================================================
--- head/deskutils/logjam/pkg-plist	(revision 396828)
+++ head/deskutils/logjam/pkg-plist	(revision 396829)
@@ -1,14 +1,14 @@
 bin/logjam
 man/man1/logjam.1.gz
-%%WITH_XMMS%%bin/logjam-xmms-client
+%%XMMS%%bin/logjam-xmms-client
 share/applications/logjam.desktop
 share/pixmaps/logjam_goat.png
 share/pixmaps/logjam_pencil.png
 share/locale/de/LC_MESSAGES/logjam.mo
 share/locale/en_GB/LC_MESSAGES/logjam.mo
 share/locale/en_US.UTF-8/LC_MESSAGES/logjam.mo
 share/locale/es/LC_MESSAGES/logjam.mo
 share/locale/he/LC_MESSAGES/logjam.mo
 share/locale/ru_RU/LC_MESSAGES/logjam.mo
 share/locale/uk_UA/LC_MESSAGES/logjam.mo
 share/locale/ja/LC_MESSAGES/logjam.mo