From 3c951f3ef8ae0bf3ae9c8d397fabba16d293e475 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 18 Feb 2018 12:55:00 +1100 Subject: [PATCH 01/34] enchant: 2.2.1 -> 2.2.3 --- enchant/.footprint | 6 +++--- enchant/.md5sum | 2 +- enchant/.signature | 8 ++++---- enchant/Pkgfile | 6 ++---- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/enchant/.footprint b/enchant/.footprint index 7a453ae2f..b129f8465 100644 --- a/enchant/.footprint +++ b/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/ diff --git a/enchant/.md5sum b/enchant/.md5sum index b5c057653..e09fe89a5 100644 --- a/enchant/.md5sum +++ b/enchant/.md5sum @@ -1 +1 @@ -0dacf2d2e53b1b394c19fd772390e0d4 enchant-2.2.1.tar.gz +4b8abb58e00e93363591b3f5ea4f52d5 enchant-2.2.3.tar.gz diff --git a/enchant/.signature b/enchant/.signature index bf059d2e4..0c69f3975 100644 --- a/enchant/.signature +++ b/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 diff --git a/enchant/Pkgfile b/enchant/Pkgfile index c6b47f95e..40cb57cfa 100644 --- a/enchant/Pkgfile +++ b/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 From 8ea176e613445024f74e80479d044e90e1d9599c Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 18 Feb 2018 15:42:53 +1100 Subject: [PATCH 02/34] ddrescue: 1.22 -> 1.23 --- ddrescue/.md5sum | 2 +- ddrescue/.signature | 6 +++--- ddrescue/Pkgfile | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ddrescue/.md5sum b/ddrescue/.md5sum index 4a7263e5d..ee42a846c 100644 --- a/ddrescue/.md5sum +++ b/ddrescue/.md5sum @@ -1 +1 @@ -49c845ed89d25b534842e40366154cb4 ddrescue-1.22.tar.lz +cd85a82d510d9abf790132fb0da1bf3c ddrescue-1.23.tar.lz diff --git a/ddrescue/.signature b/ddrescue/.signature index a8af3b4a5..a6367546b 100644 --- a/ddrescue/.signature +++ b/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 diff --git a/ddrescue/Pkgfile b/ddrescue/Pkgfile index f996c6709..a0badcc22 100644 --- a/ddrescue/Pkgfile +++ b/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) From 9207ba0a89099f2bb2c44ce505496563880067a7 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 18 Feb 2018 18:07:48 +1100 Subject: [PATCH 03/34] ffmpeg: 3.4.1 -> 3.4.2 --- ffmpeg/.md5sum | 2 +- ffmpeg/.signature | 6 +++--- ffmpeg/Pkgfile | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ffmpeg/.md5sum b/ffmpeg/.md5sum index 19b11a713..ee8973ca3 100644 --- a/ffmpeg/.md5sum +++ b/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 diff --git a/ffmpeg/.signature b/ffmpeg/.signature index 2ee8ffb14..a9874a8a2 100644 --- a/ffmpeg/.signature +++ b/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 diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile index fa82cded4..c9fdcbd50 100644 --- a/ffmpeg/Pkgfile +++ b/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) From 38186fee3e8aa077fa2cf27f76cf567987236800 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 18 Feb 2018 18:19:41 +1100 Subject: [PATCH 04/34] mpv: 0.27.0 -> 0.27.2 closes FS#1588 --- mpv/.md5sum | 3 +- mpv/.signature | 7 +- mpv/09_ytdl-hook-whitelist-protocols.patch | 105 --------------------- mpv/Pkgfile | 10 +- 4 files changed, 7 insertions(+), 118 deletions(-) delete mode 100644 mpv/09_ytdl-hook-whitelist-protocols.patch diff --git a/mpv/.md5sum b/mpv/.md5sum index 2fbcec1e8..4c938aa82 100644 --- a/mpv/.md5sum +++ b/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 diff --git a/mpv/.signature b/mpv/.signature index 49e7e3573..cdb942140 100644 --- a/mpv/.signature +++ b/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 diff --git a/mpv/09_ytdl-hook-whitelist-protocols.patch b/mpv/09_ytdl-hook-whitelist-protocols.patch deleted file mode 100644 index c5c4f54f4..000000000 --- a/mpv/09_ytdl-hook-whitelist-protocols.patch +++ /dev/null @@ -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 -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) diff --git a/mpv/Pkgfile b/mpv/Pkgfile index 8fbe91f6a..bd1d4ee3d 100644 --- a/mpv/Pkgfile +++ b/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 \ From e36378d0e7289db709882f8c033f6f8898638d8e Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 04:18:13 -0500 Subject: [PATCH 05/34] qiv: new maintainer. update to 2.3.2. --- qiv/.md5sum | 3 +-- qiv/.signature | 7 +++---- qiv/Makefile.patch | 39 --------------------------------------- qiv/Pkgfile | 22 +++++++++++----------- 4 files changed, 15 insertions(+), 56 deletions(-) delete mode 100644 qiv/Makefile.patch diff --git a/qiv/.md5sum b/qiv/.md5sum index ffe141bed..cdee0940a 100644 --- a/qiv/.md5sum +++ b/qiv/.md5sum @@ -1,2 +1 @@ -820f97fa101ccd2b59936720e800a112 Makefile.patch -f692f665ad429f13c732156351420850 qiv-2.2.3.tgz +e64dd2cbd49f31264f60012e0138549b qiv-2.3.2.tgz diff --git a/qiv/.signature b/qiv/.signature index 74d18df3f..beadd4551 100644 --- a/qiv/.signature +++ b/qiv/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33csHweylFBaa/qKM6CoxfPA6X6Lus3NqDZpJFbUOUamizMvQ8jrzhSnNGB2qdmuJjodFjwfpemfLO+gJdtz5gk= -SHA256 (Pkgfile) = c0a5e3b79477661b6da15100ffd1601bf927ac49c59bf114a6f2e787761c8c62 +RWSagIOpLGJF3w7EnXOBdla3J6qGoJjy3zee5/0hUYNiYkO/61mhnGscbXwqb8VO4iOsyjUr8hI89ePsKJkbZQIuAMYcI8J5RAY= +SHA256 (Pkgfile) = 06ef381e8dbeaf6fadf3e9643de025976348f1919356c615c3afd9b5be825f27 SHA256 (.footprint) = 5a19c52fa346d924787748668c20d87b45f78efcd10dcd18e91a2fe57da73a9a -SHA256 (qiv-2.2.3.tgz) = 9f445a0e52948f71c946da18633068389a1583edb28efe1933043f0a90baad6a -SHA256 (Makefile.patch) = f31e8b9b8c3a832cde5833ee375c639025b3c6bbbefd1944e7d3894e9fab4fd0 +SHA256 (qiv-2.3.2.tgz) = 48e0a088a0d5cf5fac2314a60b3aed62c4913e792627f64f03986865ad7080d5 diff --git a/qiv/Makefile.patch b/qiv/Makefile.patch deleted file mode 100644 index 55377129a..000000000 --- a/qiv/Makefile.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- Makefile.orig 2010-08-30 22:58:36.000000000 +0200 -+++ Makefile 2010-08-30 23:02:12.000000000 +0200 -@@ -3,8 +3,10 @@ - # User Options - ####################################################################### - -+DESTDIR = -+ - # Directory where qiv will be installed under. --PREFIX = /usr/local -+PREFIX = /usr - - # Font to use for statusbar in fullscreen mode - STATUSBAR_FONT = "fixed" -@@ -83,7 +85,7 @@ - endif - - ifdef GTD_XINERAMA --LIBS += -L/usr/X11R6/lib -lXinerama -+LIBS += -L/usr/lib/X11 -lXinerama - endif - - ifdef MAGIC -@@ -127,13 +129,7 @@ - - install: $(PROGRAM) - @echo "Installing QIV..." -- install -s -m 0755 $(PROGRAM) $(PREFIX)/bin -- install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1 -- $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1 -- @if ./qiv -f ./intro.jpg ; \ -- then echo "-- Test Passed --" ; \ -- else echo "-- Test Failed --" ; \ -- fi -- @echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n" -+ install -D -m 0755 $(PROGRAM) $(DESTDIR)/$(PREFIX)/bin/$(PROGRAM) -+ install -D -m 0644 $(PROGRAM).1 $(DESTDIR)/$(PREFIX)/man/man1/$(PROGRAM).1 - - # the end... ;-) diff --git a/qiv/Pkgfile b/qiv/Pkgfile index 9c615d680..f5ac5aab2 100644 --- a/qiv/Pkgfile +++ b/qiv/Pkgfile @@ -1,18 +1,18 @@ # Description: Very small and pretty fast gdk/Imlib2 image viewer -# URL: http://spiegl.de/qiv/ -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Juergen Daubert, juergen dot daubert at t-online dot de -# Depends on: imlib2 gtk +# 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.2.3 +version=2.3.2 release=1 -source=(http://spiegl.de/qiv/download/$name-$version.tgz \ - Makefile.patch) +source=(http://spiegl.de/qiv/download/$name-$version.tgz) build () { - cd $name-$version - patch -p0 -i $SRC/Makefile.patch - make - make DESTDIR=$PKG install + 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 } From 604ae87b5bc9ac292ecc2b368c7928c2109cb926 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 04:23:26 -0500 Subject: [PATCH 06/34] ethtool: new maintainer. update to 4.15. --- ethtool/.md5sum | 2 +- ethtool/.signature | 6 +++--- ethtool/Pkgfile | 16 +++++++--------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ethtool/.md5sum b/ethtool/.md5sum index 499d0ae8d..c76fed72f 100644 --- a/ethtool/.md5sum +++ b/ethtool/.md5sum @@ -1 +1 @@ -16d38f4ebe23e44f96f7d8b38ed3652c ethtool-4.11.tar.xz +1d9a82de6c9131d1caa626f77c6cdb57 ethtool-4.15.tar.xz diff --git a/ethtool/.signature b/ethtool/.signature index a562e498f..f39144f41 100644 --- a/ethtool/.signature +++ b/ethtool/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+HwzEu3iTUbTEsYi2/K2oXmimXHBhB6kkhwN/nCH2A4HlF+/hpFq5zhF24wHcJ0L2upfPPNzMstXNoAG5RVEw8= -SHA256 (Pkgfile) = b5686db964940c7dba76d45f130b4d65ac342bc42838f64042be5da213acf1e6 +RWSagIOpLGJF3xJCRl4/y849AHSWQBclBO/MOVBnRjCZjremiP8l8HNMKCu+xGGDgT8Rub5yYUYoTJdZYmAMHNWC2psOh4gDewQ= +SHA256 (Pkgfile) = cd3fdee675a50d8260e455ccda8b7df42a3893099bf850669bb0c3fd74018937 SHA256 (.footprint) = 0c1414ae37bf1aa07394d0619ee65d30799bf11d9f93f53f6f5a6f12d0261359 -SHA256 (ethtool-4.11.tar.xz) = 12d8edaa8064966b8ef19cc44fecc096a68828035b6a1f2c67a27531a718e1b2 +SHA256 (ethtool-4.15.tar.xz) = 71f7fd32483ffdc7c6c4d882e230714eb101df0a46cbe396dbeb8ac78f1ef91a diff --git a/ethtool/Pkgfile b/ethtool/Pkgfile index 5d7bc8d4c..c3e988996 100644 --- a/ethtool/Pkgfile +++ b/ethtool/Pkgfile @@ -1,18 +1,16 @@ # Description: Linux net driver diagnostic and tuning tool -# URL: https://www.kernel.org/pub/software/network/ethtool/ -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Manuel Ruiz, manuel dot tienza at gmail dot com -# Depends on: +# URL: https://www.kernel.org/pub/software/network/ethtool/ +# Maintainer: John Vogel, jvogel4 at stny dot rr dot com name=ethtool -version=4.11 +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 + cd $name-$version + ./configure --prefix=/usr + make + make DESTDIR=$PKG install } From 2143956f86d53f8608981a958ae920b3779d67c1 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 04:52:59 -0500 Subject: [PATCH 07/34] dos2unix: new maintainer. update to 7.4.0. --- dos2unix/.footprint | 13 +++++++------ dos2unix/.md5sum | 2 +- dos2unix/.signature | 8 ++++---- dos2unix/Pkgfile | 16 ++++++---------- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dos2unix/.footprint b/dos2unix/.footprint index e6580d6a7..a7b0436db 100644 --- a/dos2unix/.footprint +++ b/dos2unix/.footprint @@ -4,9 +4,10 @@ drwxr-xr-x root/root usr/bin/ 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/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/dos2unix.1.gz -lrwxrwxrwx root/root usr/man/man1/mac2unix.1.gz -> dos2unix.1.gz -lrwxrwxrwx root/root usr/man/man1/unix2dos.1.gz -> dos2unix.1.gz -lrwxrwxrwx root/root usr/man/man1/unix2mac.1.gz -> dos2unix.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/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 diff --git a/dos2unix/.md5sum b/dos2unix/.md5sum index be7fc1f0f..5b398d51c 100644 --- a/dos2unix/.md5sum +++ b/dos2unix/.md5sum @@ -1 +1 @@ -04428e77e2ead8a92c1492ba8977f1d1 dos2unix-7.3.4.tar.gz +a615de542899e53d6f9575ad3cb32b19 dos2unix-7.4.0.tar.gz diff --git a/dos2unix/.signature b/dos2unix/.signature index 1e24ed50c..4552c52ad 100644 --- a/dos2unix/.signature +++ b/dos2unix/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+0TbIFlnHtOOGxkfYD2TL9+Sbmlf2LbF1fF2qriYlBfS9Nts/WDQG1iJKC85VjFhdmLKgD1b7MjlG/wV9y2jwQ= -SHA256 (Pkgfile) = 0c22e3864c3805358c0867986b8437658d9c554be8818b7a4b61d645ec91b99f -SHA256 (.footprint) = 0e7b18a9c1360f26f0f897d937033ebc99ad8a716928d90c754af3ab1812249d -SHA256 (dos2unix-7.3.4.tar.gz) = 8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5 +RWSagIOpLGJF34elIZxB94MRukPEV71e/8LIcoBk2YiAPJzkh8U2MnYt4ZKSivBsKBQpSro6E+x/Isw3hSS+NGRzqifW3UrhwQY= +SHA256 (Pkgfile) = 5ae6c4736e377a75779737bde1fb5024c9d3cd1ee81c6809063d87486ba58fe4 +SHA256 (.footprint) = 624ae5623dcfc7cfd7f465b5a2c9c344fba2bc9a71d13724199ece3975cfe8f2 +SHA256 (dos2unix-7.4.0.tar.gz) = bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a diff --git a/dos2unix/Pkgfile b/dos2unix/Pkgfile index c66d15c97..3a0a4fefc 100644 --- a/dos2unix/Pkgfile +++ b/dos2unix/Pkgfile @@ -1,19 +1,15 @@ # Description: Dos2unix converts DOS or MAC text files to UNIX format -# URL: http://dos2unix.sourceforge.net -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Jose V Beneyto, sepen at crux dot nu -# Depends on: +# URL: http://dos2unix.sourceforge.net +# Maintainer: John Vogel, jvogel4 at stny dot rr dot com name=dos2unix -version=7.3.4 +version=7.4.0 release=1 source=(http://www.xs4all.nl/~waterlan/$name/$name-$version.tar.gz) build() { - cd $name-$version - make clean - make CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE" - make DESTDIR=$PKG install prefix=/usr mandir=/usr/man - rm -rf $PKG/usr/share + cd $name-$version + make ENABLE_NLS= CFLAGS="$CFLAGS" + make ENABLE_NLS= DESTDIR=$PKG install-bin install-man } From 7f687aa188545663673bba290988bb2f9d819236 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 05:13:51 -0500 Subject: [PATCH 08/34] i2c-tools: new maintainer --- i2c-tools/.footprint | 3 +++ i2c-tools/.signature | 6 +++--- i2c-tools/Pkgfile | 15 +++++---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/i2c-tools/.footprint b/i2c-tools/.footprint index 182dabf1d..f93f371bf 100644 --- a/i2c-tools/.footprint +++ b/i2c-tools/.footprint @@ -4,6 +4,9 @@ drwxr-xr-x root/root usr/bin/ -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 diff --git a/i2c-tools/.signature b/i2c-tools/.signature index 7ed689e9c..fc4053b75 100644 --- a/i2c-tools/.signature +++ b/i2c-tools/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30KDFrU98UAlvavuIe+bbGsvEoyu2YD3CW5bjtuHMDSc52zuSumOprCc64sXC8kNWZaAD7OOqDVMaKnylrkisg4= -SHA256 (Pkgfile) = 5a80f333d91eea989718ccaffcf80154ab3c01009d75f84e26d8f70f9d02e153 -SHA256 (.footprint) = 366154f1fabea0b9b38bdd812dc6e15b5d9d9de386da83ca6add31d11b88b15f +RWSagIOpLGJF379gyfYhE3jZJODSybuBQw2sonVS8wrOzWgkj1PmYjN9nPX6mVI4o8TguKMOriXIRttkmVmii8+M5+V4f6FNhwQ= +SHA256 (Pkgfile) = c74fc432bf0f7a0cb0a5ac485b7effe6b323918afdda2f20102d35b414699e98 +SHA256 (.footprint) = cef3dc749f3dbc8e798b6fa005f88ceb884ff0cc76a665369b4161bb75343f53 SHA256 (i2c-tools-4.0.tar.xz) = d900ca1c11c51ea20caa50b096f948008b8a7ad832311b23353e21baa7af28d6 diff --git a/i2c-tools/Pkgfile b/i2c-tools/Pkgfile index 9cf74e016..e47d634c2 100644 --- a/i2c-tools/Pkgfile +++ b/i2c-tools/Pkgfile @@ -1,7 +1,6 @@ # Description: I2C Tools for Linux -# URL: https://i2c.wiki.kernel.org/index.php/I2C_Tools -# Maintainer: Unmaintained -# Depends on: +# 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 @@ -9,11 +8,7 @@ release=1 source=(https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-$version.tar.xz) build() { - cd $name-$version - sed -e 's|/usr/local|/usr|g' -i Makefile - - make PREFIX=/usr - make DESTDIR=$PKG install - - rm -r $PKG/usr/include + cd $name-$version + make prefix=/usr + make prefix=/usr DESTDIR=$PKG install } From 995c69f5faf7505170b462c3c1b4a16c8bcc833f Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 05:35:54 -0500 Subject: [PATCH 09/34] pm-utils: new maintainer --- pm-utils/.footprint | 17 +++++++++-------- pm-utils/.signature | 6 +++--- pm-utils/Pkgfile | 33 ++++++++++++++++----------------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pm-utils/.footprint b/pm-utils/.footprint index f7852c2df..b613d87b5 100644 --- a/pm-utils/.footprint +++ b/pm-utils/.footprint @@ -61,16 +61,17 @@ 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-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/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/on_ac_power.1.gz --rw-r--r-- root/root usr/man/man1/pm-is-supported.1.gz -drwxr-xr-x root/root usr/man/man8/ --rw-r--r-- root/root usr/man/man8/pm-action.8.gz --rw-r--r-- root/root usr/man/man8/pm-pmu.8.gz --rw-r--r-- root/root usr/man/man8/pm-powersave.8.gz 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 diff --git a/pm-utils/.signature b/pm-utils/.signature index 14aa8c33a..242fec1f2 100644 --- a/pm-utils/.signature +++ b/pm-utils/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31oxgmLkrsJQTwBM1gvt7mE//9qpl8NgmZ4SZM0w5uvIGybHLpVZDvJSaMBLf7QNTwIV9PbHPMk6wDtjkoPI3AQ= -SHA256 (Pkgfile) = e54542a6bfcdcbf76c15efad39e94c7c5de5b625e11a6d0f79e6c59ddb4133ed -SHA256 (.footprint) = 1691e8abefe14cd78db78a5d6af4668206537d6edb955ff1ee772217ddc8fdff +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 diff --git a/pm-utils/Pkgfile b/pm-utils/Pkgfile index 199dc3608..bde553610 100644 --- a/pm-utils/Pkgfile +++ b/pm-utils/Pkgfile @@ -1,8 +1,6 @@ # Description: Power management scripts for suspend and hibernate -# URL: http://pm-utils.freedesktop.org/ -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Andrew Brouwers, abrouwers at gmail dot com -# Depends on: +# URL: http://pm-utils.freedesktop.org/ +# Maintainer: John Vogel, jvogel4 at stny dot rr dot com name=pm-utils version=1.4.1 @@ -11,19 +9,20 @@ 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 + cd $name-$version - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/man + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc - make - make DESTDIR=$PKG install - - install -m 0644 man/*.1 $PKG/usr/man/man1 - install -m 0644 man/*.8 $PKG/usr/man/man8 - rm -rf $PKG/usr/share - - # install video quirks - mv $SRC/video-quirks $PKG/usr/lib/pm-utils + 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 } From 4efba6f4497827a9361d70144362bbb6f10e1cf1 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 06:07:21 -0500 Subject: [PATCH 10/34] p5-extutils-depends: new maintainer --- p5-extutils-depends/.signature | 4 ++-- p5-extutils-depends/Pkgfile | 27 +++++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/p5-extutils-depends/.signature b/p5-extutils-depends/.signature index 826fded43..20cf871c0 100644 --- a/p5-extutils-depends/.signature +++ b/p5-extutils-depends/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF394GlX6q8CrvQ4GODvZ0e06oLv3WnE3DHtFpv5yW06xPJNXusa+n1wKZSWLSrCkIs8TSiW4uOwuXV97+3l024wo= -SHA256 (Pkgfile) = 4f40e48b0e8c194c784f80e837945901601991f0e14fadbd39426bf46da36a99 +RWSagIOpLGJF31nRWaU7r9nrpWK5KxUQkbIFBEihCTXS6y2Stxi1iZXCFgOuZr0tYggGfr0qYsRC2SP+DMBtcL5acGZuhNhWoAI= +SHA256 (Pkgfile) = c40caa17e9b1b84f61f15c1cbf6b86bb73fc5528d6364a86c28d4c09e7225e76 SHA256 (.footprint) = dfdab6ae7912be356e69212127e28b24920431a46e395954bd4586d7ffee5436 SHA256 (ExtUtils-Depends-0.405.tar.gz) = 8ad6401ad7559b03ceda1fe4b191c95f417bdec7c542a984761a4656715a8a2c diff --git a/p5-extutils-depends/Pkgfile b/p5-extutils-depends/Pkgfile index 24b53b6c8..0b4ea020b 100644 --- a/p5-extutils-depends/Pkgfile +++ b/p5-extutils-depends/Pkgfile @@ -1,24 +1,23 @@ # Description: Perl bindings for depends -# URL: http://www.cpan.org/ -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Han Boetes, han at mijncomputer dot nl -# Depends on: p5-xml-parser +# 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=1 -source=(http://www.cpan.org/modules/by-module/ExtUtils/ExtUtils-Depends-$version.tar.gz) +source=(https://www.cpan.org/modules/by-module/ExtUtils/ExtUtils-Depends-$version.tar.gz) build() { - cd ExtUtils-Depends-$version - perl Makefile.PL + cd ExtUtils-Depends-$version + perl Makefile.PL - make OPTIMIZE="$CFLAGS" - make install DESTDIR=$PKG + make OPTIMIZE="$CFLAGS" + make install DESTDIR=$PKG - find $PKG \ - -name perllocal.pod \ - -o -name "*.bs" \ - -o -name .packlist | xargs rm - find $PKG -empty | xargs rmdir -p ||: + find $PKG \ + -name perllocal.pod \ + -o -name "*.bs" \ + -o -name .packlist | xargs rm + find $PKG -empty | xargs rmdir -p ||: } From e19bcfc3df918968cb0d4e46a12f234b08ac6012 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 06:19:03 -0500 Subject: [PATCH 11/34] p5-extutils-pkgconfig: new maintainer. fix perms. --- p5-extutils-pkgconfig/.footprint | 4 ++-- p5-extutils-pkgconfig/.signature | 6 +++--- p5-extutils-pkgconfig/Pkgfile | 30 +++++++++++++++--------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/p5-extutils-pkgconfig/.footprint b/p5-extutils-pkgconfig/.footprint index 6b118391c..40128e9a5 100644 --- a/p5-extutils-pkgconfig/.footprint +++ b/p5-extutils-pkgconfig/.footprint @@ -4,8 +4,8 @@ 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/ --r--r--r-- root/root usr/lib/perl5/site_perl/5.24/ExtUtils/PkgConfig.pm +-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/ --r--r--r-- root/root usr/share/man/man3/ExtUtils::PkgConfig.3pm.gz +-rw-r--r-- root/root usr/share/man/man3/ExtUtils::PkgConfig.3pm.gz diff --git a/p5-extutils-pkgconfig/.signature b/p5-extutils-pkgconfig/.signature index 72ceb4042..2d84140f8 100644 --- a/p5-extutils-pkgconfig/.signature +++ b/p5-extutils-pkgconfig/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+DVD8eAL8B7NmpYcRh5xUqBE5v7u4p8ZfvRUsUN9o8/UQXxmyIeN0XXLFzmIPt3RVhhziZ73HMFVX8v935sYg8= -SHA256 (Pkgfile) = 9fd37df6e2602651c89d3e73c0773450ef777357cbb62c7f4198faed03ab580a -SHA256 (.footprint) = bb3e6b2da6f2584997dd440f715a358e0c172d90e008cd7e3273ac4a856a5908 +RWSagIOpLGJF3yWKTsv7us56dWK+nnuLMyDwiZOz2hdbB8OpxHVNKH8fE8BCJ2RMzBZA4P+hHfeyNBpABlRdhROsbhOQtTttcw4= +SHA256 (Pkgfile) = a98c8c821b123e5dc0fa35715ff2ba0f21279373a112188af576c43004cf44dd +SHA256 (.footprint) = 9a4d09173e3ba27358ce647b497213f8b37851185f68ea92a26c7e856def246d SHA256 (ExtUtils-PkgConfig-1.16.tar.gz) = bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e diff --git a/p5-extutils-pkgconfig/Pkgfile b/p5-extutils-pkgconfig/Pkgfile index 5366d609a..d6d097127 100644 --- a/p5-extutils-pkgconfig/Pkgfile +++ b/p5-extutils-pkgconfig/Pkgfile @@ -1,24 +1,24 @@ # Description: Perl bindings for pkgconfig -# URL: http://search.cpan.org/dist/ExtUtils-PkgConfig/ -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Han Boetes, han at mijncomputer dot nl -# Depends on: p5-xml-parser +# 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=1 -source=(http://www.cpan.org/modules/by-module/ExtUtils/ExtUtils-PkgConfig-$version.tar.gz) +release=2 +source=(https://www.cpan.org/modules/by-module/ExtUtils/ExtUtils-PkgConfig-$version.tar.gz) build() { - cd ExtUtils-PkgConfig-$version - perl Makefile.PL + cd ExtUtils-PkgConfig-$version + perl Makefile.PL - make OPTIMIZE="$CFLAGS" - make install DESTDIR=$PKG + make OPTIMIZE="$CFLAGS" + make install DESTDIR=$PKG - find $PKG \ - -name perllocal.pod \ - -o -name "*.bs" \ - -o -name .packlist | xargs rm - find $PKG -empty | xargs rmdir -p ||: + 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 ||: } From 89dc77a0a0ed79ef29f61ffc2fbf47a1661761fb Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 06:28:54 -0500 Subject: [PATCH 12/34] p5-extutils-depends: fix perms --- p5-extutils-depends/.footprint | 4 ++-- p5-extutils-depends/.signature | 6 +++--- p5-extutils-depends/Pkgfile | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/p5-extutils-depends/.footprint b/p5-extutils-depends/.footprint index 02a23772d..510062c24 100644 --- a/p5-extutils-depends/.footprint +++ b/p5-extutils-depends/.footprint @@ -4,8 +4,8 @@ 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/ --r--r--r-- root/root usr/lib/perl5/site_perl/5.24/ExtUtils/Depends.pm +-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/ --r--r--r-- root/root usr/share/man/man3/ExtUtils::Depends.3pm.gz +-rw-r--r-- root/root usr/share/man/man3/ExtUtils::Depends.3pm.gz diff --git a/p5-extutils-depends/.signature b/p5-extutils-depends/.signature index 20cf871c0..0ff855b4f 100644 --- a/p5-extutils-depends/.signature +++ b/p5-extutils-depends/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31nRWaU7r9nrpWK5KxUQkbIFBEihCTXS6y2Stxi1iZXCFgOuZr0tYggGfr0qYsRC2SP+DMBtcL5acGZuhNhWoAI= -SHA256 (Pkgfile) = c40caa17e9b1b84f61f15c1cbf6b86bb73fc5528d6364a86c28d4c09e7225e76 -SHA256 (.footprint) = dfdab6ae7912be356e69212127e28b24920431a46e395954bd4586d7ffee5436 +RWSagIOpLGJF3xYoRvCgwFgloEethhOoebkBm0YIzf5xs7CQ42VVGN/pl7q8wk9Xi2bG+oX/78U+iCNKbjZoQ+7EtGqZaWletQo= +SHA256 (Pkgfile) = adc409aeb23cf7c31256de5ad5f02af20d2f77da1c00cd96ab6838224a513ad3 +SHA256 (.footprint) = ece46380cbab13ef80b948898946e6bcfc42cc4e3fcc5b321dc0b10339cfd3d9 SHA256 (ExtUtils-Depends-0.405.tar.gz) = 8ad6401ad7559b03ceda1fe4b191c95f417bdec7c542a984761a4656715a8a2c diff --git a/p5-extutils-depends/Pkgfile b/p5-extutils-depends/Pkgfile index 0b4ea020b..a91b0c6f3 100644 --- a/p5-extutils-depends/Pkgfile +++ b/p5-extutils-depends/Pkgfile @@ -5,7 +5,7 @@ name=p5-extutils-depends version=0.405 -release=1 +release=2 source=(https://www.cpan.org/modules/by-module/ExtUtils/ExtUtils-Depends-$version.tar.gz) build() { @@ -15,6 +15,7 @@ build() { 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" \ From d5f793efe1b3b1688bca3f78aef2b8e631d18758 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 06:52:12 -0500 Subject: [PATCH 13/34] svn2cl: new maintainer. fix mandir. --- svn2cl/.footprint | 6 +++--- svn2cl/.md5sum | 2 +- svn2cl/.signature | 8 ++++---- svn2cl/Pkgfile | 21 ++++++++++----------- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/svn2cl/.footprint b/svn2cl/.footprint index 13fb5f20f..f0f1ecbf7 100644 --- a/svn2cl/.footprint +++ b/svn2cl/.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/svn2cl -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/svn2cl.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/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 diff --git a/svn2cl/.md5sum b/svn2cl/.md5sum index 4f12705fe..987e84930 100644 --- a/svn2cl/.md5sum +++ b/svn2cl/.md5sum @@ -1,2 +1,2 @@ c21d77d2cc45b9e0ee290c4604658e38 svn2cl -028f52e0a2d5c3b859b053067ee1af2c svn2cl-0.12.tar.gz +e3435be4cacdb7a729267917e46ec74f svn2cl-0.14.tar.gz diff --git a/svn2cl/.signature b/svn2cl/.signature index 0ca286b1a..df4861d62 100644 --- a/svn2cl/.signature +++ b/svn2cl/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36uBMvLq1C0Hokk6MlCYhX0bT6gvKwEjhU3Mcmv+2GWMgyDZZ4kPb4SrRLhA5qWkgY2TjoD9MH3SQcxpvPb23Ak= -SHA256 (Pkgfile) = 391b7fdcf7e5fdfa380b93b1ebf25de11ededa9006fdcdd9124091f8845963d6 -SHA256 (.footprint) = 1ed2c9f3bacded4af16052735875daf93033dd4295bba1d7fb7b966b9ef6b820 -SHA256 (svn2cl-0.12.tar.gz) = abb8976a7862d267eebe98deb1082a9e5a236a63db9dd304794f969ccd777c74 +RWSagIOpLGJF31VYDofq9rcfrgPgxHSlWNmjwHqRZYaaZ+LoAXZAYd2iQMFwfchOafOQ9Evvxn128FcT7ncz892IgclYhwoipQM= +SHA256 (Pkgfile) = 65945819faf647000dfb1d2e76142dfbbd8a5c0246420794ead24841f3b9899d +SHA256 (.footprint) = 227b7952a98ae63e1d0420e49b09989b364be59e0bb3bfc6a67990944766395f +SHA256 (svn2cl-0.14.tar.gz) = a1beb1ee03c7247c2f89792ac5bf91cb4e5ee9bdee839e2208ec9f3aacd738f2 SHA256 (svn2cl) = 42c49e5176d845f4a2e19d2a3b31ba70e9390bb4242f6b6490d8c4c73939cf94 diff --git a/svn2cl/Pkgfile b/svn2cl/Pkgfile index 4172c456f..2e7e7e3d2 100644 --- a/svn2cl/Pkgfile +++ b/svn2cl/Pkgfile @@ -1,19 +1,18 @@ # Description: Script and XSL stylesheet to convert svn logs to ChangeLog. -# URL: http://ch.tudelft.nl/~artur/svn2cl/ -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: James Mills, prologic at shortcircuit dot net dot au -# Depends on: subversion libxslt +# URL: https://arthurdejong.org/svn2cl/ +# Maintainer: John Vogel, jvogel4 at stny dot rr dot com +# Depends on: subversion libxslt name=svn2cl -version=0.12 +version=0.14 release=1 -source=(http://arthurdejong.org/$name/$name-$version.tar.gz \ +source=(https://arthurdejong.org/$name/$name-$version.tar.gz $name) build() { - install -d $PKG/usr/{bin,man/man1,share/$name} - install -m 0644 $name-$version/$name.1 $PKG/usr/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 + 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 } From 42e9a64e21136a96d7cc28271deb2fb3febbd511 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 07:18:27 -0500 Subject: [PATCH 14/34] cppcheck: new maintainer --- cppcheck/.signature | 4 ++-- cppcheck/Pkgfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cppcheck/.signature b/cppcheck/.signature index b1c90ee82..89cba2b58 100644 --- a/cppcheck/.signature +++ b/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 diff --git a/cppcheck/Pkgfile b/cppcheck/Pkgfile index b42b22700..e6766138b 100644 --- a/cppcheck/Pkgfile +++ b/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 From 8b0d296d3133f2cc4396d3c2e636471024e7f3f5 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 08:09:09 -0500 Subject: [PATCH 15/34] p5-digest-sha1: new maintainer. fix perms. --- p5-digest-sha1/.footprint | 6 +++--- p5-digest-sha1/.signature | 6 +++--- p5-digest-sha1/Pkgfile | 37 +++++++++++++++++++------------------ 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/p5-digest-sha1/.footprint b/p5-digest-sha1/.footprint index d8d886304..36bb9ed6a 100644 --- a/p5-digest-sha1/.footprint +++ b/p5-digest-sha1/.footprint @@ -5,12 +5,12 @@ 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/ --r--r--r-- root/root usr/lib/perl5/site_perl/5.24/linux-thread-multi/Digest/SHA1.pm +-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/ --r-xr-xr-x root/root usr/lib/perl5/site_perl/5.24/linux-thread-multi/auto/Digest/SHA1/SHA1.so +-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/ --r--r--r-- root/root usr/share/man/man3/Digest::SHA1.3pm.gz +-rw-r--r-- root/root usr/share/man/man3/Digest::SHA1.3pm.gz diff --git a/p5-digest-sha1/.signature b/p5-digest-sha1/.signature index a0aecce9e..6c92eef19 100644 --- a/p5-digest-sha1/.signature +++ b/p5-digest-sha1/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF313lZ31gHmYH+UAmjvezyYV2cHYAM6J/3KcBfUkrlCqK9FAJNbjgFWqiE1QMKDSQvFKT5VHwW0/8C9DKYtVY0QI= -SHA256 (Pkgfile) = 9f096ebe8d598f45a097efd3a1bc47cddc8d9aac516a49d81a35d4661888bf4e -SHA256 (.footprint) = a788dcbe3e5eaadd8c56fb570af8c0beaaafff0fb483ab3ad03ad3404d981f4d +RWSagIOpLGJF39m6gmjSC71MK6OcA7o+V9OIDu89WfY8qCXRMVMiRGsAJPbMKmBVwq2TuSInV4963wZWXmd2hli4vrogzElUyQQ= +SHA256 (Pkgfile) = dbb76d2ed59543aebf76ac483082db61852668ac3601a40ab2d23e5e9763271d +SHA256 (.footprint) = 15e3b6ca896e83354873e94e58dfecb960bfa868b49c10a6f77d7f14aefa3d87 SHA256 (Digest-SHA1-2.13.tar.gz) = 68c1dac2187421f0eb7abf71452a06f190181b8fc4b28ededf5b90296fb943cc diff --git a/p5-digest-sha1/Pkgfile b/p5-digest-sha1/Pkgfile index 5078ff815..44e5011eb 100644 --- a/p5-digest-sha1/Pkgfile +++ b/p5-digest-sha1/Pkgfile @@ -1,29 +1,30 @@ # Description: Perl Digest::SHA1 -# URL: http://search.cpan.org/~gaas/Digest-SHA1/ -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Han Boetes, han at mijncomputer dot nl -# Depends on: perl +# 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=2 -source=(http://www.cpan.org/modules/by-module/Digest/Digest-SHA1-$version.tar.gz) +release=3 +source=(https://www.cpan.org/modules/by-module/Digest/Digest-SHA1-$version.tar.gz) build() { - cd Digest-SHA1-$version + cd Digest-SHA1-$version - perl Makefile.PL - make OPTIMIZE="$CFLAGS" + perl Makefile.PL + make OPTIMIZE="$CFLAGS" - make install DESTDIR=$PKG + 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 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 {} \; + # Remove empty directories + find $PKG -depth -empty -exec rm -rf {} \; + # Fix perms + find $PKG -type f -a ! -perm -u+w -exec chmod u+w {} \; } From 2c022523e6f41f44d22b57ef30e86909bc13273f Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 08:57:41 -0500 Subject: [PATCH 16/34] bzr: new maintainer. update to 2.7.0. --- bzr/.footprint | 11 +++++++---- bzr/.md5sum | 2 +- bzr/.signature | 8 ++++---- bzr/Pkgfile | 15 +++++++-------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/bzr/.footprint b/bzr/.footprint index c9704438b..31bfa3547 100644 --- a/bzr/.footprint +++ b/bzr/.footprint @@ -4,7 +4,7 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/bzr-2.6.0-py2.7.egg-info +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bzr-2.7.0-py2.7.egg-info drwxr-xr-x root/root usr/lib/python2.7/site-packages/bzrlib/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/__init__.pyc @@ -717,6 +717,8 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_update.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_upgrade.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_upgrade.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_verify_signatures.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_verify_signatures.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_version.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_version.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_version_info.py @@ -1711,6 +1713,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/bzrlib/version_info_formats -rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/xml8.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/xml_serializer.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/bzrlib/xml_serializer.pyc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/bzr.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/bzr.1.gz diff --git a/bzr/.md5sum b/bzr/.md5sum index 60677eea1..ae2dde9ec 100644 --- a/bzr/.md5sum +++ b/bzr/.md5sum @@ -1 +1 @@ -28c86653d0df10d202c6b842deb0ea35 bzr-2.6.0.tar.gz +8e5020502efd54f5925a14a456b88b89 bzr-2.7.0.tar.gz diff --git a/bzr/.signature b/bzr/.signature index 08c69854b..f394174af 100644 --- a/bzr/.signature +++ b/bzr/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35miHTAVDt0/A3mdByYaAtEB6799a5WjEYE7g4HPOL3Ry/9pDZzDbqJy9kmgAj7+/hgeUxe1yEw+5a/M2bJ13gY= -SHA256 (Pkgfile) = 8cba8398f4330236d7541980ecad7a51c02be708d0fbad30a9a57476bcab0b6f -SHA256 (.footprint) = eb61fcb16adf98262de09f4604845d5b5619f5dc2037a5471488c0c2d4e113ca -SHA256 (bzr-2.6.0.tar.gz) = 0994797182eb828867eee81cccc79480bd2946c99304266bc427b902cf91dab0 +RWSagIOpLGJF3xeOOkcBnaNKPNTqc5VeVH9AImVAPqqCpmdlahqC8J8zClmeS/FNtep9XD6QGIMNSZQcLsznSgeHguRXx1jXKgs= +SHA256 (Pkgfile) = 4d6fcca9adb1f5478b554c71957e05f73feb0c34bad4d89bbde56f76db636f8d +SHA256 (.footprint) = efb1f46be6443d7ec399f17c8f33382d01152e535cb837dd29ccb2f5397eea38 +SHA256 (bzr-2.7.0.tar.gz) = 0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3 diff --git a/bzr/Pkgfile b/bzr/Pkgfile index 53741b858..4e560aaca 100644 --- a/bzr/Pkgfile +++ b/bzr/Pkgfile @@ -1,15 +1,14 @@ # Description: Next-generation distributed version control. -# URL: http://bazaar-ng.org/ -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Johannes Winkelmann, jw at tks6 dot net -# Depends on: python +# URL: https://bazaar-ng.org/ +# Maintainer: John Vogel, jvogel4 at stny dot rr dot com +# Depends on: python name=bzr -version=2.6.0 +version=2.7.0 release=1 -source=(http://launchpad.net/$name/${version%.*}/$version/+download/$name-$version.tar.gz) +source=(https://launchpad.net/$name/${version%.*}/$version/+download/$name-$version.tar.gz) build() { - cd $name-$version - python setup.py install --root=$PKG --prefix=/usr + cd $name-$version + python setup.py install --root=$PKG --prefix=/usr --install-data=/usr/share } From 6784d4cb94aa288814be1f4806e975f32531dcfc Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 09:39:38 -0500 Subject: [PATCH 17/34] feedparser: new maintainer --- feedparser/.signature | 4 ++-- feedparser/Pkgfile | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/feedparser/.signature b/feedparser/.signature index 5e9cd8c12..fe3bda485 100644 --- a/feedparser/.signature +++ b/feedparser/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33A5NGj4XY/K14QO2r3BuxEi1jjV7U3CzxaZ1Be/37JFPeIErueNMUNanlPe81bFmWLAnjHzncZ8a5TTKf+2Eg8= -SHA256 (Pkgfile) = d535e1df51caeb8457790bc13c02c07bc07c5655d63a83974e4af902dc004ad4 +RWSagIOpLGJF3857KVr019xtvBrs9CpG49TIfhWiRC6IYRZhiF/XgCffgHqmj4bKNF26v+tGN46DRfX7o9tSG2q/LWzUlzteigQ= +SHA256 (Pkgfile) = 09993cb6095918fbd9a11866fa57cb9ab197e7d0cf5e85d6848c1649c8017c78 SHA256 (.footprint) = 109bfb228ecf4e68d4bbd07844fd743e5f4dade8264eb1d0f9ad23b1a2f8b6ea SHA256 (5.2.1.tar.gz) = 09367f95e58b9c5f70da70061d3e7f397ed8ec5d3c970e231ef011ff62de462f diff --git a/feedparser/Pkgfile b/feedparser/Pkgfile index 839a76128..713f75cda 100644 --- a/feedparser/Pkgfile +++ b/feedparser/Pkgfile @@ -1,8 +1,7 @@ # Description: Parse RSS and Atom feeds in Python -# URL: https://github.com/kurtmckee/feedparser -# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net -# Packager: James Mills, prologic at shortcircuit dot net dot au -# Depends on: python-setuptools +# 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 @@ -10,7 +9,7 @@ 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 + cd $name-$version + /usr/bin/python setup.py build + /usr/bin/python setup.py install --prefix=/usr --root=$PKG --optimize=1 } From 4ca0bd516af5deb709b1933e8fee5434293cf912 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 10:24:56 -0500 Subject: [PATCH 18/34] jamvm: new maintainer. update to 1.5.4. --- jamvm/.md5sum | 2 +- jamvm/.signature | 6 +++--- jamvm/Pkgfile | 19 +++++++++---------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/jamvm/.md5sum b/jamvm/.md5sum index 8ede151ba..137689a2f 100644 --- a/jamvm/.md5sum +++ b/jamvm/.md5sum @@ -1 +1 @@ -ce886163658d748113b0570dfae12aea jamvm-1.5.3.tar.gz +7654e9657691f5f09c4f481ed4686176 jamvm-1.5.4.tar.gz diff --git a/jamvm/.signature b/jamvm/.signature index 614312a47..30199b3e4 100644 --- a/jamvm/.signature +++ b/jamvm/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wBdGO8LhUcYYtAIr3qb/3bNqin7AqBNWKGn1iAZxPvJ5J7xnEYc+IBgrdL6C6f6c2RHojv0goh7onI8xULo+gE= -SHA256 (Pkgfile) = 8e8326e05ed58154d709d8e6f1ff39668411905e43f13a8326b9b4356da9f119 +RWSagIOpLGJF36D7JJ1GfiXt3X+HSpRBhheOakn+XgYYw9woOl7JZa+Q0vI6evwagBaqlDMDI8t5NiddoAsBiLqh17KZxxNYeAM= +SHA256 (Pkgfile) = a7e87b805611755a2b1442aa43fc00c1d237551d44f61903ebcbffc0594f55a1 SHA256 (.footprint) = 650be26b33df7ffbc2f9351cbd8ac6c5d9535911bea08e8e73f22b575f4d2cf3 -SHA256 (jamvm-1.5.3.tar.gz) = f2795ab62635df1c9bc6c4a7b90f53d0d846c0c26f5ec7b352f687506407ebd8 +SHA256 (jamvm-1.5.4.tar.gz) = 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124 diff --git a/jamvm/Pkgfile b/jamvm/Pkgfile index 011a2b3b4..3f3fdbc5a 100644 --- a/jamvm/Pkgfile +++ b/jamvm/Pkgfile @@ -1,17 +1,16 @@ -# Description: Java Virtual Machine which conforms to the JVM specification version 2 (blue book). In comparison to most other VM's (free and commercial) it is extremely small -# URL: http://jamvm.sourceforge.net/ -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Jose V Beneyto, sepen at crux dot nu -# Depends on: +# 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.3 +version=1.5.4 release=1 source=(http://download.sourceforge.net/$name/$name/JamVM%20$version/$name-$version.tar.gz) build() { - cd $name-$version - ./configure --prefix=/usr - make - make DESTDIR=$PKG install + find $name-$version ! -type l -a -perm -go+w | xargs chmod go-w + cd $name-$version + ./configure --prefix=/usr + make + make DESTDIR=$PKG install } From 17a395d2a3b350e5c1abd9496afa12ba1b508a2f Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 11:43:56 -0500 Subject: [PATCH 19/34] sxhkd: new maintainer. update to 0.5.8. --- sxhkd/.footprint | 7 ++++--- sxhkd/.md5sum | 2 +- sxhkd/.signature | 8 ++++---- sxhkd/Pkgfile | 23 +++++++++++------------ 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sxhkd/.footprint b/sxhkd/.footprint index 2c8961ad3..89cdfd19c 100644 --- a/sxhkd/.footprint +++ b/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 diff --git a/sxhkd/.md5sum b/sxhkd/.md5sum index e170e13aa..230d222b2 100644 --- a/sxhkd/.md5sum +++ b/sxhkd/.md5sum @@ -1 +1 @@ -e04b8d7173059bce156bec6d8cd4297d 0.5.5.tar.gz +1fbd4590cdbf021856b1e7b9c614d59f sxhkd-0.5.8.tar.gz diff --git a/sxhkd/.signature b/sxhkd/.signature index 53ba84dd9..528800a61 100644 --- a/sxhkd/.signature +++ b/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 diff --git a/sxhkd/Pkgfile b/sxhkd/Pkgfile index dfdce0c86..c49df8f60 100644 --- a/sxhkd/Pkgfile +++ b/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 } From b6fd984a996b5a8129f64bfd53dacd7208f4aba9 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 11:58:00 -0500 Subject: [PATCH 20/34] tabbed: new maintainer --- tabbed/.footprint | 7 ++++--- tabbed/.signature | 6 +++--- tabbed/Pkgfile | 16 +++++++--------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/tabbed/.footprint b/tabbed/.footprint index 430cae8e2..61fc757f9 100644 --- a/tabbed/.footprint +++ b/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 diff --git a/tabbed/.signature b/tabbed/.signature index 2fb0776a9..ac906fdf7 100644 --- a/tabbed/.signature +++ b/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 diff --git a/tabbed/Pkgfile b/tabbed/Pkgfile index 3d8ceae7c..a212658c1 100644 --- a/tabbed/Pkgfile +++ b/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 } From 7c8b41818936197061a26a48bc9d34b65c3178be Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 12:07:57 -0500 Subject: [PATCH 21/34] sxiv: new maintainer. update to 24. --- sxiv/.footprint | 6 +- sxiv/.md5sum | 4 +- sxiv/.signature | 10 +-- sxiv/Pkgfile | 21 +++--- sxiv/config.h | 176 ++++++++++++++++++++++++------------------------ 5 files changed, 108 insertions(+), 109 deletions(-) diff --git a/sxiv/.footprint b/sxiv/.footprint index 55632461c..08facf673 100644 --- a/sxiv/.footprint +++ b/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 diff --git a/sxiv/.md5sum b/sxiv/.md5sum index 0f87061c0..8cd1f9ea4 100644 --- a/sxiv/.md5sum +++ b/sxiv/.md5sum @@ -1,2 +1,2 @@ -9d471c49984c0357d63bf984bc09dd09 config.h -3255d0d47e0a4cddd752ec03ee4bddaf v1.3.1.tar.gz +d641dc83dfe760b2ce13553c3c14066f config.h +a929f8ae19f947a23594fdce2b3cf38d sxiv-24.tar.gz diff --git a/sxiv/.signature b/sxiv/.signature index 7879750ea..2de841407 100644 --- a/sxiv/.signature +++ b/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 diff --git a/sxiv/Pkgfile b/sxiv/Pkgfile index 7010c30ca..47b996486 100644 --- a/sxiv/Pkgfile +++ b/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 } diff --git a/sxiv/config.h b/sxiv/config.h index cb230c807..5af745d69 100644 --- a/sxiv/config.h +++ b/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 From dc8d1c1ee26e175951fa20536916ada6945ecbf9 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 13:32:28 -0500 Subject: [PATCH 22/34] st: new maintainer. update to 0.7. --- st/.md5sum | 4 +- st/.signature | 8 ++-- st/Pkgfile | 24 +++++------ st/config.h | 111 ++++++++++++++++++++++++++++++++++++++++++-------- 4 files changed, 111 insertions(+), 36 deletions(-) diff --git a/st/.md5sum b/st/.md5sum index 2bbc2735f..bfc5bd574 100644 --- a/st/.md5sum +++ b/st/.md5sum @@ -1,2 +1,2 @@ -1bb9c3c6f0125f96e59e745f45359fa2 config.h -4f8ae2737120a8cba34b23c6020fe51e st-0.5.tar.gz +db080428894b5621e2532df9e69251f6 config.h +29b2a599cf1511c8062ed8f025c84c63 st-0.7.tar.gz diff --git a/st/.signature b/st/.signature index 1dfcf5019..30bcb409b 100644 --- a/st/.signature +++ b/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 diff --git a/st/Pkgfile b/st/Pkgfile index 2e1935f3a..b0a7af065 100644 --- a/st/Pkgfile +++ b/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} } diff --git a/st/config.h b/st/config.h index 58b470eb0..b41747f0d 100644 --- a/st/config.h +++ b/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{|}~"; + From 2c68f8bcd1f87d3ce4731a0cd4ac2e41913c9d75 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 14:23:21 -0500 Subject: [PATCH 23/34] abcde: new maintainer. update to 2.8.1. --- abcde/.footprint | 9 +++++---- abcde/.md5sum | 2 +- abcde/.signature | 8 ++++---- abcde/Pkgfile | 21 ++++++++++----------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/abcde/.footprint b/abcde/.footprint index 0eb52e68d..c3c47cc39 100644 --- a/abcde/.footprint +++ b/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 diff --git a/abcde/.md5sum b/abcde/.md5sum index ab24beac9..214992253 100644 --- a/abcde/.md5sum +++ b/abcde/.md5sum @@ -1 +1 @@ -d761c5a07854ce24748be9aa10100e74 abcde-2.5.4.tar.gz +29c9819f83615d71eda3489fd3fc5d43 abcde-2.8.1.tar.gz diff --git a/abcde/.signature b/abcde/.signature index 2dd1a73cc..ef23c1968 100644 --- a/abcde/.signature +++ b/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 diff --git a/abcde/Pkgfile b/abcde/Pkgfile index 29919991b..90c1c32dc 100644 --- a/abcde/Pkgfile +++ b/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 } From 91da3210bffbfb673d96dbef33d5b9d4545f9649 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 14:42:10 -0500 Subject: [PATCH 24/34] cd-discid: new maintainer. update to 1.4 --- cd-discid/.footprint | 7 ++++--- cd-discid/.md5sum | 2 +- cd-discid/.signature | 8 ++++---- cd-discid/Pkgfile | 14 +++++--------- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/cd-discid/.footprint b/cd-discid/.footprint index 56426f797..b659cd9e9 100644 --- a/cd-discid/.footprint +++ b/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 diff --git a/cd-discid/.md5sum b/cd-discid/.md5sum index 075c93236..afd030b30 100644 --- a/cd-discid/.md5sum +++ b/cd-discid/.md5sum @@ -1 +1 @@ -64677b8b63d1db0db015043f5455171a cd-discid_0.9.orig.tar.gz +85027b71d08fbbfb11ac2f0db6e8cea7 cd-discid-1.4.tar.gz diff --git a/cd-discid/.signature b/cd-discid/.signature index b987dd2f6..eda2e715d 100644 --- a/cd-discid/.signature +++ b/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 diff --git a/cd-discid/Pkgfile b/cd-discid/Pkgfile index 92b448b23..9a91794ce 100644 --- a/cd-discid/Pkgfile +++ b/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 } From aae8ab157f527e8fd6b70da580ffc21b28e69ace Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 15:04:40 -0500 Subject: [PATCH 25/34] surf: new maintainer. update config.h. --- surf/.md5sum | 2 +- surf/.signature | 6 +- surf/Pkgfile | 26 +++---- surf/config.h | 199 ++++++++++++++++++++++++++++++++---------------- 4 files changed, 152 insertions(+), 81 deletions(-) diff --git a/surf/.md5sum b/surf/.md5sum index 7fc4a2ce1..5005b2150 100644 --- a/surf/.md5sum +++ b/surf/.md5sum @@ -1,2 +1,2 @@ -15c2c911658e2e6085e4c4fa7a7b01c1 config.h +3d465f7f264e9394d0ba2d11e42a7dbb config.h 11713901fa83c536f3ddfacfc28c3acc surf-2.0.tar.gz diff --git a/surf/.signature b/surf/.signature index 17e62fa40..45c4eee8b 100644 --- a/surf/.signature +++ b/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 diff --git a/surf/Pkgfile b/surf/Pkgfile index 3c1a77566..504da4b98 100644 --- a/surf/Pkgfile +++ b/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 } diff --git a/surf/config.h b/surf/config.h index a221c86e3..6d3135ef4 100644 --- a/surf/config.h +++ b/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 }, +}; From b40905e35db3d183a76646400e84f7d4f61041ff Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 16:30:57 -0500 Subject: [PATCH 26/34] dwm: new maintainer. update to 6.1. --- dwm/.footprint | 7 ++++--- dwm/.md5sum | 4 ++-- dwm/.signature | 10 +++++----- dwm/Pkgfile | 16 +++++++--------- dwm/config.h | 28 ++++++++++++++++++---------- 5 files changed, 36 insertions(+), 29 deletions(-) diff --git a/dwm/.footprint b/dwm/.footprint index 20fa44097..7a67f902a 100644 --- a/dwm/.footprint +++ b/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 diff --git a/dwm/.md5sum b/dwm/.md5sum index 3826c7414..65084fce7 100644 --- a/dwm/.md5sum +++ b/dwm/.md5sum @@ -1,2 +1,2 @@ -2453e037f46449774ec8afab49b4f1a2 config.h -8bb00d4142259beb11e13473b81c0857 dwm-6.0.tar.gz +80c4ef2a3eca0fe2d14e2203e3833200 config.h +f0b6b1093b7207f89c2a90b848c008ec dwm-6.1.tar.gz diff --git a/dwm/.signature b/dwm/.signature index 1aba3499b..9159fe5fc 100644 --- a/dwm/.signature +++ b/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 +RWSagIOpLGJF36TbjNxZpEKgjPYfAtwV0EWDJtQoX4k8Lof5kWl0WJTu6NI7kEiriwIPKwKDTwKBg6NxIOPybycM4zlmYz6bNgA= +SHA256 (Pkgfile) = 07f70881ebae41133271cd188d09890fbcdc41f51a948b821b64aaac4a16d471 +SHA256 (.footprint) = 5fafc2be3ed213723d4401d9318b376ceeae5c7ab3a2ab885c9ab13be1c154a6 +SHA256 (dwm-6.1.tar.gz) = c2f6c56167f0acdbe3dc37cca9c1a19260c040f2d4800e3529a21ad7cce275fe +SHA256 (config.h) = 5a7f0769943de1fba30dd8dbeff173c6bdae010ff2716a4d7c231e7f586df4e6 diff --git a/dwm/Pkgfile b/dwm/Pkgfile index c7e74c296..a7dc45117 100644 --- a/dwm/Pkgfile +++ b/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 +version=6.1 release=1 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 } diff --git a/dwm/config.h b/dwm/config.h index 77ff35805..7054c06dd 100644 --- a/dwm/config.h +++ b/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 */ From adab30f2514d7b1d245f40135980d078156da059 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 16:40:00 -0500 Subject: [PATCH 27/34] libquvi-scripts: new maintainer. fix mandir. --- libquvi-scripts/.footprint | 6 +++--- libquvi-scripts/.signature | 6 +++--- libquvi-scripts/Pkgfile | 21 +++++++++++++-------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/libquvi-scripts/.footprint b/libquvi-scripts/.footprint index d4f0c7c03..f81ccb4c9 100644 --- a/libquvi-scripts/.footprint +++ b/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 diff --git a/libquvi-scripts/.signature b/libquvi-scripts/.signature index d09ec5f1d..71c69b4c2 100644 --- a/libquvi-scripts/.signature +++ b/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 +RWSagIOpLGJF33UWA+b9Ln0ia7odpFs9QMPtxqcs06rre+fZlHEWUA2IezG3USUkJdRSKAzVyKZNZU0gQ5C4FEosmZfp65Jn9A4= +SHA256 (Pkgfile) = 7aa6250e0828915cb6e791afe02084420c376311408149bca6d12ba068bbd5c8 +SHA256 (.footprint) = 69bec42fd59673ce88cbbcf312ab8b52c7cb63f2b106f8b27ba2796033faebf8 SHA256 (libquvi-scripts-0.4.21.tar.xz) = 7c02cc86ac25334892d08bbc31251d78a55ee2a16d57dfa2bda7ac657c8e0f34 diff --git a/libquvi-scripts/Pkgfile b/libquvi-scripts/Pkgfile index 2e9bb9fa0..26167979b 100644 --- a/libquvi-scripts/Pkgfile +++ b/libquvi-scripts/Pkgfile @@ -1,7 +1,7 @@ # 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 @@ -9,10 +9,15 @@ release=1 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) } From 68e5c2c62b17018f380fe17c95cec8e58c57c6d7 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 16:44:35 -0500 Subject: [PATCH 28/34] libquvi: new maintainer. fix mandir. --- libquvi/.footprint | 7 ++++--- libquvi/.signature | 6 +++--- libquvi/Pkgfile | 13 +++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/libquvi/.footprint b/libquvi/.footprint index 33eb650d2..a1b65e9b3 100644 --- a/libquvi/.footprint +++ b/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 diff --git a/libquvi/.signature b/libquvi/.signature index 7bf896e95..fccf79153 100644 --- a/libquvi/.signature +++ b/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 +RWSagIOpLGJF39fXSgctxsC+PqSGOgRQGYwKJGyF2c1Q8y91ockkkMyJhNypN7EA1ikhE5EUHr9WhKAW2qM13DWah7S97iNBnAw= +SHA256 (Pkgfile) = a90592615bc05b390ef93a126d59515838ecc78e488e544932dcc2ada4aa6536 +SHA256 (.footprint) = e3201936dfd81a80931829b87b3499944ef33fa99a3966acce227751c1f938ba SHA256 (libquvi-0.4.1.tar.xz) = b5862f7e5fa6ed7defd169adb5c7586c6406af86e029671fd09615f6eb7aa903 diff --git a/libquvi/Pkgfile b/libquvi/Pkgfile index 8f8ea5e8b..dcf983f2d 100644 --- a/libquvi/Pkgfile +++ b/libquvi/Pkgfile @@ -1,6 +1,6 @@ # 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 @@ -9,9 +9,10 @@ release=1 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 } From 84936de13255aa8c80ec319529bb717526d8f495 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 16:48:12 -0500 Subject: [PATCH 29/34] quvi: new maintainer. fix mandir. --- quvi/.footprint | 7 ++++--- quvi/.signature | 6 +++--- quvi/Pkgfile | 15 ++++++++------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/quvi/.footprint b/quvi/.footprint index 6c435ca7d..498954f97 100644 --- a/quvi/.footprint +++ b/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 diff --git a/quvi/.signature b/quvi/.signature index 266bed154..fb2ece71f 100644 --- a/quvi/.signature +++ b/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 diff --git a/quvi/Pkgfile b/quvi/Pkgfile index 7ecf46707..310133e7e 100644 --- a/quvi/Pkgfile +++ b/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 } From a16f5806e78ac97095127711fe87b26dcc900454 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 16:49:27 -0500 Subject: [PATCH 30/34] libquvi-scripts: bump release --- libquvi-scripts/.signature | 4 ++-- libquvi-scripts/Pkgfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libquvi-scripts/.signature b/libquvi-scripts/.signature index 71c69b4c2..4ff37209a 100644 --- a/libquvi-scripts/.signature +++ b/libquvi-scripts/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33UWA+b9Ln0ia7odpFs9QMPtxqcs06rre+fZlHEWUA2IezG3USUkJdRSKAzVyKZNZU0gQ5C4FEosmZfp65Jn9A4= -SHA256 (Pkgfile) = 7aa6250e0828915cb6e791afe02084420c376311408149bca6d12ba068bbd5c8 +RWSagIOpLGJF3xCGRp3U1lOp1O4AEH8GgHaJ8+3JdRtVM0GEM/JGVuW6p+JXeWCaJDTGSJd4zJyMg9UVgTFHp+YqnAJhxz4Pewo= +SHA256 (Pkgfile) = 03e191466b168cbfdde365005f26d94b54ebdbd0c0e230fd6418c8d87cb5d2c1 SHA256 (.footprint) = 69bec42fd59673ce88cbbcf312ab8b52c7cb63f2b106f8b27ba2796033faebf8 SHA256 (libquvi-scripts-0.4.21.tar.xz) = 7c02cc86ac25334892d08bbc31251d78a55ee2a16d57dfa2bda7ac657c8e0f34 diff --git a/libquvi-scripts/Pkgfile b/libquvi-scripts/Pkgfile index 26167979b..231ce11d4 100644 --- a/libquvi-scripts/Pkgfile +++ b/libquvi-scripts/Pkgfile @@ -5,7 +5,7 @@ name=libquvi-scripts version=0.4.21 -release=1 +release=2 source=(http://downloads.sourceforge.net/sourceforge/quvi/$name-$version.tar.xz) build () { From 3114c57201e94b62ce27ceffee8713532c6ca1ce Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 16:50:28 -0500 Subject: [PATCH 31/34] libquvi: bump release --- libquvi/.signature | 4 ++-- libquvi/Pkgfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libquvi/.signature b/libquvi/.signature index fccf79153..716a4b030 100644 --- a/libquvi/.signature +++ b/libquvi/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39fXSgctxsC+PqSGOgRQGYwKJGyF2c1Q8y91ockkkMyJhNypN7EA1ikhE5EUHr9WhKAW2qM13DWah7S97iNBnAw= -SHA256 (Pkgfile) = a90592615bc05b390ef93a126d59515838ecc78e488e544932dcc2ada4aa6536 +RWSagIOpLGJF3zOSLnw2gUN3Ksi4jdb7m4ip2ExEqauh+BFRznMc91iciB3kAeHM1cPWGS5pUXEJqMbt0Ua4AkKOZETqGaD/WAw= +SHA256 (Pkgfile) = 57ecf82a43cb3e6d0501d56327c933a8981fa0d270429ae60231f5e352fefb99 SHA256 (.footprint) = e3201936dfd81a80931829b87b3499944ef33fa99a3966acce227751c1f938ba SHA256 (libquvi-0.4.1.tar.xz) = b5862f7e5fa6ed7defd169adb5c7586c6406af86e029671fd09615f6eb7aa903 diff --git a/libquvi/Pkgfile b/libquvi/Pkgfile index dcf983f2d..82f0da8ce 100644 --- a/libquvi/Pkgfile +++ b/libquvi/Pkgfile @@ -5,7 +5,7 @@ name=libquvi version=0.4.1 -release=1 +release=2 source=(http://downloads.sourceforge.net/sourceforge/quvi/$name-$version.tar.xz) build () { From fb7d250215a9a22007eab6b03608df94715c4a4b Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 16:54:27 -0500 Subject: [PATCH 32/34] wmname: new maintainer --- wmname/.signature | 4 ++-- wmname/Pkgfile | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wmname/.signature b/wmname/.signature index efcd480a3..6e65157de 100644 --- a/wmname/.signature +++ b/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 diff --git a/wmname/Pkgfile b/wmname/Pkgfile index 25b3a8cb4..f8fb8963f 100644 --- a/wmname/Pkgfile +++ b/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 } From 4cdc10c78a6e4ab02a0eea5a4a22bf33de937a88 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 16:58:12 -0500 Subject: [PATCH 33/34] xssstate: new maintainer. fix mandir. --- xssstate/.footprint | 7 ++++--- xssstate/.signature | 6 +++--- xssstate/Pkgfile | 16 +++++++--------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/xssstate/.footprint b/xssstate/.footprint index 2fe23bf09..36b13c3d6 100644 --- a/xssstate/.footprint +++ b/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 diff --git a/xssstate/.signature b/xssstate/.signature index 41d51b6ba..73a649c6e 100644 --- a/xssstate/.signature +++ b/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 diff --git a/xssstate/Pkgfile b/xssstate/Pkgfile index 3f44accee..5dc80a6df 100644 --- a/xssstate/Pkgfile +++ b/xssstate/Pkgfile @@ -1,19 +1,17 @@ # Description: A simple tool to retrieve the X screensaver state. # URL: http://tools.suckless.org/xssstate -# Maintainer: Maximilian Dietrich, dxm at openmailbox dot org +# Maintainer: John Vogel, jvogel4 at stny dot rr dot com # Depends on: xorg-libxscrnsaver name=xssstate version=1.1 -release=2 +release=3 source=(http://dl.suckless.org/tools/$name-$version.tar.gz) build () { - cd $name-$version - make - make DESTDIR=$PKG \ - PREFIX=/usr \ - MANPREFIX=/usr/man \ - install - #install -D -m 755 $SRC/$name-$version/xsidle.sh $PKG/usr/bin/xsidle.sh + cd $name-$version + + make CC=gcc + make DESTDIR=$PKG PREFIX=/usr install + #install -D -m 755 $SRC/$name-$version/xsidle.sh $PKG/usr/bin/xsidle.sh } From b3fbb535b4d7277c96be17dc4282c97799390fb3 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Sun, 18 Feb 2018 17:34:29 -0500 Subject: [PATCH 34/34] dwm: bump release --- dwm/.signature | 4 ++-- dwm/Pkgfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dwm/.signature b/dwm/.signature index 9159fe5fc..8a2f24972 100644 --- a/dwm/.signature +++ b/dwm/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36TbjNxZpEKgjPYfAtwV0EWDJtQoX4k8Lof5kWl0WJTu6NI7kEiriwIPKwKDTwKBg6NxIOPybycM4zlmYz6bNgA= -SHA256 (Pkgfile) = 07f70881ebae41133271cd188d09890fbcdc41f51a948b821b64aaac4a16d471 +RWSagIOpLGJF35fcEaw6bHwS4syTYqQEWBu1xNTk5vz/Cr/CJElT+0to/DOG1KGrIrxXuqr+f5tj+uIdO9avFEMamy6hVrx7egw= +SHA256 (Pkgfile) = dd1c7771ca773b4f877f2d8b2a2affb8becf8c38676e16192b84fc992b9e9451 SHA256 (.footprint) = 5fafc2be3ed213723d4401d9318b376ceeae5c7ab3a2ab885c9ab13be1c154a6 SHA256 (dwm-6.1.tar.gz) = c2f6c56167f0acdbe3dc37cca9c1a19260c040f2d4800e3529a21ad7cce275fe SHA256 (config.h) = 5a7f0769943de1fba30dd8dbeff173c6bdae010ff2716a4d7c231e7f586df4e6 diff --git a/dwm/Pkgfile b/dwm/Pkgfile index a7dc45117..ff3d2213b 100644 --- a/dwm/Pkgfile +++ b/dwm/Pkgfile @@ -5,7 +5,7 @@ name=dwm version=6.1 -release=1 +release=2 source=(http://dl.suckless.org/dwm/$name-$version.tar.gz config.h) build () {