Date: Sun, 10 Jan 2016 16:31:34 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405719 - in head: net-im/corebird net-im/kopete-kde4 net-im/telepathy-gabble net-im/telepathy-logger net-im/telepathy-salut net-mgmt/pmacct net-mgmt/rackmonkey net/asterisk11 net/aster... Message-ID: <201601101631.u0AGVYsZ071909@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Jan 10 16:31:33 2016 New Revision: 405719 URL: https://svnweb.freebsd.org/changeset/ports/405719 Log: Convert ports from s* t* and net* categories to USES=sqlite and USES=firebird Modified: head/net-im/corebird/Makefile head/net-im/kopete-kde4/Makefile head/net-im/telepathy-gabble/Makefile head/net-im/telepathy-logger/Makefile head/net-im/telepathy-salut/Makefile head/net-mgmt/pmacct/Makefile head/net-mgmt/rackmonkey/Makefile head/net/asterisk11/Makefile head/net/asterisk13/Makefile head/net/freeradius2/Makefile head/net/freeradius3/Makefile head/net/kget/Makefile head/net/liferea/Makefile head/net/ntopng/Makefile head/net/prosearch/Makefile head/net/quiterss/Makefile head/net/turnserver/Makefile head/security/softhsm2/Makefile head/sysutils/bulk_extractor/Makefile head/sysutils/fusefs-sqlfs/Makefile head/sysutils/lnav/Makefile head/sysutils/tracker/Makefile head/sysutils/zeitgeist/Makefile head/textproc/soothsayer/Makefile Modified: head/net-im/corebird/Makefile ============================================================================== --- head/net-im/corebird/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net-im/corebird/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -20,10 +20,9 @@ LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/ USE_GITHUB= yes GH_ACCOUNT= baedert -USES= autoreconf gettext gmake libtool pkgconfig +USES= autoreconf gettext gmake libtool pkgconfig sqlite GNU_CONFIGURE= yes USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 intltool libxml2 pango -USE_SQLITE= yes INSTALLS_ICONS= yes OPTIONS_DEFINE= GSTREAMER Modified: head/net-im/kopete-kde4/Makefile ============================================================================== --- head/net-im/kopete-kde4/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net-im/kopete-kde4/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -20,13 +20,12 @@ LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/l libjasper.so:${PORTSDIR}/graphics/jasper BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -USES= cmake:outsource jpeg pkgconfig shebangfix tar:xz webplugin:native +USES= cmake:outsource jpeg pkgconfig shebangfix sqlite tar:xz webplugin:native USE_GNOME= libxml2 libxslt USE_KDE4= kdelibs kdeprefix pimlibs \ automoc4 qimageblitz USE_QT4= corelib gui network qt3support sql xml \ moc_build qmake_build rcc_build uic_build uic3_build -USE_SQLITE= yes USE_XORG= x11 xdamage xext xscrnsaver xtst USE_LDCONFIG= yes Modified: head/net-im/telepathy-gabble/Makefile ============================================================================== --- head/net-im/telepathy-gabble/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net-im/telepathy-gabble/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -23,9 +23,8 @@ RUN_DEPENDS= ca_root_nss>=0:${PORTSDIR}/ PORTSCOUT= limitw:1,even -USES= alias gmake libtool pathfix pkgconfig python:build +USES= alias gmake libtool pathfix pkgconfig python:build sqlite USE_GNOME= glib20 gtksourceview3 libxslt:build -USE_SQLITE= 3 USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt Modified: head/net-im/telepathy-logger/Makefile ============================================================================== --- head/net-im/telepathy-logger/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net-im/telepathy-logger/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -16,12 +16,11 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDI libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib USES= gettext-tools gmake libtool pathfix pkgconfig python:build \ - tar:bzip2 + sqlite tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GNOME= glib20 gnomedocutils intltool libxml2 \ libxslt:build introspection:build -USE_SQLITE= yes GLIB_SCHEMAS= org.freedesktop.Telepathy.Logger.gschema.xml INSTALL_TARGET= install-strip Modified: head/net-im/telepathy-salut/Makefile ============================================================================== --- head/net-im/telepathy-salut/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net-im/telepathy-salut/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -16,10 +16,9 @@ LIB_DEPENDS= libavahi-glib.so:${PORTSDIR libsoup-2.4.so:${PORTSDIR}/devel/libsoup GNU_CONFIGURE= yes -USES= gmake libtool pathfix pkgconfig python:build +USES= gmake libtool pathfix pkgconfig python:build sqlite USE_GNOME= glib20 libxslt:build USE_OPENSSL= yes -USE_SQLITE= 3 CONFIGURE_ARGS= --disable-Werror --enable-avahi-tests=no LDFLAGS+= -lpthread INSTALL_TARGET= install-strip Modified: head/net-mgmt/pmacct/Makefile ============================================================================== --- head/net-mgmt/pmacct/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net-mgmt/pmacct/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -51,7 +51,7 @@ PLIST_SUB+= WITH_PGSQL="@comment " .endif .if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes +USES+= sqlite CONFIGURE_ARGS+=--enable-sqlite3 \ --with-sqlite3-includes=${LOCALBASE}/include .else Modified: head/net-mgmt/rackmonkey/Makefile ============================================================================== --- head/net-mgmt/rackmonkey/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net-mgmt/rackmonkey/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -34,7 +34,7 @@ SUB_FILES= pkg-message .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes +USES+= sqlite RUN_DEPENDS+= p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite .endif .if ${PORT_OPTIONS:MMYSQL} @@ -65,7 +65,7 @@ do-install: cd ${WRKSRC}/perl && ${COPYTREE_SHARE} RackMonkey ${STAGEDIR}${WWWDIR}/ ${MKDIR} ${WRKDIR}/build_conf; \ ${CP} ${WRKSRC}/conf/rackmonkey.conf-default ${WRKDIR}/build_conf/rackmonkey.conf; \ - if [ "${USE_SQLITE}" ]; then \ + if [ "${USES:MSQLITE}" ]; then \ ${ECHO} "Building with SQLite............."; \ ${SED} -i '' -e 's%dbconnect =%dbconnect = dbi:SQLite:dbname=${WWWDIR}/rackmonkey.db%' ${WRKDIR}/build_conf/rackmonkey.conf; \ if [ "${INIT_DB}" ]; then \ Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net/asterisk11/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -21,12 +21,11 @@ EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 -USES= bison cpe gmake iconv localbase ncurses shebangfix +USES= bison cpe gmake iconv localbase ncurses shebangfix sqlite USE_CSTD= gnu89 USE_GNOME= libxml2 USE_LDCONFIG= yes USE_OPENSSL= yes -USE_SQLITE= 3 USE_RC_SUBR= asterisk GNU_CONFIGURE= yes Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net/asterisk13/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -24,12 +24,11 @@ EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 -USES= bison cpe gmake iconv localbase ncurses shebangfix +USES= bison cpe gmake iconv localbase ncurses shebangfix sqlite USE_CSTD= gnu89 USE_GNOME= libxml2 USE_LDCONFIG= yes USE_OPENSSL= yes -USE_SQLITE= 3 USE_RC_SUBR= asterisk GNU_CONFIGURE= yes Modified: head/net/freeradius2/Makefile ============================================================================== --- head/net/freeradius2/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net/freeradius2/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -177,7 +177,7 @@ PLIST_SUB+= UNIXODBC="@comment " .endif .if ${PORT_OPTIONS:MFIREBIRD} -USE_FIREBIRD= YES +USES+= firebird CONFIGURE_ARGS+=--with-rlm_sql_firebird PLIST_SUB+= FIREBIRD="" .else Modified: head/net/freeradius3/Makefile ============================================================================== --- head/net/freeradius3/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net/freeradius3/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -154,7 +154,7 @@ PLIST_SUB+= UNIXODBC="@comment " .endif .if ${PORT_OPTIONS:MFIREBIRD} -USE_FIREBIRD= YES +USES+= firebird CONFIGURE_ARGS+=--with-rlm_sql_firebird PLIST_SUB+= FIREBIRD="" .else Modified: head/net/kget/Makefile ============================================================================== --- head/net/kget/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net/kget/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -16,11 +16,10 @@ LIB_DEPENDS= libgpgme.so:${PORTSDIR}/sec libqca.so:${PORTSDIR}/devel/qca \ libboost_thread.so:${PORTSDIR}/devel/boost-libs -USE_SQLITE= yes USE_KDE4= kdelibs kdeprefix workspace libkonq \ nepomuk-core nepomuk-widgets automoc4 ontologies \ soprano -USES= cmake:outsource shebangfix tar:xz +USES= cmake:outsource shebangfix sqlite tar:xz SHEBANG_FILES= conf/*.pl USE_QT4= gui sql moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Modified: head/net/liferea/Makefile ============================================================================== --- head/net/liferea/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net/liferea/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -19,10 +19,9 @@ RUN_DEPENDS= gsettings-desktop-schemas>= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:${PORTSDIR}/devel/py-libpeas USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \ - python:2 tar:bzip2 + python:2 sqlite tar:bzip2 USE_GNOME= dconf:run gtk30 intltool introspection:build \ libxslt:build libxml2 -USE_SQLITE= 3 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib Modified: head/net/ntopng/Makefile ============================================================================== --- head/net/ntopng/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net/ntopng/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -21,10 +21,9 @@ LIB_DEPENDS= librrd.so:${PORTSDIR}/datab libzmq.so:${PORTSDIR}/net/libzmq4 GNU_CONFIGURE= yes -USE_SQLITE= yes MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes -USES= autoreconf cpe gmake libtool pathfix pkgconfig tar:tgz +USES= autoreconf cpe gmake libtool pathfix pkgconfig sqlite tar:tgz SUB_FILES= ntopng-geoipupdate.sh CPE_VENDOR= ntop Modified: head/net/prosearch/Makefile ============================================================================== --- head/net/prosearch/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net/prosearch/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -129,7 +129,7 @@ WANT_PGSQL= client server .endif .if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes +USES+= sqlite RUN_DEPENDS+=\ p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite .endif Modified: head/net/quiterss/Makefile ============================================================================== --- head/net/quiterss/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net/quiterss/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -15,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING NO_WRKSUBDIR= yes -USES= desktop-file-utils pkgconfig qmake:outsource -USE_SQLITE= yes +USES= desktop-file-utils pkgconfig qmake:outsource sqlite INSTALLS_ICONS= yes OPTIONS_DEFINE= DEBUG Modified: head/net/turnserver/Makefile ============================================================================== --- head/net/turnserver/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/net/turnserver/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -94,7 +94,7 @@ CONFIGURE_ENG+= TURN_NO_MONGO=1 .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes +USES+= sqlite .else CONFIGURE_ENV+= TURN_NO_SQLITE=1 .endif Modified: head/security/softhsm2/Makefile ============================================================================== --- head/security/softhsm2/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/security/softhsm2/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -18,12 +18,11 @@ LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/d GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sqlite3=${LOCALBASE} --localstatedir="${PREFIX}/var" INSTALL_TARGET= install-strip -USES= libtool +USES= libtool sqlite CONFLICTS= softhsm-1.* USE_LDCONFIG= yes -USE_SQLITE= yes OPTIONS_SINGLE= CRYP OPTIONS_SINGLE_CRYP= CRYP_OPEN CRYP_BOTAN Modified: head/sysutils/bulk_extractor/Makefile ============================================================================== --- head/sysutils/bulk_extractor/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/sysutils/bulk_extractor/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -12,13 +12,13 @@ COMMENT= Program that scans a disk image LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING +USES= sqlite LIB_DEPENDS= libafflib.so:${PORTSDIR}/sysutils/afflib \ libewf.so:${PORTSDIR}/devel/libewf \ libexiv2.so:${PORTSDIR}/graphics/exiv2 \ libexpat.so:${PORTSDIR}/textproc/expat2 USE_OPENSSL= yes -USE_SQLITE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-exiv2=true CPPFLAGS+= -I${LOCALBASE}/include Modified: head/sysutils/fusefs-sqlfs/Makefile ============================================================================== --- head/sysutils/fusefs-sqlfs/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/sysutils/fusefs-sqlfs/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -13,8 +13,7 @@ DISTNAME= lib${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= SQLite backed FUSE file system -USES= fuse -USE_SQLITE= 3 +USES= fuse sqlite OPTIONS_DEFINE= DOCS @@ -22,8 +21,6 @@ PORTDOCS= README PLIST_FILES= bin/sqlfs -.include <bsd.port.pre.mk> - do-build: (cd ${WRKSRC} && ${CC} -DFUSE -DFUSE_USE_VERSION=25 \ -D_FILE_OFFSET_BITS=64 -D_REENTRANT ${CFLAGS} \ @@ -37,4 +34,4 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/sysutils/lnav/Makefile ============================================================================== --- head/sysutils/lnav/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/sysutils/lnav/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -17,8 +17,7 @@ USE_GITHUB= yes GH_ACCOUNT= tstack GNU_CONFIGURE= yes -USES= autoreconf execinfo ncurses python readline -USE_SQLITE= 3 +USES= autoreconf execinfo ncurses python readline sqlite PLIST_FILES= bin/lnav man/man1/lnav.1.gz Modified: head/sysutils/tracker/Makefile ============================================================================== --- head/sysutils/tracker/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/sysutils/tracker/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -25,10 +25,10 @@ RUN_DEPENDS= xdg-desktop-icon:${PORTSDIR PORTSCOUT= limitw:1,even -USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:xz +USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \ + sqlite tar:xz USE_GNOME= gtk30 intltool introspection:build libxslt:build USE_LDCONFIG= yes -USE_SQLITE= 3 USE_GSTREAMER1= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes Modified: head/sysutils/zeitgeist/Makefile ============================================================================== --- head/sysutils/zeitgeist/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/sysutils/zeitgeist/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -22,8 +22,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__ USE_GNOME= intlhack glib20 introspection:build GNU_CONFIGURE= yes -USES= gmake gettext pathfix python:2 pkgconfig libtool tar:xz -USE_SQLITE= 3 +USES= gmake gettext pathfix python:2 pkgconfig libtool sqlite tar:xz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip Modified: head/textproc/soothsayer/Makefile ============================================================================== --- head/textproc/soothsayer/Makefile Sun Jan 10 16:29:59 2016 (r405718) +++ head/textproc/soothsayer/Makefile Sun Jan 10 16:31:33 2016 (r405719) @@ -14,8 +14,7 @@ LICENSE= GPLv2 # (or later) BUILD_DEPENDS= help2man:${PORTSDIR}/misc/help2man -USES= libtool pkgconfig -USE_SQLITE= 3 +USES= libtool pkgconfig sqlite GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_CPPUNIT_CONFIG=no \ ac_cv_path_PYTHON=no \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601101631.u0AGVYsZ071909>