diff --git a/brotli/.footprint b/brotli/.footprint
new file mode 100644
index 000000000..db08595f0
--- /dev/null
+++ b/brotli/.footprint
@@ -0,0 +1,26 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/brotli
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/brotli/
+-rw-r--r--	root/root	usr/include/brotli/decode.h
+-rw-r--r--	root/root	usr/include/brotli/encode.h
+-rw-r--r--	root/root	usr/include/brotli/port.h
+-rw-r--r--	root/root	usr/include/brotli/types.h
+drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libbrotlicommon-static.a
+lrwxrwxrwx	root/root	usr/lib/libbrotlicommon.so -> libbrotlicommon.so.1
+lrwxrwxrwx	root/root	usr/lib/libbrotlicommon.so.1 -> libbrotlicommon.so.1.0.2
+-rwxr-xr-x	root/root	usr/lib/libbrotlicommon.so.1.0.2
+-rw-r--r--	root/root	usr/lib/libbrotlidec-static.a
+lrwxrwxrwx	root/root	usr/lib/libbrotlidec.so -> libbrotlidec.so.1
+lrwxrwxrwx	root/root	usr/lib/libbrotlidec.so.1 -> libbrotlidec.so.1.0.2
+-rwxr-xr-x	root/root	usr/lib/libbrotlidec.so.1.0.2
+-rw-r--r--	root/root	usr/lib/libbrotlienc-static.a
+lrwxrwxrwx	root/root	usr/lib/libbrotlienc.so -> libbrotlienc.so.1
+lrwxrwxrwx	root/root	usr/lib/libbrotlienc.so.1 -> libbrotlienc.so.1.0.2
+-rwxr-xr-x	root/root	usr/lib/libbrotlienc.so.1.0.2
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/libbrotlicommon.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libbrotlidec.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libbrotlienc.pc
diff --git a/brotli/.md5sum b/brotli/.md5sum
new file mode 100644
index 000000000..8daaa28b6
--- /dev/null
+++ b/brotli/.md5sum
@@ -0,0 +1 @@
+ded01ebc24dda74ebac1719ac1e51728  brotli-v1.0.2.tar.gz
diff --git a/brotli/.signature b/brotli/.signature
new file mode 100644
index 000000000..d215ce7b4
--- /dev/null
+++ b/brotli/.signature
@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF30n0aZYt8olWMyrN9qfcFhYKutoFSSx0Scv3V/Cv3SnVP8t5jbl31JQfDTnUNhnTVfpWQ20JZEbI602M2W01QQQ=
+SHA256 (Pkgfile) = d86f5efca88d1b66e1a08cadb4254c691c92786843754e986687131508ab085d
+SHA256 (.footprint) = 99dd8c3738cd003890c577bc576ed968114bb31b5a919b2d0214e1b1a563c957
+SHA256 (brotli-v1.0.2.tar.gz) = c2cf2a16646b44771a4109bb21218c8e2d952babb827796eb8a800c1f94b7422
diff --git a/brotli/Pkgfile b/brotli/Pkgfile
new file mode 100644
index 000000000..0617cf65e
--- /dev/null
+++ b/brotli/Pkgfile
@@ -0,0 +1,23 @@
+# Description: Brotli compression library
+# URL: https://github.com/google/brotli
+# Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: cmake
+
+name=brotli
+version=1.0.2
+release=1
+source=(https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz)
+
+build() {
+	cd $name-$version
+
+	install -d $SRC/build
+	cd $SRC/build
+
+	cmake $SRC/$name-$version \
+		-DCMAKE_INSTALL_PREFIX="/usr" \
+		-DCMAKE_INSTALL_LIBDIR="/usr/lib"
+
+	make
+	make DESTDIR=$PKG install
+}
diff --git a/dhcp/.md5sum b/dhcp/.md5sum
index 05892001c..c5896b715 100644
--- a/dhcp/.md5sum
+++ b/dhcp/.md5sum
@@ -1,4 +1,4 @@
 157549658aba092b0d26aa1df3943051  default-config.diff
 d668fba757e27f197729972750f89859  dhclient
-2b5e5b2fa31c2e27e487039d86f83d3f  dhcp-4.3.5.tar.gz
+c0c45f217b2b831dc67574d46e307249  dhcp-4.3.6-P1.tar.gz
 3d6b3dbd3cabb0efcfada56cd3e6c0a4  dhcpd
diff --git a/dhcp/.signature b/dhcp/.signature
index c5cf5f95c..a3ecebb3a 100644
--- a/dhcp/.signature
+++ b/dhcp/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30bM3yok9pAhCizsz6VooxYe505EJzyvZOtPwm7Xq58pacxjkeol68mhxTfrfUrXdRkFtYD/uZbmfmYYGNgxYAI=
-SHA256 (Pkgfile) = 19e523c26a6a1aef2ee01b2e345316b0fed07158fcd27d9d38a037c0a334ea5a
+RWSagIOpLGJF31JNiiHgm2WAnayPuWAzHsAurUi4TaGqZ+zWarcU/5S/YKNHiRdZ/EO2NDHBhbG9Hkq8xjZG4BVp4q98zlNTfQI=
+SHA256 (Pkgfile) = 936bc2bcc34c5c437526142838159f7d0f31788675eacdbf9fa5981f56df9c4f
 SHA256 (.footprint) = a167140e476d16efb80792f8428dfa738073019b3c251613416c2fed6ce7067b
-SHA256 (dhcp-4.3.5.tar.gz) = eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954
+SHA256 (dhcp-4.3.6-P1.tar.gz) = 2fd177bef02856f05fe17713ced9bfcc7d94f14c933c15f2f2fbedc9cc57a3c3
 SHA256 (dhcpd) = a49171ca3a53f0c1d87190c57cd27b47131b79fba34a67e231deb3f96e9b501c
 SHA256 (dhclient) = b8bf3b0d8766fb987b204ace96f0c2c65e8e7a9187501bdee5a4c6e0e4924153
 SHA256 (default-config.diff) = 20486335665bc723b476c7f5380b07d4a4bc87466b331a5e5af319a6809782b8
diff --git a/dhcp/Pkgfile b/dhcp/Pkgfile
index 301c75dd0..f8088ef8e 100644
--- a/dhcp/Pkgfile
+++ b/dhcp/Pkgfile
@@ -1,10 +1,10 @@
 # Description: DHCP server, client and relay agent.
-# URL:         http://www.isc.org/dhcp
+# URL:         https://www.isc.org/downloads/dhcp
 # Maintainer:  Thomas Penteker, tek at serverop dot de
 # Packager:    Mark Rosenstand, mark at borkware dot net
 
 name=dhcp
-version=4.3.5
+version=4.3.6-P1
 release=1
 source=(http://ftp.isc.org/isc/$name/$version/$name-$version.tar.gz dhcpd \
         dhclient default-config.diff)
diff --git a/fribidi/.footprint b/fribidi/.footprint
deleted file mode 100644
index 4bb2050a6..000000000
--- a/fribidi/.footprint
+++ /dev/null
@@ -1,65 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/fribidi
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/fribidi/
--rw-r--r--	root/root	usr/include/fribidi/fribidi-arabic.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-begindecls.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-bidi-types-list.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-bidi-types.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-bidi.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-char-sets-list.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-char-sets.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-common.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-config.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-deprecated.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-enddecls.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-flags.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-joining-types-list.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-joining-types.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-joining.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-mirroring.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-shape.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-types.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-unicode-version.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi-unicode.h
--rw-r--r--	root/root	usr/include/fribidi/fribidi.h
-drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libfribidi.la
-lrwxrwxrwx	root/root	usr/lib/libfribidi.so -> libfribidi.so.0.3.6
-lrwxrwxrwx	root/root	usr/lib/libfribidi.so.0 -> libfribidi.so.0.3.6
--rwxr-xr-x	root/root	usr/lib/libfribidi.so.0.3.6
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/fribidi.pc
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man3/
--rw-r--r--	root/root	usr/share/man/man3/fribidi_charset_to_unicode.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_debug_status.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_get_bidi_type.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_get_bidi_type_name.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_get_bidi_types.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_get_joining_type.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_get_joining_type_name.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_get_joining_types.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_get_mirror_char.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_get_par_direction.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_get_par_embedding_levels.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_get_type.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_get_type_internal.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_join_arabic.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_log2vis.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_log2vis_get_embedding_levels.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_mirroring_status.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_parse_charset.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_remove_bidi_marks.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_reorder_line.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_reorder_nsm_status.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_set_debug.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_set_mirroring.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_set_reorder_nsm.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_shape.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_shape_mirroring.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_unicode_to_charset.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_unicode_version.3.gz
--rw-r--r--	root/root	usr/share/man/man3/fribidi_version_info.3.gz
diff --git a/fribidi/.md5sum b/fribidi/.md5sum
deleted file mode 100644
index e6ed12f5f..000000000
--- a/fribidi/.md5sum
+++ /dev/null
@@ -1 +0,0 @@
-6c7e7cfdd39c908f7ac619351c1c5c23  fribidi-0.19.7.tar.bz2
diff --git a/fribidi/.signature b/fribidi/.signature
deleted file mode 100644
index 957f7546a..000000000
--- a/fribidi/.signature
+++ /dev/null
@@ -1,5 +0,0 @@
-untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF340oljaj15dKHjITpx310QdD6N37ytW/8J3v8Wu9u+o3EYnSc3H4yV6uy3KAjduY7WxN/DIHri7grDSL+d3MKwg=
-SHA256 (Pkgfile) = d38abb96db379fe1fc4d73e2e51278b3a299ce6ed020521b32490c8a8299f89f
-SHA256 (.footprint) = 6dfeee48b77b5d85ee67c7c574485374c9037c7320193a167c4d9af33298c12d
-SHA256 (fribidi-0.19.7.tar.bz2) = 08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e
diff --git a/fribidi/Pkgfile b/fribidi/Pkgfile
deleted file mode 100644
index da7e7860e..000000000
--- a/fribidi/Pkgfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Description: Unicode Bidirectional (BiDi) Algorithm.
-# URL: https://github.com/fribidi/fribidi/
-# Maintainer: Danny Rawlins, crux at romster dot me
-
-name=fribidi
-version=0.19.7
-release=1
-source=(https://github.com/fribidi/fribidi/releases/download/0.19.7/fribidi-0.19.7.tar.bz2)
-
-build() {
-	cd $name-$version
-	./configure --prefix=/usr
-	make
-	make DESTDIR=$PKG install
-}
diff --git a/libproxy/.footprint b/libproxy/.footprint
new file mode 100644
index 000000000..6a4a2d763
--- /dev/null
+++ b/libproxy/.footprint
@@ -0,0 +1,15 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/proxy
+drwxr-xr-x	root/root	usr/include/
+-rw-r--r--	root/root	usr/include/proxy.h
+drwxr-xr-x	root/root	usr/lib/
+lrwxrwxrwx	root/root	usr/lib/libproxy.so -> libproxy.so.1
+lrwxrwxrwx	root/root	usr/lib/libproxy.so.1 -> libproxy.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libproxy.so.1.0.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/libproxy-1.0.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/cmake/
+drwxr-xr-x	root/root	usr/share/cmake/Modules/
+-rw-r--r--	root/root	usr/share/cmake/Modules/Findlibproxy.cmake
diff --git a/libproxy/.md5sum b/libproxy/.md5sum
new file mode 100644
index 000000000..33f955e4b
--- /dev/null
+++ b/libproxy/.md5sum
@@ -0,0 +1 @@
+f6b1d2a1e17a99cd3debaae6d04ab152  libproxy-0.4.15.tar.xz
diff --git a/libproxy/.signature b/libproxy/.signature
new file mode 100644
index 000000000..36e792375
--- /dev/null
+++ b/libproxy/.signature
@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF38dmP1Ga2gfpJU7S5pRSfxHK+0alF3vYQsoOyuk6djxErthrpXlReipMPAb5b/Q03rAmWg+qtiA8WY2CA3elnAM=
+SHA256 (Pkgfile) = 6dba3b2e00f0c9c9f94e3f7f386e191ace9d06f86bd3efa26c8aac660fbff54a
+SHA256 (.footprint) = e9d5184325707b70c1a1c49c0fc3f2465f60e87e0b506ccefd8f9cdbba051e03
+SHA256 (libproxy-0.4.15.tar.xz) = 654db464120c9534654590b6683c7fa3887b3dad0ca1c4cd412af24fbfca6d4f
diff --git a/libproxy/Pkgfile b/libproxy/Pkgfile
new file mode 100644
index 000000000..a6620dbe8
--- /dev/null
+++ b/libproxy/Pkgfile
@@ -0,0 +1,35 @@
+# Description: Provides consistent proxy configuration to applications.
+# URL:         http://libproxy.github.io/libproxy
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  cmake dbus glib
+
+name=libproxy
+version=0.4.15
+release=1
+source=(https://github.com/$name/$name/releases/download/$version/$name-$version.tar.xz)
+
+build() {
+	cd $name-$version
+
+	mkdir build
+	cd build
+
+	cmake .. \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DWITH_DOTNET=off \
+		-DWITH_GNOME3=off \
+		-DWITH_KDE=off \
+		-DWITH_NM=off \
+		-DWITH_PERL=off \
+		-DWITH_PYTHON2=off \
+		-DWITH_PYTHON3=off \
+		-DWITH_VALA=off \
+		-DWITH_WEBKIT=off \
+		-DWITH_WEBKIT3=off
+
+	make
+	make DESTDIR=$PKG install
+}
diff --git a/libquvi-scripts/.footprint b/libquvi-scripts/.footprint
index f81ccb4c9..93fba68d4 100644
--- a/libquvi-scripts/.footprint
+++ b/libquvi-scripts/.footprint
@@ -1,75 +1,81 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/libquvi-scripts.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libquvi-scripts-0.9.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/libquvi-scripts/
-drwxr-xr-x	root/root	usr/share/libquvi-scripts/lua/
-drwxr-xr-x	root/root	usr/share/libquvi-scripts/lua/util/
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/util/charset.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/util/content_type.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/util/trim.lua
-drwxr-xr-x	root/root	usr/share/libquvi-scripts/lua/website/
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/101greatgoals.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/1tvru.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/ardmediathek.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/arte.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/audioboo.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/bbc.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/beeg.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/bikeradar.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/canalplus.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/cbsnews.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/clipfish.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/collegehumor.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/dailymotion.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/deviantclip.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/dorkly.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/empflix.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/foxnews.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/funnyordie.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/gaskrank.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/guardian.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/jizzhut.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/keezmovies.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/lego.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/liveleak.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/metacafe.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/myspass.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/publicsenat.lua
-drwxr-xr-x	root/root	usr/share/libquvi-scripts/lua/website/quvi/
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/quvi/bit.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/quvi/const.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/quvi/html.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/quvi/url.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/quvi/util.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/redtube.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/sapo.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/senat.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/sevenload.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/soundcloud.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/spankwire.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/spiegel.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/tagtele.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/tapuz.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/tcmag.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/ted.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/theonion.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/tmunderground.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/tnaflix.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/totallynsfw.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/tvlux.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/tvrain.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/videa.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/videobash.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/vimeo.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/wimp.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/xhamster.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/xnxx.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/xvideos.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/youjizz.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/lua/website/youtube.lua
--rw-r--r--	root/root	usr/share/libquvi-scripts/version
+lrwxrwxrwx	root/root	usr/share/libquvi-scripts/0.9 -> 0.9.20131130
+drwxr-xr-x	root/root	usr/share/libquvi-scripts/0.9.20131130/
+drwxr-xr-x	root/root	usr/share/libquvi-scripts/0.9.20131130/common/
+drwxr-xr-x	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/const.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/debug.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/entity.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/hash.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/hex.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/html.lua
+drwxr-xr-x	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/http/
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/http/cookie.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/lxph.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/stream.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/time.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/util.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/common/quvi/youtube.lua
+drwxr-xr-x	root/root	usr/share/libquvi-scripts/0.9.20131130/media/
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/101greatgoals.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/1tvru.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/ardmediathek.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/arte.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/audioboo.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/bikeradar.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/canalplus.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/cbsnews.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/clipfish.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/collegehumor.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/dailymotion.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/dorkly.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/funnyordie.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/gaskrank.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/guardian.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/ina.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/lego.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/liveleak.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/majestyc.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/metacafe.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/myspass.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/publicsenat.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/sapo.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/senat.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/sevenload.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/soundcloud.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/spiegel.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/tagtele.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/tapuz.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/ted.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/theonion.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/tvlux.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/videa.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/videobash.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/vimeo.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/vzaar.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/media/youtube.lua
+drwxr-xr-x	root/root	usr/share/libquvi-scripts/0.9.20131130/playlist/
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/playlist/soundcloud.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/playlist/youtube.lua
+drwxr-xr-x	root/root	usr/share/libquvi-scripts/0.9.20131130/scan/
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/scan/vzaar.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/scan/youtube.lua
+drwxr-xr-x	root/root	usr/share/libquvi-scripts/0.9.20131130/subtitle/
+drwxr-xr-x	root/root	usr/share/libquvi-scripts/0.9.20131130/subtitle/export/
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/subtitle/export/subrip.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/subtitle/youtube.lua
+drwxr-xr-x	root/root	usr/share/libquvi-scripts/0.9.20131130/util/
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/util/convert_entities.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/util/resolve_redirections.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/util/to_file_ext.lua
+-rw-r--r--	root/root	usr/share/libquvi-scripts/0.9.20131130/version
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man7/
 -rw-r--r--	root/root	usr/share/man/man7/libquvi-scripts.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/quvi-modules-3rdparty.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/quvi-modules.7.gz
diff --git a/libquvi-scripts/.md5sum b/libquvi-scripts/.md5sum
index 634d5cf76..2d92204c4 100644
--- a/libquvi-scripts/.md5sum
+++ b/libquvi-scripts/.md5sum
@@ -1 +1 @@
-2690c995b7cd6193cbc774a7d89a885c  libquvi-scripts-0.4.21.tar.xz
+46ddfd887260a515199c2e1ba8c46d8a  libquvi-scripts-0.9.20131130.tar.xz
diff --git a/libquvi-scripts/.signature b/libquvi-scripts/.signature
index 4ff37209a..6bfbd4c5d 100644
--- a/libquvi-scripts/.signature
+++ b/libquvi-scripts/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3xCGRp3U1lOp1O4AEH8GgHaJ8+3JdRtVM0GEM/JGVuW6p+JXeWCaJDTGSJd4zJyMg9UVgTFHp+YqnAJhxz4Pewo=
-SHA256 (Pkgfile) = 03e191466b168cbfdde365005f26d94b54ebdbd0c0e230fd6418c8d87cb5d2c1
-SHA256 (.footprint) = 69bec42fd59673ce88cbbcf312ab8b52c7cb63f2b106f8b27ba2796033faebf8
-SHA256 (libquvi-scripts-0.4.21.tar.xz) = 7c02cc86ac25334892d08bbc31251d78a55ee2a16d57dfa2bda7ac657c8e0f34
+RWSagIOpLGJF3+GWq+vh6JyBmGqkyqWtsXOqtcmEv/ucdvqbjT4GNFnw6CzQHyuTzAlPqLWZTQd1ZTZU1QUSe60BwCqhvuA32go=
+SHA256 (Pkgfile) = 794aef649fe5325c858a5c290ca917853d260fc714daa487770786b4b0fe069a
+SHA256 (.footprint) = dd2100621cae8eb90c027e902500398dfeaae8e0f6d0473e303c5a4985d9e691
+SHA256 (libquvi-scripts-0.9.20131130.tar.xz) = 17f21f9fac10cf60af2741f2c86a8ffd8007aa334d1eb78ff6ece130cb3777e3
diff --git a/libquvi-scripts/Pkgfile b/libquvi-scripts/Pkgfile
index 231ce11d4..c932a83ec 100644
--- a/libquvi-scripts/Pkgfile
+++ b/libquvi-scripts/Pkgfile
@@ -4,8 +4,8 @@
 # Depends on:  lua
 
 name=libquvi-scripts
-version=0.4.21
-release=2
+version=0.9.20131130
+release=1
 source=(http://downloads.sourceforge.net/sourceforge/quvi/$name-$version.tar.xz)
 
 build () {
@@ -14,10 +14,10 @@ build () {
 	./configure \
 		--prefix=/usr \
 		--with-nsfw \
-		--with-nlfy
+		--with-geoblocked
 
 	make
 	make DESTDIR=$PKG install
 
-	rm -rf $(find $PKG/usr/share -name README)
+	find $PKG/usr/share -name README -delete
 }
diff --git a/libquvi/.footprint b/libquvi/.footprint
index a1b65e9b3..f8a841170 100644
--- a/libquvi/.footprint
+++ b/libquvi/.footprint
@@ -1,18 +1,31 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/quvi/
--rw-r--r--	root/root	usr/include/quvi/llst.h
--rw-r--r--	root/root	usr/include/quvi/net.h
--rw-r--r--	root/root	usr/include/quvi/quvi.h
+drwxr-xr-x	root/root	usr/include/quvi-0.9/
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi.h
+drwxr-xr-x	root/root	usr/include/quvi-0.9/quvi/
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qbool.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qcallback.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qdef.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qerror.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qfunc.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qhttpmiprop.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qinfo.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qmediaprop.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qoption.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qplaylistprop.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qscript.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qsubtprop.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qsupp.h
+-rw-r--r--	root/root	usr/include/quvi-0.9/quvi/qversion.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libquvi.a
--rwxr-xr-x	root/root	usr/lib/libquvi.la
-lrwxrwxrwx	root/root	usr/lib/libquvi.so -> libquvi.so.7.0.1
-lrwxrwxrwx	root/root	usr/lib/libquvi.so.7 -> libquvi.so.7.0.1
--rwxr-xr-x	root/root	usr/lib/libquvi.so.7.0.1
+-rwxr-xr-x	root/root	usr/lib/libquvi-0.9-0.9.4.so
+-rwxr-xr-x	root/root	usr/lib/libquvi-0.9.la
+lrwxrwxrwx	root/root	usr/lib/libquvi-0.9.so -> libquvi-0.9-0.9.4.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/libquvi.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libquvi-0.9.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/libquvi.3.gz
+drwxr-xr-x	root/root	usr/share/man/man7/
+-rw-r--r--	root/root	usr/share/man/man7/quvi-object.7.gz
diff --git a/libquvi/.md5sum b/libquvi/.md5sum
index 65f2cfae2..87f762000 100644
--- a/libquvi/.md5sum
+++ b/libquvi/.md5sum
@@ -1 +1 @@
-acc5a5da25a7f89c6ff5338d00eaaf58  libquvi-0.4.1.tar.xz
+8e3f2134a6b3376934bd884b07dcdac5  libquvi-0.9.4.tar.xz
diff --git a/libquvi/.signature b/libquvi/.signature
index 716a4b030..d461c8791 100644
--- a/libquvi/.signature
+++ b/libquvi/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zOSLnw2gUN3Ksi4jdb7m4ip2ExEqauh+BFRznMc91iciB3kAeHM1cPWGS5pUXEJqMbt0Ua4AkKOZETqGaD/WAw=
-SHA256 (Pkgfile) = 57ecf82a43cb3e6d0501d56327c933a8981fa0d270429ae60231f5e352fefb99
-SHA256 (.footprint) = e3201936dfd81a80931829b87b3499944ef33fa99a3966acce227751c1f938ba
-SHA256 (libquvi-0.4.1.tar.xz) = b5862f7e5fa6ed7defd169adb5c7586c6406af86e029671fd09615f6eb7aa903
+RWSagIOpLGJF30rntpBY1uy1cmvvewFLrxG0w9L8uvVvpuYEBZQNrBhvf3W4E6ZQirmnVhkjd0InuMtSs2KWDaEwuiFoi9g0eAA=
+SHA256 (Pkgfile) = cd54e6b116c64570ca0c2f6ace2c2dd366cb3f0391031a72a620d243fe4feef5
+SHA256 (.footprint) = 2779c859472882814fd7c38c477d2be9b49bac214f82c17ba27e5947396844ab
+SHA256 (libquvi-0.9.4.tar.xz) = 2d3fe28954a68ed97587e7b920ada5095c450105e993ceade85606dadf9a81b2
diff --git a/libquvi/Pkgfile b/libquvi/Pkgfile
index 82f0da8ce..672e85bfe 100644
--- a/libquvi/Pkgfile
+++ b/libquvi/Pkgfile
@@ -1,17 +1,17 @@
 # Description: Library for parsing video download links.
 # URL:         http://quvi.sourceforge.net/
 # Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
-# Depends on:  libquvi-scripts
+# Depends on:  libgcrypt libproxy libquvi-scripts
 
 name=libquvi
-version=0.4.1
-release=2
+version=0.9.4
+release=1
 source=(http://downloads.sourceforge.net/sourceforge/quvi/$name-$version.tar.xz)
 
 build () {
 	cd $name-$version
 
-	./configure --prefix=/usr
+	./configure --prefix=/usr --disable-nls
 
 	make
 	make DESTDIR=$PKG install
diff --git a/monit/.signature b/monit/.signature
index e4d6730e3..36f47d293 100644
--- a/monit/.signature
+++ b/monit/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/XjRYYSIveQwf+LJP2UfwZdE2/bQ/5+8mN+dTZMe1i1gwrYmPbWBsIkalod0B4H9+6Y0wLkrE4CHJbxbhaHzwE=
-SHA256 (Pkgfile) = c2372183abaeb7e2f73fa633aedc46023e7fdc0fee666d77ddfc13043387fe72
+RWSagIOpLGJF37KrdChRvKa1d/RRxqtQQUU5Cz2tmb7+HJZeKtqmHQbyduO5rY15hyJ+Be/+DbFzPS/zdKKpJQ4f4NfWdwi9CA4=
+SHA256 (Pkgfile) = 9dcd94c698d695d83ad9fbf63ce9f5c308c7be3ff99a33ff42a6753ccd959b94
 SHA256 (.footprint) = 1543986dc614b53b721621604afb2f1e34fa3f50e7f62ea8a5583e3adfb4575a
 SHA256 (monit-5.25.1.tar.gz) = 4b5c25ceb10825f1e5404f1d8a7b21507716b82bc20c3586f86603691c3b81bc
 SHA256 (monitd) = e8d5f6a67b0e75641bc0158bfdc942f1738f734d751c94ddfa82ec1f1c571f1e
diff --git a/ntp/.md5sum b/ntp/.md5sum
index e718d4e88..8f0c74595 100644
--- a/ntp/.md5sum
+++ b/ntp/.md5sum
@@ -1,4 +1,4 @@
-745384ed0dedb3f66b33fe84d66466f9  ntp-4.2.8p10.tar.gz
+00950ca2855579541896513e78295361  ntp-4.2.8p11.tar.gz
 0c5675c46a226de4504f5b855326b6b7  ntp-64bit.diff
 99133142249735be5c8f48f1b6ca6821  ntp.conf
 81250961599ecb64d9c0ca96d96b1d73  ntpd
diff --git a/ntp/.signature b/ntp/.signature
index 563abe410..32c9a679e 100644
--- a/ntp/.signature
+++ b/ntp/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF303AOjRyrFlC8pkIyHTgdBlp/e/x7x21lcbgoLfhIABUkMpcDHnC15vTKo/O58dBymKXjx+9p61j/6zPBuVkgAM=
-SHA256 (Pkgfile) = 29ba440ee3f5ab328b67aa54bd6c0c8f44c613bb7e081ea068dec10b841e5788
+RWSagIOpLGJF371SkIzuTpab28F7r8iRt+JWycDsUiyaLvDA8WDULeo31KUbltyfJYqsWMB8YxWYg2NVmbOZ0ir8tCWoyxD25AI=
+SHA256 (Pkgfile) = 3896dd34e246e6217bbecaa920bd05dfab7ef623d6694cfe23e67e3b891165a5
 SHA256 (.footprint) = 0d110ca02e0ad4c6a5f9de4df929d79093c4314df5c9aced43a2c02ed63119a4
-SHA256 (ntp-4.2.8p10.tar.gz) = ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f
+SHA256 (ntp-4.2.8p11.tar.gz) = f14a39f753688252d683ff907035ffff106ba8d3db21309b742e09b5c3cd278e
 SHA256 (ntpd) = a117c4b99139d836264c267cd0804f15b313bcab233837bf7f5676681b2a9955
 SHA256 (ntpdate) = 79e158ce339a836966966ab76c42ebecfa7023c3bbc2770c215817bfae2838d1
 SHA256 (ntp.conf) = 8351e20d8c73c5a920625d14cf584bb43127429cfa1d5977daf5d05f7e110383
diff --git a/ntp/Pkgfile b/ntp/Pkgfile
index 8f477a339..2ceed40a4 100644
--- a/ntp/Pkgfile
+++ b/ntp/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  openssl
 
 name=ntp
-version=4.2.8p10
+version=4.2.8p11
 release=1
 source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$name-$version.tar.gz
         ntpd ntpdate ntp.conf ntp-64bit.diff)
diff --git a/quvi/.footprint b/quvi/.footprint
index 498954f97..c10289ff9 100644
--- a/quvi/.footprint
+++ b/quvi/.footprint
@@ -4,4 +4,10 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/quvi-dump.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/quvi-get.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/quvi-info.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/quvi-scan.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/quvi.1.gz
+drwxr-xr-x	root/root	usr/share/man/man5/
+-rw-r--r--	root/root	usr/share/man/man5/quvirc.5.gz
diff --git a/quvi/.md5sum b/quvi/.md5sum
index 45a02a7c8..c4b89be50 100644
--- a/quvi/.md5sum
+++ b/quvi/.md5sum
@@ -1 +1 @@
-66cb0dda70f2900c58c4b87b2d76007b  quvi-0.4.2.tar.xz
+baa1d7b25e9fd173e952e27d4aa4b933  quvi-0.9.5.tar.xz
diff --git a/quvi/.signature b/quvi/.signature
index fb2ece71f..6e3a4972d 100644
--- a/quvi/.signature
+++ b/quvi/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30jlQDFkDTHDbkkDPz2xwho17bNGtkHzi0bC/kXp8exggrIXoVVyT+st/L8qJP510SZ6YiLAWQbZRe5OLCsMywA=
-SHA256 (Pkgfile) = fe90a9e4c8c13bb69a93b69b5aa76a592430df3e795cb7ec10ba21d6101322c8
-SHA256 (.footprint) = a6330314756a547d800efbb37ad3aaaccbc8575186a2e9ba5896b7854e4b0ce1
-SHA256 (quvi-0.4.2.tar.xz) = 91a1396ce9a56ac3cfa3a5edabf8d214b3c6b2a35afad3b5f2f9feb29ba19026
+RWSagIOpLGJF3wfUg3f/JH+11Ph8fitWdmFXc2BVTXb9PE+fSF9z3wamxbOExcv8AWncE1MgKa0NP8V0iHLEolBC8V/+w4+w/QE=
+SHA256 (Pkgfile) = e720cfc74ca40380d3867c503fb18ef749d8536ff7babd0424e37f810e78b4f1
+SHA256 (.footprint) = bd9246ff8d9c212b51aafb36d66f9e2a2950b8c6c7a52f10f8623d40baa8c5f1
+SHA256 (quvi-0.9.5.tar.xz) = cb3918aad990b9bc49828a5071159646247199a63de0dd4c706adc5c8cd0a2c0
diff --git a/quvi/Pkgfile b/quvi/Pkgfile
index 310133e7e..6e64f2da6 100644
--- a/quvi/Pkgfile
+++ b/quvi/Pkgfile
@@ -4,14 +4,14 @@
 # Depends on:  libquvi
 
 name=quvi
-version=0.4.2
-release=2
+version=0.9.5
+release=1
 source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.xz)
 
 build () {
 	cd $name-$version
 
-	./configure --prefix=/usr
+	./configure --prefix=/usr --disable-nls
 
 	make
 	make DESTDIR=$PKG install
diff --git a/webkitgtk/.footprint b/webkitgtk/.footprint
index 222de5db3..f2936379a 100644
--- a/webkitgtk/.footprint
+++ b/webkitgtk/.footprint
@@ -75,6 +75,7 @@ drwxr-xr-x	root/root	usr/include/webkitgtk-4.0/webkit2/
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebHitTestResult.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebInspector.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebPage.h
+-rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebProcessEnumTypes.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebResource.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebView.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebViewBase.h
@@ -204,11 +205,11 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit2-4.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-4.0.so -> libjavascriptcoregtk-4.0.so.18
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.6.15
--rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18.6.15
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.7.8
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18.7.8
 lrwxrwxrwx	root/root	usr/lib/libwebkit2gtk-4.0.so -> libwebkit2gtk-4.0.so.37
-lrwxrwxrwx	root/root	usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.24.9
--rwxr-xr-x	root/root	usr/lib/libwebkit2gtk-4.0.so.37.24.9
+lrwxrwxrwx	root/root	usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.28.0
+-rwxr-xr-x	root/root	usr/lib/libwebkit2gtk-4.0.so.37.28.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/javascriptcoregtk-4.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/webkit2gtk-4.0.pc
diff --git a/webkitgtk/.md5sum b/webkitgtk/.md5sum
index c44994f2e..27664f154 100644
--- a/webkitgtk/.md5sum
+++ b/webkitgtk/.md5sum
@@ -1,2 +1 @@
-6700854d41a714c73085242af39f1f5a  enchant-2.patch
-c1a548595135ee75ad3bf2e18ac83112  webkitgtk-2.18.6.tar.xz
+51cc47345c3ec53802718cd6fc9b746f  webkitgtk-2.20.0.tar.xz
diff --git a/webkitgtk/.signature b/webkitgtk/.signature
index b72c77319..2d8324757 100644
--- a/webkitgtk/.signature
+++ b/webkitgtk/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zXVJa44XuVC2C4zRbyuY2FPOeyzt69LMc9TVSHv0Z1ld5O2u2iUu8epb13QGeT/0uB6I9mKRUoeeAnrW4Cf+ws=
-SHA256 (Pkgfile) = a4d83ff7419519adc216d2145eed6a0a184f96d059ed246d17dc5760289127bd
-SHA256 (.footprint) = 1d9c6cf7142a7529f10c7c50357b251bc87d149bc80203309a3f3ddd5d4400d7
-SHA256 (webkitgtk-2.18.6.tar.xz) = 93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c
-SHA256 (enchant-2.patch) = ed8e5fe614ed800da3caccb8162bdd2d8dbd5a69ab90d426b34e124dee5cf1b6
+RWSagIOpLGJF38l44EOaiz060amkIF6fqyismzhZuIPfrEprBmz9v7nTRsN+v3pvP4Bz/KjqTRpZ3hzj5zSUJz7cv3jXgBniegM=
+SHA256 (Pkgfile) = 637ffda3b7c11543169d23e38e9f7bccdfc318bb8aeb8a7b5b53cfda1cbd7dc6
+SHA256 (.footprint) = 3fce2f34e483810fe3cde313b4ee91862e2add70bf5d7597bdb9db23f9361ca8
+SHA256 (webkitgtk-2.20.0.tar.xz) = 57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c
diff --git a/webkitgtk/Pkgfile b/webkitgtk/Pkgfile
index c64ac2540..90dab11c5 100644
--- a/webkitgtk/Pkgfile
+++ b/webkitgtk/Pkgfile
@@ -1,21 +1,18 @@
 # Description: Small, efficient and fast rendering engine for Web Browsers.
 # URL: https://www.webkitgtk.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: gst-plugins-bad gtk harfbuzz-icu hyphen libgudev libsecret libsoup libtasn1 ninja ruby xorg-libxt
+# Depends on: gst-plugins-bad gtk harfbuzz-icu hyphen libgudev libsecret libsoup libtasn1 ninja ruby woff2 xorg-libxt
 # Optional: enchant libnotify geoclue
 
 name=webkitgtk
-version=2.18.6
+version=2.20.0
 release=1
-source=(https://webkitgtk.org/releases/$name-$version.tar.xz
-	enchant-2.patch)
+source=(https://webkitgtk.org/releases/$name-$version.tar.xz)
 
 build() {
 	mkdir build
 	cd $name-$version
 
-	patch -p1 -i $SRC/enchant-2.patch
-
 	# setting CC and CXX breaks compilation
 	if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then
 		unset CC CXX
diff --git a/webkitgtk/enchant-2.patch b/webkitgtk/enchant-2.patch
deleted file mode 100644
index 93c988281..000000000
--- a/webkitgtk/enchant-2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r webkitgtk-2.18.5/Source/cmake/FindEnchant.cmake webkitgtk-2.18.5-enchant2/Source/cmake/FindEnchant.cmake
---- webkitgtk-2.18.5/Source/cmake/FindEnchant.cmake	2017-08-09 11:13:53.000000000 +0200
-+++ webkitgtk-2.18.5-enchant2/Source/cmake/FindEnchant.cmake	2018-01-18 10:06:07.127310881 +0100
-@@ -28,7 +28,7 @@
- # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- find_package(PkgConfig)
--pkg_check_modules(PC_ENCHANT enchant)
-+pkg_check_modules(PC_ENCHANT enchant-2)
- 
- find_path(ENCHANT_INCLUDE_DIRS
-     NAMES enchant.h
-@@ -37,7 +37,7 @@
- )
- 
- find_library(ENCHANT_LIBRARIES
--    NAMES enchant
-+    NAMES enchant-2
-     PATHS ${PC_ENCHANT_LIBDIR}
-           ${PC_ENCHANT_LIBRARY_DIRS}
- )
diff --git a/woff2/.footprint b/woff2/.footprint
new file mode 100644
index 000000000..a92144861
--- /dev/null
+++ b/woff2/.footprint
@@ -0,0 +1,17 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/woff2/
+-rw-r--r--	root/root	usr/include/woff2/decode.h
+-rw-r--r--	root/root	usr/include/woff2/encode.h
+-rw-r--r--	root/root	usr/include/woff2/output.h
+drwxr-xr-x	root/root	usr/lib/
+lrwxrwxrwx	root/root	usr/lib/libwoff2common.so -> libwoff2common.so.1.0.2
+-rwxr-xr-x	root/root	usr/lib/libwoff2common.so.1.0.2
+lrwxrwxrwx	root/root	usr/lib/libwoff2dec.so -> libwoff2dec.so.1.0.2
+-rwxr-xr-x	root/root	usr/lib/libwoff2dec.so.1.0.2
+lrwxrwxrwx	root/root	usr/lib/libwoff2enc.so -> libwoff2enc.so.1.0.2
+-rwxr-xr-x	root/root	usr/lib/libwoff2enc.so.1.0.2
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/libwoff2common.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libwoff2dec.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libwoff2enc.pc
diff --git a/woff2/.md5sum b/woff2/.md5sum
new file mode 100644
index 000000000..6ada093e0
--- /dev/null
+++ b/woff2/.md5sum
@@ -0,0 +1 @@
+793c8844845351cb80730a74937e411b  woff2-v1.0.2.tar.gz
diff --git a/woff2/.signature b/woff2/.signature
new file mode 100644
index 000000000..decf56f81
--- /dev/null
+++ b/woff2/.signature
@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF37WxOrV3QdUMuWp1W8+Mo+HcDwdhYTJP8WPsmNrsbcQe+zXMiPPBQjlfTmMEbFpJQt9Wta8e9w8FRV4oGLxJAwM=
+SHA256 (Pkgfile) = e4c2d53e1c7b2aafa865fdc76b371a9e8dd072b52928e89e868da0a48a4dba93
+SHA256 (.footprint) = c179ebad9e8bc5f83860892a89d23b7d5eaeb425234ed56e8759835357eee452
+SHA256 (woff2-v1.0.2.tar.gz) = add272bb09e6384a4833ffca4896350fdb16e0ca22df68c0384773c67a175594
diff --git a/woff2/Pkgfile b/woff2/Pkgfile
new file mode 100644
index 000000000..8cae39ed3
--- /dev/null
+++ b/woff2/Pkgfile
@@ -0,0 +1,24 @@
+# Description: Web Open Font Format 2 reference implementation
+# URL: https://github.com/google/woff2
+# Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: brotli ninja
+
+name=woff2
+version=1.0.2
+release=1
+source=(https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz)
+
+build() {
+	cd $name-$version
+
+	install -d $SRC/build
+	cd $SRC/build
+
+	cmake $SRC/$name-$version \
+		-G Ninja \
+		-DCMAKE_INSTALL_PREFIX="/usr" \
+		-DCMAKE_INSTALL_LIBDIR="/usr/lib"
+
+	ninja -j ${JOBS-1}
+	DESTDIR="$PKG" ninja install
+}