buildlink1 -> buildlink2, and use java.mk for proper Java handling.

4 files changed, 48 insertions, 11 deletions

diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index b42d587a62a..11e76900999 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/08/25 16:12:01 kristerw Exp $
+# $NetBSD: Makefile,v 1.14 2002/11/14 22:38:30 jlam Exp $
 
 DISTNAME=		nhc98src-1.14a
 PKGNAME=		nhc98-1.14a
@@ -12,22 +12,20 @@ COMMENT=		Portable Haskell 98 compiler
 # Not yet ported to 64-bit machines
 NOT_FOR_PLATFORM=	*-*-alpha *-*-sparc64
 
-# KEY_RESIZE
-USE_NCURSES=		YES
+USE_BUILDLINK2=		YES
+BUILDLINK_SETENV.CC=	CC=gcc
 
-WRKSRC=			${WRKDIR}/${PKGNAME}
+USE_NCURSES=		KEY_RESIZE
 
-HAS_CONFIGURE=		yes
-CONFIGURE_ENV+=		CC=gcc
+HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--buildwith=gcc --installdir=${PREFIX} \
 			+docs --docdir=${PREFIX}/share/doc/nhc98
 
 # Note that you can also build with ghc (Glasgow Haskell Compiler) or
 # hbc (Chalmers Haskell).
 
+WRKSRC=			${WRKDIR}/${PKGNAME}
 USE_GMAKE=		yes
-USE_JAVA=		yes
-
 ALL_TARGET=		default
 
 HARCH=			`${WRKSRC}/script/harch`
@@ -36,5 +34,7 @@ PLIST_SUBST+=		HARCH=${HARCH}
 post-extract:
 	@${FIND} ${WRKSRC}/docs -type d -name \*CVS\* | ${XARGS} ${RM} -rf
 
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/java.mk"
 .include "../../mk/bsd.pkg.mk"
+
diff --git a/lang/nhc98/PLIST b/lang/nhc98/PLIST
index 47f7002628f..8bc061fb5a0 100644
--- a/lang/nhc98/PLIST
+++ b/lang/nhc98/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/25 16:12:02 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/11/14 22:38:30 jlam Exp $
 bin/greencard-nhc98
 bin/harch
 bin/hi
@@ -64,6 +64,7 @@ include/nhc98/Prelude.T.hi
 include/nhc98/Prelude.hi
 include/nhc98/PreludeBuiltin.T.hi
 include/nhc98/PreludeBuiltin.hi
+include/nhc98/Q8defs.h
 include/nhc98/Random.T.hi
 include/nhc98/Random.hi
 include/nhc98/Ratio.T.hi
@@ -290,6 +291,7 @@ share/doc/nhc98/libs/Bit.html
 share/doc/nhc98/libs/FFI.html
 share/doc/nhc98/libs/IOExtras.html
 share/doc/nhc98/libs/OldBinary.html
+share/doc/nhc98/libs/PackedString.html
 share/doc/nhc98/libs/Time.html
 share/doc/nhc98/libs/index.html
 share/doc/nhc98/limits.html
diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo
index 068cee71f33..78b51376035 100644
--- a/lang/nhc98/distinfo
+++ b/lang/nhc98/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/08/25 16:12:02 kristerw Exp $
+$NetBSD: distinfo,v 1.7 2002/11/14 22:38:30 jlam Exp $
 
 SHA1 (nhc98src-1.14a.tar.gz) = e82f815367790d7a090c676d6e1f3b368efebe35
 Size (nhc98src-1.14a.tar.gz) = 6215952 bytes
+SHA1 (patch-aa) = 075cbe18ad64194e66fed94d687b4027e28cb037
diff --git a/lang/nhc98/patches/patch-aa b/lang/nhc98/patches/patch-aa
new file mode 100644
index 00000000000..768b76aa12b
--- /dev/null
+++ b/lang/nhc98/patches/patch-aa
@@ -0,0 +1,34 @@
+$NetBSD: patch-aa,v 1.5 2002/11/14 22:38:30 jlam Exp $
+
+--- configure.orig	Tue Aug 13 09:52:51 2002
++++ configure
+@@ -345,13 +345,13 @@ int main (void) { test(); }
+     if $CCC -o curses curses.c >/dev/null 2>/dev/null
+     then CURSES=""
+     else
+-      if $CCC -o curses curses.c -lncurses >/dev/null 2>/dev/null
++      if $CCC $LDFLAGS -o curses curses.c -lncurses >/dev/null 2>/dev/null
+       then CURSES="-lncurses"
+       else
+-        if $CCC -o curses curses.c -lcurses >/dev/null 2>/dev/null
++        if $CCC $LDFLAGS -o curses curses.c -lcurses >/dev/null 2>/dev/null
+         then CURSES="-lcurses"
+         else
+-          if $CCC -o curses curses.c -lcurses -ltermcap >/dev/null 2>/dev/null
++          if $CCC $LDFLAGS -o curses curses.c -lcurses -ltermcap >/dev/null 2>/dev/null
+           then CURSES="-lcurses -ltermcap"
+           else CURSES="-ltermcap -lcurses"	# don't know a good default?
+           fi
+@@ -368,10 +368,10 @@ int main (void) { test(); }
+ 
+   echo -n "Testing for the readline library: "
+   echo 'main(){readline();}' >rd.c
+-  if ${CCC} -o rd.out rd.c -lreadline >/dev/null 2>&1
++  if ${CCC} ${LDFLAGS} -o rd.out rd.c -lreadline >/dev/null 2>&1
+   then echo '          -lreadline (detected)'
+        READLINE="-DUSE_READLINE=1 -lreadline"
+-  else if ${CCC} -o rd.out rd.c -lreadline $CURSES >/dev/null 2>&1
++  else if ${CCC} ${LDFLAGS} -o rd.out rd.c -lreadline $CURSES >/dev/null 2>&1
+     then echo "          -lreadline $CURSES (detected)"
+        READLINE="-DUSE_READLINE=1 -lreadline $CURSES"
+     else echo '          no  (detected)'