Browse Source

Merge remote-tracking branch 'freebsd/master'

* freebsd/master:
  games/cursive: Update to 0.11,1 and set MAINTAINER
  games/devilutionX: Update to 1.0.1
  Unbreak by making fetchable again. This necessitates updating from 3.3.0 to 3.3.3 in order to make fetchable again.
  Update to 3.19
  Make fetchable again.
  Upgrade dnsdbq to version 2.1.0:
  Fix wrong license information it is MIT not ISCL
  New port: x11/showkeys
  Improve RELRO description
  Update to 0.10.18
  fix the www link
  Update to 20200320
  - Update to 1.14.1 - Add missing RUN_DEPENDS - Update WWW
  A Python implementation of the SCRAM authentication protocol defined by RFC 5802 and RFC 7677. Scramp supports the following mechanisms:   * SCRAM-SHA-256   * SCRAM-SHA-1
  audio/spotify-tui: Update to 0.17.0
master
HardenedBSD Sync Service 4 months ago
parent
commit
955ef26a1c
42 changed files with 220 additions and 237 deletions
  1. +5
    -5
      audio/spotify-tui/Makefile
  2. +11
    -11
      audio/spotify-tui/distinfo
  3. +1
    -1
      benchmarks/fio/Makefile
  4. +3
    -3
      benchmarks/fio/distinfo
  5. +3
    -2
      databases/py-pg8000/Makefile
  6. +3
    -3
      databases/py-pg8000/distinfo
  7. +1
    -1
      databases/py-pg8000/pkg-descr
  8. +1
    -1
      devel/binutils/Makefile
  9. +3
    -5
      dns/dnsdbq/Makefile
  10. +3
    -3
      dns/dnsdbq/distinfo
  11. +14
    -3
      games/cursive/Makefile
  12. +3
    -2
      games/cursive/distinfo
  13. +0
    -23
      games/cursive/files/patch-Makefile
  14. +0
    -11
      games/cursive/files/patch-cursive.6
  15. +0
    -11
      games/cursive/files/patch-cursive.c
  16. +2
    -0
      games/cursive/pkg-descr
  17. +1
    -1
      games/devilutionX/Makefile
  18. +3
    -3
      games/devilutionX/distinfo
  19. +9
    -1
      games/devilutionX/files/patch-3rdParty_StormLib_src_StormPort.h
  20. +7
    -4
      games/devilutionX/files/patch-CMakeLists.txt
  21. +8
    -11
      games/devilutionX/files/patch-Packaging_fedora_devilutionx.desktop
  22. +1
    -2
      mail/neomutt/Makefile
  23. +3
    -3
      mail/neomutt/distinfo
  24. +0
    -104
      mail/neomutt/files/indent-sidebar.patch
  25. +1
    -1
      mail/neomutt/pkg-descr
  26. +4
    -7
      mail/vacation/Makefile
  27. +3
    -2
      mail/vacation/distinfo
  28. +1
    -0
      security/Makefile
  29. +1
    -4
      security/cops/Makefile
  30. +19
    -0
      security/py-scramp/Makefile
  31. +3
    -0
      security/py-scramp/distinfo
  32. +6
    -0
      security/py-scramp/pkg-descr
  33. +1
    -1
      textproc/libdiff/Makefile
  34. +1
    -5
      www/kcgi/Makefile
  35. +3
    -3
      www/kcgi/distinfo
  36. +6
    -0
      www/kcgi/pkg-plist
  37. +1
    -0
      x11/Makefile
  38. +28
    -0
      x11/showkeys/Makefile
  39. +3
    -0
      x11/showkeys/distinfo
  40. +28
    -0
      x11/showkeys/files/patch-Makefile
  41. +10
    -0
      x11/showkeys/files/patch-keystack.c
  42. +16
    -0
      x11/showkeys/pkg-descr

+ 5
- 5
audio/spotify-tui/Makefile View File

@@ -2,7 +2,7 @@

PORTNAME= spotify-tui
DISTVERSIONPREFIX= v
DISTVERSION= 0.16.0
DISTVERSION= 0.17.0
CATEGORIES= audio

MAINTAINER= vulcan@wired.sh
@@ -146,7 +146,7 @@ CARGO_CRATES= aho-corasick-0.7.6 \
quote-0.6.13 \
quote-1.0.2 \
rand-0.6.5 \
rand-0.7.2 \
rand-0.7.3 \
rand_chacha-0.1.1 \
rand_chacha-0.2.1 \
rand_core-0.3.1 \
@@ -176,8 +176,8 @@ CARGO_CRATES= aho-corasick-0.7.6 \
scopeguard-1.0.0 \
security-framework-0.3.4 \
security-framework-sys-0.3.3 \
serde-1.0.104 \
serde_derive-1.0.104 \
serde-1.0.105 \
serde_derive-1.0.105 \
serde_json-1.0.48 \
serde_urlencoded-0.6.1 \
serde_yaml-0.8.11 \
@@ -197,7 +197,7 @@ CARGO_CRATES= aho-corasick-0.7.6 \
textwrap-0.11.0 \
thread_local-0.3.6 \
time-0.1.42 \
tokio-0.2.11 \
tokio-0.2.13 \
tokio-macros-0.2.5 \
tokio-socks-0.2.0 \
tokio-tls-0.3.0 \

+ 11
- 11
audio/spotify-tui/distinfo View File

@@ -1,4 +1,4 @@
TIMESTAMP = 1584049981
TIMESTAMP = 1584912963
SHA256 (rust/crates/aho-corasick-0.7.6.tar.gz) = 58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d
SIZE (rust/crates/aho-corasick-0.7.6.tar.gz) = 108953
SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
@@ -259,8 +259,8 @@ SHA256 (rust/crates/quote-1.0.2.tar.gz) = 053a8c8bcc71fcce321828dc897a98ab9760be
SIZE (rust/crates/quote-1.0.2.tar.gz) = 23023
SHA256 (rust/crates/rand-0.6.5.tar.gz) = 6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca
SIZE (rust/crates/rand-0.6.5.tar.gz) = 104814
SHA256 (rust/crates/rand-0.7.2.tar.gz) = 3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412
SIZE (rust/crates/rand-0.7.2.tar.gz) = 111438
SHA256 (rust/crates/rand-0.7.3.tar.gz) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
SIZE (rust/crates/rand-0.7.3.tar.gz) = 112246
SHA256 (rust/crates/rand_chacha-0.1.1.tar.gz) = 556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef
SIZE (rust/crates/rand_chacha-0.1.1.tar.gz) = 11703
SHA256 (rust/crates/rand_chacha-0.2.1.tar.gz) = 03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853
@@ -319,10 +319,10 @@ SHA256 (rust/crates/security-framework-0.3.4.tar.gz) = 8ef2429d7cefe5fd28bd1d2ed
SIZE (rust/crates/security-framework-0.3.4.tar.gz) = 48568
SHA256 (rust/crates/security-framework-sys-0.3.3.tar.gz) = e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895
SIZE (rust/crates/security-framework-sys-0.3.3.tar.gz) = 9554
SHA256 (rust/crates/serde-1.0.104.tar.gz) = 414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449
SIZE (rust/crates/serde-1.0.104.tar.gz) = 73258
SHA256 (rust/crates/serde_derive-1.0.104.tar.gz) = 128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64
SIZE (rust/crates/serde_derive-1.0.104.tar.gz) = 49658
SHA256 (rust/crates/serde-1.0.105.tar.gz) = e707fbbf255b8fc8c3b99abb91e7257a622caeb20a9818cbadbeeede4e0932ff
SIZE (rust/crates/serde-1.0.105.tar.gz) = 73358
SHA256 (rust/crates/serde_derive-1.0.105.tar.gz) = ac5d00fc561ba2724df6758a17de23df5914f20e41cb00f94d5b7ae42fffaff8
SIZE (rust/crates/serde_derive-1.0.105.tar.gz) = 49700
SHA256 (rust/crates/serde_json-1.0.48.tar.gz) = 9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25
SIZE (rust/crates/serde_json-1.0.48.tar.gz) = 72113
SHA256 (rust/crates/serde_urlencoded-0.6.1.tar.gz) = 9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97
@@ -361,8 +361,8 @@ SHA256 (rust/crates/thread_local-0.3.6.tar.gz) = c6b53e329000edc2b34dbe8545fd20e
SIZE (rust/crates/thread_local-0.3.6.tar.gz) = 12388
SHA256 (rust/crates/time-0.1.42.tar.gz) = db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f
SIZE (rust/crates/time-0.1.42.tar.gz) = 30005
SHA256 (rust/crates/tokio-0.2.11.tar.gz) = 8fdd17989496f49cdc57978c96f0c9fe5e4a58a8bddc6813c449a4624f6a030b
SIZE (rust/crates/tokio-0.2.11.tar.gz) = 336368
SHA256 (rust/crates/tokio-0.2.13.tar.gz) = 0fa5e81d6bc4e67fe889d5783bd2a128ab2e0cfa487e0be16b6a8d177b101616
SIZE (rust/crates/tokio-0.2.13.tar.gz) = 355464
SHA256 (rust/crates/tokio-macros-0.2.5.tar.gz) = f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389
SIZE (rust/crates/tokio-macros-0.2.5.tar.gz) = 5831
SHA256 (rust/crates/tokio-socks-0.2.0.tar.gz) = 45a756c74d51f7a835277695059aed2bc7399978eb1230dd8b2989cbb5e9e392
@@ -453,5 +453,5 @@ SHA256 (rust/crates/xcb-0.8.2.tar.gz) = 5e917a3f24142e9ff8be2414e36c649d47d6cc2b
SIZE (rust/crates/xcb-0.8.2.tar.gz) = 129071
SHA256 (rust/crates/yaml-rust-0.4.3.tar.gz) = 65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d
SIZE (rust/crates/yaml-rust-0.4.3.tar.gz) = 45768
SHA256 (Rigellute-spotify-tui-v0.16.0_GH0.tar.gz) = f47538ffeddf10ef3247ca5b307e405d2068b4e10b62489b9d9aaac2ed0ed2a8
SIZE (Rigellute-spotify-tui-v0.16.0_GH0.tar.gz) = 554958
SHA256 (Rigellute-spotify-tui-v0.17.0_GH0.tar.gz) = 5e8c5d0581d01a0bd1bbed1e97a2603adc600e9f3f932f939e371fcbb2a2031e
SIZE (Rigellute-spotify-tui-v0.17.0_GH0.tar.gz) = 556165

+ 1
- 1
benchmarks/fio/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= fio
PORTVERSION= 3.18
PORTVERSION= 3.19
CATEGORIES= benchmarks
MASTER_SITES= http://brick.kernel.dk/snaps/


+ 3
- 3
benchmarks/fio/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1580978738
SHA256 (fio-3.18.tar.bz2) = cb70c311e8039ea61c50188fad39b4e8e0586593544a8e639bd4030b01899f8b
SIZE (fio-3.18.tar.bz2) = 902218
TIMESTAMP = 1585069321
SHA256 (fio-3.19.tar.bz2) = 4b6db7eaee26d6fd33bf210eb73b6d37f5d45adcc88726866ad030565f3ccc06
SIZE (fio-3.19.tar.bz2) = 902391

+ 3
- 2
databases/py-pg8000/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= pg8000
PORTVERSION= 1.13.2
PORTVERSION= 1.14.1
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,8 @@ COMMENT= Pure-Python Interface to the PostgreSQL Database

LICENSE= BSD3CLAUSE

RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=0:security/py-passlib@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=0:security/py-passlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}scramp>=0:security/py-scramp@${PY_FLAVOR}

USES= python:3.5+
USE_PYTHON= autoplist distutils

+ 3
- 3
databases/py-pg8000/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1562143981
SHA256 (pg8000-1.13.2.tar.gz) = eebcb4176a7e407987e525a07454882f611985e0becb2b73f76efb93bbdc0aab
SIZE (pg8000-1.13.2.tar.gz) = 55835
TIMESTAMP = 1585039551
SHA256 (pg8000-1.14.1.tar.gz) = 7e87f5ec51eab2bb1f2a75a687b681152d60ec26828c93c244f00d5d085da64a
SIZE (pg8000-1.14.1.tar.gz) = 73626

+ 1
- 1
databases/py-pg8000/pkg-descr View File

@@ -6,4 +6,4 @@ external libraries (such as a compiled python module, or
PostgreSQL's libpq library). pg8000 supports the standard
Python DB-API version 2.0.

WWW: https://github.com/mfenniak/pg8000
WWW: https://github.com/tlocke/pg8000

+ 1
- 1
devel/binutils/Makefile View File

@@ -31,7 +31,7 @@ TEST_TARGET= check
OPTIONS_DEFINE= NLS STATIC
STATIC_PREVENTS= NLS

RELRO_DESC= enable -z relro in ELF linker by default
RELRO_DESC= Enable relocation memory corruption mitigation (-z relro) by default

LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING3
LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING3.LIB

+ 3
- 5
dns/dnsdbq/Makefile View File

@@ -1,17 +1,15 @@
# $FreeBSD$

PORTNAME= dnsdbq
PORTVERSION= 1.5.0
PORTVERSION= 2.1.0
DISTVERSIONPREFIX= v
CATEGORIES= dns

MAINTAINER= truckman@FreeBSD.org
COMMENT= DNSDB API Client, C Version

LICENSE= APACHE20 ISCL
LICENSE_COMB= multi
LICENSE= APACHE20
LICENSE_FILE_APACHE20= ${WRKSRC}/Apache-2.0
LICENSE_FILE_ISCL= ${WRKSRC}/ISC

LIB_DEPENDS= libjansson.so:devel/jansson \
libcurl.so:ftp/curl
@@ -20,7 +18,7 @@ USES= compiler:c11 localbase
USE_GITHUB= yes
GH_ACCOUNT= dnsdb

PORTSCOUT= limit:^1
PORTSCOUT= limit:^[0-9]*\.[0-9]*\.[0-9]*$$

do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/

+ 3
- 3
dns/dnsdbq/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1576787497
SHA256 (dnsdb-dnsdbq-v1.5.0_GH0.tar.gz) = 89a1696aaf1faa317b870205025eea88489caaa64c59d719cbd995793edc9348
SIZE (dnsdb-dnsdbq-v1.5.0_GH0.tar.gz) = 34371
TIMESTAMP = 1585028449
SHA256 (dnsdb-dnsdbq-v2.1.0_GH0.tar.gz) = bfc1bf01c12d4631cbb8f141dfba7c038c627a0a3baee608fc254b92d9f85462
SIZE (dnsdb-dnsdbq-v2.1.0_GH0.tar.gz) = 40930

+ 14
- 3
games/cursive/Makefile View File

@@ -2,18 +2,29 @@
# $FreeBSD$

PORTNAME= cursive
PORTVERSION= 1.0
PORTVERSION= 0.11
PORTEPOCH= 1
CATEGORIES= games
MASTER_SITES= ftp://puck.nether.net/pub/janc/
MASTER_SITES= https://www.unixpapa.com/software/
DISTNAME= ${PORTNAME}

MAINTAINER= ports@FreeBSD.org
MAINTAINER= ed.arrakis@gmail.com
COMMENT= Create ASCII character cursive handwriting

USES= tar:tgz
NO_WRKSUBDIR= yes

PLIST_FILES= bin/cursive \
man/man6/cursive.6.gz

post-patch:
@${REINPLACE_CMD} -e 's|/usr/games/||g' ${WRKSRC}/cursive.6

do-build:
${CC} ${CFLAGS} -c ${WRKSRC}/cursive.c -o ${WRKSRC}/cursive.o
${CC} ${CFLAGS} -c ${WRKSRC}/font.c -o ${WRKSRC}/font.o
${CC} ${CFLAGS} -o ${WRKSRC}/cursive ${WRKSRC}/cursive.o ${WRKSRC}/font.o

do-install:
${INSTALL_PROGRAM} ${WRKSRC}/cursive ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/cursive.6 ${STAGEDIR}${PREFIX}/man/man6

+ 3
- 2
games/cursive/distinfo View File

@@ -1,2 +1,3 @@
SHA256 (cursive.tgz) = a76238f9f0b52ecddf2011fad801ba5cc01a14f2a518b05edb07dcba9699ef40
SIZE (cursive.tgz) = 11207
TIMESTAMP = 1582636072
SHA256 (cursive.tgz) = f7068552689e753df6b4f546f0cfa69fa4e689487ce4eb1f0766b5751105e4ae
SIZE (cursive.tgz) = 7129

+ 0
- 23
games/cursive/files/patch-Makefile View File

@@ -1,23 +0,0 @@
--- Makefile.old Sun Oct 20 01:13:47 1991
+++ Makefile Thu Apr 4 08:24:44 2002
@@ -1,7 +1,9 @@
-CFLAGS = -g
+CFLAGS += -g
+
+all: cursive
cursive: cursive.o x.o xs.o
- cc -g -o cursive cursive.o x.o xs.o
+ ${CC} -g -o cursive cursive.o x.o xs.o
x.c: font.c
xstr font.c
@@ -13,7 +15,7 @@
# the same, but is slightly bigger.
lcursive: cursive.o font.o
- cc -g -o lcursive cursive.o font.o
+ ${CC} -g -o lcursive cursive.o font.o
cursive.shar: cursive.c font.c cursive.h cursive.6 Makefile shar
shar cursive.c font.c cursive.h cursive.6 Makefile shar > cursive.shar

+ 0
- 11
games/cursive/files/patch-cursive.6 View File

@@ -1,11 +0,0 @@
--- cursive.6.orig Sat Dec 4 17:31:42 1999
+++ cursive.6 Sat Dec 4 17:32:03 1999
@@ -3,7 +3,7 @@
.SH NAME
cursive \- print text in cursive script
.SH SYNOPSIS
-.B /usr/games/cursive
+.B cursive
[
.BI \-i n
]

+ 0
- 11
games/cursive/files/patch-cursive.c View File

@@ -1,11 +0,0 @@
--- cursive.c.orig Sat Dec 4 17:20:55 1999
+++ cursive.c Sat Dec 4 17:21:32 1999
@@ -128,7 +128,7 @@
else
{
/* Message from standard input */
- while (gets(message) != NULL)
+ while (fgets(message, sizeof(message), stdin) != NULL)
prline(message);
}
}

+ 2
- 0
games/cursive/pkg-descr View File

@@ -9,3 +9,5 @@ Cursive is a program for generating cursive signatures and text like
Do not be fooled by inferior immitations (like the figlet font which
doesn't connect letters right). This is the one and only original
cursive program.

WWW: https://www.unixpapa.com/cursive.html

+ 1
- 1
games/devilutionX/Makefile View File

@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= devilutionX
PORTVERSION= 1.0.0
PORTVERSION= 1.0.1
CATEGORIES= games

MAINTAINER= benny.goemans@gmail.com

+ 3
- 3
games/devilutionX/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1577908977
SHA256 (diasurgical-devilutionX-1.0.0_GH0.tar.gz) = fafb0bac935bbbee8e261d7fbd2d4ea769b88bbc78ba1affef74064a2cc77779
SIZE (diasurgical-devilutionX-1.0.0_GH0.tar.gz) = 1798349
TIMESTAMP = 1583844955
SHA256 (diasurgical-devilutionX-1.0.1_GH0.tar.gz) = 165564fefdbfd0b4fbf74688ea1beb1d811eb1d8e200b9faad5b70ae2ac7564e
SIZE (diasurgical-devilutionX-1.0.1_GH0.tar.gz) = 2005920

+ 9
- 1
games/devilutionX/files/patch-3rdParty_StormLib_src_StormPort.h View File

@@ -1,4 +1,4 @@
--- 3rdParty/StormLib/src/StormPort.h.orig 2019-10-11 11:58:58 UTC
--- 3rdParty/StormLib/src/StormPort.h.orig 2020-03-10 14:00:26 UTC
+++ 3rdParty/StormLib/src/StormPort.h
@@ -165,6 +165,7 @@
#include <ctype.h>
@@ -6,5 +6,13 @@
#include <errno.h>
+ #include <strings.h>
#ifndef __BIG_ENDIAN__
#define PLATFORM_LITTLE_ENDIAN
@@ -193,6 +194,7 @@
#include <ctype.h>
#include <assert.h>
#include <errno.h>
+ #include <strings.h>
#ifndef __BIG_ENDIAN__
#define PLATFORM_LITTLE_ENDIAN

+ 7
- 4
games/devilutionX/files/patch-CMakeLists.txt View File

@@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2019-12-27 15:25:22 UTC
--- CMakeLists.txt.orig 2020-03-10 14:00:26 UTC
+++ CMakeLists.txt
@@ -326,7 +326,7 @@ if(WIN32)
@@ -491,7 +491,7 @@ if(WIN32)
endif()
endif()
@@ -9,7 +9,7 @@
# Enable POSIX extensions such as `readlink` and `ftruncate`.
add_definitions(-D_POSIX_C_SOURCE=200809L)
endif()
@@ -337,8 +337,8 @@ endif()
@@ -502,8 +502,8 @@ endif()
if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
# Change __FILE__ to only show the path relative to the project folder
@@ -20,7 +20,7 @@
if(DEBUG)
# Note: For Valgrind suppor.
@@ -399,3 +399,9 @@ if(APPLE)
@@ -564,6 +564,12 @@ if(APPLE)
include(CPack)
endif()
@@ -30,3 +30,6 @@
+install(FILES Packaging/resources/16.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/16x16/apps RENAME devilutionx.png)
+install(FILES Packaging/resources/Diablo_32.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/32x32/apps RENAME devilutionx.png)
+install(FILES Packaging/resources/Diablo_48.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/48x48/apps RENAME devilutionx.png)
if(SWITCH)
set(APP_TITLE "DevilutionX")

+ 8
- 11
games/devilutionX/files/patch-Packaging_fedora_devilutionx.desktop View File

@@ -1,18 +1,15 @@
--- Packaging/fedora/devilutionx.desktop.orig 2019-12-27 16:29:35 UTC
--- Packaging/fedora/devilutionx.desktop.orig 2020-03-09 00:37:54 UTC
+++ Packaging/fedora/devilutionx.desktop
@@ -1,11 +1,11 @@
@@ -1,9 +1,9 @@
[Desktop Entry]
-Name=devilutionX
+Name=DevilutionX
Name=devilutionX
GenericName=DevilutionX
-Comment=Play Diablo I on Linux
-Comment[da]=Spil Diablo I på Linux
-Comment[hr]=Igrajte Diablo I na Linuxu
+Comment=Play Diablo I
+Comment[da]=Spil Diablo I
+Comment[hr]=Igrajte Diablo I
Exec=devilutionx
-Icon=devilutionx.png
+Icon=devilutionx
Icon=devilutionx.png
Terminal=false
Type=Application
X-DCOP-ServiceType=Multi
X-KDE-StartupNotify=true
-Categories=Qt;Game;RolePlaying;
+Categories=Game;RolePlaying;

+ 1
- 2
mail/neomutt/Makefile View File

@@ -1,8 +1,7 @@
# $FreeBSD$

PORTNAME= neomutt
PORTVERSION= 20200313
PORTREVISION= 1
PORTVERSION= 20200320
CATEGORIES= mail

MAINTAINER= bapt@FreeBSD.org

+ 3
- 3
mail/neomutt/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1584350770
SHA256 (neomutt-neomutt-20200313_GH0.tar.gz) = b5ff780506a5371f737f32afd694857568e8827b1c391e0aca27c66687019e85
SIZE (neomutt-neomutt-20200313_GH0.tar.gz) = 3295200
TIMESTAMP = 1585065378
SHA256 (neomutt-neomutt-20200320_GH0.tar.gz) = 69daf2e0633dee7e8bdba74ab714adfa70e8f078028b56d612228c2aa836aafa
SIZE (neomutt-neomutt-20200320_GH0.tar.gz) = 3304719

+ 0
- 104
mail/neomutt/files/indent-sidebar.patch View File

@@ -1,104 +0,0 @@
From a7f602f120788bb8501cba46e9de6cf9de35a742 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Sun, 15 Mar 2020 17:12:58 +0000
Subject: [PATCH] fix sidebar indent

Take care when comparing "$folder" against an IMAP Mailbox path
(the `user@` may not be present on both sides).

Fixes: #2173
Fixes: #2175
---
sidebar.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 56 insertions(+), 4 deletions(-)

diff --git a/sidebar.c b/sidebar.c
index 199fa7df0b..1f0943371a 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -36,6 +36,7 @@
#include <string.h>
#include "mutt/lib.h"
#include "config/lib.h"
+#include "email/lib.h"
#include "core/lib.h"
#include "gui/lib.h"
#include "sidebar.h"
@@ -833,6 +834,48 @@ static void fill_empty_space(struct MuttWindow *win, int first_row,
}
}
+/**
+ * imap_is_prefix - Check if folder matches the beginning of mbox
+ * @param folder Folder
+ * @param mbox Mailbox path
+ * @param plen Prefix length
+ * @retval true If folder is the prefix of mbox
+ */
+static bool imap_is_prefix(const char *folder, const char *mbox, size_t *plen)
+{
+ struct Url *url_m = url_parse(mbox);
+ struct Url *url_f = url_parse(folder);
+
+ if (!url_m || !url_f)
+ return false;
+
+ bool rc = false;
+
+ if (mutt_str_strcasecmp(url_m->host, url_f->host) != 0)
+ goto done;
+
+ if (url_m->user && url_f->user && (mutt_str_strcasecmp(url_m->user, url_f->user) != 0))
+ goto done;
+
+ size_t mlen = mutt_str_strlen(url_m->path);
+ size_t flen = mutt_str_strlen(url_f->path);
+ if (flen > mlen)
+ goto done;
+
+ if (mutt_str_strncmp(url_m->path, url_f->path, flen) != 0)
+ goto done;
+
+ if (url_m->user && !url_f->user)
+ *plen += mutt_str_strlen(url_m->user) + 1;
+ rc = true;
+
+done:
+ url_free(&url_m);
+ url_free(&url_f);
+
+ return rc;
+}
+
/**
* draw_sidebar - Write out a list of mailboxes, in a panel
* @param win Window to draw on
@@ -915,15 +958,24 @@ static void draw_sidebar(struct MuttWindow *win, int num_rows, int num_cols, int
size_t maildirlen = mutt_str_strlen(C_Folder);
if (maildirlen && C_SidebarDelimChars &&
strchr(C_SidebarDelimChars, C_Folder[maildirlen - 1]))
+ {
maildirlen--;
+ }
/* check whether C_Folder is a prefix of the current folder's path */
bool maildir_is_prefix = false;
- if ((mutt_buffer_len(&m->pathbuf) > maildirlen) &&
- (mutt_str_strncmp(C_Folder, mailbox_path(m), maildirlen) == 0) &&
- C_SidebarDelimChars && strchr(C_SidebarDelimChars, mailbox_path(m)[maildirlen]))
+ if (m->magic == MUTT_IMAP)
{
- maildir_is_prefix = true;
+ maildir_is_prefix = imap_is_prefix(C_Folder, mailbox_path(m), &maildirlen);
+ }
+ else
+ {
+ if ((mutt_buffer_len(&m->pathbuf) > maildirlen) &&
+ (mutt_str_strncmp(C_Folder, mailbox_path(m), maildirlen) == 0) &&
+ C_SidebarDelimChars && strchr(C_SidebarDelimChars, mailbox_path(m)[maildirlen]))
+ {
+ maildir_is_prefix = true;
+ }
}
/* calculate depth of current folder and generate its display name with indented spaces */

+ 1
- 1
mail/neomutt/pkg-descr View File

@@ -6,4 +6,4 @@ What is NeoMutt?

Hopefully this will build the community and reduce duplicated effort.

WWW: https://www.neomutt.org
WWW: https://neomutt.org

+ 4
- 7
mail/vacation/Makefile View File

@@ -2,24 +2,21 @@
# $FreeBSD$

PORTNAME= vacation
PORTVERSION= 3.3.0
PORTREVISION= 2
PORTVERSION= 3.3.3
CATEGORIES= mail
MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}-0.4
DISTNAME= ${PORTNAME}_${PORTVERSION}

MAINTAINER= mcdouga9@egr.msu.edu
MAINTAINER= cy@FreeBSD.org
COMMENT= Email autoresponder, similar to vacation from sendmail

BROKEN= unfetchable

PORTSCOUT= ignore:1

USES= bdb

CFLAGS+= -L${LOCALBASE}/lib

WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
WRKSRC= ${WRKDIR}/work

PLIST_FILES= bin/vacation man/man1/vacation.1.gz


+ 3
- 2
mail/vacation/distinfo View File

@@ -1,2 +1,3 @@
SHA256 (vacation_3.3.0-0.4.tar.gz) = 086a3dfde953aa5247a5389fa17f1f77312acd54e3cc74a0369eb363c798b567
SIZE (vacation_3.3.0-0.4.tar.gz) = 11473
TIMESTAMP = 1584933003
SHA256 (vacation_3.3.3.tar.gz) = 0bd52d8d3df77f2079c7a42cf530c76d8ed3f135d7f46a8be74829a321d08f04
SIZE (vacation_3.3.3.tar.gz) = 12665

+ 1
- 0
security/Makefile View File

@@ -978,6 +978,7 @@
SUBDIR += py-rsa
SUBDIR += py-safe
SUBDIR += py-scp
SUBDIR += py-scramp
SUBDIR += py-scrypt
SUBDIR += py-securesystemslib
SUBDIR += py-service_identity

+ 1
- 4
security/cops/Makefile View File

@@ -5,15 +5,12 @@ PORTNAME= cops
PORTVERSION= 1.04
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.fish2.com/cops/ \
http://komquats.com/distfiles/
MASTER_SITES= https://cschubert.com/distfiles/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}+

MAINTAINER= cy@FreeBSD.org
COMMENT= System secureness checker

BROKEN= unfetchable

USES= groff perl5 shebangfix
USE_PERL5= run
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/.//g}+

+ 19
- 0
security/py-scramp/Makefile View File

@@ -0,0 +1,19 @@
# $FreeBSD$

PORTNAME= scramp
PORTVERSION= 1.1.0
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

MAINTAINER= wen@FreeBSD.org
COMMENT= Pure-Python implementation of the SCRAM authentication protocol

LICENSE= MIT

USES= python:3.5+
USE_PYTHON= autoplist distutils

NO_ARCH= yes

.include <bsd.port.mk>

+ 3
- 0
security/py-scramp/distinfo View File

@@ -0,0 +1,3 @@
TIMESTAMP = 1585042269
SHA256 (scramp-1.1.0.tar.gz) = 475aa6296deb2737b86e9df9098e8eca0f30c8ad1cc0a8adadb99ef012a5ceba
SIZE (scramp-1.1.0.tar.gz) = 20211

+ 6
- 0
security/py-scramp/pkg-descr View File

@@ -0,0 +1,6 @@
A Python implementation of the SCRAM authentication protocol defined
by RFC 5802 and RFC 7677. Scramp supports the following mechanisms:
* SCRAM-SHA-256
* SCRAM-SHA-1

WWW: https://github.com/tlocke/scramp

+ 1
- 1
textproc/libdiff/Makefile View File

@@ -8,7 +8,7 @@ MASTER_SITES= http://kristaps.bsd.lv/libdiff/snapshots/
MAINTAINER= bapt@FreeBSD.org
COMMENT= Library to generate arbitrary sequence diffs

LICENSE= ISCL
LICENSE= MIT

PLIST_FILES= lib/libdiff.a \
include/diff.h \

+ 1
- 5
www/kcgi/Makefile View File

@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= kcgi
PORTVERSION= 0.10.15
PORTVERSION= 0.10.18
CATEGORIES= www devel
MASTER_SITES= http://kristaps.bsd.lv/kcgi/snapshots/

@@ -18,8 +18,4 @@ HAS_CONFIGURE= yes
MAKE_ARGS= DATADIR=${EXAMPLESDIR}
USE_RC_SUBR= kfcgi

post-patch:
@${REINPLACE_CMD} -e "s/install -m 0555/${INSTALL_PROGRAM}/" \
${WRKSRC}/Makefile

.include <bsd.port.mk>

+ 3
- 3
www/kcgi/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1584603616
SHA256 (kcgi-0.10.15.tgz) = 4acefd100c02f1eaf9906b4692c24635358c23a16cb5242af2f03a5bbac572d1
SIZE (kcgi-0.10.15.tgz) = 193696
TIMESTAMP = 1585065610
SHA256 (kcgi-0.10.18.tgz) = b7d4649a48ca6cfc9b97cfd9a063a99de74756bd6120d7200e32eeb2ed9d9ee4
SIZE (kcgi-0.10.18.tgz) = 198937

+ 6
- 0
www/kcgi/pkg-plist View File

@@ -14,6 +14,9 @@ libdata/pkgconfig/kcgi-regress.pc
libdata/pkgconfig/kcgi-xml.pc
libdata/pkgconfig/kcgi.pc
man/man3/kcgi.3.gz
man/man3/kcgi_buf_printf.3.gz
man/man3/kcgi_buf_putc.3.gz
man/man3/kcgi_buf_puts.3.gz
man/man3/kcgi_buf_write.3.gz
man/man3/kcgi_strerror.3.gz
man/man3/kcgi_writer_disable.3.gz
@@ -29,6 +32,9 @@ man/man3/khttp_fcgi_test.3.gz
man/man3/khttp_free.3.gz
man/man3/khttp_head.3.gz
man/man3/khttp_parse.3.gz
man/man3/khttp_printf.3.gz
man/man3/khttp_putc.3.gz
man/man3/khttp_puts.3.gz
man/man3/khttp_template.3.gz
man/man3/khttp_write.3.gz
man/man3/khttpbasic_validate.3.gz

+ 1
- 0
x11/Makefile View File

@@ -292,6 +292,7 @@
SUBDIR += sessreg
SUBDIR += setlayout
SUBDIR += setxkbmap
SUBDIR += showkeys
SUBDIR += simdock
SUBDIR += simplestroke
SUBDIR += sisctrl

+ 28
- 0
x11/showkeys/Makefile View File

@@ -0,0 +1,28 @@
# $FreeBSD$

PORTNAME= showkeys
DISTVERSION= g20191004
CATEGORIES= x11

MAINTAINER= 0mp@FreeBSD.org
COMMENT= Display keystrokes during screencasts or presentations

LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE

LIB_DEPENDS= libxosd.so:misc/xosd

USES= localbase xorg
USE_GITHUB= yes
GH_ACCOUNT= nibrahim
GH_TAGNAME= 187d59c
USE_XORG= x11 xext xinerama xtst

ALL_TARGET= ${PORTNAME}

PLIST_FILES= bin/${PORTNAME}

do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/

.include <bsd.port.mk>

+ 3
- 0
x11/showkeys/distinfo View File

@@ -0,0 +1,3 @@
TIMESTAMP = 1585063387
SHA256 (nibrahim-showkeys-g20191004-187d59c_GH0.tar.gz) = ec7859595ee148d29115a90e39ce7a7629b5011ab0368df5782f4ef5a668c617
SIZE (nibrahim-showkeys-g20191004-187d59c_GH0.tar.gz) = 18033

+ 28
- 0
x11/showkeys/files/patch-Makefile View File

@@ -0,0 +1,28 @@
--- Makefile.orig 2019-10-04 17:36:38 UTC
+++ Makefile
@@ -1,18 +1,18 @@
showkeys: showkeys.c showkeys.h keystack.o
- gcc -g -Wall showkeys.c keystack.o -o showkeys -lX11 -lxosd -lpthread -lXext -lX11 -lXinerama -lXtst
+ ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} -g -Wall showkeys.c keystack.o -o showkeys -lX11 -lxosd -lpthread -lXext -lX11 -lXinerama -lXtst
keystack.o: keystack.c keystack.h
- gcc -c -g keystack.c
+ ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} -c -g keystack.c
clean:
rm showkeys keystack.o record-attempt record-example
check-syntax:
- gcc -Wall -o nul -S ${CHK_SOURCES}
+ ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} -Wall -o nul -S ${CHK_SOURCES}
-record-attempt: record-attempt.c
- gcc -g -Wall record-attempt.c -L/usr/lib -lXtst -lxosd -lpthread -lXext -lX11 -lXinerama -o record-attempt
+record-attempt: tests/record-attempt.c
+ ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} -g -Wall tests/record-attempt.c -L/usr/lib -lXtst -lxosd -lpthread -lXext -lX11 -lXinerama -o record-attempt
-record-example: record-example.c
- gcc -g -Wall record-example.c -L/usr/lib -lXtst -lxosd -lpthread -lXext -lX11 -lXinerama -o record-example
+record-example: tests/record-example.c
+ ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} -g -Wall tests/record-example.c -L/usr/lib -lXtst -lxosd -lpthread -lXext -lX11 -lXinerama -o record-example

+ 10
- 0
x11/showkeys/files/patch-keystack.c View File

@@ -0,0 +1,10 @@
--- keystack.c.orig 2020-03-24 16:28:07 UTC
+++ keystack.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
+#include "config.h"
#include "keystack.h"
static void

+ 16
- 0
x11/showkeys/pkg-descr View File

@@ -0,0 +1,16 @@
Showkeys is a simple program to display keys being pressed on the screen.

It is useful while making presentations and screencasts. The audience will be
able to see the keys being pressed.

It is similar to key-mon. Key-mon has more features than showkeys. The
advantages of showkeys are

1. Doesn't use GTK/GNOME.
2. Uses libXosd to display keys directly onto the screen.
3. No floating windows that always need to be on top. This is very useful if
you're using a tiling WM like Xmonad.
4. Keystroke history. key-mon has this but doesn't show modifiers. showkeys
does this using an Emacs style key notation.

WWW: https://github.com/nibrahim/showkeys

Loading…
Cancel
Save