cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r429298 it has some unexpected side effects which I do not have time to

Browse Source 
fix yet

Approved by:	portmgr (implicit)
This commit is contained in:
Baptiste Daroussin 2016-12-25 12:46:14 +00:00
parent 91bbddb925
commit dd2c2cb23e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=429411
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mk/bsd.options.mk
View File

@ -153,7 +153,7 @@
.if !defined(OPTIONSMKINCLUDED) .if !defined(OPTIONSMKINCLUDED)
OPTIONSMKINCLUDED= bsd.options.mk OPTIONSMKINCLUDED= bsd.options.mk
OPTIONS_NAME?= ${PKGORIGIN:S/\//_/g} OPTIONS_NAME?= ${PKGORIGIN:S/\//_/}
OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options
_OPTIONS_FLAGS= ALL_TARGET BROKEN CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \ _OPTIONS_FLAGS= ALL_TARGET BROKEN CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \

4
Mk/bsd.port.mk
View File

@ -1211,7 +1211,9 @@ USE_SUBMAKE= yes
.for _CATEGORY in ${CATEGORIES} .for _CATEGORY in ${CATEGORIES}
PKGCATEGORY?= ${_CATEGORY} PKGCATEGORY?= ${_CATEGORY}
.endfor .endfor
PKGORIGIN?= ${.CURDIR:C/${PORTSDIR}\///} _PORTDIRNAME= ${.CURDIR:T}
PORTDIRNAME?= ${_PORTDIRNAME}
PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME}
# where 'make config' records user configuration options # where 'make config' records user configuration options
PORT_DBDIR?= /var/db/ports PORT_DBDIR?= /var/db/ports

4
Mk/bsd.sanity.mk
View File

@ -15,8 +15,8 @@ WARNING+= "WITH_NEW_XORG and WITHOUT_NEW_XORG knobs were removed and have no eff
WARNING+= "WITH_KMS was removed and has no effect" WARNING+= "WITH_KMS was removed and has no effect"
.endif .endif
.if exists(${.CURDIR}/../../Mk/bsd.port.mk) || exists(${.CURDIR}/../../../Mk/bsd.port.mk) .if exists(${.CURDIR}/../../Mk/bsd.port.mk)
.if ${PKGORIGIN:C/\/.*//} != ${PKGCATEGORY} .if ${.CURDIR:H:T} != ${PKGCATEGORY}
DEV_ERROR+= "The first entry in CATEGORIES should be the directory where the port lives" DEV_ERROR+= "The first entry in CATEGORIES should be the directory where the port lives"
.endif .endif
.else .else