upgrade to 2.4

PR:		39430
Submitted by:	Ports Fury

3 files changed, 12 insertions, 28 deletions

diff --git a/devel/jam/Makefile b/devel/jam/Makefile
index 194abde9d2a3..7545fef68a65 100644
--- a/devel/jam/Makefile
+++ b/devel/jam/Makefile
@@ -6,15 +6,21 @@
 #
 
 PORTNAME=	jam
-PORTVERSION=	2.3
-PORTREVISION=	1
+PORTVERSION=	2.4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp1.perforce.com/pub/jam/
 
 MAINTAINER=	ports@FreeBSD.org
 
-NO_WRKSUBDIR=	yes
+ONLY_FOR_ARCHS=	alpha i386
+
 USE_ZIP=	yes
+EXTRACT_BEFORE_ARGS=	-q -aa
+
+pre-patch:
+	@${REINPLACE_CMD} -e 's|^CC|#CC|g ; \
+		 s|^CFLAGS|#CFLAGS|g ; \
+		 s|\tjam|\t\$$\{.CURDIR\}/jam|g' ${WRKSRC}/Makefile
 
 do-install:
 .if ${MACHINE_ARCH} == "alpha"
@@ -23,8 +29,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin.freebsd/jam ${PREFIX}/bin
 .endif
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/jam
-	${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/jam
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/jam/distinfo b/devel/jam/distinfo
index e926d00c028c..691810d660e3 100644
--- a/devel/jam/distinfo
+++ b/devel/jam/distinfo
@@ -1 +1 @@
-MD5 (jam-2.3.zip) = 3eb37e221712f483d9b054d4cfafd49a
+MD5 (jam-2.4.zip) = 9af98a917377fa7406b2f5f5be5e26b6
diff --git a/devel/jam/files/patch-aa b/devel/jam/files/patch-aa
deleted file mode 100644
index 46d73fab914e..000000000000
--- a/devel/jam/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig	Thu Jan  4 16:53:08 2001
-+++ Makefile	Thu Feb  1 22:13:36 2001
-@@ -1,8 +1,8 @@
- # Makefile for jam
- 
--CC = cc
-+#CC = cc
- TARGET = -o jam0
--CFLAGS =
-+#CFLAGS =
- 
- # Special flavors - uncomment appropriate lines
- 
-@@ -54,7 +54,7 @@
- 	rules.c scan.c search.c timestamp.c variable.c
- 
- all: jam0
--	jam0
-+	./jam0
- 
- jam0:
- 	$(CC) $(TARGET) $(CFLAGS) $(SOURCES) $(LINKLIBS)