Attachment #211118 for bug #242997




MAINTAINER=		ports@FreeBSD.org
COMMENT=		Trade and combat space simulator, clone of Elite

DEPRECATED=	Unmaintained, uses EOLed python27
EXPIRATION_DATE=	2020-01-27

LICENSE=		CC-BY-NC-SA-3.0 GPLv2 ZLIB
LICENSE_COMB=		multi
LICENSE_FILE_CC-BY-NC-SA-3.0=	${WRKSRC}/Doc/LICENSE.TXT

			libpng.so:graphics/png \
			libminizip.so:archivers/minizip

USES=			gl gnustep openal:al perl5 python:3.5+,build sdl \
			tar:bzip2 xorg
USE_CXXSTD=		gnu++98
USE_GL=			gl glu

USE_SDL=		sdl
USE_XORG=		x11
USE_GNUSTEP=		base build

MAKE_ENV=		ac_cv_path_PYTHON=${PYTHON_CMD}
# Redefine DO_MAKE_BUILD, because current gnustep in USES overrides MAKEFILE
# without possibility to change it, as it was done in the previous implementation
DO_MAKE_BUILD=		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}




# Patch for Python 3.x support, created with using 2to3 program.

--- deps/mozilla/js/src/build/cl.py.orig	2014-05-17 17:57:43 UTC
+++ deps/mozilla/js/src/build/cl.py
@@ -51,7 +51,7 @@ def InvokeClWithDependencyGeneration(cmd
             break
 
     if target == None:
-        print >>sys.stderr, "No target set" and sys.exit(1)
+        print("No target set" and sys.exit(1), file=sys.stderr)
 
     # The deps target lives here
     depstarget = os.path.basename(target) + ".pp"
@@ -90,7 +90,7 @@ def InvokeClWithDependencyGeneration(cmd
 
     f = open(depstarget, "w")
     for dep in sorted(deps):
-        print >>f, "%s: %s" % (target, dep)
+        print("%s: %s" % (target, dep), file=f)
 
 if __name__ == "__main__":
     InvokeClWithDependencyGeneration(sys.argv[1:])
--- deps/mozilla/js/src/imacro_asm.py.orig	2014-05-17 17:57:43 UTC
+++ deps/mozilla/js/src/imacro_asm.py
@@ -456,7 +456,7 @@ def assemble(filename, outfile):
 if __name__ == '__main__':
     import sys
     if len(sys.argv) != 3:
-        print "usage: python imacro_asm.py infile.jsasm outfile.c.out"
+        print("usage: python imacro_asm.py infile.jsasm outfile.c.out")
         sys.exit(1)
 
     f = open(sys.argv[2], 'w')

Lines 1-7 Link Here

(-)games/oolite/files/patch-deps_mozilla_js_src_configure (-2 / +16 lines)
1	--- deps/mozilla/js/src/configure.orig 2014-06-30 08:54:39 UTC	1	--- deps/mozilla/js/src/configure.orig 2014-05-17 17:57:43 UTC
2	+++ deps/mozilla/js/src/configure	2	+++ deps/mozilla/js/src/configure
3	@@ -9547,7 +9547,8 @@	3	@@ -6490,10 +6490,10 @@ case "$host" in
		4	;;
		5	esac
4		6
		7	-echo $ac_n "checking for Python version >= $PYTHON_VERSION but not 3.x""... $ac_c" 1>&6
		8	-echo "configure:6495: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5
		9	+echo $ac_n "checking for Python version >= $PYTHON_VERSION""... $ac_c" 1>&6
		10	+echo "configure:6495: checking for Python version >= $PYTHON_VERSION" >&5
		11
		12	-$PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1] or sys.version[:2] != '2.')" $PYTHON_VERSION
		13	+$PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1])" $PYTHON_VERSION
		14	_python_res=$?
		15
		16	if test "$_python_res" != 0; then
		17	@@ -9547,7 +9547,8 @@ fi
		18
5	echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6	19	echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6
6	if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \	20	if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
7	- "$ac_cv_have_visibility_class_bug" = "no"; then	21	- "$ac_cv_have_visibility_class_bug" = "no"; then




--- deps/mozilla/js/src/configure.in.orig	2014-06-30 08:54:39 UTC
+++ deps/mozilla/js/src/configure.in
@@ -3378,7 +3378,8 @@
                        rm -f conftest.{c,S}
                        ])
         if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
-                "$ac_cv_have_visibility_class_bug" = "no"; then
+                "$ac_cv_have_visibility_class_bug" = "no" -a \
+		"$OS_ARCH" != "FreeBSD" ; then
           VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
           WRAP_SYSTEM_INCLUDES=1
           STL_FLAGS='-I$(DIST)/stl_wrappers'

Return to bug 242997

Lines 12-20 Link Here

(-)games/oolite/Makefile (-4 / +3 lines)
12	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Trade and combat space simulator, clone of Elite	13	COMMENT= Trade and combat space simulator, clone of Elite
14		14
15	DEPRECATED= Unmaintained, uses EOLed python27
16	EXPIRATION_DATE= 2020-01-27
17
18	LICENSE= CC-BY-NC-SA-3.0 GPLv2 ZLIB	15	LICENSE= CC-BY-NC-SA-3.0 GPLv2 ZLIB
19	LICENSE_COMB= multi	16	LICENSE_COMB= multi
20	LICENSE_FILE_CC-BY-NC-SA-3.0= ${WRKSRC}/Doc/LICENSE.TXT	17	LICENSE_FILE_CC-BY-NC-SA-3.0= ${WRKSRC}/Doc/LICENSE.TXT
Lines 27-33 Link Here
27	libpng.so:graphics/png \	24	libpng.so:graphics/png \
28	libminizip.so:archivers/minizip	25	libminizip.so:archivers/minizip
29		26
30	USES= gl gnustep openal:al perl5 python:2.7,build sdl \	27	USES= gl gnustep openal:al perl5 python:3.5+,build sdl \
31	tar:bzip2 xorg	28	tar:bzip2 xorg
32	USE_CXXSTD= gnu++98	29	USE_CXXSTD= gnu++98
33	USE_GL= gl glu	30	USE_GL= gl glu
Lines 34-39 Link Here
34	USE_SDL= sdl	31	USE_SDL= sdl
35	USE_XORG= x11	32	USE_XORG= x11
36	USE_GNUSTEP= base build	33	USE_GNUSTEP= base build
		34
		35	MAKE_ENV= ac_cv_path_PYTHON=${PYTHON_CMD}
37	# Redefine DO_MAKE_BUILD, because current gnustep in USES overrides MAKEFILE	36	# Redefine DO_MAKE_BUILD, because current gnustep in USES overrides MAKEFILE
38	# without possibility to change it, as it was done in the previous implementation	37	# without possibility to change it, as it was done in the previous implementation
39	DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}	38	DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}

Line 0 Link Here

(-)games/oolite/files/patch-deps_mozilla_js_src.diff (+33 lines)
	1	# Patch for Python 3.x support, created with using 2to3 program.
	2
	3	--- deps/mozilla/js/src/build/cl.py.orig 2014-05-17 17:57:43 UTC
	4	+++ deps/mozilla/js/src/build/cl.py
	5	@@ -51,7 +51,7 @@ def InvokeClWithDependencyGeneration(cmd
	6	break
	7
	8	if target == None:
	9	- print >>sys.stderr, "No target set" and sys.exit(1)
	10	+ print("No target set" and sys.exit(1), file=sys.stderr)
	11
	12	# The deps target lives here
	13	depstarget = os.path.basename(target) + ".pp"
	14	@@ -90,7 +90,7 @@ def InvokeClWithDependencyGeneration(cmd
	15
	16	f = open(depstarget, "w")
	17	for dep in sorted(deps):
	18	- print >>f, "%s: %s" % (target, dep)
	19	+ print("%s: %s" % (target, dep), file=f)
	20
	21	if __name__ == "__main__":
	22	InvokeClWithDependencyGeneration(sys.argv[1:])
	23	--- deps/mozilla/js/src/imacro_asm.py.orig 2014-05-17 17:57:43 UTC
	24	+++ deps/mozilla/js/src/imacro_asm.py
	25	@@ -456,7 +456,7 @@ def assemble(filename, outfile):
	26	if __name__ == '__main__':
	27	import sys
	28	if len(sys.argv) != 3:
	29	- print "usage: python imacro_asm.py infile.jsasm outfile.c.out"
	30	+ print("usage: python imacro_asm.py infile.jsasm outfile.c.out")
	31	sys.exit(1)
	32
	33	f = open(sys.argv[2], 'w')

Lines 1-12 Link Here

(-)games/oolite/files/patch-deps_mozilla_js_src_configure.in (-12 lines)
1	--- deps/mozilla/js/src/configure.in.orig 2014-06-30 08:54:39 UTC
2	+++ deps/mozilla/js/src/configure.in
3	@@ -3378,7 +3378,8 @@
4	rm -f conftest.{c,S}
5	])
6	if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
7	- "$ac_cv_have_visibility_class_bug" = "no"; then
8	+ "$ac_cv_have_visibility_class_bug" = "no" -a \
9	+ "$OS_ARCH" != "FreeBSD" ; then
10	VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
11	WRAP_SYSTEM_INCLUDES=1
12	STL_FLAGS='-I$(DIST)/stl_wrappers'