pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Removed duplicates: p5-Pod-Usage, p5-Test-Most, p5-XML-Twig, prosody, rc.subr, revbump, samtools, simulavr, validns
Module Name: pkgsrc-wip
Committed By: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By: adam
Date: Sun Dec 23 15:47:01 2018 +0100
Changeset: 6a521a98531fed81ab57d90db33de3656bef9ab2
Modified Files:
Makefile
trinity/Makefile
vcsh/Makefile
Removed Files:
p5-Pod-Usage/DESCR
p5-Pod-Usage/Makefile
p5-Pod-Usage/distinfo
p5-Test-Most/DESCR
p5-Test-Most/Makefile
p5-Test-Most/PLIST
p5-Test-Most/distinfo
p5-XML-Twig/DESCR
p5-XML-Twig/Makefile
p5-XML-Twig/distinfo
prosody/DESCR
prosody/Makefile
prosody/PLIST
prosody/distinfo
prosody/files/prosody.sh
prosody/files/smf/manifest.xml
prosody/patches/patch-Makefile
prosody/patches/patch-prosody.cfg.lua.dist
prosody/patches/patch-util-src_signal.c
rc.subr/DESCR
rc.subr/Makefile
rc.subr/PLIST
rc.subr/TODO
rc.subr/files/DAEMON.sh
rc.subr/files/LOGIN.sh
rc.subr/files/NETWORKING.sh
rc.subr/files/SERVERS.sh
rc.subr/files/rc.conf.example
rc.subr/files/rc.subr
revbump/COMMIT_MSG
revbump/DESCR
revbump/Makefile
revbump/PLIST
revbump/files/blbump
revbump/files/blbump.1
revbump/files/check-cvs-diff
revbump/files/check-cvs-diff.1
revbump/files/finddepends
revbump/files/finddepends.1
revbump/files/replace-commonbump
revbump/files/replace-commonbump.1
revbump/files/revbump
revbump/files/revbump.1
samtools/DESCR
samtools/Makefile
samtools/PLIST
samtools/distinfo
simulavr/COMMIT_MSG
simulavr/DESCR
simulavr/MESSAGE
simulavr/Makefile
simulavr/PLIST
simulavr/TODO
simulavr/distinfo
simulavr/patches/patch-configure
simulavr/patches/patch-doc_simulavr_texinfo
simulavr/patches/patch-examples_atmel_key_StdDefs_c
simulavr/patches/patch-examples_atmel_key_scancodes.h
simulavr/patches/patch-regress_timertest_timer_16bit.c
simulavr/patches/patch-src_Makefile.in
simulavr/patches/patch-src_systemclock_cpp
simulavr/patches/patch-src_systemclock_h
simulavr/patches/patch-src_traceval_cpp
simulavr/patches/patch-src_traceval_h
validns/DESCR
validns/Makefile
validns/PLIST
validns/distinfo
validns/patches/patch-Makefile
validns/patches/patch-base32hex.c
validns/patches/patch-base64.c
validns/patches/patch-carp.c
validns/patches/patch-cert.c
validns/patches/patch-loc.c
validns/patches/patch-main.c
validns/patches/patch-naptr.c
validns/patches/patch-nsec.c
validns/patches/patch-nsec3.c
validns/patches/patch-nsec3param.c
validns/patches/patch-rr.c
validns/patches/patch-textparse.c
validns/patches/patch-tlsa.c
validns/patches/patch-x25.c
Log Message:
Removed duplicates: p5-Pod-Usage, p5-Test-Most, p5-XML-Twig, prosody, rc.subr, revbump, samtools, simulavr, validns
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6a521a98531fed81ab57d90db33de3656bef9ab2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 9 -
p5-Pod-Usage/DESCR | 1 -
p5-Pod-Usage/Makefile | 16 -
p5-Pod-Usage/distinfo | 6 -
p5-Test-Most/DESCR | 8 -
p5-Test-Most/Makefile | 20 -
p5-Test-Most/PLIST | 6 -
p5-Test-Most/distinfo | 6 -
p5-XML-Twig/DESCR | 16 -
p5-XML-Twig/Makefile | 22 -
p5-XML-Twig/distinfo | 6 -
prosody/DESCR | 4 -
prosody/Makefile | 77 --
prosody/PLIST | 166 ----
prosody/distinfo | 9 -
prosody/files/prosody.sh | 24 -
prosody/files/smf/manifest.xml | 29 -
prosody/patches/patch-Makefile | 85 --
prosody/patches/patch-prosody.cfg.lua.dist | 39 -
prosody/patches/patch-util-src_signal.c | 15 -
rc.subr/DESCR | 4 -
rc.subr/Makefile | 58 --
rc.subr/PLIST | 7 -
rc.subr/TODO | 25 -
rc.subr/files/DAEMON.sh | 10 -
rc.subr/files/LOGIN.sh | 13 -
rc.subr/files/NETWORKING.sh | 9 -
rc.subr/files/SERVERS.sh | 10 -
rc.subr/files/rc.conf.example | 6 -
rc.subr/files/rc.subr | 916 ---------------------
revbump/COMMIT_MSG | 10 -
revbump/DESCR | 5 -
revbump/Makefile | 31 -
revbump/PLIST | 11 -
revbump/files/blbump | 148 ----
revbump/files/blbump.1 | 77 --
revbump/files/check-cvs-diff | 99 ---
revbump/files/check-cvs-diff.1 | 84 --
revbump/files/finddepends | 153 ----
revbump/files/finddepends.1 | 86 --
revbump/files/replace-commonbump | 250 ------
revbump/files/replace-commonbump.1 | 141 ----
revbump/files/revbump | 186 -----
revbump/files/revbump.1 | 112 ---
samtools/DESCR | 3 -
samtools/Makefile | 25 -
samtools/PLIST | 24 -
samtools/distinfo | 6 -
simulavr/COMMIT_MSG | 16 -
simulavr/DESCR | 7 -
simulavr/MESSAGE | 11 -
simulavr/Makefile | 95 ---
simulavr/PLIST | 160 ----
simulavr/TODO | 4 -
simulavr/distinfo | 15 -
simulavr/patches/patch-configure | 25 -
simulavr/patches/patch-doc_simulavr_texinfo | 23 -
.../patches/patch-examples_atmel_key_StdDefs_c | 40 -
.../patches/patch-examples_atmel_key_scancodes.h | 293 -------
.../patches/patch-regress_timertest_timer_16bit.c | 24 -
simulavr/patches/patch-src_Makefile.in | 17 -
simulavr/patches/patch-src_systemclock_cpp | 223 -----
simulavr/patches/patch-src_systemclock_h | 78 --
simulavr/patches/patch-src_traceval_cpp | 126 ---
simulavr/patches/patch-src_traceval_h | 88 --
trinity/Makefile | 2 +-
validns/DESCR | 1 -
validns/Makefile | 19 -
validns/PLIST | 3 -
validns/distinfo | 21 -
validns/patches/patch-Makefile | 45 -
validns/patches/patch-base32hex.c | 15 -
validns/patches/patch-base64.c | 15 -
validns/patches/patch-carp.c | 16 -
validns/patches/patch-cert.c | 24 -
validns/patches/patch-loc.c | 60 --
validns/patches/patch-main.c | 92 ---
validns/patches/patch-naptr.c | 15 -
validns/patches/patch-nsec.c | 15 -
validns/patches/patch-nsec3.c | 15 -
validns/patches/patch-nsec3param.c | 15 -
validns/patches/patch-rr.c | 24 -
validns/patches/patch-textparse.c | 450 ----------
validns/patches/patch-tlsa.c | 24 -
validns/patches/patch-x25.c | 15 -
vcsh/Makefile | 2 +-
86 files changed, 2 insertions(+), 5204 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index e7292a884f..12a91d6b38 100644
--- a/Makefile
+++ b/Makefile
@@ -2602,7 +2602,6 @@ SUBDIR+= p5-Plucene
SUBDIR+= p5-Plucene-Plugin-Analyzer-SnowballAnalyzer
SUBDIR+= p5-PluceneSimple
SUBDIR+= p5-Pod-Constants
-SUBDIR+= p5-Pod-Usage
SUBDIR+= p5-Pod-Xhtml
SUBDIR+= p5-Proc-Fork
SUBDIR+= p5-RPC-PlClient
@@ -2620,7 +2619,6 @@ SUBDIR+= p5-Sys-MemInfo
SUBDIR+= p5-Template-Plugin-Class
SUBDIR+= p5-Term-ReadLine-Perl5
SUBDIR+= p5-Test-Fake-HTTPD
-SUBDIR+= p5-Test-Most
SUBDIR+= p5-Test-Strict
SUBDIR+= p5-Test-Stub
SUBDIR+= p5-Test-Unit-Lite
@@ -2649,7 +2647,6 @@ SUBDIR+= p5-WebService-GData
SUBDIR+= p5-XML-DT
SUBDIR+= p5-XML-DTDParser
SUBDIR+= p5-XML-RSS-LibXML
-SUBDIR+= p5-XML-Twig
SUBDIR+= p5-XML-Writer-Simple
SUBDIR+= p5-mha4mysql-manager
SUBDIR+= p5-mha4mysql-node
@@ -2931,7 +2928,6 @@ SUBDIR+= profanity
SUBDIR+= progreiserfs
SUBDIR+= proplib
SUBDIR+= proselint
-SUBDIR+= prosody
SUBDIR+= prover9
SUBDIR+= proxychains
SUBDIR+= proxychains-ng
@@ -4089,7 +4085,6 @@ SUBDIR+= ratproxy
SUBDIR+= raw
SUBDIR+= rawdog
SUBDIR+= rc.d.Interix
-SUBDIR+= rc.subr
SUBDIR+= rclone
SUBDIR+= rdsn-git
SUBDIR+= rdup
@@ -4113,7 +4108,6 @@ SUBDIR+= remctl
SUBDIR+= resid-builder
SUBDIR+= residualvm
SUBDIR+= resin
-SUBDIR+= revbump
SUBDIR+= revelation
SUBDIR+= rhapsody
SUBDIR+= riak
@@ -4206,7 +4200,6 @@ SUBDIR+= sais
SUBDIR+= sais-demo-data
SUBDIR+= salmon
SUBDIR+= samhain
-SUBDIR+= samtools
SUBDIR+= samtools0119
SUBDIR+= sara
SUBDIR+= sarf
@@ -4286,7 +4279,6 @@ SUBDIR+= simpa
SUBDIR+= simple-mtpfs
SUBDIR+= simple-scan
SUBDIR+= simplec
-SUBDIR+= simulavr
SUBDIR+= simulavr-git
SUBDIR+= simutrans
SUBDIR+= simutrans-data
@@ -4652,7 +4644,6 @@ SUBDIR+= v8-316
SUBDIR+= vacuum
SUBDIR+= vagalume
SUBDIR+= vale-current
-SUBDIR+= validns
SUBDIR+= vamp
SUBDIR+= vamps
SUBDIR+= vanitygen
diff --git a/p5-Pod-Usage/DESCR b/p5-Pod-Usage/DESCR
deleted file mode 100644
index dd3d7373e0..0000000000
--- a/p5-Pod-Usage/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Pod::Usage - print a usage message from embedded pod documentation.
diff --git a/p5-Pod-Usage/Makefile b/p5-Pod-Usage/Makefile
deleted file mode 100644
index 992518cff6..0000000000
--- a/p5-Pod-Usage/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD$
-
-DISTNAME= Pod-Usage-1.69
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Pod/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://search.cpan.org/~marekr/Pod-Usage-1.69/
-COMMENT= Print a usage message from embedded pod documentation
-LICENSE= ${PERL5_LICENSE}
-
-PERL5_PACKLIST= auto/Pod/Usage/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Pod-Usage/distinfo b/p5-Pod-Usage/distinfo
deleted file mode 100644
index 80661294d4..0000000000
--- a/p5-Pod-Usage/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (Pod-Usage-1.69.tar.gz) = 4d102738f27d65478d885cf20380badfcaa837a3
-RMD160 (Pod-Usage-1.69.tar.gz) = f24523869cebffb2555c705af23f535d4850d9b3
-SHA512 (Pod-Usage-1.69.tar.gz) = 56e2f6492c03892c95c74de2841a52b02be372842eaff32f84fdf8901fb73ebed6465a0215ccb8c9f2eaf23c7cafb5d044c77b69805cb364bcf71c4f24835025
-Size (Pod-Usage-1.69.tar.gz) = 61342 bytes
diff --git a/p5-Test-Most/DESCR b/p5-Test-Most/DESCR
deleted file mode 100644
index 36c1aa76da..0000000000
--- a/p5-Test-Most/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Test::Most exists to reduce boilerplate and to make your testing life easier.
-We provide "one stop shopping" for most commonly used testing modules. In
-fact, we often require the latest versions so that you get bug fixes through
-Test::Most and don't have to keep upgrading these modules separately.
-
-This module provides you with the most commonly used testing functions,
-along with automatically turning on strict and warning and gives you a bit
-more fine-grained control over your test suite.
diff --git a/p5-Test-Most/Makefile b/p5-Test-Most/Makefile
deleted file mode 100644
index 8d47fab05a..0000000000
--- a/p5-Test-Most/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD$
-
-DISTNAME= Test-Most-0.35
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Test/}
-
-MAINTAINER= sasha-pkgsrc%arcocene.org@localhost
-HOMEPAGE= http://search.cpan.org/dist/Shell-Command/
-COMMENT= Most commonly needed test functions and features
-LICENSE= ${PERL5_LICENSE}
-
-DEPENDS+= p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
-DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences
-DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
-DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
-DEPENDS+= p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Test-Most/PLIST b/p5-Test-Most/PLIST
deleted file mode 100644
index 0858d463f6..0000000000
--- a/p5-Test-Most/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD$
-${PERL5_SUB_INSTALLVENDORLIB}/Test/Most.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Test/Most/Exception.pm
-${PERL5_SUB_INSTALLVENDORARCH}/auto/Test/Most/.packlist
-${PERL5_SUB_INSTALLVENDORMAN3DIR}/Test::Most.3
-${PERL5_SUB_INSTALLVENDORMAN3DIR}/Test::Most::Exception.3
diff --git a/p5-Test-Most/distinfo b/p5-Test-Most/distinfo
deleted file mode 100644
index 316a239a11..0000000000
--- a/p5-Test-Most/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (Test-Most-0.35.tar.gz) = 6ac702ff3623624082979f3c9496e66a175335fc
-RMD160 (Test-Most-0.35.tar.gz) = 8db7982856202af932c8be3f275030e8843605ce
-SHA512 (Test-Most-0.35.tar.gz) = 1b2d201811e59d7afce47ff5f7da67c170d4685ffbec23360757b5cacc9fe72fc82609bc46cc9d8e351fdb75715696457c201dd94fadaeca70a6f31690236291
-Size (Test-Most-0.35.tar.gz) = 16074 bytes
diff --git a/p5-XML-Twig/DESCR b/p5-XML-Twig/DESCR
deleted file mode 100644
index 1aa5067cc8..0000000000
--- a/p5-XML-Twig/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-XML::Twig is (yet another!) XML transformation module.
-
-Its strong points: can be used to process huge documents while still
-being in tree mode; not bound by DOM or SAX, so it is very perlish and
-offers a very comprehensive set of methods; simple to use; DWIMs as
-much as possible.
-
-What it doesn't offer: full SAX support (it can export SAX, but only
-reads XML), full XPath support (unless you use XML::Twig::XPath), nor
-DOM support.
-
-Other drawbacks: it is a big module, and with over 500 methods available
-it can be a bit overwhelming. A good starting point is the tutorial at
-http://xmltwig.org/xmltwig/tutorial/index.html. In fact the whole
-XML::Twig page at http://xmltwig.org/xmltwig/ has plenty of information
-to get you started with XML::Twig.
diff --git a/p5-XML-Twig/Makefile b/p5-XML-Twig/Makefile
deleted file mode 100644
index 896871cbd2..0000000000
--- a/p5-XML-Twig/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2013/05/14 02:26:40 jgoamakf Exp $
-#
-
-DISTNAME= XML-Twig-3.52
-PKGNAME= p5-${DISTNAME}
-CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=XML/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://metacpan.org/pod/XML::Twig
-COMMENT= Perl module for processing huge XML documents
-LICENSE= ${PERL5_LICENSE}
-
-DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
-DEPENDS+= p5-XML-XPathEngine-[0-9]*:../../textproc/p5-XML-XPathEngine
-DEPENDS+= p5-Encode-[0-9]*:../../textproc/p5-Encode
-DEPENDS+= p5-Scalar-List-Utils-[0-9]*:../../devel/p5-Scalar-List-Utils
-
-PERL5_PACKLIST= auto/XML/Twig/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-XML-Twig/distinfo b/p5-XML-Twig/distinfo
deleted file mode 100644
index 9fd9ed1bb1..0000000000
--- a/p5-XML-Twig/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (XML-Twig-3.52.tar.gz) = ce4ad6f055ea677ab5526e55677faffcc6457eb8
-RMD160 (XML-Twig-3.52.tar.gz) = 532413b74b6372e32c9a1e54b0a73ffd24ad31ff
-SHA512 (XML-Twig-3.52.tar.gz) = 1594e127fb76c0e53d0bd1f0a12fe3874c9523dd2bc55675d5a6cf44d5682ddea481671f786d3a65e6b69f5307c4da1701529f318453a1f8a22685b2dae793a6
-Size (XML-Twig-3.52.tar.gz) = 407769 bytes
diff --git a/prosody/DESCR b/prosody/DESCR
deleted file mode 100644
index 66ae434a17..0000000000
--- a/prosody/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Prosody is a flexible communications server for Jabber/XMPP written in Lua.
-It aims to be easy to use, and light on resources. For developers it aims
-to be easy to extend and give a flexible system on which to rapidly develop
-added functionality, or prototype new protocols.
diff --git a/prosody/Makefile b/prosody/Makefile
deleted file mode 100644
index 7b7526d86e..0000000000
--- a/prosody/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2017/03/01 16:38:31 fhajny Exp $
-#
-
-DISTNAME= prosody-0.10.0
-CATEGORIES= chat
-MASTER_SITES= http://prosody.im/downloads/source/
-
-MAINTAINER= fhajny%NetBSD.org@localhost
-HOMEPAGE= http://prosody.im/
-COMMENT= Flexible communications server for Jabber/XMPP written in Lua
-LICENSE= mit
-
-DEPENDS+= ${LUA_PKGPREFIX}-expat>=1.2:../../textproc/lua-expat
-DEPENDS+= ${LUA_PKGPREFIX}-filesystem>=1.0:../../devel/lua-filesystem
-DEPENDS+= ${LUA_PKGPREFIX}-sec>=0.3.3:../../security/lua-sec
-DEPENDS+= ${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket
-
-HAS_CONFIGURE= yes
-USE_TOOLS+= gmake
-BUILD_DEFS+= VARBASE
-
-LUA_VERSIONS_ACCEPTED= 51
-
-.include "../../mk/bsd.prefs.mk"
-
-PROSODY_USER?= prosody
-PROSODY_GROUP?= ${PROSODY_USER}
-PROSODY_DATA?= ${VARBASE}/db/prosody
-PROSODY_LOG?= ${VARBASE}/log/prosody
-PROSODY_RUN?= ${VARBASE}/run/prosody
-
-OWN_DIRS_PERMS+= ${PROSODY_DATA} ${PROSODY_USER} ${PROSODY_GROUP} 0770
-OWN_DIRS_PERMS+= ${PROSODY_LOG} ${PROSODY_USER} ${PROSODY_GROUP} 0770
-OWN_DIRS_PERMS+= ${PROSODY_RUN} ${PROSODY_USER} ${PROSODY_GROUP} 0770
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/certs
-
-PKG_USERS_VARS= PROSODY_USER
-PKG_GROUPS_VARS= PROSODY_GROUP
-PKG_GROUPS= ${PROSODY_GROUP}
-PKG_USERS= ${PROSODY_USER}:${PROSODY_GROUP}
-PKG_GECOS.${PROSODY_USER}= Prosody daemon user
-PKG_HOME.${PROSODY_USER}= ${PROSODY_DATA}
-PKG_SHELL.${PROSODY_USER}= ${NOLOGIN}
-
-PKG_SYSCONFSUBDIR= ${PKGBASE}
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+= ${EGDIR}/prosody.cfg.lua ${PKG_SYSCONFDIR}/prosody.cfg.lua
-CONF_FILES+= ${EGDIR}/certs/localhost.cnf ${PKG_SYSCONFDIR}/certs/localhost.cnf
-
-REPLACE_LUA+= prosody prosodyctl
-
-SUBST_CLASSES+= path
-SUBST_MESSAGE.path= Fixing default paths
-SUBST_STAGE.path= pre-configure
-SUBST_FILES.path= Makefile man/prosodyctl.man prosody.cfg.lua.dist
-SUBST_SED.path= -e 's,/etc/prosody,${PKG_SYSCONFDIR},g'
-SUBST_VARS.path= EGDIR PROSODY_DATA PROSODY_LOG PROSODY_RUN
-
-CONFIGURE_ARGS+= --cflags=${CFLAGS:Q}
-CONFIGURE_ARGS+= --datadir=${PROSODY_DATA}
-CONFIGURE_ARGS+= --ldflags="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared"
-CONFIGURE_ARGS+= --no-example-certs
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --with-lua-include=${PREFIX}/${LUA_INCDIR}
-
-CFLAGS+= -fPIC -Wall -DLUA_COMPAT_MODULE
-MAKE_ENV.SunOS+= SOCKET_LIB=-lsocket
-
-RCD_SCRIPTS= prosody
-
-.include "../../lang/lua/application.mk"
-.include "../../lang/lua/tool.mk"
-.include "../../devel/libidn/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/prosody/PLIST b/prosody/PLIST
deleted file mode 100644
index 22e352bc13..0000000000
--- a/prosody/PLIST
+++ /dev/null
@@ -1,166 +0,0 @@
-@comment $NetBSD$
-bin/prosody
-bin/prosodyctl
-lib/prosody/core/certmanager.lua
-lib/prosody/core/configmanager.lua
-lib/prosody/core/hostmanager.lua
-lib/prosody/core/loggingmanager.lua
-lib/prosody/core/moduleapi.lua
-lib/prosody/core/modulemanager.lua
-lib/prosody/core/portmanager.lua
-lib/prosody/core/rostermanager.lua
-lib/prosody/core/s2smanager.lua
-lib/prosody/core/sessionmanager.lua
-lib/prosody/core/stanza_router.lua
-lib/prosody/core/statsmanager.lua
-lib/prosody/core/storagemanager.lua
-lib/prosody/core/usermanager.lua
-lib/prosody/modules/adhoc/adhoc.lib.lua
-lib/prosody/modules/adhoc/mod_adhoc.lua
-lib/prosody/modules/mod_admin_adhoc.lua
-lib/prosody/modules/mod_admin_telnet.lua
-lib/prosody/modules/mod_announce.lua
-lib/prosody/modules/mod_auth_anonymous.lua
-lib/prosody/modules/mod_auth_cyrus.lua
-lib/prosody/modules/mod_auth_internal_hashed.lua
-lib/prosody/modules/mod_auth_internal_plain.lua
-lib/prosody/modules/mod_blocklist.lua
-lib/prosody/modules/mod_bosh.lua
-lib/prosody/modules/mod_c2s.lua
-lib/prosody/modules/mod_carbons.lua
-lib/prosody/modules/mod_component.lua
-lib/prosody/modules/mod_compression.lua
-lib/prosody/modules/mod_debug_sql.lua
-lib/prosody/modules/mod_dialback.lua
-lib/prosody/modules/mod_disco.lua
-lib/prosody/modules/mod_groups.lua
-lib/prosody/modules/mod_http.lua
-lib/prosody/modules/mod_http_errors.lua
-lib/prosody/modules/mod_http_files.lua
-lib/prosody/modules/mod_iq.lua
-lib/prosody/modules/mod_lastactivity.lua
-lib/prosody/modules/mod_legacyauth.lua
-lib/prosody/modules/mod_limits.lua
-lib/prosody/modules/mod_message.lua
-lib/prosody/modules/mod_motd.lua
-lib/prosody/modules/mod_net_multiplex.lua
-lib/prosody/modules/mod_offline.lua
-lib/prosody/modules/mod_pep.lua
-lib/prosody/modules/mod_ping.lua
-lib/prosody/modules/mod_posix.lua
-lib/prosody/modules/mod_presence.lua
-lib/prosody/modules/mod_privacy.lua
-lib/prosody/modules/mod_private.lua
-lib/prosody/modules/mod_proxy65.lua
-lib/prosody/modules/mod_register.lua
-lib/prosody/modules/mod_roster.lua
-lib/prosody/modules/mod_s2s/mod_s2s.lua
-lib/prosody/modules/mod_s2s/s2sout.lib.lua
-lib/prosody/modules/mod_s2s_auth_certs.lua
-lib/prosody/modules/mod_saslauth.lua
-lib/prosody/modules/mod_server_contact_info.lua
-lib/prosody/modules/mod_storage_internal.lua
-lib/prosody/modules/mod_storage_none.lua
-lib/prosody/modules/mod_storage_sql.lua
-lib/prosody/modules/mod_storage_sql1.lua
-lib/prosody/modules/mod_storage_xep0227.lua
-lib/prosody/modules/mod_time.lua
-lib/prosody/modules/mod_tls.lua
-lib/prosody/modules/mod_unknown.lua
-lib/prosody/modules/mod_uptime.lua
-lib/prosody/modules/mod_vcard.lua
-lib/prosody/modules/mod_version.lua
-lib/prosody/modules/mod_watchregistrations.lua
-lib/prosody/modules/mod_websocket.lua
-lib/prosody/modules/mod_welcome.lua
-lib/prosody/modules/mod_windows.lua
-lib/prosody/modules/muc/mod_muc.lua
-lib/prosody/modules/muc/muc.lib.lua
-lib/prosody/net/adns.lua
-lib/prosody/net/connlisteners.lua
-lib/prosody/net/dns.lua
-lib/prosody/net/http.lua
-lib/prosody/net/http/codes.lua
-lib/prosody/net/http/parser.lua
-lib/prosody/net/http/server.lua
-lib/prosody/net/httpserver.lua
-lib/prosody/net/server.lua
-lib/prosody/net/server_event.lua
-lib/prosody/net/server_select.lua
-lib/prosody/net/websocket.lua
-lib/prosody/prosody.version
-lib/prosody/util/adhoc.lua
-lib/prosody/util/array.lua
-lib/prosody/util/cache.lua
-lib/prosody/util/caps.lua
-lib/prosody/util/dataforms.lua
-lib/prosody/util/datamanager.lua
-lib/prosody/util/datetime.lua
-lib/prosody/util/debug.lua
-lib/prosody/util/dependencies.lua
-lib/prosody/util/encodings.so
-lib/prosody/util/envload.lua
-lib/prosody/util/events.lua
-lib/prosody/util/filters.lua
-lib/prosody/util/format.lua
-lib/prosody/util/hashes.so
-lib/prosody/util/helpers.lua
-lib/prosody/util/hex.lua
-lib/prosody/util/hmac.lua
-lib/prosody/util/http.lua
-lib/prosody/util/id.lua
-lib/prosody/util/import.lua
-lib/prosody/util/interpolation.lua
-lib/prosody/util/ip.lua
-lib/prosody/util/iterators.lua
-lib/prosody/util/jid.lua
-lib/prosody/util/json.lua
-lib/prosody/util/logger.lua
-lib/prosody/util/mercurial.lua
-lib/prosody/util/multitable.lua
-lib/prosody/util/net.so
-lib/prosody/util/openssl.lua
-lib/prosody/util/paths.lua
-lib/prosody/util/pluginloader.lua
-lib/prosody/util/pposix.so
-lib/prosody/util/presence.lua
-lib/prosody/util/prosodyctl.lua
-lib/prosody/util/pubsub.lua
-lib/prosody/util/queue.lua
-lib/prosody/util/random.lua
-lib/prosody/util/rfc6724.lua
-lib/prosody/util/ringbuffer.so
-lib/prosody/util/rsm.lua
-lib/prosody/util/sasl.lua
-lib/prosody/util/sasl/anonymous.lua
-lib/prosody/util/sasl/digest-md5.lua
-lib/prosody/util/sasl/external.lua
-lib/prosody/util/sasl/plain.lua
-lib/prosody/util/sasl/scram.lua
-lib/prosody/util/sasl_cyrus.lua
-lib/prosody/util/serialization.lua
-lib/prosody/util/session.lua
-lib/prosody/util/set.lua
-lib/prosody/util/signal.so
-lib/prosody/util/sql.lua
-lib/prosody/util/sslconfig.lua
-lib/prosody/util/stanza.lua
-lib/prosody/util/statistics.lua
-lib/prosody/util/statsd.lua
-lib/prosody/util/table.so
-lib/prosody/util/template.lua
-lib/prosody/util/termcolours.lua
-lib/prosody/util/throttle.lua
-lib/prosody/util/time.lua
-lib/prosody/util/timer.lua
-lib/prosody/util/uuid.lua
-lib/prosody/util/watchdog.lua
-lib/prosody/util/x509.lua
-lib/prosody/util/xml.lua
-lib/prosody/util/xmppstream.lua
-man/man1/prosodyctl.1
-share/examples/prosody/certs/Makefile
-share/examples/prosody/certs/localhost.cnf
-share/examples/prosody/certs/openssl.cnf
-share/examples/prosody/prosody.cfg.lua
-@pkgdir lib/prosody/modules/storage
diff --git a/prosody/distinfo b/prosody/distinfo
deleted file mode 100644
index fd4ccbf373..0000000000
--- a/prosody/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.14 2017/03/01 16:38:31 fhajny Exp $
-
-SHA1 (prosody-0.10.0.tar.gz) = 57c1c5a665e6453bdde06727ef398cd69accd9d7
-RMD160 (prosody-0.10.0.tar.gz) = dad7a9329fb94bffbaf3177a86aa2740360f74c8
-SHA512 (prosody-0.10.0.tar.gz) = ee66e240afba6a8cb286623da48d9b535798153fb65e32070cec93aafe360e91f7087eeb49dec0f7d145e24f04339ed0878e50835b52f682130b204e22990ce9
-Size (prosody-0.10.0.tar.gz) = 330461 bytes
-SHA1 (patch-Makefile) = d2db1572d2b608c331f388351367fb42413fa7e9
-SHA1 (patch-prosody.cfg.lua.dist) = 001c961b4ee4be12311db12e01c30f3f9b11033c
-SHA1 (patch-util-src_signal.c) = d2a2d61a87d2ddc0d1e2dbce46ec7dffec015a22
diff --git a/prosody/files/prosody.sh b/prosody/files/prosody.sh
deleted file mode 100644
index 7b22581d71..0000000000
--- a/prosody/files/prosody.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# PROVIDE: prosody
-# REQUIRE: DAEMON
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="prosody"
-rcvar=${name}
-ctl_command="@PREFIX@/bin/${name}ctl"
-required_files="@PKG_SYSCONFDIR@/${name}.cfg.lua"
-pidfile="@VARBASE@/run/${name}.pid"
-#start_precmd="ulimit -n 2048"
-extra_commands="reload status"
-
-start_cmd="${ctl_command} start"
-stop_cmd="${ctl_command} stop"
-reload_cmd="${ctl_command} reload"
-status_cmd="${ctl_command} status"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/prosody/files/smf/manifest.xml b/prosody/files/smf/manifest.xml
deleted file mode 100644
index 76d8556c1f..0000000000
--- a/prosody/files/smf/manifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="export">
- <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
- <create_default_instance enabled="false" />
- <single_instance />
- <dependency name="network" grouping="require_all" restart_on="error" type="service">
- <service_fmri value="svc:/milestone/network:default" />
- </dependency>
- <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
- <service_fmri value="svc:/system/filesystem/local" />
- </dependency>
- <method_context></method_context>
- <exec_method type="method" name="start" exec="@PREFIX@/bin/prosodyctl start" timeout_seconds="600" />
- <exec_method type="method" name="stop" exec="@PREFIX@/bin/prosodyctl stop" timeout_seconds="600" />
- <property_group name="startd" type="framework">
- <propval name="duration" type="astring" value="contract" />
- <propval name="ignore_error" type="astring" value="core,signal" />
- </property_group>
- <property_group name="application" type="application">
- <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/prosody.cfg.lua" />
- </property_group>
- <template>
- <common_name>
- <loctext xml:lang="C">Prosody XMPP server</loctext>
- </common_name>
- </template>
- </service>
-</service_bundle>
diff --git a/prosody/patches/patch-Makefile b/prosody/patches/patch-Makefile
deleted file mode 100644
index 8e706dee6a..0000000000
--- a/prosody/patches/patch-Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD$
-
---- Makefile.orig 2017-11-17 20:57:32.803849000 +0000
-+++ Makefile
-@@ -3,10 +3,11 @@ include config.unix
-
- BIN = $(DESTDIR)$(PREFIX)/bin
- CONFIG = $(DESTDIR)$(SYSCONFDIR)
-+EGDIR = $(DESTDIR)@EGDIR@
- MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
- SOURCE = $(DESTDIR)$(LIBDIR)/prosody
- DATA = $(DESTDIR)$(DATADIR)
--MAN = $(DESTDIR)$(PREFIX)/share/man
-+MAN = $(DESTDIR)$(PREFIX)/$(PKGMANDIR)
-
- INSTALLEDSOURCE = $(LIBDIR)/prosody
- INSTALLEDCONFIG = $(SYSCONFDIR)
-@@ -28,35 +29,39 @@ ifeq ($(EXCERTS),yes)
- endif
-
- install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
-- $(MKDIR) $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
-- $(MKDIR_PRIVATE) $(DATA)
-- $(MKDIR) $(MAN)/man1
-- $(MKDIR) $(CONFIG)/certs
-- $(MKDIR) $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
-- $(INSTALL_EXEC) ./prosody.install $(BIN)/prosody
-- $(INSTALL_EXEC) ./prosodyctl.install $(BIN)/prosodyctl
-- $(INSTALL_DATA) core/*.lua $(SOURCE)/core
-- $(INSTALL_DATA) net/*.lua $(SOURCE)/net
-- $(MKDIR) $(SOURCE)/net/http $(SOURCE)/net/websocket
-- $(INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
-- $(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
-- $(INSTALL_DATA) util/*.lua $(SOURCE)/util
-- $(INSTALL_DATA) util/*.so $(SOURCE)/util
-- $(MKDIR) $(SOURCE)/util/sasl
-- $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
-- $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam
-- $(INSTALL_DATA) plugins/*.lua $(MODULES)
-- $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
-- $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
-- $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
-- $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
-- $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
-- $(INSTALL_DATA) certs/* $(CONFIG)/certs
-- $(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
-- test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
-- -test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
-+ $(BSD_INSTALL_SCRIPT_DIR) $(BIN)
-+ $(BSD_INSTALL_DATA_DIR) $(EGDIR)
-+ $(BSD_INSTALL_DATA_DIR) $(MODULES)
-+ $(BSD_INSTALL_DATA_DIR) $(SOURCE)
-+ $(BSD_INSTALL_DATA_DIR) -m 750 $(DATA)
-+ $(BSD_INSTALL_MAN_DIR) $(MAN)/man1
-+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/core
-+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net
-+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util
-+ $(BSD_INSTALL_SCRIPT) ./prosody.install $(BIN)/prosody
-+ $(BSD_INSTALL_SCRIPT) ./prosodyctl.install $(BIN)/prosodyctl
-+ $(BSD_INSTALL_DATA) core/*.lua $(SOURCE)/core
-+ $(BSD_INSTALL_DATA) net/*.lua $(SOURCE)/net
-+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/http
-+ $(BSD_INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
-+ $(BSD_INSTALL_DATA) util/*.lua $(SOURCE)/util
-+ $(BSD_INSTALL_LIB) util/*.so $(SOURCE)/util
-+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util/sasl
-+ $(BSD_INSTALL_DATA) util/sasl/* $(SOURCE)/util/sasl
-+ $(BSD_INSTALL_DATA) plugins/*.lua $(MODULES)
-+ $(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs
-+ $(BSD_INSTALL_DATA) certs/* $(EGDIR)/certs
-+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/adhoc
-+ $(BSD_INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
-+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_s2s
-+ $(BSD_INSTALL_DATA) plugins/mod_s2s/* $(MODULES)/mod_s2s
-+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/muc
-+ $(BSD_INSTALL_DATA) plugins/muc/* $(MODULES)/muc
-+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/storage
-+ $(BSD_INSTALL_MAN) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
-+ $(BSD_INSTALL_DATA) prosody.cfg.lua.install $(EGDIR)/prosody.cfg.lua
-+ $(BSD_INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
- $(MAKE) install -C util-src
--
- clean:
- rm -f prosody.install
- rm -f prosodyctl.install
diff --git a/prosody/patches/patch-prosody.cfg.lua.dist b/prosody/patches/patch-prosody.cfg.lua.dist
deleted file mode 100644
index 694e2856ab..0000000000
--- a/prosody/patches/patch-prosody.cfg.lua.dist
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD$
-
---- prosody.cfg.lua.dist.orig 2017-11-17 20:50:11.470659000 +0000
-+++ prosody.cfg.lua.dist
-@@ -86,7 +86,7 @@ modules_disabled = {
- -- "offline"; -- Store offline messages
- -- "c2s"; -- Handle client connections
- -- "s2s"; -- Handle server-to-server connections
-- -- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
- }
-
- -- Disable account creation by default, for security
-@@ -161,12 +161,13 @@ archive_expires_after = "1w" -- Remove a
- -- Logging configuration
- -- For advanced logging see https://prosody.im/doc/logging
- log = {
-- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
-- error = "prosody.err";
-+ info = "@PROSODY_LOG@/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-+ error = "@PROSODY_LOG@/prosody.err";
- -- "*syslog"; -- Uncomment this for logging to syslog
- -- "*console"; -- Log to the console, useful for debugging with daemonize=false
- }
-
-+
- -- Uncomment to enable statistics
- -- For more info see https://prosody.im/doc/statistics
- -- statistics = "internal"
-@@ -181,6 +182,9 @@ log = {
- -- Location of directory to find certificates in (relative to main config file):
- certificates = "certs"
-
-+-- Enable PID file by default
-+pidfile = "@PROSODY_RUN@/prosody.pid";
-+
- ----------- Virtual hosts -----------
- -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
- -- Settings under each VirtualHost entry apply *only* to that host.
diff --git a/prosody/patches/patch-util-src_signal.c b/prosody/patches/patch-util-src_signal.c
deleted file mode 100644
index f15a72fad0..0000000000
--- a/prosody/patches/patch-util-src_signal.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- util-src/signal.c.orig 2017-11-17 20:50:20.874396000 +0000
-+++ util-src/signal.c
-@@ -31,6 +31,10 @@
- #include <signal.h>
- #include <stdlib.h>
-
-+#ifdef __unix__
-+#include <sys/param.h>
-+#endif
-+
- #include "lua.h"
- #include "lauxlib.h"
-
diff --git a/rc.subr/DESCR b/rc.subr/DESCR
deleted file mode 100644
index 70f61ba9e8..0000000000
--- a/rc.subr/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Portable implementation of the NetBSD rc.d subsystem.
-
-This package allows you to use rc.subr-style rc scripts (such as
-those included in pkgsrc) on other operating systems.
diff --git a/rc.subr/Makefile b/rc.subr/Makefile
deleted file mode 100644
index 3b708bab34..0000000000
--- a/rc.subr/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2012/10/07 14:10:46 asau Exp $
-#
-
-DISTNAME= rc.subr-20030912
-CATEGORIES= pkgtools
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= reed%NetBSD.org@localhost
-HOMEPAGE= http://www.netbsd.org/guide/en/chap-rc.html
-COMMENT= Portable NetBSD rc.subr implementation for pkgsrc
-LICENSE= original-bsd
-
-NOT_FOR_PLATFORM= NetBSD-1.[5-9]*-* NetBSD-[2-9]*-* FreeBSD-[5-9]*-*
-
-NO_EXTRACT= yes
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-
-CONF_FILES= ${EGDIR}/rc.conf.example ${PKG_SYSCONFDIR}/rc.conf
-# XXX consider not-hardcoding /etc/rc.subr in all rc.d scripts
-SUPPORT_FILES= ${EGDIR}/rc.subr ${PKG_SYSCONFDIR}/rc.subr
-
-# XXX not in PLIST because I am hoping that it will automatic soon
-RCD_SCRIPTS= DAEMON LOGIN NETWORKING SERVERS
-
-PS_ARG= "-ax"
-PS_FORMAT= "-o pid,command"
-WHOAMI?= /usr/bin/whoami
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-PS_ARG= "-ef"
-PS_FORMAT= "-o pid,comm"
-WHOAMI= "/usr/ucb/whoami"
-.elif ${OPSYS} == "Linux"
-PS_ARG= "ax"
-.endif
-
-FILES_SUBST+= NICE=${NICE:Q}
-FILES_SUBST+= OPSYS=${OPSYS}
-FILES_SUBST+= PS=${PS:Q}
-FILES_SUBST+= PS_ARG=${PS_ARG:Q}
-FILES_SUBST+= PS_FORMAT=${PS_FORMAT:Q}
-FILES_SUBST+= WHOAMI=${WHOAMI:Q}
-
-do-extract:
- ${SED} ${FILES_SUBST_SED} ${FILESDIR}/rc.subr > ${WRKDIR}/rc.subr
-
-do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${FILESDIR}/rc.conf.example ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKDIR}/rc.subr ${DESTDIR}${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/rc.subr/PLIST b/rc.subr/PLIST
deleted file mode 100644
index cea71ce3e5..0000000000
--- a/rc.subr/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/11 10:45:13 thomasklausner Exp $
-share/examples/rc.d/DAEMON
-share/examples/rc.d/LOGIN
-share/examples/rc.d/NETWORKING
-share/examples/rc.d/SERVERS
-share/examples/rc.subr/rc.conf.example
-share/examples/rc.subr/rc.subr
diff --git a/rc.subr/TODO b/rc.subr/TODO
deleted file mode 100644
index 45402f7ac1..0000000000
--- a/rc.subr/TODO
+++ /dev/null
@@ -1,25 +0,0 @@
-rc.subr usage WARNING refers to manual page
-/etc/rc.d/sshd: WARNING: $sshd is not set properly - see rc.conf(5)
-
-and example rc.conf should mentions manual page but it is not installed
-
-need to install manual pages: rc.conf and rc.subr, but NetBSD
-versions are too NetBSD specific
-
-should figure out paths to commands before installing
-in rc.subr
-
-why not always use "echo"?
-
-maybe backup_file should be in another shell script?
-does FreeBSD rcNG have that?
-
-make sure this works same as FreeBSD would expect
-
-get rid of that OPSYS check in rc.subr
-
-get rid of many _RCCMD_ parts by using @WHATEVER@ directly in code ??
-
-on my own Linux, depend on my packages for mount, logger, kill, bash, etc...
-
-improve DESCRiption
diff --git a/rc.subr/files/DAEMON.sh b/rc.subr/files/DAEMON.sh
deleted file mode 100644
index 519146c204..0000000000
--- a/rc.subr/files/DAEMON.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: DAEMON.sh,v 1.1.1.1 2003/09/13 22:48:01 jeremy-c-reed Exp $
-#
-
-# PROVIDE: DAEMON
-# REQUIRE: NETWORKING SERVERS
-
-# This is a dummy dependency, to ensure that general purpose daemons
-# are run _after_ the above are.
diff --git a/rc.subr/files/LOGIN.sh b/rc.subr/files/LOGIN.sh
deleted file mode 100644
index e9424aec11..0000000000
--- a/rc.subr/files/LOGIN.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: LOGIN.sh,v 1.1.1.1 2003/09/13 22:47:58 jeremy-c-reed Exp $
-#
-
-# PROVIDE: LOGIN
-# REQUIRE: DAEMON
-
-# This is a dummy dependency to ensure user services such as xdm,
-# inetd, cron and kerberos are started after everything else, in
-# case the administrator has increased the system security level
-# and wants to delay user logins until the system is (almost) fully
-# operational.
diff --git a/rc.subr/files/NETWORKING.sh b/rc.subr/files/NETWORKING.sh
deleted file mode 100644
index d143afc03f..0000000000
--- a/rc.subr/files/NETWORKING.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: NETWORKING.sh,v 1.1.1.1 2003/09/13 22:47:59 jeremy-c-reed Exp $
-#
-
-# PROVIDE: NETWORKING NETWORK
-
-# This is a dummy dependency, for services which require networking
-# to be operational before starting.
diff --git a/rc.subr/files/SERVERS.sh b/rc.subr/files/SERVERS.sh
deleted file mode 100644
index ffb93f0108..0000000000
--- a/rc.subr/files/SERVERS.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: SERVERS.sh,v 1.1.1.1 2003/09/13 22:47:59 jeremy-c-reed Exp $
-#
-
-# PROVIDE: SERVERS
-# REQUIRE: mountcritremote
-
-# This is a dummy dependency, for early-start servers relying on
-# some basic configuration.
diff --git a/rc.subr/files/rc.conf.example b/rc.subr/files/rc.conf.example
deleted file mode 100644
index e29267e8ea..0000000000
--- a/rc.subr/files/rc.conf.example
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: rc.conf.example,v 1.1.1.1 2003/09/13 22:47:58 jeremy-c-reed Exp $
-#
-# Use program=YES to enable program, NO to disable it. program_flags are
-# passed to the program on the command line.
-#
-
diff --git a/rc.subr/files/rc.subr b/rc.subr/files/rc.subr
deleted file mode 100644
index aabbd13112..0000000000
--- a/rc.subr/files/rc.subr
+++ /dev/null
@@ -1,916 +0,0 @@
-# $NetBSD: rc.subr,v 1.1.1.1 2003/09/13 22:47:59 jeremy-c-reed Exp $
-#
-# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Luke Mewburn.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the NetBSD
-# Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# rc.subr
-# functions used by various rc scripts
-#
-
-# global variables
-# ----------------
-
-_RCCMD_chown="@CHOWN@"
-_RCCMD_chroot="/usr/sbin/chroot"
-_RCCMD_ci="/usr/bin/ci"
-_RCCMD_co="/usr/bin/co"
-_RCCMD_cp="@CP@"
-_RCCMD_echo="@ECHO@"
-_RCCMD_kill="/bin/kill"
-_RCCMD_logger="/usr/bin/logger"
-_RCCMD_mount="/sbin/mount"
-_RCCMD_mv="@MV@"
-_RCCMD_nice="@NICE@"
-_RCCMD_ps="@PS@"
-_RCCMD_rcs="/usr/bin/rcs"
-_RCCMD_rm="@RM@"
-_RCCMD_sh="@RCD_SCRIPTS_SHELL@"
-_RCCMD_su="@SU@"
-_RCCMD_systrace="/bin/systrace"
-_RCCMD_whoami="@WHOAMI@"
-
-_RCARG_psformat="@PS_FORMAT@"
-_RCARG_ps="@PS_ARG@"
-
-#
-# functions
-# ---------
-
-#
-# checkyesno var
-# Test $1 variable, and warn if not set to YES or NO.
-# Return 0 if it's "yes" (et al), nonzero otherwise.
-#
-checkyesno()
-{
- eval _value=\$${1}
- case $_value in
-
- # "yes", "true", "on", or "1"
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
- return 0
- ;;
-
- # "no", "false", "off", or "0"
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
- return 1
- ;;
- *)
- warn "\$${1} is not set properly - see rc.conf(5)."
- return 1
- ;;
- esac
-}
-
-# reverse_list list
-# print the list in reverse order
-#
-reverse_list()
-{
- _revlist=
- for _revfile; do
- _revlist="$_revfile $_revlist"
- done
- ${_RCCMD_echo} $_revlist
-}
-
-#
-# mount_critical_filesystems type
-# Go through the list of critical filesystems as provided in
-# the rc.conf(5) variable $critical_filesystems_${type}, checking
-# each one to see if it is mounted, and if it is not, mounting it.
-#
-mount_critical_filesystems()
-{
- eval _fslist=\$critical_filesystems_${1}
- for _fs in $_fslist; do
- ${_RCCMD_mount} | (
- _ismounted=false
- while read what _on on _type type; do
- if [ $on = $_fs ]; then
- _ismounted=true
- fi
- done
- if $_ismounted; then
- :
- else
- ${_RCCMD_mount} $_fs >/dev/null 2>&1
- fi
- )
- done
-}
-
-#
-# check_pidfile pidfile procname [interpreter]
-# Parses the first line of pidfile for a PID, and ensures
-# that the process is running and matches procname.
-# Prints the matching PID upon success, nothing otherwise.
-# interpreter is optional; see _find_processes() for details.
-#
-check_pidfile()
-{
- _pidfile=$1
- _procname=$2
- _interpreter=$3
- if [ -z "$_pidfile" -o -z "$_procname" ]; then
- err 3 'USAGE: check_pidfile pidfile procname [interpreter]'
- fi
- if [ ! -f $_pidfile ]; then
- return
- fi
- read _pid _junk < $_pidfile
- if [ -z "$_pid" ]; then
- return
- fi
- _find_processes $_procname ${_interpreter:-.} '-p '"$_pid"
-}
-
-#
-# check_process procname [interpreter]
-# Ensures that a process (or processes) named procname is running.
-# Prints a list of matching PIDs.
-# interpreter is optional; see _find_processes() for details.
-#
-check_process()
-{
- _procname=$1
- _interpreter=$2
- if [ -z "$_procname" ]; then
- err 3 'USAGE: check_process procname [interpreter]'
- fi
- _find_processes $_procname ${_interpreter:-.} ${_RCARG_ps}
-}
-
-#
-# _find_processes procname interpreter psargs
-# Search for procname in the output of ps generated by psargs.
-# Prints the PIDs of any matching processes, space separated.
-#
-# If interpreter == ".", check the following variations of procname
-# against the first word of each command:
-# procname
-# `basename procname`
-# `basename procname` + ":"
-# "(" + `basename procname` + ")"
-#
-# If interpreter != ".", read the first line of procname, remove the
-# leading #!, normalise whitespace, append procname, and attempt to
-# match that against each command, either as is, or with extra words
-# at the end.
-#
-_find_processes()
-{
- if [ $# -ne 3 ]; then
- err 3 'USAGE: _find_processes procname interpreter psargs'
- fi
- _procname=$1
- _interpreter=$2
- _psargs=$3
-
- _pref=
- if [ $_interpreter != "." ]; then # an interpreted script
- read _interp < $_procname # read interpreter name
- _interp=${_interp#\#!} # strip #!
- set -- $_interp
- if [ $_interpreter != $1 ]; then
- warn "\$command_interpreter $_interpreter != $1"
- fi
- _interp="$* $_procname" # cleanup spaces, add _procname
- _fp_args='_argv'
- _fp_match='case "$_argv" in
- ${_interp}|"${_interp} "*)'
- else # a normal daemon
- _procnamebn=${_procname##*/}
- _fp_args='_arg0 _argv'
- _fp_match='case "$_arg0" in
- $_procname|$_procnamebn|${_procnamebn}:|"(${_procnamebn})")'
- fi
-
- _proccheck='
- ${_RCCMD_ps} ${_RCARG_psformat} '"$_psargs"' |
- while read _npid '"$_fp_args"'; do
- case "$_npid" in
- PID)
- continue ;;
- esac ; '"$_fp_match"'
- ${_RCCMD_echo} -n "$_pref$_npid" ;
- _pref=" "
- ;;
- esac
- done'
-
- eval $_proccheck
-}
-
-#
-# wait_for_pids pid [pid ...]
-# spins until none of the pids exist
-#
-wait_for_pids()
-{
- _list="$@"
- if [ -z "$_list" ]; then
- return
- fi
- _prefix=
- while true; do
- _nlist="";
- for _j in $_list; do
- if ${_RCCMD_kill} -0 $_j 2>/dev/null; then
- _nlist="${_nlist}${_nlist:+ }$_j"
- fi
- done
- if [ -z "$_nlist" ]; then
- break
- fi
- _list=$_nlist
- ${_RCCMD_echo} -n ${_prefix:-"Waiting for PIDS: "}$_list
- _prefix=", "
- sleep 2
- done
- if [ -n "$_prefix" ]; then
- ${_RCCMD_echo} "."
- fi
-}
-
-#
-# run_rc_command argument
-# Search for argument in the list of supported commands, which is:
-# "start stop restart rcvar status poll ${extra_commands}"
-# If there's a match, run ${argument}_cmd or the default method
-# (see below).
-#
-# If argument has a given prefix, then change the operation as follows:
-# Prefix Operation
-# ------ ---------
-# fast Skip the pid check, and set rc_fast=yes
-# force Set ${rcvar} to YES, and set rc_force=yes
-#
-# The following globals are used:
-#
-# Name Needed Purpose
-# ---- ------ -------
-# name y Name of script.
-#
-# command n Full path to command.
-# Not needed if ${rc_arg}_cmd is set for
-# each keyword.
-#
-# command_args n Optional args/shell directives for command.
-#
-# command_interpreter n If not empty, command is interpreted, so
-# call check_{pidfile,process}() appropriately.
-#
-# extra_commands n List of extra commands supported.
-#
-# pidfile n If set, use check_pidfile $pidfile $command,
-# otherwise use check_process $command.
-# In either case, only check if $command is set.
-#
-# procname n Process name to check for instead of $command.
-#
-# rcvar n This is checked with checkyesno to determine
-# if the action should be run.
-#
-# ${name}_chroot n Directory to chroot to before running ${command}
-# Requires /usr to be mounted.
-#
-# ${name}_chdir n Directory to cd to before running ${command}
-# (if not using ${name}_chroot).
-#
-# ${name}_flags n Arguments to call ${command} with.
-# NOTE: $flags from the parent environment
-# can be used to override this.
-#
-# ${name}_nice n Nice level to run ${command} at.
-#
-# ${name}_user n User to run ${command} as, using su(1) if not
-# using ${name}_chroot.
-# Requires /usr to be mounted.
-#
-# ${name}_group n Group to run chrooted ${command} as.
-# Requires /usr to be mounted.
-#
-# ${name}_groups n Comma separated list of supplementary groups
-# to run the chrooted ${command} with.
-# Requires /usr to be mounted.
-#
-# ${name}_systrace n Flags passed to systrace(1) if it is used.
-# Setting this variable enables systracing
-# of the given program. The use of "-a" is
-# recommended so that the boot process is not
-# stalled. In order to pass no flags to
-# systrace, set this variable to "--".
-#
-# ${rc_arg}_cmd n If set, use this as the method when invoked;
-# Otherwise, use default command (see below)
-#
-# ${rc_arg}_precmd n If set, run just before performing the
-# ${rc_arg}_cmd method in the default
-# operation (i.e, after checking for required
-# bits and process (non)existence).
-# If this completes with a non-zero exit code,
-# don't run ${rc_arg}_cmd.
-#
-# ${rc_arg}_postcmd n If set, run just after performing the
-# ${rc_arg}_cmd method, if that method
-# returned a zero exit code.
-#
-# required_dirs n If set, check for the existence of the given
-# directories before running the default
-# (re)start command.
-#
-# required_files n If set, check for the readability of the given
-# files before running the default (re)start
-# command.
-#
-# required_vars n If set, perform checkyesno on each of the
-# listed variables before running the default
-# (re)start command.
-#
-# Default behaviour for a given argument, if no override method is
-# provided:
-#
-# Argument Default behaviour
-# -------- -----------------
-# start if !running && checkyesno ${rcvar}
-# ${command}
-#
-# stop if ${pidfile}
-# rc_pid=$(check_pidfile $pidfile $command)
-# else
-# rc_pid=$(check_process $command)
-# kill $sig_stop $rc_pid
-# wait_for_pids $rc_pid
-# ($sig_stop defaults to TERM.)
-#
-# reload Similar to stop, except use $sig_reload instead,
-# and doesn't wait_for_pids.
-# $sig_reload defaults to HUP.
-#
-# restart Run `stop' then `start'.
-#
-# status Show if ${command} is running, etc.
-#
-# poll Wait for ${command} to exit.
-#
-# rcvar Display what rc.conf variable is used (if any).
-#
-# Variables available to methods, and after run_rc_command() has
-# completed:
-#
-# Variable Purpose
-# -------- -------
-# rc_arg Argument to command, after fast/force processing
-# performed
-#
-# rc_flags Flags to start the default command with.
-# Defaults to ${name}_flags, unless overridden
-# by $flags from the environment.
-# This variable may be changed by the precmd method.
-#
-# rc_pid PID of command (if appropriate)
-#
-# rc_fast Not empty if "fast" was provided (q.v.)
-#
-# rc_force Not empty if "force" was provided (q.v.)
-#
-#
-run_rc_command()
-{
- rc_arg=$1
- if [ -z "$name" ]; then
- err 3 'run_rc_command: $name is not set.'
- fi
-
- case "$rc_arg" in
- fast*) # "fast" prefix; don't check pid
- rc_arg=${rc_arg#fast}
- rc_fast=yes
- ;;
- force*) # "force prefix; always start
- rc_arg=${rc_arg#force}
- rc_force=yes
- if [ -n "${rcvar}" ]; then
- eval ${rcvar}=YES
- fi
- ;;
- esac
-
- _keywords="start stop restart rcvar $extra_commands"
- rc_pid=
- _pidcmd=
- _procname=${procname:-${command}}
-
- # setup pid check command if not fast
- if [ -z "$rc_fast" -a -n "$_procname" ]; then
- if [ -n "$pidfile" ]; then
- _pidcmd='rc_pid=$(check_pidfile '"$pidfile $_procname $command_interpreter"')'
- else
- _pidcmd='rc_pid=$(check_process '"$_procname $command_interpreter"')'
- fi
- if [ -n "$_pidcmd" ]; then
- _keywords="${_keywords} status poll"
- fi
- fi
-
- if [ -z "$rc_arg" ]; then
- rc_usage "$_keywords"
- fi
-
- if [ -n "$flags" ]; then # allow override from environment
- rc_flags=$flags
- else
- eval rc_flags=\$${name}_flags
- fi
- eval _chdir=\$${name}_chdir _chroot=\$${name}_chroot \
- _nice=\$${name}_nice _user=\$${name}_user \
- _group=\$${name}_group _groups=\$${name}_groups \
- _systrace=\$${name}_systrace
-
- if [ -n "$_user" ]; then # unset $_user if running as that user
- if [ "$_user" = "$($_RCCMD_whoami)" ]; then
- unset _user
- fi
- fi
-
- # if ${rcvar} is set, and $1 is not
- # "rcvar", then run
- # checkyesno ${rcvar}
- # and return if that failed
- #
- if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then
- if ! checkyesno ${rcvar}; then
- return 0
- fi
- fi
-
- eval $_pidcmd # determine the pid if necessary
-
- for _elem in $_keywords; do
- if [ "$_elem" != "$rc_arg" ]; then
- continue
- fi
-
- # if there's a custom ${XXX_cmd},
- # run that instead of the default
- #
- eval _cmd=\$${rc_arg}_cmd _precmd=\$${rc_arg}_precmd \
- _postcmd=\$${rc_arg}_postcmd
- if [ -n "$_cmd" ]; then
- # if the precmd failed and force
- # isn't set, exit
- #
- if ! eval $_precmd && [ -z "$rc_force" ]; then
- return 1
- fi
-
- if ! eval $_cmd && [ -z "$rc_force" ]; then
- return 1
- fi
- eval $_postcmd
- return 0
- fi
-
- case "$rc_arg" in # default operations...
-
- status)
- if [ -n "$rc_pid" ]; then
- ${_RCCMD_echo} \
- "${name} is running as pid $rc_pid."
- else
- ${_RCCMD_echo} "${name} is not running."
- return 1
- fi
- ;;
-
- start)
- if [ -n "$rc_pid" ]; then
- ${_RCCMD_echo} \
- "${name} already running? (pid=$rc_pid)."
- exit 1
- fi
-
- if [ ! -x ${_chroot}${command} ]; then
- return 0
- fi
-
- # check for required variables,
- # directories, and files
- #
- for _f in $required_vars; do
- if ! checkyesno $_f; then
- warn "\$${_f} is not set."
- if [ -z "$rc_force" ]; then
- return 1
- fi
- fi
- done
- for _f in $required_dirs; do
- if [ ! -d "${_f}/." ]; then
- warn "${_f} is not a directory."
- if [ -z "$rc_force" ]; then
- return 1
- fi
- fi
- done
- for _f in $required_files; do
- if [ ! -r "${_f}" ]; then
- warn "${_f} is not readable."
- if [ -z "$rc_force" ]; then
- return 1
- fi
- fi
- done
-
- # if the precmd failed and force
- # isn't set, exit
- #
- if ! eval $_precmd && [ -z "$rc_force" ]; then
- return 1
- fi
-
- # setup the command to run, and run it
- #
- ${_RCCMD_echo} "Starting ${name}."
- if [ -n "$_chroot" ]; then
- if [ "${OPSYS}" = "SunOS" ]; then
- _doit="\
-${_nice:+${_RCCMD_nice} -n $_nice }\
-${_RCCMD_chroot} $_chroot"
- if [ -n "$_user" ]; then
- _doit="\
-$_doit ${_RCCMD_su} -m $_user \
--c '${_RCCMD_sh} -c'"
- fi
- _doit="\
-$_doit $command $rc_flags $command_args"
- else
- _doit="\
-${_nice:+${_RCCMD_nice} -n $_nice }\
-${_systrace:+${_RCCMD_systrace} $_systrace }\
-${_RCCMD_chroot} ${_user:+-u $_user }${_group:+-g $_group }\
-${_groups:+-G $_groups } $_chroot $command $rc_flags $command_args"
- fi
- else
- _doit="\
-${_chdir:+cd $_chdir; }\
-${_nice:+${_RCCMD_nice} -n $_nice }\
-${_systrace:+${_RCCMD_systrace} $_systrace }\
-$command $rc_flags $command_args"
- if [ -n "$_user" ]; then
- _doit="${_RCCMD_su} -m $_user \
- -c '${_RCCMD_sh} -c \"$_doit\"'"
- fi
- fi
-
- # if the cmd failed and force
- # isn't set, exit
- #
- if ! eval $_doit && [ -z "$rc_force" ]; then
- return 1
- fi
-
- # finally, run postcmd
- #
- eval $_postcmd
- ;;
-
- stop)
- if [ -z "$rc_pid" ]; then
- if [ -n "$pidfile" ]; then
- ${_RCCMD_echo} \
- "${name} not running? (check $pidfile)."
- else
- ${_RCCMD_echo} "${name} not running?"
- fi
- exit 1
- fi
-
- # if the precmd failed and force
- # isn't set, exit
- #
- if ! eval $_precmd && [ -z "$rc_force" ]; then
- return 1
- fi
-
- # send the signal to stop
- #
- ${_RCCMD_echo} "Stopping ${name}."
- _doit="${_RCCMD_kill} -${sig_stop:-TERM} $rc_pid"
- if [ -n "$_user" ]; then
- _doit="${_RCCMD_su} -m $_user \
- -c '${_RCCMD_sh} -c \"$_doit\"'"
- fi
-
- # if the stop cmd failed and force
- # isn't set, exit
- #
- if ! eval $_doit && [ -z "$rc_force" ]; then
- return 1
- fi
-
- # wait for the command to exit,
- # and run postcmd.
- wait_for_pids $rc_pid
- eval $_postcmd
- ;;
-
- reload)
- if [ -z "$rc_pid" ]; then
- if [ -n "$pidfile" ]; then
- ${_RCCMD_echo} \
- "${name} not running? (check $pidfile)."
- else
- ${_RCCMD_echo} "${name} not running?"
- fi
- exit 1
- fi
- ${_RCCMD_echo} "Reloading ${name} config files."
- if ! eval $_precmd && [ -z "$rc_force" ]; then
- return 1
- fi
- _doit="${_RCCMD_kill} -${sig_reload:-HUP} $rc_pid"
- if [ -n "$_user" ]; then
- _doit="${_RCCMD_su} -m $_user -c '${_RCCMD_sh} -c \"$_doit\"'"
- fi
- if ! eval $_doit && [ -z "$rc_force" ]; then
- return 1
- fi
- eval $_postcmd
- ;;
-
- restart)
- if ! eval $_precmd && [ -z "$rc_force" ]; then
- return 1
- fi
- # prevent restart being called more
- # than once by any given script
- #
- if ${_rc_restart_done:-false}; then
- return 0
- fi
- _rc_restart_done=true
-
- ( $0 ${rc_force:+force}stop )
- $0 ${rc_force:+force}start
-
- eval $_postcmd
- ;;
-
- poll)
- if [ -n "$rc_pid" ]; then
- wait_for_pids $rc_pid
- fi
- ;;
-
- rcvar)
- ${_RCCMD_echo} "# $name"
- if [ -n "$rcvar" ]; then
- if checkyesno ${rcvar}; then
- ${_RCCMD_echo} "\$${rcvar}=YES"
- else
- ${_RCCMD_echo} "\$${rcvar}=NO"
- fi
- fi
- ;;
-
- *)
- rc_usage "$_keywords"
- ;;
-
- esac
- return 0
- done
-
- ${_RCCMD_echo} 1>&2 "$0: unknown directive '$rc_arg'."
- rc_usage "$_keywords"
- exit 1
-}
-
-#
-# run_rc_script file arg
-# Start the script `file' with `arg', and correctly handle the
-# return value from the script. If `file' ends with `.sh', it's
-# sourced into the current environment. If `file' appears to be
-# a backup or scratch file, ignore it. Otherwise if it's
-# executable run as a child process.
-#
-run_rc_script()
-{
- _file=$1
- _arg=$2
- if [ -z "$_file" -o -z "$_arg" ]; then
- err 3 'USAGE: run_rc_script file arg'
- fi
-
- unset name command command_args command_interpreter \
- extra_commands pidfile procname \
- rcvar required_dirs required_files required_vars
- eval unset ${_arg}_cmd ${_arg}_precmd ${_arg}_postcmd
-
- case "$_file" in
- *.sh) # run in current shell
- set $_arg ; . $_file
- ;;
- *[~#]|*.OLD|*.orig|*,v) # scratch file; skip
- warn "Ignoring scratch file $_file"
- ;;
- *) # run in subshell
- if [ -x $_file ]; then
- if [ -n "$rc_fast_and_loose" ]; then
- set $_arg ; . $_file
- else
- ( set $_arg ; . $_file )
- fi
- fi
- ;;
- esac
-}
-
-#
-# load_rc_config
-# Source in the configuration file for a given command.
-#
-load_rc_config()
-{
- _command=$1
- if [ -z "$_command" ]; then
- err 3 'USAGE: load_rc_config command'
- fi
-
- if ${_rc_conf_loaded:-false}; then
- :
- else
- . /etc/rc.conf
- _rc_conf_loaded=true
- fi
- if [ -f /etc/rc.conf.d/"$_command" ]; then
- . /etc/rc.conf.d/"$_command"
- fi
-}
-
-
-#
-# rc_usage commands
-# Print a usage string for $0, with `commands' being a list of
-# valid commands.
-#
-rc_usage()
-{
- ${_RCCMD_echo} -n 1>&2 "Usage: $0 [fast|force]("
-
- _sep=
- for _elem; do
- ${_RCCMD_echo} -n 1>&2 "$_sep$_elem"
- _sep="|"
- done
- ${_RCCMD_echo} 1>&2 ")"
- exit 1
-}
-
-#
-# err exitval message
-# Display message to stderr and log to the syslog, and exit with exitval.
-#
-err()
-{
- exitval=$1
- shift
-
- if [ -x ${_RCCMD_logger} ]; then
- ${_RCCMD_logger} "$0: ERROR: $*"
- fi
- ${_RCCMD_echo} 1>&2 "$0: ERROR: $*"
- exit $exitval
-}
-
-#
-# warn message
-# Display message to stderr and log to the syslog.
-#
-warn()
-{
- if [ -x ${_RCCMD_logger} ]; then
- ${_RCCMD_logger} "$0: WARNING: $*"
- fi
- ${_RCCMD_echo} 1>&2 "$0: WARNING: $*"
-}
-
-#
-# backup_file action file cur backup
-# Make a backup copy of `file' into `cur', and save the previous
-# version of `cur' as `backup' or use rcs for archiving.
-#
-# This routine checks the value of the backup_uses_rcs variable,
-# which can be either YES or NO.
-#
-# The `action' keyword can be one of the following:
-#
-# add `file' is now being backed up (and is possibly
-# being reentered into the backups system). `cur'
-# is created and RCS files, if necessary, are
-# created as well.
-#
-# update `file' has changed and needs to be backed up.
-# If `cur' exists, it is copied to to `back' or
-# checked into RCS (if the repository file is old),
-# and then `file' is copied to `cur'. Another RCS
-# check in done here if RCS is being used.
-#
-# remove `file' is no longer being tracked by the backups
-# system. If RCS is not being used, `cur' is moved
-# to `back', otherwise an empty file is checked in,
-# and then `cur' is removed.
-#
-#
-backup_file()
-{
- _action=$1
- _file=$2
- _cur=$3
- _back=$4
-
- if checkyesno backup_uses_rcs; then
- _msg0="backup archive"
- _msg1="update"
-
- # ensure that history file is not locked
- if [ -f $_cur,v ]; then
- ${_RCCMD_rcs} -q -u -U -M $_cur
- fi
-
- # ensure after switching to rcs that the
- # current backup is not lost
- if [ -f $_cur ]; then
- # no archive, or current newer than archive
- if [ ! -f $_cur,v -o $_cur -nt $_cur,v ]; then
- ${_RCCMD_ci} -q -f -u -t-"$_msg0" \
- -m"$_msg1" $_cur
- ${_RCCMD_rcs} -q -kb -U $_cur
- ${_RCCMD_co} -q -f -u $_cur
- fi
- fi
-
- case $_action in
- add|update)
- ${_RCCMD_cp} -p $_file $_cur
- ${_RCCMD_ci} -q -f -u -t-"$_msg0" -m"$_msg1" $_cur
- ${_RCCMD_rcs} -q -kb -U $_cur
- ${_RCCMD_co} -q -f -u $_cur
- ${_RCCMD_chown} root:wheel $_cur $_cur,v
- ;;
- remove)
- ${_RCCMD_cp} /dev/null $_cur
- ${_RCCMD_ci} -q -f -u -t-"$_msg0" -m"$_msg1" $_cur
- ${_RCCMD_rcs} -q -kb -U $_cur
- ${_RCCMD_chown} root:wheel $_cur $_cur,v
- ${_RCCMD_rm} $_cur
- ;;
- esac
- else
- case $_action in
- add|update)
- if [ -f $_cur ]; then
- ${_RCCMD_cp} -p $_cur $_back
- fi
- ${_RCCMD_cp} -p $_file $_cur
- ${_RCCMD_chown} root:wheel $_cur
- ;;
- remove)
- ${_RCCMD_mv} -f $_cur $_back
- ;;
- esac
- fi
-}
diff --git a/revbump/COMMIT_MSG b/revbump/COMMIT_MSG
deleted file mode 100644
index 66723e8c3b..0000000000
--- a/revbump/COMMIT_MSG
+++ /dev/null
@@ -1,10 +0,0 @@
-Update 2.11 to 2.12
--------------------
- - Now allow /usr/pkgsrc be symlink.
- The other location of /usr/pkgsrc may be either
- * symlink from /usr/pkgsrc (since 2.12) or
- * PKGSRCDIR environment variable (since 2.11)
- - Add -c option only for debug as:
- [-c file_to_check]
- -c (debug) see if the file is defined in %HASH
- %HASH is internal database for files to handle
diff --git a/revbump/DESCR b/revbump/DESCR
deleted file mode 100644
index 7f74cd8816..0000000000
--- a/revbump/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Tools for bumping PKGREVISIONs and adapting BUILDLINK_ABI_DEPENDS
-versions to the latest version automatically.
-
-This tool is mostly intended for pkgsrc developers with commit
-access.
diff --git a/revbump/Makefile b/revbump/Makefile
deleted file mode 100644
index 7e84d72bd3..0000000000
--- a/revbump/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2015/09/06 01:47:48 makoto Exp $
-
-PKGNAME= revbump-2.11
-PKGREVISION= 1
-CATEGORIES= pkgtools
-
-MAINTAINER= wiz%NetBSD.org@localhost
-HOMEPAGE= http://www.pkgsrc.org/
-COMMENT= Tools for bumping PKGREVISIONs (for pkgsrc developers)
-LICENSE= modified-bsd
-
-WRKSRC= ${WRKDIR}
-NO_CONFIGURE= yes
-USE_TOOLS+= perl:run
-USE_LANGUAGES= # empty
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-build:
-.for i in blbump finddepends revbump replace-commonbump check-cvs-diff
- ${SED} -e "s!@PERL@!${PERL5}!g" -e "s! make ! ${MAKE} !g" \
- ${FILESDIR}/${i} > ${WRKDIR}/${i}
-.endfor
-
-do-install:
-.for i in blbump finddepends revbump replace-commonbump check-cvs-diff
- ${INSTALL_SCRIPT} ${WRKDIR}/${i} ${DESTDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${FILESDIR}/${i}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/revbump/PLIST b/revbump/PLIST
deleted file mode 100644
index 5156f08378..0000000000
--- a/revbump/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2015/01/08 15:32:10 makoto Exp $
-bin/blbump
-bin/check-cvs-diff
-bin/finddepends
-bin/replace-commonbump
-bin/revbump
-man/man1/blbump.1
-man/man1/check-cvs-diff.1
-man/man1/finddepends.1
-man/man1/replace-commonbump.1
-man/man1/revbump.1
diff --git a/revbump/files/blbump b/revbump/files/blbump
deleted file mode 100644
index 28a318a7ee..0000000000
--- a/revbump/files/blbump
+++ /dev/null
@@ -1,148 +0,0 @@
-#!@PERL@ -w
-# -*- perl -*-
-#
-# $NetBSD: blbump,v 1.3 2015/01/08 15:32:10 makoto Exp $
-#
-# Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
-#
-# This code was originally contributed to the NetBSD Foundation, Inc.
-# by Julio Merino <jmmv%NetBSD.org@localhost> and Thomas Klausner <wiz%NetBSD.org@localhost>.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of author nor the names of its contributors may
-# be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-use strict;
-use Getopt::Std;
-
-my (@PACKAGES, $PKGSRCDIR, %opt, $pkg);
-
-$PKGSRCDIR = $ENV{PKGSRCDIR};
-if (! $PKGSRCDIR) {
- $PKGSRCDIR = "/usr/pkgsrc";
-}
-
-sub usage {
- print STDERR "usage: blbump [-h] [-p pkgsrcdir] [cat1/pkg1 ... catN/pkgN]\n\n";
- print STDERR "If no packages are given as arguments, the list is read from stdin.\n";
- print STDERR "Packages whose buildlink files cannot be updated automatically\n";
- print STDERR "are written to stdout.\n";
- exit 0;
-}
-
-sub blbump {
- my $pkgdir = shift;
- my ($pkgver, $ret);
- local (*MAKE);
-
- # ignore packages without buildlink3.mk files
- if (not -e "$PKGSRCDIR/$pkgdir/buildlink3.mk") {
- return 1;
- }
- open(MAKE, '-|', "cd $PKGSRCDIR/$pkgdir ; make show-var VARNAME=PKGNAME");
- $pkgver = <MAKE>;
- close(MAKE);
- chop $pkgver;
- $pkgver =~ s/-([^-]*)$/>=$1/;
-
- if (-f "$PKGSRCDIR/$pkgdir/buildlink3.mk") {
- $ret = bumpbl("$PKGSRCDIR/$pkgdir/buildlink3.mk", $pkgver);
- if ($ret == 0) {
- return 0;
- }
- }
-
- return 1;
-}
-
-sub bumpbl {
- my ($backupbl, $done, $newbl, $oldbl, $pkgver);
- $oldbl = shift;
- $pkgver = shift;
- local (*OLDBL);
-
- open(OLDBL, $oldbl) or return 0;
- $newbl = "$oldbl.new";
- open(NEWBL, ">$newbl");
-
- $done = 0;
- while (<OLDBL>) {
- if ($done == 0 && /^(BUILDLINK_ABI_DEPENDS.+=[ \t]+)(.+)$/) {
- print NEWBL "$1$pkgver\n";
- $done = 1;
- } elsif ($done == 0 && /^BUILDLINK_PKGSRCDIR(.*=[ \t]+)/) {
- print NEWBL "BUILDLINK_ABI_DEPENDS${1}$pkgver\n";
- print NEWBL $_;
- $done = 1;
- } else {
- print NEWBL $_;
- }
- }
-
- # no suitable place found
- if ($done == 0) {
- close(NEWBL);
- close(OLDBL);
- unlink "$newbl";
- return 0;
- }
-
- close(NEWBL);
- close(OLDBL);
- rename("$newbl", "$oldbl");
-
- return 1;
-}
-
-getopts('hp:', \%opt);
-usage() if $opt{h};
-if ($opt{p}) {
- $PKGSRCDIR = $opt{p};
-}
-
-@PACKAGES = ();
-push @PACKAGES, @ARGV;
-
-if (! -d $PKGSRCDIR || ! -d "$PKGSRCDIR/doc" || ! -d "$PKGSRCDIR/mk") {
- print STDERR "Invalid pkgsrc directory $PKGSRCDIR\n";
- exit 1;
-}
-
-if (! @PACKAGES) {
- while (<STDIN>) {
- chop;
- push @PACKAGES, $_;
- }
-}
-
-foreach $pkg (@PACKAGES) {
- if (! -f "$PKGSRCDIR/$pkg/Makefile") {
- print "$pkg\n";
- } else {
- print "$pkg\n" if blbump("$pkg") == 0;
- }
-}
-
-exit 0;
diff --git a/revbump/files/blbump.1 b/revbump/files/blbump.1
deleted file mode 100644
index 8afbebb4c3..0000000000
--- a/revbump/files/blbump.1
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" $NetBSD: blbump.1,v 1.4 2015/09/06 01:47:48 makoto Exp $
-.\"
-.\" Copyright (c) 2003, 2004, 2005 The NetBSD Foundation, Inc.
-.\"
-.\" This code was originally contributed to the NetBSD Foundation, Inc.
-.\" by Julio Merino <jmmv%NetBSD.org@localhost> and Thomas Klausner <wiz%NetBSD.org@localhost>.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in
-.\" the documentation and/or other materials provided with the
-.\" distribution.
-.\" 3. Neither the name of author nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd February 9, 2015
-.Dt BLBUMP 1
-.Os
-.Sh NAME
-.Nm blbump
-.Nd tool to help bumping dependencies in buildlink3 files automatically
-.Sh SYNOPSIS
-.Nm
-.Op Fl h
-.Op Fl p Ar pkgsrcdir
-.Op cat1/pkg1 ... catN/pkgN
-.Sh DESCRIPTION
-.Nm
-is a perl script for pkgsrc developers that simplifies bumping
-buildlink3 file dependencies automatically.
-Given a package (in
-.Ar category/package
-format) on the command line or stdin, it will try to adjust the
-.Dv BUILDLINK_ABI_DEPENDS
-line for that package to the current version automatically.
-.Pp
-.Nm Fl h
-displays a short usage.
-.Pp
-If
-.Fl p
-is given,
-.Ar pkgsrcdir
-is used instead of the default
-.Pa /usr/pkgsrc .
-.Pp
-.Nm
-prints the package name
-(in
-.Ar category/package
-form) on stdout for each package where it failed.
-.Sh ENVIRONMENT
-.Ev PKGSRCDIR
-pkgsrc root directory.
-Defaults to
-.Pa /usr/pkgsrc .
-.Sh SEE ALSO
-.Xr finddepends 1 ,
-.Xr revbump 1
diff --git a/revbump/files/check-cvs-diff b/revbump/files/check-cvs-diff
deleted file mode 100644
index 46365c44c4..0000000000
--- a/revbump/files/check-cvs-diff
+++ /dev/null
@@ -1,99 +0,0 @@
-#!@PERL@ -w
-# -*- perl -*-
-#
-# read output of (cd /usr/pkgsrc; cvs diff -u ) and check if
-# py{27,34} and ruby200 string are left in buildlink3.mk.
-# They are then modified to Variable representation.
-#"
-use strict;
-use Getopt::Std;
-our(@ARGV);
-my (%opts);
-
-my($my_name) = $0;
-$my_name =~ s#(.*)/##;
-
-sub usage(){
- print <<HELP;
-$my_name:
- Read cvs diff -u output (of named file) and substitute
- if the string py27, py34 or ruby200 is found in the corresponding
- changes in diff.
-Synopsys:
- $my_name [-h] [-p pkgsrc_dir] [-v] [cvs-diff-u_output-file]
-Where:
- -h Show this help
- -p pkgsrc directory other than /usr/pkgsrc
- -v verbose (not actually implemented yet)
- cvs-diff-u_output_file:
- The name of input. Usually the file including 'cvs diff -u'
- output (default cvs-diff)
-See Also:
- revbump(1) for how to use it.
-HELP
-}
-
-sub main() {
- my ($PKGSRCDIR);
- my ($CVS_DIFF) = 'cvs-diff';
- my ($file_to_edit);
- my ($stay, $mod) = (0,0);
- my ($Makefile, $buildlink3, $other) = (0, 0, 0);
-
- $PKGSRCDIR = $ENV{PKGSRCDIR};
- if (! $PKGSRCDIR) {
- $PKGSRCDIR = "/usr/pkgsrc";
- }
-
- getopts('hvp:',\%opts);
- if ($ARGV[0]) { $CVS_DIFF = $ARGV[0]}
- if ($opts{'p'}) { $PKGSRCDIR = $opts{'p'}; }
- if ($opts{'h'}) { usage() ; exit ;}
-
- # for using rename, unlink
- chdir $PKGSRCDIR;
-
- open(CVS_DIFF, $CVS_DIFF) || die "Problem opening file $CVS_DIFF: $!\n";
- while(<CVS_DIFF>){
- # Looking for the +++ filename line in cvs diff (supposed to use 'cvs diff -u')
- $file_to_edit = '';
- if ( /^\+\+\+ (\S+)/) {
- $file_to_edit = $1; }
- if ( $file_to_edit && -f $file_to_edit ) {
- if ( $file_to_edit =~ /Makefile$/ ) { $Makefile++;}
- elsif ( $file_to_edit =~ /buildlink3.mk$/ ) { $buildlink3++;
- # print __LINE__, ' ', $file_to_edit,"\n";
- my ($new_file) = $file_to_edit. '.new';
- my ($edit) = 0;
- open(NEW, "> $new_file" ) || print STDERR "Problem to write $edit: $! \n";
- open(EDIT, $file_to_edit ) || print STDERR "Problem opening file $file_to_edit: $! \n";
- while(<EDIT>) {
- if ( /^BUILDLINK.*py27/ ) { $_=~ s/py27/\${PYPKGPREFIX}/ ; $edit++;}
- if ( /^BUILDLINK.*py34/ ) { $_=~ s/py34/\${PYPKGPREFIX}/ ;
- print STDERR " py34 found at $file_to_edit\n";
- ; $edit++;}
- if ( /^BUILDLINK.*ruby200/ ) { $_=~ s/ruby200/\${RUBY_PKGPREFIX}/ ; $edit++;}
- print NEW $_;
- }
- close(EDIT);
- close(NEW);
- if ($edit) { unlink $file_to_edit;
- rename $new_file, $file_to_edit;
- $mod++;}
- else {
- $stay++;
- unlink $new_file; };
- } else { $other++; print STDERR " (other) ", $file_to_edit,"\n"}
- }
- }
- close(CVS_DIFF);
- printf STDERR "Makefile: %4d\n", $Makefile;
- printf STDERR "buildlink3.mk: %4d\n", $buildlink3;
- printf STDERR " Modified: %4d\n", $mod;
- printf STDERR " Untouched: %4d\n", $stay;
- printf STDERR "Other: %4d\n", $other;
-}
-
-main();
-exit;
-
diff --git a/revbump/files/check-cvs-diff.1 b/revbump/files/check-cvs-diff.1
deleted file mode 100644
index f135c0546e..0000000000
--- a/revbump/files/check-cvs-diff.1
+++ /dev/null
@@ -1,84 +0,0 @@
-.\" $NetBSD: check-cvs-diff.1,v 1.5 2015/09/06 01:47:48 makoto Exp $
-.\"
-.\" Copyright (c) 2003, 2004, 2005 The NetBSD Foundation, Inc.
-.\"
-.\" This code was originally contributed to the NetBSD Foundation, Inc.
-.\" by Makoto Fujiwara <mef%NetBSD.org@localhost>.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in
-.\" the documentation and/or other materials provided with the
-.\" distribution.
-.\" 3. Neither the name of author nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd February 9, 2015
-.Dt CHECK-CVS-DIFF 1
-.Os
-.Sh NAME
-.Nm check-cvs-diff
-.Nd clean up unintended revbump(1) replacements
-.Sh SYNOPSIS
-.Nm
-.Op Fl hv
-.Op Fl p Ar pkgsrcdir
-.Ar cvs-diff-u_output-file
-.Sh DESCRIPTION
-.Nm
-is a perl script for pkgsrc developers that simplifies checking and replacing fixed
-version number in
-.Xr revbump 1
-resultant tree, Makefile and buildlink3.mk files.
-It reads `cvs diff -u' output written in named file, and if above
-mentioned strings are found in the diff, replaces them in corresponding
-file by the appropriate variables.
-.Pp
-.Nm Fl h
-displays a short usage.
-.Pp
-If
-.Fl p
-is given,
-.Ar pkgsrcdir
-is used instead of the default
-.Pa /usr/pkgsrc .
-.Pp
-If
-.Fl v
-is given,
-.Nm
-outputs more verbose information.
-.Pp
-.Nm
-prints the package name
-(in
-.Ar category/package
-form) on stdout for each package where it failed, but usually none.
-.Sh ENVIRONMENT
-.Ev PKGSRCDIR
-pkgsrc root directory.
-Defaults to
-.Pa /usr/pkgsrc .
-.Sh SEE ALSO
-.Xr finddepends 1 ,
-.Xr replace-commonbump 1 ,
-.Xr revbump 1
diff --git a/revbump/files/finddepends b/revbump/files/finddepends
deleted file mode 100644
index 721d6b854d..0000000000
--- a/revbump/files/finddepends
+++ /dev/null
@@ -1,153 +0,0 @@
-#!@PERL@ -w
-# -*- perl -*-
-#
-# $NetBSD: finddepends,v 1.3 2015/01/08 15:32:10 makoto Exp $
-#
-# Copyright (c) 2006, 2014 The NetBSD Foundation, Inc.
-#
-# This code was originally contributed to the NetBSD Foundation, Inc.
-# by Thomas Klausner <wiz%NetBSD.org@localhost>.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of author nor the names of its contributors may
-# be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-use strict;
-use Getopt::Std;
-
-my ($PKGSRCDIR, $arg, $bl3, %bl3content, @bl3files, @bl3result,
- $content, $found, $key, $makefile, @makefiles, %opt,
- @optionfiles, $pattern, @searchlist);
-
-$PKGSRCDIR = $ENV{PKGSRCDIR};
-if (! $PKGSRCDIR) {
- $PKGSRCDIR = "/usr/pkgsrc";
-}
-
-sub usage {
- print STDERR "usage: finddepends [-h] [-p pkgsrcdir] package\n\n";
- print STDERR "Find all packages that depend on the argument package.\n";
- exit 0;
-}
-
-getopts('hp:', \%opt);
-usage() if $opt{h};
-if ($opt{p}) {
- $PKGSRCDIR = $opt{p};
-}
-
-usage if (1 ne @ARGV);
-$arg = shift;
-$arg =~ s,/$,,g;
-
-@searchlist = ();
-push @searchlist, $arg;
-
-if (! -d $PKGSRCDIR || ! -d "$PKGSRCDIR/doc" || ! -d "$PKGSRCDIR/mk") {
- print STDERR "Invalid pkgsrc directory $PKGSRCDIR\n";
- exit 1;
-}
-
-@bl3files = <$PKGSRCDIR/*/*/buildlink3.mk>;
-%bl3content = ();
-foreach $bl3 (@bl3files) {
- open OUT, $bl3 or die "can't open $bl3";
- $content = "";
- while (<OUT>) {
- chomp($_);
- next if m/^\s*#/;
- $content .= $_;
- }
- close OUT;
- $bl3content{$bl3} = $content;
-}
-
-@bl3result = ();
-while ($pattern = pop @searchlist) {
-# print "* Looking for $pattern\n";
- for $key (keys %bl3content) {
-# print "searching $key ($bl3content{$key})\n\n";
- if ($bl3content{$key} =~ m/\Q$pattern/) {
-# print "\n\n ******** MATCH $key \n\n";
-# print "** $pattern found in $key\n";
-# print "** BUMP $key\n";
- delete($bl3content{$key});
-# print "\n\n **** ADDING $key \n\n";
- $key =~ s,$PKGSRCDIR/,,;
-# print "** Adding $key\n";
- print "$key\n";
- push @searchlist, $key;
- push @bl3result, $key;
- }
- }
-}
-
-print "\n";
-
-@makefiles = <$PKGSRCDIR/*/*/Makefile*>;
-@optionfiles = <$PKGSRCDIR/*/*/options.mk>;
-push(@makefiles, @optionfiles);
-@optionfiles = <$PKGSRCDIR/*/*/modules.mk>;
-push(@makefiles, @optionfiles);
-@optionfiles = <$PKGSRCDIR/*/*/mozilla-common.mk>;
-push(@makefiles, @optionfiles);
-@optionfiles = <$PKGSRCDIR/*/*/plugins.mk>;
-push(@makefiles, @optionfiles);
-@optionfiles = <$PKGSRCDIR/*/*/schemas.mk>;
-push(@makefiles, @optionfiles);
-
-for $makefile (@makefiles) {
-# print "* reading $makefile\n";
- open OUT, $makefile or die "can't open $makefile";
- $content = "";
- my @used_by;
- while (<OUT>) {
- chomp($_);
- if (m/^# used by (.*)/) {
- push @used_by, $1;
- }
- next if m/^\s*#/;
- $content .= $_;
- }
- close OUT;
- $found = 0;
- for $pattern (@bl3result) {
- if ($content =~ m/\Q$pattern/) {
- $found = 1;
- last;
- }
- }
-# print "** BUMP $makefile\n" if ($found);
- if ($found) {
- $makefile =~ s,$PKGSRCDIR/,,;
- print "$makefile\n";
- for my $user (@used_by) {
- print "$user\n";
- }
- }
-}
-
-exit 0;
diff --git a/revbump/files/finddepends.1 b/revbump/files/finddepends.1
deleted file mode 100644
index 201ac90857..0000000000
--- a/revbump/files/finddepends.1
+++ /dev/null
@@ -1,86 +0,0 @@
-.\" $NetBSD: finddepends.1,v 1.3 2015/01/08 15:32:10 makoto Exp $
-.\"
-.\" Copyright (c) 2006, 2014 The NetBSD Foundation, Inc.
-.\"
-.\" This code was originally contributed to the NetBSD Foundation, Inc.
-.\" by Thomas Klausner <wiz%NetBSD.org@localhost>.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in
-.\" the documentation and/or other materials provided with the
-.\" distribution.
-.\" 3. Neither the name of author nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd June 24, 2014
-.Dt FINDDEPENDS 1
-.Os
-.Sh NAME
-.Nm finddepends
-.Nd find direct dependencies of a package
-.Sh SYNOPSIS
-.Nm
-.Op Fl h
-.Op Fl p Ar pkgsrcdir
-.Ar pattern
-.Sh DESCRIPTION
-.Nm
-is a perl script for pkgsrc developers that helps finding packages
-affected by a recursive PKGREVISION bump.
-Given a
-.Ar pattern
-on the command line, it will recursively find all buildlink3.mk files
-that include it, and then find all Makefiles that include any of the
-buildlink3.mk files.
-.Pp
-When reading Makefile.common, it will parse
-.Dq # used by
-lines and emit those packages too, so there might be duplicates in
-the output.
-.Pp
-.Nm Fl h
-displays a short usage.
-.Pp
-If
-.Fl p
-is given,
-.Ar pkgsrcdir
-is used instead of the default
-.Pa /usr/pkgsrc .
-.Pp
-See
-.Xr revbump 1
-for an example of a complete recursive PKGREVISION bump.
-.Sh ENVIRONMENT
-.Ev PKGSRCDIR
-pkgsrc root directory.
-Defaults to
-.Pa /usr/pkgsrc .
-.Sh EXAMPLES
-.Dl finddepends security/libtasn1
-.Pp
-would first output all buildlink3.mk files that include
-security/libtasn1, and then all Makefiles and options.mk files that
-include any of the found buildlink3.mk files.
-.Sh SEE ALSO
-.Xr blbump 1 ,
-.Xr revbump 1
diff --git a/revbump/files/replace-commonbump b/revbump/files/replace-commonbump
deleted file mode 100644
index b901922fda..0000000000
--- a/revbump/files/replace-commonbump
+++ /dev/null
@@ -1,250 +0,0 @@
-#!@PERL@ -w
-# -*- perl -*-
-# The process has two steps
-# (1)
-# Travers all the files (with some filtering) over /usr/pkgsrc
-# pick up referenced -> referer relation and store them to %HASH
-# (multiple files are concatinated by ';' )
-# (2)
-# read input (usually named 'commonbump'), and expand one line into
-# replacement referer lines, which are referenced -> referer relation.
-
-use strict;
-use Getopt::Std;
-use File::Find;
-
-my(%HASH); # referenced -> referer relation hash, referer is delimitted by ;
-my($PKGSRCDIR); # /usr/pkgsrc path, usually /usr/pkgsrc
-
-my($TABLE) = 'commonbump'; # name of file, list-of-files to process
-my(@TABLE); # contents of file above
-
-my($debug) = 0;
-my($prefix) ; # A part of path, top to pkgsrc, typically /usr/pkgsrc
-
-my($common_bump) = 0; # count, not used for now (yet)
-my(%opts);
-our(@ARGV);
-
-my ($FILE) = __FILE__;
- $FILE =~ s,.*/([^/]+),$1,; # pick leafname from __FILE__
-
-my($replaced) = 'commonbump.replaced';
-
-my($my_name) = $0;
-$my_name =~ s#(.*)/##;
-
-sub usage() {
- print <<HELP;
-$my_name:
- This command is a part of revbump package and intended for pkgsrc developers.
- (1) Read entire pkgsrc tree and check referer -> referenced relation,
- then internally keeps (opposite) referenced -> referer relation table.
- (2) Read another file, named '$TABLE' or other name with -T, which
- usually lists Makefile.common or *common.mk files to expand.
- (3) Now expands those list in '$TABLE' into list of Makefiles by
- referenced -> refer relation. By default, it outputs to the file
- '$replaced' (currently the name is fixed).
-
-Synopsys:
- $my_name [-a ] [-c file_to_check] [-h] [-p pkgsrc_directory] [-T list_file]
-Where:
- -a Check all, disregard to -T option. If "# used by" is
- included or not.
- -c (debug) see if the file is defined in \%HASH
- -h Show this help
- -p directory
- pkgsrc directory to process (default $PKGSRCDIR)
- -T the filename containing list of files (default: commonbump)
-See Also:
- revbump(1) for how to use it (and replace-commonbump(1)).
-HELP
-}
-
-# get value of variable by using make show-var
-sub show_var($$){
- my($varname) = shift;
- my($pkgdir) = shift;
- my($value);
- #chdir $pkgdir;
- open(MAKE, '-|', "cd $PKGSRCDIR/$pkgdir ; make show-var VARNAME=$varname");
- $value = <MAKE>;
- close(MAKE);
- chomp($value);
- if ($value =~ /know how to make/ ) { print STDERR $value, '(', $pkgdir,')',"\n";}
- return $value
-}
-
-sub GenerateHash ($$) {
- my ($pkgsrc) = shift;
- my ($prefix) = shift;
-
- # ----------------------------------------------------------------
- my ($wanted_closure) = sub () {
- my $dir = $File::Find::dir ;
- my $fname = "$File::Find::dir/$_" ;
-
- # skip these directories and files ( as files including something )
- if ($dir =~ m|CVS$| ) {$File::Find::prune = 1; return;}
- if ($dir =~ m|mk$| ) {$File::Find::prune = 1; return;}
- if ($dir =~ m|work$| ) {$File::Find::prune = 1; return;}
- if ($dir =~ m|patches$| ) {$File::Find::prune = 1; return;}
- if ($dir =~ m|files$| ) {$File::Find::prune = 1; return;}
- if ($dir =~ m|bootstrap$| ) {$File::Find::prune = 1; return;}
- if ($dir =~ m|pkgsrc/[^/]$| ) {$File::Find::prune = 1; return;}
- if ($dir =~ m|x11-links| ) {$File::Find::prune = 1; return;}
- if ($_ =~ m|^\.\#| ) { return;}
- if ($_ =~ m|~$| ) { return;}
- if ($_ =~ m|buildlink3.mk$| ) { return;}
- if ($_ =~ m|builtin.mk$| ) { return;}
-
- my($shortname) = $fname;
- $shortname =~ s|$prefix/||;
- my($shortdir) = $dir;
- $shortdir =~ s|$prefix/||;
-
- # pick only Makefile.* and .mk ( as files including something )
- if ($_ =~ m|Makefile| ||
- $_ =~ m|\.mk$| ) {
- print STDERR __LINE__, ' ', $fname,' ', `pwd`, "\n" if $debug;
- open(FNAME, $fname) || print STDERR __LINE__, " Problem opening file $fname:$!\n";
- my ($included) = '';
- while (<FNAME>){
- # now starts finding included file
- # pick .include "../../
- if ( m|^\.\s*include\s+\"\.\./\.\./(.*)\"| ) { $included = $1;}
- # pick ".include "Makefile" etc (without leading ../../), this needs to add package dir.
- if ( m|^\.\s*include\s+\"(.*)\"| ) { next;} # including the same directory stuff, doesn't matter
- if ( m|^\.\s*include\s+\"(.*)\"| ) { $included = $prefix .'/'. $1;}
- if ( $included =~ m|/mk/| ) { next;} # it is include line but for mk, skip this line
- if ( $included =~ m|version.mk| ) { next;}
- if ( $included =~ m|tests/| ) { next;}
- if ( $included =~ m|options.mk| ) { next;}
- if ( $included =~ m|enigmail.mk| ) { next;}
-
- $included =~ s,\${.CURDIR},$shortname,;
- if ($included =~ /\${([^}]+)}/ ) { # If it is with ${..} type VARIABLE,
- my($varname) = $1;
- my($value) = show_var($varname, $shortdir);
- $included =~ s/\${[^}]+}/$value/; # Replace it with the value
- if ($value eq '') { # if the $value is empty, issue message
- print STDERR
-$FILE, ': ', __LINE__, ' Value ${', $varname, '} is empty at ', $shortdir, "\n";
- }
- }
- print STDERR __LINE__ , ' ', $shortname, ' -> ', $included,': ',$_ ,"\n" if $debug;
- if ( $included eq '') { next;} # not include line, look at next line
- print STDERR __LINE__ , ' ', $shortname, ' -> ', $included,"\n" if $debug;
- if ( ! $HASH{$included} ) { # If is not registered yet,
- $HASH{$included} = $shortname; # Just define
- } else { # If it has any value,
- my(@registered) = split ';', $HASH{$included}; # Get what is defined
- if (grep (/^$shortname$/, @registered) == 0 ) { # and if it is not in there
- $HASH{$included} .= ';'. $shortname; # Add onto the hash
- }
- }
- } # end while
- close(FNAME);
- } # if of (major process) ... starting with: if ($_ =~ m|Makefile| ||
- }; # end of my ($wanted_closure) = sub () {
- # ----------------------------------------------------------------
- # With 'follow => 1', /usr/pkgsrc can be symlink to other location.
- find({ wanted => $wanted_closure, follow => 1 }, $pkgsrc);
-}
-
-# Table is assumed to contain list of files to process, set up it in @TABLE here.
-sub ReadTable($) {
- my ($table) = shift;
- if ($table eq '-') {
- @TABLE = <>;
- } else {
- open(TABLE, $table) || print STDERR "Problem reading file $table: $!\n";
- @TABLE = <TABLE>;
- close(TABLE);
- }
- }
-
-sub ShowResults() {
- open(REPLACED, "> $replaced") || die "problem open to write: $replaced: $!\n";
- foreach my $file (@TABLE) {
- chomp($file);
- if ($file =~ /^\s*$/ ) { next; } # Skip empty line, in case
- if ($HASH{$file} && # To avoid 'Use of uninitialized value in split at ..'
- grep ($file, $HASH{$file}) > 0) { # referer found ( separated with ';')
- my(@list) = split ';', $HASH{$file};
- foreach my $i (0..$#list) {
- print REPLACED "$list[$i]\n"; # write the list into REPLACED handle
- }
- }
- }
-}
-
-# check the pkgsrc tree is healthy or not
-sub CheckPkgsrcTree($){
- my ($pkgsrc) = shift;
-
- if (! -d $pkgsrc || ! -d "$pkgsrc/doc" || ! -d "$pkgsrc/mk") {
- print STDERR "Invalid pkgsrc directory $pkgsrc\n";
- exit 1;
- }
-}
-
-# if -a option is applied, not using @TABLE, but scan whole thing.
-sub CheckAll() {
- foreach my $i (sort keys %HASH) { # for all the referenced
- if ($i =~ /buildlink3.mk/ ) { next;}
-
- # First collect the line of '# used by .*'
- open (REFERENCED, $i) || print ' *** ', __LINE__, " Unable to open $i $!\n";
- my (@referer) = {};
- while(<REFERENCED>){
- if (/\# used by (.*)/) { push (@referer, $1);}
- }
- close(REFERENCED);
- my $number = 0;
- foreach my $referer (@referer) {
- $number += grep $referer, $HASH{$i};
- }
- $#referer++; # conpensate -1 -> 0, 0 -> 1 etc
- if ($#referer < $number) { print $#referer . ' ? ' . $number .' .. ', $i,' <- ', $HASH{$i}, ' ... <', "\n";}
- if ($#referer > $number) { print $#referer . ' ? ' . $number .' .. ', $i,' <- ', $HASH{$i}, ' ... >', "\n";}
- }
-}
-sub CheckHash($$) {
- my ($pkgsrc) = shift;
- my ($check_hash) = shift;
- print STDERR __LINE__,' ', $check_hash, ' -> ', $HASH{"$check_hash"}, "\n";
-}
-sub main() {
- my($check_all) = 0;
- my($prefix);
- my($CheckHashFile) = 0;
-
- $PKGSRCDIR = $ENV{PKGSRCDIR};
- if (! $PKGSRCDIR) {
- $PKGSRCDIR = "/usr/pkgsrc";
- }
- getopts('ac:hp:T:', \%opts);
-
- if ($opts{'a'}) { $check_all = 1; }
- if ($opts{'c'}) {
- $CheckHashFile = $opts{'c'}; }
- if ($opts{'h'}) { usage(); exit 0;}
- if ($opts{'p'}) { $PKGSRCDIR = $opts{'p'};}
- if ($opts{'T'}) { $TABLE = $opts{'T'};}
-
- $prefix = $PKGSRCDIR;
- $prefix =~ s|.*/pkgsrc/(.*)|$1|;
- CheckPkgsrcTree($PKGSRCDIR);
- GenerateHash($PKGSRCDIR, $prefix);
- # Check the first half,
- CheckHash($PKGSRCDIR, $CheckHashFile) if $CheckHashFile;
- ReadTable($TABLE);
- if ($check_all) { CheckAll(); }
- else { ShowResults();}
-}
-
-main();
-
-exit;
-__END__
diff --git a/revbump/files/replace-commonbump.1 b/revbump/files/replace-commonbump.1
deleted file mode 100644
index 43361703df..0000000000
--- a/revbump/files/replace-commonbump.1
+++ /dev/null
@@ -1,141 +0,0 @@
-.\" $NetBSD: replace-commonbump.1,v 1.8 2015/09/06 01:47:48 makoto Exp $
-.\"
-.\" Copyright (c) 2014 The NetBSD Foundation, Inc.
-.\"
-.\" This code was originally contributed to the NetBSD Foundation, Inc.
-.\" by Makoto Fujiwara <mef%NetBSD.org@localhost>.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in
-.\" the documentation and/or other materials provided with the
-.\" distribution.
-.\" 3. Neither the name of author nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd February 9, 2015
-.Dt REPLACE-COMMONBUMP 1
-.Os
-.Sh NAME
-.Nm replace-commonbump
-.Nd tool to help expanding (replacing) commonbump file to the real list of Makefiles
-.Sh SYNOPSIS
-.Nm
-.Op Fl ah
-.Op Fl c Ar directory/package/Makefile.common
-.Op Fl p Ar pkgsrcdir
-.Op Fl T Ar list_file
-.Sh DESCRIPTION
-.Nm
-is a perl script for pkgsrc developers.
-It simplifies the process expanding
-.Pa commonbump
-file into
-.Pa commonbump-replace .
-The
-.Pa commonbump
-file is to be created by the first stage of the
-.Dv PKGREVISION
-bump process as described in
-.Xr revbump 1 .
-.Pp
-.Nm Fl h
-displays a short usage.
-.Pp
-If
-.Fl p
-is given,
-.Ar pkgsrcdir
-is used instead of the default
-.Pa /usr/pkgsrc .
-.Pp
-If
-.Fl a
-is given,
-check the whole pkgsrc tree, disregard both the
-.Fl T
-option and the default
-.Pa commonbump
-file.
-It will check if
-.Dq # used by
-is included or not, usually in Makefile.common in the package.
-.Pp
-If
-.Fl T
-is given,
-.Ar list_file
-is used instead of the default
-.Pa commonbump .
-.Pp
-If
-.Fl c
-.Ar directory/package/Makefile.common
-is given,
-it shows the result of first half of the processing,
-meaning that
-the particular Makefile.common is referenced from Makefiles of the other packages.
-.Pp
-.Nm
-prints the package name
-(in
-.Ar category/package
-form) on stdout for each package where it failed, but usually none.
-.Pp
-The internal process is divided into three stages.
-.Bl -enum
-.It
-Read entire pkgsrc tree and check the
-.Ar referer -> referenced
-relation,
-then internally keeps (opposite)
-.Ar referenced -> referer
-relation table.
-.It
-Read a file, named
-.Pa commonbump
-or the argument given with
-.Fl T ,
-which usually lists
-.Pa Makefile.common
-or
-.Pa *common.mk
-files to be expanded.
-.It
-Expand the filenames listed in
-.Pa commonbump
-into the list of packagename/Makefile by the
-referenced -> referer relation.
-.Nm
-then outputs to the file
-.Pa commonbump.replaced
-(currently the name is fixed).
-.El
-.Sh ENVIRONMENT
-.Ev PKGSRCDIR
-pkgsrc root directory.
-Defaults to
-.Pa /usr/pkgsrc .
-.Sh SEE ALSO
-.Xr blbump 1 ,
-.Xr check-cvs-diff 1 ,
-.Xr finddepends 1 ,
-.Xr revbump 1
diff --git a/revbump/files/revbump b/revbump/files/revbump
deleted file mode 100644
index fcebb6360a..0000000000
--- a/revbump/files/revbump
+++ /dev/null
@@ -1,186 +0,0 @@
-#!@PERL@ -w
-# -*- perl -*-
-#
-# $NetBSD: revbump,v 1.5 2015/01/08 15:32:10 makoto Exp $
-#
-# Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
-#
-# This code was originally contributed to the NetBSD Foundation, Inc.
-# by Julio Merino <jmmv%NetBSD.org@localhost> and Thomas Klausner <wiz%NetBSD.org@localhost>.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of author nor the names of its contributors may
-# be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-use strict;
-use Getopt::Std;
-
-my (@PACKAGES, $PKGSRCDIR, %opt, $pkg);
-
-$PKGSRCDIR = $ENV{PKGSRCDIR};
-if (! $PKGSRCDIR) {
- $PKGSRCDIR = "/usr/pkgsrc";
-}
-
-sub usage {
- print STDERR "usage: revbump [-h] [-p pkgsrcdir] [cat1/pkg1 ... catN/pkgN]\n\n";
- print STDERR "If no packages are given as arguments, the list is read from stdin.\n";
- print STDERR "Packages for which revision cannot be bumped are written to stdout.\n";
- exit 0;
-}
-
-sub revbump {
- my $pkgdir = shift;
- my ($pkg, $oldpkgver, $pkgver, $done, $oldmk, $newmk, $backupmk);
- local (*OLDMK, *MAKE);
- my (@OLD, @NEW, @NEW2); # two phase edit
-
- $pkgdir =~ /\/(.*)$/;
- $pkg = $1;
-
- $oldmk = "$PKGSRCDIR/$pkgdir/Makefile";
-
- open(MAKE, '-|', "cd $PKGSRCDIR/$pkgdir ; make show-var VARNAME=PKGVERSION");
- $oldpkgver = <MAKE>;
- close(MAKE);
- chop $oldpkgver;
-
- open(OLDMK, $oldmk);
- @OLD = <OLDMK>;
- close(OLDMK);
-
- # first pass, check PKGREVISION line (only)
- $done = 0;
- while ($_ = shift @OLD) {
- if ($done == 0 && /^PKGREVISION=([ \t]+)([0-9]+)$/) {
- $done = $2 + 1;
- push(@NEW, "PKGREVISION=${1}${done}\n");
- } else {
- push(@NEW, $_);
- }
- }
- # if above is OK, just copy,
- if ( $done > 0 ){
- @NEW2 = @NEW;
- # or do second pass
- } else {
- while ($_ = shift @NEW) {
- if ($done == 0 && /^CATEGORIES=([ \t]+)/) {
- push(@NEW2,"PKGREVISION=${1}1\n");
- push(@NEW2, $_);
- $done = 1;
- } elsif ($done == 0 && /^PKGNAME=([ \t]+)/) {
- push (@NEW2, $_);
- push (@NEW2,"PKGREVISION=${1}1\n");
- $done = 1;
- } elsif ($done == 0 && /^COMMENT=([ \t]+)/) {
- push (@NEW2, $_);
- push (@NEW2,"PKGREVISION=${1}1\n");
- $done = 1;
- } elsif ($done == 0 && /^.\s*include([ \t]+)/) {
- push (@NEW2,"PKGREVISION=${1}1\n");
- push (@NEW2, $_);
- $done = 1;
- } else {
- push (@NEW2, $_);
- };
- }
- } # end else
- $newmk = "$oldmk.new";
- open(NEWMK, ">$newmk");
- print NEWMK @NEW2;
- close(NEWMK);
- # no suitable place found
- if ($done == 0) {
- unlink "$newmk";
- return 0;
- }
-
- $backupmk = "$oldmk.orig";
- rename("$oldmk", "$backupmk");
- rename("$newmk", "$oldmk");
-
- open(MAKE, '-|', "cd $PKGSRCDIR/$pkgdir ; make show-var VARNAME=PKGVERSION");
- $pkgver = <MAKE>;
- close(MAKE);
- chop $pkgver;
-
- # compare previous PKGVERSION and current PKGVERSION to see if update
- # was successful
- if ($oldpkgver =~ /.*nb([0-9]+)$/) {
- $oldpkgver = $1;
- } else {
- $oldpkgver = 0;
- }
- if ($pkgver =~ /.*nb([0-9]+)$/) {
- $pkgver = $1;
- } else {
- $pkgver = 0;
- }
- if ($oldpkgver + 1 != $pkgver) {
- # unsuccessful, revert change
- rename("$backupmk", "$oldmk");
- return 0;
- }
-
- unlink "$backupmk";
-
- # print("Updated $pkgdir from $oldpkgver to $pkgver\n");
-
- return 1;
-}
-
-getopts('hp:', \%opt);
-usage() if $opt{h};
-if ($opt{p}) {
- $PKGSRCDIR = $opt{p};
-}
-
-@PACKAGES = ();
-push @PACKAGES, @ARGV;
-
-if (! -d $PKGSRCDIR || ! -d "$PKGSRCDIR/doc" || ! -d "$PKGSRCDIR/mk") {
- print STDERR "Invalid pkgsrc directory $PKGSRCDIR\n";
- exit 1;
-}
-
-if (! @PACKAGES) {
- while (<STDIN>) {
- chop;
- push @PACKAGES, $_;
- }
-}
-
-foreach $pkg (@PACKAGES) {
- if (! -f "$PKGSRCDIR/$pkg/Makefile") {
- print "$pkg\n";
- } else {
- print "$pkg\n" if revbump("$pkg") == 0;
- $pkg =~ /\/(.*)$/;
- }
-}
-
-exit 0;
diff --git a/revbump/files/revbump.1 b/revbump/files/revbump.1
deleted file mode 100644
index ee5778207c..0000000000
--- a/revbump/files/revbump.1
+++ /dev/null
@@ -1,112 +0,0 @@
-.\" $NetBSD: revbump.1,v 1.8 2015/09/06 01:47:48 makoto Exp $
-.\"
-.\" Copyright (c) 2003, 2004, 2005, 2006, 2010, 2012, 2013, 2014 The NetBSD Foundation, Inc.
-.\"
-.\" This code was originally contributed to the NetBSD Foundation, Inc.
-.\" by Julio Merino <jmmv%NetBSD.org@localhost> and Thomas Klausner <wiz%NetBSD.org@localhost>.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in
-.\" the documentation and/or other materials provided with the
-.\" distribution.
-.\" 3. Neither the name of author nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-.\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-.\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd February 9, 2015
-.Dt REVBUMP 1
-.Os
-.Sh NAME
-.Nm revbump
-.Nd tool to help bump PKGREVISIONs automatically
-.Sh SYNOPSIS
-.Nm
-.Op Fl h
-.Op Fl p Ar pkgsrcdir
-.Op cat1/pkg1 ... catN/pkgN
-.Sh DESCRIPTION
-.Nm
-is a perl script for pkgsrc developers that simplifies bumping
-PKGREVISIONs automatically.
-Given a package (in
-.Ar category/package
-format) on the command line or stdin, it will try to increase
-the PKGREVISION for that package automatically.
-.Pp
-.Nm Fl h
-displays a short usage.
-.Pp
-If
-.Fl p
-is given,
-.Ar pkgsrcdir
-is used instead of the default
-.Pa /usr/pkgsrc .
-.Pp
-.Nm
-reports successful updates on stdout, and prints the package name
-(in
-.Ar category/package
-form) on stdout for each package where it failed.
-.Sh EXAMPLES
-.Dl revbump devel/gmake x11/glib2
-.Pp
-would bump the PKGREVISIONs of gmake and glib2, as would
-.Bd -literal -offset indent
-revbump \*[Lt]\*[Lt] EOF
-devel/gmake
-x11/glib2
-EOF
-.Ed
-.Pp
-The complete procedure for a recursive dependency bump for
-category/package using
-.Nm
-and
-.Xr blbump 1
-would be:
-.Bd -literal -offset indent
-cd /usr/pkgsrc ;
-finddepends category/package | sort -u \*[Gt] allbump ;
-grep buildlink3.mk allbump | sed 's/.buildlink3.mk//' \*[Gt] bl3bump ;
-grep -e Makefile.common -e mk$ allbump | grep -v -e buildlink3.mk -e options.mk > commonbump ;
-replace-commonbump ;
-cat allbump commonbump.replaced | sed 's,/[^/]*$,,' | sort -u \*[Gt] makebump ;
-revbump \*[Lt] makebump | tee makebump.manual ;
-# [if a package is listed in makebump.manual, handle the PKGREVISION bump manually]
-blbump \*[Lt] bl3bump | tee bl3bump.manual ;
-# [handle the *ABI_DEPENDS* bumps in bl3bump.manual manually, usually none] ;
-cvs diff -u `cat makebump` > cvs-diff ;
-check-cvs-diff ;
-cvs diff `cat bl3bump makebump` | less
-cvs commit `cat bl3bump makebump`
-rm allbump bl3bump* makebump* commonbump* cvs-diff
-.Ed
-.Sh ENVIRONMENT
-.Ev PKGSRCDIR
-pkgsrc root directory.
-Defaults to
-.Pa /usr/pkgsrc .
-.Sh SEE ALSO
-.Xr blbump 1 ,
-.Xr check-cvs-diff 1 ,
-.Xr finddepends 1 ,
-.Xr replace-commonbump 1
diff --git a/samtools/DESCR b/samtools/DESCR
deleted file mode 100644
index 23d11d1c81..0000000000
--- a/samtools/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Samtools implements various utilities for post-processing alignments in the
-SAM, BAM, and CRAM formats, including indexing, variant calling (in conjunction
-with bcftools), and a simple alignment viewer.
diff --git a/samtools/Makefile b/samtools/Makefile
deleted file mode 100644
index 998e260fac..0000000000
--- a/samtools/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2018/05/07 18:37:31 bacon Exp $
-
-DISTNAME= samtools-1.9
-CATEGORIES= biology
-MASTER_SITES= ${MASTER_SITE_GITHUB:=samtools/}
-GITHUB_TAG= ${PKGVERSION_NOREV}
-
-MAINTAINER= bacon%NetBSD.org@localhost
-HOMEPAGE= http://www.htslib.org/
-COMMENT= Tools for manipulating next-generation sequencing data
-LICENSE= mit
-
-USE_TOOLS+= autoconf automake autoreconf gmake perl:run
-GNU_CONFIGURE= yes
-REPLACE_PERL= misc/*.pl misc/plot-bamstats test/test.pl
-REPLACE_PYTHON= misc/*.py
-
-pre-configure:
- cd ${WRKSRC} && autoreconf
-
-.include "../../mk/curses.buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../wip/htslib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/samtools/PLIST b/samtools/PLIST
deleted file mode 100644
index 5ab65fe32e..0000000000
--- a/samtools/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD$
-bin/ace2sam
-bin/blast2sam.pl
-bin/bowtie2sam.pl
-bin/export2sam.pl
-bin/interpolate_sam.pl
-bin/maq2sam-long
-bin/maq2sam-short
-bin/md5fa
-bin/md5sum-lite
-bin/novo2sam.pl
-bin/plot-bamstats
-bin/psl2sam.pl
-bin/sam2vcf.pl
-bin/samtools
-bin/samtools.pl
-bin/seq_cache_populate.pl
-bin/soap2sam.pl
-bin/varfilter.py
-bin/wgsim
-bin/wgsim_eval.pl
-bin/zoom2sam.pl
-man/man1/samtools.1
-man/man1/wgsim.1
diff --git a/samtools/distinfo b/samtools/distinfo
deleted file mode 100644
index 50ed513e70..0000000000
--- a/samtools/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (samtools-1.9.tar.gz) = d5e163f7d7b232f99ac36d7749d5786b77af59d9
-RMD160 (samtools-1.9.tar.gz) = 8c1ce9afbd2865bc659c80f093839afb6db105ae
-SHA512 (samtools-1.9.tar.gz) = 4c50a365987fd5fa4ddaaa5056587e6b7ccaaacb67dc37880fe242f015a5e1acb94eb8b631184f91a5f4434b84bbf9805acbaee75be1dd9edb76b594fcff0c91
-Size (samtools-1.9.tar.gz) = 4098992 bytes
diff --git a/simulavr/COMMIT_MSG b/simulavr/COMMIT_MSG
deleted file mode 100644
index 981f826480..0000000000
--- a/simulavr/COMMIT_MSG
+++ /dev/null
@@ -1,16 +0,0 @@
-(pkgsrc)
- simulavr asks for libiberty.a.
- With avr-gcc 4.5.3 and avr-binutils-2.23.2, binutils is installing
- libiberty.a
- But with new binutils-2.24, it won't install libiberty. Instead,
- avr-gcc-4.8.3 will provied libiberty.
- Makefile (of simulavr) now has pointer to PATH of libiberty now
- as:
- CONFIGURE_ARGS+= --with-libiberty=${PREFIX}/lib/gcc/avr
-(Add patches)
- patch-src_systemclock_cpp (rename from patch-src_systemclock.cpp)
- patch-src_systemclock_h
- patch-src_traceval_cpp
- patch-src_traceval_h
- clang flags as resize unresolved reference,
- backport from git repository (as of 2013-09-15).
diff --git a/simulavr/DESCR b/simulavr/DESCR
deleted file mode 100644
index fb4f0c8c17..0000000000
--- a/simulavr/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The Simulavr program is a simulator for the Atmel AVR family of
-microcontrollers. Simulavr can be used either standalone or as a
-remote target for gdb. When used in gdbserver mode, the simulator
-is used as a backend so that gdb can be used as a source level
-debugger for AVR programs.
-
-Simulavr was written by Theodore A. Roth
diff --git a/simulavr/MESSAGE b/simulavr/MESSAGE
deleted file mode 100644
index d7c536064e..0000000000
--- a/simulavr/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2013/08/25 15:02:15 makoto Exp $
-Various README files are installed at following locations:
- ${PREFIX}/share/doc/simulvar/README
- ${PREFIX}/share/doc/simulvar/README.gdb
- ${PREFIX}/share/doc/simulvar/examples/{topics}/README
-Also, please read the 'info' at the node of SimulAVR.
-
-The introduction of simulAVR with avr-gdb, see following URL:
- http://www.nongnu.org/simulavr/intro.html
-===========================================================================
diff --git a/simulavr/Makefile b/simulavr/Makefile
deleted file mode 100644
index f29fe69877..0000000000
--- a/simulavr/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2015/01/10 20:28:38 thomasklausner Exp $
-
-DISTNAME= simulavr-1.0.0
-PKGREVISION= 1
-CATEGORIES= emulators
-MASTER_SITES= http://download.savannah.gnu.org/releases/simulavr/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.nongnu.org/simulavr/
-COMMENT= Simulator for Atmel AVR microcontrollers
-LICENSE= gnu-gpl-v2
-
-BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
-BUILD_DEPENDS+= avr-libc-[0-9]*:../../wip/avr-libc
-
-CONFIGURE_ARGS+= --disable-tests
-CONFIGURE_ARGS+= --enable-python=python${PYVERSSUFFIX}
-CONFIGURE_ARGS+= --with-bfd=${PREFIX}/avr
-CONFIGURE_ARGS+= --with-libiberty=${PREFIX}/lib/gcc/avr
-CONFIGURE_ENV+= TEX=no
-
-# Following line does not work yet (examples/python directory)
-#CONFIGURE_ENV+= az_python_use=true
-#MAKE_ENV+= az_python_use=true
-
-MAKE_JOBS_SAFE= no
-
-USE_TOOLS+= makeinfo gmake
-USE_LIBTOOL= yes
-USE_LANGUAGES+= c c++
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-INFO_FILES= yes
-
-# Interim fix
-SUBST_CLASSES+= prefix
-SUBST_STAGE.prefix= post-patch
-SUBST_MESSAGE.prefix= Fix include path finding Python.h
-SUBST_FILES.prefix= src/Makefile.in
-SUBST_VARS.prefix= PREFIX
-
-# Following SUBST_CLASSES are from diff against git version (as of 2013-08-08)
-# See also
-# http://savannah.nongnu.org/bugs/?35737
-SUBST_CLASSES+= compare2
-SUBST_STAGE.compare2= post-patch
-SUBST_MESSAGE.compare2= Convert poisoned SIG_OUTPUT_COMPARE2 to TIMER2_COMP_vect
-SUBST_FILES.compare2= examples/atmega128_timer/main.c
-SUBST_FILES.compare2+= examples/python/example.c
-SUBST_FILES.compare2+= examples/python/example_io.c
-SUBST_FILES.compare2+= examples/python/ex_pinout.c
-SUBST_FILES.compare2+= regress/timertest/timer_8bit_ctc.c
-SUBST_SED.compare2= -e 's/SIG_OUTPUT_COMPARE2/TIMER2_COMP_vect/g'
-
-# StdDefs.h:66:33: error: attempt to use poisoned "SIG_UART0_RECV"
-# StdDefs.h:67:39: error: attempt to use poisoned "SIG_UART0_DATA"
-# kb.c:39:8: error: attempt to use poisoned "SIG_INTERRUPT0"
-
-SUBST_CLASSES+= uart0
-SUBST_STAGE.uart0= post-patch
-SUBST_MESSAGE.uart0= Convert poisoned SIG_UART0_RECV to USART0_RX_vect
-SUBST_FILES.uart0= examples/atmel_key/StdDefs.h
-SUBST_SED.uart0= -e 's/SIG_UART0_RECV/USART0_RX_vect/g'
-SUBST_SED.uart0+= -e 's/SIG_UART0_DATA/USART0_UDRE_vect/g'
-
-SUBST_CLASSES+= intrpt0
-SUBST_STAGE.intrpt0= post-patch
-SUBST_MESSAGE.intrpt0= Convert poisoned SIG_INTERRUPT0 to INT0_vect
-SUBST_FILES.intrpt0= examples/atmel_key/kb.c
-SUBST_FILES.intrpt0+= examples/python/multicore.c
-SUBST_FILES.intrpt0+= regress/extinttest/ext_int0.c
-SUBST_SED.intrpt0= -e 's/SIG_INTERRUPT0/INT0_vect/g'
-
-# Following case, see patches
-# regress/timertest/timer_16bit.c:ISR(SIG_OUTPUT_COMPARE3B) {
-
-SUBST_CLASSES+= makeinfo
-SUBST_STAGE.makeinfo= post-configure
-SUBST_MESSAGE.makeinfo= set MAKEINFO path (to avoid work-directory references included)
-SUBST_FILES.makeinfo= examples/anacomp/Makefile.in
-SUBST_FILES.makeinfo+= examples/python/Makefile.in
-SUBST_SED.makeinfo= -e 's,@MAKEINFO@,${PREFIX}/bin/makeinfo,g'
-
-# gcc 2.95 gives warnings that it cannot inline all functions.
-BUILDLINK_TRANSFORM+= rm:-Werror
-
-.include "../../cross/avr-binutils/buildlink3.mk"
-.include "../../wip/avr-gcc/buildlink3.mk"
-.include "../../devel/swig/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../lang/python/pyversion.mk"
-.include "../../lang/${PYPACKAGE}/buildlink3.mk"
-.include "../../lang/tcl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/simulavr/PLIST b/simulavr/PLIST
deleted file mode 100644
index 60566b9dda..0000000000
--- a/simulavr/PLIST
+++ /dev/null
@@ -1,160 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2013/09/12 04:56:07 makoto Exp $
-bin/simulavr
-include/simulavr/adcpin.h
-include/simulavr/application.h
-include/simulavr/at4433.h
-include/simulavr/at8515.h
-include/simulavr/at90canbase.h
-include/simulavr/atmega128.h
-include/simulavr/atmega1284abase.h
-include/simulavr/atmega16_32.h
-include/simulavr/atmega668base.h
-include/simulavr/atmega8.h
-include/simulavr/attiny2313.h
-include/simulavr/avrdevice.h
-include/simulavr/avrdevice_impl.h
-include/simulavr/avrerror.h
-include/simulavr/avrfactory.h
-include/simulavr/avrmalloc.h
-include/simulavr/breakpoint.h
-include/simulavr/config_deprecated.h
-include/simulavr/decoder.h
-include/simulavr/dumpargs.h
-include/simulavr/externalirq.h
-include/simulavr/externaltype.h
-include/simulavr/extpin.h
-include/simulavr/flash.h
-include/simulavr/flashprog.h
-include/simulavr/funktor.h
-include/simulavr/gdb.h
-include/simulavr/global.h
-include/simulavr/hardware.h
-include/simulavr/helper.h
-include/simulavr/hwacomp.h
-include/simulavr/hwad.h
-include/simulavr/hwdecls.h
-include/simulavr/hweeprom.h
-include/simulavr/hwpinchange.h
-include/simulavr/hwport.h
-include/simulavr/hwspi.h
-include/simulavr/hwsreg.h
-include/simulavr/hwstack.h
-include/simulavr/hwtimer.h
-include/simulavr/hwuart.h
-include/simulavr/hwwado.h
-include/simulavr/icapturesrc.h
-include/simulavr/ioregs.h
-include/simulavr/irqsystem.h
-include/simulavr/keyboard.h
-include/simulavr/keynumber_to_scancode.dat
-include/simulavr/keytrans.h
-include/simulavr/lcd.h
-include/simulavr/memory.h
-include/simulavr/mysocket.h
-include/simulavr/net.h
-include/simulavr/pin.h
-include/simulavr/pinatport.h
-include/simulavr/pinmon.h
-include/simulavr/pinnotify.h
-include/simulavr/prescalermux.h
-include/simulavr/printable.h
-include/simulavr/pysimulationmember.h
-include/simulavr/rwmem.h
-include/simulavr/scope.h
-include/simulavr/serialrx.h
-include/simulavr/serialtx.h
-include/simulavr/simulationmember.h
-include/simulavr/specialmem.h
-include/simulavr/spisink.h
-include/simulavr/spisrc.h
-include/simulavr/string2.h
-include/simulavr/string2_template.h
-include/simulavr/systemclock.h
-include/simulavr/systemclocktypes.h
-include/simulavr/timerirq.h
-include/simulavr/timerprescaler.h
-include/simulavr/traceval.h
-include/simulavr/types.h
-include/simulavr/ui.h
-include/simulavr/xcode_to_keynumber.dat
-info/simulavr.info
-lib/libsim.la
-lib/libsimulavr.la
-share/doc/simulavr/AUTHORS
-share/doc/simulavr/COPYING
-share/doc/simulavr/ChangeLog
-share/doc/simulavr/INSTALL
-share/doc/simulavr/NEWS
-share/doc/simulavr/README
-share/doc/simulavr/README.gdb
-share/doc/simulavr/SUPPORT
-share/doc/simulavr/TODO
-share/doc/simulavr/examples/ChangeLog
-share/doc/simulavr/examples/anacomp/Makefile
-share/doc/simulavr/examples/anacomp/README
-share/doc/simulavr/examples/anacomp/anacomp.elf
-share/doc/simulavr/examples/anacomp/anacomp.tcl
-share/doc/simulavr/examples/anacomp/main.c
-share/doc/simulavr/examples/atmega128_timer/README
-share/doc/simulavr/examples/atmega128_timer/debugio.c
-share/doc/simulavr/examples/atmega128_timer/debugio.h
-share/doc/simulavr/examples/atmega128_timer/main.c
-share/doc/simulavr/examples/atmega128_timer/timer.elf
-share/doc/simulavr/examples/atmega48/README
-share/doc/simulavr/examples/atmega48/anadata1
-share/doc/simulavr/examples/atmega48/anadata2
-share/doc/simulavr/examples/atmega48/anadata3
-share/doc/simulavr/examples/atmega48/atmega48.elf
-share/doc/simulavr/examples/atmega48/atmega48.tcl
-share/doc/simulavr/examples/atmega48/main.cpp
-share/doc/simulavr/examples/atmega48/spidata
-share/doc/simulavr/examples/atmel_key/Notes.txt
-share/doc/simulavr/examples/atmel_key/README
-share/doc/simulavr/examples/atmel_key/StdDefs.c
-share/doc/simulavr/examples/atmel_key/StdDefs.h
-share/doc/simulavr/examples/atmel_key/atmel_key.elf
-share/doc/simulavr/examples/atmel_key/atmel_key.tcl
-share/doc/simulavr/examples/atmel_key/kb.c
-share/doc/simulavr/examples/atmel_key/kb.h
-share/doc/simulavr/examples/atmel_key/main.c
-share/doc/simulavr/examples/atmel_key/pindefs.h
-share/doc/simulavr/examples/atmel_key/scancodes.h
-share/doc/simulavr/examples/atmel_key/serial.c
-share/doc/simulavr/examples/atmel_key/serial.h
-share/doc/simulavr/examples/feedback/README
-share/doc/simulavr/examples/feedback/adc.c
-share/doc/simulavr/examples/feedback/debugio.c
-share/doc/simulavr/examples/feedback/debugio.h
-share/doc/simulavr/examples/feedback/defines.h
-share/doc/simulavr/examples/feedback/feedback.elf
-share/doc/simulavr/examples/feedback/feedback.tcl
-share/doc/simulavr/examples/feedback/main.c
-share/doc/simulavr/examples/feedback/simfeedback.tcl
-share/doc/simulavr/examples/feedback/uart.c
-share/doc/simulavr/examples/feedback/uart.h
-share/doc/simulavr/examples/gui.tcl
-share/doc/simulavr/examples/kbd.xbm
-share/doc/simulavr/examples/simple_ex1/README
-share/doc/simulavr/examples/simple_ex1/fred.c
-share/doc/simulavr/examples/simple_ex1/fred.elf
-share/doc/simulavr/examples/simulavr.tcl
-share/doc/simulavr/examples/spi/README
-share/doc/simulavr/examples/spi/anadata
-share/doc/simulavr/examples/spi/main.cpp
-share/doc/simulavr/examples/spi/spi.elf
-share/doc/simulavr/examples/spi/spi.tcl
-share/doc/simulavr/examples/spi/spidata
-share/doc/simulavr/examples/stdiodemo/README
-share/doc/simulavr/examples/stdiodemo/checkdebug.gdb
-share/doc/simulavr/examples/stdiodemo/defines.h
-share/doc/simulavr/examples/stdiodemo/hd44780.c
-share/doc/simulavr/examples/stdiodemo/hd44780.h
-share/doc/simulavr/examples/stdiodemo/lcd.c
-share/doc/simulavr/examples/stdiodemo/lcd.h
-share/doc/simulavr/examples/stdiodemo/stdiodemo-setup.jpg
-share/doc/simulavr/examples/stdiodemo/stdiodemo.c
-share/doc/simulavr/examples/stdiodemo/stdiodemo.dox
-share/doc/simulavr/examples/stdiodemo/stdiodemo.elf
-share/doc/simulavr/examples/stdiodemo/stdiodemo.tcl
-share/doc/simulavr/examples/stdiodemo/uart.c
-share/doc/simulavr/examples/stdiodemo/uart.h
diff --git a/simulavr/TODO b/simulavr/TODO
deleted file mode 100644
index 25d7bf20c8..0000000000
--- a/simulavr/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-- In configuration, seeing following message:
- build verilog modul avr.vpi = no
-- examples/python is not activated.
- az_python_use=true seems to do that, but not.
diff --git a/simulavr/distinfo b/simulavr/distinfo
deleted file mode 100644
index b753e7000b..0000000000
--- a/simulavr/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.6 2014/06/20 14:33:28 makoto Exp $
-
-SHA1 (simulavr-1.0.0.tar.gz) = e7cacc74be974793bd9c18330ec8d128fbd17d42
-RMD160 (simulavr-1.0.0.tar.gz) = 0e9eb32f398943449b564e919765348c32f4c600
-Size (simulavr-1.0.0.tar.gz) = 1013014 bytes
-SHA1 (patch-configure) = 8fe7c24d17ded8a5b53688f5d35b4aaf55e6c830
-SHA1 (patch-doc_simulavr_texinfo) = ce5615f6e64d4be535b056bd8d3377b1f7a4a5d6
-SHA1 (patch-examples_atmel_key_StdDefs_c) = 73a89da0144d1d0cc2c678476270ea1f79300089
-SHA1 (patch-examples_atmel_key_scancodes.h) = f7f6d3f2da8eec4cf9b52800a499bd8300545bc0
-SHA1 (patch-regress_timertest_timer_16bit.c) = 81ee86847fd4d40817b2f4bf01e03aca86856f3c
-SHA1 (patch-src_Makefile.in) = 28354fe97e521b528b6f6d804b7b750d7c63062f
-SHA1 (patch-src_systemclock_cpp) = 91535a11446dade72752dd0d549d4a605c5e90bc
-SHA1 (patch-src_systemclock_h) = fce9df95336b02b3152ec9b162a085c8c4b20283
-SHA1 (patch-src_traceval_cpp) = a92597bd935916fa0ec366b9187df33f075a7c83
-SHA1 (patch-src_traceval_h) = 140fc29e4879d1a4d9ad650ce8eb0be6939e1aae
diff --git a/simulavr/patches/patch-configure b/simulavr/patches/patch-configure
deleted file mode 100644
index 0c563f8191..0000000000
--- a/simulavr/patches/patch-configure
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/07/06 15:35:48 makoto Exp $
-
-=> Checking for portability problems in extracted files
-ERROR: [check-portability.awk] => Found test ... == ...:
-
---- configure.orig 2013-07-06 17:58:39.000000000 +0900
-+++ configure 2013-07-06 18:00:22.000000000 +0900
-@@ -15283,7 +15283,7 @@ $as_echo_n "checking for Python library
- py_version=`$PYTHON -c "from distutils.sysconfig import *; \
- from string import join; \
- print(join(get_config_vars('VERSION')))"`
-- if test "$py_version" == "None"; then
-+ if test "$py_version" = "None"; then
- if test -n "$PYTHON_VERSION"; then
- py_version=$PYTHON_VERSION
- else
-@@ -16684,7 +16684,7 @@ else
- USE_FAB_FALSE=
- fi
-
--if test X"${USE_FAB_FALSE}" == X"" ; then
-+if test X"${USE_FAB_FALSE}" x= X"" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: NOT available" >&5
- $as_echo "NOT available" >&6; }
- else
diff --git a/simulavr/patches/patch-doc_simulavr_texinfo b/simulavr/patches/patch-doc_simulavr_texinfo
deleted file mode 100644
index 318039ae49..0000000000
--- a/simulavr/patches/patch-doc_simulavr_texinfo
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-doc_simulavr_texinfo,v 1.1 2013/08/14 05:14:55 makoto Exp $
-
-Add directory entry information. Without this, ${PREFIX}/info/dir
-won't be updated by install-info. Typical error message will be:
- ----
-% install-info --dir-file=/usr/pkg/info/dir ./work/simulavr-1.0.0/doc/simulavr.info
-install-info: warning: no info dir entry in `./work/simulavr-1.0.0/doc/simulavr.info'
- ----
-
---- doc/simulavr.texinfo.orig 2012-02-13 00:26:38.000000000 +0900
-+++ doc/simulavr.texinfo 2013-08-14 14:04:34.000000000 +0900
-@@ -36,6 +36,11 @@ by the Free Software Foundation.
-
- @end copying
-
-+@dircategory SimulAVR
-+@direntry
-+* Simulavr: (SimulAVR). A simulator for the Atmel AVR family of microcontrollers.
-+@end direntry
-+
- @titlepage
- @title SimulAVR - an AVR simulation framework
- @subtitle A simulator for the Atmel AVR family of microcontrollers.
diff --git a/simulavr/patches/patch-examples_atmel_key_StdDefs_c b/simulavr/patches/patch-examples_atmel_key_StdDefs_c
deleted file mode 100644
index 6c6d057f34..0000000000
--- a/simulavr/patches/patch-examples_atmel_key_StdDefs_c
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-examples_atmel_key_StdDefs_c,v 1.1 2014/06/20 14:33:28 makoto Exp $
-
-StdDefs.c: In function 'putstr':
-StdDefs.c:120:4: warning: pointer targets in passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign]
- for (j = 0; j <= strlen(s); j++)
- ^
-In file included from StdDefs.c:10:0:
-/usr/pkg/avr/include/string.h:133:15: note: expected 'const char *' but argument is of type 'CHARU *'
- extern size_t strlen(const char *) __ATTR_PURE__;
-
---- /export/WRKOBJDIR/wip/simulavr/work/simulavr-1.0.0/examples/atmel_key/StdDefs.c 2014-06-20 23:24:10.000000000 +0900
-+++ ./examples/atmel_key/StdDefs.c 2014-06-20 12:31:14.000000000 +0900
-@@ -55,13 +55,11 @@
- }
-
- // Delay in 1/10's of a millisecond
--void msleep(INT16U ms)
-- { /* This loop does not work with optimization != 0. Therefore we use
-- avr-libc _delay routines K. Schwichtenberg
-- INT16S i,j;
-- for (i = 1; i < ms; i++)
-- for (j = 1; j < ONETENTH_MS; j++); / * to give 1/10 ms*/
-- _delay_ms(ms); // Changed K. Schwichtenberg
-+// Does not work with -O0, use -O1, even for debugging.
-+void msleep(INT16U ms10)
-+ {
-+ for( ; ms10; --ms10)
-+ _delay_ms(0.1);
- }
-
- //------------------------------------------------------------
-@@ -117,7 +115,7 @@
- void putstr(CHARU *s)
- {
- int j;
-- for (j = 0; j <= strlen(s); j++)
-+ for (j = 0; j <= strlen((char*)s); j++)
- putchar(*(s + j));
- CRLF();
- }
diff --git a/simulavr/patches/patch-examples_atmel_key_scancodes.h b/simulavr/patches/patch-examples_atmel_key_scancodes.h
deleted file mode 100644
index b915622d7f..0000000000
--- a/simulavr/patches/patch-examples_atmel_key_scancodes.h
+++ /dev/null
@@ -1,293 +0,0 @@
-$NetBSD: patch-examples_atmel_key_scancodes.h,v 1.1 2013/08/08 05:38:44 makoto Exp $
-
-In file included from kb.c:14:0:
-scancodes.h:19:1: warning: missing braces around initializer
-scancodes.h:19:1: warning: (near initialization for 'unshifted[0]')
-scancodes.h:90:11: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'shifted'
-
---- work/simulavr-1.0.0/examples/atmel_key/scancodes.h 2012-02-13 00:26:38.000000000 +0900
-+++ examples/atmel_key/scancodes.h 2013-08-08 09:25:31.000000000 +0900
-@@ -15,145 +15,145 @@
-
- // Unshifted characters
-
--static char unshifted[][2] __attribute__ ((progmem)) = {
--0x0d,9,
--0x0e,'`',
--0x15,'q',
--0x16,'1',
--0x1a,'z',
--0x1b,'s',
--0x1c,'a',
--0x1d,'w',
--0x1e,'2',
--0x21,'c',
--0x22,'x',
--0x23,'d',
--0x24,'e',
--0x25,'4',
--0x26,'3',
--0x29,' ',
--0x2a,'v',
--0x2b,'f',
--0x2c,'t',
--0x2d,'r',
--0x2e,'5',
--0x31,'n',
--0x32,'b',
--0x33,'h',
--0x34,'g',
--0x35,'y',
--0x36,'6',
--0x39,',',
--0x3a,'m',
--0x3b,'j',
--0x3c,'u',
--0x3d,'7',
--0x3e,'8',
--0x41,',',
--0x42,'k',
--0x43,'i',
--0x44,'o',
--0x45,'0',
--0x46,'9',
--0x49,'.',
--0x4a,'/',
--0x4b,'l',
--0x4c,';',
--0x4d,'p',
--0x4e,'-',
--0x52,'\'',
--0x54,'[',
--0x55,'=',
--0x5a,13,
--0x5b,']',
--0x5d,'\\',
--0x61,'<',
--0x66,8,
--0x69,'1',
--0x6b,'4',
--0x6c,'7',
--0x70,'0',
--0x71,'.',
--0x72,'2',
--0x73,'5',
--0x74,'6',
--0x75,'8',
--0x79,'+',
--0x7a,'3',
--0x7b,'-',
--0x7c,'*',
--0x7d,'9',
--0,0
-+static char const unshifted[][2] __attribute__ ((progmem)) = {
-+{0x0d,9},
-+{0x0e,'`'},
-+{0x15,'q'},
-+{0x16,'1'},
-+{0x1a,'z'},
-+{0x1b,'s'},
-+{0x1c,'a'},
-+{0x1d,'w'},
-+{0x1e,'2'},
-+{0x21,'c'},
-+{0x22,'x'},
-+{0x23,'d'},
-+{0x24,'e'},
-+{0x25,'4'},
-+{0x26,'3'},
-+{0x29,' '},
-+{0x2a,'v'},
-+{0x2b,'f'},
-+{0x2c,'t'},
-+{0x2d,'r'},
-+{0x2e,'5'},
-+{0x31,'n'},
-+{0x32,'b'},
-+{0x33,'h'},
-+{0x34,'g'},
-+{0x35,'y'},
-+{0x36,'6'},
-+{0x39,','},
-+{0x3a,'m'},
-+{0x3b,'j'},
-+{0x3c,'u'},
-+{0x3d,'7'},
-+{0x3e,'8'},
-+{0x41,','},
-+{0x42,'k'},
-+{0x43,'i'},
-+{0x44,'o'},
-+{0x45,'0'},
-+{0x46,'9'},
-+{0x49,'.'},
-+{0x4a,'/'},
-+{0x4b,'l'},
-+{0x4c,';'},
-+{0x4d,'p'},
-+{0x4e,'-'},
-+{0x52,'\''},
-+{0x54,'['},
-+{0x55,'='},
-+{0x5a,13},
-+{0x5b,']'},
-+{0x5d,'\\'},
-+{0x61,'<'},
-+{0x66,8},
-+{0x69,'1'},
-+{0x6b,'4'},
-+{0x6c,'7'},
-+{0x70,'0'},
-+{0x71,'.'},
-+{0x72,'2'},
-+{0x73,'5'},
-+{0x74,'6'},
-+{0x75,'8'},
-+{0x79,'+'},
-+{0x7a,'3'},
-+{0x7b,'-'},
-+{0x7c,'*'},
-+{0x7d,'9'},
-+{0,0}
- };
-
- // Shifted characters
--prog_char shifted[][2] = {
--0x0d,9,
--0x0e,'~',
--0x15,'Q',
--0x16,'!',
--0x1a,'Z',
--0x1b,'S',
--0x1c,'A',
--0x1d,'W',
--0x1e,'@',
--0x21,'C',
--0x22,'X',
--0x23,'D',
--0x24,'E',
--0x25,'$',
--0x26,'#',
--0x29,' ',
--0x2a,'V',
--0x2b,'F',
--0x2c,'T',
--0x2d,'R',
--0x2e,'%',
--0x31,'N',
--0x32,'B',
--0x33,'H',
--0x34,'G',
--0x35,'Y',
--0x36,'^',
--0x39,'L',
--0x3a,'M',
--0x3b,'J',
--0x3c,'U',
--0x3d,'&',
--0x3e,'*',
--0x41,'<',
--0x42,'K',
--0x43,'I',
--0x44,'O',
--0x45,')',
--0x46,'(',
--0x49,'>',
--0x4a,'\?',
--0x4b,'L',
--0x4c,':',
--0x4d,'P',
--0x4e,'_',
--0x52,'\"',
--0x54,'{',
--0x55,'+',
--0x5a,13,
--0x5b,'}',
--0x5d,'|',
--0x61,'>',
--0x66,8,
--0x69,'1',
--0x6b,'4',
--0x6c,'7',
--0x70,'0',
--0x71,'.',
--0x72,'2',
--0x73,'5',
--0x74,'6',
--0x75,'8',
--0x79,'+',
--0x7a,'3',
--0x7b,'-',
--0x7c,'*',
--0x7d,'9',
--0,0
-+static char const shifted[][2] __attribute__ ((progmem)) = {
-+{0x0d,9},
-+{0x0e,'~'},
-+{0x15,'Q'},
-+{0x16,'!'},
-+{0x1a,'Z'},
-+{0x1b,'S'},
-+{0x1c,'A'},
-+{0x1d,'W'},
-+{0x1e,'@'},
-+{0x21,'C'},
-+{0x22,'X'},
-+{0x23,'D'},
-+{0x24,'E'},
-+{0x25,'$'},
-+{0x26,'#'},
-+{0x29,' '},
-+{0x2a,'V'},
-+{0x2b,'F'},
-+{0x2c,'T'},
-+{0x2d,'R'},
-+{0x2e,'%'},
-+{0x31,'N'},
-+{0x32,'B'},
-+{0x33,'H'},
-+{0x34,'G'},
-+{0x35,'Y'},
-+{0x36,'^'},
-+{0x39,'L'},
-+{0x3a,'M'},
-+{0x3b,'J'},
-+{0x3c,'U'},
-+{0x3d,'&'},
-+{0x3e,'*'},
-+{0x41,'<'},
-+{0x42,'K'},
-+{0x43,'I'},
-+{0x44,'O'},
-+{0x45,')'},
-+{0x46,'('},
-+{0x49,'>'},
-+{0x4a,'\?'},
-+{0x4b,'L'},
-+{0x4c,':'},
-+{0x4d,'P'},
-+{0x4e,'_'},
-+{0x52,'\"'},
-+{0x54,'{'},
-+{0x55,'+'},
-+{0x5a,13},
-+{0x5b,'}'},
-+{0x5d,'|'},
-+{0x61,'>'},
-+{0x66,8},
-+{0x69,'1'},
-+{0x6b,'4'},
-+{0x6c,'7'},
-+{0x70,'0'},
-+{0x71,'.'},
-+{0x72,'2'},
-+{0x73,'5'},
-+{0x74,'6'},
-+{0x75,'8'},
-+{0x79,'+'},
-+{0x7a,'3'},
-+{0x7b,'-'},
-+{0x7c,'*'},
-+{0x7d,'9'},
-+{0,0}
- };
diff --git a/simulavr/patches/patch-regress_timertest_timer_16bit.c b/simulavr/patches/patch-regress_timertest_timer_16bit.c
deleted file mode 100644
index ff7eb94bea..0000000000
--- a/simulavr/patches/patch-regress_timertest_timer_16bit.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-regress_timertest_timer_16bit.c,v 1.1 2013/08/08 05:38:44 makoto Exp $
-
-error: attempt to use poisoned "VARNAME"
-
---- work/simulavr-1.0.0/regress/timertest/timer_16bit.c 2012-02-13 00:26:38.000000000 +0900
-+++ regress/timertest/timer_16bit.c 2013-08-08 09:25:31.000000000 +0900
-@@ -4,14 +4,14 @@
- volatile int timer_ticks;
-
- #ifdef T3TEST
--ISR(SIG_OVERFLOW3) {
-+ISR(TIMER3_OVF_vect) {
- timer_ticks++;
- }
--ISR(SIG_OUTPUT_COMPARE3B) {
-+ISR(TIMER3_COMPB_vect) {
- timer_ticks++;
- }
- #else
--ISR(SIG_OVERFLOW1) {
-+ISR(TIMER1_OVF_vect) {
- timer_ticks++;
- }
- #endif
diff --git a/simulavr/patches/patch-src_Makefile.in b/simulavr/patches/patch-src_Makefile.in
deleted file mode 100644
index 6fead543d5..0000000000
--- a/simulavr/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2013/07/07 03:42:12 makoto Exp $
-
-/usr/pkg/bin/swig -c++ -python -Ipython -o pysim ...
-...
-pysimulavr_wrap.cpp:146:20: fatal error: Python.h: No such file or directory
-
---- src/Makefile.in.orig 2013-07-07 10:12:33.000000000 +0900
-+++ src/Makefile.in 2013-07-07 10:31:40.000000000 +0900
-@@ -395,7 +395,7 @@
- @USE_SWIG_TRUE@@USE_TCL_TRUE@TCL_LIB = @AVR_TCL_LIB@
- @USE_SWIG_TRUE@@USE_TCL_TRUE@TCL_INCLUDE = @AVR_TCL_INCLUDE@
- @PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_MODUL_LIB = _pysimulavr@PYTHON_MODULE_EXTENSION@
--@PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_XTRA_INC = -Ipython
-+@PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_XTRA_INC = -I@PREFIX@/include/python2.7 -Ipython
- @PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_MODUL_INTERFACE = $(srcdir)/python/pysimulavr.i
- @PYTHON_USE_TRUE@@USE_SWIG_TRUE@nodist_lib_pysimulavr_la_SOURCES = pysimulavr_wrap.cpp
- @PYTHON_USE_TRUE@@USE_SWIG_TRUE@lib_pysimulavr_la_CPPFLAGS = $(PYTHON_CPPFLAGS) $(PYTHON_XTRA_INC)
diff --git a/simulavr/patches/patch-src_systemclock_cpp b/simulavr/patches/patch-src_systemclock_cpp
deleted file mode 100644
index 6784460c3e..0000000000
--- a/simulavr/patches/patch-src_systemclock_cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-$NetBSD: patch-src_systemclock_cpp,v 1.1 2013/09/15 16:45:17 makoto Exp $
-
-clang flags as resize unresolved reference,
-backport from git repository (as of 2013-09-15).
-
---- simulavr-1.0.0/src/systemclock.cpp 2012-02-13 00:26:38.000000000 +0900
-+++ src/systemclock.cpp 2013-09-13 09:41:15.000000000 +0900
-@@ -2,7 +2,7 @@
- ****************************************************************************
- *
- * simulavr - A simulator for the Atmel AVR family of microcontrollers.
-- * Copyright (C) 2001, 2002, 2003 Klaus Rudolph
-+ * Copyright (C) 2001, 2002, 2003 Klaus Rudolph
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
-@@ -28,6 +28,7 @@
- #include "simulationmember.h"
- #include "helper.h"
- #include "application.h"
-+#include "avrdevice.h"
- #include "avrerror.h"
-
- #include "signal.h"
-@@ -35,83 +36,78 @@
-
- using namespace std;
-
--
- template<typename Key, typename Value>
- MinHeap<Key, Value>::MinHeap()
- {
-- this->reserve(10); // vector would free&malloc when we keep inserting and removing only 1 element.
-+ this->reserve(10); // vector would free&malloc when we keep inserting and removing only 1 element.
- }
-
- template<typename Key, typename Value>
- void MinHeap<Key, Value>::RemoveMinimum()
- {
-- assert(!this->empty());
-- Key k = this->back().first;
-- Value v = this->back().second;
-- RemoveMinimumAndInsert(k, v);
-- this->pop_back();
-+ assert(!this->empty());
-+ Key k = this->back().first;
-+ Value v = this->back().second;
-+ RemoveMinimumAndInsert(k, v);
-+ this->pop_back();
- }
-
- template<typename Key, typename Value>
- bool MinHeap<Key, Value>::ContainsValue(Value v) const
- {
-- for(unsigned i = 0; i < this->size(); i++)
-- {
-- std::pair<Key,Value> item = (*this)[i];
-- if(item.second == v)
-- return true;
-- }
-- return false;
-+ for(unsigned i = 0; i < this->size(); i++)
-+ {
-+ std::pair<Key,Value> item = (*this)[i];
-+ if(item.second == v)
-+ return true;
-+ }
-+ return false;
- }
-
- template<typename Key, typename Value>
--void MinHeap<Key, Value>::Insert(Key k, Value v)
-+void MinHeap<Key, Value>::InsertInternal(Key k, Value v, unsigned pos)
- {
-- resize(this->size()+1);
-- for(unsigned i = this->size();;) {
-- unsigned parent = i/2;
-- if(parent == 0 || (*this)[parent-1].first < k) {
-- (*this)[i-1].first = k;
-- (*this)[i-1].second = v;
-- return;
-- }
-- Key k_temp = (*this)[parent-1].first;
-- Value v_temp = (*this)[parent-1].second;
-- (*this)[i-1].first = k_temp;
-- (*this)[i-1].second = v_temp;
-- i = parent;
-- }
-+ for(unsigned i = pos;;) {
-+ unsigned parent = i/2;
-+ if(parent == 0 || (*this)[parent-1].first <= k) {
-+ (*this)[i-1].first = k;
-+ (*this)[i-1].second = v;
-+ return;
-+ }
-+ Key k_temp = (*this)[parent-1].first;
-+ Value v_temp = (*this)[parent-1].second;
-+ (*this)[i-1].first = k_temp;
-+ (*this)[i-1].second = v_temp;
-+ i = parent;
-+ }
- }
-
- template<typename Key, typename Value>
--void MinHeap<Key, Value>::RemoveMinimumAndInsert(Key k, Value v)
-+void MinHeap<Key, Value>::RemoveAtPositionAndInsertInternal(Key k, Value v, unsigned pos)
- {
-- assert(!this->empty());
-- unsigned i = 1;
-- for(;;) {
-- unsigned left = 2*i;
-- unsigned right = 2*i + 1;
-- unsigned smallest = i;
-- if(left-1 < this->size() && (*this)[left-1].first < k)
-- smallest = left;
-- if(right-1 < this->size() && (*this)[right-1].first < k)
-- smallest = right;
-- if(smallest == i) {
-- (*this)[smallest-1].first = k;
-- (*this)[smallest-1].second = v;
-- return;
-- }
-- Key k_temp = (*this)[smallest-1].first;
-- Value v_temp = (*this)[smallest-1].second;
-- (*this)[smallest-1].first = k;
-- (*this)[smallest-1].second = v;
-- k = k_temp;
-- v = v_temp;
-- i = smallest;
-- }
-+ assert(pos < this->size());
-+ unsigned i = pos + 1;
-+ for(;;) {
-+ unsigned left = 2*i;
-+ unsigned right = 2*i + 1;
-+ unsigned smallest = i;
-+ if(left-1 < this->size() && (*this)[left-1].first < k)
-+ smallest = left;
-+ if(right-1 < this->size() && (*this)[right-1].first < k && (*this)[right-1].first < (*this)[left-1].first)
-+ smallest = right;
-+ if(smallest == i) {
-+ (*this)[smallest-1].first = k;
-+ (*this)[smallest-1].second = v;
-+ return;
-+ }
-+ Key k_temp = (*this)[smallest-1].first;
-+ Value v_temp = (*this)[smallest-1].second;
-+ (*this)[i-1].first = k_temp;
-+ (*this)[i-1].second = v_temp;
-+ i = smallest;
-+ }
- }
-
--
- SystemClock::SystemClock() {
- static int no = 0;
- currentTime = 0;
-@@ -130,7 +126,6 @@
- }
- }
-
--
- void SystemClock::Add(SimulationMember *dev) {
- syncMembers.Insert(currentTime, dev);
- }
-@@ -153,6 +148,8 @@
- currentTime = syncMembers.begin()->first;
- SystemClockOffset nextStepIn_ns = -1;
-
-+ syncMembers.RemoveMinimum();
-+
- // do a step on simulation member
- res = core->Step(untilCoreStepFinished, &nextStepIn_ns);
-
-@@ -164,9 +161,7 @@
- // be called anymore!
-
- if(nextStepIn_ns > 0)
-- syncMembers.RemoveMinimumAndInsert(nextStepIn_ns, core);
-- else
-- syncMembers.RemoveMinimum();
-+ syncMembers.Insert(nextStepIn_ns, core);
-
- // handle async simulation members
- amiEnd = asyncMembers.end();
-@@ -180,12 +175,11 @@
- }
-
- void SystemClock::Rescedule(SimulationMember *sm, SystemClockOffset newTime) {
-- MinHeap<SystemClockOffset, SimulationMember *>::iterator ii;
-
-- for(ii=syncMembers.begin(); ii != syncMembers.end(); ii++) {
-- if(ii->second == sm) {
-- syncMembers.erase(ii);
-- break;
-+ for(unsigned i = 0; i < syncMembers.size(); i++) {
-+ if(syncMembers[i].second == sm) {
-+ syncMembers.RemoveAtPositionAndInsert(newTime+currentTime+1, sm, i);
-+ return;
- }
- }
-
-@@ -211,6 +205,7 @@
- }
-
- void SystemClock::Endless() {
-+ breakMessage = false; // if we run a second loop, clear break before entering loop
- int steps = 0;
-
- signal(SIGINT, OnBreak);
-@@ -227,7 +222,6 @@
- Application::GetInstance()->PrintResults();
- }
-
--
- void SystemClock::Run(SystemClockOffset maxRunTime) {
- int steps = 0;
-
-@@ -269,4 +263,3 @@
- static SystemClock obj;
- return obj;
- }
--
diff --git a/simulavr/patches/patch-src_systemclock_h b/simulavr/patches/patch-src_systemclock_h
deleted file mode 100644
index 860495f4e7..0000000000
--- a/simulavr/patches/patch-src_systemclock_h
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-src_systemclock_h,v 1.1 2013/09/15 16:45:17 makoto Exp $
-
-clang flags as resize unresolved reference,
-backport from git repository (as of 2013-09-15).
-
---- simulavr-1.0.0/src/systemclock.h 2012-02-13 00:26:38.000000000 +0900
-+++ src/systemclock.h 2013-09-13 09:41:15.000000000 +0900
-@@ -2,7 +2,7 @@
- ****************************************************************************
- *
- * simulavr - A simulator for the Atmel AVR family of microcontrollers.
-- * Copyright (C) 2001, 2002, 2003 Klaus Rudolph
-+ * Copyright (C) 2001, 2002, 2003 Klaus Rudolph
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
-@@ -29,26 +29,41 @@
- #include <map>
- #include <vector>
-
--#include "avrdevice.h"
- #include "systemclocktypes.h"
-
-+class SimulationMember;
-+
- /** A heap data structure optimized for obtaining Value of the smallest Key.
-- Example MinHeap<SystemClockOffset, SimulationMember*>. */
-+ Example MinHeap<SystemClockOffset, SimulationMember*>. */
- template<typename Key, typename Value>
- class MinHeap : public std::vector<std::pair<Key,Value> >
- {
- public:
-- MinHeap();
-- bool IsEmpty() const { return this->empty(); }
-- Value GetMinimumKey() const { return this->front().first; }
-- Value GetMinimumValue() const { return this->front().second; };
-- void RemoveMinimum();
-- bool ContainsValue(Value v) const;
-- void Insert(Key k, Value v);
-- void RemoveMinimumAndInsert(Key k, Value v);
-+ MinHeap();
-+ bool IsEmpty() const { return this->empty(); }
-+ Key GetMinimumKey() const { return this->front().first; }
-+ Value GetMinimumValue() const { return this->front().second; };
-+ void RemoveMinimum();
-+ bool ContainsValue(Value v) const;
-+ void Insert(Key k, Value v) {
-+ this->resize(this->size()+1);
-+ InsertInternal(k, v, this->size());
-+ }
-+ void RemoveMinimumAndInsert(Key k, Value v) {
-+ RemoveAtPositionAndInsertInternal(k, v, 0);
-+ }
-+ void RemoveAtPositionAndInsert(Key k, Value v, unsigned pos) {
-+ if(k < (*this)[pos-1].first)
-+ InsertInternal(k, v, pos);
-+ else
-+ RemoveAtPositionAndInsertInternal(k, v, pos);
-+ }
-+protected:
-+ // These are internal because a bad value of `pos' could violate the binary heap invariant.
-+ void InsertInternal(Key k, Value v, unsigned pos);
-+ void RemoveAtPositionAndInsertInternal(Key k, Value v, unsigned pos);
- };
-
--
- //! Class to store and manage the central simulation time
- /*! This acts as a time table, a simulation member gets a place on this ordered
- table, where it should be called next time, the placement depends on the
-@@ -72,7 +87,7 @@
-
- protected:
- SystemClockOffset currentTime; //!< time in [ns] since start of simulation
-- MinHeap<SystemClockOffset, SimulationMember *> syncMembers; //!< earliest first
-+ MinHeap<SystemClockOffset, SimulationMember *> syncMembers; //!< earliest first
- std::vector<SimulationMember*> asyncMembers; //!< List of asynchron working simulation members, will be called every step!
-
- public:
diff --git a/simulavr/patches/patch-src_traceval_cpp b/simulavr/patches/patch-src_traceval_cpp
deleted file mode 100644
index 05ea639a95..0000000000
--- a/simulavr/patches/patch-src_traceval_cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-src_traceval_cpp,v 1.1 2013/09/15 16:45:17 makoto Exp $
-
-clang flags as resize unresolved reference,
-backport from git repository (as of 2013-09-15).
-
---- simulavr-1.0.0/src/traceval.cpp 2012-02-13 00:26:38.000000000 +0900
-+++ src/traceval.cpp 2013-09-13 09:41:15.000000000 +0900
-@@ -28,6 +28,7 @@
- #include <stdlib.h>
- #include "helper.h"
- #include "traceval.h"
-+#include "avrdevice.h"
- #include "avrerror.h"
- #include "systemclock.h"
-
-@@ -36,7 +37,7 @@
- TraceValue::TraceValue(size_t bits,
- const std::string &__name,
- const int __index,
-- void *_shadow) :
-+ const void *_shadow) :
- b(bits),
- _name(__name),
- _index(__index),
-@@ -111,15 +112,16 @@
- unsigned nv;
- switch (b) {
- case 1:
-- nv=*(bool*)shadow; break;
-+ nv = *(const bool*) shadow; break;
- case 8:
-- nv=*(uint8_t*)shadow; break;
-+ nv = *(const uint8_t*) shadow; break;
- case 16:
-- nv=*(uint16_t*)shadow; break;
-+ nv = *(const uint16_t*) shadow; break;
- case 32:
-- nv=*(uint32_t*)shadow; break;
-+ nv = *(const uint32_t*) shadow; break;
- default:
- avr_error("Internal error: Unsupported number of bits in TraceValue::cycle().");
-+ break;
- }
- if (v!=nv) {
- f|=CHANGE;
-@@ -144,6 +146,26 @@
- f=0;
- }
-
-+char TraceValue::VcdBit(int bitNo) const {
-+ if (_written)
-+ return (v & (1 << bitNo)) ? '1' : '0';
-+ else
-+ return 'x';
-+}
-+
-+char TraceValueOutput::VcdBit(int bitNo) const {
-+ unsigned val = value();
-+ if(written()) {
-+ if(val == Pin::TRISTATE)
-+ return 'z';
-+ if((val == Pin::HIGH) || (val == Pin::PULLUP))
-+ return '1';
-+ if(val == Pin::LOW)
-+ return '0';
-+ }
-+ return 'x';
-+}
-+
- TraceValueRegister::~TraceValueRegister() {
- for (valmap_t::iterator i = _tvr_values.begin(); i != _tvr_values.end(); i++)
- delete i->first;
-@@ -360,14 +382,9 @@
-
- void DumpVCD::valout(const TraceValue *v) {
- osbuffer << 'b';
-- if (v->written()) {
-- unsigned val=v->value();
-- for (int i=v->bits()-1; i>=0; i--)
-- osbuffer << ((val&(1<<i)) ? '1' : '0');
-- } else {
-- for (int i=0; i < v->bits(); i++)
-- osbuffer << 'x';
-- }
-+ for (int i = v->bits()-1; i >= 0; i--)
-+ osbuffer << v->VcdBit(i);
-+
- }
-
- void DumpVCD::flushbuffer(void) {
-@@ -726,31 +743,28 @@
- return load(is);
- }
-
--TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, bool *val) {
-+TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, const bool *val) {
- TraceValue *tv=new TraceValue(1, t->GetTraceValuePrefix() + name,
- -1, val);
- t->RegisterTraceValue(tv);
- return tv;
- }
-
--TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, uint8_t
--*val) {
-+TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, const uint8_t*val) {
- TraceValue* tv=new TraceValue(8, t->GetTraceValuePrefix() + name,
- -1, val);
- t->RegisterTraceValue(tv);
- return tv;
- }
-
--TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, uint16_t
--*val) {
-+TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, const uint16_t*val) {
- TraceValue* tv=new TraceValue(16, t->GetTraceValuePrefix() + name,
- -1, val);
- t->RegisterTraceValue(tv);
- return tv;
- }
-
--TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, uint32_t
--*val) {
-+TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, const uint32_t*val) {
- TraceValue* tv=new TraceValue(32, t->GetTraceValuePrefix() + name,
- -1, val);
- t->RegisterTraceValue(tv);
diff --git a/simulavr/patches/patch-src_traceval_h b/simulavr/patches/patch-src_traceval_h
deleted file mode 100644
index 0af4c5b654..0000000000
--- a/simulavr/patches/patch-src_traceval_h
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-src_traceval_h,v 1.1 2013/09/15 16:45:17 makoto Exp $
-
-clang flags as resize unresolved reference,
-backport from git repository (as of 2013-09-15).
-
---- simulavr-1.0.0/src/traceval.h 2012-02-13 00:26:38.000000000 +0900
-+++ src/traceval.h 2013-09-13 09:41:15.000000000 +0900
-@@ -106,8 +106,9 @@
- TraceValue(size_t bits,
- const std::string &_name,
- const int __index=-1,
-- void* shadow=0);
--
-+ const void* shadow=0);
-+ virtual ~TraceValue() {}
-+
- //! Give number of bits for this value. Max 32.
- size_t bits() const;
-
-@@ -177,6 +178,9 @@
- flags. */
- virtual void dump(Dumper &d);
-
-+ /*! Give back VCD coding of a bit */
-+ virtual char VcdBit(int bitNo) const;
-+
- protected:
- //! Clear all access flags
- void clear_flags();
-@@ -191,7 +195,7 @@
- const unsigned b;
-
- //! shadow reg, if used
-- void *shadow;
-+ const void *shadow;
-
- //! The value itself
- unsigned v;
-@@ -207,6 +211,17 @@
- bool _enabled;
- };
-
-+class TraceValueOutput: public TraceValue {
-+
-+ public:
-+ /*! Generate a new uninitialized trace value of pin output driver */
-+ TraceValueOutput(const std::string &_name): TraceValue(1, _name) {}
-+
-+ /*! Give back VCD coding of pin output driver */
-+ virtual char VcdBit(int bitNo) const;
-+
-+};
-+
- class AvrDevice;
- class TraceValueRegister;
-
-@@ -453,7 +468,7 @@
- if(_tvr_scopename.length() > 0)
- _tvr_scopeprefix += _tvr_scopename + ".";
- }
-- ~TraceValueRegister();
-+ virtual ~TraceValueRegister();
-
- //! Returns the scope prefix
- const std::string GetTraceValuePrefix(void) { return _tvr_scopeprefix; }
-@@ -511,18 +526,18 @@
-
- //! Register a directly traced bool value
- /*! \return pointer to the new registered TraceValue */
--TraceValue *trace_direct(TraceValueRegister *t, const std::string &name, bool *val);
-+TraceValue *trace_direct(TraceValueRegister *t, const std::string &name, const bool *val);
-
- //! Register a directly traced byte value
- /*! \return pointer to the new registered TraceValue */
--TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, uint8_t *val);
-+TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, const uint8_t *val);
-
- //! Register a directly traced 16bit word value
- /*! \return pointer to the new registered TraceValue */
--TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, uint16_t *val);
-+TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, const uint16_t *val);
-
- //! Register a directly traced 32bit word value
- /*! \return pointer to the new registered TraceValue */
--TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, uint32_t *val);
-+TraceValue* trace_direct(TraceValueRegister *t, const std::string &name, const uint32_t *val);
-
- #endif
diff --git a/trinity/Makefile b/trinity/Makefile
index 1b4d9bd9fe..3869b3f283 100644
--- a/trinity/Makefile
+++ b/trinity/Makefile
@@ -23,7 +23,7 @@ DEPENDS+= slclust>=0.0.0.20100202:../../wip/slclust
DEPENDS+= salmon>=0.11.3:../../wip/salmon
DEPENDS+= bowtie>=1.1.2:../../wip/bowtie
DEPENDS+= bowtie2>=2.3.4.2:../../wip/bowtie2
-DEPENDS+= samtools>=1.9:../../wip/samtools
+DEPENDS+= samtools>=1.9:../../biology/samtools
DEPENDS+= jellyfish>=2.2.10:../../wip/jellyfish2
DEPENDS+= parafly>=2013.01.21:../../wip/parafly
DEPENDS+= fastool>=0.1.4:../../wip/fastool
diff --git a/validns/DESCR b/validns/DESCR
deleted file mode 100644
index d48cd376fd..0000000000
--- a/validns/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-validns is a DNS and DSNSEC zone file validator.
diff --git a/validns/Makefile b/validns/Makefile
deleted file mode 100644
index 25e7d5caa8..0000000000
--- a/validns/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD$
-
-DISTNAME= validns
-PKGNAME= validns-0.8
-CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_GITHUB:=tobez/}
-GITHUB_PROJECT= validns
-GITHUB_TAG= f423245b9867359398f83e8a60fea167ad7694ca
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-COMMENT= DNS and DNSSEC zone file validator
-LICENSE= 2-clause-bsd
-
-USE_LANGUAGES= c
-USE_TOOLS+= gmake
-WRKSRC= ${WRKDIR}/${DISTNAME}-${GITHUB_TAG}
-
-.include "../../wip/judy/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/validns/PLIST b/validns/PLIST
deleted file mode 100644
index 6eca3c991e..0000000000
--- a/validns/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-bin/validns
-man/man1/validns.1
diff --git a/validns/distinfo b/validns/distinfo
deleted file mode 100644
index ed8e36a800..0000000000
--- a/validns/distinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-SHA1 (validns-f423245b9867359398f83e8a60fea167ad7694ca.tar.gz) = ca6a82104a75ed28ae13ed7577cd57a355c239b5
-RMD160 (validns-f423245b9867359398f83e8a60fea167ad7694ca.tar.gz) = 218782537d73256fb9a2fbc50da32414857792e8
-SHA512 (validns-f423245b9867359398f83e8a60fea167ad7694ca.tar.gz) = 2b42d256712c823f0ab5549a05954c4d80f5849fcc33f17eba3d4680e65b8bc6b1e350dfbacd982b800981ac0308305e3a6fce2e990e687133a98ecb4d7be103
-Size (validns-f423245b9867359398f83e8a60fea167ad7694ca.tar.gz) = 230306 bytes
-SHA1 (patch-Makefile) = 9212b049087139c7446b9317e8bbbafb3c589cd6
-SHA1 (patch-base32hex.c) = be66cfc75a4d204e28af79096806b86f39c1e701
-SHA1 (patch-base64.c) = 9d89278c3023d785f4286163e3f21f0714e999a0
-SHA1 (patch-carp.c) = 1191373ede9a0b6b4e4023056cbcbbbcb1010f4b
-SHA1 (patch-cert.c) = 25cde2c4914c9c5e73b8e2c55211e4baabedddb3
-SHA1 (patch-loc.c) = 17705f915b28197a388d097223b4fd0486163398
-SHA1 (patch-main.c) = 8ac62bb59916c2d9f0c85b6a177b2cdf91ddb942
-SHA1 (patch-naptr.c) = 6247a5f25407b7cc2d95083e19b39b1425f43f9b
-SHA1 (patch-nsec.c) = 791910fe98705614a0656e66d707a4eac850af65
-SHA1 (patch-nsec3.c) = 36627ed0b73694e7b39ba287010ac28c7979da2c
-SHA1 (patch-nsec3param.c) = b396524fd5ef0321f1f9b84f7fa6533c851de24c
-SHA1 (patch-rr.c) = 67aba9922ec1584715bad1325d316a75fddf02ee
-SHA1 (patch-textparse.c) = 3cbabb87f56949c4fc0d722479d4768a9515f2d3
-SHA1 (patch-tlsa.c) = ec35acbbe41811cee845e3d7e503221c9fa5d0ec
-SHA1 (patch-x25.c) = 44d0a07bd2a669884ac2b13b655719753beae091
diff --git a/validns/patches/patch-Makefile b/validns/patches/patch-Makefile
deleted file mode 100644
index 6f53e7d550..0000000000
--- a/validns/patches/patch-Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-Add -L and -Wl,-R args to link to pick up Judy library.
-Add "all" and "install" targets.
-Remove / comment-out non-pkgsrc include and library paths..
-
---- Makefile.orig 2017-08-04 14:27:44.000000000 +0000
-+++ Makefile
-@@ -1,9 +1,11 @@
- # The following options seem to work fine on Linux, FreeBSD, and Darwin
- OPTIMIZE=-O2 -g
- CFLAGS=-Wall -Werror -pthread -fno-strict-aliasing
--INCPATH=-I/usr/local/include -I/opt/local/include -I/usr/local/ssl/include
-+# INCPATH=-I/usr/local/include -I/opt/local/include -I/usr/local/ssl/include
- CC?=cc
-
-+EXTRALPATH=-L${PREFIX}/lib -Wl,-R,${PREFIX}/lib
-+
- # These additional options work on Solaris/gcc to which I have an access
- # (when combined with the options above, and CC=gcc).
- #EXTRALPATH=-L/usr/local/ssl/lib -Wl,-R,/usr/local/ssl/lib
-@@ -18,6 +20,14 @@ CC?=cc
- #EXTRALIBS-lrt -lnsl
- #EXTRALINKING=-mt -lpthread
-
-+all: validns
-+
-+install:
-+ mkdir -p ${DESTDIR}/${PREFIX}/bin
-+ install -c -m 555 validns ${DESTDIR}/${PREFIX}/bin
-+ mkdir -p ${DESTDIR}/${PREFIX}/man/man1
-+ install -c -m 444 validns.1 ${DESTDIR}/${PREFIX}/man/man1
-+
- validns: main.o carp.o mempool.o textparse.o base64.o base32hex.o \
- rr.o soa.o a.o cname.o mx.o ns.o \
- rrsig.o nsec.o dnskey.o txt.o aaaa.o \
-@@ -39,7 +49,7 @@ validns: main.o carp.o mempool.o textpar
- ipseckey.o cbtree.o mb.o mg.o mr.o minfo.o \
- afsdb.o x25.o isdn.o rt.o px.o kx.o \
- dlv.o dhcid.o nsap.o caa.o \
-- -L/usr/local/lib -L/opt/local/lib $(EXTRALPATH) \
-+ $(EXTRALPATH) \
- -lJudy -lcrypto $(EXTRALIBS) $(EXTRALINKING)
-
- clean:
diff --git a/validns/patches/patch-base32hex.c b/validns/patches/patch-base32hex.c
deleted file mode 100644
index 686be8f373..0000000000
--- a/validns/patches/patch-base32hex.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- base32hex.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ base32hex.c
-@@ -48,7 +48,7 @@ decode_base32hex(void *dest, char *src,
- v = *src - 'a' + 10;
- else if (*src >= '0' && *src <= '9')
- v = *src - '0';
-- else if (isspace(*src) || *src == '=') {
-+ else if (isspace((unsigned char)*src) || *src == '=') {
- src++;
- continue;
- } else {
diff --git a/validns/patches/patch-base64.c b/validns/patches/patch-base64.c
deleted file mode 100644
index 45d12ad7c0..0000000000
--- a/validns/patches/patch-base64.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- base64.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ base64.c
-@@ -39,7 +39,7 @@ decode_base64(void *dest, char *src, siz
- v = 62;
- else if (*src == '/')
- v = 63;
-- else if (isspace(*src) || *src == '=') {
-+ else if (isspace((unsigned char)*src) || *src == '=') {
- src++;
- continue;
- } else {
diff --git a/validns/patches/patch-carp.c b/validns/patches/patch-carp.c
deleted file mode 100644
index d3f62bcfa0..0000000000
--- a/validns/patches/patch-carp.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Add use of getprogname() for NetBSD and OpenBSD.
-This part of the code could do with some more work...
-
---- carp.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ carp.c
-@@ -102,7 +102,7 @@ static char proggy[MAXPATHLEN];
-
- const char *thisprogname(void)
- {
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- return getprogname();
- #elif defined(__APPLE__)
- return getprogname();
diff --git a/validns/patches/patch-cert.c b/validns/patches/patch-cert.c
deleted file mode 100644
index 88d695b682..0000000000
--- a/validns/patches/patch-cert.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- cert.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ cert.c
-@@ -29,7 +29,7 @@ static int extract_certificate_type(char
- int type;
- char *str_type;
-
-- if (isdigit(**s)) {
-+ if (isdigit((unsigned char)**s)) {
- type = extract_integer(s, what, NULL);
- if (type >= 1 && type <= 8)
- return type;
-@@ -90,7 +90,7 @@ static struct rr* cert_parse(char *name,
- return bitch("bad key tag");
- rr->key_tag = key_tag;
-
-- if (isdigit(*s)) {
-+ if (isdigit((unsigned char)*s)) {
- alg = extract_integer(&s, "algorithm", NULL);
- if (alg < 0) return NULL;
- if (alg > 255) return bitch("bad algorithm");
diff --git a/validns/patches/patch-loc.c b/validns/patches/patch-loc.c
deleted file mode 100644
index ea032a5f79..0000000000
--- a/validns/patches/patch-loc.c
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- loc.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ loc.c
-@@ -64,7 +64,7 @@ static struct rr *loc_parse(char *name,
- deg = i;
- min = 0;
- sec = 0;
-- if (isdigit(*s)) {
-+ if (isdigit((unsigned char)*s)) {
- i = extract_integer(&s, "minutes latitude", NULL);
- if (i < 0)
- return NULL;
-@@ -72,7 +72,7 @@ static struct rr *loc_parse(char *name,
- return bitch("minutes latitude not in the range 0..59");
- min = i;
-
-- if (isdigit(*s)) { /* restricted floating point, starting with a digit */
-+ if (isdigit((unsigned char)*s)) { /* restricted floating point, starting with a digit */
- if (extract_double(&s, "seconds latitude", &sec, 0) < 0)
- return NULL;
- if (sec < 0 || sec > 59.999)
-@@ -89,7 +89,7 @@ static struct rr *loc_parse(char *name,
- } else {
- return bitch("latitude: N or S is expected");
- }
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- return bitch("latitude: N or S is expected");
- }
- s = skip_white_space(s);
-@@ -104,7 +104,7 @@ static struct rr *loc_parse(char *name,
- deg = i;
- min = 0;
- sec = 0;
-- if (isdigit(*s)) {
-+ if (isdigit((unsigned char)*s)) {
- i = extract_integer(&s, "minutes longitude", NULL);
- if (i < 0)
- return NULL;
-@@ -112,7 +112,7 @@ static struct rr *loc_parse(char *name,
- return bitch("minutes longitude not in the range 0..59");
- min = i;
-
-- if (isdigit(*s)) { /* restricted floating point, starting with a digit */
-+ if (isdigit((unsigned char)*s)) { /* restricted floating point, starting with a digit */
- if (extract_double(&s, "seconds longitude", &sec, 0) < 0)
- return NULL;
- if (sec < 0 || sec > 59.999)
-@@ -129,7 +129,7 @@ static struct rr *loc_parse(char *name,
- } else {
- return bitch("longitude: E or W is expected");
- }
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- return bitch("longitude: E or W is expected");
- }
- s = skip_white_space(s);
diff --git a/validns/patches/patch-main.c b/validns/patches/patch-main.c
deleted file mode 100644
index 8c1341c885..0000000000
--- a/validns/patches/patch-main.c
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- main.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ main.c
-@@ -109,8 +109,8 @@ static char *process_directive(char *s)
- if (*(s+1) == 'O' && strncmp(s, "$ORIGIN", 7) == 0) {
- char *o;
- s += 7;
-- if (!isspace(*s)) {
-- if (isalnum(*s)) goto unrecognized_directive;
-+ if (!isspace((unsigned char)*s)) {
-+ if (isalnum((unsigned char)*s)) goto unrecognized_directive;
- return bitch("bad $ORIGIN format");
- }
- s = skip_white_space(s);
-@@ -128,8 +128,8 @@ static char *process_directive(char *s)
- }
- } else if (*(s+1) == 'T' && strncmp(s, "$TTL", 4) == 0) {
- s += 4;
-- if (!isspace(*s)) {
-- if (isalnum(*s)) goto unrecognized_directive;
-+ if (!isspace((unsigned char)*s)) {
-+ if (isalnum((unsigned char)*s)) goto unrecognized_directive;
- return bitch("bad $TTL format");
- }
- s = skip_white_space(s);
-@@ -149,8 +149,8 @@ static char *process_directive(char *s)
- char *lhs, *rdtype;
-
- s += 9;
-- if (!isspace(*s)) {
-- if (isalnum(*s)) goto unrecognized_directive;
-+ if (!isspace((unsigned char)*s)) {
-+ if (isalnum((unsigned char)*s)) goto unrecognized_directive;
- return bitch("bad $GENERATE format");
- }
- s = skip_white_space(s);
-@@ -190,13 +190,13 @@ static char *process_directive(char *s)
- char *p, *f;
- char c;
- s += 8;
-- if (!isspace(*s)) {
-- if (isalnum(*s)) goto unrecognized_directive;
-+ if (!isspace((unsigned char)*s)) {
-+ if (isalnum((unsigned char)*s)) goto unrecognized_directive;
- return bitch("bad $INCLUDE format");
- }
- s = skip_white_space(s);
- p = s;
-- while (*s && !isspace(*s) && *s != ';')
-+ while (*s && !isspace((unsigned char)*s) && *s != ';')
- s++;
- c = *s;
- *s = '\0';
-@@ -221,7 +221,7 @@ static char *process_directive(char *s)
- } else {
- unrecognized_directive:
- s = d-1;
-- while (isalnum(*d)) d++;
-+ while (isalnum((unsigned char)*d)) d++;
- *d = '\0';
- return bitch("unrecognized directive: %s", s);
- }
-@@ -276,7 +276,7 @@ read_zone_file(void)
- continue;
-
- s = file_info->buf;
-- if (!isspace(*s)) {
-+ if (!isspace((unsigned char)*s)) {
- /* <domain-name>, $INCLUDE, $ORIGIN */
- if (*s == '$') {
- process_directive(s);
-@@ -298,7 +298,7 @@ read_zone_file(void)
- }
- if (G.default_ttl >= 0)
- ttl = G.default_ttl;
-- if (isdigit(*s)) {
-+ if (isdigit((unsigned char)*s)) {
- ttl = extract_timevalue(&s, "TTL");
- if (ttl < 0)
- continue;
-@@ -323,7 +323,7 @@ read_zone_file(void)
- if (!class)
- continue;
- if (*class == 'i' && *(class+1) == 'n' && *(class+2) == 0) {
-- if (isdigit(*s)) {
-+ if (isdigit((unsigned char)*s)) {
- ttl = extract_timevalue(&s, "TTL");
- if (ttl < 0)
- continue;
diff --git a/validns/patches/patch-naptr.c b/validns/patches/patch-naptr.c
deleted file mode 100644
index 1bcfab95f4..0000000000
--- a/validns/patches/patch-naptr.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- naptr.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ naptr.c
-@@ -42,7 +42,7 @@ static struct rr *naptr_parse(char *name
- if (text.length < 0)
- return NULL;
- for (i = 0; i < text.length; i++) {
-- if (!isalnum(text.data[i])) {
-+ if (!isalnum((unsigned char)text.data[i])) {
- return bitch("flags contains illegal characters");
- }
- }
diff --git a/validns/patches/patch-nsec.c b/validns/patches/patch-nsec.c
deleted file mode 100644
index f044ac5a85..0000000000
--- a/validns/patches/patch-nsec.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- nsec.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ nsec.c
-@@ -133,7 +133,7 @@ void validate_nsec_chain(void)
- freeall_temp();
- s = rr->next_domain;
- t = name;
-- while (*s) *t++ = tolower(*s++);
-+ while (*s) *t++ = tolower((unsigned char)*s++);
- *t = 0;
- rr_set = find_rr_set(T_NSEC, name);
- if (!rr_set) {
diff --git a/validns/patches/patch-nsec3.c b/validns/patches/patch-nsec3.c
deleted file mode 100644
index bcdb030a5c..0000000000
--- a/validns/patches/patch-nsec3.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- nsec3.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ nsec3.c
-@@ -65,7 +65,7 @@ static struct rr* nsec3_parse(char *name
- rr->salt.length = 0;
- rr->salt.data = NULL;
- s++;
-- if (*s && !isspace(*s) && *s != ';' && *s != ')')
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')')
- return bitch("salt is not valid");
- s = skip_white_space(s);
- } else {
diff --git a/validns/patches/patch-nsec3param.c b/validns/patches/patch-nsec3param.c
deleted file mode 100644
index 0d2d1707b3..0000000000
--- a/validns/patches/patch-nsec3param.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- nsec3param.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ nsec3param.c
-@@ -58,7 +58,7 @@ static struct rr* nsec3param_parse(char
- rr->salt.length = 0;
- rr->salt.data = NULL;
- s++;
-- if (*s && !isspace(*s) && *s != ';' && *s != ')')
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')')
- return bitch("salt is not valid");
- s = skip_white_space(s);
- } else {
diff --git a/validns/patches/patch-rr.c b/validns/patches/patch-rr.c
deleted file mode 100644
index 7dd86f06ab..0000000000
--- a/validns/patches/patch-rr.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- rr.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ rr.c
-@@ -449,7 +449,7 @@ invalid:
- }
- if (*s++ != '#')
- goto invalid;
-- if (*s && !isspace(*s) && *s != ';' && *s != ')')
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')')
- goto invalid;
- s = skip_white_space(s);
- if (!s) return NULL;
-@@ -841,7 +841,7 @@ int extract_algorithm(char **s, char *wh
- int alg;
- char *str_alg;
-
-- if (isdigit(**s)) {
-+ if (isdigit((unsigned char)**s)) {
- alg = extract_integer(s, what, NULL);
- if (algorithm_type(alg) == ALG_UNSUPPORTED) {
- bitch("bad or unsupported algorithm %d", alg);
diff --git a/validns/patches/patch-textparse.c b/validns/patches/patch-textparse.c
deleted file mode 100644
index a02f284612..0000000000
--- a/validns/patches/patch-textparse.c
+++ /dev/null
@@ -1,450 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- textparse.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ textparse.c
-@@ -26,7 +26,7 @@
-
- int empty_line_or_comment(char *s)
- {
-- while (isspace(*s)) s++;
-+ while (isspace((unsigned char)*s)) s++;
- if (!*s) return 1;
- if (*s == ';') return 1;
- return 0;
-@@ -34,7 +34,7 @@ int empty_line_or_comment(char *s)
-
- char *skip_white_space(char *s)
- {
-- while (isspace(*s)) s++;
-+ while (isspace((unsigned char)*s)) s++;
- if (*s == ';') {
- while (*s) s++;
- }
-@@ -76,20 +76,20 @@ static char *extract_name_slow(char **in
- int d, l, ol;
-
- while (1) {
-- if (isalnum(*s) || *s == '_' || *s == '.' || *s == '-' || *s == '/' || ((options & DOLLAR_OK_IN_NAMES) && *s == '$')) {
-+ if (isalnum((unsigned char)*s) || *s == '_' || *s == '.' || *s == '-' || *s == '/' || ((options & DOLLAR_OK_IN_NAMES) && *s == '$')) {
- if (t-buf >= 1022)
- return bitch("name too long");
- *t++ = *s++;
- } else if (*s == '\\') {
- s++;
-- if (isdigit(*s)) {
-+ if (isdigit((unsigned char)*s)) {
- d = *s - '0';
- s++;
-- if (!isdigit(*s))
-+ if (!isdigit((unsigned char)*s))
- return bitch("bad escape sequence");
- d = d*10 + *s - '0';
- s++;
-- if (!isdigit(*s))
-+ if (!isdigit((unsigned char)*s))
- return bitch("bad escape sequence");
- d = d*10 + *s - '0';
- s++;
-@@ -114,7 +114,7 @@ static char *extract_name_slow(char **in
- break;
- }
- }
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- return bitch("%s is not valid", what);
- }
- *t = '\0';
-@@ -154,7 +154,7 @@ static char *extract_name_slow(char **in
- if (!(options & KEEP_CAPITALIZATION)) {
- t = buf;
- while (*t) {
-- *t = tolower(*t);
-+ *t = tolower((unsigned char)*t);
- t++;
- }
- }
-@@ -173,7 +173,7 @@ char *extract_name(char **input, char *w
-
- if (*s == '@') {
- s++;
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- return bitch("literal @ in %s is not all by itself", what);
- }
- if (!file_info->current_origin) {
-@@ -181,7 +181,7 @@ char *extract_name(char **input, char *w
- }
- r = quickstrdup(file_info->current_origin);
- } else {
-- if (!(isalnum(*s) || *s == '_' || *s == '.' || *s == '/' || ((options & DOLLAR_OK_IN_NAMES) && *s == '$'))) {
-+ if (!(isalnum((unsigned char)*s) || *s == '_' || *s == '.' || *s == '/' || ((options & DOLLAR_OK_IN_NAMES) && *s == '$'))) {
- if (*s == '*') {
- wildcard = 1;
- } else {
-@@ -191,9 +191,9 @@ char *extract_name(char **input, char *w
- }
- }
- s++;
-- while (isalnum(*s) || *s == '.' || *s == '-' || *s == '_' || *s == '/' || ((options & DOLLAR_OK_IN_NAMES) && *s == '$'))
-+ while (isalnum((unsigned char)*s) || *s == '.' || *s == '-' || *s == '_' || *s == '/' || ((options & DOLLAR_OK_IN_NAMES) && *s == '$'))
- s++;
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- if (*s == '\\')
- return extract_name_slow(input, what, options);
- return bitch("%s is not valid", what);
-@@ -226,7 +226,7 @@ char *extract_name(char **input, char *w
- if (!(options & KEEP_CAPITALIZATION)) {
- s = r;
- while (*s) {
-- *s = tolower(*s);
-+ *s = tolower((unsigned char)*s);
- s++;
- }
- }
-@@ -244,13 +244,13 @@ char *extract_label(char **input, char *
- char *r = NULL;
- char *end = NULL;
-
-- if (!isalpha(*s)) {
-+ if (!isalpha((unsigned char)*s)) {
- return bitch("%s expected", what);
- }
- s++;
-- while (isalnum(*s))
-+ while (isalnum((unsigned char)*s))
- s++;
-- if (*s && !isspace(*s)) {
-+ if (*s && !isspace((unsigned char)*s)) {
- return bitch("%s is not valid", what);
- }
- if (!*s) end = s;
-@@ -270,7 +270,7 @@ char *extract_label(char **input, char *
- }
- s = r;
- while (*s) {
-- *s = tolower(*s);
-+ *s = tolower((unsigned char)*s);
- s++;
- }
- return r;
-@@ -283,14 +283,14 @@ long long extract_integer(char **input,
- char *end = NULL;
- char c;
-
-- if (!isdigit(*s)) {
-+ if (!isdigit((unsigned char)*s)) {
- bitch("%s expected", what);
- return -1;
- }
- s++;
-- while (isdigit(*s))
-+ while (isdigit((unsigned char)*s))
- s++;
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- if (!extra_delimiters || strchr(extra_delimiters, *s) == NULL) {
- bitch("%s is not valid", what);
- return -1;
-@@ -320,9 +320,9 @@ int extract_double(char **input, char *w
- char c;
- int saw_m = 0;
-
-- while (isdigit(*s) || *s == '+' || *s == '-' || *s == '.')
-+ while (isdigit((unsigned char)*s) || *s == '+' || *s == '-' || *s == '.')
- s++;
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- if (skip_m && (*s == 'm' || *s == 'M')) {
- saw_m = 1;
- } else {
-@@ -343,7 +343,7 @@ int extract_double(char **input, char *w
-
- if (saw_m) {
- s++;
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- bitch("%s is not valid", what);
- return -1;
- }
-@@ -364,36 +364,36 @@ long extract_timevalue(char **input, cha
- char *s = *input;
- int r = 0, acc = 0;
-
-- if (!isdigit(*s)) {
-+ if (!isdigit((unsigned char)*s)) {
- bitch("%s expected", what);
- return -1;
- }
- next_component:
- r = 0;
-- while (isdigit(*s)) {
-+ while (isdigit((unsigned char)*s)) {
- r *= 10;
- r += *s - '0';
- s++;
- }
-- if (tolower(*s) == 's') {
-+ if (tolower((unsigned char)*s) == 's') {
- s++;
-- } else if (tolower(*s) == 'm') {
-+ } else if (tolower((unsigned char)*s) == 'm') {
- r *= 60;
- s++;
-- } else if (tolower(*s) == 'h') {
-+ } else if (tolower((unsigned char)*s) == 'h') {
- r *= 3600;
- s++;
-- } else if (tolower(*s) == 'd') {
-+ } else if (tolower((unsigned char)*s) == 'd') {
- r *= 86400;
- s++;
-- } else if (tolower(*s) == 'w') {
-+ } else if (tolower((unsigned char)*s) == 'w') {
- r *= 604800;
- s++;
- }
- acc += r;
-- if (isdigit(*s)) goto next_component;
-+ if (isdigit((unsigned char)*s)) goto next_component;
-
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- bitch("%s is not valid", what);
- return -1;
- }
-@@ -415,66 +415,66 @@ long long extract_timestamp(char **input
- long long epoch = 0;
- struct tm tm;
-
-- if (!isdigit(*s)) {
-+ if (!isdigit((unsigned char)*s)) {
- bitch("%s expected", what);
- return -1;
- }
- year = year*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- year = year*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- year = year*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- year = year*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- month = month*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- month = month*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- day = day*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- day = day*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- hour = hour*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- hour = hour*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- minute = minute*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- minute = minute*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- second = second*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (!isdigit(*s)) goto looks_like_epoch;
-+ if (!isdigit((unsigned char)*s)) goto looks_like_epoch;
- second = second*10 + *s - '0';
- epoch = epoch*10 + *s - '0';
- s++;
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- bitch("%s is not valid", what);
- return -1;
- }
-@@ -500,7 +500,7 @@ long long extract_timestamp(char **input
- goto done;
-
- looks_like_epoch:
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- bitch("%s is not valid", what);
- return -1;
- }
-@@ -516,14 +516,14 @@ int extract_ipv4(char **input, char *wha
- char *s = *input;
- char c;
-
-- while (isdigit(*s) || *s == '.') {
-+ while (isdigit((unsigned char)*s) || *s == '.') {
- s++;
- }
- if (s == *input) {
- bitch("%s is not valid", what);
- return -1;
- }
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- bitch("%s is not valid", what);
- return -1;
- }
-@@ -547,7 +547,7 @@ int extract_ipv6(char **input, char *wha
- char *s = *input;
- char c;
-
-- while (isdigit(*s) || *s == ':' || *s == '.' ||
-+ while (isdigit((unsigned char)*s) || *s == ':' || *s == '.' ||
- (*s >= 'a' && *s <= 'f') || (*s >= 'A' && *s <= 'F'))
- {
- s++;
-@@ -556,7 +556,7 @@ int extract_ipv6(char **input, char *wha
- bitch("%s is not valid", what);
- return -1;
- }
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- bitch("%s is not valid", what);
- return -1;
- }
-@@ -581,10 +581,10 @@ int extract_u64(char **input, char *what
- uint8_t result = 0;
- unsigned u;
-
-- #define GETHEXBLOCK if (!isxdigit(*s)) { bitch("%s is not valid", what); return -1; } \
-+ #define GETHEXBLOCK if (!isxdigit((unsigned char)*s)) { bitch("%s is not valid", what); return -1; } \
- u = 0; \
-- while (isxdigit(*s)) { \
-- if (isdigit(*s)) { \
-+ while (isxdigit((unsigned char)*s)) { \
-+ if (isdigit((unsigned char)*s)) { \
- u = (u << 4) | (*s - '0'); \
- } else if (*s >= 'a' && *s <= 'f') { \
- u = (u << 4) | (*s - 'a' + 10); \
-@@ -606,7 +606,7 @@ int extract_u64(char **input, char *what
- #undef GETHEXBLOCK
- #undef SKIPCOLON
-
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- bitch("%s is not valid", what);
- return -1;
- }
-@@ -647,7 +647,7 @@ dump_binary_data(FILE *f, struct binary_
- for (i = 0; i < 16 && mem_len > 0; i++, mem_len--, s++) {
- o[pos[i]] = hex[*s >> 4];
- o[pos[i]+1] = hex[*s & 0x0f];
-- o[51+i] = isprint(*s) ? *s : '.';
-+ o[51+i] = isprint((unsigned char)*s) ? *s : '.';
- }
- fprintf(f, "%s", o);
- }
-@@ -662,11 +662,11 @@ struct binary_data extract_base64_binary
- int bl;
-
- while (s && *s) {
-- if (!isalnum(*s) && *s != '=' && *s != '+' && *s != '/') {
-+ if (!isalnum((unsigned char)*s) && *s != '=' && *s != '+' && *s != '/') {
- bitch("%s expected", what);
- return r;
- }
-- while (isalnum(*s) || *s == '=' || *s == '+' || *s == '/') {
-+ while (isalnum((unsigned char)*s) || *s == '=' || *s == '+' || *s == '/') {
- if (l64 >= 4095) {
- bitch("%s is too long", what);
- return r;
-@@ -737,7 +737,7 @@ struct binary_data extract_text(char **i
- int c;
-
- if (*s != '"') {
-- while (*s && !isspace(*s)) {
-+ while (*s && !isspace((unsigned char)*s)) {
- o[l++] = *s++;
- }
- *input = skip_white_space(s);
-@@ -758,9 +758,9 @@ more_text:
- if (*s == 0) {
- bitch("bad backslash quoting of %s", what);
- return r;
-- } else if (isdigit(*s)) {
-+ } else if (isdigit((unsigned char)*s)) {
- c = 0;
-- while (isdigit(*s)) {
-+ while (isdigit((unsigned char)*s)) {
- c = c*10 + *s - '0';
- s++;
- }
-@@ -814,7 +814,7 @@ struct binary_data extract_hex_binary_da
- if (s[0] == '0' && (s[1] == 'x' || s[1] == 'X'))
- s += 2;
- if (eat_whitespace == EXTRACT_DONT_EAT_WHITESPACE) {
-- while (isxdigit(*s)) {
-+ while (isxdigit((unsigned char)*s)) {
- if (hl >= 4095) {
- bitch("%s is too long", what);
- return r;
-@@ -823,18 +823,18 @@ struct binary_data extract_hex_binary_da
- s++;
- hl++;
- }
-- if (*s && !isspace(*s) && *s != ';' && *s != ')') {
-+ if (*s && !isspace((unsigned char)*s) && *s != ';' && *s != ')') {
- bitch("%s is not valid", what);
- return r;
- }
- *input = skip_white_space(s);
- } else if (eat_whitespace == EXTRACT_EAT_WHITESPACE) {
- while (s && *s) {
-- if (!isxdigit(*s)) {
-+ if (!isxdigit((unsigned char)*s)) {
- bitch("%s expected", what);
- return r;
- }
-- while (isxdigit(*s)) {
-+ while (isxdigit((unsigned char)*s)) {
- if (hl >= 4095) {
- bitch("%s is too long", what);
- return r;
-@@ -859,7 +859,7 @@ struct binary_data extract_hex_binary_da
- memset(r.data, 0, r.length);
- for (hi = 0; hi < hl-hb; hi++) {
- r.data[hi/2] <<= 4;
-- r.data[hi/2] |= 0x0f & (isdigit(hex[hi+hb]) ? hex[hi+hb] - '0' : tolower(hex[hi+hb]) - 'a' + 10);
-+ r.data[hi/2] |= 0x0f & (isdigit((unsigned char)hex[hi+hb]) ? hex[hi+hb] - '0' : tolower((unsigned char)hex[hi+hb]) - 'a' + 10);
- }
- return r;
- }
diff --git a/validns/patches/patch-tlsa.c b/validns/patches/patch-tlsa.c
deleted file mode 100644
index 5499e2f4ae..0000000000
--- a/validns/patches/patch-tlsa.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- tlsa.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ tlsa.c
-@@ -105,7 +105,7 @@ not_a_prefixed_domain_name:
- return moan(rr->file_name, rr->line, "not a proper prefixed DNS domain name");
- }
- s++;
-- while (isdigit(*s)) {
-+ while (isdigit((unsigned char)*s)) {
- port = port * 10 + *s - '0';
- s++;
- }
-@@ -134,7 +134,7 @@ static void* smimea_validate_set(struct
-
- /* c93f1e400f26708f98cb19d936620da35eec8f72e57f9eec01c1afd6._smimecert.example.com. */
- s = named_rr->name;
-- while (isxdigit(*s)) {
-+ while (isxdigit((unsigned char)*s)) {
- hash_len++;
- s++;
- }
diff --git a/validns/patches/patch-x25.c b/validns/patches/patch-x25.c
deleted file mode 100644
index 9342d53d90..0000000000
--- a/validns/patches/patch-x25.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Args to isxxxx() etc. shall be "unsigned char".
-
---- x25.c.orig 2017-08-04 14:27:44.000000000 +0000
-+++ x25.c
-@@ -34,7 +34,7 @@ static struct rr *x25_parse(char *name,
- if (rr->psdn_address.length < 4)
- return bitch("PSDN-address too short");
- for (i = 0; i < rr->psdn_address.length; i++) {
-- if (!isdigit(rr->psdn_address.data[i]))
-+ if (!isdigit((unsigned char)rr->psdn_address.data[i]))
- return bitch("PSDN-address contains non-digits");
- }
-
diff --git a/vcsh/Makefile b/vcsh/Makefile
index 29d5e8a7da..88322faf49 100644
--- a/vcsh/Makefile
+++ b/vcsh/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2
# TEST_DEPENDS
BUILD_DEPENDS+= p5-Shell-Command-[0-9]*:../../wip/p5-Shell-Command
-BUILD_DEPENDS+= p5-Test-Most-[0-9]*:../../wip/p5-Test-Most
+BUILD_DEPENDS+= p5-Test-Most-[0-9]*:../../devel/p5-Test-Most
BUILD_DEPENDS+= p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
DEPENDS+= git-base-[0-9]*:../../devel/git-base
- Prev by Date:
Removed duplicates: bird[6], fish, flightgear, flightgear-data, freeradius2, mpi-ch, munge, openmpi, opensc, openssh, osg, simgear
- Next by Date:
Remove mumble and znc - imported.
- Previous by Thread:
Removed duplicates: bird[6], fish, flightgear, flightgear-data, freeradius2, mpi-ch, munge, openmpi, opensc, openssh, osg, simgear
- Next by Thread:
Remove mumble and znc - imported.
- Indexes:
Home |
Main Index |
Thread Index |
Old Index