*/*: sync with upstream

Taken from: FreeBSD
2016-04-26 08:06:37 +02:00 · 2016-04-26 08:06:37 +02:00 · a938418a2c
parent e438f17766
commit a938418a2c
318 changed files with 2166 additions and 1461 deletions
--- a/astro/foxtrotgps/Makefile
+++ b/astro/foxtrotgps/Makefile
@ -20,14 +20,13 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	DATADIRNAME=share
 CONFIGURE_ARGS=	--disable-schemas-install
-USES=		gettext gmake pkgconfig shebangfix
+USES=		gettext gmake pkgconfig shebangfix sqlite:3
 SHEBANG_FILES=	contrib/convert2gpx \
 		contrib/convert2osm \
 		contrib/georss2foxtrotgps-poi\
 		contrib/gpx2osm

 USE_GNOME=	gtk20 gconf2 libxml2 intltool libglade2
-USE_SQLITE=	3
 INSTALLS_ICONS=	yes

 GCONF_SCHEMAS=	apps_foxtrotgps.schemas
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@ -12,9 +12,7 @@ LICENSE=	GPLv3
 USE_GITHUB=	yes
 GH_ACCOUNT=	heckendorfc

-USES=		cmake
-
-USE_SQLITE=	yes
+USES=		cmake sqlite

 USE_LDCONFIG=	yes

--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@ -16,13 +16,12 @@ LIB_DEPENDS=	libplist.so:devel/libplist \
 		libtag.so:audio/taglib \
 		libsgutils2.so:sysutils/sg3_utils

-USES=		gettext gmake libtool localbase pathfix pkgconfig tar:bzip2
+USES=		gettext gmake libtool localbase pathfix pkgconfig sqlite:3 tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --disable-udev --without-hal \
 		--with-html-dir="${DOCSDIR:H}"
 USE_CSTD=	gnu89
 USE_GNOME=	gdkpixbuf2 gtk20 intltool
-USE_SQLITE=	3
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes

--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@ -22,9 +22,8 @@ OPTIONS_DEFAULT=	JACK
 DSSI_DESC=	Enable DSSI support
 LV2CORE_DESC=	Enable LV2 support

-USES=		tar:bzip2 libtool gmake pathfix pkgconfig
+USES=		tar:bzip2 libtool gmake pathfix pkgconfig sqlite:3
 GNU_CONFIGURE=	yes
-USE_SQLITE=	3
 CONFIGURE_ENV=	HAVE_UNIX98=1
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
--- a/audio/lollypop/Makefile
+++ b/audio/lollypop/Makefile
@ -18,10 +18,9 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3 \
 LIB_DEPENDS=	libnotify.so:devel/libnotify \
 	libtotem-plparser.so:multimedia/totem-pl-parser

-USES=	shebangfix python:3 pkgconfig gettext gmake tar:xz
+USES=	shebangfix python:3 pkgconfig gettext gmake sqlite tar:xz
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk30 py3gobject3 introspection:build intltool intlhack
-USE_SQLITE=	yes
 USE_GSTREAMER1=	yes mad ogg flac opus libav faad good speex
 USE_PYTHON=	py3kplist
 INSTALLS_ICONS=	yes
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@ -17,9 +17,8 @@ LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libcurl.so:ftp/curl

-USES=		desktop-file-utils gettext gmake iconv localbase pkgconfig
+USES=		desktop-file-utils gettext gmake iconv localbase pkgconfig sqlite
 USE_GNOME=	gtk20 intltool
-USE_SQLITE=	yes
 GNU_CONFIGURE=	yes
 # Cannot enable -Werror yet: Clang does not like the code `printf(_("..."))',
 # see this bug for details: http://llvm.org/bugs/show_bug.cgi?id=3814
--- a/audio/pragha/Makefile
+++ b/audio/pragha/Makefile
@ -19,10 +19,9 @@ LIB_DEPENDS=	libtag.so:audio/taglib \
 	libtotem-plparser.so:multimedia/totem-pl-parser

 USES=	compiler:c11 desktop-file-utils gettext-tools gmake libtool \
-	pkgconfig tar:bz2
+	pkgconfig sqlite tar:bz2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk30 intltool intlhack
-USE_SQLITE=	yes
 USE_GSTREAMER1=	yes faad flac libav mad ogg speex
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
--- a/audio/py-soundcloud/Makefile
+++ b/audio/py-soundcloud/Makefile
@ -7,7 +7,7 @@ CATEGORIES=	audio devel www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

-MAINTAINER=	Bernard Spil <brnrd@FreeBSD.org>
+MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	A friendly wrapper library for the Soundcloud API

 LICENSE=	BSD3CLAUSE
--- a/cad/fidocadj/Makefile
+++ b/cad/fidocadj/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	fidocadj
-PORTVERSION=	0.24.4
+PORTVERSION=	0.24.6
 #PORTREVISION=	0
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/:src SF/${PORTNAME}/manuals/:docs
@ -16,6 +16,7 @@ LICENSE=	GPLv3

 DATADIR=	${JAVASHAREDIR}/${PORTNAME}

+NO_ARCH=	yes
 NO_BUILD=	yes

 SUB_FILES=	${PORTNAME}.sh
--- a/cad/fidocadj/distinfo
+++ b/cad/fidocadj/distinfo
@ -1,4 +1,4 @@
-SHA256 (fidocadj.jar) = d9499a9797460348c4fe91405c5cc2ff154a9f1e1daa88bb6104288a36e719f2
-SIZE (fidocadj.jar) = 587644
+SHA256 (fidocadj.jar) = 43317930b20af0f2491cb22f03df6cc61f8367ccfffe4c4bbc946390f78235aa
+SIZE (fidocadj.jar) = 689142
 SHA256 (fidocadj_manual_en.pdf) = 148a926d96b7c91afbefcc6af13f0f973601342d9a2dcc8bdc3d4612b1b223d1
 SIZE (fidocadj_manual_en.pdf) = 2570172
--- a/cad/fidocadj/pkg-descr
+++ b/cad/fidocadj/pkg-descr
@ -6,4 +6,4 @@ FidoCadJ stores its drawings in a compact text format, practical for the
 copy and paste in newsgroups and forums: this has determined its success
 on the Usenet and in numerous communities.

-WWW: http://fidocadj.sourceforge.net
+WWW: http://darwinne.github.io/FidoCadJ/index.html
--- a/chinese/libchewing/Makefile
+++ b/chinese/libchewing/Makefile
@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo

-USES=		cmake libtool pathfix pkgconfig tar:bzip2
-USE_SQLITE=	yes
+USES=		cmake libtool pathfix pkgconfig sqlite tar:bzip2
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	chewing
--- a/comms/Makefile
+++ b/comms/Makefile
@ -81,6 +81,7 @@
    SUBDIR += libcodec2
    SUBDIR += libconcord
    SUBDIR += libfap
+    SUBDIR += libfec
    SUBDIR += libimobiledevice
    SUBDIR += libirman
    SUBDIR += libmodbus
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@ -4,6 +4,7 @@
 PORTNAME=	cqrlog
 PORTVERSION=	2.0.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	comms hamradio

 MAINTAINER=	hamradio@FreeBSD.org
@ -65,5 +66,7 @@ post-patch:
 	${REINPLACE_CMD} -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \
 		${WRKSRC}/Makefile
 	${RM} -rf ${WRKSRC}/src/mysql
+	${LAZARUS_DIR}/tools/lazres ${WRKSRC}/src/fLoTWExport.lrs ${WRKSRC}/src/fLoTWExport.lfm
+	${LAZARUS_DIR}/tools/lazres ${WRKSRC}/src/fPreferences.lrs ${WRKSRC}/src/fPreferences.lfm

 .include <bsd.port.mk>
--- a/comms/cqrlog/files/patch-src_fLoTWExport.lrs
+++ b/comms/cqrlog/files/patch-src_fLoTWExport.lrs
@ -1,11 +0,0 @@
--- src/fLoTWExport.lrs.orig	2016-04-20 16:06:15 UTC
-+++ src/fLoTWExport.lrs
-@@ -50,7 +50,7 @@ LazarusResources.Add('TfrmLoTWExport','F
-   +#2'8'#5'Width'#3'7'#1#7'Caption'#6'I"your qth name" means the qth which you '
-   +'have '#10'defined in tqsl QTH profile'#11'ParentColor'#8#0#0#5'TEdit'#7'edt'
-   +'Tqsl'#4'Left'#2#14#6'Height'#2#27#3'Top'#2#29#5'Width'#3#168#1#8'TabOrder'#2
-  +#0#4'Text'#6')/usr/bin/tqsl -d -l "your qth name" %f -x'#0#0#0#9'TGroupBox'#9
-+  +#0#4'Text'#6')%%LOCALBASE%%/bin/tqsl -d -l "your qth name" %f -x'#0#0#0#9'TGroupBox'#9
-   +'GroupBox6'#4'Left'#2#0#6'Height'#3#6#1#3'Top'#3#216#0#5'Width'#3#217#1#5'Al'
-   +'ign'#7#8'alClient'#7'Caption'#6#8' Upload '#12'ClientHeight'#3#243#0#11'Cli'
-   +'entWidth'#3#213#1#8'TabOrder'#2#2#0#5'TMemo'#5'mStat'#4'Left'#2#0#6'Height'
--- a/comms/cqrlog/files/patch-src_fPreferences.lrs
+++ b/comms/cqrlog/files/patch-src_fPreferences.lrs
@ -1,11 +0,0 @@
--- src/fPreferences.lrs.orig	2016-04-20 16:06:15 UTC
-+++ src/fPreferences.lrs
-@@ -1024,7 +1024,7 @@ LazarusResources.Add('TfrmPreferences','
-   +#2#14#6'Height'#2'Y'#3'Top'#2#11#5'Width'#3#9#2#7'Caption'#6#23' Path for th'
-   +'e xplanet  '#12'ClientHeight'#2'F'#11'ClientWidth'#3#5#2#8'TabOrder'#2#0#0#5
-   +'TEdit'#14'edtXplanetPath'#4'Left'#2#6#6'Height'#2#27#3'Top'#2#15#5'Width'#3
-  +#176#1#8'TabOrder'#2#0#4'Text'#6#16'/usr/bin/xplanet'#0#0#0#9'TGroupBox'#10
-+  +#176#1#8'TabOrder'#2#0#4'Text'#6#16'%%LOCALBASE%%/bin/xplanet'#0#0#0#9'TGroupBox'#10
-   ,'GroupBox22'#4'Left'#2#14#6'Height'#2'p'#3'Top'#2'k'#5'Width'#2'q'#7'Caption'
-   +#6#13' Window size '#12'ClientHeight'#2']'#11'ClientWidth'#2'm'#8'TabOrder'#2
-   +#1#0#6'TLabel'#7'Label66'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#15#5'Width'#2
--- a/comms/libfec/Makefile
+++ b/comms/libfec/Makefile
@ -0,0 +1,49 @@
+# Created by: db
+# $FreeBSD$
+
+PORTNAME=	libfec
+PORTVERSION=	3.0.1
+PORTREVISION=	2
+CATEGORIES=	comms astro hamradio math
+MASTER_SITES=	http://www.ka9q.net/code/fec/ \
+		LOCAL/db
+DISTNAME=	fec-${PORTVERSION}
+
+MAINTAINER=	hamradio@FreeBSD.org
+COMMENT=	Several forward error correction (FEC) decoders
+
+LICENSE=	LGPL21
+
+MAKEFILE=	makefile
+
+GNU_CONFIGURE=	yes
+USES=		autoreconf gmake tar:bzip2
+USE_LDCONFIG=	yes
+PLIST_FILES=	include/fec.h		\
+		lib/libfec.so		\
+		lib/libfec.a		\
+		man/man3/dsp.3.gz	\
+		man/man3/rs.3.gz	\
+		man/man3/simd-viterbi.3.gz
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+CFLAGS+=	-fPIC
+.endif
+
+post-patch:
+	@${CP} ${FILESDIR}/cpu_mode.c ${WRKSRC}
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib
+	@${MKDIR} ${STAGEDIR}${MAN3PREFIX}/man/man3
+	${INSTALL_DATA} ${WRKSRC}/fec.h ${STAGEDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/libfec.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libfec.so ${STAGEDIR}${PREFIX}/lib
+.for _man in dsp.3 simd-viterbi.3 rs.3
+	${INSTALL_MAN} ${WRKSRC}/${_man} ${STAGEDIR}${MAN3PREFIX}/man/man3
+.endfor
+
+.include <bsd.port.post.mk>
--- a/comms/libfec/distinfo
+++ b/comms/libfec/distinfo
@ -0,0 +1,2 @@
+SHA256 (fec-3.0.1.tar.bz2) = 4201f6c80fe3fb283806bf41a74ea3476d783081e7cd6d09f12406894e6f567c
+SIZE (fec-3.0.1.tar.bz2) = 101479
--- a/comms/libfec/files/cpu_mode.c
+++ b/comms/libfec/files/cpu_mode.c
@ -0,0 +1,50 @@
+/* Determine CPU support for SIMD
+ * Copyright 2004 Phil Karn, KA9Q
+ */
+#include <stdio.h>
+#include "fec.h"
+#ifdef __VEC__
+#include <sys/sysctl.h>
+#endif
+
+/* Various SIMD instruction set names */
+char *Cpu_modes[] = {"Unknown","Portable C","x86 Multi Media Extensions (MMX)",
+		   "x86 Streaming SIMD Extensions (SSE)",
+		   "x86 Streaming SIMD Extensions 2 (SSE2)",
+		   "PowerPC G4/G5 Altivec/Velocity Engine"};
+
+enum cpu_mode Cpu_mode;
+
+void find_cpu_mode(void){
+
+  int f;
+  if(Cpu_mode != UNKNOWN)
+    return;
+  else
+    Cpu_mode = PORT;
+#ifdef __i386__
+  /* Figure out what kind of CPU we have */
+  f = cpu_features();
+  if(f & (1<<26)){ /* SSE2 is present */
+    Cpu_mode = SSE2;
+  } else if(f & (1<<25)){ /* SSE is present */
+    Cpu_mode = SSE;
+  } else if(f & (1<<23)){ /* MMX is present */
+    Cpu_mode = MMX;
+  }
+#endif
+//#ifdef __VEC__
+#if 0
+// This looks very Linux specific
+  {
+  /* Ask the OS if we have Altivec support */
+  int selectors[2] = { CTL_HW, HW_VECTORUNIT };
+  int hasVectorUnit = 0;
+  size_t length = sizeof(hasVectorUnit);
+  int error = sysctl(selectors, 2, &hasVectorUnit, &length, NULL, 0);
+  if(0 == error && hasVectorUnit)
+    Cpu_mode = ALTIVEC;
+  }
+#endif
+  fprintf(stderr,"SIMD CPU detect: %s\n",Cpu_modes[Cpu_mode]);
+}
--- a/comms/libfec/files/patch-configure.in
+++ b/comms/libfec/files/patch-configure.in
@ -0,0 +1,27 @@
+--- configure.in.orig	2006-10-13 01:10:53 UTC
+++ configure.in
+@@ -38,7 +38,7 @@ AC_CANONICAL_SYSTEM
+ case $target_cpu in
+ i386|i486|i586|i686)
+ 	ARCH_OPTION="-march=$target_cpu"
+-	MLIBS="viterbi27_mmx.o mmxbfly27.o viterbi27_sse.o ssebfly27.o viterbi27_sse2.o sse2bfly27.o \
+	MLIBS="cpu_features.o viterbi27_mmx.o mmxbfly27.o viterbi27_sse.o ssebfly27.o viterbi27_sse2.o sse2bfly27.o \
+ 	viterbi29_mmx.o mmxbfly29.o viterbi29_sse.o ssebfly29.o viterbi29_sse2.o sse2bfly29.o \
+ 	viterbi39_sse2.o viterbi39_sse.o viterbi39_mmx.o \
+ 	viterbi615_mmx.o viterbi615_sse.o viterbi615_sse2.o \
+@@ -50,13 +50,13 @@ i386|i486|i586|i686)
+ 	sumsq.o sumsq_port.o \
+ 	sumsq_sse2.o sumsq_sse2_assist.o \
+ 	sumsq_mmx.o sumsq_mmx_assist.o \
+-	cpu_features.o cpu_mode_x86.o"
+	cpu_features.o"
+ 	;;
+ powerpc*)
+ 	ARCH_OPTION="-fno-common -faltivec"
+ 	MLIBS="viterbi27_av.o viterbi29_av.o viterbi39_av.o viterbi615_av.o \
+ 	encode_rs_av.o \
+-	dotprod_av.o sumsq_av.o peakval_av.o cpu_mode_ppc.o"
+	dotprod_av.o sumsq_av.o peakval_av.o"
+ 	;;
+ *)
+ 	MLIBS=
--- a/comms/libfec/files/patch-dotprod.c
+++ b/comms/libfec/files/patch-dotprod.c
@ -0,0 +1,24 @@
+--- dotprod.c.orig	2006-10-13 01:10:53 UTC
+++ dotprod.c
+@@ -54,16 +54,21 @@ void freedp(void *p){
+   switch(Cpu_mode){
+   case PORT:
+   default:
+    return;
+  break;
+ #ifdef __i386__
+   case MMX:
+   case SSE:
+     return freedp_mmx(p);
+  break;
+   case SSE2:
+     return freedp_sse2(p);
+  break;
+ #endif
+ #ifdef __VEC__
+   case ALTIVEC:
+     return freedp_av(p);
+  break;
+ #endif
+   }
+ }
--- a/comms/libfec/files/patch-fec.h
+++ b/comms/libfec/files/patch-fec.h
@ -0,0 +1,11 @@
+--- fec.h.orig	2006-10-13 01:10:53 UTC
+++ fec.h
+@@ -262,7 +262,7 @@ extern enum cpu_mode {UNKNOWN=0,PORT,MMX
+ void find_cpu_mode(void); /* Call this once at startup to set Cpu_mode */
+ 
+ /* Determine parity of argument: 1 = odd, 0 = even */
+-#ifdef __i386__
+#ifdef notyet__i386__
+ static inline int parityb(unsigned char x){
+   __asm__ __volatile__ ("test %1,%1;setpo %0" : "=g"(x) : "r" (x));
+   return x;
--- a/comms/libfec/files/patch-makefile.in
+++ b/comms/libfec/files/patch-makefile.in
@ -0,0 +1,193 @@
+--- makefile.in.orig	2006-10-13 01:10:53 UTC
+++ makefile.in
+@@ -8,7 +8,7 @@ prefix = @prefix@
+ exec_prefix=@exec_prefix@
+ VPATH = @srcdir@
+ CC=@CC@
+-LIBS=@MLIBS@ fec.o sim.o viterbi27.o viterbi27_port.o viterbi29.o viterbi29_port.o \
+LIBS=@MLIBS@ cpu_mode.o fec.o sim.o viterbi27.o viterbi27_port.o viterbi29.o viterbi29_port.o \
+ 	viterbi39.o viterbi39_port.o \
+ 	viterbi615.o viterbi615_port.o encode_rs_char.o encode_rs_int.o encode_rs_8.o \
+ 	decode_rs_char.o decode_rs_int.o decode_rs_8.o \
+@@ -43,52 +43,50 @@ test: vtest27 vtest29 vtest39 vtest615 r
+ install: all
+ 	mkdir -p @libdir@ 
+ 	install -m 644 -p $(SHARED_LIB) libfec.a @libdir@
+-#	(cd @libdir@;ln -f -s $(SHARED_LIB) libfec.so)
+-	@REBIND@
+ 	mkdir -p @includedir@
+ 	install -m 644 -p fec.h @includedir@
+ 	mkdir -m 0755 -p @mandir@/man3
+ 	install -m 644 -p simd-viterbi.3 rs.3 dsp.3 @mandir@/man3
+ 
+ peaktest: peaktest.o libfec.a
+-	gcc -g -o $@ $^
+	${CC} -g -o $@ $^
+ 
+ sumsq_test: sumsq_test.o libfec.a
+-	gcc -g -o $@ $^
+	${CC} -g -o $@ $^
+ 
+ dtest: dtest.o libfec.a
+-	gcc -g -o $@ $^ -lm
+	${CC} -g -o $@ $^ -lm
+ 
+ vtest27: vtest27.o libfec.a
+-	gcc -g -o $@ $^ -lm
+	${CC} -g -o $@ $^ -lm
+ 
+ vtest29: vtest29.o libfec.a
+-	gcc -g -o $@ $^ -lm
+	${CC} -g -o $@ $^ -lm
+ 
+ vtest39: vtest39.o libfec.a
+-	gcc -g -o $@ $^ -lm
+	${CC} -g -o $@ $^ -lm
+ 
+ vtest615: vtest615.o libfec.a
+-	gcc -g -o $@ $^ -lm
+	${CC} -g -o $@ $^ -lm
+ 
+ rstest: rstest.o libfec.a
+-	gcc -g -o $@ $^
+	${CC} -g -o $@ $^
+ 
+ rs_speedtest: rs_speedtest.o libfec.a
+-	gcc -g -o $@ $^	
+	${CC} -g -o $@ $^	
+ 
+ # for some reason, the test programs without args segfault on the PPC with -O2 optimization. Dunno why - compiler bug?
+ vtest27.o: vtest27.c fec.h
+-	gcc -g -c $<
+	${CC} -g -c $<
+ 
+ vtest29.o: vtest29.c fec.h
+-	gcc -g -c $<
+	${CC} -g -c $<
+ 
+ vtest39.o: vtest39.c fec.h
+-	gcc -g -c $<
+	${CC} -g -c $<
+ 
+ vtest615.o: vtest615.c fec.h
+-	gcc -g -c $<
+	${CC} -g -c $<
+ 
+ libfec.a: $(LIBS)
+ 	ar rv $@ $^
+@@ -100,7 +98,7 @@ libfec.dylib: $(LIBS)
+ 
+ # for Linux et al
+ libfec.so: $(LIBS)
+-	gcc -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive -lc
+	${CC} -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive -lc
+ 
+ dotprod.o: dotprod.c fec.h
+ 
+@@ -146,10 +144,10 @@ ccsds_tab.c: gen_ccsds
+ 	./gen_ccsds > ccsds_tab.c
+ 
+ gen_ccsds: gen_ccsds.o init_rs_char.o
+-	gcc -o $@ $^
+	${CC} -o $@ $^
+ 
+ gen_ccsds.o: gen_ccsds.c
+-	gcc  $(CFLAGS) -c -o $@ $<
+	${CC}  $(CFLAGS) -c -o $@ $<
+ 
+ ccsds_tal.o: ccsds_tal.c
+ 
+@@ -157,16 +155,16 @@ ccsds_tal.c: gen_ccsds_tal
+ 	./gen_ccsds_tal > ccsds_tal.c
+ 
+ exercise_char.o: exercise.c
+-	gcc $(CFLAGS) -c -o $@ $<
+	${CC} $(CFLAGS) -c -o $@ $<
+ 
+ exercise_int.o: exercise.c
+-	gcc -DBIGSYM=1 $(CFLAGS) -c -o $@ $<
+	${CC} -DBIGSYM=1 $(CFLAGS) -c -o $@ $<
+ 
+ exercise_8.o: exercise.c
+-	gcc -DFIXED=1 $(CFLAGS) -c -o $@ $<
+	${CC} -DFIXED=1 $(CFLAGS) -c -o $@ $<
+ 
+ exercise_ccsds.o: exercise.c
+-	gcc -DCCSDS=1 $(CFLAGS) -c -o $@ $<
+	${CC} -DCCSDS=1 $(CFLAGS) -c -o $@ $<
+ 
+ viterbi27.o: viterbi27.c fec.h
+ 
+@@ -175,13 +173,13 @@ viterbi27_port.o: viterbi27_port.c fec.h
+ viterbi27_av.o: viterbi27_av.c fec.h
+ 
+ viterbi27_mmx.o: viterbi27_mmx.c fec.h
+-	gcc $(CFLAGS) -mmmx -c -o $@ $<
+	${CC} $(CFLAGS) -mmmx -c -o $@ $<
+ 
+ viterbi27_sse.o: viterbi27_sse.c fec.h
+-	gcc $(CFLAGS) -msse -c -o $@ $<
+	${CC} $(CFLAGS) -msse -c -o $@ $<
+ 
+ viterbi27_sse2.o: viterbi27_sse2.c fec.h
+-	gcc $(CFLAGS) -msse2 -c -o $@ $<
+	${CC} $(CFLAGS) -msse2 -c -o $@ $<
+ 
+ viterbi29.o: viterbi29.c fec.h
+ 
+@@ -190,13 +188,13 @@ viterbi29_port.o: viterbi29_port.c fec.h
+ viterbi29_av.o: viterbi29_av.c fec.h
+ 
+ viterbi29_mmx.o: viterbi29_mmx.c fec.h
+-	gcc $(CFLAGS) -mmmx -c -o $@ $<
+	${CC} $(CFLAGS) -mmmx -c -o $@ $<
+ 
+ viterbi29_sse.o: viterbi29_sse.c fec.h
+-	gcc $(CFLAGS) -msse -c -o $@ $<
+	${CC} $(CFLAGS) -msse -c -o $@ $<
+ 
+ viterbi29_sse2.o: viterbi29_sse2.c fec.h
+-	gcc $(CFLAGS) -msse2 -c -o $@ $<
+	${CC} $(CFLAGS) -msse2 -c -o $@ $<
+ 
+ viterbi39.o: viterbi39.c fec.h
+ 
+@@ -205,13 +203,13 @@ viterbi39_port.o: viterbi39_port.c fec.h
+ viterbi39_av.o: viterbi39_av.c fec.h
+ 
+ viterbi39_mmx.o: viterbi39_mmx.c fec.h
+-	gcc $(CFLAGS) -mmmx -c -o $@ $<
+	${CC} $(CFLAGS) -mmmx -c -o $@ $<
+ 
+ viterbi39_sse.o: viterbi39_sse.c fec.h
+-	gcc $(CFLAGS) -msse -c -o $@ $<
+	${CC} $(CFLAGS) -msse -c -o $@ $<
+ 
+ viterbi39_sse2.o: viterbi39_sse2.c fec.h
+-	gcc $(CFLAGS) -msse2 -c -o $@ $<
+	${CC} $(CFLAGS) -msse2 -c -o $@ $<
+ 
+ viterbi615.o: viterbi615.c fec.h
+ 
+@@ -220,17 +218,15 @@ viterbi615_port.o: viterbi615_port.c fec
+ viterbi615_av.o: viterbi615_av.c fec.h
+ 
+ viterbi615_mmx.o: viterbi615_mmx.c fec.h
+-	gcc $(CFLAGS) -mmmx -c -o $@ $<
+	${CC} $(CFLAGS) -mmmx -c -o $@ $<
+ 
+ viterbi615_sse.o: viterbi615_sse.c fec.h
+-	gcc $(CFLAGS) -msse -c -o $@ $<
+	${CC} $(CFLAGS) -msse -c -o $@ $<
+ 
+ viterbi615_sse2.o: viterbi615_sse2.c fec.h
+-	gcc $(CFLAGS) -msse2 -c -o $@ $<
+-
+-cpu_mode_x86.o: cpu_mode_x86.c fec.h
+	${CC} $(CFLAGS) -msse2 -c -o $@ $<
+ 
+-cpu_mode_ppc.o: cpu_mode_ppc.c fec.h
+cpu_mode.o: cpu_mode.c fec.h
+ 
+ 
+ clean:
--- a/comms/libfec/pkg-descr
+++ b/comms/libfec/pkg-descr
@ -0,0 +1,20 @@
+This library package provides several forward error correction (FEC) decoders
+and accelerated primitives useful in digital signal processing (DSP).
+Except for the Reed-Solomon codecs, these functions take full advantage of
+the MMX, SSE and SSE2 SIMD instruction sets on Intel/AMD IA-32 processors
+and the Altivec/VMX/Velocity Engine SIMD instruction set on the
+G4 and G5 PowerPC. 
+The library includes Viterbi decoders for the following convolutional codes:  
+rate 1/2 k=7 
+rate 1/2 k=9 
+rate 1/6 k=15 ("Cassini")  
+plus two Reed-Solomon encoder-decoders:  
+one optimized for the (255,223) CCSDS standard code 
+a general purpose encoder/decoder for arbitrary RS codes  
+and three low-level 16-bit DSP support routines:  
+signed dot product 
+peak detection 
+sum-of-squares (energy) computation  
+This library is licensed under the "lesser" GNU General Public License.
+
+WWW: http://www.ka9q.net/code/fec/
--- a/converters/p5-JSON-PP/Makefile
+++ b/converters/p5-JSON-PP/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	JSON-PP
-PORTVERSION=	2.27300
-PORTREVISION=	1
+PORTVERSION=	2.27400
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MAKAMAKA
--- a/converters/p5-JSON-PP/distinfo
+++ b/converters/p5-JSON-PP/distinfo
@ -1,2 +1,2 @@
-SHA256 (JSON-PP-2.27300.tar.gz) = 5feef3067be4acd99ca0ebb29cf1ac1cdb338fe46977585bd1e473ea4bab71a3
-SIZE (JSON-PP-2.27300.tar.gz) = 41365
+SHA256 (JSON-PP-2.27400.tar.gz) = 0e960e89e639248c30316661f519774fab7aa1e37f367147a049f2c7ea5e06c9
+SIZE (JSON-PP-2.27400.tar.gz) = 41780
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@ -41,7 +41,7 @@ PGSQL_DESC=	Install PostgreSQL Qt plugin
 PGSQL_USE=	QT4=sql-pgsql_run

 SQLITE_DESC=	Enable SQLite backend
-SQLITE_USE=	SQLITE=3
+SQLITE_USES=	sqlite:3
 SQLITE_CMAKE_OFF=	-DAKONADI_BUILD_QSQLITE=off

 OPTIONS_DEFAULT=	MYSQL
--- a/databases/cppdb/Makefile
+++ b/databases/cppdb/Makefile
@ -91,7 +91,7 @@ PLIST_SUB+=	PGSQL=""
 CMAKE_ARGS+=	-DDISABLE_SQLITE:BOOL=ON
 PLIST_SUB+=	SQLITE3="@comment "
 .else
-USE_SQLITE=	3
+USES+=		sqlite:3
 CMAKE_ARGS+=	-DDISABLE_SQLITE:BOOL=OFF
 .if ${PORT_OPTIONS:MSQLITE3_INTERNAL}
 CMAKE_ARGS+=	-DSQLITE_BACKEND_INTERNAL:BOOL=ON
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@ -72,7 +72,7 @@ IGNORE=		your system does not support sysvipc

 .if !defined(CLIENT_ONLY)
 # Server part stuff
-LIB_DEPENDS+=	libfbembed.so:databases/firebird25-client
+USES+=		firebird

 CONFIGURE_ARGS+=--enable-superserver --without-editline

--- a/databases/flamerobin/Makefile
+++ b/databases/flamerobin/Makefile
@ -16,8 +16,7 @@ LICENSE_NAME=	FlameRobin Expat
 LICENSE_FILE=	${WRKSRC}/docs/fr_license.html
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

-USES=		compiler
-USE_FIREBIRD=	yes
+USES=		compiler firebird
 USE_WX=		2.8+
 WX_COMPS=	wx contrib
 WX_CONF_ARGS=	absolute
--- a/databases/fpc-ibase/Makefile
+++ b/databases/fpc-ibase/Makefile
@ -17,6 +17,6 @@ OPTIONS_DEFINE=	IBASE
 IBASE_DESC=	Install Interbase/Firebird client
 OPTIONS_DEFAULT=	IBASE

-IBASE_USE=	FIREBIRD=yes
+IBASE_USES=	firebird

 .include "${MASTERDIR}/Makefile"
--- a/databases/fpc-sqlite/Makefile
+++ b/databases/fpc-sqlite/Makefile
@ -16,6 +16,6 @@ EXTRACTUNITDIR=	${WRKUNITDIR}
 OPTIONS_DEFINE=	SQLITE
 OPTIONS_DEFAULT=	SQLITE

-SQLITE_USE=	SQLITE=yes
+SQLITE_USES=	sqlite

 .include "${MASTERDIR}/Makefile"
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@ -111,7 +111,7 @@ ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_ON=	--with-odbc
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgres
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite

 .include <bsd.port.options.mk>
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--without-mysql
 .endif

 .if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	yes
+USES+=		sqlite
 .else
 CONFIGURE_ARGS+=	--without-sqlite
 .endif
--- a/databases/luadbi/Makefile
+++ b/databases/luadbi/Makefile
@ -35,7 +35,7 @@ MYSQL_CFLAGS=		-I ${LOCALBASE}/include/mysql
 MYSQL_ALL_TARGET=	mysql
 MYSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbdmysql.so

-SQLITE3_USE=		SQLITE=3
+SQLITE3_USES=		sqlite:3
 SQLITE3_ALL_TARGET=	sqlite3
 SQLITE3_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbdsqlite3.so

--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs

-USE_MYSQL=	51+
-USES=		cmake:outsource
+USES=		cmake:outsource mysql
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DDOC_DESTINATION="${DOCSDIR}"

--- a/databases/mysql-connector-c/Makefile
+++ b/databases/mysql-connector-c/Makefile
@ -12,10 +12,9 @@ COMMENT=	MySQL database connector for C

 LICENSE=	GPLv2

-USE_MYSQL=	51+
 USE_OPENSSL=	yes
 WITH_OPENSSL_PORT=yes
-USES=		cmake:outsource compiler:features
+USES=		cmake:outsource compiler:features mysql
 CMAKE_ARGS+=	-DWITH_SSL=system \
 		-DOPENSSL_INCLUDE_DIR=${LOCALBASE}/include/openssl
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@ -38,7 +38,7 @@ PGSQL_USES=	pgsql

 SQLITE_LIB_DEPENDS=	libsqlite.so:databases/sqlite2

-SQLITE3_USE=	SQLITE=3
+SQLITE3_USES=	sqlite:3

 MSSQL_LIB_DEPENDS=	libsybdb.so:databases/freetds

--- a/databases/p5-DBD-InterBase/Makefile
+++ b/databases/p5-DBD-InterBase/Makefile
@ -14,9 +14,7 @@ COMMENT=	DBI driver for InterBase/Firebird/Yaffil RDBMS server
 BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}

-USE_FIREBIRD=	yes
-
-USES=		perl5
+USES=		perl5 firebird
 USE_PERL5=	patch configure

 post-patch:
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	DBI
-PORTVERSION=	1.634
+PORTVERSION=	1.636
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/databases/p5-DBI/distinfo
+++ b/databases/p5-DBI/distinfo
@ -1,2 +1,2 @@
-SHA256 (DBI-1.634.tar.gz) = 250712f385864818abfba409420d16d9ee61f1cc73ac85159d054a5ee86d1450
-SIZE (DBI-1.634.tar.gz) = 595020
+SHA256 (DBI-1.636.tar.gz) = 8f7ddce97c04b4b7a000e65e5d05f679c964d62c8b02c94c1a7d815bb2dd676c
+SIZE (DBI-1.636.tar.gz) = 595433
--- a/databases/p5-DBI/pkg-plist
+++ b/databases/p5-DBI/pkg-plist
@ -32,7 +32,6 @@ bin/dbiproxy
 %%SITE_ARCH%%/DBI/DBD/SqlEngine.pm
 %%SITE_ARCH%%/DBI/DBD/SqlEngine/Developers.pod
 %%SITE_ARCH%%/DBI/DBD/SqlEngine/HowTo.pod
-%%SITE_ARCH%%/DBI/FAQ.pm
 %%SITE_ARCH%%/DBI/Gofer/Execute.pm
 %%SITE_ARCH%%/DBI/Gofer/Request.pm
 %%SITE_ARCH%%/DBI/Gofer/Response.pm
@ -95,7 +94,6 @@ bin/dbiproxy
 %%PERL5_MAN3%%/DBI::DBD::SqlEngine.3.gz
 %%PERL5_MAN3%%/DBI::DBD::SqlEngine::Developers.3.gz
 %%PERL5_MAN3%%/DBI::DBD::SqlEngine::HowTo.3.gz
-%%PERL5_MAN3%%/DBI::FAQ.3.gz
 %%PERL5_MAN3%%/DBI::Gofer::Execute.3.gz
 %%PERL5_MAN3%%/DBI::Gofer::Request.3.gz
 %%PERL5_MAN3%%/DBI::Gofer::Response.3.gz
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@ -51,7 +51,7 @@ MYSQL_USE=		MYSQL=yes
 ORACLE_BUILD_DEPENDS=	p5-DBD-Oracle>=0.19:databases/p5-DBD-Oracle
 ORACLE_RUN_DEPENDS=	p5-DBD-Oracle>=0.19:databases/p5-DBD-Oracle
 PGSQL_USES=		pgsql
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite

 .include <bsd.port.pre.mk>

--- a/databases/proftpd-mod_sql_sqlite/Makefile
+++ b/databases/proftpd-mod_sql_sqlite/Makefile
@ -15,7 +15,7 @@ DESCR=		${.CURDIR}/pkg-descr

 MASTERDIR=	${.CURDIR}/../../ftp/proftpd

-USE_SQLITE=	yes
+USES=		sqlite

 INCLUDEDIRS=	${LOCALBASE}/include
 LIBDIRS=	${LOCALBASE}/lib
--- a/databases/py-fdb/Makefile
+++ b/databases/py-fdb/Makefile
@ -12,10 +12,8 @@ COMMENT=	Firebird RDBMS bindings for Python

 LICENSE=	ISCL

-LIB_DEPENDS=	libfbclient.so:databases/firebird25-client
-
 NO_ARCH=	yes
-USES=		python
+USES=		firebird python
 USE_PYTHON=	autoplist distutils

 .include <bsd.port.pre.mk>
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@ -5,6 +5,6 @@ PORTREVISION=	1

 COMMENT=	Qt InterBase/Firebird database plugin
 DB=		ibase
-USE_FIREBIRD=	yes
+USES+=		firebird

 .include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers"
--- a/databases/qt5-sqldrivers-ibase/Makefile
+++ b/databases/qt5-sqldrivers-ibase/Makefile
@ -3,6 +3,6 @@
 DB=		IBase
 DB_DESC=	InterBase/Firebird

-USE_FIREBIRD=	yes
+USES=		firebird

 .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers"
--- a/databases/qt5-sqldrivers-sqlite2/Makefile
+++ b/databases/qt5-sqldrivers-sqlite2/Makefile
@ -3,6 +3,6 @@
 DB=		SQLite2
 DB_DESC=	SQLite 2

-USE_SQLITE=	2
+USES=		sqlite:2

 .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers"
--- a/databases/qt5-sqldrivers-sqlite3/Makefile
+++ b/databases/qt5-sqldrivers-sqlite3/Makefile
@ -5,7 +5,7 @@ PORTNAME=	sqlite3
 DB=		SQLite
 DB_DESC=	SQLite 3

-USE_SQLITE=	3
+USES=		sqlite:3
 CONFIGURE_ARGS=	-system-sqlite

 .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers"
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@ -33,7 +33,7 @@ PGSQL_USES=	pgsql
 PGSQL_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=ON
 PGSQL_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=OFF

-SQLITE_USE=	SQLITE=yes
+SQLITE_USES=	sqlite
 SQLITE_CMAKE_ON=	-DWITH_SQLITE3:BOOL=ON
 SQLITE_CMAKE_OFF=	-DWITH_SQLITE3:BOOL=OFF

@ -46,7 +46,7 @@ BOOST_LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 BOOST_CMAKE_ON=	-DWITH_BOOST:BOOL=ON
 BOOST_CMAKE_OFF=	-DWITH_BOOST:BOOL=OFF

-FIREBIRD_USE=	FIREBIRD=yes
+FIREBIRD_USES=	firebird
 FIREBIRD_CMAKE_ARGS_ON=	-DWITH_FIREBIRD:BOOL=ON
 FIREBIRD_CMAKE_ARGS_OFF=	-DWITH_FIREBIRD:BOOL=OFF

--- a/databases/spatialite-tools/Makefile
+++ b/databases/spatialite-tools/Makefile
@ -18,8 +18,7 @@ LIB_DEPENDS=	libgeos_c.so:graphics/geos \
 		libreadosm.so:astro/readosm

 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig iconv
-USE_SQLITE=	yes
+USES=		gmake pkgconfig iconv sqlite

 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
--- a/databases/spatialite/Makefile
+++ b/databases/spatialite/Makefile
@ -19,8 +19,7 @@ LIB_DEPENDS=	libgeos_c.so:graphics/geos \

 WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
-USES=		gmake iconv pathfix pkgconfig libtool
-USE_SQLITE=	yes
+USES=		gmake iconv pathfix pkgconfig libtool sqlite
 USE_GNOME=	libxml2

 CFLAGS+=	-I${WRKSRC}/src/headers -I${LOCALBASE}/include
--- a/databases/spatialite/pkg-descr
+++ b/databases/spatialite/pkg-descr
@ -5,4 +5,4 @@ Cartographic Data, GeoSpatial Data, Geometry Data and alike). SpatiaLite
 implements spatial extensions following the specification of the Open
 Geospatial Consortium (OGC). 

-WWW: http://www.gaia-gis.it/spatialite-2.0/index.html
+WWW: http://www.gaia-gis.it/gaia-sins/
--- a/databases/sqlite-ext-miscfuncs/Makefile
+++ b/databases/sqlite-ext-miscfuncs/Makefile
@ -13,7 +13,7 @@ EXTRACT_SUFX=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Math, string, and aggregate function library for SQLite

-USE_SQLITE=	yes
+USES=		sqlite
 DIST_SUBDIR=	sqlite-ext
 NO_WRKSUBDIR=	yes

--- a/databases/sqlite-ext-pcre/Makefile
+++ b/databases/sqlite-ext-pcre/Makefile
@ -9,7 +9,6 @@ COMMENT=	Regexp function for SQLite based on PCRE library

 LIB_DEPENDS+=	libpcre.so:devel/pcre

-USE_SQLITE=	yes
 DIST_SUBDIR=	sqlite-ext

 LIBFILE=	pcre.so
@ -20,7 +19,7 @@ SUB_LIST+=	LIBFILE=${LIBFILE}

 PLIST_FILES=	libexec/${DIST_SUBDIR}/${LIBFILE}

-USES=		gmake pkgconfig
+USES=		gmake pkgconfig sqlite

 USE_GITHUB=	yes
 GH_ACCOUNT=	ralight
--- a/databases/sqlitebrowser/Makefile
+++ b/databases/sqlitebrowser/Makefile
@ -14,10 +14,9 @@ LICENSE_COMB=	dual

 USE_GITHUB=	yes

-USES=		cmake desktop-file-utils
+USES=		cmake desktop-file-utils sqlite
 USE_QT4=	corelib network gui qmake_build linguisttools_build \
 		moc_build uic_build rcc_build
-USE_SQLITE=	yes

 INSTALLS_ICONS=	yes

--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@ -12,8 +12,7 @@ COMMENT=	Admin's GUI tool for Sqlite3

 LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2

-USES=		cmake
-USE_SQLITE=	yes
+USES=		cmake sqlite
 USE_QT4=	qmake_build gui moc_build rcc_build uic_build xml sql

 GNU_CONFIGURE=	yes
--- a/databases/sqlitestudio/Makefile
+++ b/databases/sqlitestudio/Makefile
@ -37,10 +37,9 @@ OPTIONS_SUB=	yes

 WRKSRC=		${WRKDIR}/SQLiteStudio3

-USES=		compiler:c++11-lib gmake ncurses qmake
+USES=		compiler:c++11-lib gmake ncurses qmake sqlite
 USE_QT5=	core gui svg sql xml network sql-sqlite3_run widgets script \
 		concurrent uitools buildtools_build linguisttools_build
-USE_SQLITE=	yes
 USE_GL=		gl
 USE_LDCONFIG=	yes

--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@ -110,7 +110,7 @@ CONFIGURE_ARGS+=	--disable-mysql
 .endif

 .if ${PORT_OPTIONS:MFIREBIRD}
-USE_FIREBIRD=	yes
+USES+=		firebird
 CONFIGURE_ARGS+=	--with-firebird-prefix="${LOCALBASE}"
 TOSTRIP+=		libexec/sqlrelay/sqlrconnection_firebird.so
 .else
--- a/databases/tcl-Mysql/Makefile
+++ b/databases/tcl-Mysql/Makefile
@ -15,8 +15,7 @@ OPTIONS_DEFINE=	DOCS

 PATCH_DEPENDS=	rcsdiff:devel/rcs

-USE_MYSQL=	41+
-USES=		tcl tar:tgz
+USES=		mysql tcl tar:tgz
 TCL_NODOT=	tcl${TCL_VER:S/.//}
 WRKSRC=		${WRKDIR}/tcl-sql
 LIB_NAME=	libTclMySQL.so.1
--- a/databases/virtualpg/Makefile
+++ b/databases/virtualpg/Makefile
@ -13,8 +13,7 @@ LICENSE=	MPL LGPL21 GPLv2
 LICENSE_COMB=	dual

 GNU_CONFIGURE=	yes
-USES=		gmake iconv pathfix pkgconfig libtool pgsql
-USE_SQLITE=	yes
+USES=		gmake iconv pathfix pkgconfig libtool pgsql sqlite
 USE_LDCONFIG=	yes

 CFLAGS+=	-I${WRKSRC}/src/headers -I${LOCALBASE}/include
--- a/databases/vsqlite/Makefile
+++ b/databases/vsqlite/Makefile
@ -16,9 +16,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	vinzenz
 GH_PROJECT=	vsqlite--

-USES=		autoreconf compiler:c++0x libtool
+USES=		autoreconf compiler:c++0x libtool sqlite:3
 GNU_CONFIGURE=	yes
-USE_SQLITE=	3
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@ -27,9 +27,8 @@ STATUS=		debug
 STATUS=		release
 .endif

-USES=		compiler gmake iconv pkgconfig tar:tgz
+USES=		compiler gmake iconv pkgconfig sqlite tar:tgz
 USE_LDCONFIG=	yes
-USE_SQLITE=	yes

 INSTALL_TARGET=	do_install

--- a/deskutils/growl-for-linux/Makefile
+++ b/deskutils/growl-for-linux/Makefile
@ -31,11 +31,10 @@ OPTIONS_DEFINE=	LIBNOTIFY

 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,}

-USES=		autoreconf compiler:nestedfct libtool pkgconfig
+USES=		autoreconf compiler:nestedfct libtool pkgconfig sqlite:3
 USE_GITHUB=	yes
 USE_GNOME=	gtk20
 USE_OPENSSL=	yes
-USE_SQLITE=	3

 post-patch:
 	@${REINPLACE_CMD} '/^gol_LDADD =/s/$$/ -lgmodule-2.0/' \
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@ -12,14 +12,13 @@ COMMENT=	GWMetadata for GNUstep workspace manager

 LICENSE=	GPLv2

-USES=		gnustep
+USES=		gnustep sqlite
 USE_GNUSTEP=	back build
 GNU_CONFIGURE=	yes
 LIB_DEPENDS=	libDBKit.so:deskutils/gworkspace \
 		libPreferencePanes.so:deskutils/systempreferences
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}

-USE_SQLITE=	yes
 LDFLAGS+=	-lpthread

 WRKSRC=		${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@ -18,9 +18,8 @@ LIB_DEPENDS=	libical.so:devel/libical \
 		libgtkspell.so:textproc/gtkspell \
 		libwebkitgtk-1.0.so:www/webkit-gtk2

-USES=		gettext gmake libarchive pkgconfig
+USES=		gettext gmake libarchive pkgconfig sqlite
 USE_GNOME=	gtk20 libxml2
-USE_SQLITE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes

--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@ -47,9 +47,8 @@ CONFIGURE_ENV=	MKDIR_P="${MKDIR}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lboost_system

-USES=		gettext libarchive libtool pkgconfig python shebangfix
+USES=		gettext libarchive libtool pkgconfig python shebangfix sqlite:3
 USE_OPENSSL=	yes
-USE_SQLITE=	3
 USE_XORG=	pixman
 USE_LDCONFIG=	${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters
 SHEBANG_FILES=	scripts/bash/*.sh
--- a/devel/bugzilla44/Makefile
+++ b/devel/bugzilla44/Makefile
@ -49,7 +49,7 @@ MYSQL_USE=		MYSQL=yes
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql
 PGSQL_USES=		pgsql
 PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
 			sqlite3>=3:databases/sqlite3
 GRAPH_REPORTS_RUN_DEPENDS=	p5-GD>=1.20:graphics/p5-GD \
--- a/devel/bugzilla50/Makefile
+++ b/devel/bugzilla50/Makefile
@ -52,7 +52,7 @@ MYSQL_USE=		MYSQL=yes
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql
 PGSQL_USES=		pgsql:91+
 PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
 			sqlite3>=3:databases/sqlite3
 GRAPH_REPORTS_RUN_DEPENDS=	p5-GD>=1.20:graphics/p5-GD \
--- a/devel/cvstrac/Makefile
+++ b/devel/cvstrac/Makefile
@ -13,8 +13,7 @@ COMMENT?=	Web-Based Bug And Patch-Set Tracking System For CVS

 LICENSE=	GPLv2

-USES=		gmake pkgconfig
-USE_SQLITE=	yes
+USES=		gmake pkgconfig sqlite
 MAKEFILE=	bsd-gcc.mk
 MAKE_ARGS+=	BCC="${CC} ${CPPFLAGS}" TCC="${CC} ${CPPFLAGS}" \
 		LIBSQLITE="${LDFLAGS}"
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@ -36,8 +36,7 @@ BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib

 WRKSRC=			${WRKDIR}/ice-${PORTVERSION}

-USE_BDB=		yes
-WANT_BDB_VER=		5
+USE_BDB=		5
 INVALID_BDB_VER=	40 41 42 43 44 46 47 48 6
 USE_LDCONFIG=		yes
 BUILD_WRKSRC?=		${WRKSRC}/cpp
--- a/devel/libleaftag/Makefile
+++ b/devel/libleaftag/Makefile
@ -10,8 +10,7 @@ MASTER_SITES=	http://releases.chipx86.com/leaftag/libleaftag/
 MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Leaftag is a library for tagging files on the desktop

-USE_SQLITE=	2
-USES=		gmake pathfix pkgconfig libtool
+USES=		gmake pathfix pkgconfig libtool sqlite:2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@ -16,8 +16,7 @@ LIB_DEPENDS=	libexslt.so:textproc/libxslt

 CONFLICTS=	libopensync-0.22*

-USE_SQLITE=	3
-USES=		cmake pkgconfig python tar:bzip2
+USES=		cmake pkgconfig python tar:bzip2 sqlite:3
 CMAKE_ARGS+=	-Wno-dev
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@ -20,10 +20,9 @@ PORTSCOUT=	limitw:1,even
 .if !defined(REFERENCE_PORT)

 USES+=		gettext gmake gnome libtool pathfix pkgconfig \
-		python:3:build tar:xz
+		python:3:build sqlite:3 tar:xz
 USE_GNOME=	glib20 intlhack introspection:build \
 		libxml2 referencehack
-USE_SQLITE=	3
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-more-warnings \
@ -36,7 +35,7 @@ LIBVERSION=	1.7.0
 PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}

 .if defined(SOUP_SLAVE)
-USE_SQLITE=	yes
+USES+=		sqlite
 LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 CONFIGURE_ARGS+=--with-gnome
 .else
--- a/devel/matreshka/Makefile
+++ b/devel/matreshka/Makefile
@ -31,8 +31,8 @@ AMF_CONFIGURE_ENABLE=		amf

 MYSQL_USE=			MYSQL=yes
 PGSQL_USES=			pgsql
-SQLITE3_USE=			SQLITE=yes
-FIREBIRD_USE=			FIREBIRD=yes
+SQLITE3_USES=			sqlite
+FIREBIRD_USES=			firebird

 MAKE_JOBS_UNSAFE=	yes

--- a/devel/p5-App-GitGot/Makefile
+++ b/devel/p5-App-GitGot/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	App-GitGot
-PORTVERSION=	1.332
+PORTVERSION=	1.333
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/devel/p5-App-GitGot/distinfo
+++ b/devel/p5-App-GitGot/distinfo
@ -1,2 +1,2 @@
-SHA256 (App-GitGot-1.332.tar.gz) = 2e91a748719bc8522260f08f5d6f281ef32ab37a71eb6852fd4382a1f252dc48
-SIZE (App-GitGot-1.332.tar.gz) = 40622
+SHA256 (App-GitGot-1.333.tar.gz) = 46bfbb8d9906f84dd3bdf8cc7f0ca0da47cf89fa947bc0e86480f2d1d2ed7d14
+SIZE (App-GitGot-1.333.tar.gz) = 40645
--- a/devel/p5-Data-Table/Makefile
+++ b/devel/p5-Data-Table/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Data-Table
-PORTVERSION=	1.74
+PORTVERSION=	1.75
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/devel/p5-Data-Table/distinfo
+++ b/devel/p5-Data-Table/distinfo
@ -1,2 +1,2 @@
-SHA256 (Data-Table-1.74.tar.gz) = eb64eb3193ec50734a492b75ada47c84b85e47648ea42f28bf3379b5b5cc7a0a
-SIZE (Data-Table-1.74.tar.gz) = 77874
+SHA256 (Data-Table-1.75.tar.gz) = 1d974b9b5a8ef56d81e1ef4125c58d7e6428709ab0273124be8142c0bbaddb41
+SIZE (Data-Table-1.75.tar.gz) = 71658
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	ExtUtils-MakeMaker
-PORTVERSION=	7.12
+PORTVERSION=	7.14
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/devel/p5-ExtUtils-MakeMaker/distinfo
+++ b/devel/p5-ExtUtils-MakeMaker/distinfo
@ -1,2 +1,2 @@
-SHA256 (ExtUtils-MakeMaker-7.12.tar.gz) = 44eb08b65c33be0916e660c9fbc5d97c5d337131630271b08a98abf6fe1d62e1
-SIZE (ExtUtils-MakeMaker-7.12.tar.gz) = 466312
+SHA256 (ExtUtils-MakeMaker-7.14.tar.gz) = 4c3790e01daff5b1cce039fd5814b4fe178fc167dc202f723448b2d6e3ce0eaf
+SIZE (ExtUtils-MakeMaker-7.14.tar.gz) = 465639
--- a/devel/p5-MCE/Makefile
+++ b/devel/p5-MCE/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	MCE
-PORTVERSION=	1.705
+PORTVERSION=	1.706
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARIOROY
--- a/devel/p5-MCE/distinfo
+++ b/devel/p5-MCE/distinfo
@ -1,2 +1,2 @@
-SHA256 (MCE-1.705.tar.gz) = 73e31f9ae9ce13a4770487544347c118a0171cbdb54b8d9bc91d91d1c96360be
-SIZE (MCE-1.705.tar.gz) = 161269
+SHA256 (MCE-1.706.tar.gz) = 57e55be5f3cac97c971e7f5fb89beea935ff8e87e3c66f432901b6d3949f18a9
+SIZE (MCE-1.706.tar.gz) = 161512
--- a/devel/p5-MooseX-Getopt/Makefile
+++ b/devel/p5-MooseX-Getopt/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	MooseX-Getopt
-PORTVERSION=	0.68
+PORTVERSION=	0.69
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
@ -13,11 +13,12 @@ COMMENT=	Moose role for processing command line options

 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0.081:devel/p5-Getopt-Long-Descriptive \
 		p5-Moose>=0.56:devel/p5-Moose \
 		p5-MooseX-ConfigFromFile>=0:devel/p5-MooseX-ConfigFromFile \
-		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-Role-Parameterized>=1.01:devel/p5-MooseX-Role-Parameterized \
 		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
 		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
@ -30,6 +31,7 @@ TEST_DEPENDS=	p5-MooseX-SimpleConfig>=0.07:devel/p5-MooseX-SimpleConfig \
 		p5-Test-Trap>=0:devel/p5-Test-Trap \
 		p5-Test-Warnings>=0:devel/p5-Test-Warnings

+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	modbuildtiny

--- a/devel/p5-MooseX-Getopt/distinfo
+++ b/devel/p5-MooseX-Getopt/distinfo
@ -1,2 +1,2 @@
-SHA256 (MooseX-Getopt-0.68.tar.gz) = acb5118b4666352e58d4268040869d7dc2b68968fe26b5dd6715f51ebd784483
-SIZE (MooseX-Getopt-0.68.tar.gz) = 51971
+SHA256 (MooseX-Getopt-0.69.tar.gz) = 0ef348a5edb8aca9a8bf4aff9dbcc2ac4281682fdc65b210b3c87cffd7501308
+SIZE (MooseX-Getopt-0.69.tar.gz) = 54085
--- a/devel/p5-carton/Makefile
+++ b/devel/p5-carton/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	carton
 PORTVERSION=	1.0.21
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
@ -23,6 +24,7 @@ RUN_DEPENDS=	\
 	p5-Module-Metadata>=1.000003:devel/p5-Module-Metadata \
 	p5-Module-Reader>=0.002:devel/p5-Module-Reader \
 	p5-Path-Tiny>=0.033:devel/p5-Path-Tiny \
+	p5-Class-Tiny>=1.001:devel/p5-Class-Tiny \
 	p5-Try-Tiny>=0.09:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}

--- a/devel/poco-devel/Makefile
+++ b/devel/poco-devel/Makefile
@ -65,7 +65,7 @@ CONFIGURE_ARGS+=	--omit=Data/MySQL
 .endif

 .if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	yes
+USES+=		sqlite
 .else
 CONFIGURE_ARGS+=	--omit=Data/SQLite
 .endif
--- a/devel/poco-ssl/Makefile
+++ b/devel/poco-ssl/Makefile
@ -37,7 +37,7 @@ ODBC_CONFIGURE_OFF=	--omit=Data/ODBC
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_OFF=	--omit=Data/MySQL

-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_OFF=	--omit=Data/SQLite

 .include <bsd.port.options.mk>
--- a/devel/py-icalendar/files/patch-setup.py
+++ b/devel/py-icalendar/files/patch-setup.py
@ -1,10 +0,0 @@
--- setup.py.orig	2015-12-14 11:12:47 UTC
-+++ setup.py
-@@ -54,5 +54,6 @@ setuptools.setup(
-     install_requires=install_requires,
-     extras_require={
-         'test': tests_require
-    }
-+    },
-+    test_suite='icalendar.tests',
- )
--- a/devel/qscintilla2-designerplugin-qt5/Makefile
+++ b/devel/qscintilla2-designerplugin-qt5/Makefile
@ -17,7 +17,6 @@ USE_GL=		gl
 USES=		qmake pyqt:5
 USE_QT5=	core designer printsupport gui widgets xml \
 		buildtools_build qmake_build
-HAS_CONFIGURE=	yes

 WRKSRC=		${WRKDIR}/${DISTNAME}/designer-Qt4Qt5

--- a/devel/qscintilla2-designerplugin/Makefile
+++ b/devel/qscintilla2-designerplugin/Makefile
@ -17,7 +17,6 @@ LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DISTINFO_FILE=	${.CURDIR:H}/qscintilla2/distinfo
 USES=		qmake pyqt:4
 USE_QT4=	qmake_build moc_build gui xml designer
-HAS_CONFIGURE=	yes

 WRKSRC=		${WRKDIR}/${DISTNAME}/designer-Qt4Qt5

--- a/dns/dnsdist/Makefile
+++ b/dns/dnsdist/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	dnsdist
-DISTVERSION=	1.0.0-alpha2
+DISTVERSION=	1.0.0
 CATEGORIES=	dns net
 MASTER_SITES=	https://downloads.powerdns.com/releases/ \
 		LOCAL/cpm
@ -25,9 +25,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib -latomic
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 USES=		bison cpe gmake libedit libtool lua:52 pkgconfig tar:bz2
-CONFIGURE_ARGS=	--enable-dnscrypt --enable-libsodium
+CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin --enable-dnscrypt --enable-libsodium --without-protobuf
 INSTALL_TARGET=	install-strip

+USERS=		_dnsdist
+GROUPS=		_dnsdist
+
 USE_RC_SUBR=	dnsdist

 post-install:
--- a/dns/dnsdist/distinfo
+++ b/dns/dnsdist/distinfo
@ -1,2 +1,2 @@
-SHA256 (dnsdist-1.0.0-alpha2.tar.bz2) = dcbfa4f375a856694276f11921a6007bc954edd517a1cf1311a31839ca083c50
-SIZE (dnsdist-1.0.0-alpha2.tar.bz2) = 789252
+SHA256 (dnsdist-1.0.0.tar.bz2) = 1f72a5ca420fdea248dda60733a9b0ce3d68e13ee77dd5031887769a8451c713
+SIZE (dnsdist-1.0.0.tar.bz2) = 834177
--- a/dns/dnsdist/files/dnsdist.in
+++ b/dns/dnsdist/files/dnsdist.in
@ -6,22 +6,23 @@
 # REQUIRE: NETWORKING DAEMON
 # KEYWORD: shutdown
 #
-# Add the following to /etc/rc.conf to enable dnsdist:
+# Add the following line to /etc/rc.conf to enable dnsdist:
 #
 # dnsdist_enable="YES"
-#

 . /etc/rc.subr

-name="dnsdist"
-rcvar="dnsdist_enable"
+desc="dnsdist is a powerful, scriptable DNS loadbalancer"
+name=dnsdist
+rcvar=dnsdist_enable

 load_rc_config ${name}

-: ${dnsdist_enable:="NO"}
-: ${dnsdist_pidfile:=/var/run/${name}/pid}
+: ${dnsdist_priv_user:=_dnsdist}
+: ${dnsdist_priv_group:=_dnsdist}
+: ${dnsdist_enable:=NO}

 command=/usr/local/sbin/${name}
-command_args="-l 127.0.0.1:53"
+command_args="-u ${dnsdist_priv_user} -g ${dnsdist_priv_group} -d"

 run_rc_command "$1"
--- a/dns/dnsdist/pkg-plist
+++ b/dns/dnsdist/pkg-plist
@ -1,3 +1,3 @@
-bin/dnsdist
+sbin/dnsdist
 man/man1/dnsdist.1.gz
@sample etc/dnsdist.conf.sample
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@ -47,7 +47,7 @@ SQLITE_USE=	yes

 .if ${PORT_OPTIONS:MMYSQL}
 CONFIGURE_ARGS+=	--with-database-backend=mysql
-USE_MYSQL=	compat
+USES+=		mysql
 SCRIPTDATA=	migrate_adapters_1.mysql migrate_keyshare_mysql.pl \
 		migrate_zone_delete.mysql migrate_id_mysql.pl \
 		migrate_to_ng_mysql.pl migrate_1_4_8.mysql
--- a/dns/opendnssec13/Makefile
+++ b/dns/opendnssec13/Makefile
@ -46,7 +46,7 @@ MYSQL_CONFIGURE_OFF=	--with-sqlite3=${LOCALBASE} --with-database-backend=sqlite3
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE} --with-database-backend=mysql
 MYSQL_LIB_DEPENDS_OFF=	libsqlite3.so:databases/sqlite3
 MYSQL_USE=		MYSQL=compat
-MYSQL_USE_OFF=		SQLITE=yes
+MYSQL_USES_OFF=		sqlite
 SOFTHSM_CONFIGURE_ON=	--with-softhsm --with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm.so
 SOFTHSM_RUN_DEPENDS=	softhsm>=1.2.0:security/softhsm

--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@ -91,7 +91,7 @@ POLARSSL_LIB_DEPENDS_OFF=	libmbedtls.so:security/polarssl13

 REMOTE_VARS=		MODULES+=remote

-SQLITE3_USE=		SQLITE=3
+SQLITE3_USES=		sqlite:3
 SQLITE3_VARS=		MODULES+=gsqlite3

 TINYDNS_CONFIGURE_ON=	CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@ -27,8 +27,7 @@ BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		bash:shells/bash \
 		gsed:textproc/gsed
-LIB_DEPENDS=	libfbembed.so:databases/firebird25-client \
-		libapr-1.so:devel/apr1 \
+LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libboost_date_time.so:devel/boost-libs \
 		libicutu.so:devel/icu \
 		liblangtag.so:devel/liblangtag \
@ -96,7 +95,7 @@ USE_OPENLDAP=	yes
 USE_PERL5=	build
 USE_QT4=	# empty but required
 USE_XORG=	xaw xrandr
-USES=		bison compiler:c++11-lib cpe gmake jpeg perl5 pkgconfig \
+USES=		bison compiler:c++11-lib cpe firebird gmake jpeg perl5 pkgconfig \
 		python shared-mime-info tar:xz
 WANT_GNOME=	yes

--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	qemu
-PORTVERSION=	2.5.50.g20160215
-PORTREVISION=	4
+PORTVERSION=	2.5.50.g20160425
 CATEGORIES=	emulators
 MASTER_SITES=	GH \
 		LOCAL/nox:dtc \
@ -19,7 +18,7 @@ COMMENT?=	QEMU CPU Emulator - github bsd-user branch
 USE_GITHUB=	yes
 GH_ACCOUNT=	seanbruno
 GH_PROJECT=	${PORTNAME}-bsd-user
-GH_TAGNAME=	cada59f
+GH_TAGNAME=	36f4c00
 HAS_CONFIGURE=	yes
 USES=		gmake pkgconfig bison perl5 python:2,build
 USE_PERL5=	build
--- a/Show More
+++ b/Show More