- Update to version 208

- Update pkg-descr
- Trim Makefile header

PR:           ports/171986
Submitted by: KATO Tsuguru <tkato432 _at_ yahoo.com>
Approved by:  beat (mentor)
Feature safe: yes

6 files changed, 34 insertions, 71 deletions

diff --git a/devel/jwasm/Makefile b/devel/jwasm/Makefile
index 47ebe1bf821c..001b27526510 100644
--- a/devel/jwasm/Makefile
+++ b/devel/jwasm/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	jwasm
-# Date created:        7 April 2009
-# Whom:                Pedro F. Giffuni
-#
+# Created by: Pedro F. Giffuni
 # $FreeBSD$
-#
 
 PORTNAME=	jwasm
-PORTVERSION=	207a
+PORTVERSION=	208
 CATEGORIES=	devel
 MASTER_SITES=	http://www.japheth.de/Download/JWasm/
 DISTNAME=	JWasm${PORTVERSION}s
@@ -14,22 +10,40 @@ DISTNAME=	JWasm${PORTVERSION}s
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fork of OpenWatcom's x86 assembler with AMD64 support
 
+OPTIONS_DEFINE=	DOCS
+
 ONLY_FOR_ARCHS=	amd64 i386
 
+NO_WRKSUBDIR=	yes
+
 USE_ZIP=	yes
+USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
 MAKEFILE=	GccUnix.mak
-NO_WRKSUBDIR=	yes
-EXTRACT_BEFORE_ARGS=	-qa
+MAKE_JOBS_SAFE=	yes
+
+PORTDOCS=	*
+PLIST_FILES=	bin/jwasm
+
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^extra_c_flags/s|-O2|$$(CFLAGS)| ; \
+		 /^CC/s| =| ?=| ; \
+		 s|-s -o|-o|' ${WRKSRC}/GccUnix.mak
+	@${REINPLACE_CMD} -e \
+		'/v2.07/s|<malloc.h>|<stdlib.h>|' ${WRKSRC}/H/memalloc.h
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/GccUnixR/jwasm ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
+	${INSTALL_PROGRAM} ${WRKSRC}/GccUnixR/jwasm ${PREFIX}/bin
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
+	@${GZIP_CMD} ${DOCSDIR}/*.txt
 	@${MKDIR} ${DOCSDIR}/manual
-	@${INSTALL_DATA} ${WRKSRC}/Doc/*.txt ${DOCSDIR}/manual
-	@${GZIP_CMD} ${DOCSDIR}/*.txt ${DOCSDIR}/manual/*.txt
+	${INSTALL_DATA} ${WRKSRC}/Doc/*.txt ${DOCSDIR}/manual
+	@${GZIP_CMD} ${DOCSDIR}/manual/*.txt
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/jwasm/distinfo b/devel/jwasm/distinfo
index 1fb9768c3b7b..572ba7a59432 100644
--- a/devel/jwasm/distinfo
+++ b/devel/jwasm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (JWasm207as.zip) = 78c6f76ab729d9ecccf0a7fcf335457d6f76b613172a85c8d44b56ef79d328cc
-SIZE (JWasm207as.zip) = 804843
+SHA256 (JWasm208s.zip) = 7d0159c80b16c4c7c4b6391cb913b525039614ae9b82f3cd6756177d79b4fe58
+SIZE (JWasm208s.zip) = 822030
diff --git a/devel/jwasm/files/patch-GccUnix.mak b/devel/jwasm/files/patch-GccUnix.mak
deleted file mode 100644
index 0a1c976f0d82..000000000000
--- a/devel/jwasm/files/patch-GccUnix.mak
+++ /dev/null
@@ -1,20 +0,0 @@
---- GccUnix.mak.orig	2009-06-07 14:07:37.000000000 -0500
-+++ GccUnix.mak	2009-06-07 14:09:18.000000000 -0500
-@@ -14,7 +14,7 @@
- #cflags stuff
- 
- ifeq ($(DEBUG),0)
--extra_c_flags = -DNDEBUG -O2
-+extra_c_flags = -DNDEBUG ${CFLAGS}
- OUTD=GccUnixR
- else
- extra_c_flags = -DDEBUG_OUT -g
-@@ -23,7 +23,7 @@
- 
- c_flags =-D__UNIX__ $(extra_c_flags)
- 
--CC = gcc
-+#CC = cc
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
diff --git a/devel/jwasm/files/patch-H__memalloc.h b/devel/jwasm/files/patch-H__memalloc.h
deleted file mode 100644
index 09e47ae72608..000000000000
--- a/devel/jwasm/files/patch-H__memalloc.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- H/memalloc.h.orig	2012-07-29 14:44:42.000000000 -0500
-+++ H/memalloc.h	2012-07-29 14:51:44.000000000 -0500
-@@ -40,14 +40,15 @@
- #if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__OCC__)
- #define myalloca  alloca
- #include <malloc.h>
--#elif defined(__GNUC__) || defined(__TINYC__)
-+#elif (defined(__GNUC__) || defined(__TINYC__)) && !defined(__FreeBSD__)
- #define myalloca  alloca
- #include <malloc.h>  /* added v2.07 */
- #elif defined(__PCC__)
- #define myalloca  _alloca
- #include <malloc.h>
- #else
--#define myalloca  _alloca
-+#define myalloca  alloca
-+#include <stdlib.h>
- #endif
- 
- /* AsmAlloc() and AsmFree() are fast variants, which
diff --git a/devel/jwasm/pkg-descr b/devel/jwasm/pkg-descr
index 6f9e45dcf95e..9542554a43d9 100644
--- a/devel/jwasm/pkg-descr
+++ b/devel/jwasm/pkg-descr
@@ -6,14 +6,14 @@ is open.
 JWasm Features:
 
 - JWasm natively supports output formats Intel OMF, MS Coff (32- and 
-64-bit), Elf (32-and 64-bit), Bin and DOS MZ.
+  64-bit), Elf (32- and 64-bit), Bin and DOS MZ.
 - precompiled JWasm binaries are available for DOS, Windows and Linux. For 
-OS/2 and FreeBSD, makefiles are supplied.
-- Instructions up to AVX are supported.
+  OS/2 and FreeBSD, makefiles are supplied.
+- Instructions up to SSSE3 are supported.
 - The JWasm source is portable and has successfully been tested with Open 
-Watcom, MS VC, GCC and more.
+  Watcom, MS VC, GCC and more.
 - As far as programming for Windows is concerned, JWasm can be used with 
-both Win32Inc and Masm32.
+  both Win32Inc and Masm32.
 - C header files can be converted to include files for JWasm with h2incX.
 
 WWW: http://www.japheth.de/JWasm.html
diff --git a/devel/jwasm/pkg-plist b/devel/jwasm/pkg-plist
deleted file mode 100644
index 95d63384b1f9..000000000000
--- a/devel/jwasm/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $FreeBSD$
-bin/jwasm
-%%PORTDOCS%%%%DOCSDIR%%/History.txt.gz
-%%PORTDOCS%%%%DOCSDIR%%/License.txt.gz
-%%PORTDOCS%%%%DOCSDIR%%/Readme.txt.gz
-%%PORTDOCS%%%%DOCSDIR%%/manual/enh.txt.gz
-%%PORTDOCS%%%%DOCSDIR%%/manual/fixes.txt.gz
-%%PORTDOCS%%%%DOCSDIR%%/manual/gencode.txt.gz
-%%PORTDOCS%%%%DOCSDIR%%/manual/overview.txt.gz
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%