Attachment #128098 for bug #171986

View | Details | Raw Unified | Return to bug 171986
Collapse All | Expand All

Lines 1-12 Link Here

(-)devel/jwasm/Makefile (-13 / +27 lines)
1	# New ports collection makefile for: jwasm	1	# Created by: Pedro F. Giffuni
2	# Date created: 7 April 2009
3	# Whom: Pedro F. Giffuni
4	#
5	# $FreeBSD: ports/devel/jwasm/Makefile,v 1.4 2012/08/03 02:06:44 wxs Exp $	2	# $FreeBSD: ports/devel/jwasm/Makefile,v 1.4 2012/08/03 02:06:44 wxs Exp $
6	#
7		3
8	PORTNAME= jwasm	4	PORTNAME= jwasm
9	PORTVERSION= 207a	5	PORTVERSION= 208
10	CATEGORIES= devel	6	CATEGORIES= devel
11	MASTER_SITES= http://www.japheth.de/Download/JWasm/	7	MASTER_SITES= http://www.japheth.de/Download/JWasm/
12	DISTNAME= JWasm${PORTVERSION}s	8	DISTNAME= JWasm${PORTVERSION}s
Lines 14-35 Link Here
14	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Fork of OpenWatcom's x86 assembler with AMD64 support	11	COMMENT= Fork of OpenWatcom's x86 assembler with AMD64 support
16		12
		13	OPTIONS_DEFINE= DOCS
		14
17	ONLY_FOR_ARCHS= amd64 i386	15	ONLY_FOR_ARCHS= amd64 i386
18		16
		17	NO_WRKSUBDIR= yes
		18
19	USE_ZIP= yes	19	USE_ZIP= yes
		20	USE_DOS2UNIX= yes
20	USE_GMAKE= yes	21	USE_GMAKE= yes
21	MAKEFILE= GccUnix.mak	22	MAKEFILE= GccUnix.mak
22	NO_WRKSUBDIR= yes	23	MAKE_JOBS_SAFE= yes
23	EXTRACT_BEFORE_ARGS= -qa	24
		25	PORTDOCS= *
		26	PLIST_FILES= bin/jwasm
		27
		28	.include <bsd.port.options.mk>
		29
		30	post-patch:
		31	@${REINPLACE_CMD} -e \
		32	'/^extra_c_flags/s\|-O2\|$$(CFLAGS)\| ; \
		33	/^CC/s\| =\| ?=\| ; \
		34	s\|-s -o\|-o\|' ${WRKSRC}/GccUnix.mak
		35	@${REINPLACE_CMD} -e \
		36	'/v2.07/s\|<malloc.h>\|<stdlib.h>\|' ${WRKSRC}/H/memalloc.h
24		37
25	do-install:	38	do-install:
26	@${INSTALL_PROGRAM} ${WRKSRC}/GccUnixR/jwasm ${PREFIX}/bin/	39	${INSTALL_PROGRAM} ${WRKSRC}/GccUnixR/jwasm ${PREFIX}/bin
27	.if !defined(NOPORTDOCS)	40	.if ${PORT_OPTIONS:MDOCS}
28	@${MKDIR} ${DOCSDIR}	41	@${MKDIR} ${DOCSDIR}
29	@${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}	42	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
		43	@${GZIP_CMD} ${DOCSDIR}/*.txt
30	@${MKDIR} ${DOCSDIR}/manual	44	@${MKDIR} ${DOCSDIR}/manual
31	@${INSTALL_DATA} ${WRKSRC}/Doc/*.txt ${DOCSDIR}/manual	45	${INSTALL_DATA} ${WRKSRC}/Doc/*.txt ${DOCSDIR}/manual
32	@${GZIP_CMD} ${DOCSDIR}/.txt ${DOCSDIR}/manual/.txt	46	@${GZIP_CMD} ${DOCSDIR}/manual/*.txt
33	.endif	47	.endif
34		48
35	.include <bsd.port.mk>	49	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/jwasm/distinfo (-2 / +2 lines)
1	SHA256 (JWasm207as.zip) = 78c6f76ab729d9ecccf0a7fcf335457d6f76b613172a85c8d44b56ef79d328cc	1	SHA256 (JWasm208s.zip) = 7d0159c80b16c4c7c4b6391cb913b525039614ae9b82f3cd6756177d79b4fe58
2	SIZE (JWasm207as.zip) = 804843	2	SIZE (JWasm208s.zip) = 822030




--- 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




--- 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




JWasm Features:

- JWasm natively supports output formats Intel OMF, MS Coff (32- and 
  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 SSSE3 are supported.
- The JWasm source is portable and has successfully been tested with Open 
  Watcom, MS VC, GCC and more.
- As far as programming for Windows is concerned, JWasm can be used with 
  both Win32Inc and Masm32.
- C header files can be converted to include files for JWasm with h2incX.

WWW: http://www.japheth.de/JWasm.html

Lines 1-11 Link Here

(-)devel/jwasm/pkg-plist (-11 lines)
1	@comment $FreeBSD: ports/devel/jwasm/pkg-plist,v 1.2 2012/08/03 02:06:44 wxs Exp $
2	bin/jwasm
3	%%PORTDOCS%%%%DOCSDIR%%/History.txt.gz
4	%%PORTDOCS%%%%DOCSDIR%%/License.txt.gz
5	%%PORTDOCS%%%%DOCSDIR%%/Readme.txt.gz
6	%%PORTDOCS%%%%DOCSDIR%%/manual/enh.txt.gz
7	%%PORTDOCS%%%%DOCSDIR%%/manual/fixes.txt.gz
8	%%PORTDOCS%%%%DOCSDIR%%/manual/gencode.txt.gz
9	%%PORTDOCS%%%%DOCSDIR%%/manual/overview.txt.gz
10	%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
11	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 171986

Lines 1-20 Link Here

(-)devel/jwasm/files/patch-GccUnix.mak (-20 lines)
1	--- GccUnix.mak.orig 2009-06-07 14:07:37.000000000 -0500
2	+++ GccUnix.mak 2009-06-07 14:09:18.000000000 -0500
3	@@ -14,7 +14,7 @@
4	#cflags stuff
5
6	ifeq ($(DEBUG),0)
7	-extra_c_flags = -DNDEBUG -O2
8	+extra_c_flags = -DNDEBUG ${CFLAGS}
9	OUTD=GccUnixR
10	else
11	extra_c_flags = -DDEBUG_OUT -g
12	@@ -23,7 +23,7 @@
13
14	c_flags =-D__UNIX__ $(extra_c_flags)
15
16	-CC = gcc
17	+#CC = cc
18
19	.SUFFIXES:
20	.SUFFIXES: .c .o

Lines 1-20 Link Here

(-)devel/jwasm/files/patch-H__memalloc.h (-20 lines)
1	--- H/memalloc.h.orig 2012-07-29 14:44:42.000000000 -0500
2	+++ H/memalloc.h 2012-07-29 14:51:44.000000000 -0500
3	@@ -40,14 +40,15 @@
4	#if defined(__WATCOMC__) \|\| defined(__BORLANDC__) \|\| defined(__OCC__)
5	#define myalloca alloca
6	#include <malloc.h>
7	-#elif defined(__GNUC__) \|\| defined(__TINYC__)
8	+#elif (defined(__GNUC__) \|\| defined(__TINYC__)) && !defined(__FreeBSD__)
9	#define myalloca alloca
10	#include <malloc.h> /* added v2.07 */
11	#elif defined(__PCC__)
12	#define myalloca _alloca
13	#include <malloc.h>
14	#else
15	-#define myalloca _alloca
16	+#define myalloca alloca
17	+#include <stdlib.h>
18	#endif
19
20	/* AsmAlloc() and AsmFree() are fast variants, which

Lines 6-19 Link Here

(-)devel/jwasm/pkg-descr (-5 / +5 lines)
6	JWasm Features:	6	JWasm Features:
7		7
8	- JWasm natively supports output formats Intel OMF, MS Coff (32- and	8	- JWasm natively supports output formats Intel OMF, MS Coff (32- and
9	64-bit), Elf (32-and 64-bit), Bin and DOS MZ.	9	64-bit), Elf (32- and 64-bit), Bin and DOS MZ.
10	- precompiled JWasm binaries are available for DOS, Windows and Linux. For	10	- precompiled JWasm binaries are available for DOS, Windows and Linux. For
11	OS/2 and FreeBSD, makefiles are supplied.	11	OS/2 and FreeBSD, makefiles are supplied.
12	- Instructions up to AVX are supported.	12	- Instructions up to SSSE3 are supported.
13	- The JWasm source is portable and has successfully been tested with Open	13	- The JWasm source is portable and has successfully been tested with Open
14	Watcom, MS VC, GCC and more.	14	Watcom, MS VC, GCC and more.
15	- As far as programming for Windows is concerned, JWasm can be used with	15	- As far as programming for Windows is concerned, JWasm can be used with
16	both Win32Inc and Masm32.	16	both Win32Inc and Masm32.
17	- C header files can be converted to include files for JWasm with h2incX.	17	- C header files can be converted to include files for JWasm with h2incX.
18		18
19	WWW: http://www.japheth.de/JWasm.html	19	WWW: http://www.japheth.de/JWasm.html