From owner-svn-ports-all@FreeBSD.ORG Sat Dec 22 19:58:04 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DDAA4843; Sat, 22 Dec 2012 19:58:04 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A88AE8FC0A; Sat, 22 Dec 2012 19:58:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMJw4wj041908; Sat, 22 Dec 2012 19:58:04 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMJw4HO041907; Sat, 22 Dec 2012 19:58:04 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201212221958.qBMJw4HO041907@svn.freebsd.org> From: Bryan Drewery Date: Sat, 22 Dec 2012 19:58:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309403 - head/ports-mgmt/pkg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Dec 2012 19:58:04 -0000 Author: bdrewery Date: Sat Dec 22 19:58:04 2012 New Revision: 309403 URL: http://svnweb.freebsd.org/changeset/ports/309403 Log: - Enable seatbelt again after further testing. It will work fine as is with portmaster distfiles. pkg_info -Ea will list invalid packages, while pkg_info only gives a warning for the packages. This is already handled due to stderr being sent to /dev/null. The NB_OLDPKGS does come out correct. Approved by: bapt (implicit) Modified: head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Sat Dec 22 18:26:08 2012 (r309402) +++ head/ports-mgmt/pkg/Makefile Sat Dec 22 19:58:04 2012 (r309403) @@ -56,31 +56,31 @@ MLINKS= pkg-delete.8 pkg-remove.8 \ .include -#.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 +.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)