derekschrock

From e5c5065a49ae105f91b1cd4f406d5540741a20d4 Mon Sep 17 00:00:00 2001
From: Derek Schrock <dereks@lifeofadishwasher.com>
Date: Mon, 10 Aug 2015 22:12:27 -0400
Subject: [PATCH] reverse order of change log and make it easier to read

---
 KNOWNBUGS | 908 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 460 insertions(+), 448 deletions(-)

diff --git a/KNOWNBUGS b/KNOWNBUGS

derekschrock

--- /usr/jails/apache/usr/local/www/phpvirtualbox/endpoints/lib/vboxServiceWrappers.php.orig	2017-08-19 18:08:21.600780000 -0400
+++ /usr/jails/apache/usr/local/www/phpvirtualbox/endpoints/lib/vboxServiceWrappers.php	2017-08-20 20:03:29.093550000 -0400
@@ -915,8 +915,8 @@
         $request->_this = $this->handle;
         $request->location = $arg_location;
         $request->deviceType = $arg_deviceType;
-        $request->accessMode = $arg_accessMode;
-        $request->forceNewUuid = $arg_forceNewUuid;
+        $request->accessMode = $arg_accessMode === null ? "ReadWrite" : $arg_accessMode;
+        $request->forceNewUuid = $arg_forceNewUuid === null ? false : $arg_forceNewUuid;

derekschrock

#!/usr/bin/env sh

if ! [ -d "$1" ] ; then
	echo "usage: ${0##*/} dir"
	exit
fi

cd "$1"

pkg query "%o" | while read origin; do

derekschrock

# Sample minimal config file.  Copy this to ~/.offlineimaprc and edit to
# get started fast.

[general]
accounts = LOADM
pythonfile = ~/.offlineimap.py

[Account LOADM]
localrepository = Local
remoterepository = Remote

derekschrock

--- /usr/jails/apache/usr/local/www/phpvirtualbox/endpoints/lib/vboxconnector.php	2017-09-10 05:57:43.000000000 -0400
+++ vboxconnector.php	2017-12-22 21:57:11.691738000 -0500
@@ -1593,7 +1593,7 @@
 				// Network properties
 				$eprops = $n->getProperties(null);
 				$eprops = array_combine($eprops[1],$eprops[0]);
-				$iprops = array_map(create_function('$a','$b=explode("=",$a); return array($b[0]=>$b[1]);'),preg_split('/[\r|\n]+/',$args['networkAdapters'][$i]['properties']));
+				$iprops = array_map(function ($a) { $b=explode("=",$a); return array($b[0]=>$b[1]); },preg_split('/[\r|\n]+/',$args['networkAdapters'][$i]['properties']));
 				$inprops = array();
 				foreach($iprops as $a) {

derekschrock

diff --git a/misc/units b/misc/units
index 790c214f..5d72244a 100755
--- a/misc/units
+++ b/misc/units
@@ -1872,7 +1872,7 @@ failed_git_marker ()
     local f=$1
     local l
 
-    if type "git" > /dev/null 2>&1; then
+    if type "git" > /dev/null 2>&1 && [ -d .git ]; then

derekschrock

# $FreeBSD: head/x11/guake/Makefile 465584 2018-03-26 12:38:56Z bapt $

PORTNAME=	guake
PORTVERSION=	3.4.0
PORTREVISION=	1
CATEGORIES=	x11 python gnome

MAINTAINER=	daniel@shafer.cc
COMMENT=	Dropdown terminal made for the GNOME desktop

derekschrock

diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh
index 5469bff33337..1159b400d33f 100644
--- a/Mk/Scripts/do-depends.sh
+++ b/Mk/Scripts/do-depends.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: head/Mk/Scripts/do-depends.sh 455690 2017-12-07 01:51:00Z bdrewery $
 #
 # MAINTAINER: portmgr@FreeBSD.org

derekschrock

diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh
index 5469bff33337..3df2989d165a 100644
--- a/Mk/Scripts/do-depends.sh
+++ b/Mk/Scripts/do-depends.sh
@@ -11,7 +11,7 @@ validate_env dp_RAWDEPENDS dp_DEPTYPE dp_DEPENDS_TARGET dp_DEPENDS_PRECLEAN \
 	dp_DEPENDS_CLEAN dp_DEPENDS_ARGS dp_USE_PACKAGE_DEPENDS \
 	dp_USE_PACKAGE_DEPENDS_ONLY dp_PKG_ADD dp_PKG_INFO dp_WRKDIR \
 	dp_PKGNAME dp_STRICT_DEPENDS dp_LOCALBASE dp_LIB_DIRS dp_SH \
-	dp_SCRIPTSDIR PORTSDIR dp_MAKE dp_MAKEFLAGS
+	dp_SCRIPTSDIR PORTSDIR dp_MAKE dp_MAKEFLAGS dp_PORTEPOCH

derekschrock

diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh
index 5469bff33337..46dc5760e9dd 100644
--- a/Mk/Scripts/do-depends.sh
+++ b/Mk/Scripts/do-depends.sh
@@ -11,7 +11,7 @@ validate_env dp_RAWDEPENDS dp_DEPTYPE dp_DEPENDS_TARGET dp_DEPENDS_PRECLEAN \
 	dp_DEPENDS_CLEAN dp_DEPENDS_ARGS dp_USE_PACKAGE_DEPENDS \
 	dp_USE_PACKAGE_DEPENDS_ONLY dp_PKG_ADD dp_PKG_INFO dp_WRKDIR \
 	dp_PKGNAME dp_STRICT_DEPENDS dp_LOCALBASE dp_LIB_DIRS dp_SH \
-	dp_SCRIPTSDIR PORTSDIR dp_MAKE dp_MAKEFLAGS
+	dp_SCRIPTSDIR PORTSDIR dp_MAKE dp_MAKEFLAGS dp_PORTEPOCH