--- pkgtools.conf.sample	2016-07-10 17:34:20.283699000 +0200
+++ pkgtools.conf	2016-07-10 20:58:40.813500000 +0200
@@ -164,6 +164,7 @@
   ENV['PACKAGES'] ||= ENV['PORTSDIR'] + '/packages'
   ENV['PKG_PATH'] ||= ENV['PACKAGES'] + '/All'
   ENV['PKG_BACKUP_DIR'] ||= ENV['PKG_PATH']
+  ENV['PKG_TMPDIR'] ||= '/var/tmp'
 
   # SANITY_CHECK: boolean (default: true)
   #
@@ -218,6 +219,7 @@
   #   ]
 
   EXTRA_CATEGORIES = [
+    'local',
   ]
 
   # ALT_INDEX: array
@@ -265,7 +267,6 @@
   #   ]
 
   HOLD_PKGS = [
-    'bsdpan-*',
   ]
 
   # IGNORE_MOVED: array
@@ -280,7 +281,6 @@
   #   ]
 
   IGNORE_MOVED = [
-    'devel/bison',
   ]
 
   # USE_PKGS: array
@@ -405,6 +405,8 @@
   }
 
   MAKE_ENV = {
+    'lang/gcc' => 'LANG=C',
+    'lang/python27' => 'CFLAGS=-DOPENSSL_NO_SSL2', # Needed for base/head since ports r418032 ish, see PR 210820.
   }
 
   # BEFOREBUILD: hash
@@ -457,6 +459,10 @@
   #   }
 
   BEFOREDEINSTALL = {
+    # lang/rust is incompatible with itself while installed
+    # Does not compute. portupgrade doesn't detect the deinstallation of lang/rust, and assumes the old lang/rust is installed anyway.
+    # lang/rust must be handled outside of portupgrade. Simply uninstall lang/rust prior to running portupgrade when mail/thunderbird and/or www/firefox needs their upgrades.
+    # 'lang/rust' => 'pkg version -ovIL= | grep -q \'lang/rust\' && pkg delete -y lang/rust',
   }
 
   # AFTERINSTALL: hash
@@ -496,10 +502,9 @@
   #   }
 
   AFTERINSTALL = {
-    # Re-enable the X wrapper
-    'x11-servers/XFree86-4-Server' => sprintf(
-     'cd %s/bin && if [ -x Xwrapper-4 ]; then ln -sf Xwrapper-4 X; fi',
-     x11base()),
+    'www/apache24' => localbase() + '/etc/rc.d/apache24 restart',
+    'databases/postgresql95-server' => localbase() + '/etc/rc.d/postgresql restart',
+    'mail/spamassassin' => localbase() + '/etc/rc.d/sa-spamd start',
   }
 
   # PKG_SITES: array