D8889.id23232.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8889.id23232.diff
View Options

	Index: head/Mk/bsd.options.mk
	===================================================================
	--- head/Mk/bsd.options.mk
	+++ head/Mk/bsd.options.mk
	@@ -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 \
	Index: head/Mk/bsd.port.mk
	===================================================================
	--- head/Mk/bsd.port.mk
	+++ head/Mk/bsd.port.mk
	@@ -1211,9 +1211,7 @@
	.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
	Index: head/Mk/bsd.sanity.mk
	===================================================================
	--- head/Mk/bsd.sanity.mk
	+++ head/Mk/bsd.sanity.mk
	@@ -15,8 +15,8 @@
	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