From 16c6d939fabd4e67a3fc62d73a124755ca96a8ee Mon Sep 17 00:00:00 2001 From: espie Date: Thu, 12 May 2016 14:00:12 +0000 Subject: [PATCH] Term-ReadKey is part of the base system now --- databases/mariadb/Makefile | 7 ++++--- databases/mytop/Makefile | 6 +++--- databases/percona-toolkit/Makefile | 5 ++--- databases/postgresql_autodoc/Makefile | 5 ++--- devel/p5-Curses-UI/Makefile | 6 +++--- devel/p5-POE/Makefile | 5 ++--- devel/p5-Term-ProgressBar/Makefile | 6 +++--- devel/p5-Term-Prompt/Makefile | 6 ++---- devel/p5-Term-ReadLine-Perl/Makefile | 5 ++--- devel/p5-Term-ReadLine-TTYtter/Makefile | 6 ++---- devel/p5-Term-ReadLine-Zoid/Makefile | 6 ++---- graphics/cadubi/Makefile | 6 ++---- mail/imapsync/Makefile | 4 ++-- mail/sieve-connect/Makefile | 6 +++--- multimedia/get_flash_videos/Makefile | 6 +++--- net/p5-Net-Telnet-Cisco/Makefile | 7 +++---- security/kpcli/Makefile | 5 ++--- sysutils/shelldap/Makefile | 4 ++-- sysutils/sslmate/Makefile | 6 +++--- www/rt/Makefile | 4 ++-- www/wml/Makefile | 7 +++---- 21 files changed, 52 insertions(+), 66 deletions(-) diff --git a/databases/mariadb/Makefile b/databases/mariadb/Makefile index 6c8dde4180d..25c655b8696 100644 --- a/databases/mariadb/Makefile +++ b/databases/mariadb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.41 2016/05/04 07:37:22 sthen Exp $ +# $OpenBSD: Makefile,v 1.42 2016/05/12 14:00:12 espie Exp $ # archs with atomic ops ONLY_FOR_ARCHS-server= alpha amd64 i386 mips64 mips64el powerpc sparc64 @@ -15,6 +15,8 @@ PKGNAME-main= mariadb-client-${VERSION} PKGNAME-server= mariadb-server-${VERSION} PKGNAME-tests= mariadb-tests-${VERSION} EPOCH= 1 +REVISION-server=0 + CATEGORIES= databases MASTER_SITES= http://mariadb.mirror.iweb.com//${DISTNAME}/source/ \ http://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/ \ @@ -43,8 +45,7 @@ MODULES= devel/cmake BUILD_DEPENDS= devel/bison RUN_DEPENDS-server= ${BASE_PKGPATH}>=10.0v1,<10.1v1 \ - databases/p5-DBD-mysql \ - devel/p5-Term-ReadKey + databases/p5-DBD-mysql LIB_DEPENDS-server= ${BASE_PKGPATH}>=10.0v1,<10.1v1 LIB_DEPENDS-tests= ${BASE_PKGPATH}>=10.0v1,<10.1v1 diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile index eb12c106395..eceec8b93b2 100644 --- a/databases/mytop/Makefile +++ b/databases/mytop/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.9 2015/12/30 14:30:29 giovanni Exp $ +# $OpenBSD: Makefile,v 1.10 2016/05/12 14:00:13 espie Exp $ COMMENT= top clone for MySQL DISTNAME= mytop-1.7 CATEGORIES= databases perl5 +REVISION = 0 HOMEPAGE= http://jeremy.zawodny.com/mysql/mytop/ MASTER_SITES= https://www.paclan.it/distfiles/ @@ -13,8 +14,7 @@ MAINTAINER= Giovanni Bechis # GPL / Artistic License PERMIT_PACKAGE_CDROM= Yes -RUN_DEPENDS= databases/p5-DBD-mysql>=2.9004 \ - devel/p5-Term-ReadKey>=2.30 +RUN_DEPENDS= databases/p5-DBD-mysql>=2.9004 BUILD_DEPENDS= ${RUN_DEPENDS} CONFIGURE_STYLE=perl diff --git a/databases/percona-toolkit/Makefile b/databases/percona-toolkit/Makefile index a0b70cc2b4d..8552e1292b9 100644 --- a/databases/percona-toolkit/Makefile +++ b/databases/percona-toolkit/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.15 2016/05/02 18:40:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.16 2016/05/12 14:00:13 espie Exp $ COMMENT = MySQL Percona tools V = 2.2.9 DISTNAME = percona-toolkit-${V} -REVISION = 0 +REVISION = 1 EPOCH = 0 CATEGORIES = databases perl5 @@ -18,7 +18,6 @@ PERMIT_PACKAGE_CDROM = Yes MASTER_SITES = http://www.percona.com/redir/downloads/percona-toolkit/${V}/ RUN_DEPENDS = databases/p5-DBD-mysql>=3.0 \ - devel/p5-Term-ReadKey \ sysutils/flock CONFIGURE_STYLE = perl diff --git a/databases/postgresql_autodoc/Makefile b/databases/postgresql_autodoc/Makefile index 0fc8ad5353b..43088a084f6 100644 --- a/databases/postgresql_autodoc/Makefile +++ b/databases/postgresql_autodoc/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2015/11/05 19:08:56 jca Exp $ +# $OpenBSD: Makefile,v 1.6 2016/05/12 14:00:13 espie Exp $ COMMENT = documentation generator for postgresql databases DISTNAME = postgresql_autodoc-1.40 CATEGORIES = databases -REVISION = 0 +REVISION = 1 HOMEPAGE = http://www.rbt.ca/autodoc/ MASTER_SITES = ${HOMEPAGE}binaries/ @@ -13,7 +13,6 @@ MASTER_SITES = ${HOMEPAGE}binaries/ PERMIT_PACKAGE_CDROM = Yes RUN_DEPENDS = databases/p5-DBD-Pg \ - devel/p5-Term-ReadKey \ www/p5-HTML-Template WRKDIST = ${WRKDIR}/postgresql_autodoc diff --git a/devel/p5-Curses-UI/Makefile b/devel/p5-Curses-UI/Makefile index 9d666cb2825..39e1f806bb5 100644 --- a/devel/p5-Curses-UI/Makefile +++ b/devel/p5-Curses-UI/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.17 2016/03/20 19:56:17 naddy Exp $ +# $OpenBSD: Makefile,v 1.18 2016/05/12 14:00:13 espie Exp $ COMMENT= curses based user interface framework for Perl MODULES= cpan PKG_ARCH= * DISTNAME= Curses-UI-0.9609 +REVISION = 0 CATEGORIES= devel -RUN_DEPENDS= devel/p5-Curses \ - devel/p5-Term-ReadKey +RUN_DEPENDS= devel/p5-Curses BUILD_DEPENDS= ${RUN_DEPENDS} \ devel/p5-Test-Pod diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile index e08eed56327..606fd58b5bb 100644 --- a/devel/p5-POE/Makefile +++ b/devel/p5-POE/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.25 2016/03/20 19:56:30 naddy Exp $ +# $OpenBSD: Makefile,v 1.26 2016/05/12 14:00:13 espie Exp $ COMMENT= portable multitasking and networking framework for perl MODULES= cpan PKG_ARCH= * DISTNAME= POE-1.294 -REVISION= 0 +REVISION= 1 CATEGORIES= devel HOMEPAGE= http://poe.perl.org/ @@ -18,7 +18,6 @@ CONFIGURE_ARGS= --default RUN_DEPENDS= devel/p5-Curses \ devel/p5-IO-Tty \ devel/p5-POE-Test-Loops>=1.036 \ - devel/p5-Term-ReadKey \ net/p5-Socket6 \ www/p5-libwww diff --git a/devel/p5-Term-ProgressBar/Makefile b/devel/p5-Term-ProgressBar/Makefile index d477d48676c..c3c951a36f6 100644 --- a/devel/p5-Term-ProgressBar/Makefile +++ b/devel/p5-Term-ProgressBar/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.10 2016/03/20 19:56:35 naddy Exp $ +# $OpenBSD: Makefile,v 1.11 2016/05/12 14:00:13 espie Exp $ COMMENT= text mode progress bar MODULES= cpan PKG_ARCH= * DISTNAME= Term-ProgressBar-2.17 +REVISION = 0 CATEGORIES= devel MAINTAINER= Girish Venkatachalam @@ -13,7 +14,6 @@ MAINTAINER= Girish Venkatachalam PERMIT_PACKAGE_CDROM= Yes BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = devel/p5-Class-MethodMaker \ - devel/p5-Term-ReadKey +RUN_DEPENDS = devel/p5-Class-MethodMaker .include diff --git a/devel/p5-Term-Prompt/Makefile b/devel/p5-Term-Prompt/Makefile index 6f2da72f41a..bfd325514ae 100644 --- a/devel/p5-Term-Prompt/Makefile +++ b/devel/p5-Term-Prompt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2016/03/20 19:56:35 naddy Exp $ +# $OpenBSD: Makefile,v 1.10 2016/05/12 14:00:13 espie Exp $ COMMENT= handles various forms of terminal input @@ -6,12 +6,10 @@ MODULES= cpan PKG_ARCH= * DISTNAME= Term-Prompt-1.04 -REVISION= 0 +REVISION= 1 CATEGORIES= devel # perl PERMIT_PACKAGE_CDROM= Yes -RUN_DEPENDS= devel/p5-Term-ReadKey - .include diff --git a/devel/p5-Term-ReadLine-Perl/Makefile b/devel/p5-Term-ReadLine-Perl/Makefile index b6b0d4caf14..6fac4f73cf3 100644 --- a/devel/p5-Term-ReadLine-Perl/Makefile +++ b/devel/p5-Term-ReadLine-Perl/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2016/03/20 19:56:36 naddy Exp $ +# $OpenBSD: Makefile,v 1.7 2016/05/12 14:00:13 espie Exp $ COMMENT= minimal interface to Readline DISTNAME = Term-ReadLine-Perl-1.0303 +REVISION = 0 CATEGORIES= devel perl5 # perl @@ -9,8 +10,6 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Term/} -RUN_DEPENDS= devel/p5-Term-ReadKey - TEST_ENV= TEST_TARGET=test.pl TEST_IS_INTERACTIVE= Yes diff --git a/devel/p5-Term-ReadLine-TTYtter/Makefile b/devel/p5-Term-ReadLine-TTYtter/Makefile index 2d5544dfdbe..70aef251f23 100644 --- a/devel/p5-Term-ReadLine-TTYtter/Makefile +++ b/devel/p5-Term-ReadLine-TTYtter/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2016/03/20 19:56:36 naddy Exp $ +# $OpenBSD: Makefile,v 1.5 2016/05/12 14:00:13 espie Exp $ COMMENT = Readline Library Wrapper Module for Twitter DISTNAME = Term-ReadLine-TTYtter-1.4 -REVISION = 1 +REVISION = 2 CATEGORIES = devel perl5 # perl @@ -11,8 +11,6 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = cpan PKG_ARCH = * -RUN_DEPENDS = devel/p5-Term-ReadKey - TEST_ENV = TEST_TARGET=test.pl TEST_IS_INTERACTIVE = Yes diff --git a/devel/p5-Term-ReadLine-Zoid/Makefile b/devel/p5-Term-ReadLine-Zoid/Makefile index 44bbe64ce0e..2d832cb2c74 100644 --- a/devel/p5-Term-ReadLine-Zoid/Makefile +++ b/devel/p5-Term-ReadLine-Zoid/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2016/03/20 19:56:36 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2016/05/12 14:00:13 espie Exp $ COMMENT= Readline Library Wrapper for zoid MODULES= cpan PKG_ARCH= * DISTNAME= Term-ReadLine-Zoid-0.07 -REVISION= 0 +REVISION= 1 CATEGORIES= devel # perl @@ -13,6 +13,4 @@ PERMIT_PACKAGE_CDROM= Yes CONFIGURE_STYLE= modbuild -RUN_DEPENDS= devel/p5-Term-ReadKey - .include diff --git a/graphics/cadubi/Makefile b/graphics/cadubi/Makefile index e310c3b6ca1..4467e3c1863 100644 --- a/graphics/cadubi/Makefile +++ b/graphics/cadubi/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.13 2013/03/11 11:10:51 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2016/05/12 14:00:13 espie Exp $ DISTNAME= cadubi-1.3 -REVISION = 0 +REVISION = 1 CATEGORIES= graphics editors # perl artistic @@ -11,8 +11,6 @@ COMMENT= ASCII drawing utility HOMEPAGE= http://langworth.com/cadubi.html MASTER_SITES= http://langworth.com/downloads/ -RUN_DEPENDS= devel/p5-Term-ReadKey - NO_BUILD= Yes NO_TEST= Yes PKG_ARCH= * diff --git a/mail/imapsync/Makefile b/mail/imapsync/Makefile index f8f18c551b6..b69cbf413cd 100644 --- a/mail/imapsync/Makefile +++ b/mail/imapsync/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2015/06/02 19:20:15 pea Exp $ +# $OpenBSD: Makefile,v 1.15 2016/05/12 14:00:13 espie Exp $ GH_ACCOUNT = imapsync GH_PROJECT = imapsync @@ -6,6 +6,7 @@ GH_PROJECT = imapsync COMMENT= IMAP synchronization tool DISTNAME= imapsync-1.637 +REVISION = 0 CATEGORIES= mail MAINTAINER= Pierre-Emmanuel Andre @@ -19,7 +20,6 @@ RUN_DEPENDS= converters/p5-DateManip \ security/p5-IO-Socket-SSL \ security/p5-Digest-HMAC \ mail/p5-Mail-IMAPClient \ - devel/p5-Term-ReadKey \ net/p5-IO-Socket-INET6 \ security/p5-IO-Socket-SSL \ devel/p5-IO-Tee \ diff --git a/mail/sieve-connect/Makefile b/mail/sieve-connect/Makefile index 85793c9aac9..ee375cb52ca 100644 --- a/mail/sieve-connect/Makefile +++ b/mail/sieve-connect/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2013/12/23 13:24:17 jca Exp $ +# $OpenBSD: Makefile,v 1.8 2016/05/12 14:00:13 espie Exp $ COMMENT = perl sieveshell-compatible ManageSieve client @@ -8,6 +8,7 @@ PROJECT = sieve-connect DISTNAME = ${PROJECT}-${V} CATEGORIES = mail PKG_ARCH = * +REVISION = 0 MAINTAINER = LEVAI Daniel @@ -23,8 +24,7 @@ NO_TEST = Yes RUN_DEPENDS = net/p5-Net-DNS \ net/p5-IO-Socket-INET6 \ security/p5-IO-Socket-SSL>=1.14 \ - security/p5-Authen-SASL \ - devel/p5-Term-ReadKey + security/p5-Authen-SASL do-configure: @perl -pi -e 's,^PREFIX=.*,,' ${WRKSRC}/Makefile diff --git a/multimedia/get_flash_videos/Makefile b/multimedia/get_flash_videos/Makefile index acd60021352..6fae821bdb3 100644 --- a/multimedia/get_flash_videos/Makefile +++ b/multimedia/get_flash_videos/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2016/03/20 19:56:50 naddy Exp $ +# $OpenBSD: Makefile,v 1.30 2016/05/12 14:00:13 espie Exp $ COMMENT= download flash video files from various sites @@ -6,6 +6,7 @@ V= 1.25.91 DISTNAME= get_flash_videos-$V PKGNAME= ${DISTNAME} CATEGORIES= multimedia +REVISION = 0 HOMEPAGE= https://get-flash-videos.googlecode.com/ @@ -31,8 +32,7 @@ RUN_DEPENDS= www/p5-LWP-Protocol-https \ www/p5-URI \ www/p5-WWW-Mechanize # modules -RUN_DEPENDS+= devel/p5-Term-ReadKey \ - multimedia/p5-Data-AMF \ +RUN_DEPENDS+= multimedia/p5-Data-AMF \ multimedia/p5-Storable-AMF \ rtmpdump-*|flvstreamer-*:net/rtmpdump \ security/p5-Crypt-Blowfish_PP \ diff --git a/net/p5-Net-Telnet-Cisco/Makefile b/net/p5-Net-Telnet-Cisco/Makefile index 56bc7b51cc2..9d913bb3a62 100644 --- a/net/p5-Net-Telnet-Cisco/Makefile +++ b/net/p5-Net-Telnet-Cisco/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2016/03/20 19:56:55 naddy Exp $ +# $OpenBSD: Makefile,v 1.14 2016/05/12 14:00:13 espie Exp $ COMMENT= module to interact with a Cisco router MODULES= cpan PKG_ARCH= * DISTNAME= Net-Telnet-Cisco-1.10 -REVISION= 0 +REVISION= 1 CATEGORIES= net HOMEPAGE= http://nettelnetcisco.sourceforge.net/ @@ -13,8 +13,7 @@ HOMEPAGE= http://nettelnetcisco.sourceforge.net/ # Artistic PERMIT_PACKAGE_CDROM= Yes -RUN_DEPENDS= net/p5-Net-Telnet>=3.02 \ - devel/p5-Term-ReadKey>=2.14 +RUN_DEPENDS= net/p5-Net-Telnet>=3.02 BUILD_DEPENDS= ${RUN_DEPENDS} diff --git a/security/kpcli/Makefile b/security/kpcli/Makefile index 1ca5ded9743..385410290d6 100644 --- a/security/kpcli/Makefile +++ b/security/kpcli/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2016/03/29 13:50:13 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2016/05/12 14:00:13 espie Exp $ COMMENT = cli browser for keepassx databases @@ -7,7 +7,7 @@ CATEGORIES = security EXTRACT_SUFX = .pl EXTRACT_ONLY = HOMEPAGE = http://kpcli.sourceforge.net/ -REVISION = 1 +REVISION = 2 # Perl PERMIT_PACKAGE_CDROM = Yes @@ -19,7 +19,6 @@ NO_BUILD = Yes NO_TEST = Yes RUN_DEPENDS = security/p5-Crypt-Rijndael \ - devel/p5-Term-ReadKey \ devel/p5-Term-ShellUI \ devel/p5-Clone \ p5-Term-ReadLine-Perl-*|p5-Term-ReadLine-Gnu-*:devel/p5-Term-ReadLine-Gnu \ diff --git a/sysutils/shelldap/Makefile b/sysutils/shelldap/Makefile index f40ddde583d..8daa318d39f 100644 --- a/sysutils/shelldap/Makefile +++ b/sysutils/shelldap/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2016/01/14 18:31:15 landry Exp $ +# $OpenBSD: Makefile,v 1.9 2016/05/12 14:00:13 espie Exp $ COMMENT = browse LDAP server with a shell-like CLI DISTNAME = shelldap-1.3.2 HG_COMMIT = aa4172c204d4 EPOCH = 0 +REVISION = 0 CATEGORIES = sysutils HOMEPAGE = https://bitbucket.org/mahlon/shelldap/ @@ -20,7 +21,6 @@ NO_BUILD = Yes NO_TEST = Yes RUN_DEPENDS = databases/p5-ldap \ devel/p5-Algorithm-Diff \ - devel/p5-Term-ReadKey \ devel/p5-Term-ReadLine-Gnu \ devel/p5-Term-Shell \ devel/p5-YAML-Syck diff --git a/sysutils/sslmate/Makefile b/sysutils/sslmate/Makefile index f6647a295ad..1eba0936861 100644 --- a/sysutils/sslmate/Makefile +++ b/sysutils/sslmate/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2015/12/11 17:52:39 jturner Exp $ +# $OpenBSD: Makefile,v 1.9 2016/05/12 14:00:13 espie Exp $ COMMENT = client for the sslmate.com online certificate service DISTNAME = sslmate-1.5.1 CATEGORIES = sysutils +REVISION = 0 MAINTAINER = James Turner @@ -13,8 +14,7 @@ MASTER_SITES = https://packages.sslmate.com/other/ # MIT PERMIT_PACKAGE_CDROM = Yes -RUN_DEPENDS = devel/p5-Term-ReadKey \ - www/p5-libwww \ +RUN_DEPENDS = www/p5-libwww \ www/p5-LWP-Protocol-https NO_CONFIGURE = Yes diff --git a/www/rt/Makefile b/www/rt/Makefile index 4baeca49472..42368ee89a5 100644 --- a/www/rt/Makefile +++ b/www/rt/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.33 2015/10/14 17:45:44 robert Exp $ +# $OpenBSD: Makefile,v 1.34 2016/05/12 14:00:13 espie Exp $ COMMENT= industrial-grade ticketing system DISTNAME= rt-4.2.12 CATEGORIES= www +REVISION = 0 MAINTAINER= Robert Nagy @@ -39,7 +40,6 @@ RUN_DEPENDS= converters/p5-Convert-Color \ devel/p5-Regexp-IPv6 \ devel/p5-Role-Basic \ devel/p5-Symbol-Global-Name \ - devel/p5-Term-ReadKey \ devel/p5-Time-modules \ devel/p5-Tree-Simple \ devel/p5-Universal-require \ diff --git a/www/wml/Makefile b/www/wml/Makefile index ad1b2bb05c5..243e5cfeaf4 100644 --- a/www/wml/Makefile +++ b/www/wml/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.21 2016/04/12 15:19:40 naddy Exp $ +# $OpenBSD: Makefile,v 1.22 2016/05/12 14:00:13 espie Exp $ COMMENT= Website META Language: off-line HTML generation toolkit DISTNAME= wml-2.0.11 -REVISION= 9 +REVISION= 10 CATEGORIES= www HOMEPAGE= http://www.thewml.org/ @@ -16,8 +16,7 @@ MASTER_SITES= ${HOMEPAGE}/distrib/ WANTLIB= c iconv intl m ncurses perl util LIB_DEPENDS= devel/gettext -RUN_DEPENDS= devel/p5-Term-ReadKey \ - graphics/p5-GD \ +RUN_DEPENDS= graphics/p5-GD \ graphics/p5-Image-Size \ math/p5-Bit-Vector \ www/p5-HTML-Clean \