mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
OPTIONSFILE now defaults to ${PORT_DBDIR}/${UNIQUENAME}/options where
${PORT_DBDIR} is /var/db/ports and ${UNIQUENAME} is ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}. OPTIONSFILE, PORT_DBDIR, and UNIQUENAME are all overrideable by the porter. Note: a better solution may be forthcoming after it can be shaken out on bento. This is a simple fix to workaround PORTNAME conflicts in the tree. Submitted by: eivind
This commit is contained in:
parent
73d891fa45
commit
5be37c5652
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=98679
@ -69,6 +69,8 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
|
||||
# Optional.
|
||||
# PKGNAMESUFFIX - Suffix to specify compilation options. Optional.
|
||||
# Do not define this in your Makefile.
|
||||
# UNIQUENAME - A name for your port that is globally unique. By default,
|
||||
# this is set to ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
|
||||
# DISTNAME - Name of port or distribution used in generating
|
||||
# WRKSRC and DISTFILES below (default:
|
||||
# ${PORTNAME}-${PORTVERSION}).
|
||||
@ -1017,7 +1019,8 @@ USE_SUBMAKE= yes
|
||||
# where 'make config' records user configuration options
|
||||
PORT_DBDIR?= /var/db/ports
|
||||
|
||||
OPTIONSFILE?=${PORT_DBDIR}/${PORTNAME}/options
|
||||
UNIQUENAME?=${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
|
||||
OPTIONSFILE?=${PORT_DBDIR}/${UNIQUENAME}/options
|
||||
.if exists(${OPTIONSFILE})
|
||||
.include "${OPTIONSFILE}"
|
||||
.endif
|
||||
@ -4901,8 +4904,8 @@ config:
|
||||
.if !defined(OPTIONS)
|
||||
@${ECHO_MSG} "===> No options to configure"
|
||||
.else
|
||||
@(${MKDIR} ${PORT_DBDIR}/${PORTNAME} 2> /dev/null) || \
|
||||
(${ECHO_MSG} "===> Cannot create ${PORT_DBDIR}/${PORTNAME}, check permissions"; exit 1)
|
||||
@(${MKDIR} ${PORT_DBDIR}/${UNIQUENAME} 2> /dev/null) || \
|
||||
(${ECHO_MSG} "===> Cannot create ${PORT_DBDIR}/${UNIQUENAME}, check permissions"; exit 1)
|
||||
-@if [ -e ${OPTIONSFILE} ]; then \
|
||||
. ${OPTIONSFILE}; \
|
||||
fi; \
|
||||
@ -4971,7 +4974,7 @@ rmconfig:
|
||||
.if exists(${OPTIONSFILE})
|
||||
-@${ECHO_MSG} "===> Removing user-configured options for ${PORTNAME}"; \
|
||||
${RM} -f ${OPTIONSFILE}; \
|
||||
${RMDIR} ${PORT_DBDIR}/${PORTNAME}
|
||||
${RMDIR} ${PORT_DBDIR}/${UNIQUENAME}
|
||||
.else
|
||||
@${ECHO_MSG} "===> No user-specified options configured for ${PORTNAME}"
|
||||
.endif
|
||||
|
Loading…
Reference in New Issue
Block a user