From b6966d2e7354f0dcc9c3779b70d96bcdd316a751 Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 7 Mar 2022 21:45:09 +0000 Subject: [PATCH] GC a few more RCS ids in my ports --- comms/conserver/files/console.cf | 2 -- editors/vim/files/openbsd.vim | 2 -- java/jBCrypt/files/build.xml | 2 -- multimedia/get_iplayer/files/options.sample | 2 -- net/isc-bind/files/named.conf | 2 -- net/unifi/5.14/files/unifi.sh | 9 ++++----- net/unifi/5.6/files/unifi.sh | 9 ++++----- net/unifi/6.0/files/unifi.sh | 9 ++++----- net/unifi/main/files/unifi.sh | 1 - sysutils/blackbox_exporter/modules.inc | 2 -- .../flashrom/patches/patchpci-pciutils_lib_obsd-device_c | 2 -- sysutils/snmp_exporter/files/generator-pf.yml | 1 - telephony/asterisk/16/files/cdr.conf.sample | 1 - telephony/asterisk/16/files/extensions.conf.sample | 1 - telephony/asterisk/16/files/logger.conf.sample | 1 - telephony/asterisk/16/files/modules.conf.sample | 1 - telephony/asterisk/16/files/musiconhold.conf.sample | 1 - telephony/asterisk/16/files/sip.conf.sample | 1 - telephony/asterisk/16/files/voicemail.conf.sample | 1 - telephony/asterisk/18/files/cdr.conf.sample | 1 - telephony/asterisk/18/files/extensions.conf.sample | 1 - telephony/asterisk/18/files/logger.conf.sample | 1 - telephony/asterisk/18/files/modules.conf.sample | 1 - telephony/asterisk/18/files/musiconhold.conf.sample | 1 - telephony/asterisk/18/files/sip.conf.sample | 1 - telephony/asterisk/18/files/voicemail.conf.sample | 1 - www/pear/Makefile.pear | 1 - www/pear/files/patch-usr_local_bin_pear | 1 - www/pear/files/patch-usr_local_bin_peardev | 1 - www/pear/files/patch-usr_local_bin_pecl | 1 - www/pear/files/patch-var_www_pear_lib_PEAR_Config_php | 1 - www/squid/pkg/squid.login | 2 -- 32 files changed, 12 insertions(+), 52 deletions(-) diff --git a/comms/conserver/files/console.cf b/comms/conserver/files/console.cf index 590716432c4..f93d314eeb9 100644 --- a/comms/conserver/files/console.cf +++ b/comms/conserver/files/console.cf @@ -1,5 +1,3 @@ -# $OpenBSD: console.cf,v 1.2 2014/10/07 22:14:17 sthen Exp $ - config * { port 3109; } diff --git a/editors/vim/files/openbsd.vim b/editors/vim/files/openbsd.vim index 8e17a2457ed..35defe7ad94 100644 --- a/editors/vim/files/openbsd.vim +++ b/editors/vim/files/openbsd.vim @@ -1,5 +1,3 @@ -" $OpenBSD: openbsd.vim,v 1.1 2013/03/16 22:56:44 sthen Exp $ - " Copyright (c) 2007-2008 Sean C. Farley " All rights reserved. " diff --git a/java/jBCrypt/files/build.xml b/java/jBCrypt/files/build.xml index 76c595853e9..590679e1f7a 100644 --- a/java/jBCrypt/files/build.xml +++ b/java/jBCrypt/files/build.xml @@ -1,5 +1,3 @@ - - diff --git a/multimedia/get_iplayer/files/options.sample b/multimedia/get_iplayer/files/options.sample index dfb52d9ea00..93e7fc1f60e 100644 --- a/multimedia/get_iplayer/files/options.sample +++ b/multimedia/get_iplayer/files/options.sample @@ -1,5 +1,3 @@ -# $OpenBSD: options.sample,v 1.7 2016/11/19 14:16:02 sthen Exp $ - # don't ask about removing old files #nopurge 1 diff --git a/net/isc-bind/files/named.conf b/net/isc-bind/files/named.conf index 2c254f955da..bc95a5505fd 100644 --- a/net/isc-bind/files/named.conf +++ b/net/isc-bind/files/named.conf @@ -1,5 +1,3 @@ -// $OpenBSD: named.conf,v 1.3 2020/05/29 20:05:37 sthen Exp $ -// // Example file for a simple configuration of BIND, processing only // recursive queries. Consult BIND's Administration and Reference Manual // for more information. diff --git a/net/unifi/5.14/files/unifi.sh b/net/unifi/5.14/files/unifi.sh index 793d412b398..31b7dfc95bf 100644 --- a/net/unifi/5.14/files/unifi.sh +++ b/net/unifi/5.14/files/unifi.sh @@ -1,5 +1,4 @@ -#!/bin/sh -# $OpenBSD: unifi.sh,v 1.1 2021/01/28 22:42:39 sthen Exp $ +#!/bin/ksh # Optionally symlink to things like unifi-discover cmd=${0##*unifi-} @@ -8,11 +7,11 @@ name=${0##*/} if [ "$cmd" = "" -o "$cmd" = "discover" -o "$cmd" = "info" ]; then defines="$defines -Dlog4j.configuration=/dev/null" -fi - +fi + daemon="${TRUEPREFIX}/share/unifi/lib/ace.jar" java="$(${LOCALBASE}/bin/javaPathHelper -c unifi)" - + # with some filehandle trickery to do substition on stderr # 3>&1 - fh3 -> fh1 (stdout) # 1>&2 - fh1 -> fh2 (stderr) diff --git a/net/unifi/5.6/files/unifi.sh b/net/unifi/5.6/files/unifi.sh index 113f7abed66..31b7dfc95bf 100644 --- a/net/unifi/5.6/files/unifi.sh +++ b/net/unifi/5.6/files/unifi.sh @@ -1,5 +1,4 @@ -#!/bin/sh -# $OpenBSD: unifi.sh,v 1.3 2021/03/30 10:15:42 sthen Exp $ +#!/bin/ksh # Optionally symlink to things like unifi-discover cmd=${0##*unifi-} @@ -8,11 +7,11 @@ name=${0##*/} if [ "$cmd" = "" -o "$cmd" = "discover" -o "$cmd" = "info" ]; then defines="$defines -Dlog4j.configuration=/dev/null" -fi - +fi + daemon="${TRUEPREFIX}/share/unifi/lib/ace.jar" java="$(${LOCALBASE}/bin/javaPathHelper -c unifi)" - + # with some filehandle trickery to do substition on stderr # 3>&1 - fh3 -> fh1 (stdout) # 1>&2 - fh1 -> fh2 (stderr) diff --git a/net/unifi/6.0/files/unifi.sh b/net/unifi/6.0/files/unifi.sh index a187ef057e6..31b7dfc95bf 100644 --- a/net/unifi/6.0/files/unifi.sh +++ b/net/unifi/6.0/files/unifi.sh @@ -1,5 +1,4 @@ -#!/bin/sh -# $OpenBSD: unifi.sh,v 1.1 2021/03/30 10:15:42 sthen Exp $ +#!/bin/ksh # Optionally symlink to things like unifi-discover cmd=${0##*unifi-} @@ -8,11 +7,11 @@ name=${0##*/} if [ "$cmd" = "" -o "$cmd" = "discover" -o "$cmd" = "info" ]; then defines="$defines -Dlog4j.configuration=/dev/null" -fi - +fi + daemon="${TRUEPREFIX}/share/unifi/lib/ace.jar" java="$(${LOCALBASE}/bin/javaPathHelper -c unifi)" - + # with some filehandle trickery to do substition on stderr # 3>&1 - fh3 -> fh1 (stdout) # 1>&2 - fh1 -> fh2 (stderr) diff --git a/net/unifi/main/files/unifi.sh b/net/unifi/main/files/unifi.sh index 0152689286e..31b7dfc95bf 100644 --- a/net/unifi/main/files/unifi.sh +++ b/net/unifi/main/files/unifi.sh @@ -1,5 +1,4 @@ #!/bin/ksh -# $OpenBSD: unifi.sh,v 1.2 2021/12/13 22:15:00 sthen Exp $ # Optionally symlink to things like unifi-discover cmd=${0##*unifi-} diff --git a/sysutils/blackbox_exporter/modules.inc b/sysutils/blackbox_exporter/modules.inc index a0e17049525..ea4f06cd231 100644 --- a/sysutils/blackbox_exporter/modules.inc +++ b/sysutils/blackbox_exporter/modules.inc @@ -1,5 +1,3 @@ -# $OpenBSD: modules.inc,v 1.2 2021/11/01 13:00:14 ajacoutot Exp $ - MODGO_MODULES = \ cloud.google.com/go v0.34.0 \ github.com/!burnt!sushi/toml v0.3.1 \ diff --git a/sysutils/flashrom/patches/patchpci-pciutils_lib_obsd-device_c b/sysutils/flashrom/patches/patchpci-pciutils_lib_obsd-device_c index 7f95dc3fecc..686be5f3b2f 100644 --- a/sysutils/flashrom/patches/patchpci-pciutils_lib_obsd-device_c +++ b/sysutils/flashrom/patches/patchpci-pciutils_lib_obsd-device_c @@ -1,5 +1,3 @@ -$OpenBSD: patchpci-pciutils_lib_obsd-device_c,v 1.1 2020/11/20 12:48:58 sthen Exp $ - OpenBSD's /dev/pci only permits aligned 32 bit writes. Emulate smaller writes by doing read/modify/write. diff --git a/sysutils/snmp_exporter/files/generator-pf.yml b/sysutils/snmp_exporter/files/generator-pf.yml index e41bf0d803a..6b285abe138 100644 --- a/sysutils/snmp_exporter/files/generator-pf.yml +++ b/sysutils/snmp_exporter/files/generator-pf.yml @@ -1,4 +1,3 @@ -# $OpenBSD: generator-pf.yml,v 1.1 2021/03/23 19:42:28 sthen Exp $ # Cut-down example of if_mib setup done using SNMPv3 (edit the various # $snmpv3-... as needed) and information from OPENBSD-PF-MIB, based on # https://yetiops.net/posts/openbsd-snmp-exporter/. diff --git a/telephony/asterisk/16/files/cdr.conf.sample b/telephony/asterisk/16/files/cdr.conf.sample index 96c68fc2f02..35110ac4bf1 100644 --- a/telephony/asterisk/16/files/cdr.conf.sample +++ b/telephony/asterisk/16/files/cdr.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: cdr.conf.sample,v 1.1 2021/11/02 12:47:08 sthen Exp $ ; Longer example available in ${TRUEPREFIX}/share/examples/asterisk/default [general] diff --git a/telephony/asterisk/16/files/extensions.conf.sample b/telephony/asterisk/16/files/extensions.conf.sample index f6bb3179466..cc7e4c921c9 100644 --- a/telephony/asterisk/16/files/extensions.conf.sample +++ b/telephony/asterisk/16/files/extensions.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: extensions.conf.sample,v 1.1 2021/11/02 12:47:08 sthen Exp $ ; Longer example available in ${TRUEPREFIX}/share/examples/asterisk/default ; For new installations, you may prefer to use extensions.ael rather than ; this file. diff --git a/telephony/asterisk/16/files/logger.conf.sample b/telephony/asterisk/16/files/logger.conf.sample index 4221fb77ab6..deb66034464 100644 --- a/telephony/asterisk/16/files/logger.conf.sample +++ b/telephony/asterisk/16/files/logger.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: logger.conf.sample,v 1.1 2021/11/02 12:47:08 sthen Exp $ ; log files created in directory defined by 'astlogdir' in asterisk.conf [logfiles] diff --git a/telephony/asterisk/16/files/modules.conf.sample b/telephony/asterisk/16/files/modules.conf.sample index b4cacc1dd13..68db67fbd9b 100644 --- a/telephony/asterisk/16/files/modules.conf.sample +++ b/telephony/asterisk/16/files/modules.conf.sample @@ -1,3 +1,2 @@ -; $OpenBSD: modules.conf.sample,v 1.1 2021/11/02 12:47:08 sthen Exp $ [modules] autoload=yes diff --git a/telephony/asterisk/16/files/musiconhold.conf.sample b/telephony/asterisk/16/files/musiconhold.conf.sample index 445cc9d60e0..69201605b1b 100644 --- a/telephony/asterisk/16/files/musiconhold.conf.sample +++ b/telephony/asterisk/16/files/musiconhold.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: musiconhold.conf.sample,v 1.1 2021/11/02 12:47:08 sthen Exp $ ; Music on Hold -- Sample Configuration ; There are various ways to handle musiconhold. The lightweight method diff --git a/telephony/asterisk/16/files/sip.conf.sample b/telephony/asterisk/16/files/sip.conf.sample index 5dced8596fc..40fc77b0a26 100644 --- a/telephony/asterisk/16/files/sip.conf.sample +++ b/telephony/asterisk/16/files/sip.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: sip.conf.sample,v 1.1 2021/11/02 12:47:08 sthen Exp $ ; Longer example available in ${TRUEPREFIX}/share/examples/asterisk/default [general] diff --git a/telephony/asterisk/16/files/voicemail.conf.sample b/telephony/asterisk/16/files/voicemail.conf.sample index 252fce5ae1a..29bab684607 100644 --- a/telephony/asterisk/16/files/voicemail.conf.sample +++ b/telephony/asterisk/16/files/voicemail.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: voicemail.conf.sample,v 1.1 2021/11/02 12:47:08 sthen Exp $ ; Longer example available in ${TRUEPREFIX}/share/examples/asterisk/default [default] diff --git a/telephony/asterisk/18/files/cdr.conf.sample b/telephony/asterisk/18/files/cdr.conf.sample index 2bd721588e5..35110ac4bf1 100644 --- a/telephony/asterisk/18/files/cdr.conf.sample +++ b/telephony/asterisk/18/files/cdr.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: cdr.conf.sample,v 1.1.1.1 2021/10/16 10:55:00 sthen Exp $ ; Longer example available in ${TRUEPREFIX}/share/examples/asterisk/default [general] diff --git a/telephony/asterisk/18/files/extensions.conf.sample b/telephony/asterisk/18/files/extensions.conf.sample index 734b71aef5a..cc7e4c921c9 100644 --- a/telephony/asterisk/18/files/extensions.conf.sample +++ b/telephony/asterisk/18/files/extensions.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: extensions.conf.sample,v 1.1.1.1 2021/10/16 10:55:00 sthen Exp $ ; Longer example available in ${TRUEPREFIX}/share/examples/asterisk/default ; For new installations, you may prefer to use extensions.ael rather than ; this file. diff --git a/telephony/asterisk/18/files/logger.conf.sample b/telephony/asterisk/18/files/logger.conf.sample index fa2b8bbbce8..deb66034464 100644 --- a/telephony/asterisk/18/files/logger.conf.sample +++ b/telephony/asterisk/18/files/logger.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: logger.conf.sample,v 1.1.1.1 2021/10/16 10:55:00 sthen Exp $ ; log files created in directory defined by 'astlogdir' in asterisk.conf [logfiles] diff --git a/telephony/asterisk/18/files/modules.conf.sample b/telephony/asterisk/18/files/modules.conf.sample index 5bba2e8538a..68db67fbd9b 100644 --- a/telephony/asterisk/18/files/modules.conf.sample +++ b/telephony/asterisk/18/files/modules.conf.sample @@ -1,3 +1,2 @@ -; $OpenBSD: modules.conf.sample,v 1.1.1.1 2021/10/16 10:55:00 sthen Exp $ [modules] autoload=yes diff --git a/telephony/asterisk/18/files/musiconhold.conf.sample b/telephony/asterisk/18/files/musiconhold.conf.sample index 79be835d931..69201605b1b 100644 --- a/telephony/asterisk/18/files/musiconhold.conf.sample +++ b/telephony/asterisk/18/files/musiconhold.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: musiconhold.conf.sample,v 1.1.1.1 2021/10/16 10:55:00 sthen Exp $ ; Music on Hold -- Sample Configuration ; There are various ways to handle musiconhold. The lightweight method diff --git a/telephony/asterisk/18/files/sip.conf.sample b/telephony/asterisk/18/files/sip.conf.sample index 28ceb96f6c8..40fc77b0a26 100644 --- a/telephony/asterisk/18/files/sip.conf.sample +++ b/telephony/asterisk/18/files/sip.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: sip.conf.sample,v 1.1.1.1 2021/10/16 10:55:00 sthen Exp $ ; Longer example available in ${TRUEPREFIX}/share/examples/asterisk/default [general] diff --git a/telephony/asterisk/18/files/voicemail.conf.sample b/telephony/asterisk/18/files/voicemail.conf.sample index eb7095e7388..29bab684607 100644 --- a/telephony/asterisk/18/files/voicemail.conf.sample +++ b/telephony/asterisk/18/files/voicemail.conf.sample @@ -1,4 +1,3 @@ -; $OpenBSD: voicemail.conf.sample,v 1.1.1.1 2021/10/16 10:55:00 sthen Exp $ ; Longer example available in ${TRUEPREFIX}/share/examples/asterisk/default [default] diff --git a/www/pear/Makefile.pear b/www/pear/Makefile.pear index d6653684ff1..33de3fa2c14 100644 --- a/www/pear/Makefile.pear +++ b/www/pear/Makefile.pear @@ -1,4 +1,3 @@ -# $OpenBSD: Makefile.pear,v 1.4 2016/04/01 18:46:06 sthen Exp $ # Default Makefile to install a PHP PEAR module default: diff --git a/www/pear/files/patch-usr_local_bin_pear b/www/pear/files/patch-usr_local_bin_pear index d2dbf2169e2..56a92289638 100644 --- a/www/pear/files/patch-usr_local_bin_pear +++ b/www/pear/files/patch-usr_local_bin_pear @@ -1,4 +1,3 @@ -$OpenBSD: patch-usr_local_bin_pear,v 1.2 2011/11/16 13:29:13 robert Exp $ --- usr/local/bin/pear.orig Wed Nov 16 14:15:00 2011 +++ usr/local/bin/pear Wed Nov 16 14:15:49 2011 @@ -4,10 +4,10 @@ diff --git a/www/pear/files/patch-usr_local_bin_peardev b/www/pear/files/patch-usr_local_bin_peardev index 704a9d28871..f2eb82ce2fc 100644 --- a/www/pear/files/patch-usr_local_bin_peardev +++ b/www/pear/files/patch-usr_local_bin_peardev @@ -1,4 +1,3 @@ -$OpenBSD: patch-usr_local_bin_peardev,v 1.2 2011/11/16 13:29:13 robert Exp $ --- usr/local/bin/peardev.orig Wed Nov 16 14:16:34 2011 +++ usr/local/bin/peardev Wed Nov 16 14:17:14 2011 @@ -4,10 +4,10 @@ diff --git a/www/pear/files/patch-usr_local_bin_pecl b/www/pear/files/patch-usr_local_bin_pecl index afaa126aed4..a73eede3444 100644 --- a/www/pear/files/patch-usr_local_bin_pecl +++ b/www/pear/files/patch-usr_local_bin_pecl @@ -1,4 +1,3 @@ -$OpenBSD: patch-usr_local_bin_pecl,v 1.2 2011/11/16 13:29:13 robert Exp $ --- usr/local/bin/pecl.orig Wed Nov 16 14:17:44 2011 +++ usr/local/bin/pecl Wed Nov 16 14:18:02 2011 @@ -4,10 +4,10 @@ diff --git a/www/pear/files/patch-var_www_pear_lib_PEAR_Config_php b/www/pear/files/patch-var_www_pear_lib_PEAR_Config_php index 464551c0526..dd735e3bf6f 100644 --- a/www/pear/files/patch-var_www_pear_lib_PEAR_Config_php +++ b/www/pear/files/patch-var_www_pear_lib_PEAR_Config_php @@ -1,4 +1,3 @@ -$OpenBSD: patch-var_www_pear_lib_PEAR_Config_php,v 1.3 2016/04/01 18:46:06 sthen Exp $ --- var/www/pear/lib/PEAR/Config.php.orig Wed Mar 30 22:25:04 2016 +++ var/www/pear/lib/PEAR/Config.php Wed Mar 30 22:25:05 2016 @@ -79,11 +79,7 @@ if (getenv('PHP_PEAR_HTTP_PROXY')) { diff --git a/www/squid/pkg/squid.login b/www/squid/pkg/squid.login index 0fe387eda7d..2a9e4fb56b7 100644 --- a/www/squid/pkg/squid.login +++ b/www/squid/pkg/squid.login @@ -1,5 +1,3 @@ -# $OpenBSD: squid.login,v 1.1 2022/02/21 13:43:56 sthen Exp $ - squid:\ :datasize=8192M:\ :openfiles-cur=4096:\