From owner-svn-ports-all@freebsd.org Sun Jan 10 16:19:40 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3FB90A69CF7; Sun, 10 Jan 2016 16:19:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1729A1D60; Sun, 10 Jan 2016 16:19:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0AGJdZ4067456; Sun, 10 Jan 2016 16:19:39 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0AGJb12067440; Sun, 10 Jan 2016 16:19:37 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201601101619.u0AGJb12067440@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 10 Jan 2016 16:19:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405717 - in head/www: bacula-web ephemera epiphany fusionpbx midori mnogosearch mod_tsa newsbeuter trafficserver webkit-gtk2 webkit-gtk3 webkit-qt5 webkit2-gtk3 xsp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2016 16:19:40 -0000 Author: bapt Date: Sun Jan 10 16:19:37 2016 New Revision: 405717 URL: https://svnweb.freebsd.org/changeset/ports/405717 Log: Convert www ports to USES=sqlite and USES=firebird Modified: head/www/bacula-web/Makefile head/www/ephemera/Makefile head/www/epiphany/Makefile head/www/fusionpbx/Makefile head/www/midori/Makefile head/www/mnogosearch/Makefile head/www/mod_tsa/Makefile head/www/newsbeuter/Makefile head/www/trafficserver/Makefile head/www/webkit-gtk2/Makefile head/www/webkit-gtk3/Makefile head/www/webkit-qt5/Makefile head/www/webkit2-gtk3/Makefile head/www/xsp/Makefile Modified: head/www/bacula-web/Makefile ============================================================================== --- head/www/bacula-web/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/bacula-web/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -29,6 +29,8 @@ SUB_LIST= BASE=${BASE} OPTIONS_DEFINE= MYSQL PGSQL SQLITE OPTIONS_DEFAULT= PGSQL +SQLITE_USES= sqlite + .include .if ${PORT_OPTIONS:MMYSQL} @@ -46,7 +48,6 @@ USE_PHP+= pdo_pgsql .endif .if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes CONFIGURE_ARGS+= --with-sqlite=yes SUB_LIST+= REQ_SQLITE=sqlite USE_PHP+= pdo_sqlite Modified: head/www/ephemera/Makefile ============================================================================== --- head/www/ephemera/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/ephemera/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -11,10 +11,9 @@ COMMENT= Blog server LICENSE= BSD3CLAUSE +USES= sqlite RUN_DEPENDS= munger:${PORTSDIR}/lang/munger DATADIR= ${PREFIX}/share/ephemera -USE_SQLITE= 3 - .include Modified: head/www/epiphany/Makefile ============================================================================== --- head/www/epiphany/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/epiphany/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -29,12 +29,11 @@ RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/mi PORTSCOUT= limitw:1,even USES= cpe desktop-file-utils gettext gmake libtool pathfix \ - pkgconfig python:3 tar:xz + pkgconfig python:3 sqlite tar:xz CPE_VENDOR= gnome USE_GNOME= gnomedesktop3 intlhack libwnck3 libxml2 libxslt USE_XORG= ice x11 sm INSTALLS_ICONS= yes -USE_SQLITE= 3 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=\ Modified: head/www/fusionpbx/Makefile ============================================================================== --- head/www/fusionpbx/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/fusionpbx/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -19,10 +19,10 @@ EXPIRATION_DATE= 2016-01-15 LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_odbc.so:${PORTSDIR}/databases/php${PHP_VER}-pdo_odbc +USES= sqlite USE_PHP= dom filter ftp json pcre pdo pdo_sqlite posix \ session simplexml xml xmlreader xmlwriter xmlrpc \ xsl zlib odbc -USE_SQLITE= yes DEFAULT_VERSIONS+=php=5 Modified: head/www/midori/Makefile ============================================================================== --- head/www/midori/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/midori/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -31,8 +31,7 @@ USE_GNOME= glib20 intltool libxml2 USE_XORG= xscrnsaver INSTALLS_ICONS= yes USE_LDCONFIG= yes -USES= cmake desktop-file-utils gettext pkgconfig tar:bzip2 -USE_SQLITE= yes +USES= cmake desktop-file-utils gettext pkgconfig sqlite tar:bzip2 PLIST_SUB= VERSION="${PORTVERSION:R}" Modified: head/www/mnogosearch/Makefile ============================================================================== --- head/www/mnogosearch/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/mnogosearch/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -40,6 +40,11 @@ SUB_FILES+= pkg-message PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql=${LOCALBASE} +SQLITE2_USES= sqlite:2 +SQLITE3_USES= sqlite +SQLITE2_CONFIGURE_WITH= sqlite=${LOCALBASE} +SQLITE3_CONFIGURE_WITH= sqlite3=${LOCALBASE} + .include .if ${PORT_OPTIONS:MSSL} @@ -69,16 +74,6 @@ USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} .endif -.if ${PORT_OPTIONS:MSQLITE2} -USE_SQLITE= 2 -CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} -.endif - -.if ${PORT_OPTIONS:MSQLITE3} -USE_SQLITE= 3 -CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} -.endif - PORTDATA= * PORTDOCS= ChangeLog INSTALL README.html PORTEXAMPLES= README *.conf Modified: head/www/mod_tsa/Makefile ============================================================================== --- head/www/mod_tsa/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/mod_tsa/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -51,7 +51,7 @@ AP_LIB+= -lpq .endif .if ${PORT_OPTIONS:MFIREBIRD} -USE_FIREBIRD= yes +USE+= firebird CONFIGURE_ARGS+= --enable-firebird=yes SRC_FILE+= db_firebird.c AP_LIB+= -lgds Modified: head/www/newsbeuter/Makefile ============================================================================== --- head/www/newsbeuter/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/newsbeuter/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -22,11 +22,11 @@ OPTIONS_DEFAULT=PODCAST OPTIONS_SUB= yes PODCAST_DESC= Podcast client (podbeuter) -USES= compiler:c++11-lib gettext gmake iconv:translit ncurses perl5 pkgconfig shebangfix +USES= compiler:c++11-lib gettext gmake iconv:translit ncurses perl5 \ + pkgconfig sqlite shebangfix USE_CXXSTD= gnu++11 USE_PERL5= build SHEBANG_FILES= txt2h.pl -USE_SQLITE= yes USE_GNOME= libxml2 .include Modified: head/www/trafficserver/Makefile ============================================================================== --- head/www/trafficserver/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/trafficserver/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -20,14 +20,13 @@ LIB_DEPENDS= libboost_system.so:${PORTSD GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= cpe execinfo gmake libtool perl5 pkgconfig tar:bzip2 tcl +USES= cpe execinfo gmake libtool perl5 pkgconfig tar:bzip2 sqlite tcl CPE_VENDOR= apache CPE_PRODUCT= traffic_server USE_PERL5= build run USE_LDCONFIG= yes USE_OPENSSL= yes USE_RC_SUBR= ${PORTNAME} -USE_SQLITE= yes ONLY_FOR_ARCHS= i386 amd64 Modified: head/www/webkit-gtk2/Makefile ============================================================================== --- head/www/webkit-gtk2/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/webkit-gtk2/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -28,12 +28,11 @@ PORTSCOUT= limit:1.4.*$$ USE_GSTREAMER1= yes USE_XORG= xt xdamage xcomposite USES= bison compiler:c++11-lib gettext gmake gperf libtool \ - perl5 pkgconfig shebangfix tar:xz + perl5 pkgconfig shebangfix sqlite tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gtk20 introspection:build libxslt USE_GL= gl -USE_SQLITE= 3 USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes Modified: head/www/webkit-gtk3/Makefile ============================================================================== --- head/www/webkit-gtk3/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/webkit-gtk3/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -28,12 +28,11 @@ PORTSCOUT= limit:1.4.*$$ USE_GSTREAMER1= yes USE_XORG= xt xdamage xcomposite USES= bison compiler:c++11-lib gettext gmake gperf libtool perl5 \ - pkgconfig shebangfix tar:xz + pkgconfig shebangfix sqlite tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gtk20 gtk30 introspection:build libxslt USE_GL= gl -USE_SQLITE= 3 USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes Modified: head/www/webkit-qt5/Makefile ============================================================================== --- head/www/webkit-qt5/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/webkit-qt5/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -23,9 +23,9 @@ USE_QT5= core gui network opengl printsu QT_DIST= ${PORTNAME} USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes -USE_SQLITE= 3 USE_XORG= x11 xcomposite xrender -USES= bison gmake gperf jpeg perl5 pkgconfig python:build qmake:outsource +USES= bison gmake gperf jpeg perl5 pkgconfig python:build qmake:outsource \ + sqlite # Use flex(1) from ports. MAKE_ENV= PATH="${LOCALBASE}/bin:${PATH}" # "all" builds many more targets. The default one is called "first" in Modified: head/www/webkit2-gtk3/Makefile ============================================================================== --- head/www/webkit2-gtk3/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/webkit2-gtk3/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -28,12 +28,11 @@ PORTSCOUT= limitw:1,even USE_GSTREAMER1= yes USE_XORG= x11 xext ice USES= bison cmake compiler:c++11-lib gettext gmake gperf jpeg perl5 \ - pkgconfig python:2 tar:xz + pkgconfig python:2 sqlite tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gtk20 gtk30 introspection:build libxml2 libxslt USE_GL= gl egl -USE_SQLITE= 3 USE_PERL5= build USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include Modified: head/www/xsp/Makefile ============================================================================== --- head/www/xsp/Makefile Sun Jan 10 16:15:29 2016 (r405716) +++ head/www/xsp/Makefile Sun Jan 10 16:19:37 2016 (r405717) @@ -14,8 +14,7 @@ MAKE_JOBS_UNSAFE= yes GH_ACCOUNT= mono USE_GITHUB= yes -USE_SQLITE= 3 -USES= gmake mono pathfix pkgconfig tar:bzip2 +USES= gmake mono pathfix pkgconfig sqlite tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_GMCS=${LOCALBASE}/bin/mcs USE_AUTOTOOLS= automake autoconf aclocal