svn commit: r551592 - in head/games/wxlauncher: . files
Loïc Bartoletti
lbartoletti at FreeBSD.org
Tue Oct 6 20:16:41 UTC 2020
Author: lbartoletti
Date: Tue Oct 6 20:16:39 2020
New Revision: 551592
URL: https://svnweb.freebsd.org/changeset/ports/551592
Log:
games/wxlauncher: Remove python 2.x dependency
PR: 249689
Submitted by: lightside (maintainer)
Reported by: swills
Added:
head/games/wxlauncher/files/patch-scripts_helpparsers.py (contents, props changed)
head/games/wxlauncher/files/patch-scripts_onlinehelpmaker.py (contents, props changed)
Modified:
head/games/wxlauncher/Makefile
Modified: head/games/wxlauncher/Makefile
==============================================================================
--- head/games/wxlauncher/Makefile Tue Oct 6 18:32:42 2020 (r551591)
+++ head/games/wxlauncher/Makefile Tue Oct 6 20:16:39 2020 (r551592)
@@ -3,8 +3,8 @@
PORTNAME= wxlauncher
PORTVERSION= 0.10.0
-PORTREVISION= 5
DISTVERSIONPREFIX= release-
+PORTREVISION= 6
CATEGORIES= games
MAINTAINER= lightside at gmx.com
@@ -16,12 +16,12 @@ 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= *
Added: head/games/wxlauncher/files/patch-scripts_helpparsers.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/wxlauncher/files/patch-scripts_helpparsers.py Tue Oct 6 20:16:39 2020 (r551592)
@@ -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
Added: head/games/wxlauncher/files/patch-scripts_onlinehelpmaker.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/wxlauncher/files/patch-scripts_onlinehelpmaker.py Tue Oct 6 20:16:39 2020 (r551592)
@@ -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)
More information about the svn-ports-all
mailing list