Attachment #231728 for bug #261874

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




# Created by: Janni

PORTNAME=	gxemul
PORTVERSION=	0.7.0
CATEGORIES=	emulators
MASTER_SITES=	http://gavare.se/gxemul/src/

MAINTAINER=	mclay@astate.edu
COMMENT=	Instruction-level machine emulator

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-valgrind \
		--without-unittests
CONFIGURE_ENV=	CXX=${CXX} \
		LOCALBASE=${LOCALBASE} \
		PREFIX=${PREFIX}

Lines 1-3 Link Here

(-)b/emulators/gxemul/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1613553517	1	TIMESTAMP = 1644505943
2	SHA256 (gxemul-0.6.3.tar.gz) = 163604d4888218e5fdbc6858b9fc1ec1607d005eadbec424f3a9663e1f2986ed	2	SHA256 (gxemul-0.7.0.tar.gz) = 79c4437c6f8ca904f46d33ac36062a65fdcf4a92a248478e408ab11295cf8e83
3	SIZE (gxemul-0.6.3.tar.gz) = 6024573	3	SIZE (gxemul-0.7.0.tar.gz) = 5985021




--- configure.orig	2021-04-22 18:04:21 UTC
+++ configure
@@ -330,10 +330,10 @@ if [ z$NOX11 = z ]; then
 
 	XOK=0
 
-	XINCLUDE=-I/usr/X11R6/include
+	XINCLUDE=-I${LOCALBASE}/include
 	$CC $CFLAGS _test_x11.c -c -o _test_x11.o $XINCLUDE 2> /dev/null
 
-	XLIB="-L/usr/X11R6/lib -lX11 -Wl,-rpath,/usr/X11R6/lib"
+	XLIB="-L${LOCALBASE}/lib -lX11 -Wl,-rpath,${LOCALBASE}/lib"
 	$CC $CFLAGS _test_x11.o -o _test_x11 $XLIB 2> /dev/null
 
 	if [ -x _test_x11 ]; then
@@ -539,27 +539,6 @@ else
 	fi
 fi
 rm -f _testprog _testprog.error _testprog.stdout

-
-#  -O optimization for non-debug builds. Try -O and -O3.
-if [ ! z"$DEBUG" = zYES ]; then
-	printf "checking whether -O3 or -O can be used (non-DEBUG build)... "
-	$CC $CFLAGS -O _testprog.c -o _testprog 2> /dev/null
-	if [ -x _testprog ]; then
-		rm -f _testprog
-		$CC $CFLAGS -O3 _testprog.c -o _testprog 2> /dev/null
-		if [ -x _testprog ]; then
-			CFLAGS="-O3 $CFLAGS"
-			printf "yes, -O3\n"
-		else
-			CFLAGS="-O $CFLAGS"
-			printf "yes, -O\n"
-		fi
-	else
-		printf "no\n"
-	fi
-fi
-rm -f _testprog

Lines 1-6 Link Here

(-)b/emulators/gxemul/files/patch-src_devices_dev__wdc.c (-5 / +4 lines)
1	--- src/devices/dev_wdc.cc.orig 2014-08-17 08:45:12 UTC	1	--- src/devices/dev_wdc.c.orig 2021-04-22 18:04:20 UTC
2	+++ src/devices/dev_wdc.cc	2	+++ src/devices/dev_wdc.c
3	@@ -274,12 +274,12 @@ void wdc__read(struct cpu *cpu, struct w	3	@@ -274,12 +274,12 @@ void wdc__read(struct cpu cpu, struct wdc_data d)
4	+ (int64_t)d->head * d->sectors_per_track[d->drive] +	4	+ (int64_t)d->head * d->sectors_per_track[d->drive] +
5	(int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);	5	(int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);
6		6
Lines 15-21 Link Here
15	#endif	15	#endif
16		16
17	while (count > 0) {	17	while (count > 0) {
18	@@ -320,12 +320,12 @@ void wdc__write(struct cpu *cpu, struct	18	@@ -320,12 +320,12 @@ void wdc__write(struct cpu cpu, struct wdc_data d)
19	uint64_t offset = 512 * (d->sector - 1	19	uint64_t offset = 512 * (d->sector - 1
20	+ (int64_t)d->head * d->sectors_per_track[d->drive] +	20	+ (int64_t)d->head * d->sectors_per_track[d->drive] +
21	(int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);	21	(int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);
22	-

Return to bug 261874

Lines 1-19 Link Here

(-)b/emulators/gxemul/Makefile (-4 / +2 lines)
1	# Created by: Janni	1	# Created by: Janni
2		2
3	PORTNAME= gxemul	3	PORTNAME= gxemul
4	PORTVERSION= 0.6.3	4	PORTVERSION= 0.7.0
5	CATEGORIES= emulators	5	CATEGORIES= emulators
6	MASTER_SITES= http://gavare.se/gxemul/src/	6	MASTER_SITES= http://gavare.se/gxemul/src/
7		7
8	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= mclay@astate.edu
9	COMMENT= Instruction-level machine emulator	9	COMMENT= Instruction-level machine emulator
10		10
11	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	HAS_CONFIGURE= yes	14	HAS_CONFIGURE= yes
15	CONFIGURE_ARGS= --disable-valgrind \
16	--without-unittests
17	CONFIGURE_ENV= CXX=${CXX} \	15	CONFIGURE_ENV= CXX=${CXX} \
18	LOCALBASE=${LOCALBASE} \	16	LOCALBASE=${LOCALBASE} \
19	PREFIX=${PREFIX}	17	PREFIX=${PREFIX}

Lines 1-19 Link Here

(-)b/emulators/gxemul/files/patch-configure (-11 / +16 lines)
1	--- configure.orig 2018-09-06 07:41:13 UTC	1	--- configure.orig 2021-04-22 18:04:21 UTC
2	+++ configure	2	+++ configure
3	@@ -360,10 +360,10 @@ if [ z$NOX11 = z ]; then	3	@@ -330,10 +330,10 @@ if [ z$NOX11 = z ]; then
4		4
5	XOK=0	5	XOK=0
6		6
7	- XINCLUDE=-I/usr/X11R6/include	7	- XINCLUDE=-I/usr/X11R6/include
8	+ XINCLUDE=-I${LOCALBASE}/include	8	+ XINCLUDE=-I${LOCALBASE}/include
9	$CXX $CXXFLAGS _test_x11.cc -c -o _test_x11.o $XINCLUDE 2> /dev/null	9	$CC $CFLAGS _test_x11.c -c -o _test_x11.o $XINCLUDE 2> /dev/null
10		10
11	- XLIB="-L/usr/X11R6/lib -lX11"	11	- XLIB="-L/usr/X11R6/lib -lX11 -Wl,-rpath,/usr/X11R6/lib"
12	+ XLIB="-L${LOCALBASE}/lib -lX11"	12	+ XLIB="-L${LOCALBASE}/lib -lX11 -Wl,-rpath,${LOCALBASE}/lib"
13	$CXX $CXXFLAGS _test_x11.o -o _test_x11 $XLIB 2> /dev/null	13	$CC $CFLAGS _test_x11.o -o _test_x11 $XLIB 2> /dev/null
14		14
15	if [ -x _test_x11 ]; then	15	if [ -x _test_x11 ]; then
16	@@ -578,22 +578,6 @@ else	16	@@ -539,27 +539,6 @@ else
17	fi	17	fi
18	fi	18	fi
19	rm -f _testprog _testprog.error _testprog.stdout	19	rm -f _testprog _testprog.error _testprog.stdout
Lines 21-35 Link Here
21	-	21	-
22	-# -O optimization for non-debug builds. Try -O and -O3.	22	-# -O optimization for non-debug builds. Try -O and -O3.
23	-if [ ! z"$DEBUG" = zYES ]; then	23	-if [ ! z"$DEBUG" = zYES ]; then
24	- $CXX $CXXFLAGS -O _testprog.cc -o _testprog 2> /dev/null	24	- printf "checking whether -O3 or -O can be used (non-DEBUG build)... "
		25	- $CC $CFLAGS -O _testprog.c -o _testprog 2> /dev/null
25	- if [ -x _testprog ]; then	26	- if [ -x _testprog ]; then
26	- rm -f _testprog	27	- rm -f _testprog
27	- $CXX $CXXFLAGS -O3 _testprog.cc -o _testprog 2> /dev/null	28	- $CC $CFLAGS -O3 _testprog.c -o _testprog 2> /dev/null
28	- if [ -x _testprog ]; then	29	- if [ -x _testprog ]; then
29	- CXXFLAGS="-O3 $CXXFLAGS"	30	- CFLAGS="-O3 $CFLAGS"
		31	- printf "yes, -O3\n"
30	- else	32	- else
31	- CXXFLAGS="-O $CXXFLAGS"	33	- CFLAGS="-O $CFLAGS"
		34	- printf "yes, -O\n"
32	- fi	35	- fi
		36	- else
		37	- printf "no\n"
33	- fi	38	- fi
34	-fi	39	-fi
35	-rm -f _testprog	40	-rm -f _testprog