Date: Fri, 5 Jul 2013 12:29:35 +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: r322320 - head/Mk Message-ID: <201307051229.r65CTZaW021414@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Jul 5 12:29:35 2013 New Revision: 322320 URL: http://svnweb.freebsd.org/changeset/ports/322320 Log: - Fix pkg2ng due to UID/ID not being defined. Pkg-1.1.4 will define UID=0 when sourcing bsd.pkgng.mk directly. This extra defined(UID) can eventually be removed, but is needed for backwards compatibility for now. Reported by: uqs Reviewed by: bapt With hat: portmgr Modified: head/Mk/bsd.pkgng.mk Modified: head/Mk/bsd.pkgng.mk ============================================================================== --- head/Mk/bsd.pkgng.mk Fri Jul 5 12:07:16 2013 (r322319) +++ head/Mk/bsd.pkgng.mk Fri Jul 5 12:29:35 2013 (r322320) @@ -36,12 +36,6 @@ ACTUAL-PACKAGE-DEPENDS?= \ ${PKG_QUERY} "%dn: {origin: %do, version: \"%dv\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \ fi -# Redefine. pkg2ng calls directly 'make -f bsd.pkgng.mk' which needs UID to be defined - -.if !defined(UID) -UID!= ${ID} -u -.endif - .if !target(fake-pkg) fake-pkg: .if !defined(NO_PKG_REGISTER) @@ -267,7 +261,7 @@ check-already-installed: .if !target(deinstall) deinstall: -.if ${UID} != 0 && !defined(INSTALL_AS_USER) +.if defined(UID) && ${UID} != 0 && !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Switching to root credentials for '${.TARGET}' target" @cd ${.CURDIR} && \ ${SU_CMD} "${MAKE} ${.TARGET}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307051229.r65CTZaW021414>