From owner-svn-ports-all@freebsd.org Sun Dec 25 12:46:16 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15EF0C8588C; Sun, 25 Dec 2016 12:46:16 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BF83D1935; Sun, 25 Dec 2016 12:46:15 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBPCkEOf007274; Sun, 25 Dec 2016 12:46:14 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBPCkEX1007271; Sun, 25 Dec 2016 12:46:14 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201612251246.uBPCkEX1007271@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 25 Dec 2016 12:46:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429411 - head/Mk 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.23 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: Sun, 25 Dec 2016 12:46:16 -0000 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