From owner-svn-ports-all@FreeBSD.ORG Fri Dec 21 18:32:56 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 37EFF7F4; Fri, 21 Dec 2012 18:32:56 +0000 (UTC) (envelope-from bapt@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 00FDC8FC13; Fri, 21 Dec 2012 18:32:55 +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 qBLIWt2e013774; Fri, 21 Dec 2012 18:32:55 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLIWtHT013773; Fri, 21 Dec 2012 18:32:55 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201212211832.qBLIWtHT013773@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 21 Dec 2012 18:32:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309369 - 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: Fri, 21 Dec 2012 18:32:56 -0000 Author: bapt Date: Fri Dec 21 18:32:55 2012 New Revision: 309369 URL: http://svnweb.freebsd.org/changeset/ports/309369 Log: Temporary disable the seat belt it doesn't play nice with portmaster Modified: head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Fri Dec 21 18:01:16 2012 (r309368) +++ head/ports-mgmt/pkg/Makefile Fri Dec 21 18:32:55 2012 (r309369) @@ -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)