5 files changed, 34 insertions, 21 deletions
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index 53db62ec8f5..1b84386be06 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2007/02/23 13:51:05 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.43 2007/05/31 12:48:32 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gschem-${PKGVERSION}
 PKGNAME=		gschem-${PKGVERSION}
-PKGREVISION=		1
 CATEGORIES=		cad
 
 MAINTAINER=		dmcmahill@NetBSD.org
@@ -18,6 +17,10 @@ CONFLICTS+=		gEDA<19991011
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		pkg-config
+# otherwise the gettext stuff in here tries to do
+# /bin/sh /usr/bin/install -d /some/directory
+# but of course /usr/bin/install is a binary.
+MAKE_FLAGS+=		install_sh=${WRKSRC}/install-sh
 USE_PKGLOCALEDIR=	YES
 
 .include "../../cad/libgeda/buildlink3.mk"
diff --git a/cad/gschem/PLIST b/cad/gschem/PLIST
index bf714b6757d..6854b612cfd 100644
--- a/cad/gschem/PLIST
+++ b/cad/gschem/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.19 2007/02/23 13:51:05 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.20 2007/05/31 12:48:32 dmcmahill Exp $
 bin/gschem
+bin/gschemdoc
 man/man1/gschem.1
 share/gEDA/bitmap/gschem-alignment_bottomcenter.png
 share/gEDA/bitmap/gschem-alignment_bottomleft.png
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index 46bb4da0ab7..e6f1f0dbaa4 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.24 2007/02/21 13:23:53 dmcmahill Exp $
+$NetBSD: distinfo,v 1.25 2007/05/31 12:48:32 dmcmahill Exp $
 
-SHA1 (geda/geda-gschem-20070216.tar.gz) = 7aaa669f8e25f89f99259f0bfb39efee2f932a86
-RMD160 (geda/geda-gschem-20070216.tar.gz) = 76924c6970784a02d54ed47c5a72bd0325805dba
-Size (geda/geda-gschem-20070216.tar.gz) = 1053241 bytes
-SHA1 (patch-aa) = 6e1f3926d3f9019ed7032575bd81faeefe2b3d2e
+SHA1 (geda/geda-gschem-20070526.tar.gz) = 48fb4acfc628bb64fdc8c1c047671b31c3fd7778
+RMD160 (geda/geda-gschem-20070526.tar.gz) = 76eb9285c8ff4e6f5ee0edb05d8ccd618e6dbaff
+Size (geda/geda-gschem-20070526.tar.gz) = 1100946 bytes
+SHA1 (patch-aa) = 749ad5d273b3ef4da318d63171c4ec50214d72ea
+SHA1 (patch-ab) = 338c3ceaafb9fb15ea669bd6442a40899e040854
diff --git a/cad/gschem/patches/patch-aa b/cad/gschem/patches/patch-aa
index c5f71b87f02..12bf2fd2e1a 100644
--- a/cad/gschem/patches/patch-aa
+++ b/cad/gschem/patches/patch-aa
@@ -1,14 +1,11 @@
-$NetBSD: patch-aa,v 1.15 2007/02/21 13:25:00 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.16 2007/05/31 12:48:32 dmcmahill Exp $
 
---- src/gschem.c.orig	2006-10-19 03:25:33.000000000 +0000
-+++ src/gschem.c
-@@ -36,9 +36,7 @@
- #include <dmalloc.h>
- #endif
- 
--#ifdef HAVE_LOCALE_H
- #include <locale.h>
--#endif
- 
- #ifdef HAS_LIBSTROKE
- /* libstroke prototype */
+--- configure.ac.orig	2007-05-26 14:46:25.000000000 +0000
++++ configure.ac	2007-05-29 16:23:31.000000000 +0000
+@@ -400,5 +400,5 @@
+                 [AC_DEFINE([HAVE_LOCALE_H], 1, [Define if you have locale.h])],
+                 [
+-                  if test "$USE_NLS" == "yes"; then
++                  if test "$USE_NLS" = "yes"; then
+                     AC_MSG_ERROR([Cannot find useful locale.h, and nls support is enabled. Try compiling with --disable-nls])
+                   fi
diff --git a/cad/gschem/patches/patch-ab b/cad/gschem/patches/patch-ab
new file mode 100644
index 00000000000..4610fb8dbfd
--- /dev/null
+++ b/cad/gschem/patches/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.10 2007/05/31 12:48:33 dmcmahill Exp $
+
+--- configure.orig	2007-05-26 14:46:42.000000000 +0000
++++ configure	2007-05-29 16:23:44.000000000 +0000
+@@ -7515,5 +7515,5 @@
+ else
+ 
+-                  if test "$USE_NLS" == "yes"; then
++                  if test "$USE_NLS" = "yes"; then
+                     { { echo "$as_me:$LINENO: error: Cannot find useful locale.h, and nls support is enabled. Try compiling with --disable-nls" >&5
+ echo "$as_me: error: Cannot find useful locale.h, and nls support is enabled. Try compiling with --disable-nls" >&2;}