diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-01-20 22:17:03 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-01-20 22:17:03 +0000 |
| commit | 5be37c5652dc5c78d8c053ae35a0da08da8d4c7d (patch) | |
| tree | be32ea9934c38de1599012678a40836e249dc024 /Mk | |
| parent | - Use new knobs from bsd.sdl.mk (diff) | |
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
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 12229173a992..40c2e89b9743 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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 |