Update to jam-2.5.2.

This switches over from the perforce jam distribution to the jam
distribution from the FreeType project. This is fully backwards compatible
with the perforce distribution.
The FreeType jam distribution ships with a GNU configure script.
Other differences are added support for shared libraries, macro expansion,
more flexible command line processing and a fix to dependency calculation.

This closes PR pkg/37285 and should make devel/jam build on NetBSD 4.0.

4 files changed, 56 insertions, 37 deletions

diff --git a/devel/jam/Makefile b/devel/jam/Makefile
index 83e201d78a4..305c6358e31 100644
--- a/devel/jam/Makefile
+++ b/devel/jam/Makefile
@@ -1,28 +1,30 @@
-# $NetBSD: Makefile,v 1.12 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/10 00:09:23 tnn Exp $
 #
 
-DISTNAME=	jam-2.5
-PKGREVISION=	2
+PKGNAME=	jam-2.5.2
+DISTNAME=	ft${PKGNAME}
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.perforce.com/pub/jam/
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/}
+#MASTER_SITES=	ftp://ftp.perforce.com/pub/jam/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	schmonz@NetBSD.org
-HOMEPAGE=	http://www.perforce.com/jam/jam.html
+HOMEPAGE=	http://freetype.sourceforge.net/jam/index.html
+#HOMEPAGE=	http://www.perforce.com/jam/jam.html
 COMMENT=	Program construction tool, like make(1)
 
 CONFLICTS=	acunia-jam-[0-9]*
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DIST_SUBDIR=	${PKGNAME_NOREV}nb1
-WRKSRC=		${WRKDIR}
-USE_TOOLS+=	yacc
+GNU_CONFIGURE=	yes
+
+USE_TOOLS+=	yacc gmake
 
 DOCDIR=		share/doc/${PKGBASE}
 HTMLDIR=	share/doc/html/${PKGBASE}
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin ${DOCDIR} ${HTMLDIR}
 
 do-install:
 	for f in jam mkjambase; do \
diff --git a/devel/jam/distinfo b/devel/jam/distinfo
index 7871b57c969..c94e488c808 100644
--- a/devel/jam/distinfo
+++ b/devel/jam/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2007/08/01 21:53:16 joerg Exp $
+$NetBSD: distinfo,v 1.7 2008/03/10 00:09:23 tnn Exp $
 
-SHA1 (jam-2.5nb1/jam-2.5.zip) = 794a3f4483315c6b9f010f03b592646d3815328c
-RMD160 (jam-2.5nb1/jam-2.5.zip) = 8e2779e6e41e34d2368e54813e3c92d4604b9e66
-Size (jam-2.5nb1/jam-2.5.zip) = 191864 bytes
-SHA1 (patch-aa) = b24098cda1e4dfc1638df0ba945716de030a7d48
+SHA1 (ftjam-2.5.2.tar.bz2) = 08bad35e74ec85c4592d378014586174d22297b5
+RMD160 (ftjam-2.5.2.tar.bz2) = fd1d1161963ba85be09aecffe832cf1db8a7b70f
+Size (ftjam-2.5.2.tar.bz2) = 196631 bytes
+SHA1 (patch-aa) = 91a3bdf0b8382afd90ac21c4304bdc580d5068e8
+SHA1 (patch-ab) = 72816ee8c6dafdcb557560a8815f70e5ec593ff4
diff --git a/devel/jam/patches/patch-aa b/devel/jam/patches/patch-aa
index a731b3920ef..1124a83a626 100644
--- a/devel/jam/patches/patch-aa
+++ b/devel/jam/patches/patch-aa
@@ -1,24 +1,26 @@
-$NetBSD: patch-aa,v 1.3 2007/08/01 21:53:16 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2008/03/10 00:09:23 tnn Exp $
 
---- jam.h.orig	2007-08-01 21:32:10.000000000 +0000
+Beware of DOS linebreaks.
+
+--- jam.h.orig	2006-06-05 12:52:05.000000000 +0200
 +++ jam.h
-@@ -379,19 +379,7 @@
- # include <memory.h>
- # endif
- 
--# ifndef OS_ULTRIX
- # include <stdlib.h>
--# endif
--
--# if !defined(OS_BSDI) && \
--     !defined(OS_FREEBSD) && \
--     !defined(OS_NEXT) && \
--     !defined(OS_MACHTEN) && \
--     !defined(OS_MACOSX) && \
--     !defined(OS_RHAPSODY) && \
--     !defined(OS_MVS)
--# include <malloc.h>
--# endif
- 
- # endif 
- 
+@@ -379,19 +379,8 @@
+ # include <memory.h>

+ # endif

+ 

+-# ifndef OS_ULTRIX

+ # include <stdlib.h>

+-# endif

+ 

+-# if !defined(OS_BSDI) && \

+-     !defined(OS_FREEBSD) && \

+-     !defined(OS_NEXT) && \

+-     !defined(OS_MACHTEN) && \

+-     !defined(OS_MACOSX) && \

+-     !defined(OS_RHAPSODY) && \

+-     !defined(OS_MVS)

+-# include <malloc.h>

+-# endif

+ 

+ # endif

+ 

diff --git a/devel/jam/patches/patch-ab b/devel/jam/patches/patch-ab
new file mode 100644
index 00000000000..decbc99a8bc
--- /dev/null
+++ b/devel/jam/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2008/03/10 00:09:23 tnn Exp $
+
+Beware of DOS linebreaks.
+
+--- execunix.c.orig	2006-06-05 12:52:27.000000000 +0200
++++ execunix.c
+@@ -42,6 +42,7 @@
+ # include "lists.h"

+ # include "execcmd.h"

+ # include <errno.h>

++# include <unistd.h>

+ 

+ # ifdef USE_EXECUNIX

+