Framework: sync with upstream

Taken from: HardenedBSD

GIDs

@@ -823,7 +823,7 @@ _geodns:*:853:
 # free: 880
 # free: 881
 # free: 882
-# free: 883
+ipfs-go:*:883:
 telegraf:*:884:
 tcpdump:*:885:
 miniflux:*:886:

MOVED

@@ -5731,7 +5731,6 @@ devel/ros_tutorials||2014-03-28|Has expired: Depends on expiring devel/ros_comm
 math/ros-geometry||2014-03-28|Has expired: Depends on expiring devel/ros_comm
 devel/ros-nxt||2014-03-28|Has expired: Depends on expiring devel/ros_comm
 devel/ros-rx||2014-03-28|Has expired: Depends on expiring devel/ros_comm
-devel/R-cran-vcd||2014-03-28|Has expired: New port without proper maintainer
 devel/ros-documentation||2014-03-28|Has expired: Depends on expiring devel/ros_comm
 devel/ros-common_msgs||2014-03-28|Has expired: Depends on expiring devel/ros_comm
 devel/ros_comm||2014-03-28|Has expired: Broken for more than 6 months
@@ -10396,21 +10395,21 @@ x11-fonts/fontcacheproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
 x11-fonts/fontsproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
 x11-fonts/xf86bigfontproto|x11/xorgproto|2018-07-31|merged into x11/xorgproto
 x11/evieext|x11/xorgproto|2018-08-01|merged into x11/xorgproto
-net/rubygem-gitaly-proto096|net/rubygem-gitaly-proto|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use net/rubygem-gitaly-proto instead.
+net/rubygem-gitaly-proto096|net/rubygem-gitaly-proto|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use net/rubygem-gitaly-proto instead
 security/tripwire12||2018-08-02|Has expired: unfetchable
-security/rubygem-rbnacl4|security/rubygem-rbnacl|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use security/rubygem-rbnacl instead.
+security/rubygem-rbnacl4|security/rubygem-rbnacl|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use security/rubygem-rbnacl instead
-www/rubygem-gon61|www/rubygem-gon|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use www/rubygem-gon instead.
+www/rubygem-gon61|www/rubygem-gon|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use www/rubygem-gon instead
 databases/pgpool-II-33|databases/pgpool-II-35|2018-08-02|Has expired: Will be deprecated by upstream, please switch to newer pgpool versions
-devel/rubygem-grape-entity060|devel/rubygem-grape-entity|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use devel/rubygem-grape-entity instead.
+devel/rubygem-grape-entity060|devel/rubygem-grape-entity|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use devel/rubygem-grape-entity instead
-net/rubygem-gitaly-proto099|net/rubygem-gitaly-proto|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use net/rubygem-gitaly-proto instead.
+net/rubygem-gitaly-proto099|net/rubygem-gitaly-proto|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use net/rubygem-gitaly-proto instead
-net/rubygem-gitaly-proto095|net/rubygem-gitaly-proto|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use net/rubygem-gitaly-proto instead.
+net/rubygem-gitaly-proto095|net/rubygem-gitaly-proto|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use net/rubygem-gitaly-proto instead
-net/rubygem-omniauth-github11|net/rubygem-omniauth-github|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use net/rubygem-omniauth-github instead.
+net/rubygem-omniauth-github11|net/rubygem-omniauth-github|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use net/rubygem-omniauth-github instead
-net/rubygem-asset_sync220|net/rubygem-asset_sync|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use net/rubygem-asset_sync instead.
+net/rubygem-asset_sync220|net/rubygem-asset_sync|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use net/rubygem-asset_sync instead
-www/rubygem-gollum-lib-gitlab|www/rubygem-gitlab-gollum-lib|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use www/rubygem-gitlab-gollum-lib instead.
+www/rubygem-gollum-lib-gitlab|www/rubygem-gitlab-gollum-lib|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use www/rubygem-gitlab-gollum-lib instead
 www/py-django-threaded-multihost||2018-08-02|Has expired: Project development unmaintained
 www/py-django-keyedcache||2018-08-02|Has expired: Project development abandoned
 www/py-django-signals-ahoy||2018-08-02|Has expired: Project development unmaintained
-databases/rubygem-redis-namespace15|databases/rubygem-redis-namespace|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use databases/rubygem-redis-namespace instead.
+databases/rubygem-redis-namespace15|databases/rubygem-redis-namespace|2018-08-02|Has expired: Obsoleted by update of www/gitlab-ce. Please use databases/rubygem-redis-namespace instead
 security/py-python-social-auth||2018-08-02|Has expired: Upstream Deprecated
 www/py-django-social-auth||2018-08-02|Has expired: no support for new django
 audio/libmusicbrainz3|audio/libmusicbrainz5|2018-08-03|Has expired: Web Service 1.0 support ending 2018-08-01
@@ -10433,3 +10432,84 @@ lang/clang33|devel/llvm60|2018-08-13|Obsolete and unmaintained
 devel/llvm34|devel/llvm60|2018-08-13|Obsolete and unmaintained
 lang/clang34|devel/llvm60|2018-08-13|Obsolete and unmaintained
 databases/mongodb|databases/mongodb34|2018-08-15|Has expired: End of Life October 2016
+net/traceroute||2018-08-16|Has expired: Upstream gone
+net/e169-stats||2018-08-16|Has expired: unknown license
+net/l4ip||2018-08-16|Has expired: unknown license
+net/dhcprelay||2018-08-16|Has expired: unknown license
+emulators/m2000||2018-08-16|Has expired: unknown license
+textproc/ant-xinclude-task||2018-08-16|Has expired: unknown license
+textproc/bomstrip||2018-08-16|Has expired: unknown license
+x11-fonts/ecofont||2018-08-16|Has expired: unknown license
+mail/roundcube-groupvice||2018-08-16|Has expired: unknown license
+security/pft||2018-08-16|Has expired: unknown license
+devel/kickassembler||2018-08-16|Has expired: unknown license
+devel/gdbmods||2018-08-16|Has expired: unknown license
+devel/as31||2018-08-16|Has expired: unknown license
+databases/dbf2mysql||2018-08-16|Has expired: unknown license
+misc/xpns||2018-08-16|Has expired: unknown license
+misc/amfm||2018-08-16|Has expired: unknown license
+games/smashbattle||2018-08-16|Has expired: unknown license
+games/syobon||2018-08-16|Has expired: unknown license
+games/optimax||2018-08-16|Has expired: unknown license
+games/xgospel||2018-08-16|Has expired: unknown license
+biology/blat||2018-08-16|Has expired: unknown license
+x11-clocks/swisswatch||2018-08-16|Has expired: unknown license
+palm/ppmtoTbmp||2018-08-16|Has expired: unknown license
+dns/ghtool||2018-08-16|Has expired: unknown license
+x11-themes/beastie||2018-08-16|Has expired: unknown license
+converters/uudx||2018-08-16|Has expired: unknown license
+sysutils/areca-cli||2018-08-16|Has expired: unknown license
+net-im/tox12|net-im/tox|2018-08-18|Unused
+www/moodle32|www/moodle33|2018-08-19|Has expired: Deprecated by upstream
+archivers/opkg|archivers/opkg-openwrt|2018-08-20|Better naming
+net/openmq||2018-08-21|Has expired: Broken for more than 5 months
+net/coda6_server||2018-08-21|Has expired: Broken for more than 5 months
+net/ceph-devel||2018-08-21|Has expired: Broken for more than 5 months
+java/jgrapht||2018-08-21|Has expired: Broken for more than 5 months
+mail/mutt14||2018-08-21|Has expired: mutt 1.4.x has been out of support for 10+ years use mail/mutt
+www/pydio||2018-08-21|Has expired: Broken for more than 5 months
+security/fastd-devel||2018-08-21|Has expired: Broken for more than 5 months
+security/fastd||2018-08-21|Has expired: Broken for more than 5 months
+devel/bhyve-vm-goagent||2018-08-21|Has expired: Broken for more than 5 months
+devel/cherivis-devel||2018-08-21|Has expired: Depends on broken and expiring cheritrace-devel
+devel/cheritrace-devel||2018-08-21|Has expired: Broken for more than 5 months
+devel/javolution||2018-08-21|Has expired: Broken for more than 5 months
+devel/bisoncpp||2018-08-21|Has expired: Depends on broken and expiring libbobcat
+databases/php5-pdo_cassandra||2018-08-21|Has expired: Broken for more than 5 months
+games/crafty-open-large||2018-08-21|Has expired: Broken for more than 5 months
+games/crafty-open-enormous||2018-08-21|Has expired: Broken for more than 5 months
+games/crafty-open-medium||2018-08-21|Has expired: Broken for more than 5 months
+math/jakarta-commons-math||2018-08-21|Has expired: Broken for more than 5 months
+math/hfst||2018-08-21|Has expired: Broken for more than 5 months
+math/octave-forge-communications||2018-08-21|Has expired: Broken for more than 5 months
+lang/v8-devel||2018-08-21|Has expired: Broken for more than 5 months
+sysutils/rubygem-fluentd010||2018-08-21|Has expired: Broken for more than 5 months
+mail/mutt14-lite||2018-08-21|Remove expired slave port
+net/coda6_client||2018-08-21|Remove expired slave port
+net/openmq-client||2018-08-21|Remove expired slave port
+net-p2p/twister||2018-08-21|Has expired: Broken for more than 5 months
+comms/usrp||2018-08-21|Has expired: Broken for more than 5 months
+devel/libbobcat||2018-08-21|Has expired: Broken for more than 5 months
+net-p2p/dogecoin||2018-08-21|Has expired: Broken for more than 5 months
+misc/freebsd-doc-sr||2018-08-23|Removed
+www/py-django18|www/py-django111|2018-08-25|Has expired: End of Live since 01/04/2018
+x11-themes/qt4-style-Kvantum|x11-themes/Kvantum@qt4|2018-08-26|Moved to flavored version
+x11-themes/qt5-style-Kvantum|x11-themes/Kvantum@qt5|2018-08-26|Moved to flavored version
+devel/gps||2018-08-28|Has expired: Depends on obsolete LLVM 3.8.
+net-mgmt/ocsinventory-ng|net-mgmt/ocsinventory-server|2018-08-26|split port
+www/py-buku|www/buku|2018-09-01|Moved to correct directory, port is not a python library
+math/rpy2|math/py-rpy2|2018-09-01|Moved to correct directory, this is a python library
+games/libdungeonmaker||2018-09-02|Has expired: Abandonware. Unused in the ports tree
+net-p2p/lopster||2018-09-02|Has expired: Unmaintained. Napster is dead
+audio/napster||2018-09-02|Has expired: Unmaintained. Napster and OpenNap are dead
+net-p2p/xnap||2018-09-02|Has expired: Unmaintained. Napster, OpenNap, and FastTrack are dead
+russian/napster||2018-09-02|Has expired: Unmaintained. Napster and OpenNap are dead
+devel/mico||2018-09-02|Has expired: unmaintained upstream and unused in the ports tree
+net/rubygem-gitlab_omniauth-ldap1|net/rubygem-gitlab_omniauth-ldap|2018-09-02|Has expired: Use net/rubygem-gitlab_omniauth-ldap instead
+devel/onscripter|games/onscripter|2018-09-03|Moved to better category
+devel/onscripter-1byte|games/onscripter-1byte|2018-09-03|Moved to better category
+devel/ponscripter-sekai|games/ponscripter-sekai|2018-09-03|Moved to better category
+devel/renpy|games/renpy|2018-09-03|Moved to better category
+devel/renpy6|games/renpy6|2018-09-03|Moved to better category
+devel/rlvm|games/rlvm|2018-09-03|Moved to better category
+dns/openmdns|net/openmdns|2018-09-03|Moved to better category

Mk/Uses/gecko.mk

@@ -22,12 +22,12 @@ _GECKO_VERSION=	${gecko_ARGS:M[0-9][0-9]*}
 .if ${gecko_ARGS:Mfirefox}
 
 _GECKO_DEFAULT_VERSION=	60
-_GECKO_VERSIONS=		60 61
+_GECKO_VERSIONS=		60 62
 _GECKO_TYPE=	firefox
 
 # Dependence lines for different Firefox versions
 60_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
-61_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
+62_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
 
 .if exists(${LOCALBASE}/bin/firefox)
 _GECKO_INSTALLED_VER!=	${PKG_QUERY} %v firefox firefox-esr

Mk/Uses/go.mk

@@ -24,6 +24,9 @@
 #	Addional LDFLAGS variables to be passed to the C compiler by the `go`
 #	command
 #
+# GO_BUILDFLAGS
+#	Additional build arguments to be passed to the `go install` command
+#
 # MAINTAINER: jlaffaye@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GO_MK)
@@ -40,6 +43,7 @@ GOOBJ=	6
 # Settable variables
 GO_PKGNAME?=	${PORTNAME}
 GO_TARGET?=	${GO_PKGNAME}
+GO_BUILDFLAGS+=	-v
 CGO_CFLAGS+=	-I${LOCALBASE}/include
 CGO_LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -76,7 +80,8 @@ post-extract:
 
 .if !target(do-build)
 do-build:
-	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install -v ${GO_TARGET})
+	@(cd ${GO_WRKSRC}; \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install ${GO_BUILDFLAGS} ${GO_TARGET})
 .endif
 
 .if !target(do-install)

Mk/Uses/kde.mk

@@ -70,16 +70,16 @@ KDE_PLASMA_VERSION?=		5.12.5
 KDE_PLASMA_BRANCH?=		stable
 
 # Current KDE frameworks.
-KDE_FRAMEWORKS_VERSION?=	5.48.0
+KDE_FRAMEWORKS_VERSION?=	5.49.0
 KDE_FRAMEWORKS_BRANCH?= 	stable
 
 # Current KDE applications.
-KDE_APPLICATIONS_VERSION?=	18.04.3
+KDE_APPLICATIONS_VERSION?=	18.08.0
-KDE_APPLICATIONS_SHLIB_VER?=	5.8.3
+KDE_APPLICATIONS_SHLIB_VER?=	5.9.0
 KDE_APPLICATIONS_BRANCH?=	stable
 # Upstream moves old software to Attic/. Specify the newest applications release there.
 # Only the major version is used for the comparison.
-_KDE_APPLICATIONS_ATTIC_VERSION=	16.12.3
+_KDE_APPLICATIONS_ATTIC_VERSION=	17.08.3
 
 # Extended KDE universe applications.
 CALLIGRA_VERSION?=		2.9.11
@@ -296,7 +296,7 @@ _USE_KDEPIM5_ALL=	akonadicontacts akonadiimportwizard akonadimime akonadinotes \
 			contacts eventviews gapi grantleetheme \
 			gravatar identitymanagement imap \
 			incidenceeditor kdepim-addons kdepim-apps-libs \
-			kdepim-runtime5 kontactinterface kpimdav \
+			kdepim-runtime5 kitinerary kontactinterface kpimdav kpkpass \
 			ksmtp ldap libkdepim libkleo libksieve mailcommon \
 			mailimporter mailtransport mbox messagelib \
 			mime pimcommon pimtextedit syndication tnef \
@@ -802,7 +802,10 @@ kdepim-apps-libs_PORT=	deskutils/kdepim-apps-libs
 kdepim-apps-libs_LIB=	libKF5SendLater.so
 
 kdepim-runtime5_PORT=	deskutils/kdepim-runtime
-kdepim-runtime5_PATH=	${KDE_PREFIX}/lib/sasl2/libkdexoauth2.so
+kdepim-runtime5_PATH=	${KDE_PREFIX}/bin/gidmigrator
+
+kitinerary_PORT=	net/kitinerary
+kitinerary_LIB=		libKPimItinerary.so
 
 kontactinterface_PORT=	net/kontactinterface
 kontactinterface_LIB=	libKF5KontactInterface.so
@@ -810,6 +813,9 @@ kontactinterface_LIB=	libKF5KontactInterface.so
 kpimdav_PORT=		net/kdav
 kpimdav_LIB=		libKPimKDAV.so
 
+kpkpass_PORT=		security/kpkpass
+kpkpass_LIB=		libKPimPkPass.so
+
 ksmtp_PORT=		net/ksmtp
 ksmtp_LIB=		libKPimSMTP.so
 

Mk/Uses/linux.mk

@@ -37,7 +37,7 @@ linux_ARGS=		${LINUX_DEFAULT:S/_64//}
 .endif
 
 .if ${linux_ARGS} == c6
-LINUX_DIST_VER?=	6.9
+LINUX_DIST_VER?=	6.10
 .if ${ARCH} == amd64 && ${LINUX_DEFAULT} != c6
 LINUX_ARCH=		x86_64
 .elif ${ARCH} == amd64 || ${ARCH} == i386

Mk/Uses/php.mk

@@ -64,7 +64,7 @@ _INCLUDE_USES_PHP_MK=	yes
 DEV_WARNING+=	"USES=php:build is included in USES=php:phpize, USES=php:ext, and USES=php:zend, so it is not needed"
 .  endif
 .  if ${php_ARGS:Mflavors} && ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} || ${php_ARGS:Mpecl} )
-DEV_WARNINGS+=	"USES=php:flavors is included in phpize, ext, zend and pecl, so it is not needed."
+DEV_WARNING+=	"USES=php:flavors is included in phpize, ext, zend and pecl, so it is not needed."
 .  endif
 .  if ${php_ARGS:Mphpize} && ( ${php_ARGS:Mext} || ${php_ARGS:Mzend} )
 DEV_WARNING+=	"USES=php:phpize is included in USES=php:ext and USES=php:zend, so it is not needed"

Mk/bsd.default-versions.mk

@@ -87,7 +87,7 @@ PYTHON3_DEFAULT?=	3.6
 # Possible values: 2.3, 2.4, 2.5
 RUBY_DEFAULT?=		2.4
 # Possible values: 4.6, 4.7, 4.8
-SAMBA_DEFAULT?=		4.6
+SAMBA_DEFAULT?=		4.7
 # Possible values: base, openssl, openssl-devel, libressl, libressl-devel
 .if !defined(SSL_DEFAULT)
 #	If no preference was set, check for an installed base version

Mk/bsd.gecko.mk

@@ -263,8 +263,7 @@ MOZ_OPTIONS+=	\
 		--enable-default-toolkit=${MOZ_TOOLKIT} \
 		--enable-update-channel=${MOZ_CHANNEL} \
 		--disable-updater \
-		--enable-pie \
+		--enable-pie
-		--with-pthreads
 # others
 MOZ_OPTIONS+=	--with-system-zlib		\
 		--with-system-bz2

Mk/bsd.options.mk

@@ -423,10 +423,6 @@ PLIST_SUB+=	        PORTEXAMPLES="@comment "
 PLIST_SUB+=	        PORTEXAMPLES=""
 .endif
 
-.if ${PORT_OPTIONS:MDEBUG}
-WITH_DEBUG=	yes
-.endif
-
 .if defined(NO_OPTIONS_SORT)
 ALL_OPTIONS=	${OPTIONS_DEFINE}
 .endif

Mk/bsd.port.mk

@@ -1463,11 +1463,13 @@ USES+=	apache:${USE_APACHE:C/2([0-9])/2.\1/g}
 .include "${PORTSDIR}/Mk/bsd.gecko.mk"
 .endif
 
-.if defined(USE_GNOME) || defined(INSTALLS_ICONS)
+.if (defined(USE_GNOME) || defined(INSTALLS_ICONS)) && empty(USES:Mgnome)
+DEV_WARNING+=	"Using USE_GNOME alone is deprecated, please add USES=gnome."
 USES+=	gnome
 .endif
 
-.if defined(USE_MATE)
+.if defined(USE_MATE) && empty(USES:Mmate)
+DEV_WARNING+=	"Using USE_MATE alone is deprecated, please add USES=mate."
 USES+=	mate
 .endif
 

Mk/bsd.sites.mk

@@ -891,8 +891,7 @@ MASTER_SITE_NVIDIA+= \
 
 .if !defined(IGNORE_MASTER_SITE_OPENBSD)
 MASTER_SITE_OPENBSD+= \
-	https://fastly.cdn.openbsd.org/pub/OpenBSD/%SUBDIR%/ \
+	https://cdn.openbsd.org/pub/OpenBSD/%SUBDIR%/ \
-	https://cloudflare.cdn.openbsd.org/pub/OpenBSD/%SUBDIR%/ \
 	https://ftp.OpenBSD.org/pub/OpenBSD/%SUBDIR%/ \
 	https://ftp.eu.openbsd.org/pub/OpenBSD/%SUBDIR%/ \
 	https://ftp3.usa.openbsd.org/pub/OpenBSD/%SUBDIR%/ \
@@ -932,9 +931,8 @@ MASTER_SITE_PERL_CPAN_BY+= \
 	https://cpan.metacpan.org/modules/by-module/%SUBDIRPLUS%/ \
 	https://www.cpan.org/%CPANSORT%/%SUBDIR%/ \
 	ftp://ftp.cpan.org/pub/CPAN/%CPANSORT%/%SUBDIR%/ \
-	http://www.cpan.dk/%CPANSORT%/%SUBDIR%/ \
 	ftp://ftp.kddlabs.co.jp/lang/perl/CPAN/%CPANSORT%/%SUBDIR%/ \
-	https://ftp.jaist.ac.jp/pub/CPAN/%CPANSORT%/%SUBDIR%/ \
+	http://ftp.jaist.ac.jp/pub/CPAN/%CPANSORT%/%SUBDIR%/ \
 	ftp://ftp.mirrorservice.org/sites/cpan.perl.org/CPAN/%CPANSORT%/%SUBDIR%/ \
 	ftp://ftp.auckland.ac.nz/pub/perl/CPAN/%CPANSORT%/%SUBDIR%/ \
 	http://backpan.perl.org/%CPANSORT%/%SUBDIR%/ \

Templates/config.guess

@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-07-18'
+timestamp='2018-08-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -126,7 +126,7 @@ set_cc_for_build() {
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
@@ -392,20 +392,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	echo i386-pc-auroraux"$UNAME_RELEASE"
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	set_cc_for_build
+	UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
-	SUN_ARCH=i386
+	case `isainfo -b` in
-	# If there is a compiler, see if it is configured for 64-bit objects.
+	    32)
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+		echo i386-pc-solaris2"$UNAME_REL"
-	# This test works for both compilers.
+		;;
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+	    64)
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		echo x86_64-pc-solaris2"$UNAME_REL"
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		;;
-		grep IS_64BIT_ARCH >/dev/null
+	esac
-	    then
-		SUN_ARCH=x86_64
-	    fi
-	fi
-	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -843,7 +838,7 @@ EOF
     *:BSD/OS:*:*)
 	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 	exit ;;
-    arm*:FreeBSD:*:*)
+    arm:FreeBSD:*:*)
 	UNAME_PROCESSOR=`uname -p`
 	set_cc_for_build
 	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \

Tools/scripts/bump-revision.sh

@@ -48,6 +48,9 @@ trap "rm -f $tempfile" 0 1 2 3 15
 while [ $# -gt 0 ]
 do
     if [ -f "$1/Makefile" ]; then
+        # See what the port thinks its PORTREVISION is and save that.
+        pre=$(make -C "$1" -V PORTREVISION)
+
         # If the Makefile exists, continue and empty the tempfile, set up variables
 	echo -n > $tempfile
         revision_str=`grep "^PORTREVISION?\?=" "$1/Makefile"`
@@ -92,6 +95,13 @@ do
             if ! grep -q "^PORTREVISION?\?=" $1/Makefile; then
                     printc "ERROR: $1 PORTREVISION not found and failed to add it!" "red"
             fi
+
+            # See what the port now has for PORTREVISION.
+            post=$(make -C "$1" -V PORTREVISION)
+
+            if [ "$post" -le "$pre" ]; then
+                printc "ERROR: $1 PORTREVISION went backwards from $pre to $post!" "red"
+            fi
             ;;
         *)
             printc "ERROR: PORTREVISION grep for $1 exited with error!" "red"

Tools/scripts/rmport

@@ -49,6 +49,16 @@ SED="sed -i .orig -E"
 # use ~/.ssh/config to set up the desired username if different than $LOGNAME
 SVNREPO=${SVNREPO:-svn+ssh://repo.FreeBSD.org/ports}
 
+if [ -n "$(command -v svn 2>/dev/null)" ]; then
+        SVN=svn
+elif [ -n "$(command -v svnlite 2>/dev/null)" ]; then
+        SVN=svnlite
+else
+        echo "Neither svn(1) nor svnlite(1) found.  Please install devel/subversion."
+	exit 1
+fi
+
+
 if ! CDIFF=$(which cdiff) ; then
 	CDIFF=${PAGER}
 fi
@@ -134,8 +144,8 @@ mkcodir()
 co_common()
 {
 	log "getting ports/MOVED and ports/LEGAL from repository"
-	svn co --depth empty ${SVNREPO}/head ports
+	${SVN} co --depth empty ${SVNREPO}/head ports
-	svn up ports/MOVED ports/LEGAL
+	${SVN} up ports/MOVED ports/LEGAL
 }
 
 # check if some ports depend on the given port
@@ -276,8 +286,8 @@ co_port()
 	port=${2}
 
 	log "${cat}/${port}: getting ${cat}/Makefile and port's files from repository"
-	svn up --depth empty ports/${cat} ports/$cat/Makefile
+	${SVN} up --depth empty ports/${cat} ports/$cat/Makefile
-	svn up ports/${cat}/${port}
+	${SVN} up ports/${cat}/${port}
 }
 
 # check if anything about the port is mentioned in ports/LEGAL
@@ -342,7 +352,7 @@ rm_port()
 
 	log "${catport}: removing port's files"
 
-	svn rm ports/${catport}
+	${SVN} rm ports/${catport}
 }
 
 append_Template()
@@ -361,6 +371,8 @@ append_Template()
 		msg="${msg}: ${DEPRECATED}"
 	fi
 
+	echo "This is the commit message, please edit it." >> ./svnlog
+
 	log "${catport}: adding entry to commit message template"
 
 	echo "${msg}" >> ./svnlog
@@ -373,7 +385,7 @@ diff()
 
 	diffout=${codir}/diff
 
-	svn diff --no-diff-deleted ports > ${diffout} 2>&1 || :
+	${SVN} diff --no-diff-deleted ports > ${diffout} 2>&1 || :
 
 	read -p "hit <enter> to view svn diff output" dummy
 
@@ -386,14 +398,24 @@ diff()
 commit()
 {
 	log "running svn update"
-	svn up --quiet ports 2>&1 |${PAGER:-less}
+	${SVN} up --quiet ports 2>&1 |${PAGER:-less}
 	
+	echo >> svnlog
+	echo
 	$EDITOR svnlog
 
-	answer=`ask "do you want to commit?"`
+	log "Your commit message is:"
+	echo svnlog
+
+	answer=`ask "Do you want to edit again your commit message?"`
+	if [ "${answer}" = "y" ] ; then
+		$EDITOR svnlog
+	fi
+
+	answer=`ask "Do you want to commit now?"`
 
 	if [ "${answer}" = "y" ] ; then
-		svn ci --file svnlog ports
+		${SVN} ci --file svnlog ports
 	fi
 }
 

UIDs

@@ -829,8 +829,7 @@ archiva:*:871:871::0:0:Apache Archiva Daemon:/nonexistent:/usr/sbin/nologin
 # free: 880
 # free: 881
 # free: 882
-# free: 883
+ipfs-go:*:883:883::0:0:ipfs-go user:/var/db/ipfs-go:/bin/sh
-# free: 884
 telegraf:*:884:884::0:0:telegraf user:/nonexistent:/usr/sbin/nologin
 tcpdump:*:885:885::0:0:tcpdump user:/nonexistent:/usr/sbin/nologin
 miniflux:*:886:886::0:0:Miniflux:/nonexistent:/usr/sbin/nologin

UPDATING

@@ -5,6 +5,97 @@ 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.
 
+20180901:
+  AFFECTS: net/samba48
+  AUTHOR: timur@FreeBSD.org
+
+  Samba ports from now on are not dependent from the databases/ldb* ports,
+  as the link between Samba and LDB is too tight and each next major Samba
+  release requires it's own major LDB release. Please, remove installed
+  version of databases/ldb13 from your system with:
+
+  # pkg delete -f databases/ldb13
+
+20180901:
+  AFFECTS: net-mgmt/librenms
+  AUTHOR: dvl@FreeBSD.org
+
+  As of version 1.42, to conform with man hier, logs and rrd files have 
+  relocated outside the WWW directory. When upgrading from < 1.42 to more
+  recent versions, the following steps are required.
+
+  You must update config.php and manually relocate the rrd and log files.
+  Before upgrading, please stop librenms,  update the configuration, and
+  relocate the files.
+
+  If you find graphs are not updating, fping >= 4.0 requires an IPv6
+  address. Adding an IPv6 address should fix graphing.
+
+  Please add these entries to config.php:
+
+  $config['installed_from_package'] = true;
+  $config['log_dir'] = '/var/log/librenms';
+  $config['rrd_dir'] = '/var/db/librenms/rrd';
+
+  To relocate the files:
+
+  mkdir /var/log/librenms /var/db/librenms
+  chown www:ww: /var/log/librenms /var/db/librenms
+  cd /usr/local/www/librenms
+  mv rrd /var/db/librenms/
+  mv logs/librenms.log /var/log/librenms/
+  rmdir logs
+
+  An application key is required. Please follow these steps to generate it:
+
+  cd /usr/local/www/librenms
+  cp -i .env.sample .env
+
+  You might need to set your database details in that file.
+  Then run:
+
+  php artisan key:generate
+
+  The output should look something like this:
+
+  **************************************
+  *     Application In Production!     *
+  **************************************
+
+   Do you really wish to run this command? (yes/no) [no]:
+   > y
+
+  Application key [base64:P62La9V........qw=] set successfully.
+ 
+
+20180901:
+  AFFECTS: users of samba46
+  AUTHOR: antoine@FreeBSD.org
+
+  The default version of samba has been switched from 4.6 to 4.7.
+  Upgrade instructions:
+
+  For package users having samba46 installed indirectly (as a dependency):
+    # pkg upgrade
+
+  For package users having samba46 installed directly (leaf port):
+    # pkg upgrade
+    # pkg install samba47
+
+  For ports users:
+    If you want to keep samba46, add DEFAULT_VERSIONS+= samba=4.6 to make.conf
+
+    If you want to upgrade to samba47, remove samba46:
+    # pkg delete -f samba46
+
+    Portmaster users:
+    # portmaster net/samba47
+    # portmaster -a
+
+    Portupgrade users:
+    # portinstall net/samba47
+    # portupgrade -a
+
 20180813:
   AFFECTS: net/geoipupdate
   AUTHOR: adamw@FreeBSD.org