- update to 1.0-beta16

- changes:
  * fix incremental pkg repo
  * fix stage directory (copy mode) support
  * improvements on documentation (man pages, error messages)
  * new ARCH_INDEP options in developper mode to allow notifying a maintainer
    that a port might be archiecture independant
  * fix compilation on recent 8-stable and 9-stable
  * improvemens is usage() output
  * new option PORTAUDIT_SITE to allow user to set the url for the auditfile
  * pkg create -an to not repack existing packages
  * new periodic script to make daily backup of the database
  * new stats (pkg-stats(8)) subcommand
  * big improvements and bug fixes in pkg (r)query
  * deactivate shlibs tracking all the time in pkg-static
  * lots of bug fixes

Thanks to all contributors

5 files changed, 11 insertions, 80 deletions

diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index b06be2a1d03c..a7b2f4d5349f 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pkg
-DISTVERSION=	1.0-beta15
-PORTREVISION=	3
+DISTVERSION=	1.0-beta16
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/portmgr \
 		http://files.etoilebsd.net/pkg/
@@ -23,6 +22,7 @@ USE_LDCONFIG=	yes
 MANCOMPRESSED=	yes
 
 MAKE_ENV+=	WITHOUT_PROFILE=yes
+USE_STAGE=	yes
 
 MAN8=	pkg.8 \
 	pkg-add.8 \
@@ -44,14 +44,15 @@ MAN8=	pkg.8 \
 	pkg-set.8 \
 	pkg-shell.8 \
 	pkg-shlib.8 \
+	pkg-stats.8 \
 	pkg-update.8 \
 	pkg-updating.8 \
 	pkg-upgrade.8 \
 	pkg-version.8 \
 	pkg-which.8
-MLINKS=	pkg-delete.8 pkg-remove.8
 MAN5=	pkg.conf.5
-MLINKS=	pkg-delete.8 pkg-remove.8
+MLINKS=	pkg-delete.8 pkg-remove.8 \
+	pkg.8 pkg-static.8
 
 .include <bsd.port.pre.mk>
 
@@ -71,7 +72,9 @@ IGNORE=		not supported on 7.x or early 8.0
 post-install:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/scripts/periodic/410.pkg-audit
 	@${MKDIR} ${PREFIX}/etc/periodic/security
+	@${MKDIR} ${PREFIX}/etc/periodic/daily
 	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/periodic/410.pkg-audit ${PREFIX}/etc/periodic/security
+	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/periodic/411.pkg-backup ${PREFIX}/etc/periodic/daily
 	@${INSTALL_SCRIPT} ${WRKSRC}/ports/pkg2ng ${PREFIX}/sbin
 	@${INSTALL_DATA} ${WRKSRC}/pkg/pkg.conf.sample ${PREFIX}/etc
 	@${CAT} ${PKGMESSAGE}
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index bacec8a348a4..c35ad69657f3 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.0-beta15.tar.xz) = c95d205355566ad3214e5c57d90581737b1a1774414e3399d64ce4b2ee7ffa5e
-SIZE (pkg-1.0-beta15.tar.xz) = 1327304
+SHA256 (pkg-1.0-beta16.tar.xz) = 39027af80348970e4ab6b94e2fa2b578c90a1da75c8ea753571a3abb5052d69d
+SIZE (pkg-1.0-beta16.tar.xz) = 1356944
diff --git a/ports-mgmt/pkg/files/patch-libpkg__packing.c b/ports-mgmt/pkg/files/patch-libpkg__packing.c
deleted file mode 100644
index 9faa9886f2d8..000000000000
--- a/ports-mgmt/pkg/files/patch-libpkg__packing.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./libpkg/packing.c.orig	2012-06-03 16:28:53.000000000 +0200
-+++ ./libpkg/packing.c	2012-06-03 20:55:42.669538609 +0200
-@@ -133,8 +133,8 @@
- 	struct stat st;
- 	struct archive_entry *entry, *sparse_entry;
- 	/* ugly hack for python and emacs */
--	char *p;
--	bool unset_timestamp = true;
-+	/*char *p;
-+	bool unset_timestamp = true;*/
- 
- 	entry = archive_entry_new();
- 	archive_entry_copy_sourcepath(entry, filepath);
-@@ -171,7 +171,7 @@
- 		archive_entry_set_perm(entry, perm);
- 
- 	/* XXX ugly hack for python and emacs */
--	p = strrchr(filepath, '.');
-+	/*p = strrchr(filepath, '.');
- 
- 	if (p != NULL && (strcmp(p, ".pyc") == 0 ||
- 	    strcmp(p, ".py") == 0 ||
-@@ -186,7 +186,7 @@
- 		archive_entry_unset_ctime(entry);
- 		archive_entry_unset_mtime(entry);
- 		archive_entry_unset_birthtime(entry);
--	}
-+	}*/
- 
- 	archive_entry_linkify(pack->resolver, &entry, &sparse_entry);
- 
diff --git a/ports-mgmt/pkg/files/patch-pkg2ng-options-fix b/ports-mgmt/pkg/files/patch-pkg2ng-options-fix
deleted file mode 100644
index 37dd60bfc6d6..000000000000
--- a/ports-mgmt/pkg/files/patch-pkg2ng-options-fix
+++ /dev/null
@@ -1,43 +0,0 @@
---- ports/pkg2ng.orig	2012-06-03 16:28:53.000000000 +0200
-+++ ports/pkg2ng	2012-06-15 12:45:08.133722432 +0200
-@@ -9,6 +9,7 @@
- fi
- 
- ARCH=$( uname -m )
-+failed_pkgs=""
- 
- for PKG in $( pkg_info -Ea )
- do
-@@ -27,7 +28,7 @@
- 		CATEGORIES=$( make -C ${PORTSDIR}/${ORIGIN} -V CATEGORIES | sed -e "s/ /,/g")
- 		LICENSES=$( make -C ${PORTSDIR}/${ORIGIN} -V LICENSE | sed -e "s/ /,/g")
- 		LICLOGIC=$(make -C ${PORTSDIR}/${ORIGIN} -V LICENSE_COMB )
--		OPTIONS=$(make -C ${PORTSDIR}/${ORIGIN} showconfig | awk 'BEGIN{ line=""; }!/^=/ { gsub(/=/,": ",$1); line=line" "$1","; } END{print line}')
-+		OPTIONS=$(make -C ${PORTSDIR}/${ORIGIN} showconfig | awk 'BEGIN{ line=""; }!/^=/ { gsub(/=/,": ",$1); gsub(/:$/,"",$1); line=line" "$1","; } END{print line}')
- 		USERS=$(make -C ${PORTSDIR}/${ORIGIN} -V USERS | sed -e "s/ /,/g")
- 		GROUPS=$(make -C ${PORTSDIR}/${ORIGIN} -V GROUPS | sed -e "s/ /,/g")
- 	else
-@@ -66,8 +67,9 @@
- 
- 	pkg register -l -m ${MDIR} -f ${PLIST} ${CMD_ARGS}
- 	if [ $? -ne 0 ]; then
--		echo "Registration of ${PKG} failed."
-+		echo "Registration of ${PKG} failed." >&2
- 		cat ${MANIFEST}
-+		failed_pkgs="${failed_pkgs} ${PKG}"
- 	else
- 		rm -rf ${MANIFEST}
- 	fi
-@@ -75,5 +77,12 @@
- 	rm -rf ${MDIR}
- done
- 
-+
-+if [ -n "${failed_pkgs}" ]; then
-+	echo "" >&2
-+	echo "!!! Some packages failed to register !!!" >&2
-+	echo "Failed packages: ${failed_pkgs}" >&2
-+fi
-+
- # Delete the portupgrade pkgdb to avoid discrepencies. It will be auto recreated.
- rm -f /var/db/pkg/pkgdb.db > /dev/null 2>&1
diff --git a/ports-mgmt/pkg/pkg-plist b/ports-mgmt/pkg/pkg-plist
index 5f542c955966..9bffb318c927 100644
--- a/ports-mgmt/pkg/pkg-plist
+++ b/ports-mgmt/pkg/pkg-plist
@@ -6,6 +6,8 @@ include/pkg.h
 lib/libpkg.so.0
 lib/libpkg.so
 lib/libpkg.a
+etc/periodic/daily/411.pkg-backup
 etc/periodic/security/410.pkg-audit
+@dirrmtry etc/periodic/daily
 @dirrmtry etc/periodic/security
 @dirrmtry etc/periodic