svn commit: r405721 - in head: lang/newlisp lang/newlisp-devel lang/php5 lang/php55 lang/php56 lang/racket lang/smalltalk lang/urweb mail/bogofilter-sqlite mail/cyrus-imapd25 mail/evolution-ews mai...

Baptiste Daroussin bapt at FreeBSD.org
Sun Jan 10 16:44:27 UTC 2016 

Author: bapt
Date: Sun Jan 10 16:44:24 2016
New Revision: 405721
URL: https://svnweb.freebsd.org/changeset/ports/405721

Log:
  Convert categories m* and m* to USES=sqlite and USES=firebird

Modified:
  head/lang/newlisp-devel/Makefile
  head/lang/newlisp/Makefile
  head/lang/php5/Makefile.ext
  head/lang/php55/Makefile.ext
  head/lang/php56/Makefile.ext
  head/lang/racket/Makefile
  head/lang/smalltalk/Makefile
  head/lang/urweb/Makefile
  head/mail/bogofilter-sqlite/Makefile
  head/mail/cyrus-imapd25/Makefile
  head/mail/evolution-ews/Makefile
  head/mail/ezmlm-idx/Makefile
  head/mail/greylite/Makefile
  head/mail/libmapi/Makefile
  head/mail/qsf/Makefile
  head/mail/rspamd-devel/Makefile
  head/mail/rspamd/Makefile
  head/multimedia/avidemux/Makefile.common
  head/multimedia/banshee/Makefile
  head/multimedia/gmerlin/Makefile

Modified: head/lang/newlisp-devel/Makefile
==============================================================================
--- head/lang/newlisp-devel/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/lang/newlisp-devel/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -77,7 +77,7 @@ PLIST_SUB+=	PGSQL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	3
+USES+=		sqlite
 MODULES+=	sqlite3
 PLIST_SUB+=	SQLITE=""
 .else

Modified: head/lang/newlisp/Makefile
==============================================================================
--- head/lang/newlisp/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/lang/newlisp/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -61,7 +61,7 @@ MODULES+=	postgres
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	3
+USES+=		sqlite
 MODULES+=	sqlite3
 .endif
 

Modified: head/lang/php5/Makefile.ext
==============================================================================
--- head/lang/php5/Makefile.ext	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/lang/php5/Makefile.ext	Sun Jan 10 16:44:24 2016	(r405721)
@@ -146,7 +146,7 @@ USE_OPENSSL=	yes
 .if ${PHP_MODNAME} == "interbase"
 CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}
 
-USE_FIREBIRD=	yes
+USES+=		firebird
 .endif
 
 .if ${PHP_MODNAME} == "json"
@@ -273,7 +273,7 @@ USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
-USE_SQLITE=	yes
+USES+=		sqlite
 CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo

Modified: head/lang/php55/Makefile.ext
==============================================================================
--- head/lang/php55/Makefile.ext	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/lang/php55/Makefile.ext	Sun Jan 10 16:44:24 2016	(r405721)
@@ -146,7 +146,7 @@ USE_OPENSSL=	yes
 .if ${PHP_MODNAME} == "interbase"
 CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}
 
-USE_FIREBIRD=	yes
+USES+=		firebird
 .endif
 
 .if ${PHP_MODNAME} == "json"
@@ -277,7 +277,7 @@ USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
-USE_SQLITE=	yes
+USES+=		sqlite
 CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo

Modified: head/lang/php56/Makefile.ext
==============================================================================
--- head/lang/php56/Makefile.ext	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/lang/php56/Makefile.ext	Sun Jan 10 16:44:24 2016	(r405721)
@@ -146,7 +146,7 @@ USE_OPENSSL=	yes
 .if ${PHP_MODNAME} == "interbase"
 CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}
 
-USE_FIREBIRD=	yes
+USES+=		firebird
 .endif
 
 .if ${PHP_MODNAME} == "json"
@@ -277,7 +277,7 @@ USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
-USE_SQLITE=	yes
+USE+=		sqlite
 CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo

Modified: head/lang/racket/Makefile
==============================================================================
--- head/lang/racket/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/lang/racket/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -35,10 +35,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/racket-${PORTVERSION}/src
-USES=		iconv jpeg libtool tar:tgz
+USES=		iconv jpeg libtool sqlite tar:tgz
 USE_LDCONFIG=	yes
 USE_GNOME=	pango
-USE_SQLITE=	3
 
 ONLY_FOR_ARCHS=	i386 amd64
 

Modified: head/lang/smalltalk/Makefile
==============================================================================
--- head/lang/smalltalk/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/lang/smalltalk/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -24,9 +24,8 @@ PGSQL_USES=	pgsql
 SDL_USE=	SDL=image,mixer,sdl,sound,ttf
 
 USES=		execinfo gmake iconv libtool localbase makeinfo pkgconfig \
-		shebangfix tar:xz
+		shebangfix sqlite tar:xz
 USE_GNOME=	pango
-USE_SQLITE=	yes
 USE_XORG=	ice xi xmu
 USE_GL=		gl glut
 GNU_CONFIGURE=	yes

Modified: head/lang/urweb/Makefile
==============================================================================
--- head/lang/urweb/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/lang/urweb/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -49,7 +49,7 @@ CONFIGURE_ENV+=	PGHEADER="no"
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	yes
+USES+=		sqlite
 .else
 CONFIGURE_ENV+=	SQHEADER="no"
 .endif

Modified: head/mail/bogofilter-sqlite/Makefile
==============================================================================
--- head/mail/bogofilter-sqlite/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/mail/bogofilter-sqlite/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -8,8 +8,7 @@ PKGNAMESUFFIX=	-sqlite
 
 MAINTAINER=	mandree at FreeBSD.org
 
-USE_SQLITE=	3
-
+USES=		sqlite
 CONFLICTS_INSTALL=	bogofilter-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
 
 CONFIGURE_ARGS=	--with-database=sqlite

Modified: head/mail/cyrus-imapd25/Makefile
==============================================================================
--- head/mail/cyrus-imapd25/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/mail/cyrus-imapd25/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -162,7 +162,7 @@ IGNORE=		DRAC is not available
 .endif
 
 .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=yes
+USES+=	sqlite
 .endif
 
 .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \

Modified: head/mail/evolution-ews/Makefile
==============================================================================
--- head/mail/evolution-ews/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/mail/evolution-ews/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -18,10 +18,9 @@ RUN_DEPENDS=	evolution>=3.0.0:${PORTSDIR
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig sqlite tar:xz
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
-USE_SQLITE=	3
 USE_BDB=	5
 USE_OPENLDAP=	yes
 USE_LDCONFIG=	yes

Modified: head/mail/ezmlm-idx/Makefile
==============================================================================
--- head/mail/ezmlm-idx/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/mail/ezmlm-idx/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -52,7 +52,7 @@ PLIST_SUB+=	MYSQL="@comment " PGSQL="" S
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	yes
+USES+=		sqlite
 EXTRACT_INCLUDE+=	-I${LOCALBASE}/include
 EXTRACT_LIB+=	-L${LOCALBASE}/lib -lsqlite3
 ALL_TARGET+=	sqlite3

Modified: head/mail/greylite/Makefile
==============================================================================
--- head/mail/greylite/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/mail/greylite/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -14,8 +14,7 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
 
-USES=		tar:bzip2
-USE_SQLITE=	3
+USES=		sqlite tar:bzip2
 PLIST_FILES=	bin/greylite \
 		%%DNSBLENV%%bin/dnsblenv	\
 		%%UCSPI2SOCKET%%bin/ucspi2socket \

Modified: head/mail/libmapi/Makefile
==============================================================================
--- head/mail/libmapi/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/mail/libmapi/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -22,8 +22,8 @@ RUN_DEPENDS=	${SAMBA_DEP}
 CODENAME=	QUADRANT
 DOWNLOADCODE=	244
 
-USE_SQLITE=	3
-USES=		compiler:c++11-lib gmake pathfix pkgconfig python shebangfix
+USES=		compiler:c++11-lib gmake pathfix pkgconfig python shebangfix \
+		sqlite
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/mail/qsf/Makefile
==============================================================================
--- head/mail/qsf/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/mail/qsf/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--without-mysql
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE2}
-USE_SQLITE=	2
+USES+=		sqlite:2
 .else
 CONFIGURE_ARGS+=	--without-sqlite
 .endif

Modified: head/mail/rspamd-devel/Makefile
==============================================================================
--- head/mail/rspamd-devel/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/mail/rspamd-devel/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -45,13 +45,12 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rsp
 		-DDEBUG=ON
 
 USES=		cmake:outsource gettext iconv pkgconfig tar:xz perl5 \
-		compiler:c11
+		compiler:c11 sqlite
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 USE_GNOME=	glib20
 USE_OPENSSL=	yes
-USE_SQLITE=	yes
 DEBUG_FLAGS=	-g -O0
 WITH_DEBUG=	yes
 

Modified: head/mail/rspamd/Makefile
==============================================================================
--- head/mail/rspamd/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/mail/rspamd/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -40,13 +40,12 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rsp
 		-DNO_SHARED=ON
 
 USES=		cmake:outsource gettext iconv pkgconfig tar:xz perl5 \
-		compiler:c11
+		compiler:c11 sqlite
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 USE_GNOME=	glib20
 USE_OPENSSL=	yes
-USE_SQLITE=	yes
 
 .include <bsd.port.options.mk>
 

Modified: head/multimedia/avidemux/Makefile.common
==============================================================================
--- head/multimedia/avidemux/Makefile.common	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/multimedia/avidemux/Makefile.common	Sun Jan 10 16:44:24 2016	(r405721)
@@ -18,8 +18,7 @@ USE_QT4=	# empty
 
 OPTIONS_FILE=	${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options
 
-USE_SQLITE=	yes
-USES=		cmake:outsource pkgconfig iconv gmake compiler:features
+USES=		cmake:outsource pkgconfig iconv gmake compiler:features sqlite
 USES+=		dos2unix execinfo
 DOS2UNIX_FILES=	cmake/admCheckMiscLibs.cmake po/CMakeLists.txt
 CMAKE_ARGS+=	-DGNUMAKE_EXECUTABLE=gmake

Modified: head/multimedia/banshee/Makefile
==============================================================================
--- head/multimedia/banshee/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/multimedia/banshee/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -33,14 +33,13 @@ YOUTUBE_DESC=	Build and/or install the Y
 OPTIONS_DEFAULT=BPMDETECT GIO MTP WEBKIT YOUTUBE
 
 USES=		desktop-file-utils gmake libtool mono pathfix perl5 \
-		pkgconfig shared-mime-info tar:xz
+		pkgconfig shared-mime-info sqlite tar:xz
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomedocutils gnomesharp20 gtksharp20 intltool
 USE_GSTREAMER=	cdparanoia
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME:C/-.*//}
 USE_XORG=	xrandr xxf86vm
-USE_SQLITE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}

Modified: head/multimedia/gmerlin/Makefile
==============================================================================
--- head/multimedia/gmerlin/Makefile	Sun Jan 10 16:42:07 2016	(r405720)
+++ head/multimedia/gmerlin/Makefile	Sun Jan 10 16:44:24 2016	(r405721)
@@ -17,11 +17,10 @@ LIB_DEPENDS=	libexif.so:${PORTSDIR}/grap
 		libgavl.so:${PORTSDIR}/multimedia/gavl \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
-USES=		gettext libtool makeinfo pathfix pkgconfig
+USES=		gettext libtool makeinfo pathfix pkgconfig sqlite
 USE_GNOME=	gtk20 libxml2
 USE_XORG=	x11 xext xfixes xinerama xv
 USE_GL=		gl
-USE_SQLITE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_func_inotify_init=no
 CONFIGURE_ARGS=	--disable-v4l --disable-v4l2 --disable-v4lconvert \

More information about the svn-ports-all mailing list