Index: head/games/wxlauncher/Makefile =================================================================== --- head/games/wxlauncher/Makefile (revision 551591) +++ head/games/wxlauncher/Makefile (revision 551592) @@ -1,64 +1,64 @@ # Created by: lightside # $FreeBSD$ PORTNAME= wxlauncher PORTVERSION= 0.10.0 -PORTREVISION= 5 DISTVERSIONPREFIX= release- +PORTREVISION= 6 CATEGORIES= games MAINTAINER= lightside@gmx.com COMMENT= Multi-platform launcher for the Freespace 2 Source Code Project LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/GPLv2.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} +USES= cmake openal pkgconfig python:build sdl +USE_SDL= sdl2 USE_GITHUB= yes GH_ACCOUNT= scp-fs2open GH_PROJECT= wxLauncher -USES= cmake openal pkgconfig python:2.7,build sdl -USE_SDL= sdl2 CMAKE_ARGS+= -DRESOURCES_PATH:STRING="${DATADIR}" PORTDATA= * PORTDOCS= Authors.md License.txt ReadMe*.md Thanks.txt PLIST_FILES= bin/${PORTNAME} \ share/pixmaps/${PORTNAME}.png DESKTOP_ENTRIES="wxLauncher" "${COMMENT}" \ "${PORTNAME}" "${PORTNAME}" \ "Game;" false OPTIONS_DEFINE= DEBUG DOCS JOYSTICK WX3 OPTIONS_DEFAULT= JOYSTICK WX3 DEBUG_CXXFLAGS_OFF= -DNDEBUG JOYSTICK_DESC= Build with joystick support JOYSTICK_CMAKE_ON= -DUSE_JOYSTICK:BOOL=ON JOYSTICK_CMAKE_OFF= -DUSE_JOYSTICK:BOOL=OFF WX3_DESC= Build with using wxWidgets 3.0+ version (2.8 otherwise) WX3_CXXFLAGS= -std=c++11 WX3_USES= compiler:c++11-lib WX3_USE= WX=3.0+ WX3_USE_OFF= WX=2.8 WX3_CMAKE_ON= -DWXVER:STRING="3.0" WX3_CMAKE_OFF= -DWXVER:STRING="2.8" post-patch: .SILENT # Change version_strings.cpp.in file, based on GH_TAGNAME, without using git ${REINPLACE_CMD} -e '/find_program(GIT_EXECUTABLE/d ; \ /version_strings.cpp will be generated/d' \ ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e 's|123456789abc+ unknown custom tip|${GH_TAGNAME}|' \ ${WRKSRC}/code/global/version_strings.cpp.in pre-install: ${INSTALL_DATA} ${WRKSRC}/onlinehelp/images/header.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include Index: head/games/wxlauncher/files/patch-scripts_helpparsers.py =================================================================== --- head/games/wxlauncher/files/patch-scripts_helpparsers.py (nonexistent) +++ head/games/wxlauncher/files/patch-scripts_helpparsers.py (revision 551592) @@ -0,0 +1,22 @@ +--- scripts/helpparsers.py.orig 2020-09-26 12:23:32 UTC ++++ scripts/helpparsers.py +@@ -6,16 +6,16 @@ import traceback + import sys + import shutil + +-import HTMLParser ++import html.parser + + from dataclasses import Tag + from utilfunctions import update_attribute, change_filename + +-class OutputParser(HTMLParser.HTMLParser): ++class OutputParser(html.parser.HTMLParser): + """The class is designed to be used as a base class. It will output the same html structure as the input file into a file like object (only needs write).""" + + def __init__(self, file, *args, **kwargs): +- HTMLParser.HTMLParser.__init__(self, *args, **kwargs) ++ html.parser.HTMLParser.__init__(self, *args, **kwargs) + + if hasattr(file, 'write'): + self.outputfile = file Property changes on: head/games/wxlauncher/files/patch-scripts_helpparsers.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/wxlauncher/files/patch-scripts_onlinehelpmaker.py =================================================================== --- head/games/wxlauncher/files/patch-scripts_onlinehelpmaker.py (nonexistent) +++ head/games/wxlauncher/files/patch-scripts_onlinehelpmaker.py (revision 551592) @@ -0,0 +1,54 @@ +--- scripts/onlinehelpmaker.py.orig 2015-08-26 04:54:06 UTC ++++ scripts/onlinehelpmaker.py +@@ -9,14 +9,14 @@ import string + from optparse import OptionParser + import logging + NOTICE = 25 # added level for app +-import HTMLParser ++import html.parser + + try: + import markdown + except ImportError: +- print "ERROR: Unable to import markdown the markup parser." +- print " Make sure that markdown has been installed" +- print " see the ReadMe.txt for more information" ++ print("ERROR: Unable to import markdown the markup parser.") ++ print(" Make sure that markdown has been installed") ++ print(" see the ReadMe.txt for more information") + raise + + from helpparsers import Stage2Parser, Stage3Parser, Stage4Parser, Stage5Parser +@@ -203,7 +203,7 @@ def generate_paths(options): + for i in range(1, 7): + paths['stage%d'%(i)] = os.path.join(options.temp, 'stage%d'%(i)) + +- for path in paths.values(): ++ for path in list(paths.values()): + if not os.path.exists(path): + logging.debug(" Making %s", path) + os.makedirs(path) +@@ -304,9 +304,9 @@ def process_input_stage3(file, options, files, extrafi + outfile = open(outname, mode="w") + + #figure out what subdirectory of the onlinehelp I am in +- subdir = string.replace(os.path.dirname(outname), os.path.normpath(files['stage3']), "") ++ subdir = os.path.dirname(outname).replace(os.path.normpath(files['stage3']), "") + if subdir.startswith(os.path.sep): +- subdir = string.replace(subdir, os.path.sep, "", 1) # I only want to remove the leading sep ++ subdir = subdir.replace(os.path.sep, "", 1) # I only want to remove the leading sep + + parser = Stage3Parser(options, files, file=outfile, extrafiles=extrafiles, subdir=subdir) + parser.feed(input) +@@ -325,9 +325,9 @@ def process_input_stage4(file, options, files): + outfile = open(outname, mode="w") + + #figure out what subdirectory of the onlinehelp I am in +- subdir = string.replace(os.path.dirname(outname), os.path.normpath(files['stage4']), "") ++ subdir = os.path.dirname(outname).replace(os.path.normpath(files['stage4']), "") + if subdir.startswith(os.path.sep): +- subdir = string.replace(subdir, os.path.sep, "", 1) # I only want to remove the leading sep ++ subdir = subdir.replace(os.path.sep, "", 1) # I only want to remove the leading sep + + parser = Stage4Parser(files=files, file=outfile, options=options, + subdir=subdir) Property changes on: head/games/wxlauncher/files/patch-scripts_onlinehelpmaker.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property