- update to 1.0.4

- changes:
  * zsh completion for the help subcomment [1]
  * Make unlocking an already unlocked database a no-op,
  * Create the PKG_DBDIR if it doesn't exists
  * Fix download size calculation
  * When analysing shlibs, interpret the special token $ORIGIN in RPATH correctly
  * For shared libraries installed by a package, don't require dynamic library dependencies to resolve
  * Do not warn twice about unknown keywords
  * New PERMISSIVE option please do not use !!!
  * Add a seat belt in the ports Makefile to avoid automatic switching to pkgng [2]

Submitted by:		ume [1]
Requested by:		stas [2]
Bad english by:		bapt [2]
Good english by:	bdrewery, gjb [2]

3 files changed, 29 insertions, 19 deletions

diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index 1555a944e50d..8794f4964c76 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.0.3
-PORTREVISION=	1
+DISTVERSION=	1.0.4
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/portmgr \
 		http://files.etoilebsd.net/pkg/
@@ -56,6 +55,32 @@ MLINKS=	pkg-delete.8 pkg-remove.8 \
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_PKGNG)
+.if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info)
+NB_OLDPKGS!=	pkg_info 2>/dev/null | wc -l
+.if ${NB_OLDPKGS} > 0
+
+pre-everything::
+	@${ECHO_CMD} "You are about to convert your system to pkgng while you have ports/packages"; \
+	 ${ECHO_CMD} "installed with the old pkg_install tools."; \
+	 ${ECHO_CMD} ""; \
+	 ${ECHO_CMD} "You can choose to: "; \
+	 ${ECHO_CMD} "- keep pkg_install as the package management system by adding this line to /etc/make.conf:"; \
+	 ${ECHO_CMD} ""; \
+	 ${ECHO_CMD} "    WITHOUT_PKGNG=yes" ; \
+	 ${ECHO_CMD} ""; \
+	 ${ECHO_CMD} "- switch to pkgng:"; \
+	 ${ECHO_CMD} "    1) Add WITHOUT_PKGNG to /etc/make.conf"; \
+	 ${ECHO_CMD} "    2) Install ports-mgmt/pkg"; \
+	 ${ECHO_CMD} "    3) Convert your package database by running pkg2ng"; \
+	 ${ECHO_CMD} "    4) Remove WITHOUT_PKGNG from /etc/make.conf"; \
+	 ${ECHO_CMD} ""; \
+	exit 1
+
+.endif
+.endif
+.endif
+
 #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :)
 .if defined(WITH_PKGNG)
 PKG_DEPENDS=
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index f47fd2f9b776..a9ad91d73aad 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.0.3.tar.xz) = 42db4120cb4c2c5f0c9724769d626aa6d14f369882802773309a8d3774566648
-SIZE (pkg-1.0.3.tar.xz) = 1444520
+SHA256 (pkg-1.0.4.tar.xz) = 7a85792f2758d989a491d3a20a00e5c09e3b679730657a001792f31dea25e607
+SIZE (pkg-1.0.4.tar.xz) = 1446804
diff --git a/ports-mgmt/pkg/files/patch-libpkg__pkg.h b/ports-mgmt/pkg/files/patch-libpkg__pkg.h
deleted file mode 100644
index 967fc8275819..000000000000
--- a/ports-mgmt/pkg/files/patch-libpkg__pkg.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./libpkg/pkg.h.orig	2012-12-05 12:00:45.000000000 +0100
-+++ ./libpkg/pkg.h	2012-12-07 17:13:11.533719154 +0100
-@@ -37,10 +37,10 @@
- #include <sys/sbuf.h>
- #include <openssl/pem.h>
- 
--#define PKGVERSION "1.0.2"
-+#define PKGVERSION "1.0.3"
- /* PORTVERSION equivalent for proper pkg-static->ports-mgmt/pkg version comparison
-  * in pkgdb_query_newpkgversion() */
--#define PKG_PORTVERSION "1.0.2"
-+#define PKG_PORTVERSION "1.0.3_1"
- 
- struct pkg;
- struct pkg_dep;