Index: Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/jam/Makefile,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 Makefile
--- Makefile	13 Feb 2003 14:51:43 -0000	1.1.1.1
+++ Makefile	12 Jan 2004 09:58:40 -0000
@@ -2,7 +2,7 @@
 
 COMMENT=		"build utility like make"
 
-DISTNAME=	 	jam-2.4	
+DISTNAME=	 	jam-2.5
 CATEGORIES=	  	devel	
 
 HOMEPAGE=		http://www.perforce.com/jam/jam.html
@@ -19,8 +19,18 @@
 NO_REGRESS=		Yes
 MAKE_FLAGS=		CC="${CC}" CCFLAGS="${CFLAGS}"
 
+.if ${MACHINE_ARCH:L:Malpha}
+OSPLAT=axp
+.elif ${MACHINE_ARCH:L:Mi386}
+OSPLAT=x86
+.elif ${MACHINE_ARCH:L:Msparc64}
+OSPLAT=sparc
+.else
+OSPLAT=
+.endif
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/jam ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin.openbsd${OSPLAT}/jam ${PREFIX}/bin
 	${INSTALL_MAN_DIR} ${PREFIX}/share/doc/jam
 	${INSTALL_MAN} ${WRKSRC}/Jam.html ${PREFIX}/share/doc/jam
 	${INSTALL_MAN} ${WRKSRC}/Jambase.html ${PREFIX}/share/doc/jam
Index: distinfo
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/jam/distinfo,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 distinfo
--- distinfo	13 Feb 2003 14:51:43 -0000	1.1.1.1
+++ distinfo	12 Jan 2004 09:58:40 -0000
@@ -1,3 +1,3 @@
-MD5 (jam-2.4.tar) = e98beb6aef4d0c1d04916ef178e75bb3
-RMD160 (jam-2.4.tar) = cb680c6b03a5e4af8136c7b7891fb55d7e4da778
-SHA1 (jam-2.4.tar) = b30d24130ce86cd5713be940fc95d313cc4ca51a
+MD5 (jam-2.5.tar) = d340f3c73d16a1206d0e8c88a66428e7
+RMD160 (jam-2.5.tar) = ac78805d6342ad0e3b3ef14ce45f5fbefdcb684c
+SHA1 (jam-2.5.tar) = e5efff58f14cd2bc5fde98d18b7a98aabed84995
Index: patches/patch-Jambase
===================================================================
RCS file: patches/patch-Jambase
diff -N patches/patch-Jambase
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-Jambase	12 Jan 2004 09:58:40 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- Jambase.orig	2004-01-12 19:50:36.000000000 +1100
++++ Jambase	2004-01-12 19:52:09.000000000 +1100
+@@ -472,6 +472,9 @@ else if $(UNIX)
+     case NCR :
+ 	RANLIB		?= "" ;
+ 
++    case OPENBSD :
++	OPTIM		?= "" ;
++
+     case PTX :
+ 	RANLIB		?= "" ;
+ 
Index: patches/patch-Jamfile
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/jam/patches/patch-Jamfile,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 patch-Jamfile
--- patches/patch-Jamfile	13 Feb 2003 14:51:43 -0000	1.1.1.1
+++ patches/patch-Jamfile	12 Jan 2004 09:58:40 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Jamfile,v 1.1.1.1 2003/02/13 14:51:43 naddy Exp $
---- Jamfile.orig	Wed Apr 17 21:27:35 2002
-+++ Jamfile	Thu Feb 13 15:18:22 2003
-@@ -4,10 +4,10 @@
+--- Jamfile.orig	2003-04-23 14:45:49.000000000 +1000
++++ Jamfile	2004-01-12 19:17:35.000000000 +1100
+@@ -4,7 +4,7 @@
  # There are no user-serviceable parts in this file.
  #
  # Put executables in platform-specific  subdirectory.
@@ -9,8 +9,4 @@
 +#CC = 
  if $(VMS) 	{ LOCATE_TARGET ?= [.binvms] ; }
  else if $(MAC) 	{ LOCATE_TARGET ?= :bin.mac ; }
--else 		{ LOCATE_TARGET ?= bin.$(OSFULL[1]:L) ; }
-+else 		{ LOCATE_TARGET ?= bin ; }
- 
- # Leave generated source in current directory; it would be nice to use
- # these lines below to build the source into the platform-specific
+ else 		{ LOCATE_TARGET ?= bin.$(OSFULL[1]:L) ; }
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/jam/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile	13 Feb 2003 14:51:43 -0000	1.1.1.1
+++ patches/patch-Makefile	12 Jan 2004 09:58:40 -0000
@@ -1,23 +1,13 @@
 $OpenBSD: patch-Makefile,v 1.1.1.1 2003/02/13 14:51:43 naddy Exp $
---- Makefile.orig	Wed Mar 20 18:39:47 2002
-+++ Makefile	Thu Feb 13 15:18:22 2003
-@@ -1,8 +1,8 @@
+--- Makefile.orig	2003-04-23 14:45:50.000000000 +1000
++++ Makefile	2004-01-12 17:34:22.000000000 +1100
+@@ -1,7 +1,7 @@
  # Makefile for jam
  
 -CC = cc
-+#CC =  
- TARGET = -o jam0
 -CFLAGS =
++#CC = cc
 +#CFLAGS =
+ EXENAME = ./jam0
+ TARGET = -o $(EXENAME)
  
- # Special flavors - uncomment appropriate lines
- 
-@@ -65,7 +65,7 @@ SOURCES = \
- 	rules.c scan.c search.c timestamp.c variable.c
- 
- all: jam0
--	jam0
-+	./jam0
- 
- jam0:
- 	$(CC) $(TARGET) $(CFLAGS) $(SOURCES) $(LINKLIBS)
Index: patches/patch-README
===================================================================
RCS file: patches/patch-README
diff -N patches/patch-README
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-README	12 Jan 2004 09:58:40 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- README.orig	2004-01-12 17:43:22.000000000 +1100
++++ README	2004-01-12 17:43:47.000000000 +1100
+@@ -77,6 +77,7 @@ INSTALLING
+ 	    COHERENT/386	COHERENT
+ 	    DGUX 5.4		DGUX
+ 	    FreeBSD		FREEBSD
++	    OpenBSD		OPENBSD
+ 	    HPUX 9.0		HPUX
+ 	    IRIX 5.0		IRIX
+ 	    Linux		LINUX
Index: patches/patch-RELNOTES
===================================================================
RCS file: patches/patch-RELNOTES
diff -N patches/patch-RELNOTES
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-RELNOTES	12 Jan 2004 09:58:40 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- RELNOTES.orig	2004-01-12 17:43:22.000000000 +1100
++++ RELNOTES	2004-01-12 17:45:40.000000000 +1100
+@@ -2,6 +2,10 @@
+ ===============================================================================
+ 
+ 
++OpenBSD-specific changes:
++	OpenBSD is now supported as an OS type.
++
++
+ Release notes for Jam 2.5
+ (aka Jam - make(1) redux)
+ 
Index: patches/patch-jam_h
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/jam/patches/patch-jam_h,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 patch-jam_h
--- patches/patch-jam_h	13 Feb 2003 14:51:43 -0000	1.1.1.1
+++ patches/patch-jam_h	12 Jan 2004 09:58:40 -0000
@@ -1,7 +1,24 @@
 $OpenBSD: patch-jam_h,v 1.1.1.1 2003/02/13 14:51:43 naddy Exp $
---- jam.h.orig	Wed Mar 20 18:40:21 2002
-+++ jam.h	Thu Feb 13 15:18:22 2003
-@@ -380,7 +380,7 @@
+--- jam.h.orig	2003-04-23 14:45:51.000000000 +1000
++++ jam.h	2004-01-12 17:40:56.000000000 +1100
+@@ -231,6 +231,10 @@
+ # define OSMINOR "OS=FREEBSD"
+ # define OS_FREEBSD
+ # endif
++# ifdef __OpenBSD__
++# define OSMINOR "OS=OPENBSD"
++# define OS_OPENBSD
++# endif
+ # ifdef __DGUX__
+ # define OSMINOR "OS=DGUX"
+ # define OS_DGUX
+@@ -385,12 +389,13 @@
+ 
+ # if !defined(OS_BSDI) && \
+      !defined(OS_FREEBSD) && \
++     !defined(OS_OPENBSD) && \
+      !defined(OS_NEXT) && \
+      !defined(OS_MACHTEN) && \
       !defined(OS_MACOSX) && \
       !defined(OS_RHAPSODY) && \
       !defined(OS_MVS)
Index: patches/patch-jambase_c
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/jam/patches/patch-jambase_c,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 patch-jambase_c
--- patches/patch-jambase_c	13 Feb 2003 14:51:43 -0000	1.1.1.1
+++ patches/patch-jambase_c	12 Jan 2004 09:58:40 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-jambase_c,v 1.1.1.1 2003/02/13 14:51:43 naddy Exp $
---- jambase.c.orig	Wed Apr 17 21:29:45 2002
-+++ jambase.c	Thu Feb 13 15:18:22 2003
-@@ -296,7 +296,7 @@ char *jambase[] = {
- "LEX		?= lex ;\n",
- "LINKFLAGS	?= $(CCFLAGS) ;\n",
- "LINKLIBS	?= ;\n",
--"OPTIM		?= -O ;\n",
-+"OPTIM		?= ;\n",
- "RANLIB		?= ranlib ;\n",
- "YACC		?= yacc ;\n",
- "YACCGEN		?= .c ;\n",
+--- jambase.c.orig	2003-04-23 14:57:10.000000000 +1000
++++ jambase.c	2004-01-12 19:52:36.000000000 +1100
+@@ -278,6 +278,8 @@ const char *jambase[] = {
+ "MANDIR		?= /usr/local/share/man ;\n",
+ "case NCR :\n",
+ "RANLIB		?= \"\" ;\n",
++"case OPENBSD :\n",
++"OPTIM		?= \"\" ;\n",
+ "case PTX :\n",
+ "RANLIB		?= \"\" ;\n",
+ "case QNX :\n",