diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-08-17 14:20:40 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-08-17 14:20:40 +0000 |
| commit | 21a283f3bec444388d1448f993783ec673a06502 (patch) | |
| tree | 16be3a9188cf2781563095e15839c170074dd7a7 | |
| parent | cda45bfa8a05d49eb690397ab1b7facd622490a7 (diff) | |
| download | ports-21a283f3bec444388d1448f993783ec673a06502.tar.gz ports-21a283f3bec444388d1448f993783ec673a06502.zip | |
Remove UNIQUENAME and LATEST_LINK.
UNIQUENAME was never unique, it was only used by USE_LDCONFIG and now,
we won't have conflicts there.
Use PKGBASE instead of LATEST_LINK in PKGLATESTFILE, the *only* consumer
is pkg-devel, and it works just fine without LATEST_LINK as pkg-devel
has the correct PKGNAME anyway.
Now that UNIQUENAME is gone, OPTIONSFILE is too. (it's been called
OPTIONS_FILE now.)
Reviewed by: antoine, bapt
Exp-run by: antoine
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D3336
Notes
Notes:
svn path=/head/; revision=394508
271 files changed, 144 insertions, 587 deletions
@@ -10,6 +10,14 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20150817: +AUTHOR: mat@FreeBSD.org + + UNIQUENAME and LATEST_LINK have been removed. LATEST_LINK was only used by + ports-mgmt/pkg{,-devel} and PKGBASE can be used in its stead. UNIQUENAME was + used by USE_LDCONFIG where it was not unique enough, and as old compat shims + with options. + 20150716: AUTHOR: kwm@FreeBSD.org diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index 7151ce1bcca5..26ab48d50222 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -47,7 +47,7 @@ Database_Include_MAINTAINER= ports@FreeBSD.org # build this port with (overrides WITH_BDB_VER). # WITH_BDB_VER # - User defined global variable to set Berkeley DB version. -# <UNIQUENAME>_WITH_BDB_VER +# <BDB_UNIQUENAME>_WITH_BDB_VER # - User defined port specific variable to set Berkeley DB # version. # WITH_BDB_HIGHEST @@ -191,6 +191,8 @@ IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} # TODO: avoid malformed conditional with invalid USE_BDB/WITH_BDB_VER # check if + works properly from test builds 01h12m23s +BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} + _USE_BDB_save:=${USE_BDB} _WITH_BDB_VER_save:=${WITH_BDB_VER} @@ -211,9 +213,9 @@ db5_FIND= ${LOCALBASE}/include/db5/db.h db6_FIND= ${LOCALBASE}/include/db6/db.h # Override the global WITH_BDB_VER with the -# port specific <UNIQUENAME>_WITH_BDB_VER -.if defined(${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER) -WITH_BDB_VER= ${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} +# port specific <BDB_UNIQUENAME>_WITH_BDB_VER +.if defined(${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER) +WITH_BDB_VER= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} .endif # Override USE_BDB with global WITH_BDB_VER @@ -340,7 +342,7 @@ BDB_VER= ${_BDB_VER} debug-bdb: @${ECHO_CMD} "--INPUTS----------------------------------------------------" - @${ECHO_CMD} "${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}" + @${ECHO_CMD} "${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}" @${ECHO_CMD} "WITH_BDB_VER: ${_WITH_BDB_VER_save}" @${ECHO_CMD} "WANT_BDB_VER: ${WANT_BDB_VER}" @${ECHO_CMD} "BDB_BUILD_DEPENDS: ${BDB_BUILD_DEPENDS}" @@ -374,7 +376,7 @@ BAD_VAR+= ${var}, . endif . endfor . if defined(BAD_VAR) -_IGNORE_MSG= Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version +_IGNORE_MSG= Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version . if defined(IGNORE) IGNORE+= ${_IGNORE_MSG} . else diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk index 7a198af8dd04..19a5b924ec93 100644 --- a/Mk/bsd.options.mk +++ b/Mk/bsd.options.mk @@ -127,7 +127,6 @@ OPTIONSMKINCLUDED= bsd.options.mk OPTIONS_NAME?= ${PKGORIGIN:S/\//_/} -OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options _OPTIONS_FLAGS= ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \ @@ -244,22 +243,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX To remove once UNIQUENAME will be removed -## Set the options specified per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_SET} -. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) -PORT_OPTIONS+= ${opt} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endif -. endfor - -## Unset the options excluded per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_UNSET} -PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endfor -# XXX To remove once UNIQUENAME will be removed - ## Set the options specified per-port (set by user in make.conf) . for opt in ${${OPTIONS_NAME}_SET} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) @@ -274,14 +257,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX to remove once UNIQUENAME is removed -## options files (from dialog) -. if exists(${OPTIONSFILE}) && !make(rmconfig) -. include "${OPTIONSFILE}" -. endif -. sinclude "${OPTIONSFILE}.local" -# XXX to remove once UNIQUENAME is removed - ## options files (from dialog) . if exists(${OPTIONS_FILE}) && !make(rmconfig) . include "${OPTIONS_FILE}" @@ -303,6 +278,14 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} .endif .endfor +_OPTIONS_UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME} +.for _k in SET UNSET SET_FORCE UNSET_FORCE +.if defined(${_OPTIONS_UNIQUENAME}_${_k}) +WARNING+= "You are using ${_OPTIONS_UNIQUENAME}_${_k} which is not supported any more, use:" +WARNING+= "${OPTIONS_NAME}_${_k}= ${${_OPTIONS_UNIQUENAME}_${_k}}" +.endif +.endfor + .if defined(OPTIONS_WARNINGS) WARNING+= "You are using the following deprecated options: ${OPTIONS_WARNINGS}" WARNING+= "If you added them on the command line, you should replace them by" @@ -355,22 +338,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX To remove once UNIQUENAME will be removed -## Set the options specified per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_SET_FORCE} -. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) -PORT_OPTIONS+= ${opt} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endif -. endfor - -## Unset the options excluded per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_UNSET_FORCE} -PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endfor -# XXX To remove once UNIQUENAME will be removed - ## Set the options specified per-port (set by user in make.conf) . for opt in ${${OPTIONS_NAME}_SET_FORCE} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) 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 diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 3040665aa62e..67ea6003d3de 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -159,7 +159,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL NO_INSTALL_MANPAGES \ INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \ PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ - USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT + USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \ + UNIQUENAME LATEST_LINK SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes @@ -194,6 +195,8 @@ PYDISTUTILS_NOEGGINFO_ALT= USE_PYTHON=noegginfo USE_PYTHON_PREFIX_ALT= USE_PYTHON=pythonprefix PYTHON_PKGNAMESUFFIX_ALT= PYTHON_PKGNAMEPREFIX NO_INSTALL_MANPAGES_ALT= USES=imake:noman +UNIQUENAME_ALT= PKGBASE +LATEST_LINK_ALT= PKGBASE .for a in ${SANITY_DEPRECATED} .if defined(${a}) diff --git a/Tools/scripts/README b/Tools/scripts/README index 458328bc4f0e..a93227f826cd 100644 --- a/Tools/scripts/README +++ b/Tools/scripts/README @@ -12,8 +12,6 @@ bad-pkgdescrs.sh - locate identical pkg descriptions bump_revision.pl - Small script to bump the PORTREVISION variable of ports which are depending on a port with a changed shared lib version. -check-latest-link - search for duplicate LATEST_LINK values and send nag - mails to the responsible maintainers checkcats.py - verify that master categories in all ports are correct and report any problems. Beware that the full check takes quite some time. diff --git a/Tools/scripts/check-latest-link b/Tools/scripts/check-latest-link deleted file mode 100644 index 97e1f0167052..000000000000 --- a/Tools/scripts/check-latest-link +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# -# Iterate over the ports collection, assemble the list of LATEST_LINKs and -# then look for duplicates. Send a nag-mail to the responsible maintainers. - -# Sanitize environment -export __MAKE_CONF=/dev/null -export PORT_DBDIR=/nonexistent -export PKG_DBDIR=/nonexistent -export LOCALBASE=/nonexistent - -if [ -z "${PORTSDIR}" ]; then - PORTSDIR=/usr/ports -fi - -if [ "$1" = "-nomail" ]; then - NOMAIL=1 -else - NOMAIL=0 -fi - -cd ${PORTSDIR} -CATEGORIES=$(make -V SUBDIR) - -for cat in ${CATEGORIES}; do - cd ${PORTSDIR}/${cat} - dirs=$(make -V SUBDIR) - - make "PORTSDIR=${PORTSDIR}" "CATEGORY=${cat}" "DIRS=${dirs}" -k -j3 -f - << "EOF" -all: ${DIRS:S/$/.portinfo/} - -.for d in ${DIRS} -${d}.portinfo: - @cd ${PORTSDIR}/${CATEGORY}/${d}; make 'portinfo=$${NO_LATEST_LINK}| $${MAINTAINER} $${.CURDIR:S,${PORTSDIR}/,,} $${LATEST_LINK}' -V portinfo -.endfor -EOF -done | grep '^|' > ${PORTSDIR}/.latest_link - -cd ${PORTSDIR} -(awk '{print " " $4 "$"}' < .latest_link) | sort | uniq -d > .latest_dups - -grep -f .latest_dups .latest_link | sort -i -k4 > .latest_full - -maint=$(awk '{print $2}' < .latest_full | sort -ui | tr '\n' ' ') - -(echo "Dear port maintainers," - echo - echo "The following list includes ports maintained by you that have duplicate" - echo "LATEST_LINK values. They should either be modified to use a unique" - echo "PKGNAME, e.g. by using PKGNAMESUFFIX. Note that NO_LATEST_LINK is" - echo "deprecated. See the portmgr blog post for more information:" - echo "http://blogs.freebsdish.org/portmgr/2013/10/03/package-name-collisions/" - echo - echo - echo "Thanks," - echo "Erwin \"Annoying Reminder Guy III\" Lansing" - echo - echo - - printf "%-20s %-30s %-20s\n" "LATEST_LINK" "PORTNAME" "MAINTAINER" - echo "==========================================================================" - while read dummy i j k; do - printf "%-20s %-30s %-20s\n" $k $j $i - done < .latest_full - - num=$(wc -l .latest_full | awk '{print $1}') - echo - echo "Total: $num ports") > .latest_mail - -if [ "${NOMAIL}" = "0" ]; then - for i in ${maint}; do - mail -s "Ports with duplicate LATEST_LINKs" $i < .latest_mail - done - # Copy to erwin@ - mail -s "Ports with duplicate LATEST_LINKs" erwin@FreeBSD.org < .latest_mail -else - cat .latest_mail -fi - -rm .latest_dups .latest_full .latest_link .latest_mail @@ -5,6 +5,19 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20150817: + AFFECTS: everybody who still uses <UNIQUENAME>_SET/UNSET in make.conf + AUTHOR: mat@FreeBSD.org + + The use of <UNIQUENAME>_SET/UNSET has been deprecated for a long time, + replaced by <OPTIONNS_NAME>_SET/UNSET. It is now not supported any more. + A warning will be issued telling you what to do, for example: + + $ make + /!\ WARNING /!\ + You are using perl_SET which is not supported any more, use: + lang_perl5.20_SET= DEBUG + 20150816: AFFECTS: users of sysutils/s6 AUTHOR: Colin Booth <colin@heliocat.net> diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile index 1b424b7ab44f..870643b15c97 100644 --- a/audio/amarok-kde4/Makefile +++ b/audio/amarok-kde4/Makefile @@ -22,8 +22,6 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${P RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${PORTSDIR}/devel/qtscriptgenerator \ ${KDE4_PREFIX}/lib/kde4/kio_upnp_ms.so:${PORTSDIR}/net/kio-upnp-ms -LATEST_LINK= ${PORTNAME}-kde4 - USE_KDE4= kdelibs kdeprefix libkcddb libkcompactdisc \ nepomuk-core runtime automoc4 strigi USE_MYSQL= embedded diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 32b84e1739d3..ce616919812c 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -32,8 +32,6 @@ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} INSTALL_TARGET= install-strip -LATEST_LINK= jack - OPTIONS_DEFINE= ALSA DOXYGEN READLINE OPTIONS_DEFAULT=READLINE OPTIONS_SUB= yes diff --git a/audio/lua51-mpd/Makefile b/audio/lua51-mpd/Makefile index abd83953aa3e..e21bf6de973c 100644 --- a/audio/lua51-mpd/Makefile +++ b/audio/lua51-mpd/Makefile @@ -12,7 +12,7 @@ COMMENT= Lua library for musicpd RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket OPTIONS_DEFINE= DOCS -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} GH_ACCOUNT= silentbicycle GH_PROJECT= lua-mpd diff --git a/audio/py-mpd2/Makefile b/audio/py-mpd2/Makefile index 5a0f528d31c7..391b7a912cfd 100644 --- a/audio/py-mpd2/Makefile +++ b/audio/py-mpd2/Makefile @@ -23,7 +23,6 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS EXAMPLES DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff --git a/biology/ruby-bio/Makefile b/biology/ruby-bio/Makefile index fea988732e72..8a9cb18e58b4 100644 --- a/biology/ruby-bio/Makefile +++ b/biology/ruby-bio/Makefile @@ -16,8 +16,6 @@ OPTIONS_DEFINE= XMLPARSER BDB4 MYSQL PGSQL DOCS XMLPARSER_DESC= xmlparser support for faster Blast processing BDB4_DESC= bdb4 support for faster flat file indexing -OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options - USES= shebangfix USE_RUBY= yes USE_RUBY_SETUP= yes diff --git a/chinese/joe/Makefile b/chinese/joe/Makefile index 696be5cfb9ee..9a9608547460 100644 --- a/chinese/joe/Makefile +++ b/chinese/joe/Makefile @@ -9,8 +9,6 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org -LATEST_LINK= ${PKGNAMEPREFIX}joe - DEPRECATED= The difference with editors/joe is too trivial to warrant a separate port EXPIRATION_DATE=2015-09-27 diff --git a/chinese/phpbb3-tw/Makefile b/chinese/phpbb3-tw/Makefile index 07b9614fd612..ea22a32f7ea4 100644 --- a/chinese/phpbb3-tw/Makefile +++ b/chinese/phpbb3-tw/Makefile @@ -15,8 +15,6 @@ COMMENT= The Traditional Chinese version of phpBB3 CONFLICTS= phpbb-tw-[0-2]* phpbb-devel-[0-3]* phpbb-[0-3]* -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX} - USES= zip # The phpBB3 port supports a number of variables that may be tweaked at build diff --git a/databases/jdbm2/Makefile b/databases/jdbm2/Makefile index bc37c828b19a..fd9510f5b5c8 100644 --- a/databases/jdbm2/Makefile +++ b/databases/jdbm2/Makefile @@ -19,7 +19,6 @@ JAVA_VERSION= 1.6+ NO_BUILD= yes PROJECTHOST= jdbm2 -LATEST_LINK= jdbm2 PORTDOCS= * PORTEXAMPLES= * diff --git a/databases/luasql-mysql/Makefile b/databases/luasql-mysql/Makefile index 7601c8f48c60..02155f6348b1 100644 --- a/databases/luasql-mysql/Makefile +++ b/databases/luasql-mysql/Makefile @@ -53,7 +53,6 @@ MAKE_ARGS+= DRIVER_LIBS="-L ${LOCALBASE}/lib -lsqlite3" \ IGNORE= unknown or unsupported luasql driver .endif -LATEST_LINK= ${PORTNAME}-${LUASQL_DRIVER} PLIST_SUB+= LUASQL_DRIVER=${LUASQL_DRIVER} do-install: diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile index b248f685f618..8eb84de84f0e 100644 --- a/databases/mariadb-client/Makefile +++ b/databases/mariadb-client/Makefile @@ -4,8 +4,6 @@ PORTNAME= mariadb PORTREVISION= 7 PKGNAMESUFFIX= 53-client -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - COMMENT= Database client - drop-in replacement for MySQL MASTERDIR= ${.CURDIR}/../mariadb-server diff --git a/databases/mariadb-scripts/Makefile b/databases/mariadb-scripts/Makefile index f13f806569fa..effc8eec3a6b 100644 --- a/databases/mariadb-scripts/Makefile +++ b/databases/mariadb-scripts/Makefile @@ -7,7 +7,6 @@ COMMENT= Scripts for mariadb - drop-in replacement for MySQL LICENSE= GPLv2 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} USES= perl5 MASTERDIR= ${.CURDIR}/../mariadb-server diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile index 87ff39e2a3cc..288cc93aa1f1 100644 --- a/databases/mariadb-server/Makefile +++ b/databases/mariadb-server/Makefile @@ -20,8 +20,6 @@ COMMENT= Database server - drop-in replacement for MySQL LICENSE= GPLv2 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - CONFLICTS?= mariadb5[4-9]-server-* \ mariadb1[0-9][0-9]-server-* \ mysql*-server-* \ diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile index 7e7bc6909dff..445d9cd96e2e 100644 --- a/databases/mariadb100-server/Makefile +++ b/databases/mariadb100-server/Makefile @@ -21,7 +21,6 @@ LICENSE= GPLv2 SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} SLAVEDIRS= databases/mariadb100-client USES= bison:build cmake execinfo gmake shebangfix cpe USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin diff --git a/databases/pear-DoctrineDBAL/Makefile b/databases/pear-DoctrineDBAL/Makefile index 7246a48d70d0..678e040c1bf0 100644 --- a/databases/pear-DoctrineDBAL/Makefile +++ b/databases/pear-DoctrineDBAL/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:${PORTSDIR}/deve ${PEARDIR}/Doctrine/Common/Version.php:${PORTSDIR}/databases/pear-DoctrineCommon \ ${PEARDIR}/Symfony/Component/Console/Application.php:${PORTSDIR}/devel/pear-Symfony_Component_Console -OPTIONSFILE?= ${PORT_DBDIR}/pear-${PORTNAME}/options OPTIONS_DEFINE= DBLIB MYSQL ODBC PGSQL SQLITE OPTIONS_DEFAULT=MYSQL diff --git a/databases/proftpd-mod_sql_mysql/Makefile b/databases/proftpd-mod_sql_mysql/Makefile index 5703130a577f..bb2f521ae0d1 100644 --- a/databases/proftpd-mod_sql_mysql/Makefile +++ b/databases/proftpd-mod_sql_mysql/Makefile @@ -12,7 +12,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd USE_MYSQL= yes diff --git a/databases/proftpd-mod_sql_odbc/Makefile b/databases/proftpd-mod_sql_odbc/Makefile index aba7dde47139..c56916c9bb11 100644 --- a/databases/proftpd-mod_sql_odbc/Makefile +++ b/databases/proftpd-mod_sql_odbc/Makefile @@ -14,7 +14,6 @@ LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd CONFIGURE_ARGS= LIBS=-liodbc \ diff --git a/databases/proftpd-mod_sql_sqlite/Makefile b/databases/proftpd-mod_sql_sqlite/Makefile index 1c351f5ac5b5..94d50d485d2c 100644 --- a/databases/proftpd-mod_sql_sqlite/Makefile +++ b/databases/proftpd-mod_sql_sqlite/Makefile @@ -13,7 +13,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd USE_SQLITE= yes diff --git a/databases/proftpd-mod_sql_tds/Makefile b/databases/proftpd-mod_sql_tds/Makefile index edafb84ccb8e..a9c1c4d1aac9 100644 --- a/databases/proftpd-mod_sql_tds/Makefile +++ b/databases/proftpd-mod_sql_tds/Makefile @@ -14,7 +14,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile index 484909795925..ffe2f47b4059 100644 --- a/databases/py-MySQLdb/Makefile +++ b/databases/py-MySQLdb/Makefile @@ -23,7 +23,6 @@ PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}1-${PORTNAME}-${PORTVERSION} -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= DOCS MYSQLCLIENT_R OPTIONS_DEFAULT= MYSQLCLIENT_R MYSQLCLIENT_R_DESC= Use libmysqlclient_r (thread safe) diff --git a/databases/py-pyPgSQL/Makefile b/databases/py-pyPgSQL/Makefile index 76df2a55142c..c040aa4057d5 100644 --- a/databases/py-pyPgSQL/Makefile +++ b/databases/py-pyPgSQL/Makefile @@ -25,9 +25,6 @@ OPTIONS_DEFINE= BYTEA_CONN EXAMPLES DOCS OPTIONS_DEFAULT= BYTEA_CONN BYTEA_CONN_DESC= Apply Bytea connection patch -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBYTEA_CONN} diff --git a/databases/py-sqlalchemy-devel/Makefile b/databases/py-sqlalchemy-devel/Makefile index 44ac7be2d694..bbae74f2c7ab 100644 --- a/databases/py-sqlalchemy-devel/Makefile +++ b/databases/py-sqlalchemy-devel/Makefile @@ -32,9 +32,6 @@ OPTIONS_DEFAULT= SQLITE SYBASE_DESC= Sybase backend TESTS_DESC= Include nose for unit tests -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mssql>0:${PORTSDIR}/databases/py-mssql PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2 SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile index 8d1758631e04..0625198afcbe 100644 --- a/databases/py-sqlalchemy/Makefile +++ b/databases/py-sqlalchemy/Makefile @@ -32,9 +32,6 @@ MSSQL_DESC= MS SQL Server backend TESTS_DESC= Include nose for unit tests SYBASE_DESC= Sybase backend -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - .include <bsd.port.options.mk> DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} diff --git a/databases/py-sqlalchemy06/Makefile b/databases/py-sqlalchemy06/Makefile index d8d6260a6899..00960afa2ad5 100644 --- a/databases/py-sqlalchemy06/Makefile +++ b/databases/py-sqlalchemy06/Makefile @@ -18,9 +18,6 @@ LICENSE= MIT USES= python USE_PYTHON= distutils autoplist -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - OPTIONS_DEFINE= CEXTENSIONS DOCS EXAMPLES NOSE OPTIONS_MULTI= BACKEND diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile index 8e8861f2d3b4..fa372a4bb186 100644 --- a/databases/ruby-bdb/Makefile +++ b/databases/ruby-bdb/Makefile @@ -20,7 +20,6 @@ LICENSE= RUBY USE_BDB= yes OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/databases/rubygem-activerecord/Makefile b/databases/rubygem-activerecord/Makefile index 5454360d40a0..ba05e059b06b 100644 --- a/databases/rubygem-activerecord/Makefile +++ b/databases/rubygem-activerecord/Makefile @@ -26,7 +26,6 @@ OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 MYSQL_DESC= Use native MySQL bindings PGSQL_DESC= Use native PostgreSQL bindings SQLITE3_DESC= Use native SQLite3 bindings -OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options GEM_ENV+= LANG=en_US.UTF-8 diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile index dda341a64a10..278e512f8f8e 100644 --- a/databases/squirrel-sql/Makefile +++ b/databases/squirrel-sql/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} SUB_FILES= squirrel-sql -DATADIR= ${PREFIX}/share/java/${UNIQUENAME} +DATADIR= ${PREFIX}/share/java/${PKGBASE} DESKTOP_ENTRIES="Squirrel-SQL Client" \ "${COMMENT}" \ diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile index e98c18716f46..99190f0441e4 100644 --- a/deskutils/gworkspace-gwmetadata/Makefile +++ b/deskutils/gworkspace-gwmetadata/Makefile @@ -22,7 +22,6 @@ USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} USE_SQLITE= yes LDFLAGS+= -lpthread -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata CONFIGURE_ARGS+= --with-sqlite-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-sqlite-library=${LOCALBASE}/lib diff --git a/devel/cl-asdf/bsd.cl-asdf.mk b/devel/cl-asdf/bsd.cl-asdf.mk index 5af2d0c5f2d2..5f291a9e9293 100644 --- a/devel/cl-asdf/bsd.cl-asdf.mk +++ b/devel/cl-asdf/bsd.cl-asdf.mk @@ -8,7 +8,7 @@ # CL_LIBDIR_REL - Common Lisp library directory, relative to LOCALBASE or PREFIX # ASDF_PATHNAME - Where to install compiled FASL files (depends on FASL_DIR_REL) # ASDF_REGISTRY - Path to ASDF registry -# DOCSDIR - DOCSDIR using UNIQUENAME (to account for optional cl- PKGNAMEPREFIX) +# DOCSDIR - DOCSDIR using PKGBASE (to account for optional cl- PKGNAMEPREFIX) # EXAMPLESDIR - Same as above, for EXAMPLESDIR # FASL_DIR_REL - Relative path to compiled FASL files; depends on FASL_TARGET # FASL_TARGET - Platform for building FASL files (currently "sbcl" or "clisp") @@ -32,8 +32,8 @@ FASL_PATHNAME= ${PREFIX}/${CL_LIBDIR_REL}/${PORTNAME}/${FASL_DIR_REL} ASDF_REGISTRY= ${PREFIX}/${CL_LIBDIR_REL}/system-registry # Include PKGNAMEPREFIX in DOCSDIR and EXAMPLESDIR -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} .if defined(FASL_TARGET) FASL_DIR_REL= ${FASL_TARGET}fasl diff --git a/devel/glib20-reference/bsd.gnome-reference.mk b/devel/glib20-reference/bsd.gnome-reference.mk index 6b9a50178ecf..3312475b5cba 100644 --- a/devel/glib20-reference/bsd.gnome-reference.mk +++ b/devel/glib20-reference/bsd.gnome-reference.mk @@ -22,9 +22,6 @@ DISTNAME:= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MASTER_SITE_SUBDIR:= ${MASTER_SITE_SUBDIR} .endif PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-reference -.if defined(LATEST_LINK) -LATEST_LINK:= ${LATEST_LINK}-reference -.endif COMMENT= Programming reference for ${REFERENCE_PORT} diff --git a/devel/insight/Makefile b/devel/insight/Makefile index 4558797141bd..12671cbe61c4 100644 --- a/devel/insight/Makefile +++ b/devel/insight/Makefile @@ -6,8 +6,6 @@ PORTREVISION= 2 MAINTAINER= mi@aldan.algebra.com COMMENT= Gnu debugger with the Insight GUI front-end -LATEST_LINK= insight - MASTERDIR= ${.CURDIR:H}/gdb66 OPTIONS_SLAVE= INSIGHT CONFLICTS= gdb-[6-9]* diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 86bb81df383f..5f39dcfc5ed7 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -15,7 +15,6 @@ COMMAND_PREFIX= cheri-unknown-freebsd- COMMAND_SUFFIX= DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 USE_LDCONFIG= ${LLVM_PREFIX}/lib diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 79d38fb78ad8..8add55a06e9e 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -14,7 +14,6 @@ LLVM_SUFFIX= -devel LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 USE_LDCONFIG= ${LLVM_PREFIX}/lib diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile index 6d205c2bbca8..48c0979cac4d 100644 --- a/devel/llvm33/Makefile +++ b/devel/llvm33/Makefile @@ -15,7 +15,6 @@ LLVM_SUFFIX= ${PORTVERSION:S/.//g} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= execinfo gmake perl5 GNU_CONFIGURE= yes diff --git a/devel/llvm34/Makefile b/devel/llvm34/Makefile index 228db1d83275..c5473b1645c6 100644 --- a/devel/llvm34/Makefile +++ b/devel/llvm34/Makefile @@ -15,7 +15,6 @@ LLVM_SUFFIX= ${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} WRKSRC= ${WRKDIR}/llvm-${PORTVERSION}.src diff --git a/devel/llvm35/Makefile b/devel/llvm35/Makefile index 0d23e84cb30c..f81baf5c9ce3 100644 --- a/devel/llvm35/Makefile +++ b/devel/llvm35/Makefile @@ -15,7 +15,6 @@ LLVM_SUFFIX= ${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} WRKSRC= ${WRKDIR}/llvm-${DISTVERSION}.src diff --git a/devel/llvm36/Makefile b/devel/llvm36/Makefile index 1a556bed52cd..3401ed520891 100644 --- a/devel/llvm36/Makefile +++ b/devel/llvm36/Makefile @@ -16,7 +16,6 @@ LLVM_RELEASE= ${PORTVERSION:C/([0-9]\.[0-9].[0-9]).*/\1/} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} WRKSRC= ${WRKDIR}/llvm-${DISTVERSION}.src diff --git a/devel/llvm37/Makefile b/devel/llvm37/Makefile index 132a23ba929c..b0b85c6aef2f 100644 --- a/devel/llvm37/Makefile +++ b/devel/llvm37/Makefile @@ -20,7 +20,6 @@ LLVM_SUFFIX= ${DISTVERSION:R:S/.//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz USE_LDCONFIG= ${LLVM_PREFIX}/lib diff --git a/devel/ocaml-camlp5/Makefile b/devel/ocaml-camlp5/Makefile index abe78306ed38..1fda9f816cd3 100644 --- a/devel/ocaml-camlp5/Makefile +++ b/devel/ocaml-camlp5/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= http://camlp5.gforge.inria.fr/distrib/src/ \ http://cristal.inria.fr/~ddr/camlp5/distrib/src/ \ http://pauillac.inria.fr/~ddr/camlp5/distrib/src/ PKGNAMEPREFIX= ocaml- -DIST_SUBDIR= ${UNIQUENAME} +DIST_SUBDIR= ${PKGBASE} PATCH_SITES= ${MASTER_SITES} diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile index cfa9e8f4c4d4..dc126082e348 100644 --- a/devel/oniguruma/Makefile +++ b/devel/oniguruma/Makefile @@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= BSDL Regular Expressions library compatible with POSIX/GNU/Perl WRKSRC= ${WRKDIR}/${PORTNAME} -NO_LATEST_LINK= yes CONFLICTS_INSTALL= oniguruma-4.* GNU_CONFIGURE= yes DOCS= HISTORY README doc/* diff --git a/devel/oniguruma4/Makefile b/devel/oniguruma4/Makefile index 87956c2a13d5..29ef741c15f1 100644 --- a/devel/oniguruma4/Makefile +++ b/devel/oniguruma4/Makefile @@ -15,7 +15,6 @@ COMMENT= BSDL Regular Expressions library compatible with POSIX/GNU/Perl LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -NO_LATEST_LINK= yes USES= libtool CONFLICTS= oniguruma-2.* GNU_CONFIGURE= yes diff --git a/devel/php-memoize/Makefile b/devel/php-memoize/Makefile index e035775d00f7..a34e7431a48c 100644 --- a/devel/php-memoize/Makefile +++ b/devel/php-memoize/Makefile @@ -1,19 +1,17 @@ # Created by: Gasol Wu <gasol.wu@gmail.com> # $FreeBSD$ -PORTNAME= memoize +PORTNAME= php-memoize PORTVERSION= 0.2.0b1 DISTVERSIONPREFIX= v PORTREVISION= 2 CATEGORIES= devel -PKGNAMEPREFIX= php- MAINTAINER= gasol.wu@gmail.com COMMENT= PHP extension which transparently caches PHP functions USE_GITHUB= yes GH_ACCOUNT= arraypad -GH_PROJECT= ${UNIQUENAME} USE_PHP= yes USE_PHPEXT= yes diff --git a/devel/py-funcparserlib/Makefile b/devel/py-funcparserlib/Makefile index 0caa5c50f30e..f947752a814c 100644 --- a/devel/py-funcparserlib/Makefile +++ b/devel/py-funcparserlib/Makefile @@ -17,7 +17,7 @@ USES= python USE_PYTHON= distutils autoplist PORTDOCS= README doc -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DOCS diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile index cf3f0c3f8471..c583120ec190 100644 --- a/devel/py-gdata/Makefile +++ b/devel/py-gdata/Makefile @@ -23,8 +23,6 @@ GMPY_DESC= Multiprecision arithmetic M2CRYPTO_DESC= Cryptography and SSL toolkit PYCRYPTO_DESC= Cryptography toolkit -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options - EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .include <bsd.port.options.mk> diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile index a36e430feb1a..331bb1dd4593 100644 --- a/devel/py-ice/Makefile +++ b/devel/py-ice/Makefile @@ -30,7 +30,6 @@ LIB_VRS= ${PORTVERSION:S|.||g:C|[0-9]$||} PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}" # bypass infrastructure bug (taken from www/py-django) -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DEBUG TESTS OPTIONS_DEFAULT=TESTS TESTS_DESC= Run tests diff --git a/devel/py-jsonrpclib/Makefile b/devel/py-jsonrpclib/Makefile index 3b617a64c763..cd761a48046c 100644 --- a/devel/py-jsonrpclib/Makefile +++ b/devel/py-jsonrpclib/Makefile @@ -16,7 +16,6 @@ LICENSE= APACHE20 USES= python:2 USE_PYTHON= distutils autoplist -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= CJSON CJSON_DESC= Use cjson instead of json or simplejson diff --git a/devel/py-memoryprofiler/Makefile b/devel/py-memoryprofiler/Makefile index 24cc034b72cf..078dfb5cc06e 100644 --- a/devel/py-memoryprofiler/Makefile +++ b/devel/py-memoryprofiler/Makefile @@ -17,8 +17,6 @@ OPTIONS_DEFINE= PSUTIL PSUTIL_DESC= Use psutil for better performance PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:${PORTSDIR}/sysutils/py-psutil -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options - USES= python USE_PYTHON= distutils autoplist diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile index 664d83c8e0c7..94c655d39e6d 100644 --- a/devel/py-qt4-qscintilla2/Makefile +++ b/devel/py-qt4-qscintilla2/Makefile @@ -28,7 +28,6 @@ QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ARGS= --pyqt PyQt4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${SIPDIR} \ diff --git a/devel/py-qt4/bsd.pyqt.mk b/devel/py-qt4/bsd.pyqt.mk index 259ac4381a26..bc3e7ddcfd4b 100644 --- a/devel/py-qt4/bsd.pyqt.mk +++ b/devel/py-qt4/bsd.pyqt.mk @@ -98,7 +98,6 @@ USES+= python QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. PATCHDIR= ${.CURDIR}/../../devel/py-qt4-core/files -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ARGS+=-b ${PREFIX}/bin \ diff --git a/devel/py-rauth/Makefile b/devel/py-rauth/Makefile index c8361c71b984..ee28723db2df 100644 --- a/devel/py-rauth/Makefile +++ b/devel/py-rauth/Makefile @@ -20,7 +20,6 @@ TEST_DEPENDS:= ${RUN_DEPENDS} \ OPTIONS_DEFINE= TESTS TESTS_DESC= Install tools for unit testing -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options USE_GITHUB= yes GH_ACCOUNT= litl diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile index 277bf511752d..327df88fcdb1 100644 --- a/devel/py-tables/Makefile +++ b/devel/py-tables/Makefile @@ -30,7 +30,6 @@ PLIST_FILES= bin/pt2to3 bin/ptdump bin/ptrepack bin/pttree OPTIONS_DEFINE= PYREX DOCS EXAMPLES PYREX_DESC= Use code generated by Pyrex to build PYREX_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options .include <bsd.port.options.mk> diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile index 87596e221b8e..77951e5c737b 100644 --- a/devel/py-twisted/Makefile +++ b/devel/py-twisted/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedCore>=${PORTVERSION}:${PORTSDIR}/deve USES= metaport python:2 # Bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= CONCH LORE MAIL NAMES NEWS PAIR RUNNER WEB WORDS OPTIONS_DEFAULT=CONCH LORE MAIL NAMES NEWS PAIR RUNNER WEB WORDS CONCH_DESC= SSH and SFTP protocol diff --git a/devel/py-urwid/Makefile b/devel/py-urwid/Makefile index 2bcda12b66d3..1caaad0e8ca5 100644 --- a/devel/py-urwid/Makefile +++ b/devel/py-urwid/Makefile @@ -12,8 +12,6 @@ COMMENT= Curses-based user interface library for Python LICENSE= LGPL21 -# Bypass ports infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= EXAMPLES USES= python diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile index 1850cedd2f6f..40aeb476eed7 100644 --- a/devel/py-watchdog/Makefile +++ b/devel/py-watchdog/Makefile @@ -22,7 +22,6 @@ DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} GH_ACCOUNT= gorakhargosh -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS PORTDOCS= * diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile index ab2452d226ec..5eed7f8e6e3a 100644 --- a/devel/py-wheel/Makefile +++ b/devel/py-wheel/Makefile @@ -14,7 +14,6 @@ COMMENT= Built-package format for Python LICENSE= MIT OPTIONS_DEFINE= PIP SIGNATURE -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options PIP_DESC= Use pip to install wheels PIP_RUN_DEPENDS= pip:${PORTSDIR}/devel/py-pip diff --git a/devel/ruby-langscan/Makefile b/devel/ruby-langscan/Makefile index 085fb203633e..425dc9c8f4e9 100644 --- a/devel/ruby-langscan/Makefile +++ b/devel/ruby-langscan/Makefile @@ -30,7 +30,6 @@ PORTDOCS= ChangeLog NEWS README DOCSDIR= ${RUBY_MODDOCDIR} OPTIONS_DEFINE= DOCS -OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options CFLAGS+= -fPIC diff --git a/devel/rubygem-app_config/Makefile b/devel/rubygem-app_config/Makefile index 24e174639a0c..454a62fb50de 100644 --- a/devel/rubygem-app_config/Makefile +++ b/devel/rubygem-app_config/Makefile @@ -15,7 +15,6 @@ OPTIONS_DEFAULT= SQLITE3 MONGO_DESC= mongo backend support SQLITE3_DESC= sqlite3 backend support -OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options .include <bsd.port.options.mk> diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile index 6702d84baa18..6b3676c28dd4 100644 --- a/devel/subcommander2/Makefile +++ b/devel/subcommander2/Makefile @@ -16,7 +16,6 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libsvn_client-1.so:${PORTSDIR}/devel/subversion -LATEST_LINK= subcommander2 CONFLICTS= subcommander-1.* WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S,.b,b,}p${PORTVERSION:E} diff --git a/devel/subversion-static/Makefile b/devel/subversion-static/Makefile index 9250f442f307..891b799cbea1 100644 --- a/devel/subversion-static/Makefile +++ b/devel/subversion-static/Makefile @@ -3,7 +3,6 @@ PKGNAMESUFFIX= -static CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} OPTIONS_EXCLUDE= ${OPTIONS_DEFINE} OPTIONS_SLAVE= FREEBSD_TEMPLATE P4_STYLE_MARKERS SERF STATIC diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 4fc34b3861ad..648b980e4352 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -28,7 +28,6 @@ CONFIGURE_ARGS+= --without-swig \ .if defined(SVN_BUILD_ADDONS) CONFLICTS_BUILD+= ${PORTNAME}-1.[^8].[0-9]* LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion -OPTIONSFILE= ${PORT_DBDIR}/subversion/options OPTIONS_NAME= devel_subversion .endif diff --git a/devel/subversion17/Makefile.common b/devel/subversion17/Makefile.common index 829b582ed302..7de904f74ce5 100644 --- a/devel/subversion17/Makefile.common +++ b/devel/subversion17/Makefile.common @@ -31,7 +31,6 @@ CONFIGURE_ARGS+= --without-swig \ .if defined(SVN_BUILD_BINDINGS) CONFLICTS_BUILD+= ${PORTNAME}-1.[^7].[0-9]* LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion17 -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_NAME= devel_subversion17 .endif diff --git a/dns/samba-nsupdate/Makefile b/dns/samba-nsupdate/Makefile index d2edf9533395..5acac16218b6 100644 --- a/dns/samba-nsupdate/Makefile +++ b/dns/samba-nsupdate/Makefile @@ -41,8 +41,8 @@ OPTIONS_DEFINE= IPV6 SIGCHASE_CONFIGURE_ARGS+= STD_CDEFINES="-DDIG_SIGCHASE=1" IPV6_CONFIGURE_ON= --enable-ipv6 -PLIST_FILES= bin/${UNIQUENAME} \ - man/man1/${UNIQUENAME}.1.gz +PLIST_FILES= bin/${PKGBASE} \ + man/man1/${PKGBASE}.1.gz .include <bsd.port.pre.mk> @@ -76,11 +76,11 @@ post-patch: -e 's|^.*check confgen ||' \ ${WRKSRC}/bin/Makefile.in @${REINPLACE_CMD} \ - -e 's|${PORTNAME}|${UNIQUENAME}|g' \ + -e 's|${PORTNAME}|${PKGBASE}|g' \ ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 do-install: - ${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${UNIQUENAME}.1 - ${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${UNIQUENAME} + ${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1 + ${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGBASE} .include <bsd.port.post.mk> diff --git a/editors/2bsd-vi/Makefile b/editors/2bsd-vi/Makefile index 73aa44fa5ca7..fbd6f6e7c7f6 100644 --- a/editors/2bsd-vi/Makefile +++ b/editors/2bsd-vi/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= tar:bzip2 -PRESERVEDIR= /var/preserve/${UNIQUENAME} +PRESERVEDIR= /var/preserve/${PKGBASE} PLIST_SUB= PRESERVEDIR="${PRESERVEDIR}" post-extract: .SILENT diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile index 6e4171443311..7b15c768cf97 100644 --- a/editors/emacs-nox11/Makefile +++ b/editors/emacs-nox11/Makefile @@ -10,6 +10,5 @@ OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \ EMACS_NO_X11_SLAVE= yes MASTERDIR= ${.CURDIR}/../emacs -LATEST_LINK= emacs-nox11 .include "${MASTERDIR}/Makefile" diff --git a/editors/libreoffice-i18n/Makefile b/editors/libreoffice-i18n/Makefile index 8bc63965818b..0cae59c28017 100644 --- a/editors/libreoffice-i18n/Makefile +++ b/editors/libreoffice-i18n/Makefile @@ -2,7 +2,6 @@ .include "${.CURDIR}/../libreoffice/Makefile.common" PORTREVISION= 0 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PKGNAMESUFFIX= -i18n DISTFILES= #none MASTER_SITES= #none diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 59c345b0a42f..3e8ec17aff51 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -111,8 +111,6 @@ AOOUDIR= .openoffice.org\/${AOOVERSION1} INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} EXECBASE?= openoffice-${AOOSUFFIX} -NO_LATEST_LINK= yes - ONLY_FOR_ARCHS= i386 amd64 USE_GL= gl glu diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 876638ffcc8c..538019a063d0 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -123,8 +123,6 @@ AOOUDIR= .openoffice.org\/${AOOVERSION1} INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} EXECBASE?= openoffice-${AOOSUFFIX} -NO_LATEST_LINK= yes - ONLY_FOR_ARCHS= i386 amd64 USE_GL= gl glu diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile index e7240cef0c0b..1e8f3c02de7d 100644 --- a/emulators/generator-cbiere/Makefile +++ b/emulators/generator-cbiere/Makefile @@ -19,14 +19,14 @@ USES= gmake jpeg tar:bzip2 USE_GNOME= gtk12 USE_SDL= sdl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${UNIQUENAME}/ \ +CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${PORTNAME}/ \ --with-gtk MAKE_JOBS_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -PLIST_FILES= bin/${UNIQUENAME}-gtk +PLIST_FILES= bin/${PORTNAME}-gtk OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL OPTIONS_DEFINE_i386= RAZE diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index 8da6f49a53c4..53f9eabf30bc 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -28,7 +28,7 @@ CONFLICTS_INSTALL?= wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \ EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ - --exclude libdata/ldconfig32/${UNIQUENAME} \ + --exclude libdata/ldconfig32/${PKGNAMEPREFIX}${PORTNAME} \ -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/i386-wine/Makefile.inc b/emulators/i386-wine/Makefile.inc index 82aa02cb180e..6e429a901b38 100644 --- a/emulators/i386-wine/Makefile.inc +++ b/emulators/i386-wine/Makefile.inc @@ -28,7 +28,7 @@ CONFLICTS_INSTALL?= wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \ EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ - --exclude libdata/ldconfig32/${UNIQUENAME} \ + --exclude libdata/ldconfig32/${PKGNAMEPREFIX}-${PORTNAME} \ -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile index 498ae3189493..d48d0a48179d 100644 --- a/emulators/linux_base-c6/Makefile +++ b/emulators/linux_base-c6/Makefile @@ -175,7 +175,6 @@ FALLBACK_ELF_MIB= kern.fallback_elf_brand .if (${ARCH} == "amd64") . if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} != "c6_64" -LATEST_LINK:= ${PKGBASE:C/linux/linux32/} ARCH= i386 . endif .endif diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile index 8915809c6cec..22454de93b55 100644 --- a/emulators/linux_base-f10/Makefile +++ b/emulators/linux_base-f10/Makefile @@ -146,7 +146,6 @@ FALLBACK_ELF_MIB= kern.fallback_elf_brand .endif .if (${ARCH} == "amd64") -LATEST_LINK:= ${PKGBASE:C/linux/linux32/} ARCH= i386 .endif diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile index 5414931e8568..5b6682bc2316 100644 --- a/emulators/mupen64plus-core/Makefile +++ b/emulators/mupen64plus-core/Makefile @@ -24,7 +24,6 @@ ONLY_FOR_ARCHS= i386 amd64 OPTFLAGS= # MAKE_ENV+= OPTFLAGS="${OPTFLAGS}" -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options .include "${.CURDIR}/../mupen64plus-core/Makefile.common" .include <bsd.port.mk> diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 6992d2e36306..e982b6a41ece 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -22,7 +22,6 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxguest vboxservice diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index 789dcad63bd2..ae30d444bd16 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -22,7 +22,6 @@ CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox USES= cpe kmod tar:bzip2 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxnet diff --git a/finance/ledgersmb12/Makefile b/finance/ledgersmb12/Makefile index 50b4622c67de..a121fe523507 100644 --- a/finance/ledgersmb12/Makefile +++ b/finance/ledgersmb12/Makefile @@ -15,8 +15,6 @@ BUILD_DEPENDS= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \ p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std RUN_DEPENDS:= ${BUILD_DEPENDS} -LATEST_LINK= ledgersmb12 - WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes NO_ARCH= yes diff --git a/ftp/curl-hiphop/Makefile b/ftp/curl-hiphop/Makefile index 1ee9655e78ac..e774a60beba8 100644 --- a/ftp/curl-hiphop/Makefile +++ b/ftp/curl-hiphop/Makefile @@ -15,7 +15,6 @@ EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-hiphop GNU_CONFIGURE_PREFIX= ${PREFIX}/${HIPHOP_DIR}/ext CONFIGURE_ARGS+= --disable-shared --enable-static PLIST_SUB+= HIPHOP_DIR="${HIPHOP_DIR}" -LATEST_LINK= curl-hiphop PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr diff --git a/ftp/proftpd-mod_geoip/Makefile b/ftp/proftpd-mod_geoip/Makefile index 3033e60192c8..c721531d9fd1 100644 --- a/ftp/proftpd-mod_geoip/Makefile +++ b/ftp/proftpd-mod_geoip/Makefile @@ -14,7 +14,6 @@ LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd INCLUDEDIRS= ${LOCALBASE}/include diff --git a/ftp/py-pyftpdlib/Makefile b/ftp/py-pyftpdlib/Makefile index fef29f7ceed5..135e6a2a3b5d 100644 --- a/ftp/py-pyftpdlib/Makefile +++ b/ftp/py-pyftpdlib/Makefile @@ -21,9 +21,6 @@ OPTIONS_DEFAULT= SENDFILE OPENSSL SENDFILE_DESC= Enable sendfile(2) support OPENSSL_DESC= Enable FTP over SSL/TLS (RFC4217) -# Workaround ports infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - SENDFILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysendfile>0:${PORTSDIR}/net/py-pysendfile OPENSSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl diff --git a/games/doom-data/Makefile b/games/doom-data/Makefile index bd78d4b36311..8022fa1762f0 100644 --- a/games/doom-data/Makefile +++ b/games/doom-data/Makefile @@ -28,7 +28,6 @@ STRIFE_DESC= Install Strife shareware data SUB_FILES= pkg-message -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${DMDIR} DOOM_DISTFILES= doom1.wad.bz2 diff --git a/games/ioquake3-devel-server/Makefile b/games/ioquake3-devel-server/Makefile index 894b994d48a1..d06495ee799c 100644 --- a/games/ioquake3-devel-server/Makefile +++ b/games/ioquake3-devel-server/Makefile @@ -7,7 +7,6 @@ PKGNAMESUFFIX= -server MAINTAINER= kamikaze@bsdforen.de COMMENT= Ioquake3 development snapshot dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER GAMELIBS diff --git a/games/ioquake3-server/Makefile b/games/ioquake3-server/Makefile index 157753675370..f1b6f93d2b4b 100644 --- a/games/ioquake3-server/Makefile +++ b/games/ioquake3-server/Makefile @@ -7,7 +7,6 @@ PKGNAMESUFFIX= -server MAINTAINER= kamikaze@bsdforen.de COMMENT= Ioquake3 dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER GAMELIBS diff --git a/games/iourbanterror-server/Makefile b/games/iourbanterror-server/Makefile index 51a1eb2d1a2b..3ecc83653902 100644 --- a/games/iourbanterror-server/Makefile +++ b/games/iourbanterror-server/Makefile @@ -7,7 +7,6 @@ PKGNAMESUFFIX= -server MAINTAINER= kamikaze@bsdforen.de COMMENT= Urban Terror dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile index 5563c6bdd9aa..a60eb0f28405 100644 --- a/games/linux-quake3/Makefile +++ b/games/linux-quake3/Makefile @@ -35,7 +35,6 @@ PUNKBUSTER_DESC= Install PunkBuster SMP_DESC= Install SMP (threaded) client PLIST_SUB+= LIBDIR="libexec/${PKGNAMEPREFIX}${PORTNAME}" -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} LIBDIR= ${PREFIX}/libexec/${PKGNAMEPREFIX}${PORTNAME} Q3DATAFILE= linuxq3apoint-1.32b-3.x86.run diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile index 019ae6790276..68c585f04b51 100644 --- a/games/nethack33/Makefile +++ b/games/nethack33/Makefile @@ -12,7 +12,6 @@ MAINTAINER= glewis@FreeBSD.org COMMENT= Dungeon explorin', slashin', hackin' game WRKSRC= ${WRKDIR}/${TRUEPORTNAME}-${PORTVERSION} -LATEST_LINK= ${TRUEPORTNAME}33${PKGNAMESUFFIX} USES= gmake tar:tgz MAKE_ENV= GRAPHICS="${GRAPHICS}" diff --git a/games/openarena-server/Makefile b/games/openarena-server/Makefile index f2c5baa89550..9c8c5a3b2319 100644 --- a/games/openarena-server/Makefile +++ b/games/openarena-server/Makefile @@ -7,7 +7,6 @@ PKGNAMESUFFIX= -server MAINTAINER= kamikaze@bsdforen.de COMMENT= OpenArena dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER diff --git a/games/opengfx/Makefile b/games/opengfx/Makefile index 0babdc57b931..3bee7aa19933 100644 --- a/games/opengfx/Makefile +++ b/games/opengfx/Makefile @@ -16,7 +16,6 @@ LICENSE= GPLv2 USES= zip NO_BUILD= yes -LATEST_LINK= openttd-${PORTNAME} # upstream zipped a tar file, unpack it. post-extract: diff --git a/games/opensfx/Makefile b/games/opensfx/Makefile index 6b599a60cd40..a4c15b3b603b 100644 --- a/games/opensfx/Makefile +++ b/games/opensfx/Makefile @@ -20,7 +20,6 @@ LICENSE_PERMS= auto-accept USES= zip NO_BUILD= yes -LATEST_LINK= openttd-${PORTNAME} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/openttd/baseset/opensfx diff --git a/games/quake-source/Makefile b/games/quake-source/Makefile index fa5c9d98ace6..dee28e5eb6f9 100644 --- a/games/quake-source/Makefile +++ b/games/quake-source/Makefile @@ -16,8 +16,6 @@ COMMENT= Quake game source code NO_BUILD= yes NO_WRKSUBDIR= yes -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} - OPTIONS_DEFINE= QUAKEWORLD OPTIONS_DEFAULT= QUAKEWORLD diff --git a/games/quake2-3zb2/Makefile b/games/quake2-3zb2/Makefile index b5f68a6cab32..87344c5399a8 100644 --- a/games/quake2-3zb2/Makefile +++ b/games/quake2-3zb2/Makefile @@ -21,7 +21,7 @@ DOS2UNIX_FILES= *.[ch] NO_WRKSUBDIR= yes SUB_FILES= pkg-message -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= ROUTES DOCS OPTIONS_DEFAULT= ROUTES diff --git a/games/quake2-ctf/Makefile b/games/quake2-ctf/Makefile index 623da296713a..97515a823d7f 100644 --- a/games/quake2-ctf/Makefile +++ b/games/quake2-ctf/Makefile @@ -17,8 +17,7 @@ USES= dos2unix zip:infozip DOS2UNIX_FILES= ../../../ctf/readme.txt ../../../ctf/server.cfg WRKSRC= ${WRKDIR}/${CTF_SRC:S/.tar.gz//}/src/ctf -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} CTF_DATA= q2ctf150.zip CTF_SRC= quake2-r0.16.2.tar.gz diff --git a/games/quake2-data/Makefile b/games/quake2-data/Makefile index d90f2b6b0297..907a12852171 100644 --- a/games/quake2-data/Makefile +++ b/games/quake2-data/Makefile @@ -16,9 +16,8 @@ COMMENT= Quake II data files USES= zip:infozip NO_WRKSUBDIR= yes -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${Q2DIR} -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} Q2_DEMO= q2-314-demo-x86.exe Q2_SRC= q2src${PORTVERSION:S|.||}.shar.Z diff --git a/games/quake2-extras/Makefile b/games/quake2-extras/Makefile index b47ff12b3418..edfffa9aaf3c 100644 --- a/games/quake2-extras/Makefile +++ b/games/quake2-extras/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://offload1.icculus.org/quake2/files/:retex \ http://www-personal.umich.edu/~jimw/q2/aq2_install/:models PKGNAMEPREFIX= ${Q2PKGNAMEPREFIX} DISTFILES= # -DIST_SUBDIR= ${LATEST_LINK} +DIST_SUBDIR= ${PKGBASE} EXTRACT_ONLY= # MAINTAINER= danfe@FreeBSD.org @@ -19,8 +19,6 @@ COMMENT= Quake II extras (high quality textures and skins) USES= zip NO_WRKSUBDIR= yes -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} - RETEX_PAKS= 10 11 12 13 14 16 17 19 RETEX_FULL= all_q2_textures_07_17_2006zip SKINS= models.zip diff --git a/games/quake2-lights/Makefile b/games/quake2-lights/Makefile index de8f6db6a4f0..95e713945927 100644 --- a/games/quake2-lights/Makefile +++ b/games/quake2-lights/Makefile @@ -19,7 +19,7 @@ NO_WRKSUBDIR= yes BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}/src ALL_TARGET= release -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DOCS diff --git a/games/quake2-matrix/Makefile b/games/quake2-matrix/Makefile index 8abba9ef4f96..bfdc416ab2c7 100644 --- a/games/quake2-matrix/Makefile +++ b/games/quake2-matrix/Makefile @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/MatrixFixSource ALL_TARGET= release -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DOCS diff --git a/games/quake2-psychomod/Makefile b/games/quake2-psychomod/Makefile index 3e93f1d5d9e0..15fed79654b6 100644 --- a/games/quake2-psychomod/Makefile +++ b/games/quake2-psychomod/Makefile @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= release -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DOCS diff --git a/games/quake2-source/Makefile b/games/quake2-source/Makefile index 037fb918de68..951496e2b0b9 100644 --- a/games/quake2-source/Makefile +++ b/games/quake2-source/Makefile @@ -25,8 +25,6 @@ XATRIX_DESC= Reckoning (Xatrix) mission pack source OPTIONS_SUB= yes -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} - DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME} .include <bsd.port.options.mk> diff --git a/games/quake2-zaero/Makefile b/games/quake2-zaero/Makefile index d2c1662cef17..06902ef39ca3 100644 --- a/games/quake2-zaero/Makefile +++ b/games/quake2-zaero/Makefile @@ -17,7 +17,7 @@ USES= dos2unix zip DOS2UNIX_FILES= *.[ch] NO_WRKSUBDIR= yes -DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DEMO DM_MAPS DOCS OPTIONS_SUB= yes diff --git a/games/tuxpaint-fonts/Makefile b/games/tuxpaint-fonts/Makefile index ce23d06a591c..591f18051da8 100644 --- a/games/tuxpaint-fonts/Makefile +++ b/games/tuxpaint-fonts/Makefile @@ -42,9 +42,6 @@ ${l:tu}_DESC= ${l:S/_/ /} fonts MASTER_SITES+= SF/${PORTNAME}/${PORTNAME}-fonts/${${l:tu}_DISTNAME}:${l:tu} .endfor -# Do not use the same OPTIONS directory as "games/tuxpaint". -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - .include <bsd.port.options.mk> # Set DISTFILES and PLIST_FILES according to OPTIONS. diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile index 14022a43520b..d3109537c71f 100644 --- a/games/xpilot-ng-server/Makefile +++ b/games/xpilot-ng-server/Makefile @@ -23,8 +23,6 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --program-prefix="" -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - PKGFILESUFFIX= ${PKGNAMESUFFIX:S/-/./} DESCR= ${PKGDIR}/pkg-descr${PKGFILESUFFIX} PLIST= ${PKGDIR}/pkg-plist${PKGFILESUFFIX} diff --git a/graphics/frei0r-plugins/Makefile b/graphics/frei0r-plugins/Makefile index ab127fa94f02..56b75f76d4eb 100644 --- a/graphics/frei0r-plugins/Makefile +++ b/graphics/frei0r-plugins/Makefile @@ -8,9 +8,6 @@ EXTRACT_ONLY= # empty COMMENT= Frei0r meta-port -# Required in order to avoid conflicts with graphics/frei0r's OPTIONS. -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - RUN_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r MASTERDIR= ${.CURDIR}/../frei0r diff --git a/graphics/jgraph/Makefile b/graphics/jgraph/Makefile index d7174dd4f8a8..30c54f248171 100644 --- a/graphics/jgraph/Makefile +++ b/graphics/jgraph/Makefile @@ -11,7 +11,6 @@ DISTFILES= ${PORTNAME}.shar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Generates postscript graphs -NO_LATEST_LINK= yes EXTRACT_CMD= uncompress EXTRACT_BEFORE_ARGS= -c EXTRACT_AFTER_ARGS= | ${SH} diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile index 84507f4d28d3..6a5d701aaa71 100644 --- a/graphics/libgnomecanvasmm26/Makefile +++ b/graphics/libgnomecanvasmm26/Makefile @@ -15,8 +15,6 @@ COMMENT= C++ wrapper for libgnomecanvas library LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -LATEST_LINK= libgnomecanvasmm26 - USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2 USE_GNOME= libgnomecanvas GNU_CONFIGURE= yes diff --git a/graphics/py-aafigure/Makefile b/graphics/py-aafigure/Makefile index ff7e741f1b8a..837e777ce576 100644 --- a/graphics/py-aafigure/Makefile +++ b/graphics/py-aafigure/Makefile @@ -19,8 +19,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \ USES= python USE_PYTHON= distutils autoplist -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} PORTDOCS= README.txt PORTEXAMPLES= * diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile index 5d475bc0e8ad..038da04c09cd 100644 --- a/graphics/py-actdiag/Makefile +++ b/graphics/py-actdiag/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \ USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= README.rst OPTIONS_DEFINE= DOCS diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile index 076a5274438e..57186a2e2b2b 100644 --- a/graphics/py-blockdiag/Makefile +++ b/graphics/py-blockdiag/Makefile @@ -17,8 +17,6 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \ ${PKGNAMEPREFIX}funcparserlib>=0.3.6:${PORTSDIR}/devel/py-funcparserlib \ ${PKGNAMEPREFIX}webcolors>=0:${PORTSDIR}/graphics/py-webcolors -UNIQUENAME= py-${PORTNAME} - USES= python USE_PYTHON= autoplist distutils diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile index e4dfed9e4aad..79adbd76fade 100644 --- a/graphics/py-imaging/Makefile +++ b/graphics/py-imaging/Makefile @@ -16,8 +16,6 @@ COMMENT= The Python Imaging Library LIB_DEPENDS= liblcms.so:${PORTSDIR}/graphics/lcms \ libfreetype.so:${PORTSDIR}/print/freetype2 -UNIQUENAME= py-${PORTNAME} - USES= jpeg python DIST_SUBDIR= python USE_PYTHON= distutils autoplist concurrent diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile index d849d674dc7b..95ffafa7c37f 100644 --- a/graphics/py-nwdiag/Makefile +++ b/graphics/py-nwdiag/Makefile @@ -20,8 +20,8 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \ USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} PORTDOCS= README.rst PORTEXAMPLES= * diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index ac030c4da688..54c87f17f497 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -19,7 +19,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= TKINTER OPTIONS_DEFAULT= TKINTER TKINTER_DESC= Build with tkinter for X support -OPTIONSFILE?= ${PORT_DBDIR}/${PORTNAME}/options USES= dos2unix python USE_GL= glut diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile index b0f701a6c4d7..8875d42a0067 100644 --- a/graphics/py-seqdiag/Makefile +++ b/graphics/py-seqdiag/Makefile @@ -20,8 +20,8 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \ USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} PORTDOCS= README.rst PORTEXAMPLES= * diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile index 82eb79a5b4eb..fa4b2d314cea 100644 --- a/graphics/py-sorl-thumbnail/Makefile +++ b/graphics/py-sorl-thumbnail/Makefile @@ -20,7 +20,6 @@ USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DJANGO PDF WORD DJANGO_DESC= Enable Django PDF_DESC= PDF Thumbnails diff --git a/graphics/py-webcolors/Makefile b/graphics/py-webcolors/Makefile index 8e1faeae81ce..324d03687f4d 100644 --- a/graphics/py-webcolors/Makefile +++ b/graphics/py-webcolors/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE USES= python USE_PYTHON= distutils autoplist -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= README OPTIONS_DEFINE= DOCS diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile index 6fb643daca2e..54895a8862e7 100644 --- a/graphics/quat-gui/Makefile +++ b/graphics/quat-gui/Makefile @@ -18,8 +18,6 @@ LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - USE_XORG= xext USE_GL= gl glut GNU_CONFIGURE= yes @@ -29,7 +27,7 @@ CONFIGURE_ARGS= --datadir=${PREFIX}/share/doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= * PLIST_FILES= bin/quat @@ -51,7 +49,7 @@ post-patch: ${WRKSRC}/gui/Makefile.in @${REINPLACE_CMD} -e \ 's|<FL/fl_file_chooser.H>|<FL/Fl_File_Chooser.H>| ; \ - s|/doc/quat/|/doc/${UNIQUENAME}/|' \ + s|/doc/quat/|/doc/${PKGBASE}/|' \ ${WRKSRC}/gui/MainWindow.cxx # disable data file installation since distfile does not do # The Right Thing(TM) @@ -60,7 +58,7 @@ post-patch: s|^(SUBDIRS.*)doc|\1|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ - 's|@PACKAGE@|${UNIQUENAME}|' \ + 's|@PACKAGE@|${PKGBASE}|' \ ${WRKSRC}/doc/Makefile.in post-install: diff --git a/irc/py-gozerbot/Makefile b/irc/py-gozerbot/Makefile index 82d366e3da1a..3a4efae53b15 100644 --- a/irc/py-gozerbot/Makefile +++ b/irc/py-gozerbot/Makefile @@ -19,7 +19,6 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= XMPP MYSQL DOCS XMPP_DESC= Jabber functions MYSQL_DESC= Mysql functions -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options RUN_DEPENDS+= ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg diff --git a/japanese/p5-MeCab/Makefile b/japanese/p5-MeCab/Makefile index a2c15dbc3cdf..9a999f8f263c 100644 --- a/japanese/p5-MeCab/Makefile +++ b/japanese/p5-MeCab/Makefile @@ -21,7 +21,6 @@ USES= perl5 USE_PERL5= configure OPTIONS_DEFINE= EXAMPLES -OPTIONSFILE= ${PORT_DBDIR}/ja-p5-${PORTNAME}/options .include <bsd.port.pre.mk> diff --git a/japanese/ruby-mecab/Makefile b/japanese/ruby-mecab/Makefile index 6d5331b628b4..010202d347dd 100644 --- a/japanese/ruby-mecab/Makefile +++ b/japanese/ruby-mecab/Makefile @@ -22,7 +22,6 @@ USE_RUBY_EXTCONF= yes INSTALL_TARGET= site-install OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONSFILE= ${PORT_DBDIR}/ja-ruby-${PORTNAME}/options .include <bsd.port.pre.mk> diff --git a/java/netty/Makefile b/java/netty/Makefile index 0f6fc251856a..354c6ffe5ecc 100644 --- a/java/netty/Makefile +++ b/java/netty/Makefile @@ -17,8 +17,8 @@ USES= cpe tar:bzip2 CPE_VENDOR= netty_project JAVA_VERSION= 1.6+ NO_BUILD= yes -DATADIR= ${PREFIX}/share/${UNIQUENAME} -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DATADIR= ${PREFIX}/share/${PKGBASE} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.Final PLIST_FILES= %%JAVAJARDIR%%/netty-${PORTVERSION}.jar \ diff --git a/java/openjdk6-jre/Makefile b/java/openjdk6-jre/Makefile index 65624f4bb35c..5bc91065cad7 100644 --- a/java/openjdk6-jre/Makefile +++ b/java/openjdk6-jre/Makefile @@ -7,6 +7,5 @@ COMMENT= Oracle's Java 6 Runtime Environment under the GPL v2 BUILD_JRE= yes MASTERDIR= ${.CURDIR}/../openjdk6 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} .include "${MASTERDIR}/Makefile" diff --git a/java/openjdk7-jre/Makefile b/java/openjdk7-jre/Makefile index 52c032962a83..e52fd2626ccb 100644 --- a/java/openjdk7-jre/Makefile +++ b/java/openjdk7-jre/Makefile @@ -5,8 +5,6 @@ PKGNAMESUFFIX= -jre MAINTAINER= java@FreeBSD.org COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION} -LATEST_LINK= openjdk7${PKGNAMESUFFIX} - BUILD_JRE= yes MASTERDIR= ${.CURDIR}/../openjdk7 diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 8958bbec6e24..9d9cde9f5c50 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -58,8 +58,6 @@ JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src- ANT_VERSION= 1.9.4 ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin -LATEST_LINK?= openjdk7 - LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile index 91b4010181f0..6daa31f39763 100644 --- a/lang/fpc-units/Makefile +++ b/lang/fpc-units/Makefile @@ -96,8 +96,6 @@ X11_DESC= Interface to X windows server XFORMS_DESC= Interface to X-Forms ZLIB_DESC= Interface to the zlib compression library -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} - OPTIONS_DEFAULT=A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \ FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JS FCL-JSON FCL-NET FCL-PASSRC \ FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPINDEXER \ diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index 001fbc1603e6..2edffbfe9e46 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -26,8 +26,6 @@ USES= gmake iconv ONLY_FOR_ARCHS= i386 amd64 BOOTVER= 2.6.4 -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options - OPT?=-CX FPCSRCDIR= ${PORTNAME}-${PORTVERSION} diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index afb8010eb55b..aefa5579291e 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -26,7 +26,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif CPE_VENDOR= gnu -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index 76b1cdff436a..7db86eab7d8b 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -27,7 +27,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CONFLICTS= gcc-4.7.* CPE_VENDOR= gnu -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index f92da2e06ab0..2739fb9c12c8 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -26,7 +26,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CONFLICTS= gcc-4.8.* CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile index fe96f092bc4b..d1dd3c13cf51 100644 --- a/lang/gcc49/Makefile +++ b/lang/gcc49/Makefile @@ -25,7 +25,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of diff --git a/lang/gcc5-devel/Makefile b/lang/gcc5-devel/Makefile index 545b41815264..95aeb72b434e 100644 --- a/lang/gcc5-devel/Makefile +++ b/lang/gcc5-devel/Makefile @@ -25,7 +25,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile index 58c283c985cf..e18894e4836d 100644 --- a/lang/gcc5/Makefile +++ b/lang/gcc5/Makefile @@ -26,7 +26,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile index 872e9b01c603..656f59226b30 100644 --- a/lang/gcc6-devel/Makefile +++ b/lang/gcc6-devel/Makefile @@ -25,7 +25,6 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 24285244b191..c7a7c0055c84 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -13,8 +13,6 @@ COMMENT= PHP Scripting Language LICENSE= PHP301 -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - USES= tar:bzip2 cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes diff --git a/lang/php55/Makefile b/lang/php55/Makefile index 93fda0c6da4e..7ad85e7faffe 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -13,8 +13,6 @@ COMMENT= PHP Scripting Language LICENSE= PHP301 -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - USES= tar:bzip2 cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes diff --git a/lang/php56/Makefile b/lang/php56/Makefile index 0cf588747e0d..3ad1495c2bee 100644 --- a/lang/php56/Makefile +++ b/lang/php56/Makefile @@ -13,8 +13,6 @@ COMMENT= PHP Scripting Language LICENSE= PHP301 -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - USES= tar:bzip2 cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile index c5409cadbf3a..b7123a54901b 100644 --- a/lang/py-mx-base/Makefile +++ b/lang/py-mx-base/Makefile @@ -21,7 +21,6 @@ USE_PYTHON= distutils PYDISTUTILS_PKGNAME= egenix-mx-base PLIST_FILES= %%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}-nspkg.pth -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= DOCS ZOPE EXAMPLES ZOPE_USES= zope diff --git a/lang/ruby20/Makefile b/lang/ruby20/Makefile index fafe9df09214..a641622b4eea 100644 --- a/lang/ruby20/Makefile +++ b/lang/ruby20/Makefile @@ -45,8 +45,6 @@ USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes -NO_LATEST_LINK= yes - OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES RDOC OPTIONS_DEFAULT= RDOC LIBEDIT OPTIONS_SINGLE= EDIT diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile index 4faab73c62d5..483e500c6381 100644 --- a/lang/ruby21/Makefile +++ b/lang/ruby21/Makefile @@ -44,7 +44,6 @@ RUBY_VER= 2.1 USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes -NO_LATEST_LINK= yes OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES RDOC OPTIONS_DEFAULT= RDOC LIBEDIT diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile index 140f55029467..49b92f468746 100644 --- a/lang/ruby22/Makefile +++ b/lang/ruby22/Makefile @@ -44,7 +44,6 @@ RUBY_VER= 2.2 USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes -NO_LATEST_LINK= yes OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES RDOC OPTIONS_DEFAULT= RDOC LIBEDIT diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index f62e3c9a50d9..742f602ccfd1 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TCL_VER= 8.4 SHORT_TCL_VER= ${TCL_VER:S/8./8/} -MAN_SUFFIX= ${LATEST_LINK} +MAN_SUFFIX= ${PKGBASE} MAKE_ENV= SHORT_TCL_VER="${SHORT_TCL_VER}" \ MAN_SUFFIX=.${MAN_SUFFIX} \ diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile index 6697ee76e0ad..9a5839ea31b5 100644 --- a/lang/tcl86/Makefile +++ b/lang/tcl86/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TCL_VER= ${PORTVERSION:R} SHORT_TCL_VER= ${TCL_VER:S/.//} -MAN_SUFFIX= ${LATEST_LINK} +MAN_SUFFIX= ${PKGBASE} MAKE_ENV= SHORT_TCL_VER=${SHORT_TCL_VER} \ MAN_SUFFIX=.${MAN_SUFFIX} \ diff --git a/mail/addresses-goodies/Makefile b/mail/addresses-goodies/Makefile index e3a5d9279162..fc9b1170434e 100644 --- a/mail/addresses-goodies/Makefile +++ b/mail/addresses-goodies/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= libInspector.so:${PORTSDIR}/deskutils/gworkspace \ libAddresses.so:${PORTSDIR}/mail/addresses USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/Addresses-${PORTVERSION}/Goodies post-patch: diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile index 0d1abb94c201..5da8a5c9a9b9 100644 --- a/mail/p5-IMAP-Admin/Makefile +++ b/mail/p5-IMAP-Admin/Makefile @@ -14,7 +14,7 @@ COMMENT= Perl module for basic IMAP server administration USES= perl5 USE_PERL5= configure -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} OPTIONS_DEFINE= EXAMPLES diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile index 6a6665f67c25..9469526f49da 100644 --- a/mail/popa3d/Makefile +++ b/mail/popa3d/Makefile @@ -14,7 +14,6 @@ COMMENT= Secure, performance, tiny POP3 daemon ALL_TARGET= popa3d PLIST= ${WRKDIR}/.PLIST.more CFLAGS+= -DPREFIX=${PREFIX} -UNIQUENAME= ${.CURDIR:T} OPTIONS_DEFINE= SMTP_AFTER_POP3 STANDALONE_POP3 SETPROCTITLE DOCS NO_OPTIONS_SORT=yes diff --git a/mail/postfix-policyd-spf-python/Makefile b/mail/postfix-policyd-spf-python/Makefile index a0d94960fd64..928e39928f61 100644 --- a/mail/postfix-policyd-spf-python/Makefile +++ b/mail/postfix-policyd-spf-python/Makefile @@ -33,7 +33,6 @@ SUB_FILES= pkg-message SUB_LIST= PYTHON_CMD=${PYTHON_CMD} OPTIONS_DEFINE= DOCS -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options post-patch: @${MV} ${WRKSRC}/policyd-spf.conf ${WRKSRC}/policyd-spf.conf.sample diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile index 2cae97036bbf..8ecbfd789025 100644 --- a/mail/qmail-ldap/Makefile +++ b/mail/qmail-ldap/Makefile @@ -26,6 +26,5 @@ LDAP_PATCH_DATE= 20120221 MASTERDIR= ${.CURDIR}/../qmail DESCR= ${.CURDIR}/pkg-descr PATCHDIR= ${.CURDIR}/files -LATEST_LINK= ${PORTNAME}-ldap .include "${MASTERDIR}/Makefile" diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile index bd6d2c3842c5..5f3a6e91ea36 100644 --- a/mail/qmail-mysql/Makefile +++ b/mail/qmail-mysql/Makefile @@ -19,6 +19,5 @@ USE_MYSQL= yes MASTERDIR= ${.CURDIR}/../qmail DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} .include "${MASTERDIR}/Makefile" diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile index b99541f3716f..04cc017c9dc0 100644 --- a/mail/qmail-spamcontrol/Makefile +++ b/mail/qmail-spamcontrol/Makefile @@ -22,7 +22,6 @@ EXTRA_PATCHES+= ${MASTERDIR}/files/patch-install.c \ QMAIL_DIST= ${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX} SPAMCONTROL_DIST= spamcontrol-${SPAMCONTROL_VERSION}.tgz SPAMCONTROL_VERSION= 2731 -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} SLAVE_SPAMCONTROL= yes diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile index d41896a95413..dbf05ab82af4 100644 --- a/mail/qmail-tls/Makefile +++ b/mail/qmail-tls/Makefile @@ -20,6 +20,5 @@ USE_OPENSSL= yes # Local overrides MASTERDIR= ${.CURDIR}/../qmail DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} .include "${MASTERDIR}/Makefile" diff --git a/mail/wanderlust-devel/Makefile b/mail/wanderlust-devel/Makefile index dbf13d0696b4..84127ab34711 100644 --- a/mail/wanderlust-devel/Makefile +++ b/mail/wanderlust-devel/Makefile @@ -21,7 +21,6 @@ GH_TAGNAME= 5e741ba SNAPDATE= 20141209 CONFLICTS= wanderlust-*-2.14.* -NO_LATEST_LINK= yes OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_DEFAULT=DOCS EXAMPLES diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile index bdf1d6d4d229..3c15c38e5a7c 100644 --- a/math/py-matplotlib/Makefile +++ b/math/py-matplotlib/Makefile @@ -32,7 +32,6 @@ TKAGGBACKEND_DESC= TKAgg backend support WXAGGBACKEND_DESC= WXAgg backend support PORTEXAMPLES= * -UNIQUENAME= ${PORTNAME} .include <bsd.port.options.mk> diff --git a/math/py-symeig/Makefile b/math/py-symeig/Makefile index c2b45992e646..b4def8e06176 100644 --- a/math/py-symeig/Makefile +++ b/math/py-symeig/Makefile @@ -16,9 +16,6 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS+= ${PYNUMPY} RUN_DEPENDS+= ${PYNUMPY} -LATEST_LINK= py-${PORTNAME} -OPTIONSFILE= ${PORT_DBDIR}/py-numpy/options - USES= fortran python:2 USE_PYTHON= distutils autoplist diff --git a/math/sage/Makefile b/math/sage/Makefile index 2caa071ec154..63a7e7f5f01a 100644 --- a/math/sage/Makefile +++ b/math/sage/Makefile @@ -48,8 +48,6 @@ MAKE_ENV+= SAGE_PORT=yes \ SAGE_FAT_BINARY=yes \ PERL=${PERL} -LATEST_LINK= sage-math # Conflicts with graphics/sage. - # The following is needed for the lapack subpackage. MAKE_ARGS+= ARCH="${AR}" diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 44ec24d3d0c8..923c1c9aa90e 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -7,7 +7,6 @@ PORTREVISION= 5 CATEGORIES= math graphics MASTER_SITES= http://www.vtk.org/files/release/${PORTVERSION:R}/ PKGNAMESUFFIX= 5 -UNIQUENAME= ${PKGBASE} MAINTAINER= ports@FreeBSD.org COMMENT= The Visualization Toolkit diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile index d5e7a3ae80de..ca5f28fa1d6b 100644 --- a/math/vtk6/Makefile +++ b/math/vtk6/Makefile @@ -23,8 +23,6 @@ LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ # TODO # * VTK Groups -UNIQUENAME= ${PKGBASE} - CONFLICTS= vtk-4* USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} USE_XORG= xt diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile index 3221cdbd17cf..43cbff153191 100644 --- a/misc/e2fsprogs-libuuid/Makefile +++ b/misc/e2fsprogs-libuuid/Makefile @@ -12,7 +12,6 @@ CONFLICTS= ossp-uuid-[0-9]* CONFIGURE_ARGS= --enable-elf-shlibs OPTIONS_EXCLUDE= NLS -OPTIONSFILE= # works around optionsNG trouble MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs MAKE_ARGS= LIB_SUBDIRS=lib/uuid USE_LDCONFIG= yes diff --git a/misc/gnu-watch/Makefile b/misc/gnu-watch/Makefile index 47c1cd1456c1..5ea887eb79ad 100644 --- a/misc/gnu-watch/Makefile +++ b/misc/gnu-watch/Makefile @@ -16,15 +16,15 @@ LICENSE= GPLv2 LDFLAGS+= -lncurses -PLIST_FILES= bin/${UNIQUENAME} man/man1/gnu-watch.1.gz +PLIST_FILES= bin/${PKGBASE} man/man1/gnu-watch.1.gz do-build: ${CC} ${CFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.c \ - -o ${WRKSRC}/${UNIQUENAME} + -o ${WRKSRC}/${PKGBASE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${UNIQUENAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PKGBASE} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/watch.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1/${UNIQUENAME}.1 + ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1 .include <bsd.port.mk> diff --git a/misc/nut/Makefile b/misc/nut/Makefile index 21c317bfc0d5..a2d8a0fb9888 100644 --- a/misc/nut/Makefile +++ b/misc/nut/Makefile @@ -3,6 +3,7 @@ PORTNAME= nut PORTVERSION= 20.1 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= SF PKGNAMEPREFIX= health- @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= CREDITS README nut.html OPTIONS_DEFINE= FLTK DOCS diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index 82ca562ca12b..21e9266570ca 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -18,8 +18,6 @@ LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \ libexempi.so:${PORTSDIR}/textproc/exempi \ libqjson.so:${PORTSDIR}/devel/qjson -LATEST_LINK= ${PORTNAME}-kde4 - USE_KDE4= kdelibs kdeprefix libksane pimlibs \ automoc4 qimageblitz libkcddb libkcompactdisc USE_QT4= qmake_build moc_build uic_build rcc_build diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile index b1aeb3f9e649..715f66e3d3fe 100644 --- a/multimedia/gstreamer-qt4/Makefile +++ b/multimedia/gstreamer-qt4/Makefile @@ -12,8 +12,6 @@ DISTNAME= qt-${PORTNAME}-${PORTVERSION} MAINTAINER= fluffy@FreeBSD.org COMMENT= Qt4 bindings for GStreamer multimedia library -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs USES= bison cmake gmake pkgconfig tar:bzip2 diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile index ea300caa250c..ab2857886bcf 100644 --- a/multimedia/kplayer-kde4/Makefile +++ b/multimedia/kplayer-kde4/Makefile @@ -12,8 +12,6 @@ COMMENT= Movie player based on mplayer RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer -LATEST_LINK= ${PORTNAME}-kde4 - USES= cmake gettext tar:bzip2 USE_QT4= corelib qmake_build moc_build rcc_build uic_build USE_KDE4= kdeprefix kdelibs automoc4 diff --git a/multimedia/spotify-websocket-api/Makefile b/multimedia/spotify-websocket-api/Makefile index 70bbfbaf298b..dd47129204fb 100644 --- a/multimedia/spotify-websocket-api/Makefile +++ b/multimedia/spotify-websocket-api/Makefile @@ -25,7 +25,6 @@ USES= python shebangfix SHEBANG_FILES= spotify_web/spotify.py ${CLIENTFILES} USE_PYTHON= autoplist concurrent distutils -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= EXAMPLES PORTEXAMPLES= blocking.py nonblocking.py decode_mercury.py play.py \ diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile index 3970c0e8558b..f7650c940cd6 100644 --- a/net-im/kmess-kde4/Makefile +++ b/net-im/kmess-kde4/Makefile @@ -12,8 +12,6 @@ COMMENT= MSN Messenger client for KDE LIB_DEPENDS= libqca.so:${PORTSDIR}/devel/qca -LATEST_LINK= ${PORTNAME}-kde4 - USE_GNOME= libxml2 libxslt USE_KDE4= kdeprefix kdelibs libkonq automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build diff --git a/net-im/py-xmpppy-yahoo/Makefile b/net-im/py-xmpppy-yahoo/Makefile index a9418d8c011c..c22ad2dc1f77 100644 --- a/net-im/py-xmpppy-yahoo/Makefile +++ b/net-im/py-xmpppy-yahoo/Makefile @@ -26,10 +26,10 @@ FILES= adhoc.py config.py jep0133.py roomlist.py xmlconfig.py \ FILES_CURPHOO= YahooMD5.py __init__.py cpformat.py md5crypt.py pysha.py yahoo_fn.py PFILES= ${FILES:S.^.%%PYTHON_SITELIBDIR%%/xmpp/yahoo/.} \ ${FILES_CURPHOO:S.^.%%PYTHON_SITELIBDIR%%/xmpp/yahoo/curphoo/.} -PLIST_FILES= ${PFILES} ${PFILES:S.$.c.} ${PFILES:S.$.o.} etc/${UNIQUENAME:S.-._.}.conf.sample +PLIST_FILES= ${PFILES} ${PFILES:S.$.c.} ${PFILES:S.$.o.} etc/${PKGBASE:S.-._.}.conf.sample SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} BINDIR=${PYTHON_SITELIBDIR}/xmpp/yahoo \ JABBER_USER=${JABBER_USER} -USE_RC_SUBR= ${UNIQUENAME:S/-/_/} +USE_RC_SUBR= ${PKGBASE:S/-/_/} DDIR= ${PYTHON_SITELIBDIR}/xmpp/yahoo .include <bsd.port.options.mk> @@ -45,7 +45,7 @@ SUB_LIST+= JABBER_REQUIRE=jabberd post-patch: @${GREP} -lr '/usr/bin/env python' ${WRKSRC} | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/bin/env python|${PYTHON_CMD}|" - @${REINPLACE_CMD} -e "s|/etc/pyyimt.conf.xml|${PREFIX}/etc/${UNIQUENAME:S.-._.}.conf|" \ + @${REINPLACE_CMD} -e "s|/etc/pyyimt.conf.xml|${PREFIX}/etc/${PKGBASE:S.-._.}.conf|" \ -e 's|pid = ""|pid = "/var/jabberd/pid/PyYIMt.pid"|g' \ -e 's|spoolFile = "user.dbm"|spoolFile = "/var/spool/jabberd/yahoouser.dbm"|g' \ ${WRKSRC}/config.py @@ -60,7 +60,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/yahoo.py ${STAGEDIR}${DDIR}/ @${MKDIR} ${STAGEDIR}${DDIR}/curphoo ${INSTALL_DATA} ${FILES_CURPHOO:S.^.${WRKSRC}/curphoo/.} ${STAGEDIR}${DDIR}/curphoo/ - ${INSTALL_DATA} ${WRKSRC}/config_example.xml ${STAGEDIR}${PREFIX}/etc/${UNIQUENAME:S.-._.}.conf.sample + ${INSTALL_DATA} ${WRKSRC}/config_example.xml ${STAGEDIR}${PREFIX}/etc/${PKGBASE:S.-._.}.conf.sample ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${DDIR} ${STAGEDIR}${DDIR} ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d ${DDIR} ${STAGEDIR}${DDIR} @${CHMOD} -R a-w ${STAGEDIR}${DDIR} diff --git a/net-mgmt/netustad/Makefile b/net-mgmt/netustad/Makefile index e71e71771397..71de0c440e87 100644 --- a/net-mgmt/netustad/Makefile +++ b/net-mgmt/netustad/Makefile @@ -19,8 +19,6 @@ OPTIONS_DEFINE= SSL NLS DOCS OPTIONS_DEFAULT=SSL SSL_DESC= Use netUstad with SSL support -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - SSL_USE= OPENSSL=yes SSL_CONFIGURE_WITH= ssl diff --git a/net-mgmt/zabbix2-agent/Makefile b/net-mgmt/zabbix2-agent/Makefile index 6422d0ba1a80..e0bfdd0203c8 100644 --- a/net-mgmt/zabbix2-agent/Makefile +++ b/net-mgmt/zabbix2-agent/Makefile @@ -9,7 +9,6 @@ MASTERDIR= ${.CURDIR}/../zabbix2-server PLIST= ${PKGDIR}/pkg-plist.agent -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT= IPV6 diff --git a/net-mgmt/zabbix2-frontend/Makefile b/net-mgmt/zabbix2-frontend/Makefile index 2cf34a1f9ca4..0796a67114a2 100644 --- a/net-mgmt/zabbix2-frontend/Makefile +++ b/net-mgmt/zabbix2-frontend/Makefile @@ -15,7 +15,6 @@ USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ xmlreader xmlwriter simplexml gettext ldap WANT_PHP_WEB= yes -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQL MYSQLI MYSQLI_DESC= MySQLI backend diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile index 3656a003c3b8..28114ab8eb2c 100644 --- a/net-mgmt/zabbix2-server/Makefile +++ b/net-mgmt/zabbix2-server/Makefile @@ -65,8 +65,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options - OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL UNIXODBC OPTIONS_SUB= yes diff --git a/net-mgmt/zabbix22-agent/Makefile b/net-mgmt/zabbix22-agent/Makefile index 908623e40de9..f29c5db0d7af 100644 --- a/net-mgmt/zabbix22-agent/Makefile +++ b/net-mgmt/zabbix22-agent/Makefile @@ -9,7 +9,6 @@ MASTERDIR= ${.CURDIR}/../zabbix22-server PLIST= ${PKGDIR}/pkg-plist.agent -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT= IPV6 diff --git a/net-mgmt/zabbix22-frontend/Makefile b/net-mgmt/zabbix22-frontend/Makefile index 5b5ef0ac0255..694d61c28580 100644 --- a/net-mgmt/zabbix22-frontend/Makefile +++ b/net-mgmt/zabbix22-frontend/Makefile @@ -15,7 +15,6 @@ USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ xmlreader xmlwriter simplexml gettext ldap WANT_PHP_WEB= yes -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQL MYSQLI MYSQLI_DESC= MySQLI backend diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile index 8bd9ad1ff4fd..c87487d17fec 100644 --- a/net-mgmt/zabbix22-server/Makefile +++ b/net-mgmt/zabbix22-server/Makefile @@ -66,8 +66,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options - OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW LIBXML2 OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL UNIXODBC OPTIONS_SUB= yes diff --git a/net-mgmt/zabbix24-agent/Makefile b/net-mgmt/zabbix24-agent/Makefile index 369acf6adac4..8c9253f14bd7 100644 --- a/net-mgmt/zabbix24-agent/Makefile +++ b/net-mgmt/zabbix24-agent/Makefile @@ -8,7 +8,6 @@ PKGNAMESUFFIX= -agent MASTERDIR= ${.CURDIR}/../zabbix24-server PLIST= ${PKGDIR}/pkg-plist.agent -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT= IPV6 diff --git a/net-mgmt/zabbix24-frontend/Makefile b/net-mgmt/zabbix24-frontend/Makefile index 152450136220..6233b00316da 100644 --- a/net-mgmt/zabbix24-frontend/Makefile +++ b/net-mgmt/zabbix24-frontend/Makefile @@ -15,7 +15,6 @@ USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ xmlreader xmlwriter simplexml gettext ldap WANT_PHP_WEB= yes -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQL MYSQLI MYSQLI_DESC= MySQLI backend diff --git a/net-mgmt/zabbix24-server/Makefile b/net-mgmt/zabbix24-server/Makefile index 40d2f0027a72..c538fe7c14b0 100644 --- a/net-mgmt/zabbix24-server/Makefile +++ b/net-mgmt/zabbix24-server/Makefile @@ -67,7 +67,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW \ LIBXML2 OPTIONS_DEFAULT= IPV6 FPING JABBER CURL UNIXODBC MYSQL SSH diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 833900410701..946f1fd72335 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -80,11 +80,7 @@ RADIUS_GROUP= freeradius USERS= ${RADIUS_USER} GROUPS= ${RADIUS_GROUP} -.if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MKERBEROS) -${UNIQUENAME}_SET+= KERBEROS -.endif - -.if ${PORT_OPTIONS:MKERBEROS} +.if ${PORT_OPTIONS:MKERBEROS} || ${PORT_OPTIONS:MHEIMDAL} .if ${PORT_OPTIONS:MHEIMDAL} .if ${PORT_OPTIONS:MHEIMDAL_PORT} LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/heimdal diff --git a/net/hping-devel/Makefile b/net/hping-devel/Makefile index 0c6353fa935d..2795bd3d6a0f 100644 --- a/net/hping-devel/Makefile +++ b/net/hping-devel/Makefile @@ -13,7 +13,6 @@ COMMENT= Network auditing tool LIB_DEPENDS= libtcl84.so:${PORTSDIR}/lang/tcl84 -NO_LATEST_LINK= yes CONFLICTS= hping-[0-9]* GNU_CONFIGURE= yes diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile index 0211674451dd..ee4cc584e6d1 100644 --- a/net/isc-dhcp41-server/Makefile +++ b/net/isc-dhcp41-server/Makefile @@ -23,8 +23,6 @@ PORTREVISION_RELAY= 5 SUBSYS?= server WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT=IPV6 diff --git a/net/isc-dhcp42-server/Makefile b/net/isc-dhcp42-server/Makefile index 0ca6d9c74d75..d4d0c6689798 100644 --- a/net/isc-dhcp42-server/Makefile +++ b/net/isc-dhcp42-server/Makefile @@ -25,8 +25,6 @@ PORTREVISION_RELAY= 0 SUBSYS?= server #WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT=IPV6 diff --git a/net/isc-dhcp43-server/Makefile b/net/isc-dhcp43-server/Makefile index 0f6909c08798..a6c77dab76bb 100644 --- a/net/isc-dhcp43-server/Makefile +++ b/net/isc-dhcp43-server/Makefile @@ -25,8 +25,6 @@ PORTREVISION_RELAY= 0 SUBSYS?= server #WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT=IPV6 diff --git a/net/mosh/Makefile b/net/mosh/Makefile index 29243b1460e4..7d139faf0d25 100644 --- a/net/mosh/Makefile +++ b/net/mosh/Makefile @@ -23,8 +23,6 @@ INSTALL_TARGET= install-strip USE_OPENSSL= yes USES= autoreconf:autoconf perl5 pkgconfig -LATEST_LINK= mosh-term - CONFLICTS_INSTALL= mosh-0.[2-9].* PLIST_FILES= bin/mosh bin/mosh-server bin/mosh-client \ diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index f79875c94ea0..b1f4e5a238df 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -29,8 +29,6 @@ CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \ .endif .else PKGNAMESUFFIX?= -server -# Do not use ${PKGNAMESUFFIX} here has it can change later -OPTIONSFILE?= ${PORT_DBDIR}/${PORTNAME}24-server/options .endif EXTRACT_SUFX= .tgz diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile index ed32d0ed0bb0..8caf697e1582 100644 --- a/net/openmpi/Makefile +++ b/net/openmpi/Makefile @@ -24,7 +24,7 @@ USES= fortran gmake libtool:keepla perl5 pkgconfig tar:bzip2 USE_PERL5= build MPIBASE?= mpi -MPIDIR?= ${MPIBASE}/${UNIQUENAME} +MPIDIR?= ${MPIBASE}/${PKGBASE} PLIST_SUB+= MPIBASE=${MPIBASE} PLIST_SUB+= MPIDIR=${MPIDIR} diff --git a/net/proftpd-mod_ldap/Makefile b/net/proftpd-mod_ldap/Makefile index 82271e0b6b09..77ba0f09c5ad 100644 --- a/net/proftpd-mod_ldap/Makefile +++ b/net/proftpd-mod_ldap/Makefile @@ -13,7 +13,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd USE_OPENLDAP= yes diff --git a/net/py-gntp/Makefile b/net/py-gntp/Makefile index 2377d29588ec..cbdb66fa1367 100644 --- a/net/py-gntp/Makefile +++ b/net/py-gntp/Makefile @@ -14,7 +14,6 @@ LICENSE= MIT GH_ACCOUNT= kfdm -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS USE_GITHUB= yes diff --git a/net/py-pynsq/Makefile b/net/py-pynsq/Makefile index 59cc89c043e2..dd21a70d1050 100644 --- a/net/py-pynsq/Makefile +++ b/net/py-pynsq/Makefile @@ -20,7 +20,6 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:${PORTSDIR}/www/py-tornado \ OPTIONS_DEFINE= TESTS TESTS_DESC= Install tools to run test suite -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options USES= python USE_PYTHON= distutils autoplist diff --git a/net/samba36/Makefile b/net/samba36/Makefile index feb64d8dd3b3..b5dd735dd1f6 100644 --- a/net/samba36/Makefile +++ b/net/samba36/Makefile @@ -22,7 +22,6 @@ SAMBA_BASENAME= samba CPE_VENDOR= samba CPE_PRODUCT= samba -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} WRKSRC= ${WRKDIR}/${DISTNAME}/source3 diff --git a/news/inn/Makefile b/news/inn/Makefile index 2e9121154eb3..a50448a1a4dc 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -17,8 +17,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_RC_SUBR= innd SUB_FILES= pkg-install -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - USES= cpe gmake perl5 uidfix CPE_VENDOR= isc diff --git a/news/py-pynzb/Makefile b/news/py-pynzb/Makefile index f1ec2b429846..28fe44e425e4 100644 --- a/news/py-pynzb/Makefile +++ b/news/py-pynzb/Makefile @@ -16,7 +16,6 @@ LICENSE= BSD3CLAUSE USES= python USE_PYTHON= distutils autoplist -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= LXML LXML_DESC= Add support for py-lxml LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:${PORTSDIR}/devel/py-lxml diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 3f9f351b16f1..bc3e8594c64e 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -34,12 +34,10 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .if defined(WITH_PKG) .if ${WITH_PKG} != devel -NO_LATEST_LINK= yes . if !defined(PACKAGE_BUILDING) IGNORE= WITH_PKG is not defined to 'devel', this version is the devel one . endif .else -LATEST_LINK= pkg PKGNAMESUFFIX= #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= @@ -67,8 +65,6 @@ pre-everything:: .endif .endif -.else -LATEST_LINK= pkg-devel .endif .undef INSTALLS_DEPENDS diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index ad2917c69fa2..a5eb6dd3c3d2 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -37,7 +37,6 @@ MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .if defined(WITH_PKG) .if ${WITH_PKG} == devel -NO_LATEST_LINK= yes IGNORE= WITH_PKG is defined to 'devel', this version is the stable one .endif .if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info) diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 6f8ec53bdcb8..d3a66acbb7be 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -20,8 +20,6 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ CONFLICTS= LPRng-[0-9]* -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - USES+= cpe gmake iconv pkgconfig tar:bzip2 CPE_VENDOR= apple DESTDIRNAME= DSTROOT @@ -53,7 +51,6 @@ CUPSSYSGRP= wheel GROUPS= cups USERS= cups -# UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included OPTIONS_SUB= yes .if defined(CUPS_CLIENT) PORTREVISION= 2 diff --git a/print/py-pollyreports/Makefile b/print/py-pollyreports/Makefile index 3cae0676efb2..9c4220760c9e 100644 --- a/print/py-pollyreports/Makefile +++ b/print/py-pollyreports/Makefile @@ -15,7 +15,6 @@ LICENSE= BSD2CLAUSE USES= python:2 USE_PYTHON= distutils autoplist -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= REPORTLAB REPORTLAB_DESC= Install Reportlab2 diff --git a/science/py-mdp/Makefile b/science/py-mdp/Makefile index 1da2b44dec57..2662c64a36a3 100644 --- a/science/py-mdp/Makefile +++ b/science/py-mdp/Makefile @@ -19,8 +19,6 @@ RUN_DEPENDS= ${PYNUMPY} USES= python USE_PYTHON= distutils autoplist -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options - OPTIONS_DEFINE= LIBSVM PP SCIPY LIBSVM_DESC= Provide the LibSVMClassifier node diff --git a/security/botan110/Makefile b/security/botan110/Makefile index f697f5327299..a21bf0ca341b 100644 --- a/security/botan110/Makefile +++ b/security/botan110/Makefile @@ -14,8 +14,6 @@ COMMENT= Portable, easy to use, and efficient C++ crypto library LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/doc/license.txt -LATEST_LINK= botan${PKGNAMESUFFIX} - OPTIONS_DEFINE= SSL GMP ECC DOCS OPTIONS_DEFAULT= SSL GMP ECC ECC_DESC= ECC support diff --git a/security/gag/Makefile b/security/gag/Makefile index 8a0c62b1cdba..1b0a5d34c3b0 100644 --- a/security/gag/Makefile +++ b/security/gag/Makefile @@ -11,8 +11,6 @@ EXTRACT_SUFX= .tar MAINTAINER= ports@FreeBSD.org COMMENT= Stacheldraht (DOS attack) agent detector -LATEST_LINK= gag-sickenscan - ALL_TARGET= gag PORTDOCS= README diff --git a/security/krb5-111/Makefile b/security/krb5-111/Makefile index 49228edc313e..a3c6d02c7237 100644 --- a/security/krb5-111/Makefile +++ b/security/krb5-111/Makefile @@ -25,7 +25,6 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-[0-9]* krb5-maint-112-* -LATEST_LINK= ${PORTNAME}-111 KERBEROSV_URL= http://web.mit.edu/kerberos/ USES= cpe gettext gmake perl5 gssapi:bootstrap,mit USE_PERL5= build diff --git a/security/krb5-112/Makefile b/security/krb5-112/Makefile index ed222b40e111..f4a3a3b8cd39 100644 --- a/security/krb5-112/Makefile +++ b/security/krb5-112/Makefile @@ -22,7 +22,6 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-[0-9]* krb5-maint-111-* -LATEST_LINK= ${PORTNAME}-112 KERBEROSV_URL= http://web.mit.edu/kerberos/ USE_PERL5= build USE_LDCONFIG= yes diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile index f79ac94277f7..08e48588f438 100644 --- a/security/krb5-appl/Makefile +++ b/security/krb5-appl/Makefile @@ -18,7 +18,6 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ CONFLICTS= krb4-[0-9]* krb5-1.[0-7].* heimdal-[0-9]* srp-[0-9]* -LATEST_LINK= ${PORTNAME}-1 KERBEROSV_URL= http://web.mit.edu/kerberos/ USE_OPENSSL= yes USES= gmake perl5 gssapi:mit diff --git a/security/proftpd-mod_clamav/Makefile b/security/proftpd-mod_clamav/Makefile index 5f37ea2fa358..3dfd166b6e69 100644 --- a/security/proftpd-mod_clamav/Makefile +++ b/security/proftpd-mod_clamav/Makefile @@ -14,7 +14,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd GH_TAGNAME= v${DISTVERSION} diff --git a/security/py-itsdangerous/Makefile b/security/py-itsdangerous/Makefile index 985cc51367bd..f5b305351c83 100644 --- a/security/py-itsdangerous/Makefile +++ b/security/py-itsdangerous/Makefile @@ -15,7 +15,6 @@ LICENSE= BSD3CLAUSE USES= python USE_PYTHON= distutils autoplist -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= JSON JSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:${PORTSDIR}/devel/py-simplejson diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile index 03c0e98c7711..a02842f859f9 100644 --- a/security/py-keyring/Makefile +++ b/security/py-keyring/Makefile @@ -15,8 +15,6 @@ LICENSE= PSFL BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner -LATEST_LINK= py-${PORTNAME} - USES= python zip USE_PYTHON= distutils autoplist diff --git a/security/rubygem-net-ssh/Makefile b/security/rubygem-net-ssh/Makefile index d5de98a302a5..099cb74b279d 100644 --- a/security/rubygem-net-ssh/Makefile +++ b/security/rubygem-net-ssh/Makefile @@ -15,7 +15,6 @@ LICENSE= MIT OPTIONS_DEFINE= PROMPT_PASSPHRASES OPTIONS_DEFAULT=PROMPT_PASSPHRASES -OPTIONSFILE?= ${PORT_DBDIR}/rubygem-${PORTNAME}/options PROMPT_PASSPHRASES_DESC= Prompt for passphrases on keys PORTSCOUT= skipv:2.10.0 diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile index 1db80afd9e79..922134bf4a9b 100644 --- a/security/shibboleth2-sp/Makefile +++ b/security/shibboleth2-sp/Makefile @@ -19,8 +19,6 @@ MAKE_ENV= NOKEYGEN=YES USE_LDCONFIG= yes USE_RC_SUBR= shibboleth-sp -LATEST_LINK= shibboleth2-sp - USERS= shibd GROUPS= shibd diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile index 20cbd7e4e32b..2b6ce7b6651c 100644 --- a/sysutils/backuppc-devel/Makefile +++ b/sysutils/backuppc-devel/Makefile @@ -15,8 +15,6 @@ COMMENT= Multi-platform backup to disk-based storage LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -LATEST_LINK= ${PORTNAME}-devel - RUN_DEPENDS= p5-File-Listing>=0:${PORTSDIR}/sysutils/p5-File-Listing \ p5-BackupPC-XS>=0.30:${PORTSDIR}/sysutils/p5-BackupPC-XS diff --git a/sysutils/bacula-docs/Makefile b/sysutils/bacula-docs/Makefile index dbde6cf49b55..fb9459131679 100644 --- a/sysutils/bacula-docs/Makefile +++ b/sysutils/bacula-docs/Makefile @@ -13,8 +13,6 @@ COMMENT= Bacula document set NO_BUILD= yes -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - PORTDOCS= *.pdf do-install: diff --git a/sysutils/bacula5-docs/Makefile b/sysutils/bacula5-docs/Makefile index a3eae3fc9ae8..03ac1c934504 100644 --- a/sysutils/bacula5-docs/Makefile +++ b/sysutils/bacula5-docs/Makefile @@ -15,8 +15,6 @@ COMMENT= Bacula document set NO_BUILD= yes -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - PORTDOCS= *.pdf do-install: diff --git a/sysutils/bareos-docs/Makefile b/sysutils/bareos-docs/Makefile index 026ddccbe934..c1aa6e34ecdb 100644 --- a/sysutils/bareos-docs/Makefile +++ b/sysutils/bareos-docs/Makefile @@ -13,8 +13,6 @@ COMMENT= Bareos document set (PDF) NO_BUILD= yes -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - PORTDOCS= *.pdf do-extract: diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile index ec3946e7b535..e8075463e9af 100644 --- a/sysutils/boxbackup-devel/Makefile +++ b/sysutils/boxbackup-devel/Makefile @@ -17,8 +17,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE-DUAL.txt SVNVERSION= 0.11_trunk_2979 -NO_LATEST_LINK= yes - USES= perl5 tar:tgz USE_OPENSSL= yes GNU_CONFIGURE= yes diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile index 5f409547bfa4..72d442e17116 100644 --- a/sysutils/cdrtools-devel/Makefile +++ b/sysutils/cdrtools-devel/Makefile @@ -49,7 +49,6 @@ SICONVTABLES= cp10000 cp10006 cp10007 cp10029 cp10079 cp10081 cp1250 \ iso8859-16 iso8859-2 iso8859-3 iso8859-4 iso8859-5 \ iso8859-6 iso8859-7 iso8859-8 iso8859-9 koi8-r koi8-u -NO_LATEST_LINK= yes USES= gmake tar:bzip2 #CFLAGS+= -DSOURCE_MODIFIED WRKSRC= ${WRKDIR}/${DISTNAME:C/a(.+)$//} diff --git a/sysutils/cfengine32/Makefile b/sysutils/cfengine32/Makefile index 9ffad5701eb8..00b554791550 100644 --- a/sysutils/cfengine32/Makefile +++ b/sysutils/cfengine32/Makefile @@ -14,7 +14,6 @@ MAINTAINER= cy@FreeBSD.org COMMENT= Systems administration tool for networks CPE_VENDOR= gnu -LATEST_LINK= cfengine32 FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} CONFLICTS= cfengine-[2]* cfengine-3.[345]* cfengine-devel-* diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile index a2014228fb3f..da6ba321bee9 100644 --- a/sysutils/cfengine34/Makefile +++ b/sysutils/cfengine34/Makefile @@ -14,7 +14,6 @@ CPE_VENDOR= gnu .if !defined(MASTERDIR) PKGNAMESUFFIX= 34 -LATEST_LINK= cfengine34 .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} diff --git a/sysutils/cfengine36/Makefile b/sysutils/cfengine36/Makefile index f9981e862dcb..7b29b1058461 100644 --- a/sysutils/cfengine36/Makefile +++ b/sysutils/cfengine36/Makefile @@ -17,7 +17,6 @@ CPE_VENDOR= gnu .if !defined(MASTERDIR) PKGNAMESUFFIX= 36 -LATEST_LINK= cfengine36 .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} diff --git a/sysutils/cfengine37/Makefile b/sysutils/cfengine37/Makefile index f8484256dacd..a13b4451f009 100644 --- a/sysutils/cfengine37/Makefile +++ b/sysutils/cfengine37/Makefile @@ -18,7 +18,6 @@ CPE_VENDOR= gnu .if !defined(MASTERDIR) PKGNAMESUFFIX= 37 -LATEST_LINK= cfengine37 .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile index 0bd8f20c5aae..0d812a8524c9 100644 --- a/sysutils/knutclient-kde4/Makefile +++ b/sysutils/knutclient-kde4/Makefile @@ -18,6 +18,5 @@ CONFLICTS= knutclient-0.* USES= cmake gettext USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build -LATEST_LINK= knutclient-kde4 .include <bsd.port.mk> diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile index fa132bad00b9..35630910da90 100644 --- a/sysutils/pear-Log/Makefile +++ b/sysutils/pear-Log/Makefile @@ -13,7 +13,6 @@ LICENSE= MIT USES= pear USE_PHP= yes -LATEST_LINK= pear-Log OPTIONS_DEFINE= PEAR_DB PEAR_MDB2 PEAR_MAIL PEAR_SQLITE PEAR_DB_DESC= PEAR::DB support PEAR_MDB2_DESC= PEAR::MDB2 support diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile index 1a916fe8789e..3ff388bb0765 100644 --- a/sysutils/py-supervisor/Makefile +++ b/sysutils/py-supervisor/Makefile @@ -18,7 +18,6 @@ TEST_DEPENDS:= ${RUN_DEPENDS} \ OPTIONS_DEFINE= TESTS TESTS_DESC= Install mock for running unit tests -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options .include <bsd.port.options.mk> diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile index ff66aaf74175..c71daadf77ce 100644 --- a/textproc/apache-solr/Makefile +++ b/textproc/apache-solr/Makefile @@ -22,7 +22,6 @@ NO_ARCH= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" USE_JAVA= yes PORTEXAMPLES= * -LATEST_LINK= apache-solr USE_RC_SUBR= solr CPE_PRODUCT= solr diff --git a/textproc/flip/Makefile b/textproc/flip/Makefile index 83f7f12cf1d4..b7837500dcf0 100644 --- a/textproc/flip/Makefile +++ b/textproc/flip/Makefile @@ -11,8 +11,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Convert text file line endings between Unix and DOS formats -NO_LATEST_LINK= yes - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} ALL_TARGET= bsd PLIST_FILES= bin/flip man/man1/flip.1.gz diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile index 80f24022a2cd..e3bd3c83664d 100644 --- a/textproc/py-genshi/Makefile +++ b/textproc/py-genshi/Makefile @@ -15,7 +15,6 @@ COMMENT= Python toolkit for stream-based generation of output for the web LICENSE= BSD3CLAUSE OPTIONS_DEFINE= BABEL -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options BABEL_DESC= I18n support through the Babel plugin USES= python diff --git a/textproc/ruby-xmlscan/Makefile b/textproc/ruby-xmlscan/Makefile index 1b246363675b..9942e041de6d 100644 --- a/textproc/ruby-xmlscan/Makefile +++ b/textproc/ruby-xmlscan/Makefile @@ -11,7 +11,6 @@ DIST_SUBDIR= ruby MAINTAINER= ruby@FreeBSD.org COMMENT= High-performance non-validating XML parser written in 100% pure Ruby -NO_LATEST_LINK= yes USE_RUBY= yes NO_BUILD= yes diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile index 651e700a5d89..0700a4d158ad 100644 --- a/textproc/sphinxsearch-devel/Makefile +++ b/textproc/sphinxsearch-devel/Makefile @@ -21,8 +21,6 @@ COMMENT= Sphinx Full-Text Search Engine LICENSE= GPLv2 -LATEST_LINK= sphinxsearch-devel - # If expat is present on the system and configure finds it, it will # unconditionally link the output binary against it. There's no way # of turning this off. So for consistency, make sure it's always on. diff --git a/www/apache22-event-mpm/Makefile b/www/apache22-event-mpm/Makefile index f091cf4d6366..0ccb8df31aec 100644 --- a/www/apache22-event-mpm/Makefile +++ b/www/apache22-event-mpm/Makefile @@ -6,7 +6,6 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= event -LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr PORT_OPTIONS+= CGID diff --git a/www/apache22-itk-mpm/Makefile b/www/apache22-itk-mpm/Makefile index eabd2c01ffae..baf840347f6e 100644 --- a/www/apache22-itk-mpm/Makefile +++ b/www/apache22-itk-mpm/Makefile @@ -18,7 +18,6 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= itk -LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr MPM_ITK_VERSION?= 20110321-01 diff --git a/www/apache22-peruser-mpm/Makefile b/www/apache22-peruser-mpm/Makefile index 61ec2e00c4e5..704fe5cd538d 100644 --- a/www/apache22-peruser-mpm/Makefile +++ b/www/apache22-peruser-mpm/Makefile @@ -11,7 +11,6 @@ MAINTAINER= ports@FreeBSD.org WITH_MPM= peruser -LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0.patch diff --git a/www/apache22-worker-mpm/Makefile b/www/apache22-worker-mpm/Makefile index 77792c19c23b..05f5c773af72 100644 --- a/www/apache22-worker-mpm/Makefile +++ b/www/apache22-worker-mpm/Makefile @@ -6,7 +6,6 @@ MAINTAINER= apache@FreeBSD.org WITH_MPM= worker -LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr PORT_OPTIONS+= CGID diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules index 209956a263e6..38c58ba36712 100644 --- a/www/apache22/Makefile.modules +++ b/www/apache22/Makefile.modules @@ -9,7 +9,7 @@ # Maintainer note for OPTION handling: # To set additional option use # PORT_OPTIONS+= -# To unset an OPTION, even the OPTION is set in OPTIONSFILE use +# To unset an OPTION, even the OPTION is set in OPTIONS_FILE use # WITHOUT_MODULES+= # Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected # if the OPTION is enabled by the user, therefore we calculate diff --git a/www/apache24/Makefile.modules b/www/apache24/Makefile.modules index d6a7484618a9..051ffd6e4e37 100644 --- a/www/apache24/Makefile.modules +++ b/www/apache24/Makefile.modules @@ -9,7 +9,7 @@ # Maintainer note for OPTION handling: # To set additional option use # PORT_OPTIONS+= -# To unset an OPTION, even the OPTION is set in OPTIONSFILE use +# To unset an OPTION, even the OPTION is set in OPTIONS_FILE use # WITHOUT_MODULES+= # Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected # if the OPTION is enabled by the user, therefore we calculate diff --git a/www/autoindex2/Makefile b/www/autoindex2/Makefile index 01295171945e..bf49a61e3fc9 100644 --- a/www/autoindex2/Makefile +++ b/www/autoindex2/Makefile @@ -16,7 +16,6 @@ USES= dos2unix USE_PHP= session DEFAULT_VERSIONS+= php=5 CONFLICTS= AutoIndex-1* -LATEST_LINK= AutoIndex2 NO_BUILD= yes INSTALLDIR?= ${WWWDIR} diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index cd1e22265c88..86072257145d 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -19,7 +19,6 @@ MAKE_ENV= JAVA_HOME=${JAVA_HOME} WRKSRC= ${WRKDIR}/${PDISTNAME} APP_NAME?= ${PORTNAME} APP_HOME?= ${PREFIX}/${APP_NAME} -LATEST_LINK= ${APP_NAME} PLIST= ${WRKDIR}/pkg-plist PDISTNAME= ${PORTNAME}-${PORTVERSION} PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile index e7dc9b9dc491..9d35fe698949 100644 --- a/www/dillo2/Makefile +++ b/www/dillo2/Makefile @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/libexec CONFLICTS= dillo-i18n-[0-9]* \ dillo-0* -LATEST_LINK= dillo2 OPTIONS_DEFINE= COOKIES HYPHENATION IPV6 SSL THREADS DOCS OPTIONS_DEFAULT= COOKIES HYPHENATION IPV6 SSL THREADS diff --git a/www/free-sa-devel/Makefile b/www/free-sa-devel/Makefile index 23aa839372d6..9bb34d7d480f 100644 --- a/www/free-sa-devel/Makefile +++ b/www/free-sa-devel/Makefile @@ -14,7 +14,6 @@ COMMENT= Statistic analyzer for daemons log files similar to SARG LICENSE= GPLv3 CONFLICTS= free-sa-[0-9]* -LATEST_LINK= free-sa-devel WWWDIR?= ${PREFIX}/www/${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} diff --git a/www/gaeutilities/Makefile b/www/gaeutilities/Makefile index 5788bf528bb9..ff720ac4623e 100644 --- a/www/gaeutilities/Makefile +++ b/www/gaeutilities/Makefile @@ -17,7 +17,6 @@ USES= python:2 # same as www/google-appengine WRKSRC= ${WRKDIR}/joerussbowman-gaeutilities-ea3f7e1 -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS do-build: diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile index 5404117b5a9b..600bb3dece39 100644 --- a/www/geronimo/Makefile +++ b/www/geronimo/Makefile @@ -50,7 +50,6 @@ PID_FILE= /var/run/${APP_SHORTNAME}.pid WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work WRKSRC= ${WRKDIR}/${DISTNAME:S/-bin//} JAR_FILE= bin/server.jar -LATEST_LINK= ${APP_SHORTNAME} PLIST_FILES= "@(${GERONIMO_USER},${GERONIMO_GROUP},) ${GERONIMO_OUT:S,^${PREFIX}/,,}" SUB_LIST= GERONIMO_HOME=${APP_HOME} \ diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile index 6950c22a5461..ae2cf8c26bbe 100644 --- a/www/linux-opera/Makefile +++ b/www/linux-opera/Makefile @@ -31,8 +31,8 @@ NO_BUILD= yes OPERA_VER?= 12.16 OPERA_BUILD?= 1860 -DATADIR= ${PREFIX}/share/${UNIQUENAME} -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DATADIR= ${PREFIX}/share/${PKGBASE} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} RENAME= opera lib/opera \ share/applications/opera-browser.desktop \ @@ -44,63 +44,63 @@ post-extract: @${MV} ${WRKSRC}/share/man ${WRKSRC}/man @for _r in ${RENAME}; do \ linux=`${ECHO_CMD} $${_r} | \ - ${SED} -e 's|opera|${UNIQUENAME}|g'`; \ + ${SED} -e 's|opera|${PKGBASE}|g'`; \ ${MV} ${WRKSRC}/$${_r} ${WRKSRC}/$${linux}; \ done; \ for _f in `find ${WRKSRC}/share/icons -type f | \ ${SED} -e 's|${WRKSRC}/||g'`; do \ linux=`${ECHO_CMD} $${_f} | \ - ${SED} -e 's|opera|${UNIQUENAME}|g'`; \ + ${SED} -e 's|opera|${PKGBASE}|g'`; \ ${MV} ${WRKSRC}/$${_f} ${WRKSRC}/$${linux}; \ done; \ for _l in `find ${WRKSRC}/share/icons -name opera-widget.png | \ ${SED} -e 's|/opera-widget\.png||g'`; do \ ${RM} $${_l}/opera-widget.png; \ cd $${_l}; \ - ${LN} -s ../mimetypes/${UNIQUENAME}-widget.png \ - $${_l}/${UNIQUENAME}-widget.png; \ + ${LN} -s ../mimetypes/${PKGBASE}-widget.png \ + $${_l}/${PKGBASE}-widget.png; \ done post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%LINUXBASE%%|${LINUXBASE}|g' \ - ${WRKSRC}/share/${UNIQUENAME}/defaults/pluginpath.ini - @${REINPLACE_CMD} -e '/man1/s|opera|${UNIQUENAME}|g ; \ + ${WRKSRC}/share/${PKGBASE}/defaults/pluginpath.ini + @${REINPLACE_CMD} -e '/man1/s|opera|${PKGBASE}|g ; \ /man1/s|1.gz|1|g ; /man1/s|share/||g ; \ - s|bin/opera|bin/${UNIQUENAME}|g ; \ + s|bin/opera|bin/${PKGBASE}|g ; \ s|name=$$(uname -s)|name=Linux|g ; \ - s|lib/opera|lib/${UNIQUENAME}|g ; \ - s|applications/opera|applications/${UNIQUENAME}|g ; \ - s|doc/opera|doc/${UNIQUENAME}|g ; \ - /hicolor/s|/opera|/${UNIQUENAME}|g ; \ - s|packages/opera|packages/${UNIQUENAME}|g ; \ - s|share/opera|share/${UNIQUENAME}|g ; \ + s|lib/opera|lib/${PKGBASE}|g ; \ + s|applications/opera|applications/${PKGBASE}|g ; \ + s|doc/opera|doc/${PKGBASE}|g ; \ + /hicolor/s|/opera|/${PKGBASE}|g ; \ + s|packages/opera|packages/${PKGBASE}|g ; \ + s|share/opera|share/${PKGBASE}|g ; \ s|PREFIX=/usr/local|PREFIX=${PREFIX}|g ; \ - /OPERA_PERSONALDIR/s|.opera|.${UNIQUENAME}|g ; \ - s|opera)|${UNIQUENAME})|g ; \ - s|opera-widget-manager)|${UNIQUENAME}-widget-manager)|g ; \ + /OPERA_PERSONALDIR/s|.opera|.${PKGBASE}|g ; \ + s|opera)|${PKGBASE})|g ; \ + s|opera-widget-manager)|${PKGBASE}-widget-manager)|g ; \ s|^.*rmdir.*mime/packages.*||g ; \ s|^.*GX - bin/uninstall-opera@.*||g ; \ s|[$$]tempdir/damaged|${WRKSRC}/damaged|g ; \ s|PREFIX/bin/uninstall-opera|PREFIX/bin/disabled-opera|g' \ ${WRKSRC}/install @${REINPLACE_CMD} -e '/^Name/s|$$| (Linux version)|g ; \ - /Exec/s|opera|${UNIQUENAME}|g ; \ - /Icon/s|opera|${UNIQUENAME}|g ; \ - /StartupWMClass/s|opera|${UNIQUENAME}|g ; \ + /Exec/s|opera|${PKGBASE}|g ; \ + /Icon/s|opera|${PKGBASE}|g ; \ + /StartupWMClass/s|opera|${PKGBASE}|g ; \ s|TryExec=.*||g ; /^$$/d' \ ${WRKSRC}/share/applications/*.desktop - @${REINPLACE_CMD} -e 's|lib/opera|lib/${UNIQUENAME}|g ; \ - s|doc/opera|doc/${UNIQUENAME}|g ; \ - s|share/opera|share/${UNIQUENAME}|g ; \ - s|opera-widget-manager|${UNIQUENAME}-widget-manager|g ; \ - s|opera (1)|${UNIQUENAME} (1)|g ; \ - s|\.opera@@|\.${UNIQUENAME}@@|g ; \ - s|B opera@@|B ${UNIQUENAME}@@|g ; \ - /standards-compliant/s|opera|${UNIQUENAME}|g' \ + @${REINPLACE_CMD} -e 's|lib/opera|lib/${PKGBASE}|g ; \ + s|doc/opera|doc/${PKGBASE}|g ; \ + s|share/opera|share/${PKGBASE}|g ; \ + s|opera-widget-manager|${PKGBASE}-widget-manager|g ; \ + s|opera (1)|${PKGBASE} (1)|g ; \ + s|\.opera@@|\.${PKGBASE}@@|g ; \ + s|B opera@@|B ${PKGBASE}@@|g ; \ + /standards-compliant/s|opera|${PKGBASE}|g' \ ${WRKSRC}/man/man1/*.1 - @${REINPLACE_CMD} -e '/<generic-icon/s|opera|${UNIQUENAME}|g' \ + @${REINPLACE_CMD} -e '/<generic-icon/s|opera|${PKGBASE}|g' \ ${WRKSRC}/share/mime/packages/*.xml @${FIND} ${WRKSRC} -name '*.orig' -delete @${FIND} ${WRKSRC} -name '*.bak' -delete diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile index 9df643b12f07..5f832654acab 100644 --- a/www/mod_auth_kerb2/Makefile +++ b/www/mod_auth_kerb2/Makefile @@ -17,7 +17,6 @@ LICENSE_COMB= multi LICENSE_FILE_MIT= ${WRKSRC}/LICENSE LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE -LATEST_LINK= mod_auth_kerb2 PORTSCOUT= limit:^5.4 USE_APACHE= 22+ diff --git a/www/mod_extract_forwarded/Makefile b/www/mod_extract_forwarded/Makefile index 13058aaf5310..fd678d77637d 100644 --- a/www/mod_extract_forwarded/Makefile +++ b/www/mod_extract_forwarded/Makefile @@ -23,10 +23,6 @@ PATCH_STRIP= -p1 AP_FAST_BUILD= yes AP_GENPLIST= yes -# Workaround for UNIQUENAME v.s. OptionsNG problem. -# http://lists.freebsd.org/pipermail/freebsd-ports/2012-June/075466.html -UNIQUENAME= ap22-${PORTNAME} - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MYOSHFUJI} diff --git a/www/mod_layout22/Makefile b/www/mod_layout22/Makefile index 7d86f83147a2..8cb2bfd86e24 100644 --- a/www/mod_layout22/Makefile +++ b/www/mod_layout22/Makefile @@ -16,7 +16,6 @@ CONFLICTS= mod_layout-3.* mod_layout-4.* PORTSCOUT= limit:^5 USE_APACHE= 22 -LATEST_LINK= mod_layout22 MAKE_ARGS+= builddir=${WRKSRC} diff --git a/www/mod_macro22/Makefile b/www/mod_macro22/Makefile index cd0f197df34c..96306788ebb3 100644 --- a/www/mod_macro22/Makefile +++ b/www/mod_macro22/Makefile @@ -19,7 +19,6 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> USE_APACHE= 22 -LATEST_LINK= mod_macro22 AP_FAST_BUILD= yes AP_GENPLIST= yes PORTDOCS= ${PORTNAME}.html diff --git a/www/mod_myvhost/Makefile b/www/mod_myvhost/Makefile index 8b9a02da7de0..f2418cd9cf00 100644 --- a/www/mod_myvhost/Makefile +++ b/www/mod_myvhost/Makefile @@ -15,7 +15,6 @@ LICENSE= APACHE20 MANUAL_PACKAGE_BUILD= needs apr and apache with DBD options enabled USE_APACHE= 22+ -UNIQUENAME= ${PORTNAME} PORTDOCS= changelog.html documentation.html download.html \ index.html my.css diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile index 6928266b3461..c21c436d0095 100644 --- a/www/mod_security/Makefile +++ b/www/mod_security/Makefile @@ -58,9 +58,6 @@ FUZZYHASH_LIB_DEPENDS= libfuzzy.so:${PORTSDIR}/security/ssdeep ETCDIR= ${PREFIX}/etc/modsecurity -# ap2x- prefix OPTIONSFILE fix -OPTIONSFILE= ${PORT_DBDIR}/www_mod_security/options - REINPLACE_ARGS= -i "" AP_EXTRAS+= -DWITH_LIBXML2 CONFIGURE_ARGS+=--with-apxs=${APXS} --with-pcre=${LOCALBASE} --with-yajl=${LOCALBASE} --with-curl=${LOCALBASE} diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile index fefc9ec01328..6cfc2c1cada9 100644 --- a/www/p5-Apache-Clean2/Makefile +++ b/www/p5-Apache-Clean2/Makefile @@ -16,8 +16,6 @@ BUILD_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \ p5-HTML-Clean>=0.8:${PORTSDIR}/www/p5-HTML-Clean RUN_DEPENDS:= ${BUILD_DEPENDS} -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}2 - USES= perl5 USE_PERL5= configure USE_APACHE= 22+ diff --git a/www/pear-HTTP_FloodControl/Makefile b/www/pear-HTTP_FloodControl/Makefile index e5142a200a1c..3fae48adbf5d 100644 --- a/www/pear-HTTP_FloodControl/Makefile +++ b/www/pear-HTTP_FloodControl/Makefile @@ -11,7 +11,6 @@ COMMENT= PEAR classes to detect and protect from attempts to flood a site BUILD_DEPENDS= ${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP RUN_DEPENDS= ${PEARDIR}/HTTP.php:${PORTSDIR}/www/pear-HTTP -LATEST_LINK= pear-HTTP_FloodControl DOCS= README LICENSE OPTIONS_DEFINE= PEAR_DB PEAR_MDB PEAR_MDB2 PEAR_DB_DESC= PEAR::DB support diff --git a/www/pelican/Makefile b/www/pelican/Makefile index b8a15d074fed..4b78cbc87fc0 100644 --- a/www/pelican/Makefile +++ b/www/pelican/Makefile @@ -26,7 +26,6 @@ TEST_DEPENDS:= ${RUN_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \ OPTIONS_DEFINE= TEST -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options .include <bsd.port.options.mk> diff --git a/www/py-cssselect/Makefile b/www/py-cssselect/Makefile index eb0f372192ef..f8185a8227c0 100644 --- a/www/py-cssselect/Makefile +++ b/www/py-cssselect/Makefile @@ -14,7 +14,6 @@ COMMENT= Cssselect parses CSS3 Selectors and translates them to XPath 1.0 LICENSE= BSD3CLAUSE OPTIONS_DEFINE= DOCS -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options USES= python USE_PYTHON= distutils autoplist diff --git a/www/py-cssutils/Makefile b/www/py-cssutils/Makefile index a394b92d66c6..bbbee752ec66 100644 --- a/www/py-cssutils/Makefile +++ b/www/py-cssutils/Makefile @@ -15,7 +15,6 @@ COMMENT= CSS Cascading Style Sheets library for Python LICENSE= LGPL3 OPTIONS_DEFINE= EXAMPLES -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options USE_PYTHON= autoplist distutils USES= python zip diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile index d2232cae39ad..b6f850dd8da0 100644 --- a/www/py-django-cms/Makefile +++ b/www/py-django-cms/Makefile @@ -23,7 +23,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.7.3:${PORTSDIR}/databases/py-south USES= python:2 USE_PYTHON= autoplist distutils -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_MULTI= DATABASE OPTIONS_DEFAULT=SQLITE OPTIONS_MULTI_DATABASE=MYSQL PGSQL SQLITE diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile index 98ef62853af2..93b25743be28 100644 --- a/www/py-django-photologue/Makefile +++ b/www/py-django-photologue/Makefile @@ -19,7 +19,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py- USES= python zip USE_PYTHON= autoplist distutils -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= TAGGING OPTIONS_DEFAULT= TAGGING diff --git a/www/py-qp/Makefile b/www/py-qp/Makefile index 7ef58d9ed5ce..6f1d73cf5fa3 100644 --- a/www/py-qp/Makefile +++ b/www/py-qp/Makefile @@ -17,7 +17,6 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}durus>=0:${PORTSDIR}/devel/py-durus \ RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options USE_PYTHON= distutils USES= python:2 diff --git a/www/py-qpy/Makefile b/www/py-qpy/Makefile index b857cbd3c8af..a04898b5e017 100644 --- a/www/py-qpy/Makefile +++ b/www/py-qpy/Makefile @@ -13,7 +13,6 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Generating safely-quoted html text from python code OPTIONS_DEFINE= DOCS -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options USE_PYTHON= autoplist distutils USES= python:2 diff --git a/www/py-rhodecode/Makefile b/www/py-rhodecode/Makefile index 800641aa77d5..4703d229ff44 100644 --- a/www/py-rhodecode/Makefile +++ b/www/py-rhodecode/Makefile @@ -44,7 +44,6 @@ USE_PYTHON= distutils autoplist USE_RC_SUBR= rhodecode SUB_FILES= pkg-message -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= LDAP GIT OPTIONS_DEFAULT= GIT diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile index b825f7a7e195..adbdc6ffdf27 100644 --- a/www/py-scrapy/Makefile +++ b/www/py-scrapy/Makefile @@ -23,7 +23,6 @@ USE_PYTHON= distutils autoplist OPTIONS_DEFINE= SSL OPTIONS_DEFAULT=SSL -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options .include <bsd.port.options.mk> diff --git a/www/py-turbogears/Makefile b/www/py-turbogears/Makefile index a125f0207664..3bde9dfcb90b 100644 --- a/www/py-turbogears/Makefile +++ b/www/py-turbogears/Makefile @@ -27,7 +27,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.1.2:${PORTSDIR}/www/py-cherrypy USES= gettext python:2 USE_PYTHON= distutils autoplist -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= ELIXIR NOSE SQLOBJECT SQLALCHEMY OPTIONS_DEFAULT=SQLOBJECT ELIXIR_DESC= Use Elixir as plugin diff --git a/www/py-urlgrabber/Makefile b/www/py-urlgrabber/Makefile index c5b89ce45284..63ff73389a04 100644 --- a/www/py-urlgrabber/Makefile +++ b/www/py-urlgrabber/Makefile @@ -23,7 +23,6 @@ USE_PYTHON= distutils REINPLACE_ARGS= -i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},' DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> diff --git a/www/py-ws4py/Makefile b/www/py-ws4py/Makefile index 103f2e782ef1..abb45e65ffcb 100644 --- a/www/py-ws4py/Makefile +++ b/www/py-ws4py/Makefile @@ -17,7 +17,6 @@ USE_PYTHON= distutils autoplist NO_ARCH= yes -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= CHERRYPY GEVENT TORNADO OPTIONS_DEFAULT= CHERRYPY GEVENT CHERRYPY_DESC= CherryPy server support diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile index 46c75ac0dabc..e6a5805485ab 100644 --- a/www/rubygem-rails/Makefile +++ b/www/rubygem-rails/Makefile @@ -57,7 +57,6 @@ CPE_PRODUCT= ruby_on_rails OPTIONS_DEFINE= PASSENGER MEMCACHE_CLIENT PASSENGER_DESC= Passenger backend MEMCACHE_CLIENT_DESC= MemCache-Client support -OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options MEMCACHE_CLIENT_RUN_DEPENDS= rubygem-memcache-client>=1.2.0:${PORTSDIR}/databases/rubygem-memcache-client PASSENGER_RUN_DEPENDS= rubygem-passenger>=2.2.15:${PORTSDIR}/www/rubygem-passenger diff --git a/www/rubygem-rails4/Makefile b/www/rubygem-rails4/Makefile index c02d3f22cc20..cac86ef3ecb2 100644 --- a/www/rubygem-rails4/Makefile +++ b/www/rubygem-rails4/Makefile @@ -54,7 +54,6 @@ CPE_PRODUCT= ruby_on_rails OPTIONS_DEFINE= PASSENGER MEMCACHE_CLIENT PASSENGER_DESC= Passenger backend MEMCACHE_CLIENT_DESC= MemCache-Client support -OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options MEMCACHE_CLIENT_RUN_DEPENDS= rubygem-memcache-client>=1.2.0:${PORTSDIR}/databases/rubygem-memcache-client PASSENGER_RUN_DEPENDS= rubygem-passenger>=2.2.15:${PORTSDIR}/www/rubygem-passenger diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile index 8c58a9ebf9b3..ad067731a898 100644 --- a/www/tdiary/Makefile +++ b/www/tdiary/Makefile @@ -48,10 +48,10 @@ SUB_FILES= pkg-message tdiaryinst.rb SUB_LIST+= TDIARY_LANG=${TDIARY_LANG} \ TDIARY_SCRIPT=${TDIARY_SCRIPT} WRKSRC= ${WRKDIR}/${PORTNAME}-v${PORTVERSION}.1 -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -WWWDIR= ${PREFIX}/www/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +WWWDIR= ${PREFIX}/www/${PKGBASE} -TDIARY_SCRIPT= ${UNIQUENAME}-inst.rb +TDIARY_SCRIPT= ${PKGBASE}-inst.rb #TDIARY_LANG ja:Japanese en:English .if !defined(TDIARY_LANG) || ( defined(TDIARY_LANG) && ${TDIARY_LANG} != ja ) diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi index 6a58675a1693..81790907ebc6 100644 --- a/www/xpi-adblock/Makefile.xpi +++ b/www/xpi-adblock/Makefile.xpi @@ -17,7 +17,6 @@ # MOZILLA_ADDONS/addons/${XPI_NUM} # or # MOZILLA_ADDONS/extensions/${XPI_DISTNAME} -# LATEST_LINK - Default: ${PKGBASE:S/_//g} # XPI_LIBDIR - Name of the directory to install extensions in. # Default: ${PREFIX}/lib/xpi # XPI_XPIDIR - Name of the directory to install extension's files in. @@ -70,7 +69,6 @@ PKGNAMEPREFIX?= xpi- EXTRACT_SUFX?= .xpi DISTNAME?= ${XPI_DISTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} DIST_SUBDIR?= xpi -LATEST_LINK?= ${PKGBASE:S/_//g} NO_BUILD= yes USES+= zip:infozip diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile index 6c7e9b8785e0..eba8d1ce032b 100644 --- a/x11-toolkits/py-gui/Makefile +++ b/x11-toolkits/py-gui/Makefile @@ -15,7 +15,6 @@ COMMENT= Cross-platform pythonic GUI API BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:${PORTSDIR}/devel/pyrex OPTIONS_DEFINE= DOCS EXAMPLES OPENGL -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options USE_GNOME= pygtk2 USES= python diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 0cff9f305399..11f52fbbae29 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -41,7 +41,7 @@ CFLAGS+= -I${TCL_INCLUDEDIR} TK_VER= ${PORTVERSION:R} SHORT_TK_VER= ${TK_VER:S/.//} -MAN_SUFFIX= ${LATEST_LINK} +MAN_SUFFIX= ${PKGBASE} MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER} diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile index 279fbf55d7e6..cbaf9c3d530b 100644 --- a/x11-toolkits/tk85/Makefile +++ b/x11-toolkits/tk85/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS= --enable-shared \ CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 \ ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}" -MAN_SUFFIX= ${LATEST_LINK} +MAN_SUFFIX= ${PKGBASE} INSTALL_TARGET= install @@ -73,7 +73,7 @@ PLIST_SUB+= MAN="" PLIST_SUB+= MAN="@comment " .endif -TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} +TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${PKGBASE} post-patch: ${REINPLACE_CMD} -e \ diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile index 7d420ca2e864..cad1f38697e6 100644 --- a/x11-toolkits/tk86/Makefile +++ b/x11-toolkits/tk86/Makefile @@ -45,7 +45,7 @@ CFLAGS+= -I${TCL_INCLUDEDIR} \ TK_VER= ${PORTVERSION:R} SHORT_TK_VER= ${TK_VER:S/.//} -MAN_SUFFIX= ${LATEST_LINK} +MAN_SUFFIX= ${PKGBASE} MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER} diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index e078f7ad2904..d0ee2e2618f3 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= asclock:${PORTSDIR}/x11-clocks/asclock CONFLICTS?= afterstep-2* PORTSCOUT= limit:^1\.[0-9.]*$$ -NO_LATEST_LINK= yes USES= imake USE_XORG= xpm xext x11 diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile index ba0a774b84dc..d7ecc1394e0b 100644 --- a/x11-wm/fvwm/Makefile +++ b/x11-wm/fvwm/Makefile @@ -11,8 +11,6 @@ PKGNAMESUFFIX= 1${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= The fvwm window manager -NO_LATEST_LINK= yes - USES= imake USE_XORG= xbitmaps xpm xext x11 xmu diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index 710491e1205f..5f285354b8ff 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -17,7 +17,6 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 # Other ports this port cannot coexist with CONFLICTS?= fvwm-1.* fvwm-2.[457].* -NO_LATEST_LINK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-mandoc --without-gnome --disable-gtk diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index 2574403fa00e..deb186d7474b 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -17,7 +17,6 @@ RUN_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \ gtk-xfce-engine>0:${PORTSDIR}/x11-themes/gtk-xfce-engine USES= metaport -LATEST_LINK= xfce4 OPTIONS_DEFINE= APPFINDER ICONS MIXER MOUSEPAD NOTIFY ORAGE PRINT SLIM SQUEEZE TERMINAL XPM OPTIONS_DEFAULT= APPFINDER ICONS MOUSEPAD NOTIFY ORAGE TERMINAL diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile index 561c86a71865..dd1a67751dca 100644 --- a/x11/rsibreak-kde4/Makefile +++ b/x11/rsibreak-kde4/Makefile @@ -11,8 +11,6 @@ MASTER_SITES= LOCAL/crees/${PORTNAME} \ MAINTAINER= avg@icyb.net.ua COMMENT= KDE RSI prevention tool -LATEST_LINK= ${PORTNAME}-kde4 - USES= cmake gettext tar:bzip2 USE_QT4= qmake_build moc_build rcc_build uic_build USE_KDE4= kdeprefix kdelibs automoc4 |