Date: Sat, 24 Dec 2016 00:30:22 +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: r429298 - head/Mk Message-ID: <201612240030.uBO0UMmm019674@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Dec 24 00:30:21 2016 New Revision: 429298 URL: https://svnweb.freebsd.org/changeset/ports/429298 Log: Make the ports infrastructure accept at least 3 level ports Approved by: portmgr (rene Differential Revision: https://reviews.freebsd.org/D8889 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 Sat Dec 24 00:07:37 2016 (r429297) +++ head/Mk/bsd.options.mk Sat Dec 24 00:30:21 2016 (r429298) @@ -153,7 +153,7 @@ .if !defined(OPTIONSMKINCLUDED) OPTIONSMKINCLUDED= bsd.options.mk -OPTIONS_NAME?= ${PKGORIGIN:S/\//_/} +OPTIONS_NAME?= ${PKGORIGIN:S/\//_/g} 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 Sat Dec 24 00:07:37 2016 (r429297) +++ head/Mk/bsd.port.mk Sat Dec 24 00:30:21 2016 (r429298) @@ -1211,9 +1211,7 @@ USE_SUBMAKE= yes .for _CATEGORY in ${CATEGORIES} PKGCATEGORY?= ${_CATEGORY} .endfor -_PORTDIRNAME= ${.CURDIR:T} -PORTDIRNAME?= ${_PORTDIRNAME} -PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME} +PKGORIGIN?= ${.CURDIR:C/${PORTSDIR}\///} # where 'make config' records user configuration options PORT_DBDIR?= /var/db/ports Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Sat Dec 24 00:07:37 2016 (r429297) +++ head/Mk/bsd.sanity.mk Sat Dec 24 00:30:21 2016 (r429298) @@ -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) -.if ${.CURDIR:H:T} != ${PKGCATEGORY} +.if exists(${.CURDIR}/../../Mk/bsd.port.mk) || exists(${.CURDIR}/../../../Mk/bsd.port.mk) +.if ${PKGORIGIN:C/\/.*//} != ${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?201612240030.uBO0UMmm019674>