svn commit: r396829 - head/deskutils/logjam
Baptiste Daroussin
bapt at FreeBSD.org
Sun Sep 13 14:36:41 UTC 2015
Author: bapt
Date: Sun Sep 13 14:36:40 2015
New Revision: 396829
URL: https://svnweb.freebsd.org/changeset/ports/396829
Log:
Convert to option framework
Use options helpers
Remove usage of HAVE_GNOME
Modified:
head/deskutils/logjam/Makefile
head/deskutils/logjam/pkg-plist
Modified: head/deskutils/logjam/Makefile
==============================================================================
--- head/deskutils/logjam/Makefile Sun Sep 13 14:31:54 2015 (r396828)
+++ head/deskutils/logjam/Makefile Sun Sep 13 14:36:40 2015 (r396829)
@@ -13,55 +13,39 @@ COMMENT= GTK2 interface to livejournals,
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
-
-.if defined(WITH_SQLITE)
-CONFIGURE_ARGS+= --with-sqlite3
-LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3
-.endif
-
-.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
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mgtkhtml3}!=""
-USE_GNOME+= gtkhtml3
-.else
-CONFIGURE_ARGS+= --without-gtkhtml
-.endif
-
-.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} ""
+GTKSPELL_LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_CONFIGURE_WITH= gtkspell
+
+SQLITE_CONFIGURE_WITH= sqlite3
+SQLITE_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
+
+XMMS_LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_CONFIGURE_WITH= xmms
+
+GTKHTML_USE= GNOME=gtkhtml3
+GTKHTML_CONFIGURE_WITH= gtkhtml
+
+RSVG_USE= GNOME=librsvg2
+RSVG_CONFIGURE_WITH= librsvg
post-patch:
@${REINPLACE_CMD} -e 's|libgtkhtml-3.0|libgtkhtml-3.18|g' ${WRKSRC}/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/deskutils/logjam/pkg-plist
==============================================================================
--- head/deskutils/logjam/pkg-plist Sun Sep 13 14:31:54 2015 (r396828)
+++ head/deskutils/logjam/pkg-plist Sun Sep 13 14:36:40 2015 (r396829)
@@ -1,6 +1,6 @@
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
More information about the svn-ports-all
mailing list