There's an older version in pkgtools (wrong category), so get rid of the

newly-imported version (although it's a later stable version)

10 files changed, 1 insertions, 384 deletions

diff --git a/misc/Makefile b/misc/Makefile
index 6b4beedda73..7d9c64bfe57 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.462 2015/12/31 18:31:07 agc Exp $
+# $NetBSD: Makefile,v 1.463 2015/12/31 18:51:48 agc Exp $
 #
 
 COMMENT=	Miscellaneous utilities
@@ -237,7 +237,6 @@ SUBDIR+=	pciids
 SUBDIR+=	pdmenu
 SUBDIR+=	php-orangehrm
 SUBDIR+=	pinfo
-SUBDIR+=	pkgng
 SUBDIR+=	ppower
 SUBDIR+=	pty-redir
 SUBDIR+=	py-anita
diff --git a/misc/pkgng/DESCR b/misc/pkgng/DESCR
deleted file mode 100644
index 160c70dc4f1..00000000000
--- a/misc/pkgng/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Pkg is the Next Generation package management tool for FreeBSD.  It is
-the replacement for the current pkg_info/pkg_create/pkg_add tools that
-ports use to register local packages and which provide remote
-packages.  Its main goals are to faciliate remote binary package
-upgrades.  It also works with ports without remote binary packages.
diff --git a/misc/pkgng/Makefile b/misc/pkgng/Makefile
deleted file mode 100644
index 8c907303029..00000000000
--- a/misc/pkgng/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2015/12/31 18:29:50 agc Exp $
-
-DISTNAME=	pkg-1.6.2
-CATEGORIES=	misc
-MASTER_SITES=	http://files.etoilebsd.net/pkg/
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://wiki.freebsd.org/pkgng
-COMMENT=	FreeBSD's binary package manager
-LICENSE=	modified-bsd
-
-ONLY_FOR_PLATFORM+= NetBSD-*-* FreeBSD-*-* DragonFly-*-*
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--disable-maintainer-mode
-USE_LIBTOOL=	yes
-
-AUTO_MKDIRS=	yes
-
-OWN_DIRS+=	${PKG_SYSCONFDIR}/bash_completion.d
-OWN_DIRS+=	${PKG_SYSCONFDIR}/periodic/daily
-OWN_DIRS+=	${PKG_SYSCONFDIR}/periodic/security
-OWN_DIRS+=	${PKG_SYSCONFDIR}/periodic/weekly
-
-EGDIR=		${PREFIX}/share/doc/pkgng
-CONF_FILES+=	${EGDIR}/bash_completion.d/_pkg.bash ${PKG_SYSCONFDIR}/periodic/daily/_pkg.bash
-CONF_FILES+=	${EGDIR}/periodic/daily/411.pkg-backup ${PKG_SYSCONFDIR}/periodic/daily/411.pkg-backup
-CONF_FILES+=	${EGDIR}/periodic/daily/490.status-pkg-changes ${PKG_SYSCONFDIR}/periodic/daily/490.status-pkg-changes
-CONF_FILES+=	${EGDIR}/periodic/security/410.pkg-audit ${PKG_SYSCONFDIR}/periodic/security/410.pkg-audit
-CONF_FILES+=	${EGDIR}/periodic/security/460.pkg-checksum ${PKG_SYSCONFDIR}/periodic/security/460.pkg-checksum
-CONF_FILES+=	${EGDIR}/periodic/weekly/400.status-pkg ${PKG_SYSCONFDIR}/periodic/weekly/400.status-pkg
-CONF_FILES+=	${EGDIR}/pkg.conf.sample ${PKG_SYSCONFDIR}/pkg.conf
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/misc/pkgng/PLIST b/misc/pkgng/PLIST
deleted file mode 100644
index 1689a0eb184..00000000000
--- a/misc/pkgng/PLIST
+++ /dev/null
@@ -1,55 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2015/12/31 18:29:50 agc Exp $
-include/pkg.h
-lib/libpkg.la
-lib/libpkg_static.la
-libdata/pkgconfig/pkg.pc
-man/man3/pkg_printf.3
-man/man3/pkg_repos.3
-man/man5/pkg-repository.5
-man/man5/pkg.conf.5
-man/man8/pkg-add.8
-man/man8/pkg-alias.8
-man/man8/pkg-annotate.8
-man/man8/pkg-audit.8
-man/man8/pkg-autoremove.8
-man/man8/pkg-backup.8
-man/man8/pkg-check.8
-man/man8/pkg-clean.8
-man/man8/pkg-config.8
-man/man8/pkg-convert.8
-man/man8/pkg-create.8
-man/man8/pkg-delete.8
-man/man8/pkg-fetch.8
-man/man8/pkg-info.8
-man/man8/pkg-install.8
-man/man8/pkg-lock.8
-man/man8/pkg-query.8
-man/man8/pkg-register.8
-man/man8/pkg-remove.8
-man/man8/pkg-repo.8
-man/man8/pkg-rquery.8
-man/man8/pkg-search.8
-man/man8/pkg-set.8
-man/man8/pkg-shell.8
-man/man8/pkg-shlib.8
-man/man8/pkg-ssh.8
-man/man8/pkg-static.8
-man/man8/pkg-stats.8
-man/man8/pkg-unlock.8
-man/man8/pkg-update.8
-man/man8/pkg-updating.8
-man/man8/pkg-upgrade.8
-man/man8/pkg-version.8
-man/man8/pkg-which.8
-man/man8/pkg.8
-sbin/pkg
-sbin/pkg-static
-sbin/pkg2ng
-share/doc/pkgng/bash_completion.d/_pkg.bash
-share/doc/pkgng/periodic/daily/411.pkg-backup
-share/doc/pkgng/periodic/daily/490.status-pkg-changes
-share/doc/pkgng/periodic/security/410.pkg-audit
-share/doc/pkgng/periodic/security/460.pkg-checksum
-share/doc/pkgng/periodic/weekly/400.status-pkg
-share/doc/pkgng/pkg.conf.sample
-share/zsh/site-functions/_pkg
diff --git a/misc/pkgng/distinfo b/misc/pkgng/distinfo
deleted file mode 100644
index 7e3998bca30..00000000000
--- a/misc/pkgng/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2015/12/31 18:29:50 agc Exp $
-
-SHA1 (pkg-1.6.2.tar.xz) = e2ad481f6f7585ce4bf99f98f30043e9bca33611
-RMD160 (pkg-1.6.2.tar.xz) = 7eac37e026f676b5e74f30a8a4c5f71193904a21
-SHA512 (pkg-1.6.2.tar.xz) = e348076afb7ce265e9726265028534289417fa55365aa0794aa1333035c13402ef2a145f44e7f2d8d201c73647688581a552d4655fd6aac01fba60b523bb572f
-Size (pkg-1.6.2.tar.xz) = 1898592 bytes
-SHA1 (patch-external-libfetch-http.c) = 781d9db295f5f3308f9a796097dcf0d898d6f620
-SHA1 (patch-scripts__Makefile.in) = 158681713ba705cec8caf1dd859ecaa4366383cf
-SHA1 (patch-src__Makefile.in) = 47e208408a900b7a91e17ef1e382cbd9e115c367
-SHA1 (patch-src__readpassphrase_compat.h) = c44fc47b887bb474c428e7388c05a9e6799c5f38
-SHA1 (patch-src__repo.c) = f93e1e355c200ee16d68b7bdd183be0d60f354f0
diff --git a/misc/pkgng/patches/patch-external-libfetch-http.c b/misc/pkgng/patches/patch-external-libfetch-http.c
deleted file mode 100644
index 3b4dc179f23..00000000000
--- a/misc/pkgng/patches/patch-external-libfetch-http.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-external-libfetch-http.c,v 1.1.1.1 2015/12/31 18:29:50 agc Exp $
-
-make sure time.h is included first so we don't get linker warnings
-
---- external/libfetch/http.c	2015/12/29 00:34:33	1.1
-+++ external/libfetch/http.c	2015/12/29 00:35:12
-@@ -62,7 +62,6 @@
- #define _XOPEN_SOURCE
- #include <sys/param.h>
- #include <sys/socket.h>
--#include <sys/time.h>
- 
- #include <ctype.h>
- #include <err.h>
diff --git a/misc/pkgng/patches/patch-scripts__Makefile.in b/misc/pkgng/patches/patch-scripts__Makefile.in
deleted file mode 100644
index a62e21d40dc..00000000000
--- a/misc/pkgng/patches/patch-scripts__Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-scripts__Makefile.in,v 1.1.1.1 2015/12/31 18:29:50 agc Exp $
-
-Install config files and scripts into share/doc/pkgng, and
-use config files to copy them under etc
-
---- scripts/Makefile.in	2015/12/31 17:39:42	1.1
-+++ scripts/Makefile.in	2015/12/31 17:40:46
-@@ -476,10 +476,10 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--pdailydir = ${sysconfdir}/periodic/daily
--psecuritydir = ${sysconfdir}/periodic/security
--pweeklydir = ${sysconfdir}/periodic/weekly
--bashcompdir = ${sysconfdir}/bash_completion.d
-+pdailydir = ${prefix}/share/doc/pkgng/periodic/daily
-+psecuritydir = ${prefix}/share/doc/pkgng/periodic/security
-+pweeklydir = ${prefix}/share/doc/pkgng/periodic/weekly
-+bashcompdir = ${prefix}/share/doc/pkgng/bash_completion.d
- zshcompdir = ${prefix}/share/zsh/site-functions
- dist_sbin_SCRIPTS = sbin/pkg2ng
- dist_pdaily_SCRIPTS = periodic/411.pkg-backup \
diff --git a/misc/pkgng/patches/patch-src__Makefile.in b/misc/pkgng/patches/patch-src__Makefile.in
deleted file mode 100644
index 00606b89ef7..00000000000
--- a/misc/pkgng/patches/patch-src__Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src__Makefile.in,v 1.1.1.1 2015/12/31 18:29:50 agc Exp $
-
-Place "pkg.conf.sample" file in share/doc/pkgng and use CONF_FILE
-framework put the real file in etc
-
---- src/Makefile.in	2015/12/31 17:45:08	1.1
-+++ src/Makefile.in	2015/12/31 17:49:04
-@@ -1288,18 +1288,18 @@
- 	-rm -rf .libs _libs
- install-dist_sysconfDATA: $(dist_sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	@list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-+	@list='$(dist_sysconf_DATA)'; test -n "$(prefix)/share/doc/pkgng" || list=; \
- 	if test -n "$$list"; then \
--	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
--	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
-+	  echo " $(MKDIR_P) '$(DESTDIR)$(prefix)/share/doc/pkgng'"; \
-+	  $(MKDIR_P) "$(DESTDIR)$(prefix)/share/doc/pkgng" || exit 1; \
- 	fi; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  echo "$$d$$p"; \
- 	done | $(am__base_list) | \
- 	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(prefix)/share/doc/pkgng'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(prefix)/share/doc/pkgng" || exit $$?; \
- 	done
- 
- uninstall-dist_sysconfDATA:
diff --git a/misc/pkgng/patches/patch-src__readpassphrase_compat.h b/misc/pkgng/patches/patch-src__readpassphrase_compat.h
deleted file mode 100644
index e5446a07cb4..00000000000
--- a/misc/pkgng/patches/patch-src__readpassphrase_compat.h
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-src__readpassphrase_compat.h,v 1.1.1.1 2015/12/31 18:29:50 agc Exp $
-
-missing header file - taken from openssh, v1.3
-
---- /dev/null	2015-12-28 15:45:54.000000000 -0800
-+++ src/readpassphrase_compat.h	2015-12-28 15:51:15.000000000 -0800
-@@ -0,0 +1,48 @@
-+/*	$ NetBSD: readpassphrase.h,v 1.3 2015/04/03 23:58:19 christos Exp $	*/
-+/*	$OpenBSD: readpassphrase.h,v 1.1 2000/11/21 00:48:38 millert Exp $	*/
-+
-+/*
-+ * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
-+ * All rights reserved.
-+ *
-+ * 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. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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.
-+ */
-+
-+#ifndef _READPASSPHRASE_H_
-+#define _READPASSPHRASE_H_
-+
-+#define RPP_ECHO_OFF    0x00		/* Turn off echo (default). */
-+#define RPP_ECHO_ON     0x01		/* Leave echo on. */
-+#define RPP_REQUIRE_TTY 0x02		/* Fail if there is no tty. */
-+#define RPP_FORCELOWER  0x04		/* Force input to lower case. */
-+#define RPP_FORCEUPPER  0x08		/* Force input to upper case. */
-+#define RPP_SEVENBIT    0x10		/* Strip the high bit from input. */
-+
-+#include <sys/cdefs.h>
-+
-+__BEGIN_DECLS
-+char * readpassphrase __P((const char *, char *, size_t, int));
-+char * getpass __P((const char *));
-+__END_DECLS
-+
-+#endif /* !_READPASSPHRASE_H_ */
diff --git a/misc/pkgng/patches/patch-src__repo.c b/misc/pkgng/patches/patch-src__repo.c
deleted file mode 100644
index b567cc4d24c..00000000000
--- a/misc/pkgng/patches/patch-src__repo.c
+++ /dev/null
@@ -1,154 +0,0 @@
-$NetBSD: patch-src__repo.c,v 1.1.1.1 2015/12/31 18:29:50 agc Exp $
-
-include readpassphrase in the one place it is used
-
---- src/repo.c	2015/12/29 00:43:25	1.1
-+++ src/repo.c	2015/12/29 00:44:23
-@@ -41,6 +41,147 @@
- #include <bsd/readpassphrase.h>
- #else
- #include "readpassphrase_compat.h"
-+/*
-+ * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
-+ * All rights reserved.
-+ *
-+ * 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. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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.
-+ */
-+
-+#include <sys/types.h>
-+#if defined(LIBC_SCCS) && !defined(lint)
-+static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.7 2001/08/07 19:34:11 millert Exp $";
-+#endif /* LIBC_SCCS and not lint */
-+
-+#include <ctype.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <paths.h>
-+#include <pwd.h>
-+#include <signal.h>
-+#include <string.h>
-+#include <termios.h>
-+#include <unistd.h>
-+#include "readpassphrase_compat.h"
-+
-+char *
-+readpassphrase(prompt, buf, bufsiz, flags)
-+	const char *prompt;
-+	char *buf;
-+	size_t bufsiz;
-+	int flags;
-+{
-+#ifdef GETPASS_ECHO
-+	int gflags = GETPASS_ECHO_NL;
-+
-+	if (flags & RPP_ECHO_ON)
-+		gflags |= GETPASS_ECHO;
-+	if (flags & RPP_REQUIRE_TTY)
-+		gflags |= GETPASS_NEED_TTY;
-+	if (flags & RPP_FORCELOWER)
-+		gflags |= GETPASS_FORCE_LOWER;
-+	if (flags & RPP_FORCEUPPER)
-+		gflags |= GETPASS_FORCE_UPPER;
-+	if (flags & RPP_SEVENBIT)
-+		gflags |= GETPASS_7BIT;
-+
-+	return getpassfd(prompt, buf, bufsiz, NULL, gflags, 0);
-+#else
-+	struct termios term, oterm;
-+	char ch, *p, *end;
-+	int input, output;
-+	sigset_t oset, nset;
-+
-+	/* I suppose we could alloc on demand in this case (XXX). */
-+	if (bufsiz == 0) {
-+		errno = EINVAL;
-+		return(NULL);
-+	}
-+
-+	/*
-+	 * Read and write to /dev/tty if available.  If not, read from
-+	 * stdin and write to stderr unless a tty is required.
-+	 */
-+	if ((input = output = open(_PATH_TTY, O_RDWR)) == -1) {
-+		if (flags & RPP_REQUIRE_TTY) {
-+			errno = ENOTTY;
-+			return(NULL);
-+		}
-+		input = STDIN_FILENO;
-+		output = STDERR_FILENO;
-+	}
-+
-+	/*
-+	 * We block SIGINT and SIGTSTP so the terminal is not left
-+	 * in an inconsistent state (ie: no echo).  It would probably
-+	 * be better to simply catch these though.
-+	 */
-+	sigemptyset(&nset);
-+	sigaddset(&nset, SIGINT);
-+	sigaddset(&nset, SIGTSTP);
-+	(void)sigprocmask(SIG_BLOCK, &nset, &oset);
-+
-+	/* Turn off echo if possible. */
-+	if (tcgetattr(input, &oterm) == 0) {
-+		memcpy(&term, &oterm, sizeof(term));
-+		if (!(flags & RPP_ECHO_ON) && (term.c_lflag & ECHO))
-+			term.c_lflag &= ~ECHO;
-+		if (term.c_cc[VSTATUS] != _POSIX_VDISABLE)
-+			term.c_cc[VSTATUS] = _POSIX_VDISABLE;
-+		(void)tcsetattr(input, TCSAFLUSH|TCSASOFT, &term);
-+	} else {
-+		memset(&term, 0, sizeof(term));
-+		memset(&oterm, 0, sizeof(oterm));
-+	}
-+
-+	(void)write(output, prompt, strlen(prompt));
-+	end = buf + bufsiz - 1;
-+	for (p = buf; read(input, &ch, 1) == 1 && ch != '\n' && ch != '\r';) {
-+		if (p < end) {
-+			if ((flags & RPP_SEVENBIT))
-+				ch &= 0x7f;
-+			if (isalpha((unsigned char)ch)) {
-+				if ((flags & RPP_FORCELOWER))
-+					ch = tolower((unsigned char)ch);
-+				if ((flags & RPP_FORCEUPPER))
-+					ch = toupper((unsigned char)ch);
-+			}
-+			*p++ = ch;
-+		}
-+	}
-+	*p = '\0';
-+	if (!(term.c_lflag & ECHO))
-+		(void)write(output, "\n", 1);
-+
-+	/* Restore old terminal settings and signal mask. */
-+	if (memcmp(&term, &oterm, sizeof(term)) != 0)
-+		(void)tcsetattr(input, TCSAFLUSH|TCSASOFT, &oterm);
-+	(void)sigprocmask(SIG_SETMASK, &oset, NULL);
-+	if (input != STDIN_FILENO)
-+		(void)close(input);
-+	return(buf);
-+#endif
-+}
- #endif
- 
- #include <unistd.h>