diff options
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 54 |
1 files changed, 10 insertions, 44 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index cc537724937b..b6b82fa82f99 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -74,9 +74,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Optional. # PKGVERSION - Always defined as ${PORTVERSION}. # Do not define this in your Makefile. -# UNIQUENAME - A name for your port that is globally unique. By default, -# this is set to ${LATEST_LINK} when LATEST_LINK is set, -# and to ${PKGNAMEPREFIX}${PORTNAME} otherwise. # DISTVERSION - Vendor version of the distribution. # Default: ${PORTVERSION} # DISTNAME - Name of port or distribution used in generating @@ -892,7 +889,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # directories to be searched for shared libraries. # Otherwise, this is a list of directories to be added to that # list. The directory names are written to -# ${LOCALBASE}/libdata/ldconfig/${UNIQUENAME} which is then +# ${LOCALBASE}/libdata/ldconfig/${PKGBASE} which is then # used by the ldconfig startup script. # This mechanism replaces ldconfig scripts installed by some # ports, often under such names as 000.${UNQUENAME}.sh. @@ -901,7 +898,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # version, and the directory list given will be ignored. # USE_LDCONFIG32 # - Same as USE_LDCONFIG but the target file is -# ${LOCALBASE}/libdata/ldconfig32/${UNIQUENAME} instead. +# ${LOCALBASE}/libdata/ldconfig32/${PKGBASE} instead. # Note: that should only be used on 64-bit architectures. # # DOCSDIR - Name of the directory to install the packages docs in. @@ -977,11 +974,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # generating the packing list on-the-fly, make sure it's generated before # do-install is called! # -# For package: -# -# LATEST_LINK - Install the "Latest" link for the package as ___. Define -# this if the "Latest" link name will be incorrectly determined. -# # This is used in all stages: # # SCRIPTS_ENV - Additional environment vars passed to scripts in @@ -1252,12 +1244,6 @@ USERS_BLACKLIST= _dhcp _pflogd auditdistd bin bind daemon games hast kmem mailnu LDCONFIG_DIR= libdata/ldconfig LDCONFIG32_DIR= libdata/ldconfig32 -.if defined(LATEST_LINK) -UNIQUENAME?= ${LATEST_LINK} -.else -UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} -.endif - .endif # At least KDE needs TMPDIR for the package building, @@ -2571,8 +2557,7 @@ WRKDIR_PKGFILE= ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} # The "latest version" link -- ${PKGNAME} minus everthing after the last '-' PKGLATESTREPOSITORY?= ${PACKAGES}/Latest PKGBASE?= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} -LATEST_LINK?= ${PKGBASE} -PKGLATESTFILE= ${PKGLATESTREPOSITORY}/${LATEST_LINK}${PKG_SUFX} +PKGLATESTFILE= ${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_SUFX} CONFIGURE_SCRIPT?= configure CONFIGURE_CMD?= ./${CONFIGURE_SCRIPT} @@ -2903,7 +2888,7 @@ DEPENDS_ARGS+= NOCLEANDEPENDS=yes ################################################################ .if ((!defined(OPTIONS_DEFINE) && !defined(OPTIONS_SINGLE) && !defined(OPTIONS_MULTI)) \ && !defined(OPTIONS_GROUP) && !defined(OPTIONS_RADIO) \ - || defined(CONFIG_DONE_${UNIQUENAME:tu}) || \ + || defined(CONFIG_DONE_${PKGBASE:tu}) || \ defined(PACKAGE_BUILDING) || defined(BATCH)) _OPTIONS_OK=yes .endif @@ -3584,8 +3569,8 @@ install-ldconfig-file: @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ - > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} - @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE} + @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE} >> ${TMPPLIST} .endif .endif .endif @@ -3596,8 +3581,8 @@ install-ldconfig-file: @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ - > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} - @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE} + @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE} >> ${TMPPLIST} .endif .endif .endif @@ -5117,18 +5102,12 @@ do-config: @${ECHO_MSG} "===> No options to configure" .else @optionsdir=${OPTIONS_FILE:H}; \ - oldoptionsdir=${OPTIONSFILE:H}; \ if [ ${UID} != 0 -a -z "${INSTALL_AS_USER}" -a ! -w "${PORT_DBDIR}" ] ; then \ ${ECHO_MSG} "===> Switching to root credentials to create $${optionsdir}"; \ - (${SU_CMD} "${SH} -c \"if [ -d $${oldoptionsdir} -a ! -d $${optionsdir} ]; then ${MV} $${oldoptionsdir} $${optionsdir}; elif [ -d $${oldoptionsdir} -a -d $${optionsdir} ]; then ${RM} -rf $${oldoptionsdir} ; fi ; ${MKDIR} $${optionsdir} 2> /dev/null\"") || \ + (${SU_CMD} "${SH} -c \"${MKDIR} $${optionsdir} 2> /dev/null\"") || \ (${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1); \ ${ECHO_MSG} "===> Returning to user credentials" ; \ else \ - if [ -d $${oldoptionsdir} -a ! -d $${optionsdir} ]; then \ - ${MV} $${oldoptionsdir} $${optionsdir}; \ - elif [ -d $${oldoptionsdir} -a -d $${optionsdir} ]; then \ - ${RM} -rf $${oldoptionsdir} ; \ - fi ; \ ${MKDIR} $${optionsdir} 2> /dev/null || \ (${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1) ; \ fi @@ -5246,19 +5225,6 @@ showconfig-recursive: .if !target(rmconfig) rmconfig: -.if exists(${OPTIONSFILE}) - -@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \ - optionsdir=${OPTIONSFILE:H}; \ - if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" -a ! -w "${OPTIONSFILE}" ]; then \ - ${ECHO_MSG} "===> Switching to root credentials to remove ${OPTIONSFILE} and $${optionsdir}"; \ - ${SU_CMD} "${RM} -f ${OPTIONSFILE} ; \ - ${RMDIR} $${optionsdir}"; \ - ${ECHO_MSG} "===> Returning to user credentials"; \ - else \ - ${RM} -f ${OPTIONSFILE}; \ - ${RMDIR} $${optionsdir} 2>/dev/null || return 0; \ - fi -.endif .if exists(${OPTIONS_FILE}) -@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \ optionsdir=${OPTIONS_FILE:H}; \ @@ -5675,7 +5641,7 @@ _PHONY_TARGETS+= ${target} ${target}: ${${target:tu}_COOKIE} .elif !target(${target}) ${target}: config-conditional - @cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:tu}=1 ${${target:tu}_COOKIE} + @cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${PKGBASE:tu}=1 ${${target:tu}_COOKIE} .elif target(${target}) && defined(IGNORE) .endif |