Convert to bl3 and make build with gcc3.

5 files changed, 48 insertions, 10 deletions

diff --git a/textproc/stardic/Makefile b/textproc/stardic/Makefile
index 4792a61abfe..4813817cf07 100644
--- a/textproc/stardic/Makefile
+++ b/textproc/stardic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/11/10 13:23:05 gavan Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/03 23:00:20 wiz Exp $
 
 DISTNAME=	dic
 PKGNAME=	stardic-1.31
@@ -10,17 +10,18 @@ COMMENT=	English-Chinese dictionary
 
 DIST_SUBDIR=	${PKGNAME}
 
-USE_BUILDLINK2=	# defined
-USE_GCC_SHLIB=	# defined
+USE_BUILDLINK3=	# defined
 USE_X11=	# defined
 MAKEFILE=	makefile
+USE_LANGUAGES=	c c++
 
 post-patch:
+	${CHMOD} u+w  ${WRKSRC}/hzfont
 	${MV} ${WRKSRC}/hzfont/fonts.dir ${WRKSRC}/hzfont/fonts.dir.orig
 	${ECHO} '3' > ${WRKSRC}/hzfont/fonts.dir
 	${ECHO} 'hz16.pcf.gz hz16' >> ${WRKSRC}/hzfont/fonts.dir
 	${ECHO} 'hz16ft.pcf.gz hz16ft' >> ${WRKSRC}/hzfont/fonts.dir
 	${ECHO} 'yb10x20.pcf.gz yb10x20' >> ${WRKSRC}/hzfont/fonts.dir
 
-.include "../../mk/motif.buildlink2.mk"
+.include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/stardic/distinfo b/textproc/stardic/distinfo
index 99565983e83..6e0e9f56bb1 100644
--- a/textproc/stardic/distinfo
+++ b/textproc/stardic/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2002/09/23 23:30:25 jlam Exp $
+$NetBSD: distinfo,v 1.3 2004/05/03 23:00:20 wiz Exp $
 
 SHA1 (stardic-1.31/dic.tar.gz) = 89a4edcbac415232627c98680a9817f2a7676f48
 Size (stardic-1.31/dic.tar.gz) = 1800940 bytes
 SHA1 (patch-aa) = af0aede61350b2e77d9df1deaa0d42a0a62cf043
-SHA1 (patch-ab) = 1389a4a616315da0f9dbd430939f472452e15064
+SHA1 (patch-ab) = ccfe1401645b465785b087fc35eb8fa340bd74d2
+SHA1 (patch-ac) = 91f647c7d3ddfe5bd8cf85533dd9902ec37f39a6
+SHA1 (patch-ad) = 1d3b772b9d1f722cf23311cb3f104e4b44fc375d
diff --git a/textproc/stardic/patches/patch-ab b/textproc/stardic/patches/patch-ab
index 14f9f711fc7..b24000ede01 100644
--- a/textproc/stardic/patches/patch-ab
+++ b/textproc/stardic/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/15 09:21:44 shell Exp $
+$NetBSD: patch-ab,v 1.2 2004/05/03 23:00:20 wiz Exp $
 
---- trans.cc.orig	Sat Jan 29 11:34:27 2000
+--- trans.cc.orig	2000-01-29 04:34:27.000000000 +0100
 +++ trans.cc
-@@ -103,6 +103,7 @@
+@@ -22,6 +22,8 @@
+ #include <sys/mman.h>
+ #include <string.h>
+ #include <Xm/DialogS.h>
++#include <iostream>
++using namespace std;
+ 
+ // In HP_UX , MAP_FAILED is not defined. msa add 1999.9.26
+ #ifndef MAP_FAILED
+@@ -103,6 +105,7 @@ char sErrorMessage[MAX_STR_LEN+1];
  char sHomeDir[MAX_STR_LEN+1];
  PixmapClass *poBackImage;
  char* asSearchDirs[]={
@@ -10,7 +19,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/06/15 09:21:44 shell Exp $
  	"/opt/dic",
  	"/usr/local/dic",
  	"/dic",
-@@ -2468,6 +2469,11 @@
+@@ -2468,6 +2471,11 @@ AppFrame::AppFrame():oAppCore(this)
  void AppFrame::vInit(int argc,char **argv)
  {
          Atom DELETE_WIN;
diff --git a/textproc/stardic/patches/patch-ac b/textproc/stardic/patches/patch-ac
new file mode 100644
index 00000000000..b9378c316d9
--- /dev/null
+++ b/textproc/stardic/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/05/03 23:00:20 wiz Exp $
+
+--- image.h.orig	2000-01-29 04:34:31.000000000 +0100
++++ image.h
+@@ -17,7 +17,7 @@
+ #ifndef IMAGE_H
+ #define IMAGE_H
+ 
+-#include <stdiostream.h>
++#include <iosfwd>
+ #include <stdlib.h>
+ #include <memory.h>
+ #include <string.h>
diff --git a/textproc/stardic/patches/patch-ad b/textproc/stardic/patches/patch-ad
new file mode 100644
index 00000000000..8e72858621b
--- /dev/null
+++ b/textproc/stardic/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/05/03 23:00:20 wiz Exp $
+
+--- trans.h.orig	2000-01-29 04:34:32.000000000 +0100
++++ trans.h
+@@ -42,7 +42,7 @@
+ #include <Xm/PushB.h>
+ #include <Xm/DrawnB.h>
+ #include <Xm/ArrowB.h>
+-#include <strstream.h>
++#include <sstream>
+ #include <fstream.h>
+ 
+ #include "regdef.h"