Merge branch '3.3' into 3.4

abcde/.footprint

@@ -5,7 +5,8 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/abcde
 -rwxr-xr-x	root/root	usr/bin/abcde-musicbrainz-tool
 -rwxr-xr-x	root/root	usr/bin/cddb-tool
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/abcde.1.gz
--rw-r--r--	root/root	usr/man/man1/cddb-tool.1.gz
+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/abcde.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/cddb-tool.1.gz

abcde/.md5sum

@@ -1 +1 @@
-d761c5a07854ce24748be9aa10100e74  abcde-2.5.4.tar.gz
+29c9819f83615d71eda3489fd3fc5d43  abcde-2.8.1.tar.gz

abcde/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37p0Y0lkl4nI/+/tBnvaHcWrqHzFbBDhHaEVi/JkQuBA0rLTtsdYevOA4RPy2gt9j1ZNnIUa66pU5aod98ugTAI=
-SHA256 (Pkgfile) = 2fba794f3004b54c2b79f40b18984ffd4d4c3800fae6bc47dd6888a3621004cc
-SHA256 (.footprint) = 4a5390955ded578bc2fb0acaaa3c3ef84ea2ecfa63497b7e3fcdadf48b3bc99b
-SHA256 (abcde-2.5.4.tar.gz) = 85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591
+RWSagIOpLGJF39Uz88qVLVuXoZs70Y0FygHr+Eu4dvvJS62xDW5Pm27Nn0inimqUAysGRpEKFcCUuU5yUMTctT0JgSdqUKB6ugE=
+SHA256 (Pkgfile) = 98d2d23b75a6466d87d3095f90ad0a83072c9b49dae510f0fa2201b855a215a3
+SHA256 (.footprint) = 07a0104c20296297bad6cbe5f734e8d020a1f95345727941c3df0d3590b3af5f
+SHA256 (abcde-2.8.1.tar.gz) = e49c71d7ddcd312dcc819c3be203abd3d09d286500ee777cde434c7881962b39

abcde/Pkgfile

@@ -1,17 +1,16 @@
 # Description: a better cd encoder
-# URL:         http://code.google.com/p/abcde
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
-# Depends on:  bash cd-discid wget vorbis-tools
+# URL:         https://abcde.einval.com/wiki/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  cd-discid cdparanoia vorbis-tools
+# Optional:    faac fdk-aac flac id3lib lame speex wavpack
 
 name=abcde
-version=2.5.4
-release=2
-source=(http://$name.googlecode.com/files/$name-$version.tar.gz)
+version=2.8.1
+release=1
+source=(https://$name.einval.com/download/$name-$version.tar.gz)
 
 build () {
-    cd "$name-$version"
-    make DESTDIR=$PKG \
-        PREFIX=/usr \
-	mandir=$PKG/usr/man/man1 \
-        install
+	cd "$name-$version"
+	make DESTDIR=$PKG prefix=/usr install
+	rm -rf $PKG/usr/share/doc
 }

bzr/.md5sum

@@ -0,0 +1 @@
+8e5020502efd54f5925a14a456b88b89  bzr-2.7.0.tar.gz

bzr/.signature

@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3xeOOkcBnaNKPNTqc5VeVH9AImVAPqqCpmdlahqC8J8zClmeS/FNtep9XD6QGIMNSZQcLsznSgeHguRXx1jXKgs=
+SHA256 (Pkgfile) = 4d6fcca9adb1f5478b554c71957e05f73feb0c34bad4d89bbde56f76db636f8d
+SHA256 (.footprint) = efb1f46be6443d7ec399f17c8f33382d01152e535cb837dd29ccb2f5397eea38
+SHA256 (bzr-2.7.0.tar.gz) = 0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3

bzr/Pkgfile

@@ -0,0 +1,14 @@
+# Description: Next-generation distributed version control.
+# URL:         https://bazaar-ng.org/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  python
+
+name=bzr
+version=2.7.0
+release=1
+source=(https://launchpad.net/$name/${version%.*}/$version/+download/$name-$version.tar.gz)
+
+build() {
+	cd $name-$version
+	python setup.py install --root=$PKG --prefix=/usr --install-data=/usr/share
+}

cd-discid/.footprint

@@ -1,6 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cd-discid
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/cd-discid.1.gz
+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/cd-discid.1.gz

cd-discid/.md5sum

@@ -1 +1 @@
-64677b8b63d1db0db015043f5455171a  cd-discid_0.9.orig.tar.gz
+85027b71d08fbbfb11ac2f0db6e8cea7  cd-discid-1.4.tar.gz

cd-discid/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33B8l8eON5DhYawigre7vI6OweLyOOysBdyzpSnGC/B7BwWC2kDI9bpxvUiuCfovVO8CUVg+vSJAPnTAz7GiwwQ=
-SHA256 (Pkgfile) = b0712d95c38e9c6e3c24a1cda4b28cff5d958b39da1f67d15c1c571767ddad3a
-SHA256 (.footprint) = dae9b06d65b71c5bad6c1dbb4a389392f65cd8050acf486cfd03a881e423e762
-SHA256 (cd-discid_0.9.orig.tar.gz) = 4917ac85e734d669cc4e2b8e04803afc3bddb809fc36ba400ef48075839fa2bb
+RWSagIOpLGJF34ttguntYGQe18WZbIx47DZXRNrwnWakPNAdWVF3HCiND9eEibqCuJDtN2KE9nuDzaRj3x8xhkV7aZA+JTTDBgk=
+SHA256 (Pkgfile) = b228d041fc01a5fcced782ed0453bf84ea65e4055378b79716fd02774b4caac3
+SHA256 (.footprint) = 74932d1a42a55fd127501dff9edf9e4e2628da0e6f9c4b6dc42f2d8e13205ebc
+SHA256 (cd-discid-1.4.tar.gz) = ffd68cd406309e764be6af4d5cbcc309e132c13f3597c6a4570a1f218edd2c63

cd-discid/Pkgfile

@@ -1,18 +1,14 @@
 # Description: Backend utility to get cddb information
-# URL:         http://lly.org/~rcw/cd-discid/
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
-# Depends on:
+# URL:         http://linukz.org/cd-discid.shtml
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
 
 name=cd-discid
-version=0.9
+version=1.4
 release=1
-source=(http://lly.org/~rcw/$name/${name}_$version.orig.tar.gz)
+source=(http://linukz.org/download/$name-$version.tar.gz)
 
 build () {
     cd "$name-$version"
     make
-    make DESTDIR=$PKG \
-        PREFIX=/usr \
-        mandir=$PKG/usr/man/man1 \
-        install
+    make STRIP=/bin/true DESTDIR=$PKG PREFIX=/usr install
 }

cppcheck/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34mpAE4gRiLwkgMfS7qlkQ1e+tYt434wrtvcPEz92iSLLXDFl/otmGohDgIcwAgxutV/3BaB/r6WL6k7faUx9gU=
-SHA256 (Pkgfile) = 6806ae281b5f52180c6b628733cfdf165acdd8d8fc6f8cb38192907dea24aac8
+RWSagIOpLGJF31QvFAFxT/SPm2Tmt9490q2aISlg5uYM16SSZf8P4AViyKoslWAILQhZimP951dQ+sgqtvuyrgdfJJ9f2CVOwgc=
+SHA256 (Pkgfile) = 2d098673dc995046075b7d0b19534691e099f780f5c9f995fabf6a58fc017aab
 SHA256 (.footprint) = a1ed8827e7ddbaf05a7a44202da38090ac7b8cd753f1d6cb4bf1a3e932b64308
 SHA256 (cppcheck-1.82.tar.gz) = 524444a678e63dee247fd8d2fe3194317c07f2aa65de31a41aa2eb0553bbdc7f

cppcheck/Pkgfile

@@ -1,6 +1,6 @@
 # Description: Static analysis tool for C/C++ code
 # URL:         http://cppcheck.sourceforge.net/
-# Maintainer:  Svyatoslav Mishyn, svyatoslav dot mishyn at gmail dot com
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
 # Depends on:  libpcre python docbook-xsl
 
 name=cppcheck

ddrescue/.md5sum

@@ -1 +1 @@
-49c845ed89d25b534842e40366154cb4  ddrescue-1.22.tar.lz
+cd85a82d510d9abf790132fb0da1bf3c  ddrescue-1.23.tar.lz

ddrescue/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33rtOW+fbgFdnf8MyeSEa7YroEWUNoCUeYl+jdfJ9uuwfVW9Kcd3ea8wqEk8S4CJIuXJfa4++jDB3CC1ikQy2Qs=
-SHA256 (Pkgfile) = 1bec6cb155ac56b0cc137386f19e85d22244f053125e6d2ac9beeb3ee1546de3
+RWSagIOpLGJF39zIfDn7EVU20c6KY99aKJmXpHuTAdMziH9wCRQn+GtNzI2ntYFMyhmj3VGn7s0yLtNCXegayYx5JaDGnXJxiQo=
+SHA256 (Pkgfile) = 6da8424a96f9970da6851f7177a256abaacaff4f4af0833f7436b87bcb49c211
 SHA256 (.footprint) = 2a57a202f5e3f27dd1eba54857fefb40208d344a4b9e2e49fc732a27eec4d3ff
-SHA256 (ddrescue-1.22.tar.lz) = 09857b2e8074813ac19da5d262890f722e5f7900e521a4c60354cef95eea10a7
+SHA256 (ddrescue-1.23.tar.lz) = a9ae2dd44592bf386c9c156a5dacaeeb901573c9867ada3608f887d401338d8d

ddrescue/Pkgfile

@@ -1,10 +1,9 @@
 # Description: ddrescue is a data recovery tool. It copies data from one file or block device (hard disc, cdrom, etc) to another, trying hard to rescue data in case of read errors.
 # URL: https://www.gnu.org/software/ddrescue/ddrescue.html
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Danny Rawlins, crux at romster dot me
 
 name=ddrescue
-version=1.22
+version=1.23
 release=1
 source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.lz)
 

dos2unix/.footprint

@@ -0,0 +1,13 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/dos2unix
+lrwxrwxrwx	root/root	usr/bin/mac2unix -> dos2unix
+-rwxr-xr-x	root/root	usr/bin/unix2dos
+lrwxrwxrwx	root/root	usr/bin/unix2mac -> unix2dos
+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/dos2unix.1.gz
+lrwxrwxrwx	root/root	usr/share/man/man1/mac2unix.1.gz -> dos2unix.1.gz
+lrwxrwxrwx	root/root	usr/share/man/man1/unix2dos.1.gz -> dos2unix.1.gz
+lrwxrwxrwx	root/root	usr/share/man/man1/unix2mac.1.gz -> dos2unix.1.gz

dos2unix/.md5sum

@@ -0,0 +1 @@
+a615de542899e53d6f9575ad3cb32b19  dos2unix-7.4.0.tar.gz

dos2unix/.signature

@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF34elIZxB94MRukPEV71e/8LIcoBk2YiAPJzkh8U2MnYt4ZKSivBsKBQpSro6E+x/Isw3hSS+NGRzqifW3UrhwQY=
+SHA256 (Pkgfile) = 5ae6c4736e377a75779737bde1fb5024c9d3cd1ee81c6809063d87486ba58fe4
+SHA256 (.footprint) = 624ae5623dcfc7cfd7f465b5a2c9c344fba2bc9a71d13724199ece3975cfe8f2
+SHA256 (dos2unix-7.4.0.tar.gz) = bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a

dos2unix/Pkgfile

@@ -0,0 +1,15 @@
+# Description: Dos2unix converts DOS or MAC text files to UNIX format
+# URL:         http://dos2unix.sourceforge.net
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+
+name=dos2unix
+version=7.4.0
+release=1
+source=(http://www.xs4all.nl/~waterlan/$name/$name-$version.tar.gz)
+
+build() {
+	cd $name-$version
+	make ENABLE_NLS= CFLAGS="$CFLAGS"
+	make ENABLE_NLS= DESTDIR=$PKG install-bin install-man
+}
+

dwm/.footprint

@@ -1,6 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/dwm
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/dwm.1.gz
+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/dwm.1.gz

dwm/.md5sum

@@ -1,2 +1,2 @@
-2453e037f46449774ec8afab49b4f1a2  config.h
-8bb00d4142259beb11e13473b81c0857  dwm-6.0.tar.gz
+80c4ef2a3eca0fe2d14e2203e3833200  config.h
+f0b6b1093b7207f89c2a90b848c008ec  dwm-6.1.tar.gz

dwm/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+Nt8e8B0VYhPkuYTzZzLp/wDdS24LBr1JIEA6MqjPSe/kW17DvnReoasdFZZG272BqyVjMKC23q8AwdjNCqTwU=
-SHA256 (Pkgfile) = 98506188493d894f27f20285c0281a60e1d332f18759300dcae543e543b6d380
-SHA256 (.footprint) = 8d8cde6f7b09f9bc061d2f4bf127dc08c33afe5711280f17189b4f6492024768
-SHA256 (dwm-6.0.tar.gz) = b2b9483de69259eeea56844899bb2385158d3e79a42d82b10c142099fc8eeb56
-SHA256 (config.h) = b5f59f40cce6e04b14ffd7105c3f17a070dbbb1eab6f3ca38c6e615b5eac897d
+RWSagIOpLGJF35fcEaw6bHwS4syTYqQEWBu1xNTk5vz/Cr/CJElT+0to/DOG1KGrIrxXuqr+f5tj+uIdO9avFEMamy6hVrx7egw=
+SHA256 (Pkgfile) = dd1c7771ca773b4f877f2d8b2a2affb8becf8c38676e16192b84fc992b9e9451
+SHA256 (.footprint) = 5fafc2be3ed213723d4401d9318b376ceeae5c7ab3a2ab885c9ab13be1c154a6
+SHA256 (dwm-6.1.tar.gz) = c2f6c56167f0acdbe3dc37cca9c1a19260c040f2d4800e3529a21ad7cce275fe
+SHA256 (config.h) = 5a7f0769943de1fba30dd8dbeff173c6bdae010ff2716a4d7c231e7f586df4e6

dwm/Pkgfile

@@ -1,19 +1,17 @@
 # Description: dynamic window manager
 # URL:         http://dwm.suckless.org/
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
-# Depends on:  xorg-libxinerama
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  xorg-libxft xorg-libxinerama
 
 name=dwm
-version=6.0
-release=1
+version=6.1
+release=2
 source=(http://dl.suckless.org/dwm/$name-$version.tar.gz config.h)
 
 build () {
-    cd "$name-$version"
+    cd $name-$version
+
     cp $SRC/config.h .
-    make
-    make DESTDIR=$PKG \
-        PREFIX=/usr \
-        MANPREFIX=/usr/man \
-        install
+    make CC=gcc X11INC=/usr/include
+    make DESTDIR=$PKG PREFIX=/usr install
 }

dwm/config.h

@@ -1,7 +1,10 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const char font[]            = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
+static const char *fonts[] = {
+	"monospace:size=10"
+};
+static const char dmenufont[]       = "monospace:size=10";
 static const char normbordercolor[] = "#444444";
 static const char normbgcolor[]     = "#222222";
 static const char normfgcolor[]     = "#bbbbbb";
@@ -10,22 +13,26 @@ static const char selbgcolor[]      = "#005577";
 static const char selfgcolor[]      = "#eeeeee";
 static const unsigned int borderpx  = 1;        /* border pixel of windows */
 static const unsigned int snap      = 32;       /* snap pixel */
-static const Bool showbar           = True;     /* False means no bar */
-static const Bool topbar            = True;     /* False means bottom bar */
+static const int showbar            = 1;        /* 0 means no bar */
+static const int topbar             = 1;        /* 0 means bottom bar */
 
 /* tagging */
 static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
 static const Rule rules[] = {
+	/* xprop(1):
+	 *	WM_CLASS(STRING) = instance, class
+	 *	WM_NAME(STRING) = title
+	 */
 	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Gimp",     NULL,       NULL,       0,            True,        -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 8,       False,       -1 },
+	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
+	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
 };
 
 /* layout(s) */
-static const float mfact      = 0.55; /* factor of master area size [0.05..0.95] */
-static const int nmaster      = 1;    /* number of clients in master area */
-static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
+static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
+static const int nmaster     = 1;    /* number of clients in master area */
+static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
 
 static const Layout layouts[] = {
 	/* symbol     arrange function */
@@ -46,8 +53,9 @@ static const Layout layouts[] = {
 #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
 
 /* commands */
-static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
-static const char *termcmd[]  = { "uxterm", NULL };
+static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+static const char *termcmd[]  = { "st", NULL };
 
 static Key keys[] = {
 	/* modifier                     key        function        argument */

enchant/.footprint

@@ -17,9 +17,9 @@ drwxr-xr-x	root/root	usr/lib/enchant-2/
 -rwxr-xr-x	root/root	usr/lib/enchant-2/enchant_hunspell.so
 -rw-r--r--	root/root	usr/lib/libenchant-2.a
 -rwxr-xr-x	root/root	usr/lib/libenchant-2.la
-lrwxrwxrwx	root/root	usr/lib/libenchant-2.so -> libenchant-2.so.2.2.1
-lrwxrwxrwx	root/root	usr/lib/libenchant-2.so.2 -> libenchant-2.so.2.2.1
--rwxr-xr-x	root/root	usr/lib/libenchant-2.so.2.2.1
+lrwxrwxrwx	root/root	usr/lib/libenchant-2.so -> libenchant-2.so.2.2.3
+lrwxrwxrwx	root/root	usr/lib/libenchant-2.so.2 -> libenchant-2.so.2.2.3
+-rwxr-xr-x	root/root	usr/lib/libenchant-2.so.2.2.3
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/enchant-2.pc
 drwxr-xr-x	root/root	usr/share/

enchant/.md5sum

@@ -1 +1 @@
-0dacf2d2e53b1b394c19fd772390e0d4  enchant-2.2.1.tar.gz
+4b8abb58e00e93363591b3f5ea4f52d5  enchant-2.2.3.tar.gz

enchant/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+LShh7yfcHnWQg571S8YANPvaXxiJAmS3TyG6XdHw2r6xMk/JWe1FVikq+ySieP3kIJ+n6/wRUzsI1b3KvxvwY=
-SHA256 (Pkgfile) = 25a8dbf6ad184c4ab7d27ced90f84992dc2b03a697fc9c0a604e6bba372f89fb
-SHA256 (.footprint) = 323b9ba39b5ed2ebc1f7ab16521056a18aa642ce086779a341b178a41bc8311d
-SHA256 (enchant-2.2.1.tar.gz) = 97f2e617b34c66a645b9cfebe33700456c31ca2f4677eb827b364c0d9a7f4e5e
+RWSagIOpLGJF319O94ud1xObNkt4lkuU72ZZ7So9oWqu52O9agAzaLR1y2ZI2JArie0kz8jmsR69bDTZzfJ2PIMnug3hjgzKvg4=
+SHA256 (Pkgfile) = e68fda8bf37626ec1caa463e916382cd417adaad7c3e18b0a5ffca28766604e9
+SHA256 (.footprint) = b5af98320881ffb3ba9d07e0be64b08e2d78814f4934cc00f94274f79f360f24
+SHA256 (enchant-2.2.3.tar.gz) = abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d

enchant/Pkgfile

@@ -4,16 +4,14 @@
 # Depends on: aspell glib hunspell
 
 name=enchant
-version=2.2.1
+version=2.2.3
 release=1
 source=(https://github.com/AbiWord/$name/releases/download/v$version/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
 
-	./configure \
-		--prefix=/usr \
-		--with-myspell-dir=/usr/share/myspell
+	./configure --prefix=/usr
 
 	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 	make

ethtool/.md5sum

@@ -0,0 +1 @@
+1d9a82de6c9131d1caa626f77c6cdb57  ethtool-4.15.tar.xz

ethtool/.signature

@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3xJCRl4/y849AHSWQBclBO/MOVBnRjCZjremiP8l8HNMKCu+xGGDgT8Rub5yYUYoTJdZYmAMHNWC2psOh4gDewQ=
+SHA256 (Pkgfile) = cd3fdee675a50d8260e455ccda8b7df42a3893099bf850669bb0c3fd74018937
+SHA256 (.footprint) = 0c1414ae37bf1aa07394d0619ee65d30799bf11d9f93f53f6f5a6f12d0261359
+SHA256 (ethtool-4.15.tar.xz) = 71f7fd32483ffdc7c6c4d882e230714eb101df0a46cbe396dbeb8ac78f1ef91a

ethtool/Pkgfile

@@ -0,0 +1,16 @@
+# Description: Linux net driver diagnostic and tuning tool
+# URL:         https://www.kernel.org/pub/software/network/ethtool/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+
+name=ethtool
+version=4.15
+release=1
+source=(https://www.kernel.org/pub/software/network/$name/$name-$version.tar.xz)
+
+build() {
+	cd $name-$version
+	./configure --prefix=/usr
+	make
+	make DESTDIR=$PKG install
+}
+

feedparser/.signature

@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3857KVr019xtvBrs9CpG49TIfhWiRC6IYRZhiF/XgCffgHqmj4bKNF26v+tGN46DRfX7o9tSG2q/LWzUlzteigQ=
+SHA256 (Pkgfile) = 09993cb6095918fbd9a11866fa57cb9ab197e7d0cf5e85d6848c1649c8017c78
+SHA256 (.footprint) = 109bfb228ecf4e68d4bbd07844fd743e5f4dade8264eb1d0f9ad23b1a2f8b6ea
+SHA256 (5.2.1.tar.gz) = 09367f95e58b9c5f70da70061d3e7f397ed8ec5d3c970e231ef011ff62de462f

feedparser/Pkgfile

@@ -0,0 +1,15 @@
+# Description: Parse RSS and Atom feeds in Python
+# URL:         https://github.com/kurtmckee/feedparser
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  python-setuptools
+
+name=feedparser
+version=5.2.1
+release=1
+source=(https://github.com/kurtmckee/feedparser/archive/$version.tar.gz)
+
+build() {
+	cd $name-$version
+	/usr/bin/python setup.py build
+	/usr/bin/python setup.py install --prefix=/usr --root=$PKG --optimize=1
+}

ffmpeg/.md5sum

@@ -1,3 +1,3 @@
 5e0c5cca88620751af75ce7a219b5b09  CVE-2018-6621.patch
-bbf3fcded80c33968c91bf323a744286  ffmpeg-3.4.1.tar.bz2
+26827ce59cf3379294d4c8731d85581f  ffmpeg-3.4.2.tar.bz2
 dae0c10c99399580c929fc100e79faef  ffmpeg-x264-10bit.sh

ffmpeg/.signature

@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3wYh+oQIJbx0WSoQpCT6i1GSDkuKl7IZOamNm4WWhu0zaBE2I5NJJpNYrxHmn5duvTE7aAuBZEpOHWHDx5KjtQo=
-SHA256 (Pkgfile) = aef3aa9d55efc42256094b9d9c2fe6b8398910ee4f6d8387559f14fc85b85e9e
+RWSagIOpLGJF30gEkMN7MGlBFyLEELhjN6ob1AhQDyVJIT/UHJ90h9aPM+yXiFY0aFg45uDEkEhtuqI1GuJwi+kC8vij6y1zDA4=
+SHA256 (Pkgfile) = 7e39ee721f34416d7d681bfba21674c1ee29005a4ee413e45902b97717d30d51
 SHA256 (.footprint) = 2b74837c5c830b52d0bb6f4258bdf7c2e4dd56982b9f9455248b8195b970d1cb
-SHA256 (ffmpeg-3.4.1.tar.bz2) = f3443e20154a590ab8a9eef7bc951e8731425efc75b44ff4bee31d8a7a574a2c
+SHA256 (ffmpeg-3.4.2.tar.bz2) = eb0370bf223809b9ebb359fed5318f826ac038ce77933b3afd55ab1a0a21785a
 SHA256 (ffmpeg-x264-10bit.sh) = dde9627c41800235fbcfe0f74d2181be96239a82cd2d0d277715dddb57eb9cb3
 SHA256 (CVE-2018-6621.patch) = e3b9aff1fe9aef2d7153d7517f9c349beef27c2859bf1fb01076eeab263a445e

ffmpeg/Pkgfile

@@ -1,13 +1,12 @@
 # Description: Complete solution to record, convert and stream audio and video.
 # URL: http://ffmpeg.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Matt Housh, jaeger at crux dot nu
 # Depends on: bzip2 xz yasm zlib
 # Optional: alsa-lib fdk-aac gnutls lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus x264 x265
 
 name=ffmpeg
-version=3.4.1
-release=2
+version=3.4.2
+release=1
 source=(https://ffmpeg.org/releases/$name-$version.tar.bz2
 	ffmpeg-x264-10bit.sh
 	CVE-2018-6621.patch)

i2c-tools/.footprint

@@ -0,0 +1,33 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/ddcmon
+-rwxr-xr-x	root/root	usr/bin/decode-dimms
+-rwxr-xr-x	root/root	usr/bin/decode-edid
+-rwxr-xr-x	root/root	usr/bin/decode-vaio
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/i2c/
+-rw-r--r--	root/root	usr/include/i2c/smbus.h
+drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libi2c.a
+lrwxrwxrwx	root/root	usr/lib/libi2c.so -> libi2c.so.0
+lrwxrwxrwx	root/root	usr/lib/libi2c.so.0 -> libi2c.so.0.1.0
+-rwxr-xr-x	root/root	usr/lib/libi2c.so.0.1.0
+drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/i2c-stub-from-dump
+-rwxr-xr-x	root/root	usr/sbin/i2cdetect
+-rwxr-xr-x	root/root	usr/sbin/i2cdump
+-rwxr-xr-x	root/root	usr/sbin/i2cget
+-rwxr-xr-x	root/root	usr/sbin/i2cset
+-rwxr-xr-x	root/root	usr/sbin/i2ctransfer
+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/decode-dimms.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/decode-vaio.1.gz
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/i2c-stub-from-dump.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/i2cdetect.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/i2cdump.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/i2cget.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/i2cset.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/i2ctransfer.8.gz

i2c-tools/.signature

@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF379gyfYhE3jZJODSybuBQw2sonVS8wrOzWgkj1PmYjN9nPX6mVI4o8TguKMOriXIRttkmVmii8+M5+V4f6FNhwQ=
+SHA256 (Pkgfile) = c74fc432bf0f7a0cb0a5ac485b7effe6b323918afdda2f20102d35b414699e98
+SHA256 (.footprint) = cef3dc749f3dbc8e798b6fa005f88ceb884ff0cc76a665369b4161bb75343f53
+SHA256 (i2c-tools-4.0.tar.xz) = d900ca1c11c51ea20caa50b096f948008b8a7ad832311b23353e21baa7af28d6

i2c-tools/Pkgfile

@@ -0,0 +1,14 @@
+# Description: I2C Tools for Linux
+# URL:         https://i2c.wiki.kernel.org/index.php/I2C_Tools
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+
+name=i2c-tools
+version=4.0
+release=1
+source=(https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-$version.tar.xz)
+
+build() {
+	cd $name-$version
+	make prefix=/usr
+	make prefix=/usr DESTDIR=$PKG install
+}

jamvm/.md5sum

@@ -0,0 +1 @@
+7654e9657691f5f09c4f481ed4686176  jamvm-1.5.4.tar.gz

jamvm/.signature

@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF36D7JJ1GfiXt3X+HSpRBhheOakn+XgYYw9woOl7JZa+Q0vI6evwagBaqlDMDI8t5NiddoAsBiLqh17KZxxNYeAM=
+SHA256 (Pkgfile) = a7e87b805611755a2b1442aa43fc00c1d237551d44f61903ebcbffc0594f55a1
+SHA256 (.footprint) = 650be26b33df7ffbc2f9351cbd8ac6c5d9535911bea08e8e73f22b575f4d2cf3
+SHA256 (jamvm-1.5.4.tar.gz) = 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124

jamvm/Pkgfile

@@ -0,0 +1,16 @@
+# Description: Extremely small and JVM spec 2 (blue book) conformant Java Virtual Machine
+# URL:         http://jamvm.sourceforge.net/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+
+name=jamvm
+version=1.5.4
+release=1
+source=(http://download.sourceforge.net/$name/$name/JamVM%20$version/$name-$version.tar.gz)
+
+build() {
+	find $name-$version ! -type l -a -perm -go+w | xargs chmod go-w
+	cd $name-$version
+	./configure --prefix=/usr
+	make
+	make DESTDIR=$PKG install
+}

libquvi-scripts/.footprint

@@ -2,9 +2,6 @@ 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
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man7/
--rw-r--r--	root/root	usr/man/man7/libquvi-scripts.7.gz
 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/
@@ -73,3 +70,6 @@ drwxr-xr-x	root/root	usr/share/libquvi-scripts/lua/website/quvi/
 -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
+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

libquvi-scripts/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34/xqV6XG5kL+BOH6rrlvVXT87GCboqGZ/RWhB58EFSH5Tj2JK/hhPz/kQStQM5hDsQhB2E7E8S3zGPHklc2ywM=
-SHA256 (Pkgfile) = 87773dea14b9adbb375eb6be5c53361c6aff8f948c34c9cdebb8e3115de545cd
-SHA256 (.footprint) = daa9c3a6eaff641bd6ce691294cf43a71a34e72d255e736bff20171050d4d421
+RWSagIOpLGJF3xCGRp3U1lOp1O4AEH8GgHaJ8+3JdRtVM0GEM/JGVuW6p+JXeWCaJDTGSJd4zJyMg9UVgTFHp+YqnAJhxz4Pewo=
+SHA256 (Pkgfile) = 03e191466b168cbfdde365005f26d94b54ebdbd0c0e230fd6418c8d87cb5d2c1
+SHA256 (.footprint) = 69bec42fd59673ce88cbbcf312ab8b52c7cb63f2b106f8b27ba2796033faebf8
 SHA256 (libquvi-scripts-0.4.21.tar.xz) = 7c02cc86ac25334892d08bbc31251d78a55ee2a16d57dfa2bda7ac657c8e0f34

libquvi-scripts/Pkgfile

@@ -1,18 +1,23 @@
 # Description: Library for parsing video download links. - Scripts
 # URL:         http://quvi.sourceforge.net/
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
-# Depends on:  curl lua
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  lua
 
 name=libquvi-scripts
 version=0.4.21
-release=1
+release=2
 source=(http://downloads.sourceforge.net/sourceforge/quvi/$name-$version.tar.xz)
 
 build () {
-    cd "$name-$version"
-    ./configure --prefix=/usr --mandir=/usr/man --with-nsfw --with-nlfy
-    make
-    make DESTDIR=$PKG \
-        install
-    rm -rf $(find $PKG/usr/share -name README)
+	cd $name-$version
+
+	./configure \
+		--prefix=/usr \
+		--with-nsfw \
+		--with-nlfy
+
+	make
+	make DESTDIR=$PKG install
+
+	rm -rf $(find $PKG/usr/share -name README)
 }

libquvi/.footprint

@@ -12,6 +12,7 @@ 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
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libquvi.pc
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man3/
--rw-r--r--	root/root	usr/man/man3/libquvi.3.gz
+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

libquvi/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30+OuIR9bkAbQP+n6xQeEgkEqja0VNb+1d3szw7JFUmOB4JRGe7NViXtdXIowbdy+8iYs3MSHC1053lecjLI+g0=
-SHA256 (Pkgfile) = c56cbbc7afb58eeb2454968883147207341b64b7c43198beddc7d588741e2878
-SHA256 (.footprint) = 247e253379517dc397288e3346a46fc01e8980ead57a48f00b63bd52baca88a7
+RWSagIOpLGJF3zOSLnw2gUN3Ksi4jdb7m4ip2ExEqauh+BFRznMc91iciB3kAeHM1cPWGS5pUXEJqMbt0Ua4AkKOZETqGaD/WAw=
+SHA256 (Pkgfile) = 57ecf82a43cb3e6d0501d56327c933a8981fa0d270429ae60231f5e352fefb99
+SHA256 (.footprint) = e3201936dfd81a80931829b87b3499944ef33fa99a3966acce227751c1f938ba
 SHA256 (libquvi-0.4.1.tar.xz) = b5862f7e5fa6ed7defd169adb5c7586c6406af86e029671fd09615f6eb7aa903

libquvi/Pkgfile

@@ -1,17 +1,18 @@
 # Description: Library for parsing video download links.
 # URL:         http://quvi.sourceforge.net/
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
 # Depends on:  libquvi-scripts
 
 name=libquvi
 version=0.4.1
-release=1
+release=2
 source=(http://downloads.sourceforge.net/sourceforge/quvi/$name-$version.tar.xz)
 
 build () {
-    cd "$name-$version"
-    ./configure --prefix=/usr --mandir=/usr/man
-    make
-    make DESTDIR=$PKG \
-        install
+	cd $name-$version
+
+	./configure --prefix=/usr
+
+	make
+	make DESTDIR=$PKG install
 }

mpv/.md5sum

@@ -1,2 +1 @@
-ab865014635762ab84a8e682ab9dedbe  09_ytdl-hook-whitelist-protocols.patch
-ec86f42b091d891f9a932de0f6e873ad  mpv-v0.27.0.tar.gz
+8cfb48e921e58c0d9d181d96d4809beb  mpv-v0.27.2.tar.gz

mpv/.signature

@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/8znsF9QZG+qu1DfjHvuZatuZzZTDt8Wna+swOMl79Mb4Kpz/9slTZo+HPEUn7I2pBOeNRwCqyYGEVq2JNMyw8=
-SHA256 (Pkgfile) = 68a6708f0901499c66f9bb8163dcbba9701296f61def56e2ba8242ae52659f56
+RWSagIOpLGJF3xXPXkv7MnjVpO3iJfGIuzsGv6/l3aMkGMaIYizrBP3+cIv87OAX06lCP0RPnS2oi4QGC4Uu1pY8HdMpBr+wXgI=
+SHA256 (Pkgfile) = 222c4702749f1c5471e52646c688b60f759c9f19d02cb52de2655f7c034c5481
 SHA256 (.footprint) = 3872a22695e9c213f10e0bd6c0ae8fb7c2bba5425dd68eb1ec02c9e0ba171d09
-SHA256 (mpv-v0.27.0.tar.gz) = 341d8bf18b75c1f78d5b681480b5b7f5c8b87d97a0d4f53a5648ede9c219a49c
-SHA256 (09_ytdl-hook-whitelist-protocols.patch) = 6f6bc517c3b1d72a070af64df14428aee76e6cd123b934721851649833061918
+SHA256 (mpv-v0.27.2.tar.gz) = 2ad104d83fd3b2b9457716615acad57e479fd1537b8fc5e37bfe9065359b50be

mpv/09_ytdl-hook-whitelist-protocols.patch

@@ -1,105 +0,0 @@
-Description: ytdl_hook: whitelist protocols from urls retrieved from youtube-dl
- This patch is a combination of these upstream commits:
- - e6e6b0dcc7e9 ("ytdl_hook: whitelist protocols from urls retrieved from
-   youtube-dl")
- - f8263e82cc74 ("ytdl_hook: move url_is_safe earlier in code")
- - ce42a965330d ("ytdl_hook: fix safe url checking with EDL urls")
- .
- jcowgill: backported to 0.27
- Fixes CVE-2018-6360
-Author: Ricardo Constantino <wiiaboo@gmail.com>
-Bug: https://github.com/mpv-player/mpv/issues/5456
-Bug-Debian: https://bugs.debian.org/888654
-Applied-Upstream: v0.29
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-
---- a/player/lua/ytdl_hook.lua
-+++ b/player/lua/ytdl_hook.lua
-@@ -15,6 +15,18 @@ local ytdl = {
- 
- local chapter_list = {}
- 
-+function Set (t)
-+    local set = {}
-+    for _, v in pairs(t) do set[v] = true end
-+    return set
-+end
-+
-+local safe_protos = Set {
-+    "http", "https", "ftp", "ftps",
-+    "rtmp", "rtmps", "rtmpe", "rtmpt", "rtmpts", "rtmpte",
-+    "data"
-+}
-+
- local function exec(args)
-     local ret = utils.subprocess({args = args})
-     return ret.status, ret.stdout, ret
-@@ -71,6 +83,15 @@ local function edl_escape(url)
-     return "%" .. string.len(url) .. "%" .. url
- end
- 
-+local function url_is_safe(url)
-+    local proto = type(url) == "string" and url:match("^(.+)://") or nil
-+    local safe = proto and safe_protos[proto]
-+    if not safe then
-+        msg.error(("Ignoring potentially unsafe url: '%s'"):format(url))
-+    end
-+    return safe
-+end
-+
- local function time_to_secs(time_string)
-     local ret
- 
-@@ -182,6 +203,9 @@ local function edl_track_joined(fragment
- 
-     for i = offset, #fragments do
-         local fragment = fragments[i]
-+        if not url_is_safe(join_url(base, fragment)) then
-+            return nil
-+        end
-         table.insert(parts, edl_escape(join_url(base, fragment)))
-         if fragment.duration then
-             parts[#parts] =
-@@ -201,6 +225,9 @@ local function add_single_video(json)
-             edl_track = edl_track_joined(track.fragments,
-                 track.protocol, json.is_live,
-                 track.fragment_base_url)
-+            if not edl_track and not url_is_safe(track.url) then
-+                return
-+            end
-             if track.acodec and track.acodec ~= "none" then
-                 -- audio track
-                 mp.commandv("audio-add",
-@@ -217,6 +244,9 @@ local function add_single_video(json)
-         edl_track = edl_track_joined(json.fragments, json.protocol,
-             json.is_live, json.fragment_base_url)
- 
-+        if not edl_track and not url_is_safe(json.url) then
-+            return
-+        end
-         -- normal video or single track
-         streamurl = edl_track or json.url
-         set_http_headers(json.http_headers)
-@@ -408,6 +438,10 @@ mp.add_hook("on_load", 10, function ()
- 
-                 msg.debug("EDL: " .. playlist)
- 
-+                if not playlist then
-+                    return
-+                end
-+
-                 -- can't change the http headers for each entry, so use the 1st
-                 if json.entries[1] then
-                     set_http_headers(json.entries[1].http_headers)
-@@ -475,7 +509,9 @@ mp.add_hook("on_load", 10, function ()
-                         site = entry["webpage_url"]
-                     end
- 
--                    playlist = playlist .. "ytdl://" .. site .. "\n"
-+                    if url_is_safe(site) then
-+                        playlist = playlist .. "ytdl://" .. site .. "\n"
-+                    end
-                 end
- 
-                 mp.set_property("stream-open-filename", "memory://" .. playlist)

mpv/Pkgfile

@@ -5,10 +5,9 @@
 # Optional:    youtube-dl libquvi libdvdnav libbluray libcdio-paranoia libvdpau
 
 name=mpv
-version=0.27.0
-release=2
-source=(https://github.com/$name-player/$name/archive/v$version/$name-v$version.tar.gz \
-    09_ytdl-hook-whitelist-protocols.patch)
+version=0.27.2
+release=1
+source=(https://github.com/$name-player/$name/archive/v$version/$name-v$version.tar.gz)
 
 build() {
 	cd $name-$version
@@ -16,9 +15,6 @@ build() {
 	[ -e '/usr/lib/pkgconfig/libcdio_cdda.pc' ] && PKGMK_MPV+=' --enable-cdda'
 	[ -e '/usr/lib/pkgconfig/dvdnav.pc' ] && PKGMK_MPV+=' --enable-dvdread --enable-dvdnav'
 
-	# CVE-2018-6360 fix
-	patch -p1 -i $SRC/09_ytdl-hook-whitelist-protocols.patch
-
 	./bootstrap.py
 	./waf configure ${PKGMK_MPV} \
 		--prefix=/usr \

p5-digest-sha1/.footprint

@@ -0,0 +1,16 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/perl5/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/linux-thread-multi/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/linux-thread-multi/Digest/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/linux-thread-multi/Digest/SHA1.pm
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/linux-thread-multi/auto/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/linux-thread-multi/auto/Digest/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/linux-thread-multi/auto/Digest/SHA1/
+-rwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/linux-thread-multi/auto/Digest/SHA1/SHA1.so
+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/Digest::SHA1.3pm.gz

p5-digest-sha1/.signature

@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF39m6gmjSC71MK6OcA7o+V9OIDu89WfY8qCXRMVMiRGsAJPbMKmBVwq2TuSInV4963wZWXmd2hli4vrogzElUyQQ=
+SHA256 (Pkgfile) = dbb76d2ed59543aebf76ac483082db61852668ac3601a40ab2d23e5e9763271d
+SHA256 (.footprint) = 15e3b6ca896e83354873e94e58dfecb960bfa868b49c10a6f77d7f14aefa3d87
+SHA256 (Digest-SHA1-2.13.tar.gz) = 68c1dac2187421f0eb7abf71452a06f190181b8fc4b28ededf5b90296fb943cc

p5-digest-sha1/Pkgfile

@@ -0,0 +1,30 @@
+# Description: Perl Digest::SHA1
+# URL:         https://search.cpan.org/~gaas/Digest-SHA1/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  perl
+
+name=p5-digest-sha1
+version=2.13
+release=3
+source=(https://www.cpan.org/modules/by-module/Digest/Digest-SHA1-$version.tar.gz)
+
+build() {
+	cd Digest-SHA1-$version
+
+	perl Makefile.PL
+	make OPTIMIZE="$CFLAGS"
+
+	make install DESTDIR=$PKG
+
+	# Remove perlcrap
+	find $PKG -type f \( \
+		-name '.packlist' -or \
+		-name '*.bs' -or \
+		-name 'autosplit.ix' -or \
+		-name 'perllocal.pod' \) -delete
+
+	# Remove empty directories
+	find $PKG -depth -empty -exec rm -rf {} \;
+	# Fix perms
+	find $PKG -type f -a ! -perm -u+w -exec chmod u+w {} \;
+}

p5-extutils-depends/.footprint

@@ -0,0 +1,11 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/perl5/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/ExtUtils/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/ExtUtils/Depends.pm
+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/ExtUtils::Depends.3pm.gz

p5-extutils-depends/.signature

@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3xYoRvCgwFgloEethhOoebkBm0YIzf5xs7CQ42VVGN/pl7q8wk9Xi2bG+oX/78U+iCNKbjZoQ+7EtGqZaWletQo=
+SHA256 (Pkgfile) = adc409aeb23cf7c31256de5ad5f02af20d2f77da1c00cd96ab6838224a513ad3
+SHA256 (.footprint) = ece46380cbab13ef80b948898946e6bcfc42cc4e3fcc5b321dc0b10339cfd3d9
+SHA256 (ExtUtils-Depends-0.405.tar.gz) = 8ad6401ad7559b03ceda1fe4b191c95f417bdec7c542a984761a4656715a8a2c

p5-extutils-depends/Pkgfile

@@ -0,0 +1,24 @@
+# Description: Perl bindings for depends
+# URL:         https://www.cpan.org/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  p5-xml-parser
+
+name=p5-extutils-depends
+version=0.405
+release=2
+source=(https://www.cpan.org/modules/by-module/ExtUtils/ExtUtils-Depends-$version.tar.gz)
+
+build() {
+	cd ExtUtils-Depends-$version
+	perl Makefile.PL
+
+	make OPTIMIZE="$CFLAGS"
+	make install DESTDIR=$PKG
+
+	find $PKG -type f -a ! -perm -u+w | xargs chmod u+w
+	find $PKG \
+		-name perllocal.pod \
+		-o -name "*.bs" \
+		-o -name .packlist | xargs rm
+	find $PKG -empty | xargs rmdir -p ||:
+}

p5-extutils-pkgconfig/.footprint

@@ -0,0 +1,11 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/perl5/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/ExtUtils/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/ExtUtils/PkgConfig.pm
+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/ExtUtils::PkgConfig.3pm.gz

p5-extutils-pkgconfig/.signature

@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3yWKTsv7us56dWK+nnuLMyDwiZOz2hdbB8OpxHVNKH8fE8BCJ2RMzBZA4P+hHfeyNBpABlRdhROsbhOQtTttcw4=
+SHA256 (Pkgfile) = a98c8c821b123e5dc0fa35715ff2ba0f21279373a112188af576c43004cf44dd
+SHA256 (.footprint) = 9a4d09173e3ba27358ce647b497213f8b37851185f68ea92a26c7e856def246d
+SHA256 (ExtUtils-PkgConfig-1.16.tar.gz) = bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e

p5-extutils-pkgconfig/Pkgfile

@@ -0,0 +1,24 @@
+# Description: Perl bindings for pkgconfig
+# URL:         https://search.cpan.org/dist/ExtUtils-PkgConfig/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  p5-xml-parser
+
+name=p5-extutils-pkgconfig
+version=1.16
+release=2
+source=(https://www.cpan.org/modules/by-module/ExtUtils/ExtUtils-PkgConfig-$version.tar.gz)
+
+build() {
+	cd ExtUtils-PkgConfig-$version
+	perl Makefile.PL
+
+	make OPTIMIZE="$CFLAGS"
+	make install DESTDIR=$PKG
+
+	find $PKG -type f -a ! -perm -u+w | xargs chmod u+w
+	find $PKG \
+		-name perllocal.pod \
+		-o -name "*.bs" \
+		-o -name .packlist | xargs rm
+	find $PKG -empty | xargs rmdir -p ||:
+}

pm-utils/.footprint

@@ -0,0 +1,77 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/pm/
+drwxr-xr-x	root/root	etc/pm/config.d/
+drwxr-xr-x	root/root	etc/pm/power.d/
+drwxr-xr-x	root/root	etc/pm/sleep.d/
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/on_ac_power
+-rwxr-xr-x	root/root	usr/bin/pm-is-supported
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/pm-utils.pc
+drwxr-xr-x	root/root	usr/lib/pm-utils/
+drwxr-xr-x	root/root	usr/lib/pm-utils/bin/
+-rwxr-xr-x	root/root	usr/lib/pm-utils/bin/pm-action
+-rwxr-xr-x	root/root	usr/lib/pm-utils/bin/pm-pmu
+-rwxr-xr-x	root/root	usr/lib/pm-utils/bin/pm-reset-swap
+-rwxr-xr-x	root/root	usr/lib/pm-utils/bin/service
+-rw-r--r--	root/root	usr/lib/pm-utils/defaults
+-rwxr-xr-x	root/root	usr/lib/pm-utils/functions
+drwxr-xr-x	root/root	usr/lib/pm-utils/module.d/
+-rwxr-xr-x	root/root	usr/lib/pm-utils/module.d/kernel
+-rwxr-xr-x	root/root	usr/lib/pm-utils/module.d/tuxonice
+-rwxr-xr-x	root/root	usr/lib/pm-utils/module.d/uswsusp
+-rwxr-xr-x	root/root	usr/lib/pm-utils/pm-functions
+drwxr-xr-x	root/root	usr/lib/pm-utils/power.d/
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/disable_wol
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/hal-cd-polling
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/harddrive
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/intel-audio-powersave
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/journal-commit
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/laptop-mode
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/pcie_aspm
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/readahead
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/sata_alpm
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/sched-powersave
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/wireless
+-rwxr-xr-x	root/root	usr/lib/pm-utils/power.d/xfs_buffer
+drwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/00logging
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/00powersave
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/01grub
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/49bluetooth
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/55NetworkManager
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/75modules
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/90clock
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/94cpufreq
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/95led
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/98video-quirk-db-handler
+-rwxr-xr-x	root/root	usr/lib/pm-utils/sleep.d/99video
+drwxr-xr-x	root/root	usr/lib/pm-utils/video-quirks/
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-acer.quirkdb
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-apple.quirkdb
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-asus.quirkdb
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-dell.quirkdb
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-fujitsu.quirkdb
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-hp.quirkdb
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-ibm.quirkdb
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-lenovo.quirkdb
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-misc.quirkdb
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-samsung.quirkdb
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-sony.quirkdb
+-rw-r--r--	root/root	usr/lib/pm-utils/video-quirks/20-video-quirk-pm-toshiba.quirkdb
+drwxr-xr-x	root/root	usr/sbin/
+lrwxrwxrwx	root/root	usr/sbin/pm-hibernate -> /usr/lib/pm-utils/bin/pm-action
+-rwxr-xr-x	root/root	usr/sbin/pm-powersave
+lrwxrwxrwx	root/root	usr/sbin/pm-suspend -> /usr/lib/pm-utils/bin/pm-action
+lrwxrwxrwx	root/root	usr/sbin/pm-suspend-hybrid -> /usr/lib/pm-utils/bin/pm-action
+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/on_ac_power.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pm-is-supported.1.gz
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/pm-action.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/pm-pmu.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/pm-powersave.8.gz

pm-utils/.signature

@@ -0,0 +1,6 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3wFFmneGGGA1kJLb88UsO4sAHD5FFQyQ44zt/QQhOS3rIfs6XiR7whBrj1gH/CLjALlNtiq6MQFpRtrOZsEd2Ag=
+SHA256 (Pkgfile) = ceb4d36b2bc73ae877e8d3944d04ce4d9f7a7723d9dea2b3cc7c4715cfd7a658
+SHA256 (.footprint) = ad9d6a7634c69ca88361daef61c0a688d05230b8251f58c1b45130a9cbee21c0
+SHA256 (pm-utils-1.4.1.tar.gz) = 8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b
+SHA256 (pm-quirks-20100619.tar.gz) = 14a50518928c27417cdc8bcbabb32b3d986931de105149aa248d8883e56c61ec

pm-utils/Pkgfile

@@ -0,0 +1,28 @@
+# Description: Power management scripts for suspend and hibernate
+# URL:         http://pm-utils.freedesktop.org/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+
+name=pm-utils
+version=1.4.1
+release=1
+source=(http://pm-utils.freedesktop.org/releases/$name-$version.tar.gz \
+        http://pm-utils.freedesktop.org/releases/pm-quirks-20100619.tar.gz)
+
+build() {
+	cd $name-$version
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc
+
+	make
+	make DESTDIR=$PKG install
+
+	install -m 0644 man/*.1 $PKG/usr/share/man/man1
+	install -m 0644 man/*.8 $PKG/usr/share/man/man8
+
+	# install video quirks
+	mv $SRC/video-quirks $PKG/usr/lib/pm-utils
+
+	rm -rf $PKG/usr/share/doc
+}

qiv/.md5sum

@@ -0,0 +1 @@
+e64dd2cbd49f31264f60012e0138549b  qiv-2.3.2.tgz

qiv/.signature

@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3w7EnXOBdla3J6qGoJjy3zee5/0hUYNiYkO/61mhnGscbXwqb8VO4iOsyjUr8hI89ePsKJkbZQIuAMYcI8J5RAY=
+SHA256 (Pkgfile) = 06ef381e8dbeaf6fadf3e9643de025976348f1919356c615c3afd9b5be825f27
+SHA256 (.footprint) = 5a19c52fa346d924787748668c20d87b45f78efcd10dcd18e91a2fe57da73a9a
+SHA256 (qiv-2.3.2.tgz) = 48e0a088a0d5cf5fac2314a60b3aed62c4913e792627f64f03986865ad7080d5

qiv/Pkgfile

@@ -0,0 +1,18 @@
+# Description: Very small and pretty fast gdk/Imlib2 image viewer
+# URL:         http://spiegl.de/qiv/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  imlib2 gtk lcms2 libexif
+
+name=qiv
+version=2.3.2
+release=1
+source=(http://spiegl.de/qiv/download/$name-$version.tgz)
+
+build () {
+	cd $name-$version
+	sed -i -e 's,)/man/,)/share/man/,' \
+		-e '/qiv -f/,+4d' Makefile
+
+	make
+	make COMPRESS_PROG="/bin/true" PREFIX=$PKG/usr install
+}

quvi/.footprint

@@ -1,6 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/quvi
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/quvi.1.gz
+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.1.gz

quvi/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF36G3L8aVZbX0KlIyA1vlc5A77qh72HVOd+SFDdi0MkZLfHRJ/H7CGy/zQsR/+jy3ZMQnyvYLlW+mqfOx/8TlQwA=
-SHA256 (Pkgfile) = 4ba59654804afb604fffdc619e818de6b359c26d25b8997bc9babf79e9e49289
-SHA256 (.footprint) = a53a4b80a995b20a4bf797121b21347c8ee3df5b8b2722d61e607c623f557b2c
+RWSagIOpLGJF30jlQDFkDTHDbkkDPz2xwho17bNGtkHzi0bC/kXp8exggrIXoVVyT+st/L8qJP510SZ6YiLAWQbZRe5OLCsMywA=
+SHA256 (Pkgfile) = fe90a9e4c8c13bb69a93b69b5aa76a592430df3e795cb7ec10ba21d6101322c8
+SHA256 (.footprint) = a6330314756a547d800efbb37ad3aaaccbc8575186a2e9ba5896b7854e4b0ce1
 SHA256 (quvi-0.4.2.tar.xz) = 91a1396ce9a56ac3cfa3a5edabf8d214b3c6b2a35afad3b5f2f9feb29ba19026

quvi/Pkgfile

@@ -1,17 +1,18 @@
 # Description: Command-line tool for parsing video download links.
 # URL:         http://quvi.sourceforge.net/
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
 # Depends on:  libquvi
 
 name=quvi
 version=0.4.2
-release=1
+release=2
 source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.xz)
 
 build () {
-    cd "$name-$version"
-    ./configure --prefix=/usr --mandir=/usr/man
-    make
-    make DESTDIR=$PKG \
-        install
+	cd $name-$version
+
+	./configure --prefix=/usr
+
+	make
+	make DESTDIR=$PKG install
 }

st/.md5sum

@@ -1,2 +1,2 @@
-1bb9c3c6f0125f96e59e745f45359fa2  config.h
-4f8ae2737120a8cba34b23c6020fe51e  st-0.5.tar.gz
+db080428894b5621e2532df9e69251f6  config.h
+29b2a599cf1511c8062ed8f025c84c63  st-0.7.tar.gz

st/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37OtiyeOTCmfytvvDYgPc3qeerzGM6ZK1nbysFcf2Fe2sXR/1SmF5dMm/EoVPfPC6PiLRudmpskxyCsnUbErygA=
-SHA256 (Pkgfile) = ec59b20ab22bd8d0a1e87ff69e85c9885f57561fe51edd0ed6f02fbd7c792267
+RWSagIOpLGJF35JLxVxKW7xdtpzFkDOyChcq3b+4/6aVj01vo6GJcSQOCoT3bYQTXZF+waC3WGNXFzcc3vh3NBS1tW0dHj9aJAM=
+SHA256 (Pkgfile) = 5d819a4bfe65f22fea493b8558481fbab26df811d617d26d5eaf06ed712e52e7
 SHA256 (.footprint) = bbc6b84ad135a3a88e3c2e77813191bca889a3d4c0b50c8c9747f113acb5ca67
-SHA256 (st-0.5.tar.gz) = ae80ddfaf8146f7665772efc9b85e05e08be5087682a689ecdf71aa4d4bfdd4e
-SHA256 (config.h) = 1d58ef148398a8265ad9b1c6d5610a4bd842418cc160af12a24247bde082c9b0
+SHA256 (st-0.7.tar.gz) = f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000
+SHA256 (config.h) = 474cc8905e507338a046813ba3d3a395a8c224c2b4d42720b44ba331e20797c9

st/Pkgfile

@@ -1,22 +1,20 @@
 # Description: simple terminal implementation for X
 # URL:         http://st.suckless.org/
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
 # Depends on:  xorg-libxext xorg-libxft
 
 name=st
-version=0.5
-release=3
+version=0.7
+release=1
 source=(http://dl.suckless.org/st/$name-$version.tar.gz config.h)
 
 build () {
-    cd "$name-$version"
-    cp $SRC/config.h .
-    make
-    mkdir -p $PKG/usr/share/terminfo
-    make DESTDIR=$PKG \
-	PREFIX=/usr \
-        MANPREFIX=/usr/share/man \
-	TERMINFO=$PKG/usr/share/terminfo \
-        install
-	rm $PKG/usr/share/terminfo/s/{st,st-256color}
+	cd "$name-$version"
+
+	cp $SRC/config.h .
+	make CC=gcc
+	make DESTDIR=$PKG PREFIX=/usr TERMINFO=$PKG/usr/share/terminfo install
+
+	# Remove duplicates of files from ncurses
+	rm -f $PKG/usr/share/terminfo/s/{st,st-256color}
 }

st/config.h

@@ -5,13 +5,27 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
+static char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
 static int borderpx = 2;
-static char shell[] = "/bin/sh";
 
-/* Kerning / character bounding-box mutlipliers */
-float cwscale = 1.0;
-float chscale = 1.0;
+/*
+ * What program is execed by st depends of these precedence rules:
+ * 1: program passed with -e
+ * 2: utmp option
+ * 3: SHELL environment variable
+ * 4: value of shell in /etc/passwd
+ * 5: value of shell in config.h
+ */
+static char shell[] = "/bin/sh";
+static char *utmp = NULL;
+static char stty_args[] = "stty raw pass8 nl -echo -iexten -cstopb 38400";
+
+/* identification sequence returned in DA and DECID */
+static char vtiden[] = "\033[?6c";
+
+/* Kerning / character bounding-box multipliers */
+static float cwscale = 1.0;
+static float chscale = 1.0;
 
 /*
  * word delimiter string
@@ -25,7 +39,7 @@ static unsigned int doubleclicktimeout = 300;
 static unsigned int tripleclicktimeout = 600;
 
 /* alt screens */
-static bool allowaltscreen = true;
+static int allowaltscreen = 1;
 
 /* frames per second st should at maximum draw to the screen */
 static unsigned int xfps = 120;
@@ -37,18 +51,37 @@ static unsigned int actionfps = 30;
  */
 static unsigned int blinktimeout = 800;
 
+/*
+ * thickness of underline and bar cursors
+ */
+static unsigned int cursorthickness = 2;
+
 /*
  * bell volume. It must be a value between -100 and 100. Use 0 for disabling
  * it
  */
 static int bellvolume = 0;
 
-/* TERM value */
+/* default TERM value */
 static char termname[] = "st-256color";
 
+/*
+ * spaces per tab
+ *
+ * When you are changing this value, don't forget to adapt the »it« value in
+ * the st.info and appropriately install the st.info in the environment where
+ * you use this st version.
+ *
+ *	it#$tabspaces,
+ *
+ * Secondly make sure your kernel is not expanding tabs. When running `stty
+ * -a` »tab0« should appear. You can tell the terminal to not expand tabs by
+ *  running following command:
+ *
+ *	stty tabs
+ */
 static unsigned int tabspaces = 8;
 
-
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
 	/* 8 normal colors */
@@ -75,16 +108,34 @@ static const char *colorname[] = {
 
 	/* more colors can be added after 255 to use with DefaultXX */
 	"#cccccc",
+	"#555555",
 };
 
 
 /*
  * Default colors (colorname index)
- * foreground, background, cursor
+ * foreground, background, cursor, reverse cursor
  */
 static unsigned int defaultfg = 7;
 static unsigned int defaultbg = 0;
 static unsigned int defaultcs = 256;
+static unsigned int defaultrcs = 257;
+
+/*
+ * Default shape of cursor
+ * 2: Block ("█")
+ * 4: Underline ("_")
+ * 6: Bar ("|")
+ * 7: Snowman ("☃")
+ */
+static unsigned int cursorshape = 2;
+
+/*
+ * Default colour and shape of the mouse cursor
+ */
+static unsigned int mouseshape = XC_xterm;
+static unsigned int mousefg = 7;
+static unsigned int mousebg = 0;
 
 /*
  * Colors used, when the specific fg == defaultfg. So in reverse mode this
@@ -94,9 +145,11 @@ static unsigned int defaultcs = 256;
 static unsigned int defaultitalic = 11;
 static unsigned int defaultunderline = 7;
 
-/* Internal mouse shortcuts. */
-/* Beware that overloading Button1 will disable the selection. */
-static Mousekey mshortcuts[] = {
+/*
+ * Internal mouse shortcuts.
+ * Beware that overloading Button1 will disable the selection.
+ */
+static MouseShortcut mshortcuts[] = {
 	/* button               mask            string */
 	{ Button4,              XK_ANY_MOD,     "\031" },
 	{ Button5,              XK_ANY_MOD,     "\005" },
@@ -107,13 +160,17 @@ static Mousekey mshortcuts[] = {
 
 static Shortcut shortcuts[] = {
 	/* mask                 keysym          function        argument */
+	{ XK_ANY_MOD,           XK_Break,       sendbreak,      {.i =  0} },
 	{ ControlMask,          XK_Print,       toggleprinter,  {.i =  0} },
 	{ ShiftMask,            XK_Print,       printscreen,    {.i =  0} },
 	{ XK_ANY_MOD,           XK_Print,       printsel,       {.i =  0} },
-	{ MODKEY|ShiftMask,     XK_Prior,       xzoom,          {.i = +1} },
-	{ MODKEY|ShiftMask,     XK_Next,        xzoom,          {.i = -1} },
+	{ MODKEY|ShiftMask,     XK_Prior,       xzoom,          {.f = +1} },
+	{ MODKEY|ShiftMask,     XK_Next,        xzoom,          {.f = -1} },
+	{ MODKEY|ShiftMask,     XK_Home,        xzoomreset,     {.f =  0} },
 	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
 	{ MODKEY|ShiftMask,     XK_Insert,      clippaste,      {.i =  0} },
+	{ MODKEY|ShiftMask,     XK_C,           clipcopy,       {.i =  0} },
+	{ MODKEY|ShiftMask,     XK_V,           clippaste,      {.i =  0} },
 	{ MODKEY,               XK_Num_Lock,    numlock,        {.i =  0} },
 };
 
@@ -137,7 +194,7 @@ static Shortcut shortcuts[] = {
  * * > 0: crlf mode is enabled
  * * < 0: crlf mode is disabled
  *
- * Be careful with the order of the definitons because st searchs in
+ * Be careful with the order of the definitions because st searches in
  * this table sequentially, so any XK_ANY_MOD must be in the last
  * position for a key.
  */
@@ -154,6 +211,17 @@ static KeySym mappedkeys[] = { -1 };
  */
 static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
 
+/*
+ * Override mouse-select while mask is active (when MODE_MOUSE is set).
+ * Note that if you want to use ShiftMask with selmasks, set this to an other
+ * modifier, set to 0 to not use it.
+ */
+static uint forceselmod = ShiftMask;
+
+/*
+ * This is the huge key array which defines all compatibility to the Linux
+ * world. Please decide about changes wisely.
+ */
 static Key key[] = {
 	/* keysym           mask            string      appkey appcursor crlf */
 	{ XK_KP_Home,       ShiftMask,      "\033[2J",       0,   -1,    0},
@@ -212,7 +280,6 @@ static Key key[] = {
 	{ XK_KP_7,          XK_ANY_MOD,     "\033Ow",       +2,    0,    0},
 	{ XK_KP_8,          XK_ANY_MOD,     "\033Ox",       +2,    0,    0},
 	{ XK_KP_9,          XK_ANY_MOD,     "\033Oy",       +2,    0,    0},
-	{ XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0,    0},
 	{ XK_Up,            ShiftMask,      "\033[1;2A",     0,    0,    0},
 	{ XK_Up,            ControlMask,    "\033[1;5A",     0,    0,    0},
 	{ XK_Up,            Mod1Mask,       "\033[1;3A",     0,    0,    0},
@@ -250,6 +317,8 @@ static Key key[] = {
 	{ XK_Delete,        ShiftMask,      "\033[3;2~",    +1,    0,    0},
 	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0,    0},
 	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0,    0},
+	{ XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0,    0},
+	{ XK_BackSpace,     Mod1Mask,       "\033\177",      0,    0,    0},
 	{ XK_Home,          ShiftMask,      "\033[2J",       0,   -1,    0},
 	{ XK_Home,          ShiftMask,      "\033[1;2H",     0,   +1,    0},
 	{ XK_Home,          XK_ANY_MOD,     "\033[H",        0,   -1,    0},
@@ -360,8 +429,16 @@ static Key key[] = {
  * ButtonRelease and MotionNotify.
  * If no match is found, regular selection is used.
  */
-
 static uint selmasks[] = {
 	[SEL_RECTANGULAR] = Mod1Mask,
 };
 
+/*
+ * Printable characters in ASCII, used to estimate the advance width
+ * of single wide characters.
+ */
+static char ascii_printable[] =
+	" !\"#$%&'()*+,-./0123456789:;<=>?"
+	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+	"`abcdefghijklmnopqrstuvwxyz{|}~";
+

surf/.md5sum

@@ -1,2 +1,2 @@
-15c2c911658e2e6085e4c4fa7a7b01c1  config.h
+3d465f7f264e9394d0ba2d11e42a7dbb  config.h
 11713901fa83c536f3ddfacfc28c3acc  surf-2.0.tar.gz

surf/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3wQBWgJuaXITp1fNQrYP61PSFQ3rcbrS4LMURr9zUguETPgTJVfBZGJD8dnfkPch+60jCMsIQQfRZqdV24cKrAY=
-SHA256 (Pkgfile) = 4ec7762b204ef5641102d9b2774b2b63d413f22b88657ee74969eb63aa4537fb
+RWSagIOpLGJF3yFLYEbloAcaGrZgC7k+QT2C6ZURjI4Yf6Mawe6V29QcDSYtInnPmeE6KWLjHsZUGGgzqi8TlpBsavobKIKB2Qk=
+SHA256 (Pkgfile) = 89312a4ce92efb829eee70da98b1265c494a35cf4edaceba684a7b0ad6ae08e8
 SHA256 (.footprint) = e7f7b9f11b503fcae9c62ff318be7047c3dfde1264a7969ed01626fe4869b995
 SHA256 (surf-2.0.tar.gz) = faee4c7a62c38fc9791eff1ad06787c3c9b2b79f338806827f5152a7bc54951d
-SHA256 (config.h) = 439c4b4586ab2f199f15720d9884b6c643c3383d74a3879bb00a31cbf1791f5b
+SHA256 (config.h) = 3a746f6f3a48e42b1779686421cf6b34157292e34e571b67de8d614c3ea1565c

surf/Pkgfile

@@ -1,23 +1,23 @@
 # Description: simple web-browser
 # URL:         http://surf.suckless.org/
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
-# Depends on: dmenu webkitgtk xorg-xprop xterm
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  dmenu st webkitgtk xdg-utils xorg-xprop
 
 name=surf
 version=2.0
-release=1
-source=(http://dl.suckless.org/surf/$name-$version.tar.gz config.h)
+release=2
+source=(http://dl.suckless.org/surf/$name-$version.tar.gz
+	config.h)
 
 build () {
-    cd "$name-$version"
-    #cp $SRC/config.h .
+	cd "$name-$version"
 
-    sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
-    sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk
-    sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk
+	cp $SRC/config.h .
 
-    make
-    make DESTDIR=$PKG \
-         PREFIX=/usr \
-         install
+	sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
+	sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk
+	sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk
+
+	make CC=gcc
+	make DESTDIR=$PKG PREFIX=/usr install
 }

surf/config.h

@@ -1,48 +1,97 @@
 /* modifier 0 means no modifier */
-static char *useragent      = "Mozilla/5.0 (X11; U; Unix; en-US) "
-	"AppleWebKit/537.15 (KHTML, like Gecko) Chrome/24.0.1295.0 "
-	"Safari/537.15 Surf/"VERSION;
-static char *progress       = "#0000FF";
-static char *progress_untrust = "#FF0000";
-static char *progress_trust = "#00FF00";
-static char *progress_proxy = "#FFFF00";
-static char *progress_proxy_trust = "#66FF00";
-static char *progress_proxy_untrust = "#FF6600";
-static char *stylefile      = "~/.surf/style.css";
+static int surfuseragent    = 1;  /* Append Surf version to default WebKit user agent */
+static char *fulluseragent  = ""; /* Or override the whole user agent string */
 static char *scriptfile     = "~/.surf/script.js";
+static char *styledir       = "~/.surf/styles/";
+static char *cachedir       = "~/.surf/cache/";
 static char *cookiefile     = "~/.surf/cookies.txt";
-static time_t sessiontime   = 3600;
-static char *cafile         = "/etc/ssl/certs/ca-certificates.crt";
-static char *strictssl      = FALSE; /* Refuse untrusted SSL connections */
-static int   indicator_thickness = 2;
 
 /* Webkit default features */
-static Bool enablespatialbrowsing = TRUE;
-static Bool enableplugins = TRUE;
-static Bool enablescripts = TRUE;
-static Bool enableinspector = TRUE;
-static Bool loadimages = TRUE;
-static Bool hidebackground  = FALSE;
+static Parameter defconfig[ParameterLast] = {
+	SETB(AcceleratedCanvas,  1),
+	SETB(CaretBrowsing,      0),
+	SETV(CookiePolicies,     "@Aa"),
+	SETB(DiskCache,          1),
+	SETB(DNSPrefetch,        0),
+	SETI(FontSize,           12),
+	SETB(FrameFlattening,    0),
+	SETB(Geolocation,        0),
+	SETB(HideBackground,     0),
+	SETB(Inspector,          0),
+	SETB(JavaScript,         1),
+	SETB(KioskMode,          0),
+	SETB(LoadImages,         1),
+	SETB(MediaManualPlay,    0),
+	SETB(Plugins,            1),
+	SETV(PreferredLanguages, ((char *[]){ NULL })),
+	SETB(RunInFullscreen,    0),
+	SETB(ScrollBars,         1),
+	SETB(ShowIndicators,     1),
+	SETB(SiteQuirks,         1),
+	SETB(SpellChecking,      0),
+	SETV(SpellLanguages,     ((char *[]){ "en_US", NULL })),
+	SETB(StrictSSL,          0),
+	SETB(Style,              1),
+	SETF(ZoomLevel,          1.0),
+};
+
+static UriParameters uriparams[] = {
+	{ "(://|\\.)suckless\\.org(/|$)", {
+	  FSETB(JavaScript, 0),
+	  FSETB(Plugins,    0),
+	}, },
+};
+
+static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
+                                    WEBKIT_FIND_OPTIONS_WRAP_AROUND;
 
 #define SETPROP(p, q) { \
-	.v = (char *[]){ "/bin/sh", "-c", \
-		"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
-		"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
-		p, q, winid, NULL \
-	} \
+        .v = (const char *[]){ "/bin/sh", "-c", \
+             "prop=\"`xprop -id $2 $0 " \
+             "| sed \"s/^$0(STRING) = \\(\\\\\"\\?\\)\\(.*\\)\\1$/\\2/\" " \
+             "| xargs -0 printf %b | dmenu`\" &&" \
+             "xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
+             p, q, winid, NULL \
+        } \
 }
 
 /* DOWNLOAD(URI, referer) */
 #define DOWNLOAD(d, r) { \
-	.v = (char *[]){ "/bin/sh", "-c", \
-		"st -e /bin/sh -c \"curl -J -O --user-agent '$1'" \
-		" --referer '$2'" \
-		" -b ~/.surf/cookies.txt -c ~/.surf/cookies.txt '$0';" \
-		" sleep 5;\"", \
-		d, useragent, r, NULL \
-	} \
+        .v = (const char *[]){ "/bin/sh", "-c", \
+             "st -e /bin/sh -c \"curl -g -L -J -O --user-agent '$1'" \
+             " --referer '$2' -b $3 -c $3 '$0';" \
+             " sleep 5;\"", \
+             d, useragent, r, cookiefile, NULL \
+        } \
 }
 
+/* PLUMB(URI) */
+/* This called when some URI which does not begin with "about:",
+ * "http://" or "https://" should be opened.
+ */
+#define PLUMB(u) {\
+        .v = (const char *[]){ "/bin/sh", "-c", \
+             "xdg-open \"$0\"", u, NULL \
+        } \
+}
+
+/* VIDEOPLAY(URI) */
+#define VIDEOPLAY(u) {\
+        .v = (const char *[]){ "/bin/sh", "-c", \
+             "mpv --really-quiet \"$0\"", u, NULL \
+        } \
+}
+
+/* styles */
+/*
+ * The iteration will stop at the first match, beginning at the beginning of
+ * the list.
+ */
+static SiteStyle styles[] = {
+	/* regexp               file in $styledir */
+	{ ".*",                 "default.css" },
+};
+
 #define MODKEY GDK_CONTROL_MASK
 
 /* hotkeys */
@@ -51,45 +100,67 @@ static Bool hidebackground  = FALSE;
  * edit the CLEANMASK() macro.
  */
 static Key keys[] = {
-    /* modifier	            keyval      function    arg             Focus */
-    { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
-    { MODKEY,               GDK_r,      reload,     { .b = FALSE } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
+	/* modifier              keyval          function    arg */
+	{ MODKEY,                GDK_KEY_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
+	{ MODKEY,                GDK_KEY_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
+	{ MODKEY,                GDK_KEY_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
 
-    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE } },
-    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE } },
+	{ 0,                     GDK_KEY_Escape, stop,       { 0 } },
+	{ MODKEY,                GDK_KEY_c,      stop,       { 0 } },
 
-    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_q,      zoom,       { .i = 0  } },
-    { MODKEY,               GDK_minus,  zoom,       { .i = -1 } },
-    { MODKEY,               GDK_plus,   zoom,       { .i = +1 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_r,      reload,     { .b = 1 } },
+	{ MODKEY,                GDK_KEY_r,      reload,     { .b = 0 } },
 
-    { MODKEY,               GDK_l,      navigate,   { .i = +1 } },
-    { MODKEY,               GDK_h,      navigate,   { .i = -1 } },
+	{ MODKEY,                GDK_KEY_l,      navigate,   { .i = +1 } },
+	{ MODKEY,                GDK_KEY_h,      navigate,   { .i = -1 } },
 
-    { MODKEY,               GDK_j,           scroll_v,   { .i = +1 } },
-    { MODKEY,               GDK_k,           scroll_v,   { .i = -1 } },
-    { MODKEY,               GDK_b,           scroll_v,   { .i = -10000 } },
-    { MODKEY,               GDK_space,       scroll_v,   { .i = +10000 } },
-    { MODKEY,               GDK_i,           scroll_h,   { .i = +1 } },
-    { MODKEY,               GDK_u,           scroll_h,   { .i = -1 } },
+	/* Currently we have to use scrolling steps that WebKit2GTK+ gives us
+	 * d: step down, u: step up, r: step right, l:step left
+	 * D: page down, U: page up */
+	{ MODKEY,                GDK_KEY_j,      scroll,     { .i = 'd' } },
+	{ MODKEY,                GDK_KEY_k,      scroll,     { .i = 'u' } },
+	{ MODKEY,                GDK_KEY_b,      scroll,     { .i = 'U' } },
+	{ MODKEY,                GDK_KEY_space,  scroll,     { .i = 'D' } },
+	{ MODKEY,                GDK_KEY_i,      scroll,     { .i = 'r' } },
+	{ MODKEY,                GDK_KEY_u,      scroll,     { .i = 'l' } },
 
-    { 0,                    GDK_F11,    fullscreen, { 0 } },
-    { 0,                    GDK_Escape, stop,       { 0 } },
-    { MODKEY,               GDK_o,      source,     { 0 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_o,      inspector,  { 0 } },
 
-    { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
-    { MODKEY,               GDK_f,      spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
-    { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_j,      zoom,       { .i = -1 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_k,      zoom,       { .i = +1 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_q,      zoom,       { .i = 0  } },
+	{ MODKEY,                GDK_KEY_minus,  zoom,       { .i = -1 } },
+	{ MODKEY,                GDK_KEY_plus,   zoom,       { .i = +1 } },
 
-    { MODKEY,               GDK_n,      find,       { .b = TRUE } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
+	{ MODKEY,                GDK_KEY_p,      clipboard,  { .b = 1 } },
+	{ MODKEY,                GDK_KEY_y,      clipboard,  { .b = 0 } },
 
-    { MODKEY|GDK_SHIFT_MASK,GDK_c,      toggle,     { .v = "enable-caret-browsing" } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_i,      toggle,     { .v = "auto-load-images" } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_s,      toggle,     { .v = "enable-scripts" } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_v,      toggle,     { .v = "enable-plugins" } },
+	{ MODKEY,                GDK_KEY_n,      find,       { .i = +1 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_n,      find,       { .i = -1 } },
+
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_p,      print,      { 0 } },
+
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_a,      togglecookiepolicy, { 0 } },
+	{ 0,                     GDK_KEY_F11,    togglefullscreen, { 0 } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_o,      toggleinspector, { 0 } },
+
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_c,      toggle,     { .i = CaretBrowsing } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_f,      toggle,     { .i = FrameFlattening } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_g,      toggle,     { .i = Geolocation } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_s,      toggle,     { .i = JavaScript } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_i,      toggle,     { .i = LoadImages } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_v,      toggle,     { .i = Plugins } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_b,      toggle,     { .i = ScrollBars } },
+	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_m,      toggle,     { .i = Style } },
 };
 
+/* button definitions */
+/* target can be OnDoc, OnLink, OnImg, OnMedia, OnEdit, OnBar, OnSel, OnAny */
+static Button buttons[] = {
+	/* target       event mask      button  function        argument        stop event */
+	{ OnLink,       0,              2,      clicknewwindow, { .b = 0 },     1 },
+	{ OnLink,       MODKEY,         2,      clicknewwindow, { .b = 1 },     1 },
+	{ OnLink,       MODKEY,         1,      clicknewwindow, { .b = 1 },     1 },
+	{ OnAny,        0,              8,      clicknavigate,  { .i = -1 },    1 },
+	{ OnAny,        0,              9,      clicknavigate,  { .i = +1 },    1 },
+	{ OnMedia,      MODKEY,         1,      clickexternplayer, { 0 },       1 },
+};

svn2cl/.footprint

@@ -0,0 +1,12 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/svn2cl
+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/svn2cl.1.gz
+drwxr-xr-x	root/root	usr/share/svn2cl/
+-rwxr-xr-x	root/root	usr/share/svn2cl/svn2cl.sh
+-rw-r--r--	root/root	usr/share/svn2cl/svn2cl.xsl
+-rw-r--r--	root/root	usr/share/svn2cl/svn2html.css
+-rw-r--r--	root/root	usr/share/svn2cl/svn2html.xsl

svn2cl/.md5sum

@@ -0,0 +1,2 @@
+c21d77d2cc45b9e0ee290c4604658e38  svn2cl
+e3435be4cacdb7a729267917e46ec74f  svn2cl-0.14.tar.gz

svn2cl/.signature

@@ -0,0 +1,6 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF31VYDofq9rcfrgPgxHSlWNmjwHqRZYaaZ+LoAXZAYd2iQMFwfchOafOQ9Evvxn128FcT7ncz892IgclYhwoipQM=
+SHA256 (Pkgfile) = 65945819faf647000dfb1d2e76142dfbbd8a5c0246420794ead24841f3b9899d
+SHA256 (.footprint) = 227b7952a98ae63e1d0420e49b09989b364be59e0bb3bfc6a67990944766395f
+SHA256 (svn2cl-0.14.tar.gz) = a1beb1ee03c7247c2f89792ac5bf91cb4e5ee9bdee839e2208ec9f3aacd738f2
+SHA256 (svn2cl) = 42c49e5176d845f4a2e19d2a3b31ba70e9390bb4242f6b6490d8c4c73939cf94

svn2cl/Pkgfile

@@ -0,0 +1,18 @@
+# Description: Script and XSL stylesheet to convert svn logs to ChangeLog.
+# URL:         https://arthurdejong.org/svn2cl/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  subversion libxslt
+
+name=svn2cl
+version=0.14
+release=1
+source=(https://arthurdejong.org/$name/$name-$version.tar.gz
+        $name)
+
+build() {
+	install -d $PKG/usr/{bin,share/{$name,man/man1}}
+	install -m 0644 $name-$version/$name.1 $PKG/usr/share/man/man1
+	install -m 0644 $name-$version/*.{xsl,css} $PKG/usr/share/$name
+	install -m 0755 $name-$version/$name.sh $PKG/usr/share/$name
+	install -m 0755 $SRC/$name $PKG/usr/bin
+}

sxhkd/.footprint

@@ -1,6 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/sxhkd
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/sxhkd.1.gz
+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/sxhkd.1.gz

sxhkd/.md5sum

@@ -1 +1 @@
-e04b8d7173059bce156bec6d8cd4297d  0.5.5.tar.gz
+1fbd4590cdbf021856b1e7b9c614d59f  sxhkd-0.5.8.tar.gz

sxhkd/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF386wPQ4gEuQt4EVDoquLNz5kJkmuBpyjIuGdqN0aWwh3Ur8zQ2lTgLB+k4j54+393UzqBKB9mii2VQBbdYdO/wM=
-SHA256 (Pkgfile) = 2d88afa534bbe265a13b9a02639ac6965953516fb4d7f66ca5f525291c61e572
-SHA256 (.footprint) = 31b619b5ef63774acc4023d51ecfa02ffcf01233e3d32e98263cd2ae6e9bccd0
-SHA256 (0.5.5.tar.gz) = e6699f77564e34a890d27f6c251e1ed29b04f5177e48290e7f02948497f04313
+RWSagIOpLGJF3/6BRAxGs64UxAXzXSKOSL8sHfYXcUpFwNYIfbkoLS9Z/3Wrf5JvbUCzEP3D/sp8SJ5G24kDvSpvrIGcoshwuwg=
+SHA256 (Pkgfile) = 004cfa5eae3b29b5a63628cc636fe8fd957b731ff615970c845cf47df2fb07fc
+SHA256 (.footprint) = 3619426b24a5ef3a4a962c092e646ecac3e44c265d13c5628673adce9448ffae
+SHA256 (sxhkd-0.5.8.tar.gz) = d7df48d7d301d1cf06f45172bcfe712510e98dcdbdb896af662cf979f9666855

sxhkd/Pkgfile

@@ -1,20 +1,19 @@
-# Description: A simple X hotkey daemon
+# Description: Simple X hotkey daemon
 # URL:         https://github.com/baskerville/sxhkd
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
 # Depends on:  xorg-xcb-util xorg-xcb-util-keysyms
 
 name=sxhkd
-version=0.5.5
+version=0.5.8
 release=1
-source=(https://github.com/baskerville/$name/archive/$version.tar.gz)
+source=(https://github.com/baskerville/$name/archive/$version/$name-$version.tar.gz)
 
 build () {
-    cd $name-$version
-    make
-    make DESTDIR=$PKG \
-        PREFIX=/usr \
-        MANPREFIX=/usr/man \
-        install
-    # write access only for root
-    chmod 644 $PKG/usr/man/man1/sxhkd.1
+	cd $name-$version
+
+	make
+	make PREFIX=/usr DESTDIR=$PKG install
+
+	rm -rf $PKG/usr/share/doc
+	find $PKG -perm -g+w | xargs chmod g-w
 }

sxiv/.footprint

@@ -1,10 +1,10 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/sxiv
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/sxiv.1.gz
 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/sxiv.1.gz
 drwxr-xr-x	root/root	usr/share/sxiv/
 drwxr-xr-x	root/root	usr/share/sxiv/exec/
 -rwxr-xr-x	root/root	usr/share/sxiv/exec/image-info

sxiv/.md5sum

@@ -1,2 +1,2 @@
-9d471c49984c0357d63bf984bc09dd09  config.h
-3255d0d47e0a4cddd752ec03ee4bddaf  v1.3.1.tar.gz
+d641dc83dfe760b2ce13553c3c14066f  config.h
+a929f8ae19f947a23594fdce2b3cf38d  sxiv-24.tar.gz

sxiv/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/EntXY3KjX7Gd6KkhhLqLqN1fazypeA6ZMMb3TkTJUjRtBQYt7o2AXM8KhtBpXi9BsVLkpcshtGFtFrxVMrNAY=
-SHA256 (Pkgfile) = a234c81e0073874ef14746d9be69830a9db67bb68b784d8c15ceaa7f2e5372d5
-SHA256 (.footprint) = 723a96035d1b697048d2541642ce922cc16cd7f7b9b0e126be076d85bb6c7eb3
-SHA256 (v1.3.1.tar.gz) = 9a30a1b036e1c17212128554709da3f2d65d3beaef2e0a73097af5e35cf11d0e
-SHA256 (config.h) = 027983e5d382d12dc3de4b8c65b94a05ffc5a3cf6e8fe7de8d9a048b8d942719
+RWSagIOpLGJF32hhN1530sLg72tKSQtufvJacb+eX+1tjDYMjq6LDjfQcdjNBIGZXc5bmR7w0/gils/7l7A088KuA7WRVW7+uQs=
+SHA256 (Pkgfile) = 03f813d3ee17676d011de728b65a496caf38ed9aa1902f80c32136ca580241c2
+SHA256 (.footprint) = 54015b09139273572d41d63e394d0cd5e591f959b91be66f98425d54c1508b0b
+SHA256 (sxiv-24.tar.gz) = 511dc45d12962af9c31c3068ce6bca4b832a6263946b27befea49a48cf019110
+SHA256 (config.h) = f32ebb5f590777c571daeb87b935fd290863d71e3a6a7f0ab7e8a39e8600560d

sxiv/Pkgfile

@@ -1,19 +1,18 @@
 # Description: simple/suckless image-viewer
 # URL:         https://github.com/muennich/sxiv
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
-# Depends on:  imlib2 libexif giflib
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Depends on:  giflib imlib2 libexif xorg-libxft
 
 name=sxiv
-version=1.3.1
+version=24
 release=1
-source=(https://github.com/muennich/$name/archive/v$version.tar.gz config.h)
+source=(https://github.com/muennich/$name/archive/v$version/$name-$version.tar.gz
+	config.h)
 
 build () {
-    cd "$name-$version"
-    cp $SRC/config.h .
-    make
-    make DESTDIR=$PKG \
-        PREFIX=/usr \
-        MANPREFIX=/usr/man \
-        install
+	cd $name-$version
+
+	cp $SRC/config.h .
+	make CC=gcc CFLAGS="$CFLAGS"
+	make DESTDIR=$PKG PREFIX=/usr install
 }

sxiv/config.h

@@ -7,9 +7,9 @@ enum {
 };
 
 /* bar font:
- * (see X(7) section "FONT NAMES" for valid values)
+ * (see fonts-conf(5) subsection "FONT NAMES" for valid values)
  */
-static const char * const BAR_FONT = "-*-fixed-medium-r-*-*-13-*-*-*-*-60-*-*";
+static const char * const BAR_FONT = "monospace:size=8";
 
 /* colors:
  * (see X(7) section "COLOR NAMES" for valid values)
@@ -40,6 +40,9 @@ enum { SLIDESHOW_DELAY = 5 };
 static const double GAMMA_MAX   = 10.0;
 static const int    GAMMA_RANGE = 32;
 
+/* command i_scroll pans image 1/PAN_FRACTION of screen width/height */
+static const int PAN_FRACTION = 5;
+
 /* if false, pixelate images at zoom level != 100%,
  * toggled with 'a' key binding
  */
@@ -56,105 +59,102 @@ static const bool ALPHA_LAYER = false;
 /* thumbnail sizes in pixels (width == height): */
 static const int thumb_sizes[] = { 32, 64, 96, 128, 160 };
 
+/* thumbnail size at startup, index into thumb_sizes[]: */
+static const int THUMB_SIZE = 3;
+
 #endif
 #ifdef _MAPPINGS_CONFIG
 
 /* keyboard mappings for image and thumbnail mode: */
 static const keymap_t keys[] = {
 	/* modifiers    key               function              argument */
-	{ 0,            XK_q,             g_quit,               (arg_t) None },
-	{ 0,            XK_Return,        g_switch_mode,        (arg_t) None },
-	{ 0,            XK_f,             g_toggle_fullscreen,  (arg_t) None },
-	{ 0,            XK_b,             g_toggle_bar,         (arg_t) None },
-	{ ControlMask,  XK_x,             g_prefix_external,    (arg_t) None },
-	{ 0,            XK_g,             g_first,              (arg_t) None },
-	{ 0,            XK_G,             g_n_or_last,          (arg_t) None },
-	{ 0,            XK_r,             g_reload_image,       (arg_t) None },
-	{ 0,            XK_D,             g_remove_image,       (arg_t) None },
-	{ ControlMask,  XK_h,             g_scroll_screen,      (arg_t) DIR_LEFT },
-	{ ControlMask,  XK_Left,          g_scroll_screen,      (arg_t) DIR_LEFT },
-	{ ControlMask,  XK_j,             g_scroll_screen,      (arg_t) DIR_DOWN },
-	{ ControlMask,  XK_Down,          g_scroll_screen,      (arg_t) DIR_DOWN },
-	{ ControlMask,  XK_k,             g_scroll_screen,      (arg_t) DIR_UP },
-	{ ControlMask,  XK_Up,            g_scroll_screen,      (arg_t) DIR_UP },
-	{ ControlMask,  XK_l,             g_scroll_screen,      (arg_t) DIR_RIGHT },
-	{ ControlMask,  XK_Right,         g_scroll_screen,      (arg_t) DIR_RIGHT },
-	{ 0,            XK_plus,          g_zoom,               (arg_t) +1 },
-	{ 0,            XK_KP_Add,        g_zoom,               (arg_t) +1 },
-	{ 0,            XK_minus,         g_zoom,               (arg_t) -1 },
-	{ 0,            XK_KP_Subtract,   g_zoom,               (arg_t) -1 },
-	{ 0,            XK_m,             g_toggle_image_mark,  (arg_t) None },
-	{ 0,            XK_M,             g_reverse_marks,      (arg_t) None },
-	{ ControlMask,  XK_m,             g_unmark_all,         (arg_t) None },
-	{ 0,            XK_N,             g_navigate_marked,    (arg_t) +1 },
-	{ 0,            XK_P,             g_navigate_marked,    (arg_t) -1 },
+	{ 0,            XK_q,             g_quit,               None },
+	{ 0,            XK_Return,        g_switch_mode,        None },
+	{ 0,            XK_f,             g_toggle_fullscreen,  None },
+	{ 0,            XK_b,             g_toggle_bar,         None },
+	{ ControlMask,  XK_x,             g_prefix_external,    None },
+	{ 0,            XK_g,             g_first,              None },
+	{ 0,            XK_G,             g_n_or_last,          None },
+	{ 0,            XK_r,             g_reload_image,       None },
+	{ 0,            XK_D,             g_remove_image,       None },
+	{ ControlMask,  XK_h,             g_scroll_screen,      DIR_LEFT },
+	{ ControlMask,  XK_Left,          g_scroll_screen,      DIR_LEFT },
+	{ ControlMask,  XK_j,             g_scroll_screen,      DIR_DOWN },
+	{ ControlMask,  XK_Down,          g_scroll_screen,      DIR_DOWN },
+	{ ControlMask,  XK_k,             g_scroll_screen,      DIR_UP },
+	{ ControlMask,  XK_Up,            g_scroll_screen,      DIR_UP },
+	{ ControlMask,  XK_l,             g_scroll_screen,      DIR_RIGHT },
+	{ ControlMask,  XK_Right,         g_scroll_screen,      DIR_RIGHT },
+	{ 0,            XK_plus,          g_zoom,               +1 },
+	{ 0,            XK_KP_Add,        g_zoom,               +1 },
+	{ 0,            XK_minus,         g_zoom,               -1 },
+	{ 0,            XK_KP_Subtract,   g_zoom,               -1 },
+	{ 0,            XK_m,             g_toggle_image_mark,  None },
+	{ 0,            XK_M,             g_reverse_marks,      None },
+	{ ControlMask,  XK_m,             g_unmark_all,         None },
+	{ 0,            XK_N,             g_navigate_marked,    +1 },
+	{ 0,            XK_P,             g_navigate_marked,    -1 },
+	{ 0,            XK_braceleft,     g_change_gamma,       -1 },
+	{ 0,            XK_braceright,    g_change_gamma,       +1 },
+	{ ControlMask,  XK_g,             g_change_gamma,        0 },
 
-	{ 0,            XK_h,             t_move_sel,           (arg_t) DIR_LEFT },
-	{ 0,            XK_Left,          t_move_sel,           (arg_t) DIR_LEFT },
-	{ 0,            XK_j,             t_move_sel,           (arg_t) DIR_DOWN },
-	{ 0,            XK_Down,          t_move_sel,           (arg_t) DIR_DOWN },
-	{ 0,            XK_k,             t_move_sel,           (arg_t) DIR_UP },
-	{ 0,            XK_Up,            t_move_sel,           (arg_t) DIR_UP },
-	{ 0,            XK_l,             t_move_sel,           (arg_t) DIR_RIGHT },
-	{ 0,            XK_Right,         t_move_sel,           (arg_t) DIR_RIGHT },
-	{ 0,            XK_R,             t_reload_all,         (arg_t) None },
+	{ 0,            XK_h,             t_move_sel,           DIR_LEFT },
+	{ 0,            XK_Left,          t_move_sel,           DIR_LEFT },
+	{ 0,            XK_j,             t_move_sel,           DIR_DOWN },
+	{ 0,            XK_Down,          t_move_sel,           DIR_DOWN },
+	{ 0,            XK_k,             t_move_sel,           DIR_UP },
+	{ 0,            XK_Up,            t_move_sel,           DIR_UP },
+	{ 0,            XK_l,             t_move_sel,           DIR_RIGHT },
+	{ 0,            XK_Right,         t_move_sel,           DIR_RIGHT },
+	{ 0,            XK_R,             t_reload_all,         None },
 
-	{ 0,            XK_n,             i_navigate,           (arg_t) +1 },
-	{ 0,            XK_n,             i_scroll_to_edge,     (arg_t) (DIR_LEFT | DIR_UP) },
-	{ 0,            XK_space,         i_navigate,           (arg_t) +1 },
-	{ 0,            XK_p,             i_navigate,           (arg_t) -1 },
-	{ 0,            XK_p,             i_scroll_to_edge,     (arg_t) (DIR_LEFT | DIR_UP) },
-	{ 0,            XK_BackSpace,     i_navigate,           (arg_t) -1 },
-	{ 0,            XK_bracketright,  i_navigate,           (arg_t) +10 },
-	{ 0,            XK_bracketleft,   i_navigate,           (arg_t) -10 },
-	{ ControlMask,  XK_6,             i_alternate,          (arg_t) None },
-	{ ControlMask,  XK_n,             i_navigate_frame,     (arg_t) +1 },
-	{ ControlMask,  XK_p,             i_navigate_frame,     (arg_t) -1 },
-	{ ControlMask,  XK_space,         i_toggle_animation,   (arg_t) None },
-	{ 0,            XK_h,             i_scroll,             (arg_t) DIR_LEFT },
-	{ 0,            XK_Left,          i_scroll,             (arg_t) DIR_LEFT },
-	{ 0,            XK_j,             i_scroll,             (arg_t) DIR_DOWN },
-	{ 0,            XK_Down,          i_scroll,             (arg_t) DIR_DOWN },
-	{ 0,            XK_k,             i_scroll,             (arg_t) DIR_UP },
-	{ 0,            XK_Up,            i_scroll,             (arg_t) DIR_UP },
-	{ 0,            XK_l,             i_scroll,             (arg_t) DIR_RIGHT },
-	{ 0,            XK_Right,         i_scroll,             (arg_t) DIR_RIGHT },
-	{ 0,            XK_H,             i_scroll_to_edge,     (arg_t) DIR_LEFT },
-	{ 0,            XK_J,             i_scroll_to_edge,     (arg_t) DIR_DOWN },
-	{ 0,            XK_K,             i_scroll_to_edge,     (arg_t) DIR_UP },
-	{ 0,            XK_L,             i_scroll_to_edge,     (arg_t) DIR_RIGHT },
-	{ 0,            XK_equal,         i_set_zoom,           (arg_t) 100 },
-	{ 0,            XK_w,             i_fit_to_win,         (arg_t) SCALE_DOWN },
-	{ 0,            XK_W,             i_fit_to_win,         (arg_t) SCALE_FIT },
-	{ 0,            XK_e,             i_fit_to_win,         (arg_t) SCALE_WIDTH },
-	{ 0,            XK_E,             i_fit_to_win,         (arg_t) SCALE_HEIGHT },
-	{ 0,            XK_less,          i_rotate,             (arg_t) DEGREE_270 },
-	{ 0,            XK_greater,       i_rotate,             (arg_t) DEGREE_90 },
-	{ 0,            XK_question,      i_rotate,             (arg_t) DEGREE_180 },
-	{ 0,            XK_bar,           i_flip,               (arg_t) FLIP_HORIZONTAL },
-	{ 0,            XK_underscore,    i_flip,               (arg_t) FLIP_VERTICAL },
-	{ 0,            XK_braceleft,     i_change_gamma,       (arg_t) -1 },
-	{ 0,            XK_braceright,    i_change_gamma,       (arg_t) +1 },
-	{ ControlMask,  XK_g,             i_change_gamma,       (arg_t)  0 },
-	{ 0,            XK_a,             i_toggle_antialias,   (arg_t) None },
-	{ 0,            XK_A,             i_toggle_alpha,       (arg_t) None },
-	{ 0,            XK_s,             i_slideshow,          (arg_t) None },
+	{ 0,            XK_n,             i_navigate,           +1 },
+	{ 0,            XK_n,             i_scroll_to_edge,     DIR_LEFT | DIR_UP },
+	{ 0,            XK_space,         i_navigate,           +1 },
+	{ 0,            XK_p,             i_navigate,           -1 },
+	{ 0,            XK_p,             i_scroll_to_edge,     DIR_LEFT | DIR_UP },
+	{ 0,            XK_BackSpace,     i_navigate,           -1 },
+	{ 0,            XK_bracketright,  i_navigate,           +10 },
+	{ 0,            XK_bracketleft,   i_navigate,           -10 },
+	{ ControlMask,  XK_6,             i_alternate,          None },
+	{ ControlMask,  XK_n,             i_navigate_frame,     +1 },
+	{ ControlMask,  XK_p,             i_navigate_frame,     -1 },
+	{ ControlMask,  XK_space,         i_toggle_animation,   None },
+	{ 0,            XK_h,             i_scroll,             DIR_LEFT },
+	{ 0,            XK_Left,          i_scroll,             DIR_LEFT },
+	{ 0,            XK_j,             i_scroll,             DIR_DOWN },
+	{ 0,            XK_Down,          i_scroll,             DIR_DOWN },
+	{ 0,            XK_k,             i_scroll,             DIR_UP },
+	{ 0,            XK_Up,            i_scroll,             DIR_UP },
+	{ 0,            XK_l,             i_scroll,             DIR_RIGHT },
+	{ 0,            XK_Right,         i_scroll,             DIR_RIGHT },
+	{ 0,            XK_H,             i_scroll_to_edge,     DIR_LEFT },
+	{ 0,            XK_J,             i_scroll_to_edge,     DIR_DOWN },
+	{ 0,            XK_K,             i_scroll_to_edge,     DIR_UP },
+	{ 0,            XK_L,             i_scroll_to_edge,     DIR_RIGHT },
+	{ 0,            XK_equal,         i_set_zoom,           100 },
+	{ 0,            XK_w,             i_fit_to_win,         SCALE_DOWN },
+	{ 0,            XK_W,             i_fit_to_win,         SCALE_FIT },
+	{ 0,            XK_e,             i_fit_to_win,         SCALE_WIDTH },
+	{ 0,            XK_E,             i_fit_to_win,         SCALE_HEIGHT },
+	{ 0,            XK_less,          i_rotate,             DEGREE_270 },
+	{ 0,            XK_greater,       i_rotate,             DEGREE_90 },
+	{ 0,            XK_question,      i_rotate,             DEGREE_180 },
+	{ 0,            XK_bar,           i_flip,               FLIP_HORIZONTAL },
+	{ 0,            XK_underscore,    i_flip,               FLIP_VERTICAL },
+	{ 0,            XK_a,             i_toggle_antialias,   None },
+	{ 0,            XK_A,             i_toggle_alpha,       None },
+	{ 0,            XK_s,             i_slideshow,          None },
 };
 
 /* mouse button mappings for image mode: */
 static const button_t buttons[] = {
 	/* modifiers    button            function              argument */
-	{ 0,            1,                i_navigate,           (arg_t) +1 },
-	{ 0,            3,                i_navigate,           (arg_t) -1 },
-	{ 0,            2,                i_drag,               (arg_t) None },
-	{ 0,            4,                i_scroll,             (arg_t) DIR_UP },
-	{ 0,            5,                i_scroll,             (arg_t) DIR_DOWN },
-	{ ShiftMask,    4,                i_scroll,             (arg_t) DIR_LEFT },
-	{ ShiftMask,    5,                i_scroll,             (arg_t) DIR_RIGHT },
-	{ 0,            6,                i_scroll,             (arg_t) DIR_LEFT },
-	{ 0,            7,                i_scroll,             (arg_t) DIR_RIGHT },
-	{ ControlMask,  4,                g_zoom,               (arg_t) +1 },
-	{ ControlMask,  5,                g_zoom,               (arg_t) -1 },
+	{ 0,            1,                i_cursor_navigate,    None },
+	{ 0,            2,                i_drag,               None },
+	{ 0,            3,                g_switch_mode,        None },
+	{ 0,            4,                g_zoom,               +1 },
+	{ 0,            5,                g_zoom,               -1 },
 };
 
 #endif

tabbed/.footprint

@@ -1,6 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/tabbed
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/tabbed.1.gz
+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/tabbed.1.gz

tabbed/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3xA8wgVK092hXi+V23e2sffsHkTUaPO464iY8juHWHM1Bb1/+NYks5LzrRzXQvag/YEGLLBM5toLZjSWT/M1bwI=
-SHA256 (Pkgfile) = b47230a365c8d8629120b31c1a80099dfd9273a3729e5e19d86fca365fb6253f
-SHA256 (.footprint) = ef5cc552ca82ca6e4ba7cde5047dc6580e10e967feec9b45213abb5a5ea41760
+RWSagIOpLGJF3wy+8aXDScJvCyLQjMKZ/8J9oBGmgUm+U87wxYi+BBM/MWmQiBBWXFxjN4yij/VR8ztzpYOgVdaUjHZEnWjmwgo=
+SHA256 (Pkgfile) = 52d447b0e9d0825ac3fca5425143198722083969b9ddbab77c9d9f85eb95562c
+SHA256 (.footprint) = fe3b64ecc7dfd8cb41db9f7c9413838451390cc68fb45a4eceacb82636d6f2ec
 SHA256 (tabbed-0.6.tar.gz) = 7651ea3acbec5d6a25469e8665da7fc70aba2b4fa61a2a6a5449eafdfd641c42
 SHA256 (config.h) = b53a40916d44090c31cdf5b259336deb70b79d15888f6941e7b8d216370cda55

tabbed/Pkgfile

@@ -1,6 +1,6 @@
 # Description: Simple generic tabbed fronted to xembed aware applications
-# URL:         http://tools.suckless.org/tabbed/
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
+# URL:         https://tools.suckless.org/tabbed/
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
 # Depends on:  xorg-libx11
 
 name=tabbed
@@ -9,11 +9,9 @@ release=1
 source=(http://dl.suckless.org/tools/$name-$version.tar.gz config.h)
 
 build () {
-    cd "$name-$version"
-    cp $SRC/config.h .
-    make
-    make DESTDIR=$PKG \
-        PREFIX=/usr \
-        MANPREFIX=/usr/man \
-        install
+	cd "$name-$version"
+
+	cp $SRC/config.h .
+	make CC=gcc
+	make DESTDIR=$PKG PREFIX=/usr install
 }

wmname/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF39CJ7tom1oJrhcJFrIvNmS4gVEQ5DsVf/BMMQ7On7+oxBU/hhOfJVBbMRCiMedeeD57ahkpMdCh9eShNM+z4ngM=
-SHA256 (Pkgfile) = 34926b91c42d2e67b08dd9222514995ffc13f0a8089c181b62bbfd42136bd1fd
+RWSagIOpLGJF3yG8z+rZjw0MmTxdwmDAv/Xbip/atyCjc3ZDZQ/aFEcfGcp2j0XLntuuno8C6dDFSbM5c6fFmy1W3yAJY1VoZAQ=
+SHA256 (Pkgfile) = 918b36eb4774a194fdeeba1fd8d904435552ca388f08db3691e31401ab78a319
 SHA256 (.footprint) = dfff5dca731f644052e7847f2d63e2c8cb4f36abec76c2543742a8fc6c2cc877
 SHA256 (wmname-0.1.tar.gz) = 559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5

wmname/Pkgfile

@@ -1,6 +1,6 @@
 # Description: wmname prints/sets the window manager name property of the root window
 # URL:         http://tools.suckless.org/wmname/
-# Maintainer:  Maximilian Dietrich, dxm at openmailbox dot org
+# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
 # Depends on:  xorg-libx11
 
 name=wmname
@@ -9,8 +9,8 @@ release=1
 source=(http://dl.suckless.org/tools/$name-$version.tar.gz)
 
 build () {
-    cd "$name-$version"
-    make
-    make PREFIX=$PKG/usr \
-        install
+	cd $name-$version
+
+	make CC=gcc
+	make PREFIX=$PKG/usr install
 }

xssstate/.footprint

@@ -1,6 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/xssstate
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/xssstate.1.gz
+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/xssstate.1.gz

xssstate/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zF79J6TRFKUz4JBTu0CMcNq0OF6hyc6lnIEdo8cr4OVQWCRBLpxUtBIz7b1jtdxf1RGAFSgJdpa3PonLRZjpw8=
-SHA256 (Pkgfile) = ea225f0c3a45749c90d8886e9952712ef9d3f143c692f2c6ba89c42d73407ce8
-SHA256 (.footprint) = 3091b07455473f68fe005ba06a2b9b0371bc3e3cfd00b21b3304034f15d2dea0
+RWSagIOpLGJF341+4oZCN87pxWXaWZUlDZjTh4LPdxDyt9YS7YEGo2d0PH2v4oXlNMnvz/WWzM8hEj7O2ASDsALgErd1+8dZxgU=
+SHA256 (Pkgfile) = b05e0afba22feb663a3f56324b0e0a958fbc173678c4b6c46bca4c4258550a44
+SHA256 (.footprint) = 623b69c9715687c358289ca3b76a30f17ff2c70bc3829bf390bccab375db8305
 SHA256 (xssstate-1.1.tar.gz) = c4b6f504a6a8eb247bc60960bd65cbf9631c008449a1d71ac4c55e34be1c6011