Set WRKSRC to location of configure script, and manually create do-build

and do-install targets.  This is better as the configure script gets
called with the correct environment settings.  Also set the values for
INSTALL_PROGRAM and INSTALL_DATA used in the project's Makefile to their
pkgsrc BSD_* counterparts.

4 files changed, 26 insertions, 23 deletions

diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 442c3b53d73..76463db5056 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/17 09:07:12 agc Exp $
+# $NetBSD: Makefile,v 1.14 2001/05/22 06:38:08 jlam Exp $
 
 DISTNAME=	hugs98-Feb2000
 PKGNAME=	hugs98-200002
@@ -11,18 +11,20 @@ COMMENT=	Nottingham and Yale Haskell interpreter and programming environment
 
 DEPENDS+=	readline-*:../../devel/readline
 
-WRKSRC=		${WRKDIR}/hugs98/src
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-readline
+WRKSRC=			${WRKDIR}/hugs98/src/unix
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--with-readline
+ALL_TARGET=		default
 
-ALL_TARGET=	default
-MAKE_ENV=	INSTALL="${INSTALL}" INSTALL_DATA="${INSTALL_DATA}" \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+do-build:
+	@cd ${WRKSRC}/.. && ${SETENV} ${MAKE_ENV} \
+		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
 
-do-configure:
-	cd ${WRKSRC}; (cd unix; ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
+do-install:
+	@cd ${WRKSRC}/.. && ${SETENV} ${MAKE_ENV} \
+		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET}
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/../docs/hugs.1 ${PREFIX}/man/man1/hugs.1
+	${INSTALL_MAN} ${WRKSRC}/../../docs/hugs.1 ${PREFIX}/man/man1/hugs.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/hugs/distinfo b/lang/hugs/distinfo
index 9746df0cb0c..79f0ce93c55 100644
--- a/lang/hugs/distinfo
+++ b/lang/hugs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:51 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/22 06:38:09 jlam Exp $
 
 SHA1 (hugs98-Feb2000.tar.gz) = acadac22bad6509213a25035180f6373bd0192f5
 Size (hugs98-Feb2000.tar.gz) = 567528 bytes
-SHA1 (patch-aa) = da4f36ffb0885f257cf886a52ae73b6d00ff37c2
-SHA1 (patch-ab) = 7f228962d144f9d19e2dc4be1c759ff10bbab751
+SHA1 (patch-aa) = c7e05ca44740a4a39595ab95149e6064b9d99ca9
+SHA1 (patch-ab) = 81d75e31db129be9f3e38e330c6c7f3cca375784
diff --git a/lang/hugs/patches/patch-aa b/lang/hugs/patches/patch-aa
index 578adcfe2e5..e610f3a56eb 100644
--- a/lang/hugs/patches/patch-aa
+++ b/lang/hugs/patches/patch-aa
@@ -1,18 +1,19 @@
-$NetBSD: patch-aa,v 1.3 1999/12/08 09:44:32 rh Exp $
+$NetBSD: patch-aa,v 1.4 2001/05/22 06:38:09 jlam Exp $
 
---- MkInstal.in.orig	Thu May 27 23:29:24 1999
-+++ MkInstal.in	Wed Dec  8 10:43:54 1999
-@@ -10,9 +10,6 @@
+--- ../MkInstal.in.orig	Tue Feb 29 05:29:00 2000
++++ ../MkInstal.in	Tue May 22 02:32:45 2001
+@@ -10,8 +10,8 @@
  # multiple files at once.
  ################################################################
  
 -INSTALL		= unix/install-sh
 -INSTALL_DATA	= /bin/cp
--
++INSTALL_PROGRAM=	${BSD_INSTALL_PROGRAM}
++INSTALL_DATA=		${BSD_INSTALL_DATA}
+ 
  install		:: install_bin install_lib            # the bare minimum
  install		:: install_libs                       # lotsa libraries
- install		:: install_demos		      # goodies
-@@ -22,8 +19,8 @@
+@@ -22,8 +22,8 @@
  
  install_bin	:: hugs$(EXE) runhugs$(EXE)
  		$(INSTALL) -d $(bindir)
diff --git a/lang/hugs/patches/patch-ab b/lang/hugs/patches/patch-ab
index d24d06c7c31..2c7675155e6 100644
--- a/lang/hugs/patches/patch-ab
+++ b/lang/hugs/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2000/05/20 02:19:32 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2001/05/22 06:38:09 jlam Exp $
 
---- prelude.h.orig	Thu May 27 23:29:25 1999
-+++ prelude.h	Sat May 20 04:06:55 2000
+--- ../prelude.h.orig	Thu May 27 23:29:25 1999
++++ ../prelude.h	Sat May 20 04:06:55 2000
 @@ -566,10 +566,12 @@
   * eval, print loop
   */