Fix build on SunOS.

15 files changed, 141 insertions, 8 deletions

diff --git a/cad/geda/distinfo b/cad/geda/distinfo
index 355a607cda2..9a0abec2181 100644
--- a/cad/geda/distinfo
+++ b/cad/geda/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.16 2011/05/11 11:20:23 dmcmahill Exp $
+$NetBSD: distinfo,v 1.17 2012/02/16 11:29:59 hans Exp $
 
 SHA1 (geda-gaf-1.6.2.tar.gz) = 87c21b3b77eebc8eec1c16672d4b1ab418ccb80d
 RMD160 (geda-gaf-1.6.2.tar.gz) = 4e32ba11188b9a2849036299b972c35481cb975e
 Size (geda-gaf-1.6.2.tar.gz) = 7099981 bytes
+SHA1 (patch-build-tools_icon-theme-installer) = 368e18f2ef5a1530bcbaa33afd66c2306e409cbc
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..8877a13702a
--- /dev/null
+++ b/cad/geda/patches/patch-build-tools_icon-theme-installer
@@ -0,0 +1,12 @@
+$NetBSD: patch-build-tools_icon-theme-installer,v 1.1 2012/02/16 11:29:59 hans Exp $
+
+--- build-tools/icon-theme-installer.orig	2009-12-25 18:18:18.329539169 +0100
++++ build-tools/icon-theme-installer	2009-12-25 19:01:51.837047302 +0100
+@@ -121,7 +121,6 @@ for icon in $@; do
+ 	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=`basename $install_name`
+ 
+ 	if test -z $size; then 
diff --git a/cad/gerbv/distinfo b/cad/gerbv/distinfo
index b041361c2cf..02fa8a0ec26 100644
--- a/cad/gerbv/distinfo
+++ b/cad/gerbv/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.23 2011/05/10 06:20:58 dmcmahill Exp $
+$NetBSD: distinfo,v 1.24 2012/02/16 11:33:12 hans Exp $
 
 SHA1 (gerbv-2.5.0.tar.gz) = 9a622059a83917834a1ac75551428f400b2cb2ff
 RMD160 (gerbv-2.5.0.tar.gz) = 0c725cd0ee4288014117413c554315fa9b17ae7f
 Size (gerbv-2.5.0.tar.gz) = 2295221 bytes
+SHA1 (patch-icon-theme-installer) = b3b183f2ab77c56e52d4cd96058a28bc7e2832bb
diff --git a/cad/gerbv/patches/patch-icon-theme-installer b/cad/gerbv/patches/patch-icon-theme-installer
new file mode 100644
index 00000000000..93e51465cec
--- /dev/null
+++ b/cad/gerbv/patches/patch-icon-theme-installer
@@ -0,0 +1,12 @@
+$NetBSD: patch-icon-theme-installer,v 1.1 2012/02/16 11:33:12 hans Exp $
+
+--- icon-theme-installer.orig	2009-12-25 18:18:18.329539169 +0100
++++ icon-theme-installer	2009-12-25 19:01:51.837047302 +0100
+@@ -121,7 +121,6 @@ for icon in $@; do
+ 	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=`basename $install_name`
+ 
+ 	if test -z $size; then 
diff --git a/cad/gnucap/distinfo b/cad/gnucap/distinfo
index ad47cd36bb1..ea311cec3bc 100644
--- a/cad/gnucap/distinfo
+++ b/cad/gnucap/distinfo
@@ -1,7 +1,14 @@
-$NetBSD: distinfo,v 1.11 2009/10/06 00:54:19 dmcmahill Exp $
+$NetBSD: distinfo,v 1.12 2012/02/16 11:37:27 hans Exp $
 
 SHA1 (gnucap-2006-07-08.tar.gz) = dafdfa1f78ee37b247066ccac7a2e63f99a7d8f0
 RMD160 (gnucap-2006-07-08.tar.gz) = 8006dffd189095b81dbf7358caacea870bc054df
 Size (gnucap-2006-07-08.tar.gz) = 1546670 bytes
 SHA1 (patch-aa) = 60e6484c852adfba3b0bd11a9a5c691e4d228bd7
 SHA1 (patch-ab) = cdb1825722b18784ca54ae0c39183ff0790dc6d9
+SHA1 (patch-modelgen_ap.h) = 323081e63db5148da5706ea8a9470f2c8769467f
+SHA1 (patch-modelgen_io__.h) = 56aa956aa1e49889fea1ad59c2615e7c34f87b4c
+SHA1 (patch-src_ap.h) = a11af959b3e7637a5e49df1c2fc2672ded4dc5df
+SHA1 (patch-src_c__comand.h) = c00405e8f81398ab1bbaea171ee51f5cbcfe5328
+SHA1 (patch-src_declare.h) = a8cea1d2a6866b12a3aa0d91a5f86b14ca7030fa
+SHA1 (patch-src_io__.h) = 06120be26f562dae4ffd57ae784ed15dc298b93a
+SHA1 (patch-src_u__opt.h) = 628878fea102c6b95cbcc2f3ffcf9d9e8b071299
diff --git a/cad/gnucap/patches/patch-modelgen_ap.h b/cad/gnucap/patches/patch-modelgen_ap.h
new file mode 100644
index 00000000000..77de470c608
--- /dev/null
+++ b/cad/gnucap/patches/patch-modelgen_ap.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-modelgen_ap.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- modelgen/ap.h.orig	2006-07-07 08:54:24.000000000 +0200
++++ modelgen/ap.h	2009-12-26 00:34:19.571364769 +0100
+@@ -39,6 +39,8 @@ const bool ONE_OF = false;
+ 
+ class CS_FILE {};
+ 
++#undef CS
++
+ class CS {
+ private:
+   char* _name;
diff --git a/cad/gnucap/patches/patch-modelgen_io__.h b/cad/gnucap/patches/patch-modelgen_io__.h
new file mode 100644
index 00000000000..9abdc6d45fe
--- /dev/null
+++ b/cad/gnucap/patches/patch-modelgen_io__.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-modelgen_io__.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- modelgen/io_.h.orig	2006-07-07 08:54:23.000000000 +0200
++++ modelgen/io_.h	2009-12-26 00:41:01.207595711 +0100
+@@ -25,6 +25,7 @@
+ #ifndef IO_H
+ #define IO_H
+ #include "l_lib.h"
++#undef CS
+ /*--------------------------------------------------------------------------*/
+ class CS;
+ const int MAXHANDLE = CHAR_BIT*sizeof(int)-1;
diff --git a/cad/gnucap/patches/patch-src_ap.h b/cad/gnucap/patches/patch-src_ap.h
new file mode 100644
index 00000000000..796ca5a177a
--- /dev/null
+++ b/cad/gnucap/patches/patch-src_ap.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_ap.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- src/ap.h.orig	2006-07-07 08:54:24.000000000 +0200
++++ src/ap.h	2009-12-26 00:34:39.235405370 +0100
+@@ -39,6 +39,8 @@ const bool ONE_OF = false;
+ 
+ class CS_FILE {};
+ 
++#undef CS
++
+ class CS {
+ private:
+   char* _name;
diff --git a/cad/gnucap/patches/patch-src_c__comand.h b/cad/gnucap/patches/patch-src_c__comand.h
new file mode 100644
index 00000000000..c6efa405bf0
--- /dev/null
+++ b/cad/gnucap/patches/patch-src_c__comand.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_c__comand.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- src/c_comand.h.orig	2006-07-07 08:54:25.000000000 +0200
++++ src/c_comand.h	2009-12-26 00:47:55.258943358 +0100
+@@ -24,6 +24,7 @@
+ #ifndef C_COMAND_H
+ #define C_COMAND_H
+ #include "md.h"
++#undef CS
+ /*--------------------------------------------------------------------------*/
+ class CS;
+ /*--------------------------------------------------------------------------*/
diff --git a/cad/gnucap/patches/patch-src_declare.h b/cad/gnucap/patches/patch-src_declare.h
new file mode 100644
index 00000000000..755e9765f37
--- /dev/null
+++ b/cad/gnucap/patches/patch-src_declare.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_declare.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- src/declare.h.orig	2006-07-07 08:54:24.000000000 +0200
++++ src/declare.h	2009-12-26 00:46:20.874454893 +0100
+@@ -25,6 +25,7 @@
+ #ifndef DECLARE_H
+ #define DECLARE_H
+ #include "md.h"
++#undef CS
+ /*--------------------------------------------------------------------------*/
+ class CS;
+ class CARD;
diff --git a/cad/gnucap/patches/patch-src_io__.h b/cad/gnucap/patches/patch-src_io__.h
new file mode 100644
index 00000000000..db7a0642cae
--- /dev/null
+++ b/cad/gnucap/patches/patch-src_io__.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_io__.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- src/io_.h.orig	2006-07-07 08:54:23.000000000 +0200
++++ src/io_.h	2009-12-26 00:41:47.984732101 +0100
+@@ -25,6 +25,7 @@
+ #ifndef IO_H
+ #define IO_H
+ #include "l_lib.h"
++#undef CS
+ /*--------------------------------------------------------------------------*/
+ class CS;
+ const int MAXHANDLE = CHAR_BIT*sizeof(int)-1;
diff --git a/cad/gnucap/patches/patch-src_u__opt.h b/cad/gnucap/patches/patch-src_u__opt.h
new file mode 100644
index 00000000000..9b7f825a529
--- /dev/null
+++ b/cad/gnucap/patches/patch-src_u__opt.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_u__opt.h,v 1.1 2012/02/16 11:37:27 hans Exp $
+
+--- src/u_opt.h.orig	2006-07-07 08:54:24.000000000 +0200
++++ src/u_opt.h	2009-12-26 00:42:53.851327432 +0100
+@@ -24,6 +24,7 @@
+ #ifndef U_OPT_H
+ #define U_OPT_H
+ #include "mode.h"
++#undef CS
+ /*--------------------------------------------------------------------------*/
+ class CS;
+ /*--------------------------------------------------------------------------*/
diff --git a/cad/gplcver/Makefile b/cad/gplcver/Makefile
index ca49b9e5427..85c9882cbd4 100644
--- a/cad/gplcver/Makefile
+++ b/cad/gplcver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/06/09 11:50:17 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2012/02/16 11:39:39 hans Exp $
 #
 
 DISTNAME=		gplcver-2.12a.src
@@ -20,6 +20,11 @@ BUILDLINK_LIBS.dl=	${BUILDLINK_LDADD.dl}
 
 INSTALLATION_DIRS=	bin lib/gplcver/pli_incs
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "SunOS"
+BUILDLINK_TRANSFORM+=	rm:-export-dynamic
+.endif
+
 .include "../../mk/dlopen.buildlink3.mk"
 
 do-install:
diff --git a/cad/gplcver/distinfo b/cad/gplcver/distinfo
index 59e4684745f..5ea7e05559a 100644
--- a/cad/gplcver/distinfo
+++ b/cad/gplcver/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2011/06/09 11:50:17 drochner Exp $
+$NetBSD: distinfo,v 1.5 2012/02/16 11:39:39 hans Exp $
 
 SHA1 (gplcver-2.12a.src.tar.bz2) = 946bb35b6279646c6e10c309922ed17deb2aca8a
 RMD160 (gplcver-2.12a.src.tar.bz2) = 5af004b345142ac5400c9defc7125bbe127d2c49
 Size (gplcver-2.12a.src.tar.bz2) = 1224470 bytes
-SHA1 (patch-aa) = a1692ebb9fde64ec4573ff65b880b1c809e53d66
+SHA1 (patch-aa) = 82607a701e10ac2cf91860bbe9189b78eb4b0dcc
 SHA1 (patch-ab) = b8d44b8fed5dc8d3379d990160fa453713163e2e
 SHA1 (patch-ac) = f11db370a331a9a9c18ba57b056c814971d9dbfd
 SHA1 (patch-ad) = bfd2061aff3a7b86dce2648a489a0c3035573271
diff --git a/cad/gplcver/patches/patch-aa b/cad/gplcver/patches/patch-aa
index 6d3e002e9ef..eea2b854f1c 100644
--- a/cad/gplcver/patches/patch-aa
+++ b/cad/gplcver/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2006/02/16 19:41:04 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2012/02/16 11:39:39 hans Exp $
 
 --- src/v.h.orig	2006-02-10 12:25:44.000000000 +0100
 +++ src/v.h
-@@ -102,7 +102,7 @@ typedef int32 sighandler();
+@@ -95,7 +95,7 @@ typedef int32 i_tev_ndx;
+ /* needed to allow signals to use normal decls */
+ typedef int32 sighandler();
+ 
+-#ifndef __sparc
++#ifndef __sun
+ /* BEWARE - assuming all non sparc systems define BYTE_ORDER and endian.h */
+ /* to PORT change for your system */ 
+ # ifdef __APPLE__
+@@ -104,7 +104,7 @@ typedef int32 sighandler();
  #  ifdef __CYGWIN32__
  #   include <sys/param.h>
  #  else