>Number: 171986
>Category: ports
>Synopsis: devel/jwasm: Update to version 2.0.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 25 18:10:18 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 2.0.8
Remove file:
files/patch-GccUnix.mak
files/patch-H__memalloc.h
pkg-plist
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/jwasm/Makefile devel/jwasm/Makefile
--- /usr/ports/devel/jwasm/Makefile 2012-08-03 11:06:44.000000000 +0900
+++ devel/jwasm/Makefile 2012-09-25 03:20:31.000000000 +0900
@@ -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: ports/devel/jwasm/Makefile,v 1.4 2012/08/03 02:06:44 wxs Exp $
-#
PORTNAME= jwasm
-PORTVERSION= 207a
+PORTVERSION= 208
CATEGORIES= devel
MASTER_SITES= http://www.japheth.de/Download/JWasm/
DISTNAME= JWasm${PORTVERSION}s
@@ -14,22 +10,40 @@
MAINTAINER= ports at 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 -urN /usr/ports/devel/jwasm/distinfo devel/jwasm/distinfo
--- /usr/ports/devel/jwasm/distinfo 2012-08-03 11:06:44.000000000 +0900
+++ devel/jwasm/distinfo 2012-09-02 05:38:29.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (JWasm207as.zip) = 78c6f76ab729d9ecccf0a7fcf335457d6f76b613172a85c8d44b56ef79d328cc
-SIZE (JWasm207as.zip) = 804843
+SHA256 (JWasm208s.zip) = 7d0159c80b16c4c7c4b6391cb913b525039614ae9b82f3cd6756177d79b4fe58
+SIZE (JWasm208s.zip) = 822030
diff -urN /usr/ports/devel/jwasm/files/patch-GccUnix.mak devel/jwasm/files/patch-GccUnix.mak
--- /usr/ports/devel/jwasm/files/patch-GccUnix.mak 2010-12-17 23:07:17.000000000 +0900
+++ devel/jwasm/files/patch-GccUnix.mak 1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/devel/jwasm/files/patch-H__memalloc.h devel/jwasm/files/patch-H__memalloc.h
--- /usr/ports/devel/jwasm/files/patch-H__memalloc.h 2012-08-03 11:06:44.000000000 +0900
+++ devel/jwasm/files/patch-H__memalloc.h 1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/devel/jwasm/pkg-descr devel/jwasm/pkg-descr
--- /usr/ports/devel/jwasm/pkg-descr 2012-08-03 11:06:44.000000000 +0900
+++ devel/jwasm/pkg-descr 2012-07-08 03:47:02.000000000 +0900
@@ -6,14 +6,14 @@
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 -urN /usr/ports/devel/jwasm/pkg-plist devel/jwasm/pkg-plist
--- /usr/ports/devel/jwasm/pkg-plist 2012-08-03 11:06:44.000000000 +0900
+++ devel/jwasm/pkg-plist 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
- at comment $FreeBSD: ports/devel/jwasm/pkg-plist,v 1.2 2012/08/03 02:06:44 wxs Exp $
-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%%
>Release-Note:
>Audit-Trail:
>Unformatted: