Merge lp:~tghs/inkscape/0.92.x_mac_packaging into lp:inkscape/0.92.x

[Tim Sheridan]

This branch contains the main work for getting the macOS packaging ready for an official 0.92.2 release.

Changes have mostly been reviewed by su_v as I've been committing them. Adding su_v for review in case there's anything added recently that hasn't been looked at. I've tested su_v's patches that are included in this branch.

The following are the only changes made outside of the packaging/macosx tree:
* http://bazaar.launchpad.net/~tghs/inkscape/0.92.x_mac_packaging/revision/15367
* http://bazaar.launchpad.net/~tghs/inkscape/0.92.x_mac_packaging/revision/15369
* http://bazaar.launchpad.net/~tghs/inkscape/0.92.x_mac_packaging/revision/15372

[Bryce Harrington (bryce)]

For landing on 0.92.x, pending suv's approval:

Acked-by: Bryce Harrington <email address hidden>

[su_v (suv-lp)]

review: Approve

[su_v (suv-lp)]

@Tim - would you mind applying for membership in the Inkscape dev team at launchpad to get commit access, and merge this yourself?
https://launchpad.net/~inkscape.dev
https://launchpad.net/~inkscape.dev/+join

@inkscape.dev: apart from updates for the en_GB translation, patches contributed by Tim (tghs) had been committed in r15395, r15446, r15487.

[Tim Sheridan (tghs)]

su_v: Sure, I've applied to the group. I'll merge this when I'm added.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-02-16 20:37:27 +0000
+++ CMakeLists.txt	2017-02-24 00:27:32 +0000
@@ -135,9 +135,12 @@
 add_custom_target(dist
     COMMAND sed -i "s/unknown/r${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake
     && sed -i "s/custom//" CMakeScripts/inkscape-version.cmake
+    && sed -i "/VER_BZRREV=/d" src/Makefile.am
+    && sed -i "s/..VER_BZRREV/ r${INKSCAPE_REVISION}/" src/Makefile.am
     && bzr export --uncommitted --root=${INKSCAPE_DIST_PREFIX}
     "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.bz2" 
     && bzr revert ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake
+    && bzr revert ${CMAKE_SOURCE_DIR}/src/Makefile.am
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
 
 # -----------------------------------------------------------------------------
 
=== modified file 'Info.plist.in'
--- Info.plist.in	2014-12-31 14:59:16 +0000
+++ Info.plist.in	2017-02-24 00:27:32 +0000
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Inkscape</string>
     <key>CFBundleGetInfoString</key>
-    <string>@VERSION@, Copyright 2003-2014 Inkscape Developers</string>
+    <string>@VERSION@, Copyright 2003-2017 Inkscape Developers</string>
     <key>CFBundleIconFile</key>
     <string>Inkscape.icns</string>
     <key>CFBundleIdentifier</key>
@@ -550,6 +550,6 @@
     <key>LSMinimumSystemVersion</key>
     <string>10.5</string>
     <key>NSHumanReadableCopyright</key>
-    <string>Copyright 2014 Inkscape Developers, GNU General Public License.</string>
+    <string>Copyright 2003-2017 Inkscape Developers, GNU General Public License.</string>
 </dict>
 </plist>
 
=== modified file 'packaging/macosx/README.txt'
--- packaging/macosx/README.txt	2015-01-29 00:13:59 +0000
+++ packaging/macosx/README.txt	2017-02-24 00:27:32 +0000
@@ -20,12 +20,16 @@
 
 $ sudo sed -e '$a\'$'\n''+x11 -quartz -no_x11 +rsvg +Pillow -tkinter +gnome_vfs' -i "" "$MP_PREFIX/etc/macports/variants.conf"
 
-6) install required dependencies: 
+6) optional: to force an i386 build on x86_64 machine:
+
+$ sudo sed -e '/^#build_arch/i\'$'\nbuild_arch i386' -i "" "$MP_PREFIX/etc/macports/macports.conf"
+
+7) install required dependencies: 
 
 $ sudo port install inkscape-packaging
 
-7) compile inkscape, create app bundle and DMG: 
+8) compile inkscape, create app bundle and DMG (if building for i386 on x86_64 machine, add at the beginning ARCH="i386"):
 
 $ LIBPREFIX="$MP_PREFIX" ./osx-build.sh a c b -j 5 i p -s d
 
-8) upload the DMG.
+9) upload the DMG.
 
=== modified file 'packaging/macosx/Resources/bin/inkscape'
--- packaging/macosx/Resources/bin/inkscape	2015-11-02 10:14:45 +0000
+++ packaging/macosx/Resources/bin/inkscape	2017-02-24 00:27:32 +0000
@@ -95,6 +95,10 @@
 export ASPELL_CONF="prefix $TOP;"
 export POPPLER_DATADIR="$TOP/share/poppler"
 
+# Using fontconfig backend for slightly crisper UI text rendering
+export PANGOCAIRO_BACKEND="fontconfig"
+#export PANGOCAIRO_BACKEND="coretext"
+
 # no DBUS for now
 unset DBUS_LAUNCHD_SESSION_BUS_SOCKET
 unset DBUS_SESSION_BUS_ADDRESS
@@ -140,7 +144,7 @@
 	export LANG="en_US.UTF-8"
 else
 	tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
-		tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
+		tail -n1 | awk '{print $2}' | sed 's/\./ /' | awk '{print $1}'`"
 	if [ "x$tmpLANG" == "x" ]
 	then
 		# override broken script
 
=== modified file 'packaging/macosx/Resources/etc/fonts/fonts.conf'
--- packaging/macosx/Resources/etc/fonts/fonts.conf	2014-08-20 01:29:43 +0000
+++ packaging/macosx/Resources/etc/fonts/fonts.conf	2017-02-24 00:27:32 +0000
@@ -83,72 +83,6 @@
 
 	<config>
 <!--
-  These are the default Unicode chars that are expected to be blank
-  in fonts.  All other blank chars are assumed to be broken and
-  won't appear in the resulting charsets
- -->
-		<blank>
-			<int>0x0020</int>	<!-- SPACE -->
-			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
-			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
-			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
-			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
-			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
-			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
-			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
-			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
-			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
-			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
-			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
-			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
-			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
-			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
-			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
-			<int>0x2000</int>	<!-- EN QUAD -->
-			<int>0x2001</int>	<!-- EM QUAD -->
-			<int>0x2002</int>	<!-- EN SPACE -->
-			<int>0x2003</int>	<!-- EM SPACE -->
-			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
-			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
-			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
-			<int>0x2007</int>	<!-- FIGURE SPACE -->
-			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
-			<int>0x2009</int>	<!-- THIN SPACE -->
-			<int>0x200A</int>	<!-- HAIR SPACE -->
-			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
-			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
-			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
-			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
-			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
-			<int>0x2028</int>	<!-- LINE SEPARATOR -->
-			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
-			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
-			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
-			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
-			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
-			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
-			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
-			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
-			<int>0x2060</int>	<!-- WORD JOINER -->
-			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
-			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
-			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
-			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
-			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
-			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
-			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
-			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
-			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
-			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
-			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
-			<int>0x3164</int>	<!-- HANGUL FILLER -->
-			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
-			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
-			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
-			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
-			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
-		</blank>
-<!--
   Rescan configuration every 30 seconds when FcFontSetList is called
  -->
 		<rescan>
 
=== modified file 'packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh'
--- packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh	2015-01-10 16:06:20 +0000
+++ packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh	2017-02-24 00:27:32 +0000
@@ -143,7 +143,7 @@
 	export LANG="en_US.UTF-8"
 else
 	tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
-		tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
+		tail -n1 | awk '{print $2}' | sed 's/\./ /' | awk '{print $1}'`"
 	if [ "x$tmpLANG" == "x" ]
 	then
 		# override broken script
 
=== added directory 'packaging/macosx/app_patches'
=== added file 'packaging/macosx/app_patches/fix-GIMP-sliders-in-Inkscape-app-v3.patch'
--- packaging/macosx/app_patches/fix-GIMP-sliders-in-Inkscape-app-v3.patch	1970-01-01 00:00:00 +0000
+++ packaging/macosx/app_patches/fix-GIMP-sliders-in-Inkscape-app-v3.patch	2017-02-24 00:27:32 +0000
@@ -0,0 +1,31 @@
+--- Contents/Resources/etc/gtk-2.0/gtkrc-orig	2017-02-08 07:33:39.000000000 +0100
++++ Contents/Resources/etc/gtk-2.0/gtkrc	2017-02-08 21:44:57.000000000 +0100
+@@ -16,8 +16,4 @@
+ # use OS X default PDF viewer for print preview
+ gtk-print-preview-command="open -a /Applications/Preview.app %f"
+ 
+-# fix Adwaita theme for Inkscape's GimpSpinScale widgets
+-style "spinbutton" {}
+-widget_class "*GimpSpinScale*" style "spinbutton"
+-
+ # eof
+--- Contents/Resources/share/themes/Adwaita/gtk-2.0/apps-orig.rc	2017-02-07 13:40:44.000000000 +0100
++++ Contents/Resources/share/themes/Adwaita/gtk-2.0/apps.rc	2017-02-08 21:45:08.000000000 +0100
+@@ -5,6 +5,7 @@
+ # the theme or stuff that is supposed to look different, like panels.
+ 
+ # TODO: This could really look nicer
++# TODO: fix for Inkscape
+ style "gimp_spin_scale" {
+ 
+   # Spin background
+@@ -93,7 +94,8 @@
+ }
+ 
+ # Disable spin button assets for GimpSpinScale
+-class "GimpSpinScale" style "gimp_spin_scale"
++# TODO: fix for Inkscape
++#class "GimpSpinScale" style "gimp_spin_scale"
+ 
+ # Chromium lets us define some colours and settings for better integration
+ class "ChromeGtkFrame" style "chrome_gtk_frame"
 
=== added file 'packaging/macosx/app_patches/fix-URL-links-in-Inkscape-app-v1.patch'
--- packaging/macosx/app_patches/fix-URL-links-in-Inkscape-app-v1.patch	1970-01-01 00:00:00 +0000
+++ packaging/macosx/app_patches/fix-URL-links-in-Inkscape-app-v1.patch	2017-02-24 00:27:32 +0000
@@ -0,0 +1,22 @@
+diff -u -N Contents/Resources/share/applications.orig/mimeapps.list Contents/Resources/share/applications/mimeapps.list
+--- Contents/Resources/share/applications.orig/mimeapps.list	1970-01-01 01:00:00.000000000 +0100
++++ Contents/Resources/share/applications/mimeapps.list	2017-02-14 08:46:35.000000000 +0100
+@@ -0,0 +1,3 @@
++[Default Applications]
++x-scheme-handler/http=open.desktop
++x-scheme-handler/https=open.desktop
+diff -u -N Contents/Resources/share/applications.orig/open.desktop Contents/Resources/share/applications/open.desktop
+--- Contents/Resources/share/applications.orig/open.desktop	1970-01-01 01:00:00.000000000 +0100
++++ Contents/Resources/share/applications/open.desktop	2017-02-14 08:46:40.000000000 +0100
+@@ -0,0 +1,11 @@
++[Desktop Entry]
++Version=1.0
++Name=Open
++GenericName=Open
++Comment=Open wih registered native application
++Exec=open %u
++Icon=None
++StartupNotify=false
++Terminal=false
++Type=Application
++Categories=Utility;
 
=== added file 'packaging/macosx/app_patches/fix-borderless-menus-in-Inkscape-app-v1.patch'
--- packaging/macosx/app_patches/fix-borderless-menus-in-Inkscape-app-v1.patch	1970-01-01 00:00:00 +0000
+++ packaging/macosx/app_patches/fix-borderless-menus-in-Inkscape-app-v1.patch	2017-02-24 00:27:32 +0000
@@ -0,0 +1,35 @@
+--- Contents/Resources/share/themes/Adwaita/gtk-2.0/main.rc.orig	2017-02-07 13:40:44.000000000 +0100
++++ Contents/Resources/share/themes/Adwaita/gtk-2.0/main.rc	2017-02-10 15:50:57.000000000 +0100
+@@ -1533,6 +1533,24 @@
+ 
+ }
+ 
++style "menu_framed_box" {
++
++    bg[NORMAL]      = @base_color
++    bg[INSENSITIVE] = @base_color
++    bg[PRELIGHT]    = @base_color
++
++    engine "pixmap"
++    {
++        image
++        {
++            function    = BOX
++            file        = "assets/menu-border.png"
++            border      = { 1, 1, 1, 1 }
++            stretch     = TRUE
++         }
++    }
++ }
++
+ style "menu_item" {
+ 
+   xthickness = 3
+@@ -2502,6 +2520,7 @@
+ class "GtkTextView"                                                style "textview"
+ 
+ # Menu and menubar items
++widget_class "*<GtkMenu>"                                          style "menu_framed_box"
+ widget_class "*<GtkMenuItem>*"                                     style "menu_item"
+ widget_class "*<GtkMenuBar>.<GtkMenuItem>*"                        style "menubar_item"
+ widget_class "*<GtkSeparatorMenuItem>*"                            style "separator_menu_item"
 
=== added file 'packaging/macosx/app_patches/fix-cropped-button-images-in-Inkscape-app-v1.patch'
--- packaging/macosx/app_patches/fix-cropped-button-images-in-Inkscape-app-v1.patch	1970-01-01 00:00:00 +0000
+++ packaging/macosx/app_patches/fix-cropped-button-images-in-Inkscape-app-v1.patch	2017-02-24 00:27:32 +0000
@@ -0,0 +1,36 @@
+--- Contents/Resources/share/themes/Adwaita/gtk-2.0/hacks.rc.orig	2017-02-16 00:04:50.000000000 +0100
++++ Contents/Resources/share/themes/Adwaita/gtk-2.0/hacks.rc	2017-02-16 19:17:47.000000000 +0100
+@@ -20,6 +20,18 @@
+   bg[ACTIVE] = @insensitive_bg_color
+ }
+ 
++style "inkscape_toolbox_button" {
++  xthickness = 3
++  ythickness = 3
++  GtkButton::inner-border = {0, 0, 0, 0}
++}
++
++style "inkscape_canvas_button" {
++  xthickness = 0
++  ythickness = 0
++  GtkButton::inner-border = {0, 0, 0, 0}
++}
++
+ # Vim puts an eventbox between the tab and the label and colours it,
+ # we need to handle that
+ widget "vim-main-window*GtkNotebook.GtkEventBox" style "vim_notebook"
+@@ -34,3 +46,14 @@
+ 
+ # Hack to be able to match widgets in LibreOffice
+ class "GtkWindow" style "toplevel_hack"
++
++# Inkscape toolbox buttons have cropped icons.
++# Use zero inner border and increased padding to avoid cropping
++widget "*.SPDesktopWidget.*.ToolToolbar.Tool*.SPButton" style "inkscape_toolbox_button"
++
++# Inkscape buttons in canvas corners have cropped icons.
++# use zero inner border and zero padding to avoid cropping
++widget "*.SPDesktopWidget.GtkVBox.GtkHBox.GtkTable.gtkmm__GtkHPaned.GtkTable.GtkVBox.StickyZoom" style "inkscape_canvas_button"
++widget "*.SPDesktopWidget.GtkVBox.GtkHBox.GtkTable.gtkmm__GtkHPaned.GtkTable.CMS_Adjust" style "inkscape_canvas_button"
++# Button to lock/unlock guides has no widget name
++widget "*.SPDesktopWidget.GtkVBox.GtkHBox.GtkTable.gtkmm__GtkHPaned.GtkTable.SPButton" style "inkscape_canvas_button"
 
=== modified file 'packaging/macosx/dmg_background.png'
 Binary files packaging/macosx/dmg_background.png	2014-11-08 03:30:57 +0000 and packaging/macosx/dmg_background.png	2017-02-24 00:27:32 +0000 differ
=== modified file 'packaging/macosx/dmg_background.svg'
--- packaging/macosx/dmg_background.svg	2014-11-08 03:30:57 +0000
+++ packaging/macosx/dmg_background.svg	2017-02-24 00:27:32 +0000
@@ -994,7 +994,7 @@
              sodipodi:role="line"
              id="tspan4806"
              x="459"
-             y="141.78999">Inkscape 0.91+devel</tspan></text>
+             y="141.78999">Inkscape 0.92</tspan></text>
         <path
            sodipodi:nodetypes="cccccccc"
            style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.8258427;fill:url(#linearGradient3762);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
@@ -1223,7 +1223,7 @@
          id="text4431"
          y="56.595001"
          x="113.27875"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:33.75px;line-height:125%;font-family:Calluna;-inkscape-font-specification:Calluna;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:125%;font-family:Calluna;-inkscape-font-specification:Calluna;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          xml:space="preserve"><tspan
            y="56.595001"
            x="113.27875"
@@ -1233,8 +1233,8 @@
          sodipodi:linespacing="125%"
          id="text4443"
          y="84.804001"
-         x="144.53799"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="134.53799"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:125%;font-family:EuphoriaScript;-inkscape-font-specification:EuphoriaScript;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          xml:space="preserve"><tspan
            y="84.804001"
            x="144.53799"
 
=== modified file 'packaging/macosx/osx-app.sh'
--- packaging/macosx/osx-app.sh	2017-02-22 17:57:56 +0000
+++ packaging/macosx/osx-app.sh	2017-02-24 00:27:32 +0000
@@ -286,20 +286,25 @@
 OSXMINORVER="$(cut -d. -f 1,2 <<< $OSXVERSION)"
 OSXMINORNO="$(cut -d. -f2 <<< $OSXVERSION)"
 OSXPOINTNO="$(cut -d. -f3 <<< $OSXVERSION)"
-ARCH="$(uname -a | awk '{print $NF;}')"
+HOSTARCH="$(uname -a | awk '{print $NF;}')"
 
-# guess default build_arch (MacPorts)
-if [ "$OSXMINORNO" -ge "6" ]; then
-	if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then
-		_build_arch="x86_64"
-	else
-		_build_arch="i386"
-	fi
+if [ "$ARCH" != "" ]; then
+	# explicit build_arch
+	_build_arch="$ARCH"
 else
-	if [ $ARCH = "powerpc" ]; then
-		_build_arch="ppc"
+	# guess default build_arch (MacPorts)
+	if [ "$OSXMINORNO" -ge "6" ]; then
+		if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then
+			_build_arch="x86_64"
+		else
+			_build_arch="i386"
+		fi
 	else
-		_build_arch="i386"
+		if [ $HOSTARCH = "powerpc" ]; then
+			_build_arch="ppc"
+		else
+			_build_arch="i386"
+		fi
 	fi
 fi
 
@@ -424,6 +429,7 @@
 if [ $_backend = "quartz" ]; then
 	/usr/libexec/PlistBuddy -x -c "Set :CGDisableCoalescedUpdates 1" "${package}/Contents/Info.plist"
 fi
+/usr/libexec/PlistBuddy -x -c "Set :LSMinimumSystemVersion $OSXMINORVER" "${package}/Contents/Info.plist"
 
 # Share files
 $rsync_cmd "$binary_dir/../share/$binary_name"/* "$pkgshare/$binary_name"
@@ -493,6 +499,9 @@
 		$cp_cmd -RL "$packages_path/uniconvertor" "$pkgpython"
 		# pySerial for HPGL plotting
 		$cp_cmd -RL "$packages_path/serial" "$pkgpython"
+		# scour and its dependency six
+		$cp_cmd -RL "$packages_path/scour" "$pkgpython"
+		$cp_cmd -RL "$packages_path/six.py" "$pkgpython"
 		# PyGTK (optional)
 		$cp_cmd -RL "$packages_path/cairo" "$pkgpython"
 		$cp_cmd -RL "$packages_path/glib" "$pkgpython"
@@ -856,6 +865,20 @@
 
 fi    
 
+# Patch files in app bundle
+#----------------------------------------------------------
+
+PATCH_FILE_DIR="app_patches"
+
+if [ -d "$PATCH_FILE_DIR" ]; then
+	echo "Applying patches in '$PATCH_FILE_DIR'"
+	for PATCH in ${PATCH_FILE_DIR}/*.patch; do
+		patch -d ${package} -p0 < $PATCH || {
+			echo "Patch failed!"
+			exit 1
+		}
+	done
+fi
 
 # All done.
 #----------------------------------------------------------
 
=== modified file 'packaging/macosx/osx-build.sh'
--- packaging/macosx/osx-build.sh	2017-02-22 17:57:56 +0000
+++ packaging/macosx/osx-build.sh	2017-02-24 00:27:32 +0000
@@ -10,11 +10,12 @@
 #	Jean-Olivier Irisson <[e-mail]>
 #	Liam P. White <[e-mail]>
 #	~suv <[e-mail]>
+#	Tim Sheridan <[e-mail]>
 # with information from
 #	Kees Cook
 #	Michael Wybrow
 #
-# Copyright (C) 2006-2014
+# Copyright (C) 2006-2017
 # Released under GNU GPL, read the file 'COPYING' for more information
 #
 
@@ -171,23 +172,28 @@
 OSXMINORVER="$(cut -d. -f 1,2 <<< $OSXVERSION)"
 OSXMINORNO="$(cut -d. -f2 <<< $OSXVERSION)"
 OSXPOINTNO="$(cut -d. -f3 <<< $OSXVERSION)"
-ARCH="$(uname -a | awk '{print $NF;}')"
+HOSTARCH="$(uname -a | awk '{print $NF;}')"
 
 # MacPorts for dependencies
 [[ -x $LIBPREFIX/bin/port && -d $LIBPREFIX/etc/macports ]] && export use_port="t"
 
-# guess default build_arch (MacPorts)
-if [ "$OSXMINORNO" -ge "6" ]; then
-	if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then
-		_build_arch="x86_64"
-	else
-		_build_arch="i386"
-	fi
+if [ "$ARCH" != "" ]; then
+	# explicit build_arch
+	_build_arch="$ARCH"
 else
-	if [ $ARCH = "powerpc" ]; then
-		_build_arch="ppc"
+	# guess default build_arch (MacPorts)
+	if [ "$OSXMINORNO" -ge "6" ]; then
+		if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then
+			_build_arch="x86_64"
+		else
+			_build_arch="i386"
+		fi
 	else
-		_build_arch="i386"
+		if [ $HOSTARCH = "powerpc" ]; then
+			_build_arch="ppc"
+		else
+			_build_arch="i386"
+		fi
 	fi
 fi
 
@@ -221,60 +227,89 @@
 	TARGETVERSION="10.5"
 	export CC="/usr/bin/gcc-4.2"
 	export CXX="/usr/bin/g++-4.2"
-	#export CLAGS="$CFLAGS -arch $_build_arch"
+	export CFLAGS="$CFLAGS -arch $_build_arch"
 	export CXXFLAGS="$CFLAGS"
 	CONFFLAGS="--disable-openmp $CONFFLAGS"
+	CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
 elif [ "$OSXMINORNO" -eq "6" ]; then
 	## Apple's LLVM-GCC 4.2.1 on Snow Leopard
 	TARGETNAME="SNOW LEOPARD"
 	TARGETVERSION="10.6"
 	export CC="/usr/bin/llvm-gcc-4.2"
 	export CXX="/usr/bin/llvm-g++-4.2"
-	#export CLAGS="$CFLAGS -arch $_build_arch"
+	export CFLAGS="$CFLAGS -arch $_build_arch"
 	export CXXFLAGS="$CFLAGS"
 	CONFFLAGS="--disable-openmp $CONFFLAGS"
+	CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
 elif [ "$OSXMINORNO" -eq "7" ]; then
 	## Apple's clang on Lion and later
 	TARGETNAME="LION"
 	TARGETVERSION="10.7"
 	export CC="/usr/bin/clang"
 	export CXX="/usr/bin/clang++"
-	#export CLAGS="$CFLAGS -arch $_build_arch"
+	export CFLAGS="$CFLAGS -arch $_build_arch"
 	export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align" #-stdlib=libstdc++ -std=c++11
+	CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
 elif [ "$OSXMINORNO" -eq "8" ]; then
 	## Apple's clang on Mountain Lion
 	TARGETNAME="MOUNTAIN LION"
 	TARGETVERSION="10.8"
 	export CC="/usr/bin/clang"
 	export CXX="/usr/bin/clang++"
-	#export CLAGS="$CFLAGS -arch $_build_arch"
+	export CFLAGS="$CFLAGS -arch $_build_arch"
 	export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libstdc++"
+	CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
 elif [ "$OSXMINORNO" -eq "9" ]; then
 	## Apple's clang on Mavericks
 	TARGETNAME="MAVERICKS"
 	TARGETVERSION="10.9"
 	export CC="/usr/bin/clang"
 	export CXX="/usr/bin/clang++"
-	#export CLAGS="$CFLAGS -arch $_build_arch"
-	export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
+	export CFLAGS="$CFLAGS -arch $_build_arch"
+	export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
+	CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
 elif [ "$OSXMINORNO" -eq "10" ]; then
 	## Apple's clang on Yosemite
 	TARGETNAME="YOSEMITE"
 	TARGETVERSION="10.10"
 	export CC="/usr/bin/clang"
 	export CXX="/usr/bin/clang++"
-	#export CLAGS="$CFLAGS -arch $_build_arch"
-	export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
-	echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION"
-	echo "      Inkscape packaging has not been tested on ${TARGETNAME}."
-else # if [ "$OSXMINORNO" -ge "11" ]; then
-	## Apple's clang after Yosemite?
+	export CFLAGS="$CFLAGS -arch $_build_arch"
+	export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
+	CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
+	echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION"
+	echo "      Inkscape packaging has not been tested on ${TARGETNAME}."
+elif [ "$OSXMINORNO" -eq "11" ]; then
+	## Apple's clang on El Capitan
+	TARGETNAME="EL_CAPITAN"
+	TARGETVERSION="10.11"
+	export CC="/usr/bin/clang"
+	export CXX="/usr/bin/clang++"
+	export CFLAGS="$CFLAGS -arch $_build_arch"
+	export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
+	CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
+	echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION"
+	echo "      Inkscape packaging has not been tested on ${TARGETNAME}."
+elif [ "$OSXMINORNO" -eq "12" ]; then
+	## Apple's clang on Sierra
+	TARGETNAME="SIERRA"
+	TARGETVERSION="10.12"
+	export CC="/usr/bin/clang"
+	export CXX="/usr/bin/clang++"
+	export CFLAGS="$CFLAGS -arch $_build_arch"
+	export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
+	CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
+	echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION"
+	echo "      Inkscape packaging has not been tested on ${TARGETNAME}."
+else # if [ "$OSXMINORNO" -ge "13" ]; then
+	## Apple's clang after Sierra?
 	TARGETNAME="UNKNOWN"
 	TARGETVERSION="10.XX"
 	export CC="/usr/bin/clang"
 	export CXX="/usr/bin/clang++"
-	#export CLAGS="$CFLAGS -arch $_build_arch"
-	export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
+	export CFLAGS="$CFLAGS -arch $_build_arch"
+	export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
+	CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
 	echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION"
 	echo "      Inkscape packaging has not been tested on this unknown version of OS X (${OSXVERSION})."
 fi
@@ -391,26 +426,21 @@
 	Libexif               $(checkversion libexif libexif)
 	JPEG                  $(checkversion jpeg jpeg)
 	Icu                   $(checkversion icu-uc icu)
-	LibWPD                $(checkversion libwpd-0.9 libwpd)
-	LibWPG                $(checkversion libwpg-0.2 libwpg)
-	Libcdr                $(checkversion libcdr-0.0 libcdr)
-	Libvisio              $(checkversion libvisio-0.0 libvisio)
+	LibRevenge            $(checkversion librevenge-0.0 librevenge)
+	LibWPD                $(checkversion libwpd-0.10 libwpd-0.10)
+	LibWPG                $(checkversion libwpg-0.3 libwpg-0.3)
+	Libcdr                $(checkversion libcdr-0.1 libcdr-0.1)
+	Libvisio              $(checkversion libvisio-0.1 libvisio-0.1)
 	Potrace               $(checkversion potrace potrace)
 Included python modules:
 	lxml                  $(checkversion py27-lxml py27-lxml)
 	numpy                 $(checkversion py27-numpy py27-numpy)
+	scour                 $(checkversion py27-scour py27-scour)
 	sk1libs               $(checkversion py27-sk1libs py27-sk1libs)
 	UniConvertor          $(checkversion py27-uniconvertor py27-uniconvertor)
 	Pillow                $(checkversion py27-Pillow py27-Pillow)
 " > $INFOFILE
 
-	## TODO: Pending merge adds support for:
-	#LibRevenge            $(checkversion librevenge-0.0 librevenge-devel)
-	#LibWPD                $(checkversion libwpd-0.10 libwpd-10.0)
-	#LibWPG                $(checkversion libwpg-0.3 libwpg-0.3)
-	#Libcdr                $(checkversion libcdr-0.1 libcdr-0.1)
-	#Libvisio              $(checkversion libvisio-0.1 libvisio-0.1)
-
 	## TODO: add support for gtk-mac-integration (see osxmenu branch)
 	#Gtk-mac-integration   $(checkversion gtk-mac-integration gtk-osx-application)
 
 
=== modified file 'packaging/macosx/osx-dmg.sh'
--- packaging/macosx/osx-dmg.sh	2014-08-19 22:04:43 +0000
+++ packaging/macosx/osx-dmg.sh	2017-02-24 00:27:32 +0000
@@ -22,6 +22,8 @@
 # Modify the 'dmg_background.svg' file and generate a new 
 # 'dmg_background.png' file.
 #
+# inkscape -z dmg_background.svg -i dmg_background -w 600 -h 400 -e dmg_background.png
+#
 # Update the AppleScript file 'dmg_set_style.scpt'.
 #
 # Run this script with the '-s' option.  It will apply the
 
=== modified file 'packaging/macosx/ports/devel/inkscape-packaging/Portfile'
--- packaging/macosx/ports/devel/inkscape-packaging/Portfile	2017-02-22 17:57:56 +0000
+++ packaging/macosx/ports/devel/inkscape-packaging/Portfile	2017-02-24 00:27:32 +0000
@@ -55,9 +55,7 @@
                             port:potrace
 
 # ports for Inkscape.app
-depends_build-append        port:gnome-icon-theme \
-                            port:gnome-icon-theme-symbolic \
-                            port:icon-naming-utils \
+depends_build-append        port:icon-naming-utils \
                             port:gnome-themes-standard \
                             port:gtk-engines2 \
                             port:gtk2-murrine
@@ -65,6 +63,7 @@
 # ports for python extensions
 depends_build-append        port:py27-lxml \
                             port:py27-numpy \
+                            port:py27-scour \
                             port:py27-Pillow \
                             port:py27-uniconvertor \
                             port:py27-serial \
@@ -74,6 +73,7 @@
     # ports for python extensions on Snow Leopard and Leopard
     depends_build-append    port:py26-lxml \
                             port:py26-numpy \
+                            port:py26-scour \
                             port:py26-Pillow \
                             port:py26-uniconvertor
 }
 
=== added directory 'packaging/macosx/ports/python/py-scour'
=== added file 'packaging/macosx/ports/python/py-scour/Portfile'
--- packaging/macosx/ports/python/py-scour/Portfile	1970-01-01 00:00:00 +0000
+++ packaging/macosx/ports/python/py-scour/Portfile	2017-02-24 00:27:32 +0000
@@ -0,0 +1,56 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim: fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+PortGroup           python 1.0
+PortGroup           select 1.0
+
+set realname        scour
+
+name                py-scour
+version             0.35
+revision            100
+categories-append   graphics
+license             Apache-2
+platforms           darwin
+supported_archs     noarch
+
+maintainers         nomaintainer
+
+description         Scour SVG Optimizer
+long_description    Scour is a SVG optimizer/sanitizer that can be used to \
+                    produce SVGs for Web deployment.
+
+homepage            http://pypi.python.org/pypi/${realname}/
+master_sites        pypi:s/${realname}/
+
+distname            scour-${version}
+
+checksums           rmd160  fcb8c54d89cf0b015f7f081e7d4640a85226c85a \
+                    sha256  7b33a0fc7ed578e7d1fcf4f68eb4c38cd080c243ea57537840062d37cd0d3c8e
+
+python.versions     27 34 35
+
+if {${name} ne ${subport}} {
+
+    depends_build-append    port:py${python.version}-setuptools
+
+    depends_lib-append      port:py${python.version}-six
+
+    depends_run-append      port:${realname}_select
+    
+    select.group            ${realname}
+    select.file             ${filespath}/${realname}${python.version}
+    notes "
+To make the Python ${python.branch} version of scour the one that is run\
+when you execute the commands without a version suffix, e.g. 'scour', run:
+
+port select --set ${select.group} [file tail ${select.file}]
+"
+
+    livecheck.type      none
+} else {
+    livecheck.type      regex
+    livecheck.url       https://pypi.python.org/pypi/${realname}/json
+    livecheck.regex     "${realname}-(\\d+(\\.\\d+)+)\\${extract.suffix}"
+}
 
=== added directory 'packaging/macosx/ports/python/py-scour/files'
=== added file 'packaging/macosx/ports/python/py-scour/files/scour26'
--- packaging/macosx/ports/python/py-scour/files/scour26	1970-01-01 00:00:00 +0000
+++ packaging/macosx/ports/python/py-scour/files/scour26	2017-02-24 00:27:32 +0000
@@ -0,0 +1,1 @@
+bin/scour-2.6
 
=== added file 'packaging/macosx/ports/python/py-scour/files/scour27'
--- packaging/macosx/ports/python/py-scour/files/scour27	1970-01-01 00:00:00 +0000
+++ packaging/macosx/ports/python/py-scour/files/scour27	2017-02-24 00:27:32 +0000
@@ -0,0 +1,1 @@
+bin/scour-2.7
 
=== added file 'packaging/macosx/ports/python/py-scour/files/scour34'
--- packaging/macosx/ports/python/py-scour/files/scour34	1970-01-01 00:00:00 +0000
+++ packaging/macosx/ports/python/py-scour/files/scour34	2017-02-24 00:27:32 +0000
@@ -0,0 +1,1 @@
+bin/scour-3.4
 
=== added file 'packaging/macosx/ports/python/py-scour/files/scour35'
--- packaging/macosx/ports/python/py-scour/files/scour35	1970-01-01 00:00:00 +0000
+++ packaging/macosx/ports/python/py-scour/files/scour35	2017-02-24 00:27:32 +0000
@@ -0,0 +1,1 @@
+bin/scour-3.5
 
=== modified file 'packaging/macosx/ports/python/py-sk1libs/Portfile'
--- packaging/macosx/ports/python/py-sk1libs/Portfile	2014-09-09 23:24:58 +0000
+++ packaging/macosx/ports/python/py-sk1libs/Portfile	2017-02-24 00:27:32 +0000
@@ -6,12 +6,12 @@
 
 name            py-sk1libs
 version         0.9.1
-revision        101
+revision        102
 license         LGPL-2
 maintainers     nomaintainer
 categories      python graphics
 platforms       darwin
-homepage        http://sk1project.org/
+homepage        http://sk1project.net/
 
 description     Set of python non-GUI extensions for sK1 Project
 
@@ -23,7 +23,7 @@
 distname        sk1libs-${version}
 # MacPorts does not properly support URLs with a get parameter.
 # Workaround for this bug: https://trac.macports.org/wiki/PortfileRecipes#fetchwithgetparams
-master_sites    http://sk1project.org/dc.php?target=${distfiles}&dummy=
+master_sites    http://sk1project.net/dc.php?target=${distfiles}&dummy=
 
 checksums       md5     e18088bbc8a105e7535a96f40b80f284 \
                 sha1    dd948558128bb6547b1f277087bf3066104912da \
 
=== modified file 'packaging/macosx/ports/python/py-uniconvertor/Portfile'
--- packaging/macosx/ports/python/py-uniconvertor/Portfile	2014-08-21 13:44:13 +0000
+++ packaging/macosx/ports/python/py-uniconvertor/Portfile	2017-02-24 00:27:32 +0000
@@ -6,12 +6,12 @@
 
 name            py-uniconvertor
 version         1.1.5
-revision        100
+revision        101
 license         LGPL-2 GPL-2
 maintainers     nomaintainer
 categories      python graphics 
 platforms       darwin
-homepage        http://sk1project.org/modules.php?name=Products&product=uniconvertor
+homepage        http://sk1project.net/modules.php?name=Products&product=uniconvertor
 
 description     universal vector graphics translator.
 
@@ -26,7 +26,7 @@
 distname        uniconvertor-${version}
 # MacPorts does not properly support URLs with a get parameter.
 # Workaround for this bug: https://trac.macports.org/wiki/PortfileRecipes#fetchwithgetparams
-master_sites    http://sk1project.org/dc.php?target=${distfiles}&dummy=
+master_sites    http://sk1project.net/dc.php?target=${distfiles}&dummy=
 
 checksums       md5     d1272315a58304ece2ff588834e23f72 \
                 sha1    51ec7c4487048c3357ed95cdb4ab3524018a2c9e \
@@ -42,5 +42,5 @@
 } 
 
 livecheck.type          regex
-livecheck.url           http://sk1project.org/modules.php?name=Products&product=uniconvertor&op=download
+livecheck.url           http://sk1project.net/modules.php?name=Products&product=uniconvertor&op=download
 livecheck.regex         "uniconvertor-(\\d+(?:\\.\\d+)*)${extract.suffix}"
 
=== added directory 'packaging/macosx/ports/python/scour_select'
=== added file 'packaging/macosx/ports/python/scour_select/Portfile'
--- packaging/macosx/ports/python/scour_select/Portfile	1970-01-01 00:00:00 +0000
+++ packaging/macosx/ports/python/scour_select/Portfile	2017-02-24 00:27:32 +0000
@@ -0,0 +1,35 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+PortGroup           select 1.0
+
+name                scour_select
+version             0.1
+revision            0
+categories          python
+license             BSD
+platforms           darwin
+supported_archs     noarch
+
+maintainers         nomaintainer
+
+description         common files for selecting default scour version
+long_description \
+   This port installs files that allow 'port select' to be used to \
+   create links to the preferred default version of scour.
+
+homepage            http://www.macports.org/
+
+distfiles
+
+use_configure       no
+
+build               {}
+
+destroot {
+    select::install scour ${filespath}/base
+    select::install scour ${filespath}/none
+}
+
+livecheck.type      none
 
=== added directory 'packaging/macosx/ports/python/scour_select/files'
=== added file 'packaging/macosx/ports/python/scour_select/files/base'
--- packaging/macosx/ports/python/scour_select/files/base	1970-01-01 00:00:00 +0000
+++ packaging/macosx/ports/python/scour_select/files/base	2017-02-24 00:27:32 +0000
@@ -0,0 +1,1 @@
+bin/scour
 
=== added file 'packaging/macosx/ports/python/scour_select/files/none'
--- packaging/macosx/ports/python/scour_select/files/none	1970-01-01 00:00:00 +0000
+++ packaging/macosx/ports/python/scour_select/files/none	2017-02-24 00:27:32 +0000
@@ -0,0 +1,1 @@
+-
 
=== added directory 'packaging/macosx/ports/textproc'
=== added directory 'packaging/macosx/ports/textproc/help2man'
=== added file 'packaging/macosx/ports/textproc/help2man/Portfile'
--- packaging/macosx/ports/textproc/help2man/Portfile	1970-01-01 00:00:00 +0000
+++ packaging/macosx/ports/textproc/help2man/Portfile	2017-02-24 00:27:32 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id: $
+
+PortSystem                  1.0
+
+name                        help2man
+version                     1.0
+revision                    1
+ 
+categories                  textproc
+platforms                   darwin
+license                     GPL-2
+supported_archs             noarch
+ 
+maintainers                 nomaintainer
+
+description                 Satisfy help2man dependency
+long_description            ${description}
+ 
+homepage                    http://inkscape.org
+
+# this is a metaport - no fetch, configure and build phases
+master_sites
+distfiles
+use_configure no
+build {}
+destroot {
+    # Create a dummy file so the port can be successfully activated
+    xinstall -d ${destroot}${prefix}/share/doc/${name}
+    set docfile [open ${destroot}${prefix}/share/doc/${name}/README.txt "w"]
+    puts $docfile "Dummy help2man package installation.\n"
+    close $docfile
+}
+
+# variants
+universal_variant           no
+
+# livecheck
+livecheck.type              none
 
=== modified file 'src/menus-skeleton.h'
--- src/menus-skeleton.h	2016-04-15 14:39:49 +0000
+++ src/menus-skeleton.h	2017-02-24 00:27:32 +0000
@@ -27,8 +27,10 @@
 "       <separator/>\n"
 "       <verb verb-id=\"FileImport\" />\n"
 "       <verb verb-id=\"DialogExport\" />\n"
+#if !defined(ENABLE_OSX_APP_LOCATIONS)
 "       <verb verb-id=\"FileImportFromOCAL\" />\n"
 //"       <verb verb-id=\"FileExportToOCAL\" />\n"
+#endif
 "       <separator/>\n"
 "       <verb verb-id=\"FilePrint\" />\n"
 "       <separator/>\n"