Date: Sat, 22 Dec 2012 19:58:04 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309403 - head/ports-mgmt/pkg Message-ID: <201212221958.qBMJw4HO041907@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <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 +.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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212221958.qBMJw4HO041907>