Page MenuHomeFreeBSD
Files F110653442

D3336.id.diff
No OneTemporary
Actions

D3336.id.diff
View Options

Index: head/CHANGES
===================================================================
--- head/CHANGES
+++ head/CHANGES
@@ -10,6 +10,14 @@
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
Index: head/Mk/bsd.database.mk
===================================================================
--- head/Mk/bsd.database.mk
+++ head/Mk/bsd.database.mk
@@ -47,7 +47,7 @@
# 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 @@
# 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 @@
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 @@
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 @@
. 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
Index: head/Mk/bsd.options.mk
===================================================================
--- head/Mk/bsd.options.mk
+++ head/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 @@
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 @@
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 @@
.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 @@
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})
Index: head/Mk/bsd.port.mk
===================================================================
--- head/Mk/bsd.port.mk
+++ head/Mk/bsd.port.mk
@@ -74,9 +74,6 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
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 @@
# 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 @@
################################################################
.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 @@
@${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 @@
@${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 @@
@${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 @@
.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 @@
${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
Index: head/Mk/bsd.sanity.mk
===================================================================
--- head/Mk/bsd.sanity.mk
+++ head/Mk/bsd.sanity.mk
@@ -159,7 +159,8 @@
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 @@
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})
Index: head/Tools/scripts/README
===================================================================
--- head/Tools/scripts/README
+++ head/Tools/scripts/README
@@ -12,8 +12,6 @@
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.
Index: head/Tools/scripts/check-latest-link
===================================================================
--- head/Tools/scripts/check-latest-link
+++ head/Tools/scripts/check-latest-link
@@ -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
Index: head/UPDATING
===================================================================
--- head/UPDATING
+++ head/UPDATING
@@ -5,6 +5,19 @@
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>
Index: head/audio/amarok-kde4/Makefile
===================================================================
--- head/audio/amarok-kde4/Makefile
+++ head/audio/amarok-kde4/Makefile
@@ -22,8 +22,6 @@
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
Index: head/audio/jack/Makefile
===================================================================
--- head/audio/jack/Makefile
+++ head/audio/jack/Makefile
@@ -32,8 +32,6 @@
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
Index: head/audio/lua51-mpd/Makefile
===================================================================
--- head/audio/lua51-mpd/Makefile
+++ head/audio/lua51-mpd/Makefile
@@ -12,7 +12,7 @@
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
Index: head/audio/py-mpd2/Makefile
===================================================================
--- head/audio/py-mpd2/Makefile
+++ head/audio/py-mpd2/Makefile
@@ -23,7 +23,6 @@
NO_ARCH= yes
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= DOCS EXAMPLES
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
Index: head/biology/ruby-bio/Makefile
===================================================================
--- head/biology/ruby-bio/Makefile
+++ head/biology/ruby-bio/Makefile
@@ -16,8 +16,6 @@
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
Index: head/chinese/joe/Makefile
===================================================================
--- head/chinese/joe/Makefile
+++ head/chinese/joe/Makefile
@@ -9,8 +9,6 @@
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
Index: head/chinese/phpbb3-tw/Makefile
===================================================================
--- head/chinese/phpbb3-tw/Makefile
+++ head/chinese/phpbb3-tw/Makefile
@@ -15,8 +15,6 @@
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
Index: head/databases/jdbm2/Makefile
===================================================================
--- head/databases/jdbm2/Makefile
+++ head/databases/jdbm2/Makefile
@@ -19,7 +19,6 @@
NO_BUILD= yes
PROJECTHOST= jdbm2
-LATEST_LINK= jdbm2
PORTDOCS= *
PORTEXAMPLES= *
Index: head/databases/luasql-mysql/Makefile
===================================================================
--- head/databases/luasql-mysql/Makefile
+++ head/databases/luasql-mysql/Makefile
@@ -53,7 +53,6 @@
IGNORE= unknown or unsupported luasql driver
.endif
-LATEST_LINK= ${PORTNAME}-${LUASQL_DRIVER}
PLIST_SUB+= LUASQL_DRIVER=${LUASQL_DRIVER}
do-install:
Index: head/databases/mariadb-client/Makefile
===================================================================
--- head/databases/mariadb-client/Makefile
+++ head/databases/mariadb-client/Makefile
@@ -4,8 +4,6 @@
PORTREVISION= 7
PKGNAMESUFFIX= 53-client
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-
COMMENT= Database client - drop-in replacement for MySQL
MASTERDIR= ${.CURDIR}/../mariadb-server
Index: head/databases/mariadb-scripts/Makefile
===================================================================
--- head/databases/mariadb-scripts/Makefile
+++ head/databases/mariadb-scripts/Makefile
@@ -7,7 +7,6 @@
LICENSE= GPLv2
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
USES= perl5
MASTERDIR= ${.CURDIR}/../mariadb-server
Index: head/databases/mariadb-server/Makefile
===================================================================
--- head/databases/mariadb-server/Makefile
+++ head/databases/mariadb-server/Makefile
@@ -20,8 +20,6 @@
LICENSE= GPLv2
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-
CONFLICTS?= mariadb5[4-9]-server-* \
mariadb1[0-9][0-9]-server-* \
mysql*-server-* \
Index: head/databases/mariadb100-server/Makefile
===================================================================
--- head/databases/mariadb100-server/Makefile
+++ head/databases/mariadb100-server/Makefile
@@ -21,7 +21,6 @@
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
Index: head/databases/pear-DoctrineDBAL/Makefile
===================================================================
--- head/databases/pear-DoctrineDBAL/Makefile
+++ head/databases/pear-DoctrineDBAL/Makefile
@@ -16,7 +16,6 @@
${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
Index: head/databases/proftpd-mod_sql_mysql/Makefile
===================================================================
--- head/databases/proftpd-mod_sql_mysql/Makefile
+++ head/databases/proftpd-mod_sql_mysql/Makefile
@@ -12,7 +12,6 @@
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
USE_MYSQL= yes
Index: head/databases/proftpd-mod_sql_odbc/Makefile
===================================================================
--- head/databases/proftpd-mod_sql_odbc/Makefile
+++ head/databases/proftpd-mod_sql_odbc/Makefile
@@ -14,7 +14,6 @@
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
CONFIGURE_ARGS= LIBS=-liodbc \
Index: head/databases/proftpd-mod_sql_sqlite/Makefile
===================================================================
--- head/databases/proftpd-mod_sql_sqlite/Makefile
+++ head/databases/proftpd-mod_sql_sqlite/Makefile
@@ -13,7 +13,6 @@
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
USE_SQLITE= yes
Index: head/databases/proftpd-mod_sql_tds/Makefile
===================================================================
--- head/databases/proftpd-mod_sql_tds/Makefile
+++ head/databases/proftpd-mod_sql_tds/Makefile
@@ -14,7 +14,6 @@
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds
Index: head/databases/py-MySQLdb/Makefile
===================================================================
--- head/databases/py-MySQLdb/Makefile
+++ head/databases/py-MySQLdb/Makefile
@@ -23,7 +23,6 @@
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)
Index: head/databases/py-pyPgSQL/Makefile
===================================================================
--- head/databases/py-pyPgSQL/Makefile
+++ head/databases/py-pyPgSQL/Makefile
@@ -25,9 +25,6 @@
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}
Index: head/databases/py-sqlalchemy-devel/Makefile
===================================================================
--- head/databases/py-sqlalchemy-devel/Makefile
+++ head/databases/py-sqlalchemy-devel/Makefile
@@ -32,9 +32,6 @@
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
Index: head/databases/py-sqlalchemy/Makefile
===================================================================
--- head/databases/py-sqlalchemy/Makefile
+++ head/databases/py-sqlalchemy/Makefile
@@ -32,9 +32,6 @@
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}
Index: head/databases/py-sqlalchemy06/Makefile
===================================================================
--- head/databases/py-sqlalchemy06/Makefile
+++ head/databases/py-sqlalchemy06/Makefile
@@ -18,9 +18,6 @@
USES= python
USE_PYTHON= distutils autoplist
-# bypass infrastructure bug
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
-
OPTIONS_DEFINE= CEXTENSIONS DOCS EXAMPLES NOSE
OPTIONS_MULTI= BACKEND
Index: head/databases/ruby-bdb/Makefile
===================================================================
--- head/databases/ruby-bdb/Makefile
+++ head/databases/ruby-bdb/Makefile
@@ -20,7 +20,6 @@
USE_BDB= yes
OPTIONS_DEFINE= DOCS EXAMPLES
-OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
Index: head/databases/rubygem-activerecord/Makefile
===================================================================
--- head/databases/rubygem-activerecord/Makefile
+++ head/databases/rubygem-activerecord/Makefile
@@ -26,7 +26,6 @@
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
Index: head/databases/squirrel-sql/Makefile
===================================================================
--- head/databases/squirrel-sql/Makefile
+++ head/databases/squirrel-sql/Makefile
@@ -20,7 +20,7 @@
SUB_FILES= squirrel-sql
-DATADIR= ${PREFIX}/share/java/${UNIQUENAME}
+DATADIR= ${PREFIX}/share/java/${PKGBASE}
DESKTOP_ENTRIES="Squirrel-SQL Client" \
"${COMMENT}" \
Index: head/deskutils/gworkspace-gwmetadata/Makefile
===================================================================
--- head/deskutils/gworkspace-gwmetadata/Makefile
+++ head/deskutils/gworkspace-gwmetadata/Makefile
@@ -22,7 +22,6 @@
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
Index: head/devel/cl-asdf/bsd.cl-asdf.mk
===================================================================
--- head/devel/cl-asdf/bsd.cl-asdf.mk
+++ head/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 @@
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
Index: head/devel/glib20-reference/bsd.gnome-reference.mk
===================================================================
--- head/devel/glib20-reference/bsd.gnome-reference.mk
+++ head/devel/glib20-reference/bsd.gnome-reference.mk
@@ -22,9 +22,6 @@
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}
Index: head/devel/insight/Makefile
===================================================================
--- head/devel/insight/Makefile
+++ head/devel/insight/Makefile
@@ -6,8 +6,6 @@
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]*
Index: head/devel/llvm-cheri/Makefile
===================================================================
--- head/devel/llvm-cheri/Makefile
+++ head/devel/llvm-cheri/Makefile
@@ -15,7 +15,6 @@
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
Index: head/devel/llvm-devel/Makefile
===================================================================
--- head/devel/llvm-devel/Makefile
+++ head/devel/llvm-devel/Makefile
@@ -14,7 +14,6 @@
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
Index: head/devel/llvm33/Makefile
===================================================================
--- head/devel/llvm33/Makefile
+++ head/devel/llvm33/Makefile
@@ -15,7 +15,6 @@
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
Index: head/devel/llvm34/Makefile
===================================================================
--- head/devel/llvm34/Makefile
+++ head/devel/llvm34/Makefile
@@ -15,7 +15,6 @@
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
Index: head/devel/llvm35/Makefile
===================================================================
--- head/devel/llvm35/Makefile
+++ head/devel/llvm35/Makefile
@@ -15,7 +15,6 @@
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
Index: head/devel/llvm36/Makefile
===================================================================
--- head/devel/llvm36/Makefile
+++ head/devel/llvm36/Makefile
@@ -16,7 +16,6 @@
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
Index: head/devel/llvm37/Makefile
===================================================================
--- head/devel/llvm37/Makefile
+++ head/devel/llvm37/Makefile
@@ -20,7 +20,6 @@
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
Index: head/devel/ocaml-camlp5/Makefile
===================================================================
--- head/devel/ocaml-camlp5/Makefile
+++ head/devel/ocaml-camlp5/Makefile
@@ -8,7 +8,7 @@
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}
Index: head/devel/oniguruma/Makefile
===================================================================
--- head/devel/oniguruma/Makefile
+++ head/devel/oniguruma/Makefile
@@ -15,7 +15,6 @@
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/*
Index: head/devel/oniguruma4/Makefile
===================================================================
--- head/devel/oniguruma4/Makefile
+++ head/devel/oniguruma4/Makefile
@@ -15,7 +15,6 @@
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-NO_LATEST_LINK= yes
USES= libtool
CONFLICTS= oniguruma-2.*
GNU_CONFIGURE= yes
Index: head/devel/php-memoize/Makefile
===================================================================
--- head/devel/php-memoize/Makefile
+++ head/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
Index: head/devel/py-funcparserlib/Makefile
===================================================================
--- head/devel/py-funcparserlib/Makefile
+++ head/devel/py-funcparserlib/Makefile
@@ -17,7 +17,7 @@
USE_PYTHON= distutils autoplist
PORTDOCS= README doc
-DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}
+DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
OPTIONS_DEFINE= DOCS
Index: head/devel/py-gdata/Makefile
===================================================================
--- head/devel/py-gdata/Makefile
+++ head/devel/py-gdata/Makefile
@@ -23,8 +23,6 @@
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>
Index: head/devel/py-ice/Makefile
===================================================================
--- head/devel/py-ice/Makefile
+++ head/devel/py-ice/Makefile
@@ -30,7 +30,6 @@
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
Index: head/devel/py-jsonrpclib/Makefile
===================================================================
--- head/devel/py-jsonrpclib/Makefile
+++ head/devel/py-jsonrpclib/Makefile
@@ -16,7 +16,6 @@
USES= python:2
USE_PYTHON= distutils autoplist
-OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
OPTIONS_DEFINE= CJSON
CJSON_DESC= Use cjson instead of json or simplejson
Index: head/devel/py-memoryprofiler/Makefile
===================================================================
--- head/devel/py-memoryprofiler/Makefile
+++ head/devel/py-memoryprofiler/Makefile
@@ -17,8 +17,6 @@
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
Index: head/devel/py-qt4-qscintilla2/Makefile
===================================================================
--- head/devel/py-qt4-qscintilla2/Makefile
+++ head/devel/py-qt4-qscintilla2/Makefile
@@ -28,7 +28,6 @@
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} \
Index: head/devel/py-qt4/bsd.pyqt.mk
===================================================================
--- head/devel/py-qt4/bsd.pyqt.mk
+++ head/devel/py-qt4/bsd.pyqt.mk
@@ -98,7 +98,6 @@
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 \
Index: head/devel/py-rauth/Makefile
===================================================================
--- head/devel/py-rauth/Makefile
+++ head/devel/py-rauth/Makefile
@@ -20,7 +20,6 @@
OPTIONS_DEFINE= TESTS
TESTS_DESC= Install tools for unit testing
-OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options
USE_GITHUB= yes
GH_ACCOUNT= litl
Index: head/devel/py-tables/Makefile
===================================================================
--- head/devel/py-tables/Makefile
+++ head/devel/py-tables/Makefile
@@ -30,7 +30,6 @@
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>
Index: head/devel/py-twisted/Makefile
===================================================================
--- head/devel/py-twisted/Makefile
+++ head/devel/py-twisted/Makefile
@@ -16,7 +16,6 @@
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
Index: head/devel/py-urwid/Makefile
===================================================================
--- head/devel/py-urwid/Makefile
+++ head/devel/py-urwid/Makefile
@@ -12,8 +12,6 @@
LICENSE= LGPL21
-# Bypass ports infrastructure bug
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= EXAMPLES
USES= python
Index: head/devel/py-watchdog/Makefile
===================================================================
--- head/devel/py-watchdog/Makefile
+++ head/devel/py-watchdog/Makefile
@@ -22,7 +22,6 @@
GH_ACCOUNT= gorakhargosh
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= DOCS
PORTDOCS= *
Index: head/devel/py-wheel/Makefile
===================================================================
--- head/devel/py-wheel/Makefile
+++ head/devel/py-wheel/Makefile
@@ -14,7 +14,6 @@
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
Index: head/devel/ruby-langscan/Makefile
===================================================================
--- head/devel/ruby-langscan/Makefile
+++ head/devel/ruby-langscan/Makefile
@@ -30,7 +30,6 @@
DOCSDIR= ${RUBY_MODDOCDIR}
OPTIONS_DEFINE= DOCS
-OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options
CFLAGS+= -fPIC
Index: head/devel/rubygem-app_config/Makefile
===================================================================
--- head/devel/rubygem-app_config/Makefile
+++ head/devel/rubygem-app_config/Makefile
@@ -15,7 +15,6 @@
MONGO_DESC= mongo backend support
SQLITE3_DESC= sqlite3 backend support
-OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options
.include <bsd.port.options.mk>
Index: head/devel/subcommander2/Makefile
===================================================================
--- head/devel/subcommander2/Makefile
+++ head/devel/subcommander2/Makefile
@@ -16,7 +16,6 @@
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}
Index: head/devel/subversion-static/Makefile
===================================================================
--- head/devel/subversion-static/Makefile
+++ head/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
Index: head/devel/subversion/Makefile.common
===================================================================
--- head/devel/subversion/Makefile.common
+++ head/devel/subversion/Makefile.common
@@ -28,7 +28,6 @@
.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
Index: head/devel/subversion17/Makefile.common
===================================================================
--- head/devel/subversion17/Makefile.common
+++ head/devel/subversion17/Makefile.common
@@ -31,7 +31,6 @@
.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
Index: head/dns/samba-nsupdate/Makefile
===================================================================
--- head/dns/samba-nsupdate/Makefile
+++ head/dns/samba-nsupdate/Makefile
@@ -41,8 +41,8 @@
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 @@
-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>
Index: head/editors/2bsd-vi/Makefile
===================================================================
--- head/editors/2bsd-vi/Makefile
+++ head/editors/2bsd-vi/Makefile
@@ -17,7 +17,7 @@
USES= tar:bzip2
-PRESERVEDIR= /var/preserve/${UNIQUENAME}
+PRESERVEDIR= /var/preserve/${PKGBASE}
PLIST_SUB= PRESERVEDIR="${PRESERVEDIR}"
post-extract: .SILENT
Index: head/editors/emacs-nox11/Makefile
===================================================================
--- head/editors/emacs-nox11/Makefile
+++ head/editors/emacs-nox11/Makefile
@@ -10,6 +10,5 @@
EMACS_NO_X11_SLAVE= yes
MASTERDIR= ${.CURDIR}/../emacs
-LATEST_LINK= emacs-nox11
.include "${MASTERDIR}/Makefile"
Index: head/editors/libreoffice-i18n/Makefile
===================================================================
--- head/editors/libreoffice-i18n/Makefile
+++ head/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
Index: head/editors/openoffice-4/Makefile
===================================================================
--- head/editors/openoffice-4/Makefile
+++ head/editors/openoffice-4/Makefile
@@ -111,8 +111,6 @@
INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX}
EXECBASE?= openoffice-${AOOSUFFIX}
-NO_LATEST_LINK= yes
-
ONLY_FOR_ARCHS= i386 amd64
USE_GL= gl glu
Index: head/editors/openoffice-devel/Makefile
===================================================================
--- head/editors/openoffice-devel/Makefile
+++ head/editors/openoffice-devel/Makefile
@@ -123,8 +123,6 @@
INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX}
EXECBASE?= openoffice-${AOOSUFFIX}
-NO_LATEST_LINK= yes
-
ONLY_FOR_ARCHS= i386 amd64
USE_GL= gl glu
Index: head/emulators/generator-cbiere/Makefile
===================================================================
--- head/emulators/generator-cbiere/Makefile
+++ head/emulators/generator-cbiere/Makefile
@@ -19,14 +19,14 @@
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
Index: head/emulators/i386-wine-devel/Makefile.inc
===================================================================
--- head/emulators/i386-wine-devel/Makefile.inc
+++ head/emulators/i386-wine-devel/Makefile.inc
@@ -28,7 +28,7 @@
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
Index: head/emulators/i386-wine/Makefile.inc
===================================================================
--- head/emulators/i386-wine/Makefile.inc
+++ head/emulators/i386-wine/Makefile.inc
@@ -28,7 +28,7 @@
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
Index: head/emulators/linux_base-c6/Makefile
===================================================================
--- head/emulators/linux_base-c6/Makefile
+++ head/emulators/linux_base-c6/Makefile
@@ -175,7 +175,6 @@
.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
Index: head/emulators/linux_base-f10/Makefile
===================================================================
--- head/emulators/linux_base-f10/Makefile
+++ head/emulators/linux_base-f10/Makefile
@@ -146,7 +146,6 @@
.endif
.if (${ARCH} == "amd64")
-LATEST_LINK:= ${PKGBASE:C/linux/linux32/}
ARCH= i386
.endif
Index: head/emulators/mupen64plus-core/Makefile
===================================================================
--- head/emulators/mupen64plus-core/Makefile
+++ head/emulators/mupen64plus-core/Makefile
@@ -24,7 +24,6 @@
OPTFLAGS= #
MAKE_ENV+= OPTFLAGS="${OPTFLAGS}"
-OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
.include "${.CURDIR}/../mupen64plus-core/Makefile.common"
.include <bsd.port.mk>
Index: head/emulators/virtualbox-ose-additions/Makefile
===================================================================
--- head/emulators/virtualbox-ose-additions/Makefile
+++ head/emulators/virtualbox-ose-additions/Makefile
@@ -22,7 +22,6 @@
CPE_VENDOR= oracle
CPE_PRODUCT= vm_virtualbox
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
PATCHDIR= ${.CURDIR}/../${PORTNAME}/files
WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
USE_RC_SUBR= vboxguest vboxservice
Index: head/emulators/virtualbox-ose-kmod/Makefile
===================================================================
--- head/emulators/virtualbox-ose-kmod/Makefile
+++ head/emulators/virtualbox-ose-kmod/Makefile
@@ -22,7 +22,6 @@
CPE_PRODUCT= vm_virtualbox
USES= cpe kmod tar:bzip2
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
PATCHDIR= ${.CURDIR}/../${PORTNAME}/files
WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
USE_RC_SUBR= vboxnet
Index: head/finance/ledgersmb12/Makefile
===================================================================
--- head/finance/ledgersmb12/Makefile
+++ head/finance/ledgersmb12/Makefile
@@ -15,8 +15,6 @@
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
Index: head/ftp/curl-hiphop/Makefile
===================================================================
--- head/ftp/curl-hiphop/Makefile
+++ head/ftp/curl-hiphop/Makefile
@@ -15,7 +15,6 @@
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
Index: head/ftp/proftpd-mod_geoip/Makefile
===================================================================
--- head/ftp/proftpd-mod_geoip/Makefile
+++ head/ftp/proftpd-mod_geoip/Makefile
@@ -14,7 +14,6 @@
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
INCLUDEDIRS= ${LOCALBASE}/include
Index: head/ftp/py-pyftpdlib/Makefile
===================================================================
--- head/ftp/py-pyftpdlib/Makefile
+++ head/ftp/py-pyftpdlib/Makefile
@@ -21,9 +21,6 @@
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
Index: head/games/doom-data/Makefile
===================================================================
--- head/games/doom-data/Makefile
+++ head/games/doom-data/Makefile
@@ -28,7 +28,6 @@
SUB_FILES= pkg-message
-LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}
DATADIR= ${DMDIR}
DOOM_DISTFILES= doom1.wad.bz2
Index: head/games/ioquake3-devel-server/Makefile
===================================================================
--- head/games/ioquake3-devel-server/Makefile
+++ head/games/ioquake3-devel-server/Makefile
@@ -7,7 +7,6 @@
MAINTAINER= kamikaze@bsdforen.de
COMMENT= Ioquake3 development snapshot dedicated server
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
MASTERDIR= ${.CURDIR}/../${PORTNAME}
IOQ3= SERVER GAMELIBS
Index: head/games/ioquake3-server/Makefile
===================================================================
--- head/games/ioquake3-server/Makefile
+++ head/games/ioquake3-server/Makefile
@@ -7,7 +7,6 @@
MAINTAINER= kamikaze@bsdforen.de
COMMENT= Ioquake3 dedicated server
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
MASTERDIR= ${.CURDIR}/../${PORTNAME}
IOQ3= SERVER GAMELIBS
Index: head/games/iourbanterror-server/Makefile
===================================================================
--- head/games/iourbanterror-server/Makefile
+++ head/games/iourbanterror-server/Makefile
@@ -7,7 +7,6 @@
MAINTAINER= kamikaze@bsdforen.de
COMMENT= Urban Terror dedicated server
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
MASTERDIR= ${.CURDIR}/../${PORTNAME}
IOQ3= SERVER
Index: head/games/linux-quake3/Makefile
===================================================================
--- head/games/linux-quake3/Makefile
+++ head/games/linux-quake3/Makefile
@@ -35,7 +35,6 @@
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
Index: head/games/nethack33/Makefile
===================================================================
--- head/games/nethack33/Makefile
+++ head/games/nethack33/Makefile
@@ -12,7 +12,6 @@
COMMENT= Dungeon explorin', slashin', hackin' game
WRKSRC= ${WRKDIR}/${TRUEPORTNAME}-${PORTVERSION}
-LATEST_LINK= ${TRUEPORTNAME}33${PKGNAMESUFFIX}
USES= gmake tar:tgz
MAKE_ENV= GRAPHICS="${GRAPHICS}"
Index: head/games/openarena-server/Makefile
===================================================================
--- head/games/openarena-server/Makefile
+++ head/games/openarena-server/Makefile
@@ -7,7 +7,6 @@
MAINTAINER= kamikaze@bsdforen.de
COMMENT= OpenArena dedicated server
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
MASTERDIR= ${.CURDIR}/../${PORTNAME}
IOQ3= SERVER
Index: head/games/opengfx/Makefile
===================================================================
--- head/games/opengfx/Makefile
+++ head/games/opengfx/Makefile
@@ -16,7 +16,6 @@
USES= zip
NO_BUILD= yes
-LATEST_LINK= openttd-${PORTNAME}
# upstream zipped a tar file, unpack it.
post-extract:
Index: head/games/opensfx/Makefile
===================================================================
--- head/games/opensfx/Makefile
+++ head/games/opensfx/Makefile
@@ -20,7 +20,6 @@
USES= zip
NO_BUILD= yes
-LATEST_LINK= openttd-${PORTNAME}
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/openttd/baseset/opensfx
Index: head/games/quake-source/Makefile
===================================================================
--- head/games/quake-source/Makefile
+++ head/games/quake-source/Makefile
@@ -16,8 +16,6 @@
NO_BUILD= yes
NO_WRKSUBDIR= yes
-LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}
-
OPTIONS_DEFINE= QUAKEWORLD
OPTIONS_DEFAULT= QUAKEWORLD
Index: head/games/quake2-3zb2/Makefile
===================================================================
--- head/games/quake2-3zb2/Makefile
+++ head/games/quake2-3zb2/Makefile
@@ -21,7 +21,7 @@
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
Index: head/games/quake2-ctf/Makefile
===================================================================
--- head/games/quake2-ctf/Makefile
+++ head/games/quake2-ctf/Makefile
@@ -17,8 +17,7 @@
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
Index: head/games/quake2-data/Makefile
===================================================================
--- head/games/quake2-data/Makefile
+++ head/games/quake2-data/Makefile
@@ -16,9 +16,8 @@
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
Index: head/games/quake2-extras/Makefile
===================================================================
--- head/games/quake2-extras/Makefile
+++ head/games/quake2-extras/Makefile
@@ -10,7 +10,7 @@
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 @@
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
Index: head/games/quake2-lights/Makefile
===================================================================
--- head/games/quake2-lights/Makefile
+++ head/games/quake2-lights/Makefile
@@ -19,7 +19,7 @@
BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}/src
ALL_TARGET= release
-DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK}
+DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
OPTIONS_DEFINE= DOCS
Index: head/games/quake2-matrix/Makefile
===================================================================
--- head/games/quake2-matrix/Makefile
+++ head/games/quake2-matrix/Makefile
@@ -16,7 +16,7 @@
BUILD_WRKSRC= ${WRKSRC}/MatrixFixSource
ALL_TARGET= release
-DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK}
+DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
OPTIONS_DEFINE= DOCS
Index: head/games/quake2-psychomod/Makefile
===================================================================
--- head/games/quake2-psychomod/Makefile
+++ head/games/quake2-psychomod/Makefile
@@ -15,7 +15,7 @@
BUILD_WRKSRC= ${WRKSRC}/src
ALL_TARGET= release
-DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK}
+DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
OPTIONS_DEFINE= DOCS
Index: head/games/quake2-source/Makefile
===================================================================
--- head/games/quake2-source/Makefile
+++ head/games/quake2-source/Makefile
@@ -25,8 +25,6 @@
OPTIONS_SUB= yes
-LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}
-
DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
.include <bsd.port.options.mk>
Index: head/games/quake2-zaero/Makefile
===================================================================
--- head/games/quake2-zaero/Makefile
+++ head/games/quake2-zaero/Makefile
@@ -17,7 +17,7 @@
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
Index: head/games/tuxpaint-fonts/Makefile
===================================================================
--- head/games/tuxpaint-fonts/Makefile
+++ head/games/tuxpaint-fonts/Makefile
@@ -42,9 +42,6 @@
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.
Index: head/games/xpilot-ng-server/Makefile
===================================================================
--- head/games/xpilot-ng-server/Makefile
+++ head/games/xpilot-ng-server/Makefile
@@ -23,8 +23,6 @@
CONFIGURE_ARGS= --program-prefix=""
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-
PKGFILESUFFIX= ${PKGNAMESUFFIX:S/-/./}
DESCR= ${PKGDIR}/pkg-descr${PKGFILESUFFIX}
PLIST= ${PKGDIR}/pkg-plist${PKGFILESUFFIX}
Index: head/graphics/frei0r-plugins/Makefile
===================================================================
--- head/graphics/frei0r-plugins/Makefile
+++ head/graphics/frei0r-plugins/Makefile
@@ -8,9 +8,6 @@
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
Index: head/graphics/jgraph/Makefile
===================================================================
--- head/graphics/jgraph/Makefile
+++ head/graphics/jgraph/Makefile
@@ -11,7 +11,6 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Generates postscript graphs
-NO_LATEST_LINK= yes
EXTRACT_CMD= uncompress
EXTRACT_BEFORE_ARGS= -c
EXTRACT_AFTER_ARGS= | ${SH}
Index: head/graphics/libgnomecanvasmm26/Makefile
===================================================================
--- head/graphics/libgnomecanvasmm26/Makefile
+++ head/graphics/libgnomecanvasmm26/Makefile
@@ -15,8 +15,6 @@
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
Index: head/graphics/py-aafigure/Makefile
===================================================================
--- head/graphics/py-aafigure/Makefile
+++ head/graphics/py-aafigure/Makefile
@@ -19,8 +19,8 @@
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= *
Index: head/graphics/py-actdiag/Makefile
===================================================================
--- head/graphics/py-actdiag/Makefile
+++ head/graphics/py-actdiag/Makefile
@@ -20,7 +20,7 @@
USES= python
USE_PYTHON= autoplist distutils
-DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}
+DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
PORTDOCS= README.rst
OPTIONS_DEFINE= DOCS
Index: head/graphics/py-blockdiag/Makefile
===================================================================
--- head/graphics/py-blockdiag/Makefile
+++ head/graphics/py-blockdiag/Makefile
@@ -17,8 +17,6 @@
${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
Index: head/graphics/py-imaging/Makefile
===================================================================
--- head/graphics/py-imaging/Makefile
+++ head/graphics/py-imaging/Makefile
@@ -16,8 +16,6 @@
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
Index: head/graphics/py-nwdiag/Makefile
===================================================================
--- head/graphics/py-nwdiag/Makefile
+++ head/graphics/py-nwdiag/Makefile
@@ -20,8 +20,8 @@
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= *
Index: head/graphics/py-opengl/Makefile
===================================================================
--- head/graphics/py-opengl/Makefile
+++ head/graphics/py-opengl/Makefile
@@ -19,7 +19,6 @@
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
Index: head/graphics/py-seqdiag/Makefile
===================================================================
--- head/graphics/py-seqdiag/Makefile
+++ head/graphics/py-seqdiag/Makefile
@@ -20,8 +20,8 @@
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= *
Index: head/graphics/py-sorl-thumbnail/Makefile
===================================================================
--- head/graphics/py-sorl-thumbnail/Makefile
+++ head/graphics/py-sorl-thumbnail/Makefile
@@ -20,7 +20,6 @@
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
Index: head/graphics/py-webcolors/Makefile
===================================================================
--- head/graphics/py-webcolors/Makefile
+++ head/graphics/py-webcolors/Makefile
@@ -15,7 +15,7 @@
USES= python
USE_PYTHON= distutils autoplist
-DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}
+DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
PORTDOCS= README
OPTIONS_DEFINE= DOCS
Index: head/graphics/quat-gui/Makefile
===================================================================
--- head/graphics/quat-gui/Makefile
+++ head/graphics/quat-gui/Makefile
@@ -18,8 +18,6 @@
OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-
USE_XORG= xext
USE_GL= gl glut
GNU_CONFIGURE= yes
@@ -29,7 +27,7 @@
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 @@
${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 @@
s|^(SUBDIRS.*)doc|\1|' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e \
- 's|@PACKAGE@|${UNIQUENAME}|' \
+ 's|@PACKAGE@|${PKGBASE}|' \
${WRKSRC}/doc/Makefile.in
post-install:
Index: head/irc/py-gozerbot/Makefile
===================================================================
--- head/irc/py-gozerbot/Makefile
+++ head/irc/py-gozerbot/Makefile
@@ -19,7 +19,6 @@
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
Index: head/japanese/p5-MeCab/Makefile
===================================================================
--- head/japanese/p5-MeCab/Makefile
+++ head/japanese/p5-MeCab/Makefile
@@ -21,7 +21,6 @@
USE_PERL5= configure
OPTIONS_DEFINE= EXAMPLES
-OPTIONSFILE= ${PORT_DBDIR}/ja-p5-${PORTNAME}/options
.include <bsd.port.pre.mk>
Index: head/japanese/ruby-mecab/Makefile
===================================================================
--- head/japanese/ruby-mecab/Makefile
+++ head/japanese/ruby-mecab/Makefile
@@ -22,7 +22,6 @@
INSTALL_TARGET= site-install
OPTIONS_DEFINE= DOCS EXAMPLES
-OPTIONSFILE= ${PORT_DBDIR}/ja-ruby-${PORTNAME}/options
.include <bsd.port.pre.mk>
Index: head/java/netty/Makefile
===================================================================
--- head/java/netty/Makefile
+++ head/java/netty/Makefile
@@ -17,8 +17,8 @@
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 \
Index: head/java/openjdk6-jre/Makefile
===================================================================
--- head/java/openjdk6-jre/Makefile
+++ head/java/openjdk6-jre/Makefile
@@ -7,6 +7,5 @@
BUILD_JRE= yes
MASTERDIR= ${.CURDIR}/../openjdk6
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
.include "${MASTERDIR}/Makefile"
Index: head/java/openjdk7-jre/Makefile
===================================================================
--- head/java/openjdk7-jre/Makefile
+++ head/java/openjdk7-jre/Makefile
@@ -5,8 +5,6 @@
MAINTAINER= java@FreeBSD.org
COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION}
-LATEST_LINK= openjdk7${PKGNAMESUFFIX}
-
BUILD_JRE= yes
MASTERDIR= ${.CURDIR}/../openjdk7
Index: head/java/openjdk7/Makefile
===================================================================
--- head/java/openjdk7/Makefile
+++ head/java/openjdk7/Makefile
@@ -58,8 +58,6 @@
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
Index: head/lang/fpc-units/Makefile
===================================================================
--- head/lang/fpc-units/Makefile
+++ head/lang/fpc-units/Makefile
@@ -96,8 +96,6 @@
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 \
Index: head/lang/fpc/Makefile
===================================================================
--- head/lang/fpc/Makefile
+++ head/lang/fpc/Makefile
@@ -26,8 +26,6 @@
ONLY_FOR_ARCHS= i386 amd64
BOOTVER= 2.6.4
-OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
-
OPT?=-CX
FPCSRCDIR= ${PORTNAME}-${PORTVERSION}
Index: head/lang/gcc46/Makefile
===================================================================
--- head/lang/gcc46/Makefile
+++ head/lang/gcc46/Makefile
@@ -26,7 +26,6 @@
.endif
CPE_VENDOR= gnu
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
# of executables and directories once installed.
Index: head/lang/gcc47/Makefile
===================================================================
--- head/lang/gcc47/Makefile
+++ head/lang/gcc47/Makefile
@@ -27,7 +27,6 @@
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.
Index: head/lang/gcc48/Makefile
===================================================================
--- head/lang/gcc48/Makefile
+++ head/lang/gcc48/Makefile
@@ -26,7 +26,6 @@
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.
Index: head/lang/gcc49/Makefile
===================================================================
--- head/lang/gcc49/Makefile
+++ head/lang/gcc49/Makefile
@@ -25,7 +25,6 @@
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
Index: head/lang/gcc5-devel/Makefile
===================================================================
--- head/lang/gcc5-devel/Makefile
+++ head/lang/gcc5-devel/Makefile
@@ -25,7 +25,6 @@
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
Index: head/lang/gcc5/Makefile
===================================================================
--- head/lang/gcc5/Makefile
+++ head/lang/gcc5/Makefile
@@ -26,7 +26,6 @@
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
Index: head/lang/gcc6-devel/Makefile
===================================================================
--- head/lang/gcc6-devel/Makefile
+++ head/lang/gcc6-devel/Makefile
@@ -25,7 +25,6 @@
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
Index: head/lang/php5/Makefile
===================================================================
--- head/lang/php5/Makefile
+++ head/lang/php5/Makefile
@@ -13,8 +13,6 @@
LICENSE= PHP301
-LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
USES= tar:bzip2 cpe
CPE_PRODUCT= php
NO_OPTIONS_SORT=yes
Index: head/lang/php55/Makefile
===================================================================
--- head/lang/php55/Makefile
+++ head/lang/php55/Makefile
@@ -13,8 +13,6 @@
LICENSE= PHP301
-LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
USES= tar:bzip2 cpe
CPE_PRODUCT= php
NO_OPTIONS_SORT=yes
Index: head/lang/php56/Makefile
===================================================================
--- head/lang/php56/Makefile
+++ head/lang/php56/Makefile
@@ -13,8 +13,6 @@
LICENSE= PHP301
-LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
USES= tar:bzip2 cpe
CPE_PRODUCT= php
NO_OPTIONS_SORT=yes
Index: head/lang/py-mx-base/Makefile
===================================================================
--- head/lang/py-mx-base/Makefile
+++ head/lang/py-mx-base/Makefile
@@ -21,7 +21,6 @@
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
Index: head/lang/ruby20/Makefile
===================================================================
--- head/lang/ruby20/Makefile
+++ head/lang/ruby20/Makefile
@@ -45,8 +45,6 @@
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
Index: head/lang/ruby21/Makefile
===================================================================
--- head/lang/ruby21/Makefile
+++ head/lang/ruby21/Makefile
@@ -44,7 +44,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
Index: head/lang/ruby22/Makefile
===================================================================
--- head/lang/ruby22/Makefile
+++ head/lang/ruby22/Makefile
@@ -44,7 +44,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
Index: head/lang/tcl84/Makefile
===================================================================
--- head/lang/tcl84/Makefile
+++ head/lang/tcl84/Makefile
@@ -37,7 +37,7 @@
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} \
Index: head/lang/tcl86/Makefile
===================================================================
--- head/lang/tcl86/Makefile
+++ head/lang/tcl86/Makefile
@@ -37,7 +37,7 @@
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} \
Index: head/mail/addresses-goodies/Makefile
===================================================================
--- head/mail/addresses-goodies/Makefile
+++ head/mail/addresses-goodies/Makefile
@@ -20,7 +20,6 @@
libAddresses.so:${PORTSDIR}/mail/addresses
USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
-UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
WRKSRC= ${WRKDIR}/Addresses-${PORTVERSION}/Goodies
post-patch:
Index: head/mail/p5-IMAP-Admin/Makefile
===================================================================
--- head/mail/p5-IMAP-Admin/Makefile
+++ head/mail/p5-IMAP-Admin/Makefile
@@ -14,7 +14,7 @@
USES= perl5
USE_PERL5= configure
-EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME}
+EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE}
OPTIONS_DEFINE= EXAMPLES
Index: head/mail/popa3d/Makefile
===================================================================
--- head/mail/popa3d/Makefile
+++ head/mail/popa3d/Makefile
@@ -14,7 +14,6 @@
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
Index: head/mail/postfix-policyd-spf-python/Makefile
===================================================================
--- head/mail/postfix-policyd-spf-python/Makefile
+++ head/mail/postfix-policyd-spf-python/Makefile
@@ -33,7 +33,6 @@
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
Index: head/mail/qmail-ldap/Makefile
===================================================================
--- head/mail/qmail-ldap/Makefile
+++ head/mail/qmail-ldap/Makefile
@@ -26,6 +26,5 @@
MASTERDIR= ${.CURDIR}/../qmail
DESCR= ${.CURDIR}/pkg-descr
PATCHDIR= ${.CURDIR}/files
-LATEST_LINK= ${PORTNAME}-ldap
.include "${MASTERDIR}/Makefile"
Index: head/mail/qmail-mysql/Makefile
===================================================================
--- head/mail/qmail-mysql/Makefile
+++ head/mail/qmail-mysql/Makefile
@@ -19,6 +19,5 @@
MASTERDIR= ${.CURDIR}/../qmail
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
.include "${MASTERDIR}/Makefile"
Index: head/mail/qmail-spamcontrol/Makefile
===================================================================
--- head/mail/qmail-spamcontrol/Makefile
+++ head/mail/qmail-spamcontrol/Makefile
@@ -22,7 +22,6 @@
QMAIL_DIST= ${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX}
SPAMCONTROL_DIST= spamcontrol-${SPAMCONTROL_VERSION}.tgz
SPAMCONTROL_VERSION= 2731
-LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
SLAVE_SPAMCONTROL= yes
Index: head/mail/qmail-tls/Makefile
===================================================================
--- head/mail/qmail-tls/Makefile
+++ head/mail/qmail-tls/Makefile
@@ -20,6 +20,5 @@
# Local overrides
MASTERDIR= ${.CURDIR}/../qmail
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
.include "${MASTERDIR}/Makefile"
Index: head/mail/wanderlust-devel/Makefile
===================================================================
--- head/mail/wanderlust-devel/Makefile
+++ head/mail/wanderlust-devel/Makefile
@@ -21,7 +21,6 @@
SNAPDATE= 20141209
CONFLICTS= wanderlust-*-2.14.*
-NO_LATEST_LINK= yes
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_DEFAULT=DOCS EXAMPLES
Index: head/math/py-matplotlib/Makefile
===================================================================
--- head/math/py-matplotlib/Makefile
+++ head/math/py-matplotlib/Makefile
@@ -32,7 +32,6 @@
WXAGGBACKEND_DESC= WXAgg backend support
PORTEXAMPLES= *
-UNIQUENAME= ${PORTNAME}
.include <bsd.port.options.mk>
Index: head/math/py-symeig/Makefile
===================================================================
--- head/math/py-symeig/Makefile
+++ head/math/py-symeig/Makefile
@@ -16,9 +16,6 @@
BUILD_DEPENDS+= ${PYNUMPY}
RUN_DEPENDS+= ${PYNUMPY}
-LATEST_LINK= py-${PORTNAME}
-OPTIONSFILE= ${PORT_DBDIR}/py-numpy/options
-
USES= fortran python:2
USE_PYTHON= distutils autoplist
Index: head/math/sage/Makefile
===================================================================
--- head/math/sage/Makefile
+++ head/math/sage/Makefile
@@ -48,8 +48,6 @@
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}"
Index: head/math/vtk5/Makefile
===================================================================
--- head/math/vtk5/Makefile
+++ head/math/vtk5/Makefile
@@ -7,7 +7,6 @@
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
Index: head/math/vtk6/Makefile
===================================================================
--- head/math/vtk6/Makefile
+++ head/math/vtk6/Makefile
@@ -23,8 +23,6 @@
# TODO
# * VTK Groups
-UNIQUENAME= ${PKGBASE}
-
CONFLICTS= vtk-4*
USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER}
USE_XORG= xt
Index: head/misc/e2fsprogs-libuuid/Makefile
===================================================================
--- head/misc/e2fsprogs-libuuid/Makefile
+++ head/misc/e2fsprogs-libuuid/Makefile
@@ -12,7 +12,6 @@
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
Index: head/misc/gnu-watch/Makefile
===================================================================
--- head/misc/gnu-watch/Makefile
+++ head/misc/gnu-watch/Makefile
@@ -16,15 +16,15 @@
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>
Index: head/misc/nut/Makefile
===================================================================
--- head/misc/nut/Makefile
+++ head/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 @@
USES= gmake
-DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}
+DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
PORTDOCS= CREDITS README nut.html
OPTIONS_DEFINE= FLTK DOCS
Index: head/misc/tellico-kde4/Makefile
===================================================================
--- head/misc/tellico-kde4/Makefile
+++ head/misc/tellico-kde4/Makefile
@@ -18,8 +18,6 @@
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
Index: head/multimedia/gstreamer-qt4/Makefile
===================================================================
--- head/multimedia/gstreamer-qt4/Makefile
+++ head/multimedia/gstreamer-qt4/Makefile
@@ -12,8 +12,6 @@
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
Index: head/multimedia/kplayer-kde4/Makefile
===================================================================
--- head/multimedia/kplayer-kde4/Makefile
+++ head/multimedia/kplayer-kde4/Makefile
@@ -12,8 +12,6 @@
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
Index: head/multimedia/spotify-websocket-api/Makefile
===================================================================
--- head/multimedia/spotify-websocket-api/Makefile
+++ head/multimedia/spotify-websocket-api/Makefile
@@ -25,7 +25,6 @@
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 \
Index: head/net-im/kmess-kde4/Makefile
===================================================================
--- head/net-im/kmess-kde4/Makefile
+++ head/net-im/kmess-kde4/Makefile
@@ -12,8 +12,6 @@
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
Index: head/net-im/py-xmpppy-yahoo/Makefile
===================================================================
--- head/net-im/py-xmpppy-yahoo/Makefile
+++ head/net-im/py-xmpppy-yahoo/Makefile
@@ -26,10 +26,10 @@
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 @@
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 @@
${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}
Index: head/net-mgmt/netustad/Makefile
===================================================================
--- head/net-mgmt/netustad/Makefile
+++ head/net-mgmt/netustad/Makefile
@@ -19,8 +19,6 @@
OPTIONS_DEFAULT=SSL
SSL_DESC= Use netUstad with SSL support
-LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
-
SSL_USE= OPENSSL=yes
SSL_CONFIGURE_WITH= ssl
Index: head/net-mgmt/zabbix2-agent/Makefile
===================================================================
--- head/net-mgmt/zabbix2-agent/Makefile
+++ head/net-mgmt/zabbix2-agent/Makefile
@@ -9,7 +9,6 @@
PLIST= ${PKGDIR}/pkg-plist.agent
-OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
OPTIONS_DEFINE= IPV6
OPTIONS_DEFAULT= IPV6
Index: head/net-mgmt/zabbix2-frontend/Makefile
===================================================================
--- head/net-mgmt/zabbix2-frontend/Makefile
+++ head/net-mgmt/zabbix2-frontend/Makefile
@@ -15,7 +15,6 @@
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
Index: head/net-mgmt/zabbix2-server/Makefile
===================================================================
--- head/net-mgmt/zabbix2-server/Makefile
+++ head/net-mgmt/zabbix2-server/Makefile
@@ -65,8 +65,6 @@
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
Index: head/net-mgmt/zabbix22-agent/Makefile
===================================================================
--- head/net-mgmt/zabbix22-agent/Makefile
+++ head/net-mgmt/zabbix22-agent/Makefile
@@ -9,7 +9,6 @@
PLIST= ${PKGDIR}/pkg-plist.agent
-OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
OPTIONS_DEFINE= IPV6
OPTIONS_DEFAULT= IPV6
Index: head/net-mgmt/zabbix22-frontend/Makefile
===================================================================
--- head/net-mgmt/zabbix22-frontend/Makefile
+++ head/net-mgmt/zabbix22-frontend/Makefile
@@ -15,7 +15,6 @@
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
Index: head/net-mgmt/zabbix22-server/Makefile
===================================================================
--- head/net-mgmt/zabbix22-server/Makefile
+++ head/net-mgmt/zabbix22-server/Makefile
@@ -66,8 +66,6 @@
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
Index: head/net-mgmt/zabbix24-agent/Makefile
===================================================================
--- head/net-mgmt/zabbix24-agent/Makefile
+++ head/net-mgmt/zabbix24-agent/Makefile
@@ -8,7 +8,6 @@
MASTERDIR= ${.CURDIR}/../zabbix24-server
PLIST= ${PKGDIR}/pkg-plist.agent
-OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
OPTIONS_DEFINE= IPV6
OPTIONS_DEFAULT= IPV6
Index: head/net-mgmt/zabbix24-frontend/Makefile
===================================================================
--- head/net-mgmt/zabbix24-frontend/Makefile
+++ head/net-mgmt/zabbix24-frontend/Makefile
@@ -15,7 +15,6 @@
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
Index: head/net-mgmt/zabbix24-server/Makefile
===================================================================
--- head/net-mgmt/zabbix24-server/Makefile
+++ head/net-mgmt/zabbix24-server/Makefile
@@ -67,7 +67,6 @@
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
Index: head/net/freeradius3/Makefile
===================================================================
--- head/net/freeradius3/Makefile
+++ head/net/freeradius3/Makefile
@@ -80,11 +80,7 @@
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
Index: head/net/hping-devel/Makefile
===================================================================
--- head/net/hping-devel/Makefile
+++ head/net/hping-devel/Makefile
@@ -13,7 +13,6 @@
LIB_DEPENDS= libtcl84.so:${PORTSDIR}/lang/tcl84
-NO_LATEST_LINK= yes
CONFLICTS= hping-[0-9]*
GNU_CONFIGURE= yes
Index: head/net/isc-dhcp41-server/Makefile
===================================================================
--- head/net/isc-dhcp41-server/Makefile
+++ head/net/isc-dhcp41-server/Makefile
@@ -23,8 +23,6 @@
SUBSYS?= server
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
-UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
OPTIONS_DEFINE= IPV6
OPTIONS_DEFAULT=IPV6
Index: head/net/isc-dhcp42-server/Makefile
===================================================================
--- head/net/isc-dhcp42-server/Makefile
+++ head/net/isc-dhcp42-server/Makefile
@@ -25,8 +25,6 @@
SUBSYS?= server
#WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
-UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
OPTIONS_DEFINE= IPV6
OPTIONS_DEFAULT=IPV6
Index: head/net/isc-dhcp43-server/Makefile
===================================================================
--- head/net/isc-dhcp43-server/Makefile
+++ head/net/isc-dhcp43-server/Makefile
@@ -25,8 +25,6 @@
SUBSYS?= server
#WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
-UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
OPTIONS_DEFINE= IPV6
OPTIONS_DEFAULT=IPV6
Index: head/net/mosh/Makefile
===================================================================
--- head/net/mosh/Makefile
+++ head/net/mosh/Makefile
@@ -23,8 +23,6 @@
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 \
Index: head/net/openldap24-server/Makefile
===================================================================
--- head/net/openldap24-server/Makefile
+++ head/net/openldap24-server/Makefile
@@ -29,8 +29,6 @@
.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
Index: head/net/openmpi/Makefile
===================================================================
--- head/net/openmpi/Makefile
+++ head/net/openmpi/Makefile
@@ -24,7 +24,7 @@
USE_PERL5= build
MPIBASE?= mpi
-MPIDIR?= ${MPIBASE}/${UNIQUENAME}
+MPIDIR?= ${MPIBASE}/${PKGBASE}
PLIST_SUB+= MPIBASE=${MPIBASE}
PLIST_SUB+= MPIDIR=${MPIDIR}
Index: head/net/proftpd-mod_ldap/Makefile
===================================================================
--- head/net/proftpd-mod_ldap/Makefile
+++ head/net/proftpd-mod_ldap/Makefile
@@ -13,7 +13,6 @@
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
USE_OPENLDAP= yes
Index: head/net/py-gntp/Makefile
===================================================================
--- head/net/py-gntp/Makefile
+++ head/net/py-gntp/Makefile
@@ -14,7 +14,6 @@
GH_ACCOUNT= kfdm
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= DOCS
USE_GITHUB= yes
Index: head/net/py-pynsq/Makefile
===================================================================
--- head/net/py-pynsq/Makefile
+++ head/net/py-pynsq/Makefile
@@ -20,7 +20,6 @@
OPTIONS_DEFINE= TESTS
TESTS_DESC= Install tools to run test suite
-OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options
USES= python
USE_PYTHON= distutils autoplist
Index: head/net/samba36/Makefile
===================================================================
--- head/net/samba36/Makefile
+++ head/net/samba36/Makefile
@@ -22,7 +22,6 @@
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
Index: head/news/inn/Makefile
===================================================================
--- head/news/inn/Makefile
+++ head/news/inn/Makefile
@@ -17,8 +17,6 @@
USE_RC_SUBR= innd
SUB_FILES= pkg-install
-LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
-
USES= cpe gmake perl5 uidfix
CPE_VENDOR= isc
Index: head/news/py-pynzb/Makefile
===================================================================
--- head/news/py-pynzb/Makefile
+++ head/news/py-pynzb/Makefile
@@ -16,7 +16,6 @@
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
Index: head/ports-mgmt/pkg-devel/Makefile
===================================================================
--- head/ports-mgmt/pkg-devel/Makefile
+++ head/ports-mgmt/pkg-devel/Makefile
@@ -34,12 +34,10 @@
.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 @@
.endif
.endif
-.else
-LATEST_LINK= pkg-devel
.endif
.undef INSTALLS_DEPENDS
Index: head/ports-mgmt/pkg/Makefile
===================================================================
--- head/ports-mgmt/pkg/Makefile
+++ head/ports-mgmt/pkg/Makefile
@@ -37,7 +37,6 @@
.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)
Index: head/print/cups-base/Makefile
===================================================================
--- head/print/cups-base/Makefile
+++ head/print/cups-base/Makefile
@@ -20,8 +20,6 @@
CONFLICTS= LPRng-[0-9]*
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-
USES+= cpe gmake iconv pkgconfig tar:bzip2
CPE_VENDOR= apple
DESTDIRNAME= DSTROOT
@@ -53,7 +51,6 @@
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
Index: head/print/py-pollyreports/Makefile
===================================================================
--- head/print/py-pollyreports/Makefile
+++ head/print/py-pollyreports/Makefile
@@ -15,7 +15,6 @@
USES= python:2
USE_PYTHON= distutils autoplist
-OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
OPTIONS_DEFINE= REPORTLAB
REPORTLAB_DESC= Install Reportlab2
Index: head/science/py-mdp/Makefile
===================================================================
--- head/science/py-mdp/Makefile
+++ head/science/py-mdp/Makefile
@@ -19,8 +19,6 @@
USES= python
USE_PYTHON= distutils autoplist
-OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options
-
OPTIONS_DEFINE= LIBSVM PP SCIPY
LIBSVM_DESC= Provide the LibSVMClassifier node
Index: head/security/botan110/Makefile
===================================================================
--- head/security/botan110/Makefile
+++ head/security/botan110/Makefile
@@ -14,8 +14,6 @@
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
Index: head/security/gag/Makefile
===================================================================
--- head/security/gag/Makefile
+++ head/security/gag/Makefile
@@ -11,8 +11,6 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Stacheldraht (DOS attack) agent detector
-LATEST_LINK= gag-sickenscan
-
ALL_TARGET= gag
PORTDOCS= README
Index: head/security/krb5-111/Makefile
===================================================================
--- head/security/krb5-111/Makefile
+++ head/security/krb5-111/Makefile
@@ -25,7 +25,6 @@
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
Index: head/security/krb5-112/Makefile
===================================================================
--- head/security/krb5-112/Makefile
+++ head/security/krb5-112/Makefile
@@ -22,7 +22,6 @@
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
Index: head/security/krb5-appl/Makefile
===================================================================
--- head/security/krb5-appl/Makefile
+++ head/security/krb5-appl/Makefile
@@ -18,7 +18,6 @@
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
Index: head/security/proftpd-mod_clamav/Makefile
===================================================================
--- head/security/proftpd-mod_clamav/Makefile
+++ head/security/proftpd-mod_clamav/Makefile
@@ -14,7 +14,6 @@
DESCR= ${.CURDIR}/pkg-descr
-LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
GH_TAGNAME= v${DISTVERSION}
Index: head/security/py-itsdangerous/Makefile
===================================================================
--- head/security/py-itsdangerous/Makefile
+++ head/security/py-itsdangerous/Makefile
@@ -15,7 +15,6 @@
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
Index: head/security/py-keyring/Makefile
===================================================================
--- head/security/py-keyring/Makefile
+++ head/security/py-keyring/Makefile
@@ -15,8 +15,6 @@
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner
-LATEST_LINK= py-${PORTNAME}
-
USES= python zip
USE_PYTHON= distutils autoplist
Index: head/security/rubygem-net-ssh/Makefile
===================================================================
--- head/security/rubygem-net-ssh/Makefile
+++ head/security/rubygem-net-ssh/Makefile
@@ -15,7 +15,6 @@
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
Index: head/security/shibboleth2-sp/Makefile
===================================================================
--- head/security/shibboleth2-sp/Makefile
+++ head/security/shibboleth2-sp/Makefile
@@ -19,8 +19,6 @@
USE_LDCONFIG= yes
USE_RC_SUBR= shibboleth-sp
-LATEST_LINK= shibboleth2-sp
-
USERS= shibd
GROUPS= shibd
Index: head/sysutils/backuppc-devel/Makefile
===================================================================
--- head/sysutils/backuppc-devel/Makefile
+++ head/sysutils/backuppc-devel/Makefile
@@ -15,8 +15,6 @@
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
Index: head/sysutils/bacula-docs/Makefile
===================================================================
--- head/sysutils/bacula-docs/Makefile
+++ head/sysutils/bacula-docs/Makefile
@@ -13,8 +13,6 @@
NO_BUILD= yes
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-
PORTDOCS= *.pdf
do-install:
Index: head/sysutils/bacula5-docs/Makefile
===================================================================
--- head/sysutils/bacula5-docs/Makefile
+++ head/sysutils/bacula5-docs/Makefile
@@ -15,8 +15,6 @@
NO_BUILD= yes
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-
PORTDOCS= *.pdf
do-install:
Index: head/sysutils/bareos-docs/Makefile
===================================================================
--- head/sysutils/bareos-docs/Makefile
+++ head/sysutils/bareos-docs/Makefile
@@ -13,8 +13,6 @@
NO_BUILD= yes
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-
PORTDOCS= *.pdf
do-extract:
Index: head/sysutils/boxbackup-devel/Makefile
===================================================================
--- head/sysutils/boxbackup-devel/Makefile
+++ head/sysutils/boxbackup-devel/Makefile
@@ -17,8 +17,6 @@
SVNVERSION= 0.11_trunk_2979
-NO_LATEST_LINK= yes
-
USES= perl5 tar:tgz
USE_OPENSSL= yes
GNU_CONFIGURE= yes
Index: head/sysutils/cdrtools-devel/Makefile
===================================================================
--- head/sysutils/cdrtools-devel/Makefile
+++ head/sysutils/cdrtools-devel/Makefile
@@ -49,7 +49,6 @@
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(.+)$//}
Index: head/sysutils/cfengine32/Makefile
===================================================================
--- head/sysutils/cfengine32/Makefile
+++ head/sysutils/cfengine32/Makefile
@@ -14,7 +14,6 @@
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-*
Index: head/sysutils/cfengine34/Makefile
===================================================================
--- head/sysutils/cfengine34/Makefile
+++ head/sysutils/cfengine34/Makefile
@@ -14,7 +14,6 @@
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 34
-LATEST_LINK= cfengine34
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
Index: head/sysutils/cfengine36/Makefile
===================================================================
--- head/sysutils/cfengine36/Makefile
+++ head/sysutils/cfengine36/Makefile
@@ -17,7 +17,6 @@
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 36
-LATEST_LINK= cfengine36
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
Index: head/sysutils/cfengine37/Makefile
===================================================================
--- head/sysutils/cfengine37/Makefile
+++ head/sysutils/cfengine37/Makefile
@@ -18,7 +18,6 @@
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 37
-LATEST_LINK= cfengine37
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
Index: head/sysutils/knutclient-kde4/Makefile
===================================================================
--- head/sysutils/knutclient-kde4/Makefile
+++ head/sysutils/knutclient-kde4/Makefile
@@ -18,6 +18,5 @@
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>
Index: head/sysutils/pear-Log/Makefile
===================================================================
--- head/sysutils/pear-Log/Makefile
+++ head/sysutils/pear-Log/Makefile
@@ -13,7 +13,6 @@
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
Index: head/sysutils/py-supervisor/Makefile
===================================================================
--- head/sysutils/py-supervisor/Makefile
+++ head/sysutils/py-supervisor/Makefile
@@ -18,7 +18,6 @@
OPTIONS_DEFINE= TESTS
TESTS_DESC= Install mock for running unit tests
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
.include <bsd.port.options.mk>
Index: head/textproc/apache-solr/Makefile
===================================================================
--- head/textproc/apache-solr/Makefile
+++ head/textproc/apache-solr/Makefile
@@ -22,7 +22,6 @@
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
USE_JAVA= yes
PORTEXAMPLES= *
-LATEST_LINK= apache-solr
USE_RC_SUBR= solr
CPE_PRODUCT= solr
Index: head/textproc/flip/Makefile
===================================================================
--- head/textproc/flip/Makefile
+++ head/textproc/flip/Makefile
@@ -11,8 +11,6 @@
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
Index: head/textproc/py-genshi/Makefile
===================================================================
--- head/textproc/py-genshi/Makefile
+++ head/textproc/py-genshi/Makefile
@@ -15,7 +15,6 @@
LICENSE= BSD3CLAUSE
OPTIONS_DEFINE= BABEL
-OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options
BABEL_DESC= I18n support through the Babel plugin
USES= python
Index: head/textproc/ruby-xmlscan/Makefile
===================================================================
--- head/textproc/ruby-xmlscan/Makefile
+++ head/textproc/ruby-xmlscan/Makefile
@@ -11,7 +11,6 @@
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
Index: head/textproc/sphinxsearch-devel/Makefile
===================================================================
--- head/textproc/sphinxsearch-devel/Makefile
+++ head/textproc/sphinxsearch-devel/Makefile
@@ -21,8 +21,6 @@
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.
Index: head/www/apache22-event-mpm/Makefile
===================================================================
--- head/www/apache22-event-mpm/Makefile
+++ head/www/apache22-event-mpm/Makefile
@@ -6,7 +6,6 @@
WITH_MPM= event
-LATEST_LINK= apache22-${WITH_MPM}-mpm
DESCR= ${.CURDIR}/pkg-descr
PORT_OPTIONS+= CGID
Index: head/www/apache22-itk-mpm/Makefile
===================================================================
--- head/www/apache22-itk-mpm/Makefile
+++ head/www/apache22-itk-mpm/Makefile
@@ -18,7 +18,6 @@
WITH_MPM= itk
-LATEST_LINK= apache22-${WITH_MPM}-mpm
DESCR= ${.CURDIR}/pkg-descr
MPM_ITK_VERSION?= 20110321-01
Index: head/www/apache22-peruser-mpm/Makefile
===================================================================
--- head/www/apache22-peruser-mpm/Makefile
+++ head/www/apache22-peruser-mpm/Makefile
@@ -11,7 +11,6 @@
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
Index: head/www/apache22-worker-mpm/Makefile
===================================================================
--- head/www/apache22-worker-mpm/Makefile
+++ head/www/apache22-worker-mpm/Makefile
@@ -6,7 +6,6 @@
WITH_MPM= worker
-LATEST_LINK= apache22-${WITH_MPM}-mpm
DESCR= ${.CURDIR}/pkg-descr
PORT_OPTIONS+= CGID
Index: head/www/apache22/Makefile.modules
===================================================================
--- head/www/apache22/Makefile.modules
+++ head/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
Index: head/www/apache24/Makefile.modules
===================================================================
--- head/www/apache24/Makefile.modules
+++ head/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
Index: head/www/autoindex2/Makefile
===================================================================
--- head/www/autoindex2/Makefile
+++ head/www/autoindex2/Makefile
@@ -16,7 +16,6 @@
USE_PHP= session
DEFAULT_VERSIONS+= php=5
CONFLICTS= AutoIndex-1*
-LATEST_LINK= AutoIndex2
NO_BUILD= yes
INSTALLDIR?= ${WWWDIR}
Index: head/www/cocoon/Makefile
===================================================================
--- head/www/cocoon/Makefile
+++ head/www/cocoon/Makefile
@@ -19,7 +19,6 @@
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
Index: head/www/dillo2/Makefile
===================================================================
--- head/www/dillo2/Makefile
+++ head/www/dillo2/Makefile
@@ -23,7 +23,6 @@
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
Index: head/www/free-sa-devel/Makefile
===================================================================
--- head/www/free-sa-devel/Makefile
+++ head/www/free-sa-devel/Makefile
@@ -14,7 +14,6 @@
LICENSE= GPLv3
CONFLICTS= free-sa-[0-9]*
-LATEST_LINK= free-sa-devel
WWWDIR?= ${PREFIX}/www/${PORTNAME}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
Index: head/www/gaeutilities/Makefile
===================================================================
--- head/www/gaeutilities/Makefile
+++ head/www/gaeutilities/Makefile
@@ -17,7 +17,6 @@
WRKSRC= ${WRKDIR}/joerussbowman-gaeutilities-ea3f7e1
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= DOCS
do-build:
Index: head/www/geronimo/Makefile
===================================================================
--- head/www/geronimo/Makefile
+++ head/www/geronimo/Makefile
@@ -50,7 +50,6 @@
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} \
Index: head/www/linux-opera/Makefile
===================================================================
--- head/www/linux-opera/Makefile
+++ head/www/linux-opera/Makefile
@@ -31,8 +31,8 @@
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 @@
@${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
Index: head/www/mod_auth_kerb2/Makefile
===================================================================
--- head/www/mod_auth_kerb2/Makefile
+++ head/www/mod_auth_kerb2/Makefile
@@ -17,7 +17,6 @@
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE
LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE
-LATEST_LINK= mod_auth_kerb2
PORTSCOUT= limit:^5.4
USE_APACHE= 22+
Index: head/www/mod_extract_forwarded/Makefile
===================================================================
--- head/www/mod_extract_forwarded/Makefile
+++ head/www/mod_extract_forwarded/Makefile
@@ -23,10 +23,6 @@
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}
Index: head/www/mod_layout22/Makefile
===================================================================
--- head/www/mod_layout22/Makefile
+++ head/www/mod_layout22/Makefile
@@ -16,7 +16,6 @@
PORTSCOUT= limit:^5
USE_APACHE= 22
-LATEST_LINK= mod_layout22
MAKE_ARGS+= builddir=${WRKSRC}
Index: head/www/mod_macro22/Makefile
===================================================================
--- head/www/mod_macro22/Makefile
+++ head/www/mod_macro22/Makefile
@@ -19,7 +19,6 @@
.include <bsd.port.options.mk>
USE_APACHE= 22
-LATEST_LINK= mod_macro22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
PORTDOCS= ${PORTNAME}.html
Index: head/www/mod_myvhost/Makefile
===================================================================
--- head/www/mod_myvhost/Makefile
+++ head/www/mod_myvhost/Makefile
@@ -15,7 +15,6 @@
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
Index: head/www/mod_security/Makefile
===================================================================
--- head/www/mod_security/Makefile
+++ head/www/mod_security/Makefile
@@ -58,9 +58,6 @@
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}
Index: head/www/p5-Apache-Clean2/Makefile
===================================================================
--- head/www/p5-Apache-Clean2/Makefile
+++ head/www/p5-Apache-Clean2/Makefile
@@ -16,8 +16,6 @@
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+
Index: head/www/pear-HTTP_FloodControl/Makefile
===================================================================
--- head/www/pear-HTTP_FloodControl/Makefile
+++ head/www/pear-HTTP_FloodControl/Makefile
@@ -11,7 +11,6 @@
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
Index: head/www/pelican/Makefile
===================================================================
--- head/www/pelican/Makefile
+++ head/www/pelican/Makefile
@@ -26,7 +26,6 @@
${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
OPTIONS_DEFINE= TEST
-OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options
.include <bsd.port.options.mk>
Index: head/www/py-cssselect/Makefile
===================================================================
--- head/www/py-cssselect/Makefile
+++ head/www/py-cssselect/Makefile
@@ -14,7 +14,6 @@
LICENSE= BSD3CLAUSE
OPTIONS_DEFINE= DOCS
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
USES= python
USE_PYTHON= distutils autoplist
Index: head/www/py-cssutils/Makefile
===================================================================
--- head/www/py-cssutils/Makefile
+++ head/www/py-cssutils/Makefile
@@ -15,7 +15,6 @@
LICENSE= LGPL3
OPTIONS_DEFINE= EXAMPLES
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
USE_PYTHON= autoplist distutils
USES= python zip
Index: head/www/py-django-cms/Makefile
===================================================================
--- head/www/py-django-cms/Makefile
+++ head/www/py-django-cms/Makefile
@@ -23,7 +23,6 @@
USES= python:2
USE_PYTHON= autoplist distutils
-OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
OPTIONS_MULTI= DATABASE
OPTIONS_DEFAULT=SQLITE
OPTIONS_MULTI_DATABASE=MYSQL PGSQL SQLITE
Index: head/www/py-django-photologue/Makefile
===================================================================
--- head/www/py-django-photologue/Makefile
+++ head/www/py-django-photologue/Makefile
@@ -19,7 +19,6 @@
USES= python zip
USE_PYTHON= autoplist distutils
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= TAGGING
OPTIONS_DEFAULT= TAGGING
Index: head/www/py-qp/Makefile
===================================================================
--- head/www/py-qp/Makefile
+++ head/www/py-qp/Makefile
@@ -17,7 +17,6 @@
RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= DOCS EXAMPLES
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
USE_PYTHON= distutils
USES= python:2
Index: head/www/py-qpy/Makefile
===================================================================
--- head/www/py-qpy/Makefile
+++ head/www/py-qpy/Makefile
@@ -13,7 +13,6 @@
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
Index: head/www/py-rhodecode/Makefile
===================================================================
--- head/www/py-rhodecode/Makefile
+++ head/www/py-rhodecode/Makefile
@@ -44,7 +44,6 @@
USE_RC_SUBR= rhodecode
SUB_FILES= pkg-message
-OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= LDAP GIT
OPTIONS_DEFAULT= GIT
Index: head/www/py-scrapy/Makefile
===================================================================
--- head/www/py-scrapy/Makefile
+++ head/www/py-scrapy/Makefile
@@ -23,7 +23,6 @@
OPTIONS_DEFINE= SSL
OPTIONS_DEFAULT=SSL
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
.include <bsd.port.options.mk>
Index: head/www/py-turbogears/Makefile
===================================================================
--- head/www/py-turbogears/Makefile
+++ head/www/py-turbogears/Makefile
@@ -27,7 +27,6 @@
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
Index: head/www/py-urlgrabber/Makefile
===================================================================
--- head/www/py-urlgrabber/Makefile
+++ head/www/py-urlgrabber/Makefile
@@ -23,7 +23,6 @@
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>
Index: head/www/py-ws4py/Makefile
===================================================================
--- head/www/py-ws4py/Makefile
+++ head/www/py-ws4py/Makefile
@@ -17,7 +17,6 @@
NO_ARCH= yes
-OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= CHERRYPY GEVENT TORNADO
OPTIONS_DEFAULT= CHERRYPY GEVENT
CHERRYPY_DESC= CherryPy server support
Index: head/www/rubygem-rails/Makefile
===================================================================
--- head/www/rubygem-rails/Makefile
+++ head/www/rubygem-rails/Makefile
@@ -57,7 +57,6 @@
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
Index: head/www/rubygem-rails4/Makefile
===================================================================
--- head/www/rubygem-rails4/Makefile
+++ head/www/rubygem-rails4/Makefile
@@ -54,7 +54,6 @@
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
Index: head/www/tdiary/Makefile
===================================================================
--- head/www/tdiary/Makefile
+++ head/www/tdiary/Makefile
@@ -48,10 +48,10 @@
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 )
Index: head/www/xpi-adblock/Makefile.xpi
===================================================================
--- head/www/xpi-adblock/Makefile.xpi
+++ head/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 @@
EXTRACT_SUFX?= .xpi
DISTNAME?= ${XPI_DISTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
DIST_SUBDIR?= xpi
-LATEST_LINK?= ${PKGBASE:S/_//g}
NO_BUILD= yes
USES+= zip:infozip
Index: head/x11-toolkits/py-gui/Makefile
===================================================================
--- head/x11-toolkits/py-gui/Makefile
+++ head/x11-toolkits/py-gui/Makefile
@@ -15,7 +15,6 @@
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
Index: head/x11-toolkits/tk84/Makefile
===================================================================
--- head/x11-toolkits/tk84/Makefile
+++ head/x11-toolkits/tk84/Makefile
@@ -41,7 +41,7 @@
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}
Index: head/x11-toolkits/tk85/Makefile
===================================================================
--- head/x11-toolkits/tk85/Makefile
+++ head/x11-toolkits/tk85/Makefile
@@ -32,7 +32,7 @@
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="@comment "
.endif
-TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
+TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${PKGBASE}
post-patch:
${REINPLACE_CMD} -e \
Index: head/x11-toolkits/tk86/Makefile
===================================================================
--- head/x11-toolkits/tk86/Makefile
+++ head/x11-toolkits/tk86/Makefile
@@ -45,7 +45,7 @@
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}
Index: head/x11-wm/afterstep/Makefile
===================================================================
--- head/x11-wm/afterstep/Makefile
+++ head/x11-wm/afterstep/Makefile
@@ -16,7 +16,6 @@
CONFLICTS?= afterstep-2*
PORTSCOUT= limit:^1\.[0-9.]*$$
-NO_LATEST_LINK= yes
USES= imake
USE_XORG= xpm xext x11
Index: head/x11-wm/fvwm/Makefile
===================================================================
--- head/x11-wm/fvwm/Makefile
+++ head/x11-wm/fvwm/Makefile
@@ -11,8 +11,6 @@
MAINTAINER= dinoex@FreeBSD.org
COMMENT= The fvwm window manager
-NO_LATEST_LINK= yes
-
USES= imake
USE_XORG= xbitmaps xpm xext x11 xmu
Index: head/x11-wm/fvwm2/Makefile
===================================================================
--- head/x11-wm/fvwm2/Makefile
+++ head/x11-wm/fvwm2/Makefile
@@ -17,7 +17,6 @@
# 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
Index: head/x11-wm/xfce4/Makefile
===================================================================
--- head/x11-wm/xfce4/Makefile
+++ head/x11-wm/xfce4/Makefile
@@ -17,7 +17,6 @@
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
Index: head/x11/rsibreak-kde4/Makefile
===================================================================
--- head/x11/rsibreak-kde4/Makefile
+++ head/x11/rsibreak-kde4/Makefile
@@ -11,8 +11,6 @@
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

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 22, 12:08 PM (52 m, 34 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16771135
Default Alt Text
D3336.id.diff (128 KB)

Event Timeline