Date: Sun, 25 Dec 2016 12:46:14 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429411 - head/Mk Message-ID: <201612251246.uBPCkEX1007271@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Dec 25 12:46:14 2016 New Revision: 429411 URL: https://svnweb.freebsd.org/changeset/ports/429411 Log: Revert r429298 it has some unexpected side effects which I do not have time to fix yet Approved by: portmgr (implicit) Modified: head/Mk/bsd.options.mk head/Mk/bsd.port.mk head/Mk/bsd.sanity.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Sun Dec 25 12:45:18 2016 (r429410) +++ head/Mk/bsd.options.mk Sun Dec 25 12:46:14 2016 (r429411) @@ -153,7 +153,7 @@ .if !defined(OPTIONSMKINCLUDED) OPTIONSMKINCLUDED= bsd.options.mk -OPTIONS_NAME?= ${PKGORIGIN:S/\//_/g} +OPTIONS_NAME?= ${PKGORIGIN:S/\//_/} OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options _OPTIONS_FLAGS= ALL_TARGET BROKEN CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \ Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sun Dec 25 12:45:18 2016 (r429410) +++ head/Mk/bsd.port.mk Sun Dec 25 12:46:14 2016 (r429411) @@ -1211,7 +1211,9 @@ USE_SUBMAKE= yes .for _CATEGORY in ${CATEGORIES} PKGCATEGORY?= ${_CATEGORY} .endfor -PKGORIGIN?= ${.CURDIR:C/${PORTSDIR}\///} +_PORTDIRNAME= ${.CURDIR:T} +PORTDIRNAME?= ${_PORTDIRNAME} +PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME} # where 'make config' records user configuration options PORT_DBDIR?= /var/db/ports Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Sun Dec 25 12:45:18 2016 (r429410) +++ head/Mk/bsd.sanity.mk Sun Dec 25 12:46:14 2016 (r429411) @@ -15,8 +15,8 @@ WARNING+= "WITH_NEW_XORG and WITHOUT_NEW WARNING+= "WITH_KMS was removed and has no effect" .endif -.if exists(${.CURDIR}/../../Mk/bsd.port.mk) || exists(${.CURDIR}/../../../Mk/bsd.port.mk) -.if ${PKGORIGIN:C/\/.*//} != ${PKGCATEGORY} +.if exists(${.CURDIR}/../../Mk/bsd.port.mk) +.if ${.CURDIR:H:T} != ${PKGCATEGORY} DEV_ERROR+= "The first entry in CATEGORIES should be the directory where the port lives" .endif .else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612251246.uBPCkEX1007271>