*/*: sync with upstream

Taken from: FreeBSD
2015-07-31 08:03:52 +02:00 · 2015-07-31 08:03:52 +02:00 · 70ce5f8205
parent b5964cd8b6
commit 70ce5f8205
134 changed files with 4677 additions and 2505 deletions
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	anyremote
 PORTVERSION=	6.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	SF

@ -13,7 +13,8 @@ COMMENT=	Remote control service over Bluetooth, infrared, or TCP/IP networking
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		alias iconv pkgconfig
+USES=		alias iconv pkgconfig shebangfix
+SHEBANG_FILES=	cfg-data/Utils/imdb-mf.sh
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/comms/aprsd/Makefile
+++ b/comms/aprsd/Makefile
@ -11,36 +11,45 @@ DISTNAME=	aprsd-2.2.5-15
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Server daemon providing Internet access to APRS packet data

+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
-SUB_FILES=	pkg-message
+SUB_FILES=	pkg-message pkg-deinstall
+USE_RC_SUBR=	aprsd
+
+USERS=	aprsd tnc
+GROUPS=	aprsd dialer tnc
+APRSD_RC_USER=	aprsd
+APRSD_RC_GROUP=	aprsd
+
+RC_SUB_LIST=	LOCALBASE=${LOCALBASE} APRSD_RC_USER=${APRSD_RC_USER} \
+		APRSD_RC_GROUP=${APRSD_RC_GROUP}

 OPTIONS_DEFINE=	DOCS EXAMPLES

 .include <bsd.port.pre.mk>

 post-patch:
-	@${REINPLACE_CMD} -e 's|%%CONFPATH%%|${PREFIX}/etc/aprsd/|' \
+	${REINPLACE_CMD} -e 's|%%CONFPATH%%|${PREFIX}/etc/aprsd/|' \
 	    -e 's|%%LOGPATH%%|/var/log/aprsd/|' \
 		    ${WRKSRC}/src/aprsd.cpp
-	@${REINPLACE_CMD} -e 's|%%LOGPATH%%|/var/log/aprsd/|' \
+	${REINPLACE_CMD} -e 's|%%LOGPATH%%|/var/log/aprsd/|' \
 	    ${WRKSRC}/src/utils.cpp

 pre-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/aprsd
-	@${MKDIR} ${STAGEDIR}"/var/log/aprsd"
-	@${SETENV} "PKG_PREFIX=${STAGEDIR}${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/aprsd
+	${MKDIR} ${STAGEDIR}"/var/log/aprsd"

 post-install:
 	@cd ${WRKSRC}/admin
 .for	f in INIT.TNC RESTORE.TNC aprsd.conf welcome.txt user.deny
-	@${INSTALL_DATA} ${WRKSRC}/admin/$f ${STAGEDIR}${PREFIX}/etc/aprsd/$f.samp
+	${INSTALL_DATA} ${WRKSRC}/admin/$f ${STAGEDIR}${PREFIX}/etc/aprsd/$f.samp
 .endfor
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for	f in chkaprsd udp_example
-	@${INSTALL_DATA} ${WRKSRC}/admin/$f ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/admin/$f ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-	@${INSTALL_SCRIPT}	${FILESDIR}/aprsd ${STAGEDIR}${LOCALBASE}/etc/rc.d
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${CP} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${CP} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.post.mk>
--- a/comms/aprsd/files/aprsd
+++ b/comms/aprsd/files/aprsd
@ -1,70 +0,0 @@
-#!/bin/sh
-#
-# PROVIDE: aprsd
-# REQUIRE: NETWORKING
-#
-# Add the following lines to /etc/rc.conf
-# aprsd_enable="YES"
-# aprsd_root="YES" or aprsd_root="NO"
-
-. /etc/rc.subr
-
-name="aprsd"
-rcvar=aprsd_enable
-load_rc_config $name
-aprsd_enable=${aprsd_enable-"NO"}
-aprsd_root=${aprsd_root-"NO"}
-
-command="/usr/local/bin/aprsd"
-start_cmd=aprsd_start
-stop_cmd=aprsd_stop
-
-PIDFILE="/var/run/aprsd.pid"
-UID="aprsd"
-GID="aprsd"
-#
-# aprsd.init for version 2.1.5.  starts or stops aprsd server.
-# This file should be placed in /usr/local/etc/rc.d/
-# 
-#
-#
-# Author:      Dale Heatherington <aprsd1@wa4dsy.net>
-# Modified:    Diane Bruce <va3db@amsat.org>
-
-# Source function library.
-#. /etc/rc.d/init.d/functions
-# See how we were called.
-aprsd_start()
-{
-	if [ -s ${PIDFILE} ] ; then
-		kill -0 `cat ${PIDFILE}` >&- 2>&-
-		if [ $? -eq 0 ]; then
-			echo "aprs server is already running."
-			return 0
-		fi 
-	fi
-	if [ ${aprsd_root} != "YES" ]; then
-		echo "Starting aprs server as user ${UID}:${GID}."
-		touch ${PIDFILE}
-		chown ${UID}:${GID} ${PIDFILE}
-		chown ${UID}:${GID} /var/log/aprsd
-		chown ${UID}:${GID} /var/log/aprsd/*
-		su ${UID} -m -c "${command} -d"
-	else   
-		echo "Starting aprs server as root."
-		chown root:wheel ${PIDFILE}
-                chown root:wheel /var/log/aprsd
-                chown root:wheel /var/log/aprsd/*
-
-		${command} -d
-	fi
-	return 0
-}
-aprsd_stop()
-{
-	echo  "Stopping aprs server daemon. "
-	kill -INT `cat ${PIDFILE}`
-	return 0
-}
-
-run_rc_command "$1"
--- a/comms/aprsd/files/aprsd.in
+++ b/comms/aprsd/files/aprsd.in
@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: aprsd
+# REQUIRE: NETWORKING
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf
+# aprsd_enable="YES"
+# aprsd_root="YES" or aprsd_root="NO"
+
+. /etc/rc.subr
+
+name=aprsd
+rcvar=aprsd_enable
+load_rc_config $name
+
+: ${aprsd_enable=NO}
+: ${aprsd_root=NO}
+: ${aprsd_user=%%APRSD_RC_USER%%}
+: ${aprsd_group=%%APRSD_RC_GROUP%%}
+
+command=%%LOCALBASE%%/bin/aprsd
+start_precmd=aprsd_pre
+stop_cmd=aprsd_stop
+pidfile=/var/run/aprsd.pid
+
+aprsd_pre()
+{
+	if [ ${aprsd_root} != "YES" ]; then
+		echo "Starting aprs server as user ${APRSD_RC_USER}:${APRSD_RC_GROUP}."
+		install -o ${APRSD_RC_USER} -g ${APRSD_RC_GROUP} /dev/null ${pidfile}
+		chown -R ${APRSD_RC_USER}:${APRSD_RC_GROUP} /var/log/aprsd
+	else   
+		echo "Starting aprs server as root."
+		install -o root -g wheel /dev/null ${pidfile}
+                chown -R root:wheel /var/log/aprsd
+	fi
+	return 0
+}
+
+run_rc_command "$1"
--- a/comms/aprsd/files/pkg-deinstall.in
+++ b/comms/aprsd/files/pkg-deinstall.in
@ -0,0 +1,8 @@
+#!/bin/sh
+
+cat<<EOF
+If you really want to remove this package completely
+remove what is left in %%LOCALBASE%%/etc/aprsd /var/log/aprsd.
+Also be sure to remove user and groups aprsd and tnc 
+and remember to remove aprsd from dialer group.
+EOF
--- a/comms/aprsd/pkg-deinstall
+++ b/comms/aprsd/pkg-deinstall
@ -1,16 +0,0 @@
-#!/bin/sh
-
-if [ "x$2" != "xPOST-DEINSTALL" ]; then
-	exit 0;
-fi
-
-echo "Killing aprsd if running"
-kill -9 `cat /var/run/aprsd.pid`
-rm -f /var/run/aprsd.pid
-
-cat<<EOF
-If you really want to remove this package completely
-remove what is left in /usr/local/etc/aprsd /var/log/aprsd.
-Also be sure to remove user and groups aprsd and tnc 
-and remember to remove aprsd from dialer group.
-EOF
--- a/comms/aprsd/pkg-install
+++ b/comms/aprsd/pkg-install
@ -1,142 +0,0 @@
-#!/bin/sh
-
-UID=240
-GID=${UID}
-DAEMON_NAME="aprsd"
-UID_NAME=${DAEMON_NAME}
-GID_NAME=${DAEMON_NAME}
-
-TNC_UID=241
-TNC_GID=${TNC_UID}
-TNC_UID_NAME="tnc"
-TNC_GID_NAME="tnc"
-
-if [ "x$2" != "xPRE-INSTALL" ]; then
-	exit 0;
-fi
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	if [ x${answer} = x ]; then
-		answer=${default}
-	fi
-	echo ${answer}
-}
-
-yesno() {
-	local dflt question answer
-
-	question=$1
-	dflt=$2
-	while :; do
-		answer=$(ask "${question}" "${dflt}")
-		case "${answer}" in
-		[Yy]*)          return 0;;
-		[Nn]*)          return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-adduser() {
-	local uid gid uid_name gid_name daemon_name
-
-	uid=$1
-	gid=$2
-	uid_name=$3
-	gid_name=$4
-	daemon_name=$5
-	if which -s pw ; then
-		:
-	else
-		cat <<EOF
-Your system does not include the "pw" utility.  You should upgrade
-to a newer version of FreeBSD.  Without "pw" this script will not
-run.
-EOF
-		exit 1
-	fi
-
-	echo ""
-	if pw groupshow ${gid_name} 2> /dev/null ; then
-		echo "You already have a group \"${gid_name}\", so I will use it."
-	else
-		if pw groupshow ${gid} 2> /dev/null ; then
-			echo "You already have a gid \"${gid}\".  Please create a user ${gid_name}"
-			echo "with a default group of \"${gid_name}\"."
-			exit 1
-		fi
-		echo "You need a group \"${gid_name}\"."
-		if which -s pw && yesno "Would you like me to create it" y; then
-		    pw groupadd ${gid_name} -g ${gid} || exit
-		    echo "Done."
-		else
-			echo "Please create it, and try again."
-			if ! pw usershow ${uid_name} 2> /dev/null ; then
-			    echo "While you're at it, please create a user \"${uid_name}\""
-				echo 'too, with a default group of "${gid_name}".'
-			fi
-			exit 1
-		fi
-	fi
-
-	if pw usershow ${uid_name} 2> /dev/null ; then
-		echo "You already have a user \"${uid_name}\", so I will use it."
-	else
-	        if pw usershow ${uid} 2> /dev/null ; then
-        	        echo "You already have a uid \"${uid}\".  Please create a user \"${uid_name}\""
-                	echo "with a default group of \"${gid_name}\"."
-	                exit 1
-		fi
-		echo "You need a user \"${uid_name}\"."
-		if which -s pw && yesno "Would you like me to create it" y; then
-		    pw useradd ${uid_name} -g ${gid_name} -u ${uid} -h - -d /nonexistent \
-				-s /bin/sh -c "${daemon_name}" || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-}
-
-(adduser ${UID} ${GID} ${UID_NAME} ${GID_NAME} ${DAEMON_NAME})
-
-echo `pw groupshow dialer`|grep -q ${UID_NAME}
-if [ $? -eq 0 ]; then
-	echo "You already have \"${UID_NAME}\" in the dialer group, so I will use this."
-else
-cat<<EOF
-${DAEMON_NAME} needs access to serial ports to talk to an
-external tnc. You will be asked if you wish to add ${DAEMON_NAME}
-to the dialer group for that purpose.
-EOF
-	if pw usershow ${UID_NAME} 2> /dev/null ; then
-		if which -s pw && yesno "Would you like to add \"${UID_NAME}\" to the dialer group?" y; then
-			pw groupmod -n "dialer" -m ${UID_NAME} || exit
-			echo "Done."
-		fi
-	fi
-fi
-
-if ! pw usershow ${TNC_UID_NAME} 2> /dev/null ; then
-cat<<EOF
-"${DAEMON_NAME}" has an optional login "${TNC_UID_NAME}",
-(This is described in the aprsd docs.) if you
-wish to allow remote logins. "${DAEMON_NAME}" needs to run as
-root for this to work, if you do not plan to run
-"${DAEMON_NAME}" ever as root, you can skip this step.
-You can always add it manually later if you change your mind.
-EOF
-        if which -s pw && yesno "Would you like to add a ${TNC_UID_NAME} login" y; then
-		(adduser ${TNC_UID} ${TNC_GID} ${TNC_UID_NAME} ${TNC_GID_NAME} ${DAEMON_NAME})
-        fi
-else
-	echo "You already have an user \"${TNC_UID_NAME}\" so I will use it."
-fi
--- a/comms/aprsd/pkg-plist
+++ b/comms/aprsd/pkg-plist
@ -5,7 +5,6 @@ etc/aprsd/RESTORE.TNC.samp
 etc/aprsd/aprsd.conf.samp
 etc/aprsd/user.deny.samp
 etc/aprsd/welcome.txt.samp
-etc/rc.d/aprsd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkaprsd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp_example
 %%PORTDOCS%%%%DOCSDIR%%/aprsddoc.html
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	cqrlog
 PORTVERSION=	1.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	comms hamradio

@ -15,10 +15,13 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus
 LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib

-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GITHUB=	yes
 GH_ACCOUNT=	ok2cqr

+USES=		shebangfix
+SHEBANG_FILES=	tools/cqrlog-apparmor-fix \
+		voice_keyer/voice_keyer.sh
+
 WANT_GNOME=	yes
 ALL_TARGET=	${PORTNAME}

--- a/devel/Makefile
+++ b/devel/Makefile
@ -1321,6 +1321,7 @@
    SUBDIR += linux_libusb
    SUBDIR += lion
    SUBDIR += llnextgen
+    SUBDIR += llvm-cheri
    SUBDIR += llvm-devel
    SUBDIR += llvm33
    SUBDIR += llvm34
--- a/devel/dash.el/Makefile
+++ b/devel/dash.el/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	dash.el
-PORTVERSION=	2.6.0
-PORTREVISION=	2
+PORTVERSION=	2.11.0
 CATEGORIES=	devel elisp
 DISTNAME=	dash-${PORTVERSION}

--- a/devel/dash.el/distinfo
+++ b/devel/dash.el/distinfo
@ -1,2 +1,2 @@
-SHA256 (dash-2.6.0_GH0.tar.gz) = 972e21473b456b4e8ba23f285dda567c4a36072c2433b5382f829ced2c408769
-SIZE (dash-2.6.0_GH0.tar.gz) = 70485
+SHA256 (dash-2.11.0_GH0.tar.gz) = d888d34b9b86337c5740250f202e7f2efc3bf059b08a817a978bf54923673cde
+SIZE (dash-2.11.0_GH0.tar.gz) = 138461
--- a/devel/libopensync022/Makefile
+++ b/devel/libopensync022/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libopensync
 PORTVERSION=	0.22
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/
 PKGNAMESUFFIX=	022
@ -18,6 +18,7 @@ GNU_CONFIGURE=	yes
 USES=		libtool pathfix pkgconfig python tar:bzip2
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip

 CONFLICTS=	libopensync-0.[3-9]*

--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@ -0,0 +1,236 @@
+# $FreeBSD$
+
+PORTNAME=	llvm
+PORTVERSION=	3.8.d20150730
+CATEGORIES=	devel lang
+PKGNAMESUFFIX=	${LLVM_SUFFIX}
+
+MAINTAINER=	brooks@FreeBSD.org
+COMMENT=	LLVM and Clang
+
+LLVM_SUFFIX=	-cheri
+LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
+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
+
+SUB_FILES=	llvm-wrapper.sh
+SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
+
+CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
+CMAKE_ARGS=	-DBUILD_SHARED_LIBS=ON
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	CTSRD-CHERI
+GH_TAGNAME=	${LLVM_COMMIT}
+
+LLVM_COMMIT=	6ceec22d782d30aaca11d424cbdfbd25e9f809a2
+CLANG_COMMIT=	27828bc4475a8a424b9f8bd029dce96c381cb661
+LLDB_COMMIT=	7ee5905d0109a13d543a127a9cda7c280c8103c8
+
+OPTIONS_DEFINE=	CLANG DOCS LIT LLDB
+OPTIONS_DEFAULT=	CLANG LIT LLDB
+OPTIONS_SUB=	yes
+
+CLANG_DESC=	Build clang
+CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
+CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
+CLANG_GH_PROJECT=	clang:clang
+CLANG_GH_TAGNAME=	${CLANG_COMMIT}:clang
+CLANG_PORTDOCS=		clang
+DOCS_PORTDOCS=		llvm
+DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
+			-DLLVM_BUILD_DOCS=ON
+DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
+LIT_DESC=		Install lit and FileCheck test tools
+LLDB_DESC=		Install lldb, the LLVM debugger
+LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LLDB_GH_PROJECT=	lldb:lldb
+LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
+
+OPTIONS_SUB=	yes
+
+DOCS_BUILD_DEPENDS=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+
+LLVM_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
+PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}
+
+COMMANDS=	bugpoint \
+		llc \
+		lli \
+		llvm-ar \
+		llvm-as \
+		llvm-bcanalyzer \
+		llvm-config \
+		llvm-cov \
+		llvm-diff \
+		llvm-dis \
+		llvm-dwarfdump \
+		llvm-extract \
+		llvm-link \
+		llvm-mc \
+		llvm-mcmarkup \
+		llvm-nm \
+		llvm-objdump \
+		llvm-profdata \
+		llvm-ranlib \
+		llvm-readobj \
+		llvm-rtdyld \
+		llvm-size \
+		llvm-stress \
+		llvm-symbolizer \
+		llvm-tblgen \
+		macho-dump \
+		opt
+FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
+
+STRIP_LIBS=	BugpointPasses.so \
+		LLVMHello.so \
+		${LIBNAME}.0 \
+		libLTO.so
+
+.include <bsd.port.options.mk>
+
+# keep in sync with /usr/src/lib/clang/clang.build.mk
+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
+
+.if ${PORT_OPTIONS:MCLANG}
+COMMANDS+=	clang \
+		clang++ \
+		clang-check \
+		clang-cpp \
+		clang-format
+MAN1SRCS+=	clang.1
+.endif
+
+.if ${PORT_OPTIONS:MLIT}
+MAN1SRCS+=	lit.1 FileCheck.1
+_USES_PYTHON=	python
+LIT_COMMANDS=	lit llvm-lit FileCheck
+.endif
+
+.if ${PORT_OPTIONS:MLLDB}
+COMMANDS+=	argdumper \
+		lldb \
+		lldb-mi \
+		lldb-server
+_USES_PYTHON=	python
+.endif
+
+_USES_PYTHON?=	python:build
+USES+=		${_USES_PYTHON}
+
+MAN1SRCS+=	bugpoint.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
+		llvm-bcanalyzer.1 llvm-build.1 llvm-config.1 llvm-cov.1 \
+		llvm-diff.1 llvm-dis.1 llvm-dwarfdump.1 \
+		llvm-extract.1 llvm-link.1 llvm-nm.1 \
+		llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \
+		opt.1 tblgen.1
+
+NOT_FOR_ARCH=	ia64
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 900000
+BROKEN=	GCC failing on 8.x
+.endif
+
+post-extract-CLANG-on:
+	${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
+
+post-extract-LLDB-on:
+	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
+
+post-patch:
+	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
+	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
+	    -e 's|lit\.|lit${LLVM_SUFFIX}.|' \
+	    ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX}
+.for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
+	${LN} -f ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX} \
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${command}${COMMAND_SUFFIX}
+.endfor
+
+post-install-DOCS-on:
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
+.for _man in ${MAN1SRCS}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
+	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
+.endfor
+.if ! ${PORT_OPTIONS:MLIT}
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
+.endif
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
+
+post-install-LLDB-on:
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
+
+post-install-CLANG-on:
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
+
+post-install-LIT-on:
+	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}lit${COMMAND_SUFFIX}
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}llvm-lit${COMMAND_SUFFIX}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
+	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \
+	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
+	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}FileCheck${COMMAND_SUFFIX}
+
+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
+regression-test: ${BUILD_COOKIE}
+	if [ `${ID} -u` = 0 ]; then \
+		${CHOWN} -R nobody ${WRKSRC}/test; \
+		su -m nobody -c ${TEST_CMD}; \
+	else \
+		${SH} -c ${TEST_CMD}; \
+	fi
+
+build-plist:
+	${RM} -f ${PLIST} ${PLIST}.tmp
+.for command in ${COMMANDS}
+	${ECHO_CMD} bin/${COMMAND_PREFIX}${command}${COMMAND_SUFFIX} >> ${PLIST}.tmp
+.endfor
+.for command in ${LIT_COMMANDS}
+	${ECHO_CMD} %%LIT%%bin/${COMMAND_PREFIX}${command}${COMMAND_SUFFIX} >> ${PLIST}.tmp
+	${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||}/bin/${command} >> ${PLIST}.tmp
+.endfor
+	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
+	    ${GREP} -v 'lit$$' | ${GREP} -v 'FileCheck$$' | \
+	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
+	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' \
+	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' | \
+	    ${SORT} >> ${PLIST}.tmp
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
+	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \
+	    ${SORT} >> ${PLIST}.tmp
+	awk '{if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} print}' ${PLIST}.tmp >> ${PLIST}
+	${RM} -f ${PLIST}.tmp
+
+check-commands:
+.for command in ${COMMANDS}
+	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
+.endfor
+
+.include <bsd.port.post.mk>
--- a/devel/llvm-cheri/distinfo
+++ b/devel/llvm-cheri/distinfo
@ -0,0 +1,6 @@
+SHA256 (CTSRD-CHERI-llvm-3.8.d20150730-6ceec22d782d30aaca11d424cbdfbd25e9f809a2_GH0.tar.gz) = fa40d6fbc9bc18cab19820ee4138c8324f231572eb2d15bc5816238dc6bec5b8
+SIZE (CTSRD-CHERI-llvm-3.8.d20150730-6ceec22d782d30aaca11d424cbdfbd25e9f809a2_GH0.tar.gz) = 20903524
+SHA256 (CTSRD-CHERI-clang-27828bc4475a8a424b9f8bd029dce96c381cb661_GH0.tar.gz) = 3fb812ec34ae54969649b447153cae687f718c446eaffff42799ad3c20ac3364
+SIZE (CTSRD-CHERI-clang-27828bc4475a8a424b9f8bd029dce96c381cb661_GH0.tar.gz) = 12340622
+SHA256 (CTSRD-CHERI-lldb-7ee5905d0109a13d543a127a9cda7c280c8103c8_GH0.tar.gz) = 2ac9d9a24369b013fb864c3e49e037f8a058a28e24544d8213244f84ee453f2e
+SIZE (CTSRD-CHERI-lldb-7ee5905d0109a13d543a127a9cda7c280c8103c8_GH0.tar.gz) = 13135309
--- a/devel/llvm-cheri/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
+++ b/devel/llvm-cheri/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
@ -1,7 +1,15 @@
--- tools/clang/lib/Headers/CMakeLists.txt.orig	2014-11-13 09:02:37 UTC
+--- tools/clang/lib/Headers/CMakeLists.txt.orig	2015-07-21 15:57:35 UTC
 +++ tools/clang/lib/Headers/CMakeLists.txt
-@@ -37,20 +37,12 @@
-   rtmintrin.h
+@@ -30,7 +30,6 @@ set(files
+   Intrin.h
+   inttypes.h
+   iso646.h
+-  limits.h
+   lzcntintrin.h
+   mm3dnow.h
+   mmintrin.h
+@@ -45,20 +44,12 @@ set(files
+   s390intrin.h
   shaintrin.h
   smmintrin.h
 -  stdalign.h
--- a/devel/llvm-cheri/files/llvm-wrapper.sh.in
+++ b/devel/llvm-cheri/files/llvm-wrapper.sh.in
@ -2,9 +2,9 @@
 # $FreeBSD$

 LLVM_PREFIX="%%LLVM_PREFIX%%"
-TOOL_PREFIX="%%TOOL_PREFIX%%"
+LLVM_SUFFIX="%%LLVM_SUFFIX%%"

 tool=$(basename $0)
-tool="${LLVM_PREFIX}/bin/${tool#${TOOL_PREFIX}}"
+tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
 LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
    "${tool}" "${@}"
--- a/devel/llvm-cheri/files/patch-utils_llvm-build_llvmbuild_main.py
+++ b/devel/llvm-cheri/files/patch-utils_llvm-build_llvmbuild_main.py
@ -0,0 +1,21 @@
+--- utils/llvm-build/llvmbuild/main.py.orig	2015-07-20 23:51:12 UTC
+++ utils/llvm-build/llvmbuild/main.py
+@@ -718,7 +718,17 @@ def add_magic_target_components(parser, 
+ 
+     # We handle a few special cases of target names here for historical
+     # reasons, as these are the names configure currently comes up with.
+-    native_target_name = { 'x86' : 'X86',
+    native_target_name = { 'amd64' : 'X86',
+			   'arm' : 'ARM',
+			   'armeb' : 'ARM',
+			   'armv6' : 'ARM',
+			   'armv6hf' : 'ARM',
+			   'i386' : 'X86',
+			   'mips' : 'Mips',
+			   'powerpc' : 'PowerPC',
+			   'powerpc64' : 'PowerPC',
+			   'sparc64' : 'Sparc',
+                           'x86' : 'X86',
+                            'x86_64' : 'X86',
+                            'Unknown' : None }.get(opts.native_target,
+                                                   opts.native_target)
--- a/devel/llvm-cheri/pkg-descr
+++ b/devel/llvm-cheri/pkg-descr
@ -0,0 +1,8 @@
+The LLVM Project is a collection of modular and reusable compiler and
+toolchain technologies.
+
+This port includes Clang (a C/C++/Objective-C compiler), LLD (a linker),
+LLDB (a debugger), an OpenMP runtime library, and the LLVM infrastructure
+these are built on.
+
+WWW:	http://llvm.org/
--- a/devel/llvm-cheri/pkg-plist
+++ b/devel/llvm-cheri/pkg-plist
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@ -44,20 +44,27 @@ OPTIONS_SUB=	yes
 CLANG_DESC=	Build clang
 CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
 CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
-_CLANG_GH_PROJECT=	clang:clang
-_CLANG_GH_TAGNAME=	${CLANG_COMMIT}:clang
+CLANG_GH_PROJECT=	clang:clang
+CLANG_GH_TAGNAME=	${CLANG_COMMIT}:clang
+CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+CLANG_PORTDOCS=		clang
+DOCS_PORTDOCS=		llvm
+DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
+			-DLLVM_BUILD_DOCS=ON
+DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld, the LLVM linker
-_LLD_GH_PROJECT=		lld:lld
-_LLD_GH_TAGNAME=		${LLD_COMMIT}:lld
+LLD_GH_PROJECT=		lld:lld
+LLD_GH_TAGNAME=		${LLD_COMMIT}:lld
 LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
-_LLDB_GH_PROJECT=	lldb:lldb
-_LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
+LLDB_GH_PROJECT=	lldb:lldb
+LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_CONFLICTS_INSTALL=	libiomp5-devel-*
-_OPENMP_GH_PROJECT=	openmp:openmp
-_OPENMP_GH_TAGNAME=	${OPENMP_COMMIT}:openmp
+OPENMP_GH_PROJECT=	openmp:openmp
+OPENMP_GH_TAGNAME=	${OPENMP_COMMIT}:openmp

 OPTIONS_SUB=	yes

@ -112,17 +119,6 @@ COMMANDS+=	clang \
 		clang-cpp \
 		clang-format
 MAN1SRCS+=	clang.1
-PORTDOCS+=	clang
-CMAKE_ARGS+=	-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-GH_PROJECT+=	${_CLANG_GH_PROJECT}
-GH_TAGNAME+=	${_CLANG_GH_TAGNAME}
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS+=	llvm
-CMAKE_ARGS+=	-DLLVM_ENABLE_SPHINX=ON \
-		-DSPHINX_WARNINGS_AS_ERRORS=OFF \
-		-DLLVM_BUILD_DOCS=ON
 .endif

 .if ${PORT_OPTIONS:MLIT}
@ -134,8 +130,6 @@ LIT_COMMANDS=	lit llvm-lit FileCheck
 .if ${PORT_OPTIONS:MLLD}
 COMMANDS+=	lld
 PORTDOCS+=	lld
-GH_PROJECT+=	${_LLD_GH_PROJECT}
-GH_TAGNAME+=	${_LLD_GH_TAGNAME}
 .endif

 .if ${PORT_OPTIONS:MLLDB}
@ -144,16 +138,12 @@ COMMANDS+=	argdumper \
 		lldb-mi \
 		lldb-server
 _USES_PYTHON=	python
-GH_PROJECT+=	${_LLDB_GH_PROJECT}
-GH_TAGNAME+=	${_LLDB_GH_TAGNAME}
 .endif

 .if ! ${OPTIONS_DEFINE:MOPENMP}
 # Hack to disable OPENMP in plist of unsupported architectures
 PLIST_SUB+=    OPENMP="@comment "
 .else
-GH_PROJECT+=	${_OPENMP_GH_PROJECT}
-GH_TAGNAME+=	${_OPENMP_GH_TAGNAME}
 .endif

 _USES_PYTHON?=	python:build
@ -165,9 +155,6 @@ MAN1SRCS+=	bugpoint.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
 		llvm-extract.1 llvm-lib.1 llvm-link.1 llvm-nm.1 \
 		llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \
 		opt.1 tblgen.1
-.if ${PORT_OPTIONS:MDOCS}
-PLIST_FILES+=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
-.endif

 NOT_FOR_ARCH=	ia64

@ -177,19 +164,17 @@ NOT_FOR_ARCH=	ia64
 BROKEN=	GCC failing on 8.x
 .endif

-post-extract:
-.if ${PORT_OPTIONS:MCLANG}
+post-extract-CLANG-on:
 	${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
-.endif
-.if ${PORT_OPTIONS:MLLD}
+
+post-extract-LLD-on:
 	${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
-.endif
-.if ${PORT_OPTIONS:MLLDB}
+
+post-extract-LLDB-on:
 	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
-.endif
-.if ${PORT_OPTIONS:MOPENMP}
+
+post-extract-OPENMP-on:
 	${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp
-.endif

 post-patch:
 	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
@ -198,18 +183,34 @@ post-patch:
 	    ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py

 post-install:
-.if ${PORT_OPTIONS:MCLANG}
-	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
-	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
-.endif
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
-	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
 .endfor
-.if ${PORT_OPTIONS:MLIT}
+
+post-install-DOCS-on:
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
+.for _man in ${MAN1SRCS}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
+	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
+.endfor
+.if ! ${PORT_OPTIONS:MLIT}
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
+.endif
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
+
+post-install-LLDB-on:
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
+
+post-install-CLANG-on:
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
+
+post-install-LIT-on:
 	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
@ -225,30 +226,6 @@ post-install:
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
-.else
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/llvm ${STAGEDIR}${DOCSDIR}
-.if ${PORT_OPTIONS:MCLANG}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/clang ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MLLD}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/lld ${STAGEDIR}${DOCSDIR}
-.endif
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc
-.for _man in ${MAN1SRCS}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
-	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
-.endfor
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
-.endif
-.if ${PORT_OPTIONS:MLLDB}
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
-.endif

 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 regression-test: ${BUILD_COOKIE}
@ -271,7 +248,8 @@ build-plist:
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
 	    ${GREP} -v 'lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
-	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' | \
+	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' \
+	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' | \
 	    ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \
@ -279,4 +257,9 @@ build-plist:
 	awk '{if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} print}' ${PLIST}.tmp >> ${PLIST}
 	${RM} -f ${PLIST}.tmp

+check-commands:
+.for command in ${COMMANDS}
+	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
+.endfor
+
 .include <bsd.port.post.mk>
--- a/devel/llvm-devel/Makefile.svn_rev
+++ b/devel/llvm-devel/Makefile.svn_rev
@ -1 +0,0 @@
-SVN_REV=	242708
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@ -2403,7 +2403,7 @@ llvm-devel/share/llvm/cmake/HandleLLVMStdlib.cmake
 llvm-devel/share/llvm/cmake/LLVM-Config.cmake
 llvm-devel/share/llvm/cmake/LLVMConfig.cmake
 llvm-devel/share/llvm/cmake/LLVMConfigVersion.cmake
-llvm-devel/share/llvm/cmake/LLVMExports-release.cmake
+llvm-devel/share/llvm/cmake/LLVMExports-%%CMAKE_BUILD_TYPE%%.cmake
 llvm-devel/share/llvm/cmake/LLVMExports.cmake
 llvm-devel/share/llvm/cmake/LLVMProcessSources.cmake
 llvm-devel/share/llvm/cmake/TableGen.cmake
--- a/devel/llvm37/Makefile
+++ b/devel/llvm37/Makefile
@ -40,6 +40,13 @@ CLANG_DESC=	Build clang
 CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
 CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
 CLANG_DISTFILES=	cfe-${DISTVERSION}.src${EXTRACT_SUFX}
+CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+CLANG_PORTDOCS=		clang
+DOCS_PORTDOCS=		llvm
+DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
+			-DLLVM_BUILD_DOCS=ON
+DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld, the LLVM linker
 LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
@ -47,7 +54,6 @@ LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
-OPENMP_CONFLICTS_INSTALL=	libiomp5-devel-*
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}

 # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel
@ -108,17 +114,6 @@ COMMANDS+=	clang \
 		clang-cpp \
 		clang-format
 MAN1SRCS+=	clang.1
-PORTDOCS+=	clang
-CMAKE_ARGS+=	-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-GH_PROJECT+=	${_CLANG_GH_PROJECT}
-GH_TAGNAME+=	${_CLANG_GH_TAGNAME}
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS+=	llvm
-CMAKE_ARGS+=	-DLLVM_ENABLE_SPHINX=ON \
-		-DSPHINX_WARNINGS_AS_ERRORS=OFF \
-		-DLLVM_BUILD_DOCS=ON
 .endif

 .if ${PORT_OPTIONS:MLIT}
@ -130,8 +125,6 @@ LIT_COMMANDS=	lit llvm-lit FileCheck
 .if ${PORT_OPTIONS:MLLD}
 COMMANDS+=	lld
 PORTDOCS+=	lld
-GH_PROJECT+=	${_LLD_GH_PROJECT}
-GH_TAGNAME+=	${_LLD_GH_TAGNAME}
 .endif

 .if ${PORT_OPTIONS:MLLDB}
@ -140,16 +133,12 @@ COMMANDS+=	argdumper \
 		lldb-mi \
 		lldb-server
 _USES_PYTHON=	python
-GH_PROJECT+=	${_LLDB_GH_PROJECT}
-GH_TAGNAME+=	${_LLDB_GH_TAGNAME}
 .endif

 .if ! ${OPTIONS_DEFINE:MOPENMP}
 # Hack to disable OPENMP in plist of unsupported architectures
 PLIST_SUB+=    OPENMP="@comment "
 .else
-GH_PROJECT+=	${_OPENMP_GH_PROJECT}
-GH_TAGNAME+=	${_OPENMP_GH_TAGNAME}
 .endif

 _USES_PYTHON?=	python:build
@ -161,9 +150,6 @@ MAN1SRCS+=	bugpoint.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
 		llvm-extract.1 llvm-link.1 llvm-nm.1 \
 		llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \
 		opt.1 tblgen.1
-.if ${PORT_OPTIONS:MDOCS}
-PLIST_FILES+=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
-.endif

 NOT_FOR_ARCH=	ia64

@ -173,19 +159,17 @@ NOT_FOR_ARCH=	ia64
 BROKEN=	GCC failing on 8.x
 .endif

-post-extract:
-.if ${PORT_OPTIONS:MCLANG}
+post-extract-CLANG-on:
 	${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
-.endif
-.if ${PORT_OPTIONS:MLLD}
+
+post-extract-LLD-on:
 	${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
-.endif
-.if ${PORT_OPTIONS:MLLDB}
+
+post-extract-LLDB-on:
 	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
-.endif
-.if ${PORT_OPTIONS:MOPENMP}
+
+post-extract-OPENMP-on:
 	${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp
-.endif

 post-patch:
 	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
@ -195,18 +179,34 @@ post-patch:

 post-install:
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
-.if ${PORT_OPTIONS:MCLANG}
-	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
-	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
-.endif
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
-	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
 .endfor
-.if ${PORT_OPTIONS:MLIT}
+
+post-install-DOCS-on:
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
+.for _man in ${MAN1SRCS}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
+	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
+.endfor
+.if ! ${PORT_OPTIONS:MLIT}
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
+.endif
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
+
+post-install-LLDB-on:
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
+
+post-install-CLANG-on:
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
+	   ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
+
+post-install-LIT-on:
 	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
@ -222,30 +222,6 @@ post-install:
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
-.else
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/llvm ${STAGEDIR}${DOCSDIR}
-.if ${PORT_OPTIONS:MCLANG}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/clang ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MLLD}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/lld ${STAGEDIR}${DOCSDIR}
-.endif
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc
-.for _man in ${MAN1SRCS}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
-	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
-.endfor
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
-.endif
-.if ${PORT_OPTIONS:MLLDB}
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
-.endif

 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 regression-test: ${BUILD_COOKIE}
@ -268,15 +244,18 @@ build-plist:
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
 	    ${GREP} -v 'lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
-	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' | \
+	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' \
+	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' | \
 	    ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \
 	    ${SORT} >> ${PLIST}.tmp
-#	${FIND} ${STAGEDIR}${DOCSDIR} -type f | \
-#	    ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
-#	    ${SORT} >> ${PLIST}.tmp
 	awk '{if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} print}' ${PLIST}.tmp >> ${PLIST}
 	${RM} -f ${PLIST}.tmp

+check-commands:
+.for command in ${COMMANDS}
+	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
+.endfor
+
 .include <bsd.port.post.mk>
--- a/devel/llvm37/Makefile.svn_rev
+++ b/devel/llvm37/Makefile.svn_rev
@ -1 +0,0 @@
-SVN_REV=	242708
--- a/devel/llvm37/pkg-plist
+++ b/devel/llvm37/pkg-plist
@ -2402,7 +2402,7 @@ llvm37/share/llvm/cmake/HandleLLVMStdlib.cmake
 llvm37/share/llvm/cmake/LLVM-Config.cmake
 llvm37/share/llvm/cmake/LLVMConfig.cmake
 llvm37/share/llvm/cmake/LLVMConfigVersion.cmake
-llvm37/share/llvm/cmake/LLVMExports-release.cmake
+llvm37/share/llvm/cmake/LLVMExports-%%CMAKE_BUILD_TYPE%%.cmake
 llvm37/share/llvm/cmake/LLVMExports.cmake
 llvm37/share/llvm/cmake/LLVMProcessSources.cmake
 llvm37/share/llvm/cmake/TableGen.cmake
--- a/devel/p5-Future/Makefile
+++ b/devel/p5-Future/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Future
-PORTVERSION=	0.32
+PORTVERSION=	0.33
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PEVANS
--- a/devel/p5-Future/distinfo
+++ b/devel/p5-Future/distinfo
@ -1,2 +1,2 @@
-SHA256 (Future-0.32.tar.gz) = 39418065446e15dd579f2359094efe04b1f836a5805c4ce4e8287b05de27b58d
-SIZE (Future-0.32.tar.gz) = 80051
+SHA256 (Future-0.33.tar.gz) = 2fa237430b86cdc3561356e643fb1d09199f2335c6e98210116c7d944b5dd846
+SIZE (Future-0.33.tar.gz) = 83398
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	dnsmasq
-DISTVERSION=	2.74rc3
+DISTVERSION=	2.74rc4
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/release-candidates/
 PKGNAMESUFFIX=	-devel
@ -12,7 +12,7 @@ COMMENT=	Lightweight DNS forwarder, DHCP, and TFTP server

 LICENSE=	GPLv2

-#IGNORE=		build stable version instead, it is newer than this release candidate
+IGNORE=		build stable version instead, it is newer than this release candidate
 CONFLICTS_INSTALL=dnsmasq-2*

 PORTDOCS=	CHANGELOG CHANGELOG.archive FAQ doc.html setup.html
--- a/dns/dnsmasq-devel/distinfo
+++ b/dns/dnsmasq-devel/distinfo
@ -1,2 +1,2 @@
-SHA256 (dnsmasq-2.74rc3.tar.xz) = 0c18dec3ec03ec3e3573d89da74c126d2a5e847bf9d0b35ee2ff79cc8d6ade76
-SIZE (dnsmasq-2.74rc3.tar.xz) = 486940
+SHA256 (dnsmasq-2.74rc4.tar.xz) = 3fae2440e5aa166362621d69486fa6baedd53e2726522ae6101d01356e5724a6
+SIZE (dnsmasq-2.74rc4.tar.xz) = 487492
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@ -2,63 +2,47 @@
 # $FreeBSD$

 PORTNAME=	fmsx
-PORTVERSION=	4.0
+PORTVERSION=	4.2
 CATEGORIES=	emulators
 MASTER_SITES=	http://fms.komkon.org/fMSX/:code \
-		http://fms.komkon.org/fMSX/src/:rom \
-		http://mirror.amdmi3.ru/distfiles/:code # delete me
-DISTFILES=	fMSX40.zip:code \
+		http://fms.komkon.org/fMSX/src/:rom
+DISTFILES=	fMSX${PORTVERSION:C/\.//}.zip:code \
 		MSX.ROM:rom MSX2.ROM:rom MSX2EXT.ROM:rom MSX2P.ROM:rom \
 		MSX2PEXT.ROM:rom FMPAC.ROM:rom DISK.ROM:rom MSXDOS2.ROM:rom \
 		PAINTER.ROM:rom KANJI.ROM:rom
 DIST_SUBDIR=	fmsx4
-EXTRACT_ONLY=	fMSX40.zip
+EXTRACT_ONLY=	fMSX${PORTVERSION:C/\.//}.zip

 MAINTAINER=	dk@farm.org
 COMMENT=	Portable MSX/MSX2/MSX2+ Emulator

-USE_XORG=	xi x11
-USES=		gmake dos2unix zip
+USE_XORG=	x11 xext
+USES=		dos2unix gmake zip
 DOS2UNIX_FILES=	EMULib/Unix/LibUnix.c EMULib/Unix/NetUnix.c EMULib/Rules.gcc \
 		EMULib/Rules.Unix
 RESTRICTED=	Legal status of distributed ROM images unclear
-WRKSRC=		${WRKDIR}
+NO_WRKSUBDIR=	yes
+SUB_FILES=	${PORTNAME}
+BUILD_WRKSRC=	${WRKSRC}/fMSX/Unix

-OPTIONS_DEFINE=	BPP8 BPP16 BPP24 BPP32 DOCS
+OPTIONS_DEFINE=	DOCS
+OPTIONS_SINGLE=	BPP
+OPTIONS_SINGLE_BPP=	BPP8 BPP16 BPP24 BPP32
 OPTIONS_DEFAULT=	BPP32
 BPP8_DESC=	With BPP8
 BPP16_DESC=	With BPP16
 BPP24_DESC=	With BPP24
 BPP32_DESC=	With BPP32 (see pkg-message)
-
-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \
-		${WRKSRC}/fMSX/Unix/Makefile \
-		${WRKSRC}/EMULib/Rules.Unix
-.if ${PORT_OPTIONS:MBPP32}
-	@${REINPLACE_CMD} -e 's/BPP16/BPP32/' ${WRKSRC}/fMSX/Unix/Makefile
-.endif
-.if ${PORT_OPTIONS:MBPP24}
-	@${REINPLACE_CMD} -e 's/BPP16/BPP24/' ${WRKSRC}/fMSX/Unix/Makefile
-.endif
-.if ${PORT_OPTIONS:MBPP16}
-	@${REINPLACE_CMD} -e 's/BPP16/BPP16/' ${WRKSRC}/fMSX/Unix/Makefile
-.endif
-.if ${PORT_OPTIONS:MBPP8}
-	@${REINPLACE_CMD} -e 's/BPP16/BPP8/' ${WRKSRC}/fMSX/Unix/Makefile
-.endif
-
-do-build:
-	(cd ${WRKSRC}/fMSX/Unix && ${MAKE_CMD} DEBUG_FLAGS=${DEBUG_FLAGS})
+BPP8_CFLAGS=	-DBPP8
+BPP16_CFLAGS=	-DBPP16
+BPP24_CFLAGS=	-DBPP24
+BPP32_CFLAGS=	-DBPP32

 do-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/fmsx ${STAGEDIR}${PREFIX}/bin
-	@${REINPLACE_CMD} -i "" -e "s,PREFIX,${PREFIX},g" ${STAGEDIR}${PREFIX}/bin/fmsx
-	${INSTALL_PROGRAM} ${WRKSRC}/fMSX/Unix/fmsx ${STAGEDIR}${PREFIX}/bin/fmsx.bin
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fmsx
-	${INSTALL_DATA} ${WRKSRC}/fMSX/ROMs/*.FNT ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/fmsx ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/fMSX/Unix/fmsx ${STAGEDIR}${PREFIX}/libexec/fmsx
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/ROMs/*.FNT ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.ROM ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/fMSX/*.html ${STAGEDIR}${DOCSDIR}
--- a/emulators/fmsx/distinfo
+++ b/emulators/fmsx/distinfo
@ -1,5 +1,5 @@
-SHA256 (fmsx4/fMSX40.zip) = 9ce21d69ccff09c1b886660eca28c34d9da92f142b469b7f76e5f853d50f7c1f
-SIZE (fmsx4/fMSX40.zip) = 572095
+SHA256 (fmsx4/fMSX42.zip) = 7040bd61b309d4b514c20c7413d48f9b816e2f91e8bf7bb268d6143cbaa75e00
+SIZE (fmsx4/fMSX42.zip) = 580876
 SHA256 (fmsx4/MSX.ROM) = 999564a371dd2fdf7fbe8d853e82a68d557c27b7d87417639b2fa17704b83f78
 SIZE (fmsx4/MSX.ROM) = 32768
 SHA256 (fmsx4/MSX2.ROM) = 4bc4ae85ca5f28246cd3e7b7e017d298ddd375603657f84ef2c7954bc2d9b919
--- a/emulators/fmsx/files/fmsx
+++ b/emulators/fmsx/files/fmsx
@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec PREFIX/bin/fmsx.bin -home PREFIX/share/fmsx "$@"
--- a/emulators/fmsx/files/fmsx.in
+++ b/emulators/fmsx/files/fmsx.in
@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec %%PREFIX%%/libexec/fmsx -home %%DATADIR%% "$@"
--- a/emulators/fmsx/files/patch-EMULib_Rules.Unix
+++ b/emulators/fmsx/files/patch-EMULib_Rules.Unix
@ -5,8 +5,8 @@
 include ../../EMULib/Rules.gcc
 
 -CFLAGS += -I$(EMULIB)/Unix -I/usr/X11R6/include
-+CFLAGS += -I$(EMULIB)/Unix -I%%LOCALBASE%%/include $(DEBUG_FLAGS)
+CFLAGS += -I$(EMULIB)/Unix -I${LOCALBASE}/include $(DEBUG_FLAGS)
 DEFINES+= -DUNIX -DMITSHM -DBPS16
 -LIBS   += -lX11 -lXext
-+LIBS   += -L%%LOCALBASE%%/lib -lX11 -lXext
+LIBS   += -L${LOCALBASE}/lib -lX11 -lXext
 OBJECTS+= $(EMUUNIX)
--- a/emulators/fmsx/pkg-plist
+++ b/emulators/fmsx/pkg-plist
@ -1,5 +1,5 @@
 bin/fmsx
-bin/fmsx.bin
+libexec/fmsx
 %%DATADIR%%/CYRILLIC.FNT
 %%DATADIR%%/DISK.ROM
 %%DATADIR%%/FMPAC.ROM
--- a/games/openra/Makefile
+++ b/games/openra/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	openra
 PORTVERSION=	20150614
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 # XXX Convert to USES=nuget or package dependencies instead
 MASTER_SITES=	https://nuget.org/api/v2/package/StyleCopPlus.MSBuild/4.7.49.5?dummy=/:StyleCopPlus \
@ -49,7 +49,8 @@ USE_GITHUB=	yes
 GH_PROJECT=	OpenRA

 NO_ARCH=	yes
-USES=		gmake lua:51,run mono openal:soft
+USES=		gmake lua:51,run mono openal:soft shebangfix
+SHEBANG_FILES=	launch-dedicated.sh
 USE_SDL=	sdl2
 MAKE_ENV=	prefix="${PREFIX}"
 MAKE_ARGS=	VERSION="${GH_TAGNAME}"
--- a/graphics/gegl3/Makefile
+++ b/graphics/gegl3/Makefile
@ -2,15 +2,14 @@
 # $FreeBSD$

 PORTNAME=	gegl
-PORTVERSION=	0.3.0.a1
+PORTVERSION=	0.3.0
 CATEGORIES=	graphics
-#MASTER_SITES=	GIMP
-MASTER_SITES=	LOCAL/kwm
+MASTER_SITES=	GIMP
 PKGNAMESUFFIX=	3
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.a1//}

 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Graph based image processing framework (0.3.0 snapshot)
+COMMENT=	Graph based image processing framework

 LIB_DEPENDS=	libbabl-0.1.so:${PORTSDIR}/x11/babl \
 		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
@ -40,7 +39,6 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	CAIRO ENSCRIPT EXIV2 FFMPEG PIXBUF GRAPHVIZ JASPER JPEG \
 		LUA OPENEXR OPENRAW SIMD PANGO PNG LIBRSVG2 SDL SPIRO V4L \
 		EXAMPLES LCMS2 WEBP
-#		DOCS EXAMPLES
 OPTIONS_DEFAULT=CAIRO ENSCRIPT EXIV2 PIXBUF GRAPHVIZ JASPER JPEG LCMS2 LUA \
 		OPENEXR OPENRAW PANGO PNG LIBRSVG2 SDL SPIRO V4L WEBP

@ -122,57 +120,27 @@ CONFIGURE_ARGS+=--without-pangocairo
 PLIST_SUB+=	PANGOCAIRO="@comment "
 .endif

-#.if ${PORT_OPTIONS:MDOCS}
-#BUILD_DEPENDS+=	a2x:${PORTSDIR}/textproc/asciidoc \
-#		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-#		vimdot:${PORTSDIR}/graphics/graphviz
-#USE_RUBY=	yes
-#RUBY_NO_RUN_DEPENDS=yes
-#.else
-#CONFIGURE_ARGS+=--disable-docs
-#.endif
-
 post-patch:
 	${REINPLACE_CMD} "s/lua >/lua-${LUA_VER} >/g" ${WRKSRC}/configure
-.if ! ${PORT_OPTIONS:MDOCS}
+.if ! ${PORT_OPTIONS:MEXAMPLES}
 	${REINPLACE_CMD} -e 's|tools examples|tools|g' \
 		${WRKSRC}/Makefile.in
 .endif
 	${REINPLACE_CMD} -e 's|\(lua\)\(5\.1\)|\1-\2|g ; s|x86_64|amd64|g' \
 		${WRKSRC}/configure

-#.if ${PORT_OPTIONS:MDOCS}
-#pre-configure:
-#.if !exists(${LOCALBASE}/bin/vimdot)
-#	@${ECHO_CMD} "${PKGNAME}: Needs graphics/graphviz with PANGOCAIRO support enabled."
-#	@${FALSE}
-#.endif
-#.endif
-
-#post-build:
-#.if ${PORT_OPTIONS:MDOCS}
-#	cd ${WRKSRC}/docs && ${MAKE_CMD} index.html
-#.endif
-
 post-install:
-#.if ${PORT_OPTIONS:MDOCS}
-#	${MKDIR} ${STAGEDIR}${DOCSDIR}/gallery
-#	(cd ${WRKSRC}/docs && \
-#	    ${COPYTREE_SHARE} \*.html ${STAGEDIR}${DOCSDIR} && \
-#	    ${INSTALL_DATA} ChangeLog gegl.css gegl.devhelp devhelp.css ${STAGEDIR}${DOCSDIR} && \
-#	    ${INSTALL_DATA} gallery/OpenRaster* ${STAGEDIR}${DOCSDIR}/gallery && \
-#	    ${INSTALL_DATA} gallery/clones* ${STAGEDIR}${DOCSDIR}/gallery && \
-#	    ${INSTALL_DATA} gallery/index.html ${STAGEDIR}${DOCSDIR}/gallery )
-#.endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/data
 	${INSTALL_DATA} ${WRKSRC}/examples/data/surfer.png ${STAGEDIR}${EXAMPLESDIR}/data
 .for ex in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/examples/${ex}.c ${STAGEDIR}${EXAMPLESDIR}
 .endfor
+# temporary hacks to allow parallel install
+	@${MV} ${STAGEDIR}${PREFIX}/share/examples/gegl \
+		${STAGEDIR}${PREFIX}/share/examples/gegl3
 .endif
 # temporary hacks to allow parallel install
 	@${MV} ${STAGEDIR}${PREFIX}/bin/gegl ${STAGEDIR}${PREFIX}/bin/gegl3
-	@${MV} ${STAGEDIR}${PREFIX}/share/examples/gegl \
-		${STAGEDIR}${PREFIX}/share/examples/gegl3
+
 .include <bsd.port.mk>
--- a/graphics/gegl3/distinfo
+++ b/graphics/gegl3/distinfo
@ -1,2 +1,2 @@
-SHA256 (gegl-0.3.0.a1.tar.bz2) = 75e278e496a37b781f9d63a08ccb50aceb317d986d3015259ed51ab5b82fab3f
-SIZE (gegl-0.3.0.a1.tar.bz2) = 38371008
+SHA256 (gegl-0.3.0.tar.bz2) = f0fec8f2e7b8835979d3cf4e38b05d41bb79f68dc80cf899a846484da693bbf7
+SIZE (gegl-0.3.0.tar.bz2) = 5463571
--- a/graphics/gegl3/pkg-plist
+++ b/graphics/gegl3/pkg-plist
@ -119,6 +119,7 @@ lib/gegl-%%GEGL_VER%%/deinterlace.so
 lib/gegl-%%GEGL_VER%%/difference-of-gaussians.so
 lib/gegl-%%GEGL_VER%%/difference.so
 lib/gegl-%%GEGL_VER%%/diffraction-patterns.so
+lib/gegl-%%GEGL_VER%%/displace.so
 lib/gegl-%%GEGL_VER%%/display.so
 lib/gegl-%%GEGL_VER%%/distance-transform.so
 lib/gegl-%%GEGL_VER%%/divide.so
@ -143,7 +144,9 @@ lib/gegl-%%GEGL_VER%%/fattal02.so
 lib/gegl-%%GEGL_VER%%/fractal-explorer.so
 lib/gegl-%%GEGL_VER%%/fractal-trace.so
 lib/gegl-%%GEGL_VER%%/gamma.so
+lib/gegl-%%GEGL_VER%%/gaussian-blur-iir.so
 lib/gegl-%%GEGL_VER%%/gaussian-blur.so
+lib/gegl-%%GEGL_VER%%/gblur-1d.so
 lib/gegl-%%GEGL_VER%%/gegl-buffer-load-op.so
 lib/gegl-%%GEGL_VER%%/gegl-buffer-save-op.so
 lib/gegl-%%GEGL_VER%%/grey.so
@ -254,6 +257,7 @@ lib/gegl-%%GEGL_VER%%/svg-saturate.so
 lib/gegl-%%GEGL_VER%%/texturize-canvas.so
 lib/gegl-%%GEGL_VER%%/threshold.so
 lib/gegl-%%GEGL_VER%%/tile-glass.so
+lib/gegl-%%GEGL_VER%%/tile-paper.so
 lib/gegl-%%GEGL_VER%%/tile-seamless.so
 lib/gegl-%%GEGL_VER%%/tile.so
 lib/gegl-%%GEGL_VER%%/transformops.so
@ -291,6 +295,7 @@ libdata/pkgconfig/gegl-sc-%%GEGL_VER%%.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%3/hello-world.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%3/sdl-draw.c
 share/gir-1.0/Gegl-%%GEGL_VER%%.gir
+share/locale/bs/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/ca/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/de/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/el/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
@ -304,6 +309,7 @@ share/locale/id/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/it/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/ko/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/lv/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
+share/locale/oc/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/pl/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/pt_BR/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/ru/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
--- a/irc/py-supybot/Makefile
+++ b/irc/py-supybot/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	supybot
 PORTVERSION=	0.83.4.1
+PORTREVISION=	1
 CATEGORIES=	irc python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Supybot-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -11,24 +12,21 @@ DISTNAME=	Supybot-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Supybot - A Superb Python IRC bot

+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USES=		python tar:bzip2
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGVERSION=	0.83.1+darcs
 PYDISTUTILS_EGGINFO=	supybot-${PORTVERSION}-py${PYTHON_VER}.egg-info
-
-DOCS=	ACKS ChangeLog INSTALL LICENSE README RELNOTES
-
-MAN1=	supybot.1 supybot-adduser.1 supybot-wizard.1 supybot-botchk.1 \
-	supybot-plugin-create.1 supybot-plugin-doc.1
+NO_ARCH=	yes

 OPTIONS_DEFINE=	DOCS

 post-install:
-.for f in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/docs/man/${f} ${STAGEDIR}${MAN1PREFIX}/man/man1
-.endfor
+	${INSTALL_MAN} ${WRKSRC}/docs/man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${DOCS}
+.for f in ACKS ChangeLog README RELNOTES
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/docs/GETTING_STARTED ${STAGEDIR}${DOCSDIR}
--- a/irc/py-supybot/pkg-plist
+++ b/irc/py-supybot/pkg-plist
@ -10,6 +10,7 @@ man/man1/supybot-adduser.1.gz
 man/man1/supybot-botchk.1.gz
 man/man1/supybot-plugin-create.1.gz
 man/man1/supybot-plugin-doc.1.gz
+man/man1/supybot-test.1.gz
 man/man1/supybot-wizard.1.gz
 man/man1/supybot.1.gz
 %%PYTHON_SITELIBDIR%%/supybot/__init__.py
@ -849,7 +850,5 @@ man/man1/supybot.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ACKS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/GETTING_STARTED
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELNOTES
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	openjdk6
-PORTVERSION=	b35
-PORTREVISION=	1
+PORTVERSION=	b36
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	APACHE/ant/binaries/:ant \
@ -29,7 +28,7 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		dejavu>0:${PORTSDIR}/x11-fonts/dejavu

-OPENJDK_BUILDDATE=	14_apr_2015
+OPENJDK_BUILDDATE=	22_jul_2015

 OPTIONS_DEFINE=	ICEDTEA IPV6 POLICY SOUND TZUPDATE
 OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE
--- a/java/openjdk6/distinfo
+++ b/java/openjdk6/distinfo
@ -1,6 +1,6 @@
 SHA256 (apache-ant-1.9.4-bin.tar.bz2) = 20c16575684b8869dd9d19abe0fb504566adefb5d397881e70a417886e0088cf
 SIZE (apache-ant-1.9.4-bin.tar.bz2) = 4351965
-SHA256 (openjdk-6-src-b35-14_apr_2015.tar.xz) = 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b
-SIZE (openjdk-6-src-b35-14_apr_2015.tar.xz) = 33730692
+SHA256 (openjdk-6-src-b36-22_jul_2015.tar.xz) = c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4
+SIZE (openjdk-6-src-b36-22_jul_2015.tar.xz) = 33757312
 SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d
 SIZE (jtreg-4.1-bin-b05_29_nov_2012.zip) = 5993382
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@ -1108,7 +1108,13 @@
 # include <signal.h>
 # include <errno.h>
 # include <dlfcn.h>
-@@ -131,6 +130,19 @@
+@@ -126,11 +125,25 @@
+ # include <sys/shm.h>
+ #ifndef __APPLE__
+ # include <link.h>
+# include <stdlib.h>
+ #endif
+ # include <stdint.h>
 # include <inttypes.h>
 # include <sys/ioctl.h>
 
@ -1128,7 +1134,7 @@
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 # include <elf.h>
 #endif
-@@ -162,8 +174,10 @@
+@@ -162,8 +175,10 @@
 #endif
 
 int (*os::Bsd::_clock_gettime)(clockid_t, struct timespec *) = NULL;
@ -1140,7 +1146,7 @@
 Mutex* os::Bsd::_createThread_lock = NULL;
 #endif
 pthread_t os::Bsd::_main_thread;
-@@ -171,7 +185,11 @@
+@@ -171,7 +186,11 @@
 #ifndef _ALLBSD_SOURCE
 bool os::Bsd::_is_floating_stack = false;
 bool os::Bsd::_is_NPTL = false;
@ -1152,7 +1158,7 @@
 const char * os::Bsd::_glibc_version = NULL;
 const char * os::Bsd::_libpthread_version = NULL;
 #endif
-@@ -205,6 +223,28 @@
+@@ -205,6 +224,28 @@
 
 julong os::Bsd::available_memory() {
 #ifdef _ALLBSD_SOURCE
@ -1181,7 +1187,7 @@
   // XXXBSD: this is just a stopgap implementation
   return physical_memory() >> 2;
 #else
-@@ -221,6 +261,17 @@
+@@ -221,6 +262,17 @@
 }
 
 julong os::allocatable_physical_memory(julong size) {
@ -1199,7 +1205,7 @@
 #ifdef _LP64
   return size;
 #else
-@@ -308,16 +359,22 @@
+@@ -308,16 +360,22 @@
 #define COMPILER_VARIANT "client"
 #endif
 
@ -1226,7 +1232,7 @@
   int rslt = syscall(SYS_gettid);
   if (rslt == -1) {
      // old kernel, no NPTL support
-@@ -325,6 +382,7 @@
+@@ -325,6 +383,7 @@
   } else {
      return (pid_t)rslt;
   }
@ -1234,7 +1240,7 @@
 }
 
 // Most versions of bsd have a bug where the number of processors are
-@@ -337,7 +395,35 @@
+@@ -337,7 +396,35 @@
                      "environment on Bsd when /proc filesystem is not mounted.";
 #endif
 
@ -1271,7 +1277,7 @@
 void os::Bsd::initialize_system_info() {
   int mib[2];
   size_t len;
-@@ -452,7 +538,7 @@
+@@ -452,7 +539,7 @@
  *        7: The default directories, normally /lib and /usr/lib.
  */
 #ifndef DEFAULT_LIBPATH
@ -1280,7 +1286,7 @@
 #endif
 
 #define EXTENSIONS_DIR  "/lib/ext"
-@@ -997,7 +1083,7 @@
+@@ -997,7 +1084,7 @@
     return NULL;
   }
 
@ -1289,7 +1295,7 @@
 #ifdef __APPLE__
   // thread_id is mach thread on macos
   osthread->set_thread_id(::mach_thread_self());
-@@ -1009,6 +1095,7 @@
+@@ -1009,6 +1096,7 @@
   // thread_id is kernel thread id (similar to Solaris LWP id)
   osthread->set_thread_id(os::Bsd::gettid());
 
@ -1297,7 +1303,7 @@
   if (UseNUMA) {
     int lgrp_id = os::numa_get_group_id();
     if (lgrp_id != -1) {
-@@ -1016,6 +1103,7 @@
+@@ -1016,6 +1104,7 @@
     }
   }
 #endif
@ -1305,7 +1311,7 @@
   // initialize signal mask for this thread
   os::Bsd::hotspot_sigmask(thread);
 
-@@ -1105,7 +1193,7 @@
+@@ -1105,7 +1194,7 @@
     // let pthread_create() pick the default value.
   }
 
@ -1314,7 +1320,7 @@
   // glibc guard page
   pthread_attr_setguardsize(&attr, os::Bsd::default_guard_size(thr_type));
 #endif
-@@ -1194,7 +1282,7 @@
+@@ -1194,7 +1283,7 @@
   }
 
   // Store pthread info into the OSThread
@ -1323,7 +1329,7 @@
 #ifdef __APPLE__
   osthread->set_thread_id(::mach_thread_self());
 #else
-@@ -1630,7 +1718,10 @@
+@@ -1630,7 +1719,10 @@
 }
 #endif
 
@ -1335,7 +1341,7 @@
 #ifndef SYS_clock_getres
 
 #if defined(IA32) || defined(AMD64)
-@@ -1644,6 +1735,7 @@
+@@ -1644,6 +1736,7 @@
 #else
 #define sys_clock_getres(x,y)  ::syscall(SYS_clock_getres, x, y)
 #endif
@ -1343,7 +1349,7 @@
 
 void os::Bsd::fast_thread_clock_init() {
   if (!UseBsdPosixThreadCPUClocks) {
-@@ -1817,8 +1909,10 @@
+@@ -1814,8 +1907,10 @@
 }
 
 intx os::current_thread_id() {
@ -1355,7 +1361,7 @@
 #else
   return (intx)::pthread_self();
 #endif
-@@ -2341,14 +2435,16 @@
+@@ -2338,14 +2433,16 @@
 }
 
 void os::print_os_info_brief(outputStream* st) {
@ -1374,7 +1380,7 @@
 
   os::Posix::print_uname_info(st);
 
-@@ -2366,7 +2462,23 @@
+@@ -2363,7 +2460,23 @@
   st->print("Memory:");
   st->print(" %dk page", os::vm_page_size()>>10);
 
@ -1399,7 +1405,7 @@
   // values in struct sysinfo are "unsigned long"
   struct sysinfo si;
   sysinfo(&si);
-@@ -2376,17 +2488,22 @@
+@@ -2373,17 +2486,22 @@
             os::physical_memory() >> 10);
   st->print("(" UINT64_FORMAT "k free)",
             os::available_memory() >> 10);
@ -1424,7 +1430,7 @@
   st->cr();
 }
 
-@@ -2399,7 +2516,7 @@
+@@ -2396,7 +2514,7 @@
 
 const char *fpe_names[] = { "FPE0", "FPE_INTDIV", "FPE_INTOVF", "FPE_FLTDIV",
                           "FPE_FLTOVF", "FPE_FLTUND", "FPE_FLTRES",
@ -1433,7 +1439,7 @@
 
 const char *segv_names[] = { "SEGV0", "SEGV_MAPERR", "SEGV_ACCERR" };
 
-@@ -2425,7 +2542,7 @@
+@@ -2422,7 +2540,7 @@
     st->print(", si_addr=" PTR_FORMAT, si->si_addr);
     break;
   case SIGFPE:
@ -1442,7 +1448,7 @@
     st->print(", si_addr=" PTR_FORMAT, si->si_addr);
     break;
   case SIGSEGV:
-@@ -2533,10 +2650,17 @@
+@@ -2531,10 +2649,17 @@
         jrelib_p = buf + len;
 
         // Add the appropriate library subdir
@ -1460,7 +1466,7 @@
 
         // Add the appropriate client or server subdir
         len = strlen(buf);
-@@ -2752,7 +2876,7 @@
+@@ -2752,7 +2877,7 @@
       if (::write(fd, "", 1) == 1) {
         mmap(base, size,
              PROT_READ|PROT_WRITE|PROT_EXEC,
@ -1469,7 +1475,7 @@
       }
     }
     ::close(fd);
-@@ -2815,7 +2939,7 @@
+@@ -2815,7 +2940,7 @@
 }
 
 void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) {
@ -1478,7 +1484,7 @@
 }
 
 void os::numa_make_global(char *addr, size_t bytes) {
-@@ -2962,7 +3086,7 @@
+@@ -2962,7 +3087,7 @@
   return ::mprotect(addr, size, PROT_NONE) == 0;
 #else
   uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
@ -1487,7 +1493,7 @@
   return res  != (uintptr_t) MAP_FAILED;
 #endif
 }
-@@ -2989,15 +3113,16 @@
+@@ -2989,15 +3114,16 @@
   char * addr;
   int flags;
 
@ -1508,7 +1514,7 @@
                        flags, -1, 0);
 
   if (addr != MAP_FAILED) {
-@@ -3244,9 +3369,11 @@
+@@ -3242,9 +3368,11 @@
 #endif
 
 char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
@ -1520,7 +1526,7 @@
 
   key_t key = IPC_PRIVATE;
   char *addr;
-@@ -3321,11 +3448,19 @@
+@@ -3319,11 +3447,19 @@
 // with SysV SHM the entire memory region must be allocated as shared
 // memory.
 bool os::can_commit_large_page_memory() {
@ -1540,7 +1546,7 @@
 }
 
 // Reserve memory at an arbitrary address, only if that area is
-@@ -3654,8 +3789,8 @@
+@@ -3652,8 +3788,8 @@
   return OS_OK;
 #else
   int ret = setpriority(PRIO_PROCESS, thread->osthread()->thread_id(), newpri);
@ -1550,7 +1556,7 @@
 }
 
 OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) {
-@@ -4171,7 +4306,7 @@
+@@ -4169,7 +4305,7 @@
   }
 }
 
@ -1559,7 +1565,7 @@
 // This is the fastest way to get thread cpu time on Bsd.
 // Returns cpu time (user+sys) for any thread, not only for current.
 // POSIX compliant clocks are implemented in the kernels 2.6.16+.
-@@ -4188,6 +4323,7 @@
+@@ -4186,6 +4322,7 @@
 }
 #endif
 
@ -1567,7 +1573,7 @@
 /////
 // glibc on Bsd platform uses non-documented flag
 // to indicate, that some special sort of signal
-@@ -4198,6 +4334,7 @@
+@@ -4196,6 +4333,7 @@
 #undef SIGNIFICANT_SIGNAL_MASK
 #endif
 #define SIGNIFICANT_SIGNAL_MASK (~0x04000000)
@ -1575,7 +1581,7 @@
 
 static const char* get_signal_handler_name(address handler,
                                            char* buf, int buflen) {
-@@ -4222,8 +4359,10 @@
+@@ -4220,8 +4358,10 @@
 
   sigaction(sig, NULL, &sa);
 
@ -1586,7 +1592,7 @@
 
   st->print("%s: ", os::exception_name(sig, buf, buflen));
 
-@@ -4245,7 +4384,11 @@
+@@ -4243,7 +4383,11 @@
   // May be, handler was resetted by VMError?
   if(rh != NULL) {
     handler = rh;
@ -1598,7 +1604,7 @@
   }
 
   st->print(", sa_flags="   PTR32_FORMAT, sa.sa_flags);
-@@ -4320,7 +4463,9 @@
+@@ -4318,7 +4462,9 @@
   os_sigaction(sig, (struct sigaction*)NULL, &act);
 
 
@ -1608,7 +1614,7 @@
 
   address thisHandler = (act.sa_flags & SA_SIGINFO)
     ? CAST_FROM_FN_PTR(address, act.sa_sigaction)
-@@ -4381,6 +4526,14 @@
+@@ -4379,6 +4525,14 @@
 
 extern bool signal_name(int signo, char* buf, size_t len);
 
@ -1623,7 +1629,7 @@
 const char* os::exception_name(int exception_code, char* buf, size_t size) {
   if (0 < exception_code && exception_code <= SIGRTMAX) {
     // signal
-@@ -4450,7 +4603,7 @@
+@@ -4448,7 +4602,7 @@
 // this is called _after_ the global arguments have been parsed
 jint os::init_2(void)
 {
@ -1632,7 +1638,7 @@
   Bsd::fast_thread_clock_init();
 #endif
 
-@@ -4634,6 +4787,20 @@
+@@ -4632,6 +4786,20 @@
 
 int os::active_processor_count() {
 #ifdef _ALLBSD_SOURCE
@ -1653,7 +1659,7 @@
   return _processor_count;
 #else
   // Bsd doesn't yet have a (official) notion of processor sets,
-@@ -5033,7 +5200,7 @@
+@@ -5031,7 +5199,7 @@
   return munmap(addr, bytes) == 0;
 }
 
@ -1662,7 +1668,7 @@
 static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
 
 static clockid_t thread_cpu_clockid(Thread* thread) {
-@@ -5057,7 +5224,7 @@
+@@ -5055,7 +5223,7 @@
 jlong os::current_thread_cpu_time() {
 #ifdef __APPLE__
   return os::thread_cpu_time(Thread::current(), true /* user + sys */);
@ -1671,7 +1677,7 @@
   if (os::Bsd::supports_fast_thread_cpu_time()) {
     return os::Bsd::fast_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
   } else {
-@@ -5068,7 +5235,7 @@
+@@ -5066,7 +5234,7 @@
 }
 
 jlong os::thread_cpu_time(Thread* thread) {
@ -1680,7 +1686,7 @@
   // consistent with what current_thread_cpu_time() returns
   if (os::Bsd::supports_fast_thread_cpu_time()) {
     return os::Bsd::fast_thread_cpu_time(thread_cpu_clockid(thread));
-@@ -5081,7 +5248,7 @@
+@@ -5079,7 +5247,7 @@
 jlong os::current_thread_cpu_time(bool user_sys_cpu_time) {
 #ifdef __APPLE__
   return os::thread_cpu_time(Thread::current(), user_sys_cpu_time);
@ -1689,7 +1695,7 @@
   if (user_sys_cpu_time && os::Bsd::supports_fast_thread_cpu_time()) {
     return os::Bsd::fast_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
   } else {
-@@ -5110,7 +5277,7 @@
+@@ -5108,7 +5276,7 @@
   } else {
     return ((jlong)tinfo.user_time.seconds * 1000000000) + ((jlong)tinfo.user_time.microseconds * (jlong)1000);
   }
@ -1698,7 +1704,7 @@
   if (user_sys_cpu_time && os::Bsd::supports_fast_thread_cpu_time()) {
     return os::Bsd::fast_thread_cpu_time(thread_cpu_clockid(thread));
   } else {
-@@ -5119,12 +5286,15 @@
+@@ -5117,12 +5285,15 @@
 #endif
 }
 
@ -1715,7 +1721,7 @@
   static bool proc_pid_cpu_avail = true;
   static bool proc_task_unchecked = true;
   static const char *proc_stat_path = "/proc/%d/stat";
-@@ -5208,6 +5378,7 @@
+@@ -5206,6 +5377,7 @@
   } else {
     return (jlong)user_time * (1000000000 / clock_tics_per_sec);
   }
@ -1723,7 +1729,7 @@
 }
 #endif
 
-@@ -5226,7 +5397,7 @@
+@@ -5224,7 +5396,7 @@
 }
 
 bool os::is_thread_cpu_time_supported() {
@ -1732,6 +1738,37 @@
   return true;
 #elif defined(_ALLBSD_SOURCE)
   return false;
+@@ -5799,3 +5971,30 @@
+ 
+     return true;
+ }
+
+// Get the default path to the core file
+// Returns the length of the string
+int os::get_core_path(char *buffer, size_t bufferSize) {
+#ifdef __APPLE__
+  jio_snprintf(buffer, bufferSize, "/cores/core.%d", current_process_id());
+#else
+  const char *p = get_current_directory(buffer, bufferSize);
+
+  if (p == NULL) {
+    assert(p != NULL, "failed to get current directory");
+    return 0;
+  }
+
+  const char *q = getprogname();
+
+  if (q == NULL) {
+    assert(q != NULL, "failed to get progname");
+    return 0;
+  }
+
+  const int n = strlen(buffer);
+
+  jio_snprintf(buffer + n, bufferSize - n, "/%s.core", q);
+#endif
+  return strlen(buffer);
+}
 --- hotspot/src/os/bsd/vm/os_bsd.hpp
 +++ hotspot/src/os/bsd/vm/os_bsd.hpp
@@ -56,9 +56,11 @@
@ -2141,6 +2178,40 @@
     const char *substr = "-Dsun.java.launcher.pid=";
     char *pid_prop_str = (char *)JLI_MemAlloc(strlen(substr) + MAX_PID_STR_SZ + 1);
     sprintf(pid_prop_str, "%s%d", substr, getpid());
+--- hotspot/src/os/posix/vm/os_posix.cpp
+++ hotspot/src/os/posix/vm/os_posix.cpp
+@@ -33,19 +33,18 @@
+ 
+ // Check core dump limit and report possible place where core can be found
+ void os::check_or_create_dump(void* exceptionRecord, void* contextRecord, char* buffer, size_t bufferSize) {
+  int n;
+   struct rlimit rlim;
+-  static char cwd[O_BUFLEN];
+   bool success;
+ 
+-  get_current_directory(cwd, sizeof(cwd));
+  n = get_core_path(buffer, bufferSize);
+ 
+   if (getrlimit(RLIMIT_CORE, &rlim) != 0) {
+-    jio_snprintf(buffer, bufferSize, "%s/core or core.%d (may not exist)", cwd, current_process_id());
+    jio_snprintf(buffer + n, bufferSize - n, " (may not exist)");
+     success = true;
+   } else {
+     switch(rlim.rlim_cur) {
+       case RLIM_INFINITY:
+-        jio_snprintf(buffer, bufferSize, "%s/core or core.%d", cwd, current_process_id());
+         success = true;
+         break;
+       case 0:
+@@ -53,7 +52,7 @@
+         success = false;
+         break;
+       default:
+-        jio_snprintf(buffer, bufferSize, "%s/core or core.%d (max size %lu kB). To ensure a full core dump, try \"ulimit -c unlimited\" before starting Java again", cwd, current_process_id(), (unsigned long)(rlim.rlim_cur >> 10));
+        jio_snprintf(buffer + n, bufferSize - n, " (max size %lu kB). To ensure a full core dump, try \"ulimit -c unlimited\" before starting Java again", (unsigned long)(rlim.rlim_cur >> 10));
+         success = true;
+         break;
+     }
 --- hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp
 +++ hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp
@@ -42,7 +42,6 @@
@ -2985,6 +3056,19 @@
     return ptr;
   }
 };
+--- hotspot/src/share/vm/runtime/os.hpp
+++ hotspot/src/share/vm/runtime/os.hpp
+@@ -636,6 +636,10 @@
+   // On Windows this will create an actual minidump, on Linux/Solaris it will simply check core dump limits
+   static void check_or_create_dump(void* exceptionRecord, void* contextRecord, char* buffer, size_t bufferSize);
+ 
+  // Get the default path to the core file
+  // Returns the length of the string
+  static int get_core_path(char* buffer, size_t bufferSize);
+
+   // JVMTI & JVM monitoring and management support
+   // The thread_cpu_time() and current_thread_cpu_time() are only
+   // supported if is_thread_cpu_time_supported() returns true.
 --- hotspot/src/share/vm/runtime/park.cpp
 +++ hotspot/src/share/vm/runtime/park.cpp
@@ -140,7 +140,7 @@
@ -3246,24 +3330,15 @@
 ifeq ($(PLATFORM), linux)
 --- jdk/make/com/sun/jmx/Makefile
 +++ jdk/make/com/sun/jmx/Makefile
-@@ -102,16 +102,7 @@
+@@ -102,7 +102,7 @@
 # when available, we need to run with latest rmic version available. rmic 
 # launch tool not built at this stage but we can invoke via rmi class.
 
 -RMIC_JAVA = $(OUTPUTDIR)/bin/java
-# need to treat 64bit solaris differently
-ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
-RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
-endif
-ifeq ($(PLATFORM)-$(LIBARCH), solaris-sparcv9)
-RMIC_JAVA = $(OUTPUTDIR)/bin/sparcv9/java
-endif
-
-RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
-+RMIC = $(BOOT_JAVA_CMD) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
- 
- $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
- 	$(prep-target)
+RMIC_JAVA = $(BOOTDIR)/bin/java
+ # need to treat 64bit solaris differently
+ ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
+ RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
 --- jdk/make/com/sun/security/auth/module/Makefile
 +++ jdk/make/com/sun/security/auth/module/Makefile
@@ -70,7 +70,7 @@
@ -8687,16 +8762,16 @@
 #endif
 
       /* runpath contains current effective LD_LIBRARY_PATH setting */
-@@ -435,7 +483,7 @@
-       new_runpath = JLI_MemAlloc( ((runpath!=NULL)?strlen(runpath):0) +
+@@ -436,7 +484,7 @@
                               2*strlen(jrepath) + 2*strlen(arch) +
-                               strlen(jvmpath) + 52);
+                               strlen(jvmpath) + 52;
+       new_runpath = JLI_MemAlloc(new_runpath_size);
 -      newpath = new_runpath + strlen("LD_LIBRARY_PATH=");
 +      newpath = new_runpath + strlen(LD_LIBRARY_PATH "=");
 
 
       /*
-@@ -450,7 +498,7 @@
+@@ -451,7 +499,7 @@
 
         /* jvmpath, ((running != wanted)?((wanted==64)?"/"LIBARCH64NAME:"/.."):""), */
 
@ -8705,7 +8780,7 @@
                 "%s:"
                 "%s/lib/%s:"
                 "%s/../lib/%s",
-@@ -725,7 +773,7 @@
+@@ -737,7 +785,7 @@
 jboolean
 GetApplicationHome(char *buf, jint bufsize)
 {
@ -8714,7 +8789,7 @@
     char *execname = GetExecname();
     if (execname) {
         strncpy(buf, execname, bufsize-1);
-@@ -892,7 +940,17 @@
+@@ -904,7 +952,17 @@
             exec_path = JLI_StringDup(buf);
         }
     }
@ -8733,7 +8808,7 @@
     {
         /* Not implemented */
     }
-@@ -981,6 +1039,7 @@
+@@ -993,6 +1051,7 @@
 /* Compute physical memory by asking the OS */
 uint64_t
 physical_memory(void) {
@ -8741,7 +8816,7 @@
   const uint64_t pages     = (uint64_t) sysconf(_SC_PHYS_PAGES);
   const uint64_t page_size = (uint64_t) sysconf(_SC_PAGESIZE);
   const uint64_t result    = pages * page_size;
-@@ -992,6 +1051,28 @@
+@@ -1004,6 +1063,28 @@
            "  physical memory: " UINT64_FORMAT " (%.3fGB)\n",
            pages, page_size, result, result / (double) GB);
   }
@ -8770,7 +8845,7 @@
   return result;
 }
 
-@@ -1087,7 +1168,7 @@
+@@ -1099,7 +1180,7 @@
 
 #endif /* __sun && i586 */
 
@ -8779,7 +8854,7 @@
 
 /*
  * A utility method for asking the CPU about itself.
-@@ -1152,7 +1233,7 @@
+@@ -1164,7 +1245,7 @@
 #endif
 }
 
@ -8788,7 +8863,7 @@
 
 #ifdef i586
 /*
-@@ -1364,6 +1445,39 @@
+@@ -1376,6 +1457,39 @@
 
 #endif /* __linux__ && i586 */
 
@ -8828,7 +8903,7 @@
 /* Dispatch to the platform-specific definition of "server-class" */
 jboolean
 ServerClassMachine(void) {
-@@ -1378,6 +1492,8 @@
+@@ -1390,6 +1504,8 @@
   result = solaris_i586_ServerClassMachine();
 #elif defined(__linux__) && defined(i586)
   result = linux_i586_ServerClassMachine();
@ -8837,7 +8912,7 @@
 #else
   if (_launcher_debug) {
     printf("ServerClassMachine: returns default value of %s\n",
-@@ -1518,7 +1634,7 @@
+@@ -1530,7 +1646,7 @@
     while (dp != NULL) {
         cp = strchr(dp, (int)':');
         if (cp != NULL)
@ -8846,7 +8921,7 @@
         if ((target = ProcessDir(info, dp)) != NULL)
             break;
         dp = cp;
-@@ -1696,9 +1812,29 @@
+@@ -1708,9 +1824,29 @@
     return(borrowed_unsetenv(name));
 }
 
@ -8877,7 +8952,7 @@
 
 static void* hSplashLib = NULL;
 
-@@ -1747,13 +1883,15 @@
+@@ -1759,13 +1895,15 @@
     return "%lld";
 }
 
@ -8895,7 +8970,7 @@
     pthread_t tid;
     pthread_attr_t attr;
     pthread_attr_init(&attr);
-@@ -1766,7 +1904,7 @@
+@@ -1778,7 +1916,7 @@
     if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) {
       void * tmp;
       pthread_join(tid, &tmp);
@ -8904,7 +8979,7 @@
     } else {
      /*
       * Continue execution in current thread if for some reason (e.g. out of
-@@ -1784,25 +1922,23 @@
+@@ -1796,25 +1934,23 @@
     if (thr_create(NULL, stack_size, (void *(*)(void *))continuation, args, flags, &tid) == 0) {
       void * tmp;
       thr_join(tid, NULL, &tmp);
--- a/lang/Makefile
+++ b/lang/Makefile
@ -33,7 +33,6 @@
    SUBDIR += chicken
    SUBDIR += cint
    SUBDIR += cjs
-    SUBDIR += clang-cheri
    SUBDIR += clang-devel
    SUBDIR += clang33
    SUBDIR += clang34
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@ -2,11 +2,11 @@
 # $FreeBSD$

 PORTNAME=	chicken
-PORTVERSION=	4.10.0.r1
+PORTVERSION=	4.10.0.r4
 PORTEPOCH=	1
 CATEGORIES=	lang scheme
-MASTER_SITES=	http://code.call-cc.org/dev-snapshots/2015/06/07/
-DISTNAME=	${PORTNAME}-${PORTVERSION:.r1=rc1}
+MASTER_SITES=	http://code.call-cc.org/dev-snapshots/2015/07/24/
+DISTNAME=	${PORTNAME}-${PORTVERSION:.r4=rc4}

 MAINTAINER=	vmagerya@gmail.com
 COMMENT=	Scheme-to-C compiler
--- a/lang/chicken/distinfo
+++ b/lang/chicken/distinfo
@ -1,2 +1,2 @@
-SHA256 (chicken-4.10.0rc1.tar.gz) = b5cc7c2d270d11f56a52da1b78950ada27d9bce2496b8ba230542d104b5477f0
-SIZE (chicken-4.10.0rc1.tar.gz) = 4033834
+SHA256 (chicken-4.10.0rc4.tar.gz) = 8b20fbe77a47a04417eaada3a8ef2218e51dabf919957f7059f4d60ddb6e2ad5
+SIZE (chicken-4.10.0rc4.tar.gz) = 4025925
--- a/lang/clang-cheri/Makefile
+++ b/lang/clang-cheri/Makefile
@ -1,124 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	clang-cheri
-PORTVERSION=	3.7.d20150512
-CATEGORIES=	lang devel
-MASTER_SITES=	LOCAL/brooks
-
-MAINTAINER=	brooks@FreeBSD.org
-COMMENT=	C, Objective-C, and C++ compiler with CHERI CPU support
-
-USES=		cmake:outsource compiler:c++11-lib ninja perl5 python \
-		shebangfix tar:bzip2
-
-BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
-
-TRIPLE=		cheri-unknown-freebsd
-SYSROOT=	${PREFIX}/sysroots/${TRIPLE}
-LLVM_PREFIX=	${SYSROOT}/tools
-TOOL_PREFIX=	${TRIPLE}-
-CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
-CMAKE_ARGS=	-DDEFAULT_SYSROOT=${SYSROOT} \
-		-DLLVM_DEFAULT_TARGET_TRIPLE=${TRIPLE} \
-		-DLLVM_ENABLE_CXX11=ON
-
-SHEBANG_FILES=	\
-		tools/clang/tools/clang-format/git-clang-format \
-		tools/clang/tools/clang-format/clang-format-diff.py
-
-SUB_FILES=	llvm-wrapper.sh
-SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" \
-		TOOL_PREFIX="${TOOL_PREFIX}" \
-		TOOL_SUFFIX="${TOOL_SUFFIX}"
-
-OPTIONS_DEFINE=	DOCS
-
-PLIST_SUB+=	CLANG_RELEASE=${CLANG_RELEASE}
-
-COMMANDS=	\
-		bugpoint \
-		clang \
-		clang++ \
-		clang-3.7 \
-		clang-check \
-		clang-cl \
-		clang-cpp \
-		clang-format \
-		git-clang-format \
-		llc \
-		lli \
-		llvm-ar \
-		llvm-as \
-		llvm-bcanalyzer \
-		llvm-c-test \
-		llvm-config \
-		llvm-cov \
-		llvm-diff \
-		llvm-dis \
-		llvm-dwarfdump \
-		llvm-extract \
-		llvm-link \
-		llvm-lto \
-		llvm-mc \
-		llvm-mcmarkup \
-		llvm-nm \
-		llvm-objdump \
-		llvm-readobj \
-		llvm-rtdyld \
-		llvm-size \
-		llvm-stress \
-		llvm-symbolizer \
-		llvm-tblgen \
-		macho-dump \
-		opt
-FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
-
-.include <bsd.port.pre.mk>
-
-BROKEN_armv6=	fails to link
-.if ${CHOSEN_COMPILER_TYPE} == "gcc"
-BROKEN=	build errors when C++11 compiler is gcc
-.endif
-
-.if defined(BOOTSTRAP) || defined(SVN_FETCH)
-FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
-
-do-fetch:
-	${MKDIR} ${WRKDIR}
-	svn export --force https://github.com/CTSRD-CHERI/llvm/trunk ${WRKSRC}
-	svn export --force https://github.com/CTSRD-CHERI/clang/trunk \
-	    ${WRKSRC}/tools/clang
-	#svn export --force https://github.com/CTSRD-CHERI/lldb/trunk \
-	#    ${WRKSRC}/tools/lldb
-	cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
-.if ${USER} == brooks || ${USER} == bed22
-	scp ${DISTDIR}/${DISTNAME}.tar.bz2 \
-	    brooks@freefall.freebsd.org:public_distfiles/
-.endif
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
-	    ${WRKSRC}/Makefile.config.in
-	${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \
-	    ${WRKSRC}/Makefile.config.in
-	${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
-	    ${WRKSRC}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
-
-post-install:
-	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
-	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
-	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
-	    ${STAGEDIR}${PREFIX}/bin/${TOOL_PREFIX}${FIRST_COMMAND}
-.for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
-	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
-	${LN} -f ${STAGEDIR}${PREFIX}/bin/${TOOL_PREFIX}${FIRST_COMMAND} \
-	    ${STAGEDIR}${PREFIX}/bin/${TOOL_PREFIX}${command}
-.endfor
-
-build-plist:
-	${RM} -f ${PLIST}
-	${MAKE} makeplist | \
-	    ${GREP} -v /you/have/to/check/what/makeplist/gives/you >> ${PLIST}
-
-.include <bsd.port.post.mk>
--- a/lang/clang-cheri/distinfo
+++ b/lang/clang-cheri/distinfo
@ -1,2 +0,0 @@
-SHA256 (clang-cheri-3.7.d20150512.tar.bz2) = 2d92365783859d9da86a9ca96042b51dfe07e06f4a63e16d97c8136b1eed92c5
-SIZE (clang-cheri-3.7.d20150512.tar.bz2) = 24734590
--- a/lang/clang-cheri/pkg-descr
+++ b/lang/clang-cheri/pkg-descr
@ -1,6 +0,0 @@
-CHERI-Clang is a fork of the Clang compiler with support for the CHERI
-(Capability Hardware Enhanced RISC Instructions) ISA.
-
-It also has enhanced support for MIPS CPUs, particularly MIPS64.
-
-WWW: http://www.cl.cam.ac.uk/research/security/ctsrd/cheri.html
--- a/lang/clang-cheri/pkg-plist
+++ b/lang/clang-cheri/pkg-plist
--- a/lang/ocaml/files/patch-configure
+++ b/lang/ocaml/files/patch-configure
@ -21,7 +21,13 @@
       sharedcccompopts="-fPIC"
       mksharedlib="$bytecc -shared"
       bytecclinkopts="$bytecclinkopts -Wl,-E"
-@@ -766,6 +767,7 @@ if test $with_sharedlibs = "yes"; then
+@@ -761,11 +758,13 @@ if test $with_sharedlibs = "yes"; then
+       fi;;
+     x86_64-*-darwin*)             natdynlink=true;;
+     powerpc*-*-linux*)            natdynlink=true;;
+    powerpc*-*-freebsd*)          natdynlink=true;;
+     sparc*-*-linux*)              natdynlink=true;;
+     i686-*-kfreebsd*)             natdynlink=true;;
     x86_64-*-kfreebsd*)           natdynlink=true;;
     i[3456]86-*-freebsd*)         natdynlink=true;;
     x86_64-*-freebsd*)            natdynlink=true;;
@ -29,7 +35,15 @@
     i[3456]86-*-openbsd*)         natdynlink=true;;
     x86_64-*-openbsd*)            natdynlink=true;;
     i[3456]86-*-netbsd*)          natdynlink=true;;
-@@ -833,6 +835,7 @@ case "$target" in
+@@ -815,6 +814,7 @@ case "$target" in
+   i[3456]86-*-gnu*)             arch=i386; system=gnu;;
+   i[3456]86-*-mingw*)           arch=i386; system=mingw;;
+   powerpc*-*-linux*)            arch=power; model=ppc; system=elf;;
+  powerpc-*-freebsd*)           arch=power; model=ppc; system=bsd_elf;;
+   powerpc-*-netbsd*)            arch=power; model=ppc; system=elf;;
+   powerpc-*-openbsd*)           arch=power; model=ppc; system=bsd_elf;;
+   powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
+@@ -833,6 +833,7 @@ case "$target" in
   zaurus*-*-openbsd*)           arch=arm; system=bsd;;
   x86_64-*-linux*)              arch=amd64; system=linux;;
   x86_64-*-gnu*)                arch=amd64; system=gnu;;
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@ -28,6 +28,7 @@ CONFIGURE_ENV+=		OPT=""							# Null out OPT to respect user CFLAGS and remove o
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
 MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
+MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974

 PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@ -28,6 +28,7 @@ CONFIGURE_ENV+=		OPT=""							# Null out OPT to respect user CFLAGS and remove o
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
 MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
+MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974

 PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@ -30,6 +30,7 @@ CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"	# Null out
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
 MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
+MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974

 PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
--- a/mail/roundcube-automatic_addressbook/Makefile
+++ b/mail/roundcube-automatic_addressbook/Makefile
@ -1,10 +1,8 @@
 # $FreeBSD$

 PORTNAME=	automatic_addressbook
-PORTVERSION=	0.4
-PORTREVISION=	2
+PORTVERSION=	0.4.1
 CATEGORIES=	mail
-MASTER_SITES=	http://code.crapouillou.net/attachments/download/19/
 PKGNAMEPREFIX=	roundcube-

 MAINTAINER=	anes@anes.su
@ -12,13 +10,14 @@ COMMENT=	Roundcube webmail automatic addressbook plugin

 LICENSE=	GPLv3

-BUILD_DEPENDS=	roundcube>=0.8:${PORTSDIR}/mail/roundcube
 RUN_DEPENDS=	roundcube>=0.8:${PORTSDIR}/mail/roundcube

-USES=	tar:bzip2
 NO_BUILD=	yes

-WRKSRC?=	${WRKDIR}/${PORTNAME}
+USE_GITHUB=	yes
+GH_ACCOUNT=	sblaisot
+GH_PROJECT=	automatic_addressbook
+
 RCDIR=		${PREFIX}/www/roundcube
 WWWDIR=		${RCDIR}/plugins/automatic_addressbook

--- a/mail/roundcube-automatic_addressbook/distinfo
+++ b/mail/roundcube-automatic_addressbook/distinfo
@ -1,2 +1,2 @@
-SHA256 (automatic_addressbook-0.4.tar.bz2) = eb12abb14753c1bf5ffa923fe3a458061f2b245e409780011ffe74670e8b077d
-SIZE (automatic_addressbook-0.4.tar.bz2) = 21376
+SHA256 (sblaisot-automatic_addressbook-0.4.1_GH0.tar.gz) = b1e7f110fb105342bf0da6b68bcca7eb205aeae8625993bf4cbe583ea939aed3
+SIZE (sblaisot-automatic_addressbook-0.4.1_GH0.tar.gz) = 26388
--- a/mail/roundcube-automatic_addressbook/pkg-descr
+++ b/mail/roundcube-automatic_addressbook/pkg-descr
@ -2,4 +2,4 @@ The automatic addressbook plugin for Roundcube collects each address you
 send an email to and records it in an address book, making it available 
 for later use or auto-completion.

-WWW: http://code.crapouillou.net/projects/roundcube-plugins
+WWW: https://github.com/sblaisot/automatic_addressbook
--- a/mail/roundcube-automatic_addressbook/pkg-plist
+++ b/mail/roundcube-automatic_addressbook/pkg-plist
@ -14,25 +14,44 @@
 %%WWWDIR%%/automatic_addressbook_backend.php
 %%WWWDIR%%/composer.json
 %%WWWDIR%%/config/config.inc.php.dist
+%%WWWDIR%%/localization/az_AZ.inc
 %%WWWDIR%%/localization/bg_BG.inc
+%%WWWDIR%%/localization/br.inc
+%%WWWDIR%%/localization/bs_BA.inc
+%%WWWDIR%%/localization/ca_ES.inc
+%%WWWDIR%%/localization/cs_CZ.inc
+%%WWWDIR%%/localization/cy_GB.inc
+%%WWWDIR%%/localization/de_CH.inc
 %%WWWDIR%%/localization/de_DE.inc
 %%WWWDIR%%/localization/el_GR.inc
 %%WWWDIR%%/localization/en_EN.inc
+%%WWWDIR%%/localization/en_GB.inc
 %%WWWDIR%%/localization/en_US.inc
 %%WWWDIR%%/localization/es_ES.inc
+%%WWWDIR%%/localization/et_EE.inc
+%%WWWDIR%%/localization/fa_IR.inc
+%%WWWDIR%%/localization/fi_FI.inc
 %%WWWDIR%%/localization/fr_FR.inc
 %%WWWDIR%%/localization/gl_ES.inc
+%%WWWDIR%%/localization/he_IL.inc
 %%WWWDIR%%/localization/hu_HU.inc
 %%WWWDIR%%/localization/it_IT.inc
+%%WWWDIR%%/localization/ja_JP.inc
 %%WWWDIR%%/localization/lt_LT.inc
+%%WWWDIR%%/localization/nb_NB.inc
 %%WWWDIR%%/localization/nl_NL.inc
 %%WWWDIR%%/localization/pl_PL.inc
+%%WWWDIR%%/localization/pt_BR.inc
 %%WWWDIR%%/localization/pt_BR.php
+%%WWWDIR%%/localization/pt_PT.inc
 %%WWWDIR%%/localization/ru_RU.inc
+%%WWWDIR%%/localization/sk_SK.inc
+%%WWWDIR%%/localization/sv_SE.inc
+%%WWWDIR%%/localization/tr_TR.inc
 %%WWWDIR%%/localization/vi_VN.inc
 %%WWWDIR%%/localization/zh_CN.inc
+%%WWWDIR%%/localization/zh_TW.inc
 %%WWWDIR%%/package.xml
-@dirrm %%WWWDIR%%/localization
-@dirrm %%WWWDIR%%/SQL
-@dirrmtry %%WWWDIR%%/config
-@dirrmtry %%WWWDIR%%
+@dir %%WWWDIR%%/localization
+@dir %%WWWDIR%%/SQL
+@dir %%WWWDIR%%/config
--- a/mail/roundcube-login_info/Makefile
+++ b/mail/roundcube-login_info/Makefile
@ -17,6 +17,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	roundcube>=0.5:${PORTSDIR}/mail/roundcube

 NO_BUILD=	yes
+NO_ARCH=	yes

 WWWDIR=		${LOCALBASE}/www/roundcube
 PLUGDIR=	${WWWDIR}/plugins/login_info
--- a/mail/roundcube-login_info/pkg-plist
+++ b/mail/roundcube-login_info/pkg-plist
@ -2,4 +2,3 @@
 %%PLUGDIR%%/README
 %%PLUGDIR%%/config.inc.php.dist
 %%PLUGDIR%%/login_info.php
-@dirrmtry %%PLUGDIR%%
--- a/mail/roundcube-sauserprefs/Makefile
+++ b/mail/roundcube-sauserprefs/Makefile
@ -18,6 +18,7 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	roundcube>=0.8:${PORTSDIR}/mail/roundcube

 NO_BUILD=	yes
+NO_ARCH=	yes

 WWWDIR=		${PREFIX}/www/roundcube/plugins/sauserprefs

--- a/mail/roundcube-sauserprefs/pkg-plist
+++ b/mail/roundcube-sauserprefs/pkg-plist
@ -40,11 +40,3 @@
 %%WWWDIR%%/skins/larry/tabstyles.css
 %%WWWDIR%%/skins/larry/templates/sauserprefs.html
 %%WWWDIR%%/skins/larry/templates/settingsedit.html
-@dirrm %%WWWDIR%%/skins/larry/templates
-@dirrm %%WWWDIR%%/skins/larry
-@dirrm %%WWWDIR%%/skins/classic/templates
-@dirrm %%WWWDIR%%/skins/classic
-@dirrm %%WWWDIR%%/skins
-@dirrm %%WWWDIR%%/localization
-@dirrm %%WWWDIR%%/include
-@dirrmtry %%WWWDIR%%
--- a/mail/roundcube-sieverules/Makefile
+++ b/mail/roundcube-sieverules/Makefile
@ -20,6 +20,7 @@ GH_ACCOUNT=	JohnDoh
 GH_PROJECT=	Roundcube-Plugin-SieveRules-Managesieve

 NO_BUILD=	yes
+NO_ARCH=	yes

 WWWDIR=		${PREFIX}/www/roundcube/plugins/sieverules

--- a/mail/roundcube-sieverules/pkg-plist
+++ b/mail/roundcube-sieverules/pkg-plist
@ -60,15 +60,3 @@
 %%WWWDIR%%/skins/larry/templates/editsieverule.html
 %%WWWDIR%%/skins/larry/templates/setupsieverules.html
 %%WWWDIR%%/skins/larry/templates/sieverules.html
-@dirrm %%WWWDIR%%/skins/larry/templates
-@dirrm %%WWWDIR%%/skins/larry/images
-@dirrm %%WWWDIR%%/skins/larry
-@dirrm %%WWWDIR%%/skins/classic/templates
-@dirrm %%WWWDIR%%/skins/classic/images
-@dirrm %%WWWDIR%%/skins/classic
-@dirrm %%WWWDIR%%/skins
-@dirrm %%WWWDIR%%/localization
-@dirrm %%WWWDIR%%/lib/Roundcube
-@dirrm %%WWWDIR%%/lib
-@dirrm %%WWWDIR%%/importFilters
-@dirrmtry %%WWWDIR%%
--- a/mail/ssmtp/pkg-plist
+++ b/mail/ssmtp/pkg-plist
@ -3,4 +3,4 @@
@(,ssmtp,640) etc/ssmtp/ssmtp.conf.sample
 man/man5/ssmtp.conf.5.gz
 man/man8/ssmtp.8.gz
-@dirrmtry(,ssmtp,750) etc/ssmtp
+@dir(,ssmtp,750) etc/ssmtp
--- a/mail/vqregister/Makefile
+++ b/mail/vqregister/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	vqregister
 PORTVERSION=	2.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.inter7.com/vqregister/

@ -13,18 +13,21 @@ COMMENT=	Admin-configurable email user signup CGI
 BUILD_DEPENDS=	vpopmail>0:${PORTSDIR}/mail/vpopmail
 RUN_DEPENDS=	vpopmail>0:${PORTSDIR}/mail/vpopmail

-USES=		fakeroot
 USE_APACHE_RUN=	22+
 VPOPMAIL_DIR?=	${LOCALBASE}/vpopmail

 USE_MYSQL=	yes
 MAKE_ENV=	VDIR=${VPOPMAIL_DIR} WWWDIR=${STAGEDIR}${WWWDIR}

+USERS=		vpopmail
+GROUPS=		vchkpw
+
 DOCS=		CONFIG CONTRIBUTORS FORM HISTORY TEMPLATE

 OPTIONS_DEFINE=	DOCS

 post-install:
+	${STRIP_CMD} ${STAGEDIR}${WWWDIR}/${PORTNAME}.cgi
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})

--- a/mail/vqregister/files/patch-Makefile
+++ b/mail/vqregister/files/patch-Makefile
@ -22,12 +22,13 @@
 INSTALL_BIN = vqregister.cgi
 INSTALL_UID = vpopmail
 INSTALL_GID = vchkpw
-@@ -54,8 +54,6 @@ install: $(BIN)
+@@ -54,9 +54,6 @@ install: $(BIN)
 	cp html/* $(INSTALL_DIR)/html
 	cp vqregister.email $(INSTALL_DIR)
 	cp vqregister.conf $(INSTALL_DIR)
 -	chown -R $(INSTALL_UID) $(INSTALL_DIR)
 -	chgrp -R $(INSTALL_GID) $(INSTALL_DIR)
- 	chmod u+s $(INSTALL_DIR)/$(INSTALL_BIN)
+-	chmod u+s $(INSTALL_DIR)/$(INSTALL_BIN)
 
 clean:
+ 	@echo -n "Cleaning up..."
--- a/mail/vqregister/pkg-plist
+++ b/mail/vqregister/pkg-plist
@ -3,6 +3,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/FORM
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/TEMPLATE
+@owner vpopmail
+@group vchkpw
 %%WWWDIR%%/html/error.html
 %%WWWDIR%%/html/failure.html
 %%WWWDIR%%/html/init_error.html
@ -10,6 +12,10 @@
 %%WWWDIR%%/html/register.with.password.html
 %%WWWDIR%%/html/success.html
 %%WWWDIR%%/html/success.with.password.html
-%%WWWDIR%%/vqregister.cgi
+@(vpopmail,vchkpw,4755) %%WWWDIR%%/vqregister.cgi
 %%WWWDIR%%/vqregister.conf
 %%WWWDIR%%/vqregister.email
+@dir %%WWWDIR%%/html
+@dir %%WWWDIR%%
+@owner
+@group
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@ -3,27 +3,33 @@

 PORTNAME=	iselect
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	OSSP/tool/iselect

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive Selection Tool

-OPTIONS_DEFINE=	SLANG EXAMPLES
-SLANG_DESC=	Link with slang
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING

+USES=		shebangfix
+SHEBANG_FILES=	example/gotourl/gotourl \
+		example/ilogin/ilogin \
+		example/melm/melm \
+		example/mtin/mtin \
+		example/scvs/scvs
+perl_OLD_CMD=	/sw/bin/perl
 GNU_CONFIGURE=	yes

 PLIST_FILES=	bin/iselect man/man1/iselect.1.gz
 PORTEXAMPLES=	*

-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSLANG}
-LIB_DEPENDS+=	libslang.so:${PORTSDIR}/devel/libslang2
-CONFIGURE_ARGS+=	--with-incdir=${LOCALBASE}/include \
+OPTIONS_DEFINE=	SLANG EXAMPLES
+SLANG_DESC=	Link with slang
+SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_CONFIGURE_ON=	--with-incdir=${LOCALBASE}/include \
 			--with-libdir=${LOCALBASE}/lib
-.endif

 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure
--- a/multimedia/emovix/Makefile
+++ b/multimedia/emovix/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	emovix
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/movix/eMoviX/0.9

@ -15,6 +15,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 GNU_CONFIGURE=	yes
 USES=		gmake perl5 shebangfix
-SHEBANG_FILES=	scripts/mkmovixiso scripts/movix-conf.in
+SHEBANG_FILES=	mplayer-fonts/centralEU-cp1250/runme \
+		mplayer-fonts/centralEU-iso-8859-2/runme \
+		scripts/mkmovixiso scripts/movix-conf.in
+NO_ARCH=	yes

 .include <bsd.port.mk>
--- a/net-mgmt/pandorafms_agent/Makefile
+++ b/net-mgmt/pandorafms_agent/Makefile
@ -14,7 +14,8 @@ OPTIONS_DEFINE=		DOCS TENTACLE_SERVER
 OPTIONS_DEFAULT=	DOCS TENTACLE_SERVER
 TENTACLE_SERVER_DESC=	Install tentalce_server

-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	plugins/pandora_netusage

 SUB_FILES=	pkg-message

--- a/net-mgmt/pandorafms_console/Makefile
+++ b/net-mgmt/pandorafms_console/Makefile
@ -12,6 +12,16 @@ LICENSE_FILE=	${PANDORA_LICENSE_FILE}

 RUN_DEPENDS=	${LOCALBASE}/bin/twopi:${PORTSDIR}/graphics/graphviz

+USES=		shebangfix
+SHEBANG_FILES=	include/languages/util-all \
+		include/languages/util-bzr-update \
+		include/languages/util-compile-mo \
+		include/languages/util-create-po \
+		include/languages/util-create-template \
+		include/languages/util-generate-tarball \
+		include/languages/util-update-po \
+		pandora_console_upgrade
+
 OPTIONS_DEFINE=	DOCS PGSQL
 DOCS_DESC=	Install AUTHORS and ChangeLog
 PGSQL_DESC=	Use PostgreSQL backend (experimental)
--- a/net-mgmt/pandorafms_server/Makefile
+++ b/net-mgmt/pandorafms_server/Makefile
@ -37,7 +37,28 @@ PGSQL_DESC=	Use PostgreSQL backend (experimental)
 ORACLE_DESC=	Use Oracle backend (experimental)
 EXTRAS_DESC=	Extra dependencies for util scripts

-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	FreeBSD/pandora_server \
+		bin/pandora_server \
+		util/integrity_check \
+		util/pandora_backup.sh \
+		util/pandora_count.sh \
+		util/pandora_diagnostic.sh \
+		util/pandora_remote_agent.sh \
+		util/pandora_server \
+		util/pandora_watchdog.sh \
+		util/plugin/babel_plugin/babel_plugin.sh \
+		util/plugin/create_integria_incident.sh \
+		util/plugin/dns_plugin.sh \
+		util/plugin/integria_plugin/integria_plugin.sh \
+		util/plugin/mysql_plugin.sh \
+		util/plugin/packet_loss.sh \
+		util/plugin/ssh_pandoraplugin.sh \
+		util/plugin/udp_nmap_plugin.sh \
+		util/plugin/webcheck_plugin.sh \
+		util/snmptrap_gen.sh \
+		util/tentacle_serverd \
+		util/trap_rate.sh
 USE_PERL5=	build run
 SUB_LIST+=	PERL="${PERL}" DATADIR="${DATADIR}"
 SUB_FILES=	pkg-message
--- a/net-mgmt/pandorafms_server/bsd.pandora.mk
+++ b/net-mgmt/pandorafms_server/bsd.pandora.mk
@ -13,6 +13,7 @@ PANDORA_INSTALLER=	${PORTNAME}_installer
 PANDORA_INSTALLER_ARGS=	--install

 PORTVERSION=	${PANDORA_VERSION:C/SP/./}
+PORTREVISION=	1

 MASTER_SITES?=	SF/pandora/Pandora%20FMS%20${PANDORA_VERSION:C/(SP[0-9]*)/\/\1/}Final/Tarball
 .if ${PORTNAME} == "pandora_agent"
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	ntp
-PORTVERSION=	4.3.66
+PORTVERSION=	4.3.67
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
 		http://archive.ntp.org/ntp4/ntp-dev/
--- a/net/ntp-devel/distinfo
+++ b/net/ntp-devel/distinfo
@ -1,2 +1,2 @@
-SHA256 (ntp-dev-4.3.66.tar.gz) = a28d1e2639bdc0e63f2fff563c6a305281ec8133001a8522dffccc6d8653103e
-SIZE (ntp-dev-4.3.66.tar.gz) = 23676133
+SHA256 (ntp-dev-4.3.67.tar.gz) = a8761310a2e3ca53fc880b2980276149ebce9711627da5b093d80a3842f379b2
+SIZE (ntp-dev-4.3.67.tar.gz) = 23658173
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@ -1,7 +1,6 @@
 # $FreeBSD$

 PORTNAME=	openafs
-PORTREVISION=	1
 DISTVERSION=	${AFS_DISTVERSION}.${DBVERSION:S/-//g}
 CATEGORIES=	net
 MASTER_SITES=	http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
@ -22,7 +21,7 @@ LICENSE_NAME=	IBM Public License Version 1.0
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

-AFS_DISTVERSION=	1.6.10
+AFS_DISTVERSION=	1.6.13
 DBVERSION=	2013-01-28

 USES=		cpe kmod tar:bzip2
--- a/net/openafs/distinfo
+++ b/net/openafs/distinfo
@ -1,6 +1,6 @@
-SHA256 (openafs-1.6.10-src.tar.bz2) = 09b3c4f9500107c6e1cb737a5642e50f338d6acb0579e5e03c772cba1c6f1276
-SIZE (openafs-1.6.10-src.tar.bz2) = 14592958
-SHA256 (openafs-1.6.10-doc.tar.bz2) = 7cc67eaa3feb7bc4fafc2339284ca46e160bc8dff4acdbd502cfa6e4f41a8ea4
-SIZE (openafs-1.6.10-doc.tar.bz2) = 3531577
+SHA256 (openafs-1.6.13-src.tar.bz2) = 6139370633b48f0149d4dacdd01af7ee29b800b0866c2d18a679c1669e317b26
+SIZE (openafs-1.6.13-src.tar.bz2) = 14373447
+SHA256 (openafs-1.6.13-doc.tar.bz2) = a0517efcb665efc70ac0813256730443be68fb8635da2f90e221bb2c6cc23736
+SIZE (openafs-1.6.13-doc.tar.bz2) = 3501580
 SHA256 (CellServDB.2013-01-28) = faa755c6e13d8a71182a4036d1cee01bce49fb2a93feb6499683f22049391a17
 SIZE (CellServDB.2013-01-28) = 36787
--- a/net/openafs/files/patch-src-afs-FBSD-osi_vfsops.c
+++ b/net/openafs/files/patch-src-afs-FBSD-osi_vfsops.c
@ -1,14 +0,0 @@
--- src/afs/FBSD/osi_vfsops.c.orig	2014-11-08 11:45:02.000000000 +0900
-+++ src/afs/FBSD/osi_vfsops.c	2014-11-08 12:01:34.000000000 +0900
-@@ -49,7 +49,11 @@
-     int code;
-     int offset = AFS_SYSCALL;
- #if defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV)
-+# if defined(FBSD_SYSCALL_REGISTER_FOUR_ARGS)
-+    code = syscall_register(&offset, &afs_sysent, &old_sysent, 0);
-+# else
-     code = syscall_register(&offset, &afs_sysent, &old_sysent);
-+# endif
-     if (code) {
- 	printf("AFS_SYSCALL in use, error %i. aborting\n", code);
- 	return code;
--- a/net/openafs/files/patch-src-config-param.amd64_fbsd_110.h
+++ b/net/openafs/files/patch-src-config-param.amd64_fbsd_110.h
@ -1,14 +0,0 @@
--- src/config/param.amd64_fbsd_110.h.orig	2014-10-09 18:21:13.000000000 +0900
-+++ src/config/param.amd64_fbsd_110.h	2014-11-08 12:19:21.000000000 +0900
-@@ -144,6 +144,11 @@
- #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
- #endif /* _KERNEL */
- 
-+/* r273707 added a flags argument to syscall_register() */
-+#if __FreeBSD_version >= 1100041
-+#define FBSD_SYSCALL_REGISTER_FOUR_ARGS
-+#endif
-+
- #else /* !defined(UKERNEL) */
- 
- /* This section for user space compiles only */
--- a/net/openafs/files/patch-src-config-param.i386_fbsd_110.h
+++ b/net/openafs/files/patch-src-config-param.i386_fbsd_110.h
@ -1,14 +0,0 @@
--- src/config/param.i386_fbsd_110.h.orig	2014-10-09 18:21:13.000000000 +0900
-+++ src/config/param.i386_fbsd_110.h	2014-11-08 12:19:35.000000000 +0900
-@@ -143,6 +143,11 @@
- #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
- #endif /* _KERNEL */
- 
-+/* r273707 added a flags argument to syscall_register() */
-+#if __FreeBSD_version >= 1100041
-+#define FBSD_SYSCALL_REGISTER_FOUR_ARGS
-+#endif
-+
- #else /* !defined(UKERNEL) */
- 
- /* This section for user space compiles only */
--- a/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in
+++ b/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in
@ -1,17 +0,0 @@
--- src/libafs/MakefileProto.FBSD.in.orig	2014-05-14 23:09:14.000000000 +0900
-+++ src/libafs/MakefileProto.FBSD.in	2014-05-22 08:00:36.000000000 +0900
-@@ -41,10 +41,12 @@
- <all>
- 
- KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
-	-elf \
- 	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
-	-mno-align-long-strings -fno-common -ffreestanding \
-+	-fno-common -ffreestanding \
- 	-I${KBLD} -include opt_global.h -fno-strict-aliasing
-+.if ${COMPILER_TYPE} != clang
-+KDEFS+=	-elf -mno-align-long-strings
-+.endif
- 
- DBUG = -O2
- #DBUG = -O -g
--- a/opnsense/os-update/work/.PLIST.mktmp
+++ b/opnsense/os-update/work/.PLIST.mktmp
@ -0,0 +1,5 @@
+/usr/local/share/licenses/os-update-15.7.6/catalog.mk
+/usr/local/share/licenses/os-update-15.7.6/LICENSE
+/usr/local/share/licenses/os-update-15.7.6/BSD2CLAUSE
+man/man8/opnsense-update.8.gz
+sbin/opnsense-update
--- a/opnsense/os-update/work/.build_done.os-update._usr_local
+++ b/opnsense/os-update/work/.build_done.os-update._usr_local
--- a/opnsense/os-update/work/.configure_done.os-update._usr_local
+++ b/opnsense/os-update/work/.configure_done.os-update._usr_local
--- a/opnsense/os-update/work/.extract_done.os-update._usr_local
+++ b/opnsense/os-update/work/.extract_done.os-update._usr_local
--- a/opnsense/os-update/work/.license-catalog.mk
+++ b/opnsense/os-update/work/.license-catalog.mk
@ -0,0 +1,5 @@
+_LICENSE=BSD2CLAUSE
+_LICENSE_NAME=BSD 2-clause Simplified License
+_LICENSE_PERMS=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+_LICENSE_GROUPS=FSF OSI COPYFREE
+_LICENSE_DISTFILES=
--- a/opnsense/os-update/work/.license-report
+++ b/opnsense/os-update/work/.license-report
@ -0,0 +1 @@
+This package has a single license: BSD2CLAUSE (BSD 2-clause Simplified License).
--- a/opnsense/os-update/work/.license_done.os-update._usr_local
+++ b/opnsense/os-update/work/.license_done.os-update._usr_local
--- a/opnsense/os-update/work/.metadir/+DESC
+++ b/opnsense/os-update/work/.metadir/+DESC
@ -0,0 +1,4 @@
+The OPNsense system update utility provides kernel and base
+upgrades based on binary sets as well as packages via pkg(8).
+
+WWW: https://opnsense.org/
--- a/opnsense/os-update/work/.metadir/+MANIFEST
+++ b/opnsense/os-update/work/.metadir/+MANIFEST
@ -0,0 +1,14 @@
+name: "os-update"
+version: "15.7.6"
+origin: opnsense/os-update
+comment: <<EOD
+OPNsense update utility
+EOD
+maintainer: franco@opnsense.org
+prefix: /usr/local
+deps: { 
+}
+categories: [ sysutils, ]
+licenselogic: single
+licenses: [ BSD2CLAUSE, ]
+options: {}
--- a/opnsense/os-update/work/.package_done.os-update._usr_local
+++ b/opnsense/os-update/work/.package_done.os-update._usr_local
--- a/opnsense/os-update/work/.patch_done.os-update._usr_local
+++ b/opnsense/os-update/work/.patch_done.os-update._usr_local
--- a/opnsense/os-update/work/.stage_done.os-update._usr_local
+++ b/opnsense/os-update/work/.stage_done.os-update._usr_local
--- a/opnsense/os-update/work/BSD2CLAUSE
+++ b/opnsense/os-update/work/BSD2CLAUSE
@ -0,0 +1,2 @@
+The license: BSD2CLAUSE (BSD 2-clause Simplified License) is standard,
+please read from the web.
--- a/opnsense/os-update/work/opnsense-update.sh
+++ b/opnsense/os-update/work/opnsense-update.sh
@ -0,0 +1,310 @@
+#!/bin/sh
+
+# Copyright (c) 2015 Franco Fichtner <franco@opnsense.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+set -e
+
+if [ "$(id -u)" != "0" ]; then
+	echo "Must be root."
+	exit 1
+fi
+
+MARKER="/usr/local/opnsense/version/opnsense-update"
+ORIGIN="/usr/local/etc/pkg/repos/origin.conf"
+MIRROR="http://pkg.opnsense.org"
+VERSION="15.7.6"
+ARCH=$(uname -m)
+
+# clean up old stale working directories
+rm -rf /tmp/opnsense-update.*
+
+# migrate old marker files
+for SUB in kernel base; do
+	({
+		CURR=opnsense-update.${SUB}
+		PREV=os-update.${SUB}
+
+		cd $(dirname ${MARKER})
+
+		if [ -e ${PREV} ]; then
+			if [ ! -e ${CURR} ]; then
+				mv ${PREV} ${CURR}
+				ln -s ${CURR} ${PREV}
+			fi
+		fi
+	})
+done
+
+INSTALLED_BASE=
+if [ -f ${MARKER}.base ]; then
+	INSTALLED_BASE=$(cat ${MARKER}.base)
+fi
+
+INSTALLED_KERNEL=
+if [ -f ${MARKER}.kernel ]; then
+	INSTALLED_KERNEL=$(cat ${MARKER}.kernel)
+fi
+
+DO_RELEASE=
+DO_FLAVOUR=
+DO_MIRROR=
+DO_KERNEL=
+DO_FORCE=
+DO_BASE=
+DO_PKGS=
+DO_SKIP=
+
+while getopts bcfkm:n:pr:sv OPT; do
+	case ${OPT} in
+	b)
+		DO_BASE="-b"
+		;;
+	c)
+		# -c only ever checks the embedded version string
+		if [ "${VERSION}-${ARCH}" = "${INSTALLED_KERNEL}" -a \
+		    "${VERSION}-${ARCH}" = "${INSTALLED_BASE}" ]; then
+			echo "Your system is up to date."
+			exit 1
+		fi
+		echo "There are updates available."
+		exit 0
+		;;
+	f)
+		DO_FORCE="-f"
+		;;
+	k)
+		DO_KERNEL="-k"
+		;;
+	m)
+		DO_MIRROR="-m ${OPTARG}"
+		MIRROR=${OPTARG}
+		;;
+	n)
+		DO_FLAVOUR="-n ${OPTARG}"
+		FLAVOUR=${OPTARG}
+		;;
+	p)
+		DO_PKGS="-p"
+		;;
+	r)
+		DO_RELEASE="-r ${OPTARG}"
+		RELEASE=${OPTARG}
+		;;
+	s)
+		DO_SKIP="-s"
+		;;
+	v)
+		echo ${VERSION}-${ARCH}
+		exit 0
+		;;
+	*)
+		echo "Usage: opnsense-update [-bcfkpsv] [-m mirror] [-r release]" >&2
+		exit 1
+		;;
+	esac
+done
+
+if [ -z "${DO_KERNEL}${DO_BASE}${DO_PKGS}" ]; then
+	# default is enable all
+	DO_KERNEL="-k"
+	DO_BASE="-b"
+	DO_PKGS="-p"
+fi
+
+if [ -n "${DO_FLAVOUR}" ]; then
+	# replace the package repo name
+	sed -i '' "/url:/s/\${ABI}.*/\${ABI}\/${FLAVOUR}\",/" ${ORIGIN}
+fi
+
+if [ -n "${DO_MIRROR}" ]; then
+	# replace the package repo location
+	sed -i '' "/url:/s/pkg\+.*\${ABI}/pkg\+${MIRROR}\/\${ABI}/" ${ORIGIN}
+fi
+
+if [ -n "${DO_SKIP}" ]; then
+	# only invoke flavour and mirror replacement
+	exit 0
+fi
+
+if [ -n "${DO_PKGS}" ]; then
+	pkg update ${DO_FORCE}
+	pkg upgrade -y ${DO_FORCE}
+	pkg autoremove -y
+	pkg clean -y
+	if [ -n "${DO_BASE}${DO_KERNEL}" ]; then
+		# script may have changed, relaunch...
+		opnsense-update ${DO_BASE} ${DO_KERNEL} \
+		    ${DO_FORCE} ${DO_RELEASE} ${DO_MIRROR}
+	fi
+	# stop here to prevent the second pass
+	exit 0
+fi
+
+# if no release was selected we use the embedded defaults
+if [ -z "${RELEASE}" ]; then
+	RELEASE=${VERSION}
+
+	if [ ${ARCH} = "amd64" ]; then
+		OBSOLETESHA="34f7479276c3b43c73468686dcf6f402c5be4f1d7c1d5761e22d6b52a3d4c174"
+		KERNELSHA="ad738d0f3dc14f897c475e54f8b9d4bde00b600effab150c44f93af3353edb0c"
+		BASESHA="998ca03aa2018c08ceaa38322e10d0d9592eb75df775b0e735b63d4f6a24d337"
+	elif [ ${ARCH} = "i386" ]; then
+		OBSOLETESHA="aefeb0f249ac98948dbaed1d8d4907987b9201f9268fb0498138e3bfe1142b65"
+		KERNELSHA="3c897693889ab29682f7b21e07d3e401e8d36b2139e4490b76dc7130a6219004"
+		BASESHA="971a9e8cf2d0890470d61c3c50888714f8b8e6abe5e30e2a98a538f9b1ee64b5"
+	else
+		echo "Unknown architecture ${ARCH}" >&2
+		exit 1
+	fi
+fi
+
+if [ -z "${DO_FORCE}" ]; then
+	# disable kernel update if up-to-date
+	if [ "${RELEASE}-${ARCH}" = "${INSTALLED_KERNEL}" -a \
+	    -n "${DO_KERNEL}" ]; then
+		DO_KERNEL=
+	fi
+
+	# disable base update if up-to-date
+	if [ "${RELEASE}-${ARCH}" = "${INSTALLED_BASE}" -a \
+	    -n "${DO_BASE}" ]; then
+		DO_BASE=
+	fi
+
+	# nothing to do
+	if [ -z "${DO_KERNEL}${DO_BASE}" ]; then
+		echo "Your system is up to date."
+		exit 0
+	fi
+fi
+
+echo "!!!!!!!!!!!!! ATTENTION !!!!!!!!!!!!!!!!!"
+echo "! A kernel/base upgrade is in progress. !"
+echo "!  Please do not turn off the system.   !"
+echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+
+OBSOLETESET=base-${RELEASE}-${ARCH}.obsolete
+KERNELSET=kernel-${RELEASE}-${ARCH}.txz
+BASESET=base-${RELEASE}-${ARCH}.txz
+WORKDIR=/tmp/opnsense-update.${$}
+KERNELDIR=/boot/kernel
+
+fetch_set()
+{
+	echo -n "Fetching ${1}... "
+
+	mkdir -p ${WORKDIR} && \
+	    fetch -q ${MIRROR}/sets/${1} -o ${WORKDIR}/${1} && \
+	    [ -z "${2}" -o "`sha256 -q ${WORKDIR}/${1}`" = "${2}" ] && \
+	    echo "ok" && return
+
+	echo "failed"
+	exit 1
+}
+
+apply_kernel()
+{
+	echo -n "Applying ${KERNELSET}... "
+
+	rm -rf ${KERNELDIR}.old && \
+	    mv ${KERNELDIR} ${KERNELDIR}.old && \
+	    tar -C/ -xpf ${WORKDIR}/${KERNELSET} && \
+	    kldxref ${KERNELDIR} && \
+	    echo "ok" && return
+
+	echo "failed"
+	exit 1
+}
+
+apply_base()
+{
+	echo -n "Applying ${BASESET}... "
+
+	# Ideally, we don't do any exlcude magic and simply
+	# reapply all the packages on bootup and do another
+	# reboot just to be safe...
+
+	chflags -R noschg /bin /sbin /lib /libexec \
+	    /usr/bin /usr/sbin /usr/lib && \
+	    tar -C/ -xpf ${WORKDIR}/${BASESET} \
+	    --exclude="./etc/group" \
+	    --exclude="./etc/master.passwd" \
+	    --exclude="./etc/passwd" \
+	    --exclude="./etc/shells" \
+	    --exclude="./etc/ttys" \
+	    --exclude="./etc/rc" && \
+	    kldxref ${KERNELDIR} && \
+	    echo "ok" && return
+
+	echo "failed"
+	exit 1
+}
+
+apply_obsolete()
+{
+	echo -n "Applying ${OBSOLETESET}... "
+
+	while read FILE; do
+		rm -f ${FILE}
+	done < ${WORKDIR}/${OBSOLETESET}
+
+	echo "ok"
+}
+
+if [ -n "${DO_KERNEL}" ]; then
+	fetch_set ${KERNELSET} ${KERNELSHA}
+fi
+
+if [ -n "${DO_BASE}" ]; then
+	fetch_set ${BASESET} ${BASESHA}
+	fetch_set ${OBSOLETESET} ${OBSOLETESHA}
+fi
+
+if [ -n "${DO_KERNEL}" ]; then
+	apply_kernel
+fi
+
+if [ -n "${DO_BASE}" ]; then
+	apply_base
+	apply_obsolete
+fi
+
+# bootstrap the directory  if needed
+mkdir -p $(dirname ${MARKER})
+# remove the file previously used
+rm -f ${MARKER}
+
+if [ -n "${DO_KERNEL}" ]; then
+	echo ${RELEASE}-${ARCH} > ${MARKER}.kernel
+fi
+
+if [ -n "${DO_BASE}" ]; then
+	echo ${RELEASE}-${ARCH} > ${MARKER}.base
+fi
+
+rm -rf ${WORKDIR}
+
+echo "Please reboot."
--- a/opnsense/os-update/work/os-update-15.7.6/Makefile
+++ b/opnsense/os-update/work/os-update-15.7.6/Makefile
@ -0,0 +1,8 @@
+SCRIPTS=opnsense-update.sh
+MAN=	opnsense-update.8
+
+PREFIX?=${LOCALBASE}
+BINDIR=	${PREFIX}/sbin
+MANDIR=	${PREFIX}/man/man
+
+.include <bsd.prog.mk>
--- a/opnsense/os-update/work/os-update-15.7.6/opnsense-update.8
+++ b/opnsense/os-update/work/os-update-15.7.6/opnsense-update.8
@ -0,0 +1,114 @@
+.\"
+.\" Copyright (c) 2015 Franco Fichtner <franco@opnsense.org>
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd July 29, 2015
+.Dt OPNSENSE-UPDATE 8
+.Os
+.Sh NAME
+.Nm opnsense-update
+.Nd OPNsense update utility
+.Sh SYNOPSIS
+.Nm
+.Op Fl bfkps
+.Op Fl m Ar mirror
+.Op Fl n Ar flavour
+.Op Fl r Ar release
+.Nm
+.Op Fl cv
+.Sh DESCRIPTION
+The
+.Nm
+utility offers combined kernel and base system upgrades using
+remotely fetched binary sets, as well as package upgrades via
+.Xr pkg 8 .
+.Pp
+Options
+.Sq Fl b ,
+.Sq Fl p ,
+and
+.Sq Fl k
+may be stacked to create selective updates.
+The default is
+.Sq Fl bkp ,
+attempting to update all components at once.
+.Pp
+The options are as follows:
+.Bl -tag -width ".Fl r Ar release" -offset indent
+.It Fl b
+Update the base system only.
+.It Fl c
+Check wether a base/kernel update can be performed, but don't install it.
+.It Fl f
+Force an update even when the latest release is already installed.
+.It Fl k
+Update the kernel only.
+.It Fl m Ar mirror
+Change the set fetch and package location to
+.Ar mirror .
+.It Fl n Ar flavour
+Change the package repository to
+.Ar flavour .
+Use at your own risk.
+.It Fl p
+Update the packages only.
+.It Fl r Ar release
+Select the
+.Ar release
+to be installed and switch of checksumming.
+Package upgrades are unaffected by this option.
+This is intended for development or custom builds only.
+.It Fl s
+Skip update phase; useful in conjunction with
+.Sq Fl m
+and
+.Sq Fl n .
+.It Fl v
+Print the latest base/kernel version string.
+.El
+.Sh FILES
+.Bl -tag -width Ds
+.It Pa /usr/local/etc/pkg/repos/origin.conf
+The
+.Xr pkg.conf 5
+file used to configure the packages mirror.
+The file is rewritten in case of
+.Sq Fl m
+or
+.Sq Fl n .
+.It Pa /usr/local/opnsense/version/opnsense-update.base
+The file is used to check if a base system upgrade is necessary.
+After a successful update, the file is rewritten.
+.It Pa /usr/local/opnsense/version/opnsense-update.kernel
+The file is used to check if a kernel upgrade is necessary.
+After a successful update, the file is rewritten.
+.El
+.Sh EXIT STATUS
+.Ex -std
+.Sh SEE ALSO
+.Xr pkg.conf 5 ,
+.Xr pkg 8
+.Sh AUTHORS
+.An Franco Fichtner Aq Mt franco@opnsense.org
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`This package has a single license: BSD2CLAUSE (BSD 2-clause Simplified License).`