Date: Mon, 17 Aug 2015 14:20:41 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394508 - in head: . Mk Tools/scripts audio/amarok-kde4 audio/jack audio/lua51-mpd audio/py-mpd2 biology/ruby-bio chinese/joe chinese/phpbb3-tw databases/jdbm2 databases/luasql-mysql da... Message-ID: <201508171420.t7HEKfgZ044105@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Aug 17 14:20:40 2015 New Revision: 394508 URL: https://svnweb.freebsd.org/changeset/ports/394508 Log: Remove UNIQUENAME and LATEST_LINK. UNIQUENAME was never unique, it was only used by USE_LDCONFIG and now, we won't have conflicts there. Use PKGBASE instead of LATEST_LINK in PKGLATESTFILE, the *only* consumer is pkg-devel, and it works just fine without LATEST_LINK as pkg-devel has the correct PKGNAME anyway. Now that UNIQUENAME is gone, OPTIONSFILE is too. (it's been called OPTIONS_FILE now.) Reviewed by: antoine, bapt Exp-run by: antoine Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D3336 Deleted: head/Tools/scripts/check-latest-link Modified: head/CHANGES head/Mk/bsd.database.mk head/Mk/bsd.options.mk head/Mk/bsd.port.mk head/Mk/bsd.sanity.mk head/Tools/scripts/README head/UPDATING head/audio/amarok-kde4/Makefile head/audio/jack/Makefile head/audio/lua51-mpd/Makefile head/audio/py-mpd2/Makefile head/biology/ruby-bio/Makefile head/chinese/joe/Makefile head/chinese/phpbb3-tw/Makefile head/databases/jdbm2/Makefile head/databases/luasql-mysql/Makefile head/databases/mariadb-client/Makefile head/databases/mariadb-scripts/Makefile head/databases/mariadb-server/Makefile head/databases/mariadb100-server/Makefile head/databases/pear-DoctrineDBAL/Makefile head/databases/proftpd-mod_sql_mysql/Makefile head/databases/proftpd-mod_sql_odbc/Makefile head/databases/proftpd-mod_sql_sqlite/Makefile head/databases/proftpd-mod_sql_tds/Makefile head/databases/py-MySQLdb/Makefile head/databases/py-pyPgSQL/Makefile head/databases/py-sqlalchemy-devel/Makefile head/databases/py-sqlalchemy/Makefile head/databases/py-sqlalchemy06/Makefile head/databases/ruby-bdb/Makefile head/databases/rubygem-activerecord/Makefile head/databases/squirrel-sql/Makefile head/deskutils/gworkspace-gwmetadata/Makefile head/devel/cl-asdf/bsd.cl-asdf.mk head/devel/glib20-reference/bsd.gnome-reference.mk head/devel/insight/Makefile head/devel/llvm-cheri/Makefile head/devel/llvm-devel/Makefile head/devel/llvm33/Makefile head/devel/llvm34/Makefile head/devel/llvm35/Makefile head/devel/llvm36/Makefile head/devel/llvm37/Makefile head/devel/ocaml-camlp5/Makefile head/devel/oniguruma/Makefile head/devel/oniguruma4/Makefile head/devel/php-memoize/Makefile head/devel/py-funcparserlib/Makefile head/devel/py-gdata/Makefile head/devel/py-ice/Makefile head/devel/py-jsonrpclib/Makefile head/devel/py-memoryprofiler/Makefile head/devel/py-qt4-qscintilla2/Makefile head/devel/py-qt4/bsd.pyqt.mk head/devel/py-rauth/Makefile head/devel/py-tables/Makefile head/devel/py-twisted/Makefile head/devel/py-urwid/Makefile head/devel/py-watchdog/Makefile head/devel/py-wheel/Makefile head/devel/ruby-langscan/Makefile head/devel/rubygem-app_config/Makefile head/devel/subcommander2/Makefile head/devel/subversion-static/Makefile head/devel/subversion/Makefile.common head/devel/subversion17/Makefile.common head/dns/samba-nsupdate/Makefile head/editors/2bsd-vi/Makefile head/editors/emacs-nox11/Makefile head/editors/libreoffice-i18n/Makefile head/editors/openoffice-4/Makefile head/editors/openoffice-devel/Makefile head/emulators/generator-cbiere/Makefile head/emulators/i386-wine-devel/Makefile.inc head/emulators/i386-wine/Makefile.inc head/emulators/linux_base-c6/Makefile head/emulators/linux_base-f10/Makefile head/emulators/mupen64plus-core/Makefile head/emulators/virtualbox-ose-additions/Makefile head/emulators/virtualbox-ose-kmod/Makefile head/finance/ledgersmb12/Makefile head/ftp/curl-hiphop/Makefile head/ftp/proftpd-mod_geoip/Makefile head/ftp/py-pyftpdlib/Makefile head/games/doom-data/Makefile head/games/ioquake3-devel-server/Makefile head/games/ioquake3-server/Makefile head/games/iourbanterror-server/Makefile head/games/linux-quake3/Makefile head/games/nethack33/Makefile head/games/openarena-server/Makefile head/games/opengfx/Makefile head/games/opensfx/Makefile head/games/quake-source/Makefile head/games/quake2-3zb2/Makefile head/games/quake2-ctf/Makefile head/games/quake2-data/Makefile head/games/quake2-extras/Makefile head/games/quake2-lights/Makefile head/games/quake2-matrix/Makefile head/games/quake2-psychomod/Makefile head/games/quake2-source/Makefile head/games/quake2-zaero/Makefile head/games/tuxpaint-fonts/Makefile head/games/xpilot-ng-server/Makefile head/graphics/frei0r-plugins/Makefile head/graphics/jgraph/Makefile head/graphics/libgnomecanvasmm26/Makefile head/graphics/py-aafigure/Makefile head/graphics/py-actdiag/Makefile head/graphics/py-blockdiag/Makefile head/graphics/py-imaging/Makefile head/graphics/py-nwdiag/Makefile head/graphics/py-opengl/Makefile head/graphics/py-seqdiag/Makefile head/graphics/py-sorl-thumbnail/Makefile head/graphics/py-webcolors/Makefile head/graphics/quat-gui/Makefile head/irc/py-gozerbot/Makefile head/japanese/p5-MeCab/Makefile head/japanese/ruby-mecab/Makefile head/java/netty/Makefile head/java/openjdk6-jre/Makefile head/java/openjdk7-jre/Makefile head/java/openjdk7/Makefile head/lang/fpc-units/Makefile head/lang/fpc/Makefile head/lang/gcc46/Makefile head/lang/gcc47/Makefile head/lang/gcc48/Makefile head/lang/gcc49/Makefile head/lang/gcc5-devel/Makefile head/lang/gcc5/Makefile head/lang/gcc6-devel/Makefile head/lang/php5/Makefile head/lang/php55/Makefile head/lang/php56/Makefile head/lang/py-mx-base/Makefile head/lang/ruby20/Makefile head/lang/ruby21/Makefile head/lang/ruby22/Makefile head/lang/tcl84/Makefile head/lang/tcl86/Makefile head/mail/addresses-goodies/Makefile head/mail/p5-IMAP-Admin/Makefile head/mail/popa3d/Makefile head/mail/postfix-policyd-spf-python/Makefile head/mail/qmail-ldap/Makefile head/mail/qmail-mysql/Makefile head/mail/qmail-spamcontrol/Makefile head/mail/qmail-tls/Makefile head/mail/wanderlust-devel/Makefile head/math/py-matplotlib/Makefile head/math/py-symeig/Makefile head/math/sage/Makefile head/math/vtk5/Makefile head/math/vtk6/Makefile head/misc/e2fsprogs-libuuid/Makefile head/misc/gnu-watch/Makefile head/misc/nut/Makefile head/misc/tellico-kde4/Makefile head/multimedia/gstreamer-qt4/Makefile head/multimedia/kplayer-kde4/Makefile head/multimedia/spotify-websocket-api/Makefile head/net-im/kmess-kde4/Makefile head/net-im/py-xmpppy-yahoo/Makefile head/net-mgmt/netustad/Makefile head/net-mgmt/zabbix2-agent/Makefile head/net-mgmt/zabbix2-frontend/Makefile head/net-mgmt/zabbix2-server/Makefile head/net-mgmt/zabbix22-agent/Makefile head/net-mgmt/zabbix22-frontend/Makefile head/net-mgmt/zabbix22-server/Makefile head/net-mgmt/zabbix24-agent/Makefile head/net-mgmt/zabbix24-frontend/Makefile head/net-mgmt/zabbix24-server/Makefile head/net/freeradius3/Makefile head/net/hping-devel/Makefile head/net/isc-dhcp41-server/Makefile head/net/isc-dhcp42-server/Makefile head/net/isc-dhcp43-server/Makefile head/net/mosh/Makefile head/net/openldap24-server/Makefile head/net/openmpi/Makefile head/net/proftpd-mod_ldap/Makefile head/net/py-gntp/Makefile head/net/py-pynsq/Makefile head/net/samba36/Makefile head/news/inn/Makefile head/news/py-pynzb/Makefile head/ports-mgmt/pkg-devel/Makefile head/ports-mgmt/pkg/Makefile head/print/cups-base/Makefile head/print/py-pollyreports/Makefile head/science/py-mdp/Makefile head/security/botan110/Makefile head/security/gag/Makefile head/security/krb5-111/Makefile head/security/krb5-112/Makefile head/security/krb5-appl/Makefile head/security/proftpd-mod_clamav/Makefile head/security/py-itsdangerous/Makefile head/security/py-keyring/Makefile head/security/rubygem-net-ssh/Makefile head/security/shibboleth2-sp/Makefile head/sysutils/backuppc-devel/Makefile head/sysutils/bacula-docs/Makefile head/sysutils/bacula5-docs/Makefile head/sysutils/bareos-docs/Makefile head/sysutils/boxbackup-devel/Makefile head/sysutils/cdrtools-devel/Makefile head/sysutils/cfengine32/Makefile head/sysutils/cfengine34/Makefile head/sysutils/cfengine36/Makefile head/sysutils/cfengine37/Makefile head/sysutils/knutclient-kde4/Makefile head/sysutils/pear-Log/Makefile head/sysutils/py-supervisor/Makefile head/textproc/apache-solr/Makefile head/textproc/flip/Makefile head/textproc/py-genshi/Makefile head/textproc/ruby-xmlscan/Makefile head/textproc/sphinxsearch-devel/Makefile head/www/apache22-event-mpm/Makefile head/www/apache22-itk-mpm/Makefile head/www/apache22-peruser-mpm/Makefile head/www/apache22-worker-mpm/Makefile head/www/apache22/Makefile.modules head/www/apache24/Makefile.modules head/www/autoindex2/Makefile head/www/cocoon/Makefile head/www/dillo2/Makefile head/www/free-sa-devel/Makefile head/www/gaeutilities/Makefile head/www/geronimo/Makefile head/www/linux-opera/Makefile head/www/mod_auth_kerb2/Makefile head/www/mod_extract_forwarded/Makefile head/www/mod_layout22/Makefile head/www/mod_macro22/Makefile head/www/mod_myvhost/Makefile head/www/mod_security/Makefile head/www/p5-Apache-Clean2/Makefile head/www/pear-HTTP_FloodControl/Makefile head/www/pelican/Makefile head/www/py-cssselect/Makefile head/www/py-cssutils/Makefile head/www/py-django-cms/Makefile head/www/py-django-photologue/Makefile head/www/py-qp/Makefile head/www/py-qpy/Makefile head/www/py-rhodecode/Makefile head/www/py-scrapy/Makefile head/www/py-turbogears/Makefile head/www/py-urlgrabber/Makefile head/www/py-ws4py/Makefile head/www/rubygem-rails/Makefile head/www/rubygem-rails4/Makefile head/www/tdiary/Makefile head/www/xpi-adblock/Makefile.xpi head/x11-toolkits/py-gui/Makefile head/x11-toolkits/tk84/Makefile head/x11-toolkits/tk85/Makefile head/x11-toolkits/tk86/Makefile head/x11-wm/afterstep/Makefile head/x11-wm/fvwm/Makefile head/x11-wm/fvwm2/Makefile head/x11-wm/xfce4/Makefile head/x11/rsibreak-kde4/Makefile Modified: head/CHANGES ============================================================================== --- head/CHANGES Mon Aug 17 14:13:04 2015 (r394507) +++ head/CHANGES Mon Aug 17 14:20:40 2015 (r394508) @@ -10,6 +10,14 @@ in the release notes and/or placed into 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 Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Mon Aug 17 14:13:04 2015 (r394507) +++ head/Mk/bsd.database.mk Mon Aug 17 14:20:40 2015 (r394508) @@ -47,7 +47,7 @@ Database_Include_MAINTAINER= ports@FreeB # build this port with (overrides WITH_BDB_VER). # WITH_BDB_VER # - User defined global variable to set Berkeley DB version. -# <UNIQUENAME>_WITH_BDB_VER +# <BDB_UNIQUENAME>_WITH_BDB_VER # - User defined port specific variable to set Berkeley DB # version. # WITH_BDB_HIGHEST @@ -191,6 +191,8 @@ IGNORE= cannot install: unknown MySQL v # TODO: avoid malformed conditional with invalid USE_BDB/WITH_BDB_VER # check if + works properly from test builds 01h12m23s +BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} + _USE_BDB_save:=${USE_BDB} _WITH_BDB_VER_save:=${WITH_BDB_VER} @@ -211,9 +213,9 @@ db5_FIND= ${LOCALBASE}/include/db5/db.h db6_FIND= ${LOCALBASE}/include/db6/db.h # Override the global WITH_BDB_VER with the -# port specific <UNIQUENAME>_WITH_BDB_VER -.if defined(${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER) -WITH_BDB_VER= ${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} +# port specific <BDB_UNIQUENAME>_WITH_BDB_VER +.if defined(${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER) +WITH_BDB_VER= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} .endif # Override USE_BDB with global WITH_BDB_VER @@ -340,7 +342,7 @@ BDB_VER= ${_BDB_VER} debug-bdb: @${ECHO_CMD} "--INPUTS----------------------------------------------------" - @${ECHO_CMD} "${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}" + @${ECHO_CMD} "${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}" @${ECHO_CMD} "WITH_BDB_VER: ${_WITH_BDB_VER_save}" @${ECHO_CMD} "WANT_BDB_VER: ${WANT_BDB_VER}" @${ECHO_CMD} "BDB_BUILD_DEPENDS: ${BDB_BUILD_DEPENDS}" @@ -374,7 +376,7 @@ BAD_VAR+= ${var}, . endif . endfor . if defined(BAD_VAR) -_IGNORE_MSG= Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version +_IGNORE_MSG= Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version . if defined(IGNORE) IGNORE+= ${_IGNORE_MSG} . else Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Mon Aug 17 14:13:04 2015 (r394507) +++ head/Mk/bsd.options.mk Mon Aug 17 14:20:40 2015 (r394508) @@ -127,7 +127,6 @@ OPTIONSMKINCLUDED= bsd.options.mk OPTIONS_NAME?= ${PKGORIGIN:S/\//_/} -OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options _OPTIONS_FLAGS= ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \ @@ -244,22 +243,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX To remove once UNIQUENAME will be removed -## Set the options specified per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_SET} -. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) -PORT_OPTIONS+= ${opt} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endif -. endfor - -## Unset the options excluded per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_UNSET} -PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endfor -# XXX To remove once UNIQUENAME will be removed - ## Set the options specified per-port (set by user in make.conf) . for opt in ${${OPTIONS_NAME}_SET} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) @@ -274,14 +257,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX to remove once UNIQUENAME is removed -## options files (from dialog) -. if exists(${OPTIONSFILE}) && !make(rmconfig) -. include "${OPTIONSFILE}" -. endif -. sinclude "${OPTIONSFILE}.local" -# XXX to remove once UNIQUENAME is removed - ## options files (from dialog) . if exists(${OPTIONS_FILE}) && !make(rmconfig) . include "${OPTIONS_FILE}" @@ -303,6 +278,14 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} .endif .endfor +_OPTIONS_UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME} +.for _k in SET UNSET SET_FORCE UNSET_FORCE +.if defined(${_OPTIONS_UNIQUENAME}_${_k}) +WARNING+= "You are using ${_OPTIONS_UNIQUENAME}_${_k} which is not supported any more, use:" +WARNING+= "${OPTIONS_NAME}_${_k}= ${${_OPTIONS_UNIQUENAME}_${_k}}" +.endif +.endfor + .if defined(OPTIONS_WARNINGS) WARNING+= "You are using the following deprecated options: ${OPTIONS_WARNINGS}" WARNING+= "If you added them on the command line, you should replace them by" @@ -355,22 +338,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX To remove once UNIQUENAME will be removed -## Set the options specified per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_SET_FORCE} -. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) -PORT_OPTIONS+= ${opt} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endif -. endfor - -## Unset the options excluded per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_UNSET_FORCE} -PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endfor -# XXX To remove once UNIQUENAME will be removed - ## Set the options specified per-port (set by user in make.conf) . for opt in ${${OPTIONS_NAME}_SET_FORCE} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Aug 17 14:13:04 2015 (r394507) +++ head/Mk/bsd.port.mk Mon Aug 17 14:20:40 2015 (r394508) @@ -74,9 +74,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Optional. # PKGVERSION - Always defined as ${PORTVERSION}. # Do not define this in your Makefile. -# UNIQUENAME - A name for your port that is globally unique. By default, -# this is set to ${LATEST_LINK} when LATEST_LINK is set, -# and to ${PKGNAMEPREFIX}${PORTNAME} otherwise. # DISTVERSION - Vendor version of the distribution. # Default: ${PORTVERSION} # DISTNAME - Name of port or distribution used in generating @@ -892,7 +889,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # directories to be searched for shared libraries. # Otherwise, this is a list of directories to be added to that # list. The directory names are written to -# ${LOCALBASE}/libdata/ldconfig/${UNIQUENAME} which is then +# ${LOCALBASE}/libdata/ldconfig/${PKGBASE} which is then # used by the ldconfig startup script. # This mechanism replaces ldconfig scripts installed by some # ports, often under such names as 000.${UNQUENAME}.sh. @@ -901,7 +898,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # version, and the directory list given will be ignored. # USE_LDCONFIG32 # - Same as USE_LDCONFIG but the target file is -# ${LOCALBASE}/libdata/ldconfig32/${UNIQUENAME} instead. +# ${LOCALBASE}/libdata/ldconfig32/${PKGBASE} instead. # Note: that should only be used on 64-bit architectures. # # DOCSDIR - Name of the directory to install the packages docs in. @@ -977,11 +974,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # generating the packing list on-the-fly, make sure it's generated before # do-install is called! # -# For package: -# -# LATEST_LINK - Install the "Latest" link for the package as ___. Define -# this if the "Latest" link name will be incorrectly determined. -# # This is used in all stages: # # SCRIPTS_ENV - Additional environment vars passed to scripts in @@ -1252,12 +1244,6 @@ USERS_BLACKLIST= _dhcp _pflogd auditdist LDCONFIG_DIR= libdata/ldconfig LDCONFIG32_DIR= libdata/ldconfig32 -.if defined(LATEST_LINK) -UNIQUENAME?= ${LATEST_LINK} -.else -UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} -.endif - .endif # At least KDE needs TMPDIR for the package building, @@ -2571,8 +2557,7 @@ WRKDIR_PKGFILE= ${WRKDIR}/pkg/${PKGNAME} # The "latest version" link -- ${PKGNAME} minus everthing after the last '-' PKGLATESTREPOSITORY?= ${PACKAGES}/Latest PKGBASE?= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} -LATEST_LINK?= ${PKGBASE} -PKGLATESTFILE= ${PKGLATESTREPOSITORY}/${LATEST_LINK}${PKG_SUFX} +PKGLATESTFILE= ${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_SUFX} CONFIGURE_SCRIPT?= configure CONFIGURE_CMD?= ./${CONFIGURE_SCRIPT} @@ -2903,7 +2888,7 @@ DEPENDS_ARGS+= NOCLEANDEPENDS=yes ################################################################ .if ((!defined(OPTIONS_DEFINE) && !defined(OPTIONS_SINGLE) && !defined(OPTIONS_MULTI)) \ && !defined(OPTIONS_GROUP) && !defined(OPTIONS_RADIO) \ - || defined(CONFIG_DONE_${UNIQUENAME:tu}) || \ + || defined(CONFIG_DONE_${PKGBASE:tu}) || \ defined(PACKAGE_BUILDING) || defined(BATCH)) _OPTIONS_OK=yes .endif @@ -3584,8 +3569,8 @@ install-ldconfig-file: @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ - > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} - @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE} + @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE} >> ${TMPPLIST} .endif .endif .endif @@ -3596,8 +3581,8 @@ install-ldconfig-file: @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ - > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} - @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE} + @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE} >> ${TMPPLIST} .endif .endif .endif @@ -5117,18 +5102,12 @@ do-config: @${ECHO_MSG} "===> No options to configure" .else @optionsdir=${OPTIONS_FILE:H}; \ - oldoptionsdir=${OPTIONSFILE:H}; \ if [ ${UID} != 0 -a -z "${INSTALL_AS_USER}" -a ! -w "${PORT_DBDIR}" ] ; then \ ${ECHO_MSG} "===> Switching to root credentials to create $${optionsdir}"; \ - (${SU_CMD} "${SH} -c \"if [ -d $${oldoptionsdir} -a ! -d $${optionsdir} ]; then ${MV} $${oldoptionsdir} $${optionsdir}; elif [ -d $${oldoptionsdir} -a -d $${optionsdir} ]; then ${RM} -rf $${oldoptionsdir} ; fi ; ${MKDIR} $${optionsdir} 2> /dev/null\"") || \ + (${SU_CMD} "${SH} -c \"${MKDIR} $${optionsdir} 2> /dev/null\"") || \ (${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1); \ ${ECHO_MSG} "===> Returning to user credentials" ; \ else \ - if [ -d $${oldoptionsdir} -a ! -d $${optionsdir} ]; then \ - ${MV} $${oldoptionsdir} $${optionsdir}; \ - elif [ -d $${oldoptionsdir} -a -d $${optionsdir} ]; then \ - ${RM} -rf $${oldoptionsdir} ; \ - fi ; \ ${MKDIR} $${optionsdir} 2> /dev/null || \ (${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1) ; \ fi @@ -5246,19 +5225,6 @@ showconfig-recursive: .if !target(rmconfig) rmconfig: -.if exists(${OPTIONSFILE}) - -@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \ - optionsdir=${OPTIONSFILE:H}; \ - if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" -a ! -w "${OPTIONSFILE}" ]; then \ - ${ECHO_MSG} "===> Switching to root credentials to remove ${OPTIONSFILE} and $${optionsdir}"; \ - ${SU_CMD} "${RM} -f ${OPTIONSFILE} ; \ - ${RMDIR} $${optionsdir}"; \ - ${ECHO_MSG} "===> Returning to user credentials"; \ - else \ - ${RM} -f ${OPTIONSFILE}; \ - ${RMDIR} $${optionsdir} 2>/dev/null || return 0; \ - fi -.endif .if exists(${OPTIONS_FILE}) -@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \ optionsdir=${OPTIONS_FILE:H}; \ @@ -5675,7 +5641,7 @@ _PHONY_TARGETS+= ${target} ${target}: ${${target:tu}_COOKIE} .elif !target(${target}) ${target}: config-conditional - @cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:tu}=1 ${${target:tu}_COOKIE} + @cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${PKGBASE:tu}=1 ${${target:tu}_COOKIE} .elif target(${target}) && defined(IGNORE) .endif Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Mon Aug 17 14:13:04 2015 (r394507) +++ head/Mk/bsd.sanity.mk Mon Aug 17 14:20:40 2015 (r394508) @@ -159,7 +159,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM U USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL NO_INSTALL_MANPAGES \ INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \ PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ - USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT + USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \ + UNIQUENAME LATEST_LINK SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes @@ -194,6 +195,8 @@ PYDISTUTILS_NOEGGINFO_ALT= USE_PYTHON=no 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}) Modified: head/Tools/scripts/README ============================================================================== --- head/Tools/scripts/README Mon Aug 17 14:13:04 2015 (r394507) +++ head/Tools/scripts/README Mon Aug 17 14:20:40 2015 (r394508) @@ -12,8 +12,6 @@ bad-pkgdescrs.sh - locate identical pkg 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. Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Aug 17 14:13:04 2015 (r394507) +++ head/UPDATING Mon Aug 17 14:20:40 2015 (r394508) @@ -5,6 +5,19 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20150817: + AFFECTS: everybody who still uses <UNIQUENAME>_SET/UNSET in make.conf + AUTHOR: mat@FreeBSD.org + + The use of <UNIQUENAME>_SET/UNSET has been deprecated for a long time, + replaced by <OPTIONNS_NAME>_SET/UNSET. It is now not supported any more. + A warning will be issued telling you what to do, for example: + + $ make + /!\ WARNING /!\ + You are using perl_SET which is not supported any more, use: + lang_perl5.20_SET= DEBUG + 20150816: AFFECTS: users of sysutils/s6 AUTHOR: Colin Booth <colin@heliocat.net> Modified: head/audio/amarok-kde4/Makefile ============================================================================== --- head/audio/amarok-kde4/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/audio/amarok-kde4/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -22,8 +22,6 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/qt4/plug 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 Modified: head/audio/jack/Makefile ============================================================================== --- head/audio/jack/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/audio/jack/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -32,8 +32,6 @@ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} INSTALL_TARGET= install-strip -LATEST_LINK= jack - OPTIONS_DEFINE= ALSA DOXYGEN READLINE OPTIONS_DEFAULT=READLINE OPTIONS_SUB= yes Modified: head/audio/lua51-mpd/Makefile ============================================================================== --- head/audio/lua51-mpd/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/audio/lua51-mpd/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -12,7 +12,7 @@ COMMENT= Lua library for musicpd RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket OPTIONS_DEFINE= DOCS -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} GH_ACCOUNT= silentbicycle GH_PROJECT= lua-mpd Modified: head/audio/py-mpd2/Makefile ============================================================================== --- head/audio/py-mpd2/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/audio/py-mpd2/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -23,7 +23,6 @@ USE_PYTHON= autoplist concurrent distuti NO_ARCH= yes -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS EXAMPLES DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Modified: head/biology/ruby-bio/Makefile ============================================================================== --- head/biology/ruby-bio/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/biology/ruby-bio/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -16,8 +16,6 @@ OPTIONS_DEFINE= XMLPARSER BDB4 MYSQL PGS 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 Modified: head/chinese/joe/Makefile ============================================================================== --- head/chinese/joe/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/chinese/joe/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -9,8 +9,6 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org -LATEST_LINK= ${PKGNAMEPREFIX}joe - DEPRECATED= The difference with editors/joe is too trivial to warrant a separate port EXPIRATION_DATE=2015-09-27 Modified: head/chinese/phpbb3-tw/Makefile ============================================================================== --- head/chinese/phpbb3-tw/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/chinese/phpbb3-tw/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -15,8 +15,6 @@ COMMENT= The Traditional Chinese version 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 Modified: head/databases/jdbm2/Makefile ============================================================================== --- head/databases/jdbm2/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/jdbm2/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -19,7 +19,6 @@ JAVA_VERSION= 1.6+ NO_BUILD= yes PROJECTHOST= jdbm2 -LATEST_LINK= jdbm2 PORTDOCS= * PORTEXAMPLES= * Modified: head/databases/luasql-mysql/Makefile ============================================================================== --- head/databases/luasql-mysql/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/luasql-mysql/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -53,7 +53,6 @@ MAKE_ARGS+= DRIVER_LIBS="-L ${LOCALBASE} IGNORE= unknown or unsupported luasql driver .endif -LATEST_LINK= ${PORTNAME}-${LUASQL_DRIVER} PLIST_SUB+= LUASQL_DRIVER=${LUASQL_DRIVER} do-install: Modified: head/databases/mariadb-client/Makefile ============================================================================== --- head/databases/mariadb-client/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/mariadb-client/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -4,8 +4,6 @@ PORTNAME= mariadb PORTREVISION= 7 PKGNAMESUFFIX= 53-client -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - COMMENT= Database client - drop-in replacement for MySQL MASTERDIR= ${.CURDIR}/../mariadb-server Modified: head/databases/mariadb-scripts/Makefile ============================================================================== --- head/databases/mariadb-scripts/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/mariadb-scripts/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -7,7 +7,6 @@ COMMENT= Scripts for mariadb - drop-in r LICENSE= GPLv2 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} USES= perl5 MASTERDIR= ${.CURDIR}/../mariadb-server Modified: head/databases/mariadb-server/Makefile ============================================================================== --- head/databases/mariadb-server/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/mariadb-server/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -20,8 +20,6 @@ COMMENT= Database server - drop-in repla LICENSE= GPLv2 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - CONFLICTS?= mariadb5[4-9]-server-* \ mariadb1[0-9][0-9]-server-* \ mysql*-server-* \ Modified: head/databases/mariadb100-server/Makefile ============================================================================== --- head/databases/mariadb100-server/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/mariadb100-server/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -21,7 +21,6 @@ LICENSE= GPLv2 SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} SLAVEDIRS= databases/mariadb100-client USES= bison:build cmake execinfo gmake shebangfix cpe USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin Modified: head/databases/pear-DoctrineDBAL/Makefile ============================================================================== --- head/databases/pear-DoctrineDBAL/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/pear-DoctrineDBAL/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PEARDIR}/.channels/pear.d ${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 Modified: head/databases/proftpd-mod_sql_mysql/Makefile ============================================================================== --- head/databases/proftpd-mod_sql_mysql/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/proftpd-mod_sql_mysql/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -12,7 +12,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd USE_MYSQL= yes Modified: head/databases/proftpd-mod_sql_odbc/Makefile ============================================================================== --- head/databases/proftpd-mod_sql_odbc/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/proftpd-mod_sql_odbc/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -14,7 +14,6 @@ LIB_DEPENDS= libiodbc.so:${PORTSDIR}/dat DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd CONFIGURE_ARGS= LIBS=-liodbc \ Modified: head/databases/proftpd-mod_sql_sqlite/Makefile ============================================================================== --- head/databases/proftpd-mod_sql_sqlite/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/proftpd-mod_sql_sqlite/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -13,7 +13,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd USE_SQLITE= yes Modified: head/databases/proftpd-mod_sql_tds/Makefile ============================================================================== --- head/databases/proftpd-mod_sql_tds/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/proftpd-mod_sql_tds/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -14,7 +14,6 @@ LICENSE= GPLv2 DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME} MASTERDIR= ${.CURDIR}/../../ftp/proftpd LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds Modified: head/databases/py-MySQLdb/Makefile ============================================================================== --- head/databases/py-MySQLdb/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/py-MySQLdb/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -23,7 +23,6 @@ PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}1-${PORTNAME}-${PORTVERSION} -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= DOCS MYSQLCLIENT_R OPTIONS_DEFAULT= MYSQLCLIENT_R MYSQLCLIENT_R_DESC= Use libmysqlclient_r (thread safe) Modified: head/databases/py-pyPgSQL/Makefile ============================================================================== --- head/databases/py-pyPgSQL/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/py-pyPgSQL/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -25,9 +25,6 @@ OPTIONS_DEFINE= BYTEA_CONN EXAMPLES DOCS OPTIONS_DEFAULT= BYTEA_CONN BYTEA_CONN_DESC= Apply Bytea connection patch -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBYTEA_CONN} Modified: head/databases/py-sqlalchemy-devel/Makefile ============================================================================== --- head/databases/py-sqlalchemy-devel/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/py-sqlalchemy-devel/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -32,9 +32,6 @@ OPTIONS_DEFAULT= SQLITE SYBASE_DESC= Sybase backend TESTS_DESC= Include nose for unit tests -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mssql>0:${PORTSDIR}/databases/py-mssql PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2 SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 Modified: head/databases/py-sqlalchemy/Makefile ============================================================================== --- head/databases/py-sqlalchemy/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/py-sqlalchemy/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -32,9 +32,6 @@ MSSQL_DESC= MS SQL Server backend TESTS_DESC= Include nose for unit tests SYBASE_DESC= Sybase backend -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - .include <bsd.port.options.mk> DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} Modified: head/databases/py-sqlalchemy06/Makefile ============================================================================== --- head/databases/py-sqlalchemy06/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/py-sqlalchemy06/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -18,9 +18,6 @@ LICENSE= MIT USES= python USE_PYTHON= distutils autoplist -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - OPTIONS_DEFINE= CEXTENSIONS DOCS EXAMPLES NOSE OPTIONS_MULTI= BACKEND Modified: head/databases/ruby-bdb/Makefile ============================================================================== --- head/databases/ruby-bdb/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/ruby-bdb/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -20,7 +20,6 @@ LICENSE= RUBY USE_BDB= yes OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options USE_RUBY= yes USE_RUBY_EXTCONF= yes Modified: head/databases/rubygem-activerecord/Makefile ============================================================================== --- head/databases/rubygem-activerecord/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/rubygem-activerecord/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -26,7 +26,6 @@ OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 MYSQL_DESC= Use native MySQL bindings PGSQL_DESC= Use native PostgreSQL bindings SQLITE3_DESC= Use native SQLite3 bindings -OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options GEM_ENV+= LANG=en_US.UTF-8 Modified: head/databases/squirrel-sql/Makefile ============================================================================== --- head/databases/squirrel-sql/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/databases/squirrel-sql/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} SUB_FILES= squirrel-sql -DATADIR= ${PREFIX}/share/java/${UNIQUENAME} +DATADIR= ${PREFIX}/share/java/${PKGBASE} DESKTOP_ENTRIES="Squirrel-SQL Client" \ "${COMMENT}" \ Modified: head/deskutils/gworkspace-gwmetadata/Makefile ============================================================================== --- head/deskutils/gworkspace-gwmetadata/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/deskutils/gworkspace-gwmetadata/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -22,7 +22,6 @@ USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES USE_SQLITE= yes LDFLAGS+= -lpthread -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata CONFIGURE_ARGS+= --with-sqlite-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-sqlite-library=${LOCALBASE}/lib Modified: head/devel/cl-asdf/bsd.cl-asdf.mk ============================================================================== --- head/devel/cl-asdf/bsd.cl-asdf.mk Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/cl-asdf/bsd.cl-asdf.mk Mon Aug 17 14:20:40 2015 (r394508) @@ -8,7 +8,7 @@ # CL_LIBDIR_REL - Common Lisp library directory, relative to LOCALBASE or PREFIX # ASDF_PATHNAME - Where to install compiled FASL files (depends on FASL_DIR_REL) # ASDF_REGISTRY - Path to ASDF registry -# DOCSDIR - DOCSDIR using UNIQUENAME (to account for optional cl- PKGNAMEPREFIX) +# DOCSDIR - DOCSDIR using PKGBASE (to account for optional cl- PKGNAMEPREFIX) # EXAMPLESDIR - Same as above, for EXAMPLESDIR # FASL_DIR_REL - Relative path to compiled FASL files; depends on FASL_TARGET # FASL_TARGET - Platform for building FASL files (currently "sbcl" or "clisp") @@ -32,8 +32,8 @@ FASL_PATHNAME= ${PREFIX}/${CL_LIBDIR_REL 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 Modified: head/devel/glib20-reference/bsd.gnome-reference.mk ============================================================================== --- head/devel/glib20-reference/bsd.gnome-reference.mk Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/glib20-reference/bsd.gnome-reference.mk Mon Aug 17 14:20:40 2015 (r394508) @@ -22,9 +22,6 @@ DISTNAME:= ${PORTNAME}-${DISTVERSIONPREF 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} Modified: head/devel/insight/Makefile ============================================================================== --- head/devel/insight/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/insight/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -6,8 +6,6 @@ PORTREVISION= 2 MAINTAINER= mi@aldan.algebra.com COMMENT= Gnu debugger with the Insight GUI front-end -LATEST_LINK= insight - MASTERDIR= ${.CURDIR:H}/gdb66 OPTIONS_SLAVE= INSIGHT CONFLICTS= gdb-[6-9]* Modified: head/devel/llvm-cheri/Makefile ============================================================================== --- head/devel/llvm-cheri/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/llvm-cheri/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -15,7 +15,6 @@ COMMAND_PREFIX= cheri-unknown-freebsd- COMMAND_SUFFIX= DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 USE_LDCONFIG= ${LLVM_PREFIX}/lib Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/llvm-devel/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -14,7 +14,6 @@ LLVM_SUFFIX= -devel LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 USE_LDCONFIG= ${LLVM_PREFIX}/lib Modified: head/devel/llvm33/Makefile ============================================================================== --- head/devel/llvm33/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/llvm33/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -15,7 +15,6 @@ LLVM_SUFFIX= ${PORTVERSION:S/.//g} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= execinfo gmake perl5 GNU_CONFIGURE= yes Modified: head/devel/llvm34/Makefile ============================================================================== --- head/devel/llvm34/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/llvm34/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -15,7 +15,6 @@ LLVM_SUFFIX= ${PORTVERSION:C/([0-9]\.[0- 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 Modified: head/devel/llvm35/Makefile ============================================================================== --- head/devel/llvm35/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/llvm35/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -15,7 +15,6 @@ LLVM_SUFFIX= ${PORTVERSION:C/([0-9]\.[0- 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 Modified: head/devel/llvm36/Makefile ============================================================================== --- head/devel/llvm36/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/llvm36/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -16,7 +16,6 @@ LLVM_RELEASE= ${PORTVERSION:C/([0-9]\.[0 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 Modified: head/devel/llvm37/Makefile ============================================================================== --- head/devel/llvm37/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/llvm37/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -20,7 +20,6 @@ LLVM_SUFFIX= ${DISTVERSION:R:S/.//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz USE_LDCONFIG= ${LLVM_PREFIX}/lib Modified: head/devel/ocaml-camlp5/Makefile ============================================================================== --- head/devel/ocaml-camlp5/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/ocaml-camlp5/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -8,7 +8,7 @@ MASTER_SITES= http://camlp5.gforge.inria 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} Modified: head/devel/oniguruma/Makefile ============================================================================== --- head/devel/oniguruma/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/oniguruma/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= BSDL Regular Expressions library compatible with POSIX/GNU/Perl WRKSRC= ${WRKDIR}/${PORTNAME} -NO_LATEST_LINK= yes CONFLICTS_INSTALL= oniguruma-4.* GNU_CONFIGURE= yes DOCS= HISTORY README doc/* Modified: head/devel/oniguruma4/Makefile ============================================================================== --- head/devel/oniguruma4/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/oniguruma4/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -15,7 +15,6 @@ COMMENT= BSDL Regular Expressions librar LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -NO_LATEST_LINK= yes USES= libtool CONFLICTS= oniguruma-2.* GNU_CONFIGURE= yes Modified: head/devel/php-memoize/Makefile ============================================================================== --- head/devel/php-memoize/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/php-memoize/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -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 Modified: head/devel/py-funcparserlib/Makefile ============================================================================== --- head/devel/py-funcparserlib/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-funcparserlib/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -17,7 +17,7 @@ USES= python USE_PYTHON= distutils autoplist PORTDOCS= README doc -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DOCS Modified: head/devel/py-gdata/Makefile ============================================================================== --- head/devel/py-gdata/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-gdata/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -23,8 +23,6 @@ GMPY_DESC= Multiprecision arithmetic M2CRYPTO_DESC= Cryptography and SSL toolkit PYCRYPTO_DESC= Cryptography toolkit -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options - EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .include <bsd.port.options.mk> Modified: head/devel/py-ice/Makefile ============================================================================== --- head/devel/py-ice/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-ice/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -30,7 +30,6 @@ LIB_VRS= ${PORTVERSION:S|.||g:C|[0-9]$|| PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}" # bypass infrastructure bug (taken from www/py-django) -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DEBUG TESTS OPTIONS_DEFAULT=TESTS TESTS_DESC= Run tests Modified: head/devel/py-jsonrpclib/Makefile ============================================================================== --- head/devel/py-jsonrpclib/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-jsonrpclib/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -16,7 +16,6 @@ LICENSE= APACHE20 USES= python:2 USE_PYTHON= distutils autoplist -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= CJSON CJSON_DESC= Use cjson instead of json or simplejson Modified: head/devel/py-memoryprofiler/Makefile ============================================================================== --- head/devel/py-memoryprofiler/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-memoryprofiler/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -17,8 +17,6 @@ OPTIONS_DEFINE= PSUTIL PSUTIL_DESC= Use psutil for better performance PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:${PORTSDIR}/sysutils/py-psutil -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options - USES= python USE_PYTHON= distutils autoplist Modified: head/devel/py-qt4-qscintilla2/Makefile ============================================================================== --- head/devel/py-qt4-qscintilla2/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-qt4-qscintilla2/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -28,7 +28,6 @@ QT_NONSTANDARD= yes # Do not add unknow 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} \ Modified: head/devel/py-qt4/bsd.pyqt.mk ============================================================================== --- head/devel/py-qt4/bsd.pyqt.mk Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-qt4/bsd.pyqt.mk Mon Aug 17 14:20:40 2015 (r394508) @@ -98,7 +98,6 @@ USES+= python QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. PATCHDIR= ${.CURDIR}/../../devel/py-qt4-core/files -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ARGS+=-b ${PREFIX}/bin \ Modified: head/devel/py-rauth/Makefile ============================================================================== --- head/devel/py-rauth/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-rauth/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -20,7 +20,6 @@ TEST_DEPENDS:= ${RUN_DEPENDS} \ OPTIONS_DEFINE= TESTS TESTS_DESC= Install tools for unit testing -OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options USE_GITHUB= yes GH_ACCOUNT= litl Modified: head/devel/py-tables/Makefile ============================================================================== --- head/devel/py-tables/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-tables/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -30,7 +30,6 @@ PLIST_FILES= bin/pt2to3 bin/ptdump bin/p 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> Modified: head/devel/py-twisted/Makefile ============================================================================== --- head/devel/py-twisted/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-twisted/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twis 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 Modified: head/devel/py-urwid/Makefile ============================================================================== --- head/devel/py-urwid/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-urwid/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -12,8 +12,6 @@ COMMENT= Curses-based user interface lib LICENSE= LGPL21 -# Bypass ports infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= EXAMPLES USES= python Modified: head/devel/py-watchdog/Makefile ============================================================================== --- head/devel/py-watchdog/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-watchdog/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -22,7 +22,6 @@ DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPR GH_ACCOUNT= gorakhargosh -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS PORTDOCS= * Modified: head/devel/py-wheel/Makefile ============================================================================== --- head/devel/py-wheel/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/py-wheel/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -14,7 +14,6 @@ COMMENT= Built-package format for Python LICENSE= MIT OPTIONS_DEFINE= PIP SIGNATURE -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options PIP_DESC= Use pip to install wheels PIP_RUN_DEPENDS= pip:${PORTSDIR}/devel/py-pip Modified: head/devel/ruby-langscan/Makefile ============================================================================== --- head/devel/ruby-langscan/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/ruby-langscan/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -30,7 +30,6 @@ PORTDOCS= ChangeLog NEWS README DOCSDIR= ${RUBY_MODDOCDIR} OPTIONS_DEFINE= DOCS -OPTIONSFILE= ${PORT_DBDIR}/ruby-${PORTNAME}/options CFLAGS+= -fPIC Modified: head/devel/rubygem-app_config/Makefile ============================================================================== --- head/devel/rubygem-app_config/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/rubygem-app_config/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -15,7 +15,6 @@ OPTIONS_DEFAULT= SQLITE3 MONGO_DESC= mongo backend support SQLITE3_DESC= sqlite3 backend support -OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options .include <bsd.port.options.mk> Modified: head/devel/subcommander2/Makefile ============================================================================== --- head/devel/subcommander2/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/subcommander2/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -16,7 +16,6 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libsvn_client-1.so:${PORTSDIR}/devel/subversion -LATEST_LINK= subcommander2 CONFLICTS= subcommander-1.* WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S,.b,b,}p${PORTVERSION:E} Modified: head/devel/subversion-static/Makefile ============================================================================== --- head/devel/subversion-static/Makefile Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/subversion-static/Makefile Mon Aug 17 14:20:40 2015 (r394508) @@ -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 Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/subversion/Makefile.common Mon Aug 17 14:20:40 2015 (r394508) @@ -28,7 +28,6 @@ CONFIGURE_ARGS+= --without-swig \ .if defined(SVN_BUILD_ADDONS) CONFLICTS_BUILD+= ${PORTNAME}-1.[^8].[0-9]* LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion -OPTIONSFILE= ${PORT_DBDIR}/subversion/options OPTIONS_NAME= devel_subversion .endif Modified: head/devel/subversion17/Makefile.common ============================================================================== --- head/devel/subversion17/Makefile.common Mon Aug 17 14:13:04 2015 (r394507) +++ head/devel/subversion17/Makefile.common Mon Aug 17 14:20:40 2015 (r394508) @@ -31,7 +31,6 @@ CONFIGURE_ARGS+= --without-swig \ .if defined(SVN_BUILD_BINDINGS) CONFLICTS_BUILD+= ${PORTNAME}-1.[^7].[0-9]* LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion17 -OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508171420.t7HEKfgZ044105>