Do not build the message catalogs by default for the various wcalc

packages, but only in libwalc. They have been silently reinstalled
over and over again. Mark *wcalc* as DESTDIR ready.

11 files changed, 42 insertions, 10 deletions

diff --git a/cad/cgi-wcalc/Makefile b/cad/cgi-wcalc/Makefile
index 04a9d42fd97..48f21bf0b38 100644
--- a/cad/cgi-wcalc/Makefile
+++ b/cad/cgi-wcalc/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:20 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/28 01:11:27 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../cad/wcalc/Makefile.common"
 PKGNAME=	cgi-${DISTNAME}
 PKGREVISION=	1
diff --git a/cad/gtk1-wcalc/Makefile b/cad/gtk1-wcalc/Makefile
index a509ed09d09..d5fe134bec0 100644
--- a/cad/gtk1-wcalc/Makefile
+++ b/cad/gtk1-wcalc/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/02/22 19:01:15 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/28 01:11:27 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../cad/wcalc/Makefile.common"
 PKGNAME=	gtk1-${DISTNAME}
 PKGREVISION=	1
diff --git a/cad/gtk2-wcalc/Makefile b/cad/gtk2-wcalc/Makefile
index 615f9bb1a4e..c734785a71c 100644
--- a/cad/gtk2-wcalc/Makefile
+++ b/cad/gtk2-wcalc/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:57:14 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/01/28 01:11:27 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../cad/wcalc/Makefile.common"
 PKGNAME=	gtk2-${DISTNAME}
 PKGREVISION=	4
diff --git a/cad/libwcalc/Makefile b/cad/libwcalc/Makefile
index ff4db9614bc..93cc8e41d16 100644
--- a/cad/libwcalc/Makefile
+++ b/cad/libwcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/07/14 12:55:59 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/28 01:11:27 joerg Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -25,6 +25,8 @@ USE_PKGLOCALEDIR=	yes
 
 PKGCONFIG_OVERRIDE=	libwcalc/wcalc.pc.in
 
+BUILD_DIRS=		${WRKSRC} ${WRKSRC}/po
+
 pre-build:
 	${MV} ${WRKSRC}/libwcalc/wcalc-config ${WRKSRC}/libwcalc/wcalc-config.bak
 	${SED} 's;^RPATH.*;RPATH_FLAG="${COMPILER_RPATH_FLAG}";g' ${WRKSRC}/libwcalc/wcalc-config.bak > \
diff --git a/cad/mex-wcalc/Makefile b/cad/mex-wcalc/Makefile
index dd28a48e347..2132e04693f 100644
--- a/cad/mex-wcalc/Makefile
+++ b/cad/mex-wcalc/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/10/01 13:52:17 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/28 01:11:27 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../cad/wcalc/Makefile.common"
 PKGNAME=	mex-${DISTNAME}
 PKGREVISION=	1
diff --git a/cad/oct-wcalc/Makefile b/cad/oct-wcalc/Makefile
index c27bcd808ba..f4f1e7689b9 100644
--- a/cad/oct-wcalc/Makefile
+++ b/cad/oct-wcalc/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/12/03 13:06:52 asau Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/28 01:11:27 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../cad/wcalc/Makefile.common"
 PKGNAME=	oct-${DISTNAME}
 PKGREVISION=	4
diff --git a/cad/sci-wcalc/Makefile b/cad/sci-wcalc/Makefile
index 5556b6985c3..2c6ee9fa376 100644
--- a/cad/sci-wcalc/Makefile
+++ b/cad/sci-wcalc/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:22 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/01/28 01:11:28 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../cad/wcalc/Makefile.common"
 PKGNAME=	sci-${DISTNAME}
 PKGREVISION=	2
diff --git a/cad/stdio-wcalc/Makefile b/cad/stdio-wcalc/Makefile
index 2b57e7d4d26..5c5ba573e95 100644
--- a/cad/stdio-wcalc/Makefile
+++ b/cad/stdio-wcalc/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:22 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/28 01:11:28 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../cad/wcalc/Makefile.common"
 PKGNAME=	stdio-${DISTNAME}
 PKGREVISION=	1
diff --git a/cad/wcalc-docs/Makefile b/cad/wcalc-docs/Makefile
index 606588ef940..a88b44704d5 100644
--- a/cad/wcalc-docs/Makefile
+++ b/cad/wcalc-docs/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:23 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/28 01:11:28 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../cad/wcalc/Makefile.common"
 PKGNAME=	${DISTNAME:S/wcalc/wcalc-docs/}
 PKGREVISION=	1
diff --git a/cad/wcalc/distinfo b/cad/wcalc/distinfo
index 3895782cfba..8697b916382 100644
--- a/cad/wcalc/distinfo
+++ b/cad/wcalc/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2006/01/08 06:31:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2010/01/28 01:11:28 joerg Exp $
 
 SHA1 (wcalc-1.0.tar.gz) = 733a1786d2549ebb3265170c0d317c4ccf650427
 RMD160 (wcalc-1.0.tar.gz) = a6db2fb8ca84cdc6ec2bed8d8dfc77439dcb89bf
 Size (wcalc-1.0.tar.gz) = 1363727 bytes
+SHA1 (patch-aa) = b604b7161f6f490a6be9324c05ec65d23f1a6d3a
diff --git a/cad/wcalc/patches/patch-aa b/cad/wcalc/patches/patch-aa
new file mode 100644
index 00000000000..40a211b2eae
--- /dev/null
+++ b/cad/wcalc/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2010/01/28 01:11:28 joerg Exp $
+
+--- Makefile.in.orig	2010-01-28 00:51:47.000000000 +0000
++++ Makefile.in
+@@ -287,7 +287,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = m4 include intl po @LIB_WCALC@ @PIXMAPS@ @STDIO_WCALC@ \
++SUBDIRS = m4 include intl @LIB_WCALC@ @PIXMAPS@ @STDIO_WCALC@ \
+ 		@GTK_WCALC@ @CGI_WCALC@ \
+ 		@OCT_WCALC@ @SCI_WCALC@ @MEX_WCALC@ @HTDOCS@ utils doc win32
+