The icon-theme-installer tool makes use of a GNU sed extension, and so

behaves incorrectly on many platforms (E.g. NetBSD)

https://bugs.launchpad.net/geda/+bug/1319785

Fixes build on Linux, corrects icon file names on NetBSD and others.

Bump PKGREVISION.

Discussed with dmcmahill@ - but as we're both right-thinking people that
understand that desktop icons are for pussies, strictly speaking this
has been build-tested and brain-tested only.

4 files changed, 40 insertions, 21 deletions

diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index bad491720e7..af292616c68 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2014/05/05 00:47:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.97 2014/05/15 21:40:11 dsainty Exp $
 
 DISTNAME=	geda-gaf-1.8.2
 PKGNAME=	${DISTNAME:S/-gaf-/-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/
 
diff --git a/cad/geda/PLIST b/cad/geda/PLIST
index 258dc10b12e..a18971c1d81 100644
--- a/cad/geda/PLIST
+++ b/cad/geda/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2014/03/13 10:35:03 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.19 2014/05/15 21:40:11 dsainty Exp $
 bin/convert_sym
 bin/garchive
 bin/gattrib
@@ -2237,23 +2237,23 @@ share/gEDA/system-gnetlistrc
 share/gEDA/system-gschemrc
 share/gEDA/system-gschlasrc
 share/gEDA/system-gsymcheckrc
-share/icons/hicolor/16x16/mimetypes/application-x-geda-gsch2pcb-project-16.png
-share/icons/hicolor/16x16/mimetypes/application-x-geda-schematic-16.png
-share/icons/hicolor/16x16/mimetypes/application-x-geda-symbol-16.png
-share/icons/hicolor/22x22/mimetypes/application-x-geda-gsch2pcb-project-22.png
-share/icons/hicolor/22x22/mimetypes/application-x-geda-schematic-22.png
-share/icons/hicolor/22x22/mimetypes/application-x-geda-symbol-22.png
-share/icons/hicolor/24x24/mimetypes/application-x-geda-gsch2pcb-project-24.png
-share/icons/hicolor/24x24/mimetypes/application-x-geda-schematic-24.png
-share/icons/hicolor/24x24/mimetypes/application-x-geda-symbol-24.png
-share/icons/hicolor/32x32/mimetypes/application-x-geda-gsch2pcb-project-32.png
-share/icons/hicolor/32x32/mimetypes/application-x-geda-schematic-32.png
-share/icons/hicolor/32x32/mimetypes/application-x-geda-symbol-32.png
-share/icons/hicolor/48x48/apps/geda-gattrib-48.png
-share/icons/hicolor/48x48/apps/geda-gschem-48.png
-share/icons/hicolor/48x48/mimetypes/application-x-geda-gsch2pcb-project-48.png
-share/icons/hicolor/48x48/mimetypes/application-x-geda-schematic-48.png
-share/icons/hicolor/48x48/mimetypes/application-x-geda-symbol-48.png
+share/icons/hicolor/16x16/mimetypes/application-x-geda-gsch2pcb-project.png
+share/icons/hicolor/16x16/mimetypes/application-x-geda-schematic.png
+share/icons/hicolor/16x16/mimetypes/application-x-geda-symbol.png
+share/icons/hicolor/22x22/mimetypes/application-x-geda-gsch2pcb-project.png
+share/icons/hicolor/22x22/mimetypes/application-x-geda-schematic.png
+share/icons/hicolor/22x22/mimetypes/application-x-geda-symbol.png
+share/icons/hicolor/24x24/mimetypes/application-x-geda-gsch2pcb-project.png
+share/icons/hicolor/24x24/mimetypes/application-x-geda-schematic.png
+share/icons/hicolor/24x24/mimetypes/application-x-geda-symbol.png
+share/icons/hicolor/32x32/mimetypes/application-x-geda-gsch2pcb-project.png
+share/icons/hicolor/32x32/mimetypes/application-x-geda-schematic.png
+share/icons/hicolor/32x32/mimetypes/application-x-geda-symbol.png
+share/icons/hicolor/48x48/apps/geda-gattrib.png
+share/icons/hicolor/48x48/apps/geda-gschem.png
+share/icons/hicolor/48x48/mimetypes/application-x-geda-gsch2pcb-project.png
+share/icons/hicolor/48x48/mimetypes/application-x-geda-schematic.png
+share/icons/hicolor/48x48/mimetypes/application-x-geda-symbol.png
 share/icons/hicolor/scalable/apps/geda-gattrib.svg
 share/icons/hicolor/scalable/apps/geda-gschem.svg
 share/icons/hicolor/scalable/mimetypes/application-x-geda-gsch2pcb-project.svg
diff --git a/cad/geda/distinfo b/cad/geda/distinfo
index ee817f5eafa..7559372aee5 100644
--- a/cad/geda/distinfo
+++ b/cad/geda/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.19 2014/03/13 10:35:03 dmcmahill Exp $
+$NetBSD: distinfo,v 1.20 2014/05/15 21:40:11 dsainty Exp $
 
 SHA1 (geda-gaf-1.8.2.tar.gz) = c61edc04997fc12398534a346dac32d8fcdabcc1
 RMD160 (geda-gaf-1.8.2.tar.gz) = 20100684c2987e563886d15bb608b7f464e30a69
 Size (geda-gaf-1.8.2.tar.gz) = 11282353 bytes
+SHA1 (patch-build-tools_icon-theme-installer) = 9bbc1129bf7de3d2534219471014c19389c073b5
diff --git a/cad/geda/patches/patch-build-tools_icon-theme-installer b/cad/geda/patches/patch-build-tools_icon-theme-installer
new file mode 100644
index 00000000000..a5375ad7348
--- /dev/null
+++ b/cad/geda/patches/patch-build-tools_icon-theme-installer
@@ -0,0 +1,18 @@
+$NetBSD: patch-build-tools_icon-theme-installer,v 1.3 2014/05/15 21:40:11 dsainty Exp $
+
+The icon-theme-installer tool makes use of a GNU sed extension, and so
+behaves incorrectly on many platforms (E.g. NetBSD)
+
+https://bugs.launchpad.net/geda/+bug/1319785
+
+--- build-tools/icon-theme-installer.orig	2012-12-18 00:04:20.000000000 +1300
++++ build-tools/icon-theme-installer	2014-05-15 23:14:31.969393769 +1200
+@@ -121,7 +121,7 @@
+ 	size=`echo $icon | sed -n 's/.*-\([0-9]*\).*/\1/p'`
+ 	category=`echo $icon | cut -d, -f1`
+ 	build_name=`echo $icon | cut -d, -f2`
+-	install_name=`echo $build_name | sed 's/-[0-9]\+//g'`
++	install_name=`echo $build_name | sed 's/-[0-9][0-9]*//g'`
+ 	install_name=`basename $install_name`
+ 
+ 	if test -z $size; then