cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to unbreak following the wxWidgets3 update

Browse Source 
ok ajacoutot@ landry@ giovanni@
This commit is contained in:
jca 2019-01-02 12:43:19 +00:00
parent c927ec4c04
commit 20c596a0d9
16 changed files with 1905 additions and 1715 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
games/golly/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:03 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2019/01/02 12:43:19 jca Exp $
COMMENT = game of life simulator
PKGNAME = golly-2.7
REVISION = 4
PKGNAME = golly-3.2
DISTNAME = ${PKGNAME}-src
WRKSRC = ${WRKDIST}/gui-wx/configure
CATEGORIES = games math
@ -17,21 +16,22 @@ HOMEPAGE = http://golly.sourceforge.net/
PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
LIB_DEPENDS = x11/wxWidgets
LIB_DEPENDS = x11/wxWidgets>=3.0.4
RUN_DEPENDS = devel/desktop-file-utils
WANTLIB += ${COMPILER_LIBCXX} c m wx_base wx_base_net wx_base_odbc
WANTLIB += wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc z
COMPILER = base-clang ports-gcc base-gcc
WANTLIB += ${COMPILER_LIBCXX} GL c m wx_baseu-3.0 wx_baseu_net-3.0
WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0 wx_gtk3u_gl-3.0
WANTLIB += wx_gtk3u_html-3.0 z
# Note: perl and python are loaded with wxDynamicLibrary.Load(), and
# python needs libutil to prevent undefined openpty and forkpty symbols.
WANTLIB += perl util ${MODPY_WANTLIB}
COMPILER = base-clang ports-gcc base-gcc
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-unicode
CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib -R${X11BASE}/lib ${LDFLAGS}"
SEPARATE_BUILD = Yes
FAKE_FLAGS = dist_doc_DATA="" \

4
games/golly/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (golly-2.7-src.tar.gz) = TuhuQuFsCeQaqEkvZuWkoep6EwxavEPZYuLx1WBL2XE=
SIZE (golly-2.7-src.tar.gz) = 3805524
SHA256 (golly-3.2-src.tar.gz) = TQL3hZK16iEfHO2i1bpV6xDgE+z5W4phxwYTV/mq6TE=
SIZE (golly-3.2-src.tar.gz) = 5261483

14
games/golly/patches/patch-gui-wx_configure_Makefile_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gui-wx_configure_Makefile_in,v 1.1 2017/05/17 13:53:49 espie Exp $
Index: gui-wx/configure/Makefile.in
--- gui-wx/configure/Makefile.in.orig
+++ gui-wx/configure/Makefile.in
@@ -312,7 +312,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I$(top_srcdir)/../../gollybase/
AM_CXXFLAGS = -DGOLLYDIR="$(GOLLYDIR)" -Wall -fno-strict-aliasing
-AM_LDFLAGS = -Wl,--as-needed
+AM_LDFLAGS =
noinst_LIBRARIES = libgolly.a
doc_DATA = ../../docs/License.html ../../docs/ReadMe.html
libgolly_a_SOURCES = ../../gollybase/bigint.h \

33
games/golly/patches/patch-gui-wx_configure_configure
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-gui-wx_configure_configure,v 1.3 2017/05/17 13:53:49 espie Exp $
$OpenBSD: patch-gui-wx_configure_configure,v 1.4 2019/01/02 12:43:19 jca Exp $
Don't force -O2.
Index: gui-wx/configure/configure
--- gui-wx/configure/configure.orig
+++ gui-wx/configure/configure
@@ -3752,17 +3752,9 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
@@ -3744,17 +3744,9 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@ -25,7 +25,7 @@ Index: gui-wx/configure/configure
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
@@ -4679,17 +4671,9 @@ $as_echo "$ac_cv_prog_cxx_g" >&6; }
@@ -4672,17 +4664,9 @@ $as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
@ -45,7 +45,32 @@ Index: gui-wx/configure/configure
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -6362,9 +6346,6 @@ $as_echo "$WX_PORT" >&6; }
@@ -5793,7 +5777,7 @@ $as_echo "will be automatically detected" >&6; }
else
TOOLKIT="$withval"
- if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \
+ if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \
"$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
"$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
"$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then
@@ -6268,6 +6252,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec
WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
+ WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".*gtk3.*")
WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
@@ -6279,6 +6264,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec
WX_PORT="unknown"
if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
+ if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi
if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
@@ -6353,9 +6339,6 @@ $as_echo "$WX_PORT" >&6; }
if test "$DEBUG" = "1"; then
CXXFLAGS="$CXXFLAGS -g -O0"
CFLAGS="$CFLAGS -g -O0"

11
games/golly/patches/patch-gui-wx_wxpython_cpp
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-gui-wx_wxpython_cpp,v 1.1 2013/09/09 15:43:25 landry Exp $
--- gui-wx/wxpython.cpp.orig Wed Jun 12 21:23:56 2013
+++ gui-wx/wxpython.cpp Sun Aug 25 11:15:51 2013
@@ -258,6 +258,8 @@ static void GetPythonExceptions()
$OpenBSD: patch-gui-wx_wxpython_cpp,v 1.2 2019/01/02 12:43:19 jca Exp $
Index: gui-wx/wxpython.cpp
--- gui-wx/wxpython.cpp.orig
+++ gui-wx/wxpython.cpp
@@ -237,6 +237,8 @@ static void GetPythonExceptions()
Py_XDECREF(exmod);
}
@ -10,7 +11,7 @@ $OpenBSD: patch-gui-wx_wxpython_cpp,v 1.1 2013/09/09 15:43:25 landry Exp $
// handle for Python lib
static wxDllType pythondll = NULL;
@@ -267,15 +269,37 @@ static void FreePythonLib()
@@ -246,15 +248,37 @@ static void FreePythonLib()
wxDynamicLibrary::Unload(pythondll);
pythondll = NULL;
}

246
games/golly/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2018/06/27 21:03:46 espie Exp $
@comment $OpenBSD: PLIST,v 1.5 2019/01/02 12:43:19 jca Exp $
@bin bin/bgolly
@bin bin/golly
share/applications/golly.desktop
@ -8,8 +8,13 @@ share/golly/Help/Algorithms/
share/golly/Help/Algorithms/Generations.html
share/golly/Help/Algorithms/HashLife.html
share/golly/Help/Algorithms/JvN.html
share/golly/Help/Algorithms/Larger_than_Life.html
share/golly/Help/Algorithms/NC.png
share/golly/Help/Algorithms/NM.png
share/golly/Help/Algorithms/NN.png
share/golly/Help/Algorithms/QuickLife.html
share/golly/Help/Algorithms/RuleLoader.html
share/golly/Help/Algorithms/hensel.png
share/golly/Help/Lexicon/
share/golly/Help/Lexicon/lex.htm
share/golly/Help/Lexicon/lex_1.htm
@ -41,7 +46,6 @@ share/golly/Help/Lexicon/lex_x.htm
share/golly/Help/Lexicon/lex_y.htm
share/golly/Help/Lexicon/lex_z.htm
share/golly/Help/Lexicon/modify.pl
share/golly/Help/about.gif
share/golly/Help/about.html
share/golly/Help/algos.html
share/golly/Help/archives.html
@ -53,46 +57,29 @@ share/golly/Help/edit.html
share/golly/Help/file.html
share/golly/Help/formats.html
share/golly/Help/help.html
share/golly/Help/images/
share/golly/Help/images/about.gif
share/golly/Help/images/blend0.png
share/golly/Help/images/blend1.png
share/golly/Help/images/clips.png
share/golly/Help/images/hex.png
share/golly/Help/images/layers.png
share/golly/Help/images/lifeviewer.png
share/golly/Help/images/theme.png
share/golly/Help/images/transforms.png
share/golly/Help/index.html
share/golly/Help/intro.html
share/golly/Help/layer.html
share/golly/Help/lifeviewer.html
share/golly/Help/lua.html
share/golly/Help/mouse.html
share/golly/Help/perl.html
share/golly/Help/overlay.html
share/golly/Help/problems.html
share/golly/Help/python.html
share/golly/Help/refs.html
share/golly/Help/tips.html
share/golly/Help/view.html
share/golly/Patterns/
share/golly/Patterns/Banks/
share/golly/Patterns/Banks/Banks-I-demo.rle
share/golly/Patterns/Banks/Banks-II-demo.rle
share/golly/Patterns/Banks/Banks-III-demo.rle
share/golly/Patterns/Banks/Banks-IV-constructor.rle.gz
share/golly/Patterns/Banks/Banks-IV-demo.rle
share/golly/Patterns/Codd/
share/golly/Patterns/Codd/Goucher-replicator.mc.gz
share/golly/Patterns/Codd/clocking-on-demo.rle
share/golly/Patterns/Codd/coders-demo.rle
share/golly/Patterns/Codd/construction-arm-demo.rle
share/golly/Patterns/Codd/crossover-unidir-demo.rle
share/golly/Patterns/Codd/decoder-4bit-demo.rle.gz
share/golly/Patterns/Codd/echo-discriminator.rle
share/golly/Patterns/Codd/echo-switch-demo.rle
share/golly/Patterns/Codd/extend-coder-demo.rle
share/golly/Patterns/Codd/gates-demo.rle
share/golly/Patterns/Codd/golly-constructor.rle.gz
share/golly/Patterns/Codd/repeater-emitter-demo.rle
share/golly/Patterns/Codd/sensing-demo.rle
share/golly/Patterns/Codd/sheathing-demo.rle
share/golly/Patterns/Codd/sheathing-problems.rle
share/golly/Patterns/Codd/signals-demo.rle
share/golly/Patterns/Codd/tape-reader-demo.rle
share/golly/Patterns/Devore/
share/golly/Patterns/Devore/Devore-body.rle
share/golly/Patterns/Devore/Devore-rep.rle
share/golly/Patterns/Devore/crossover.rle
share/golly/Patterns/Devore/discriminator.rle
share/golly/Patterns/Generations/
share/golly/Patterns/Generations/Banner.mcl
share/golly/Patterns/Generations/Bloomerang.mcl
@ -112,7 +99,6 @@ share/golly/Patterns/Generations/Steeplechase.mcl
share/golly/Patterns/Generations/Transers.mcl
share/golly/Patterns/Generations/What-a-mess.mcl
share/golly/Patterns/HashLife/
share/golly/Patterns/HashLife/Replicator-p237228340.mc.gz
share/golly/Patterns/HashLife/broken-lines.mc
share/golly/Patterns/HashLife/catacryst.mc
share/golly/Patterns/HashLife/gotts-dots.mc
@ -121,6 +107,7 @@ share/golly/Patterns/HashLife/hashlife-oddity2.mc
share/golly/Patterns/HashLife/hexadecimal.mc.gz
share/golly/Patterns/HashLife/jagged.mc
share/golly/Patterns/HashLife/jagged2.mc
share/golly/Patterns/HashLife/linear-propagator-p237228340.mc.gz
share/golly/Patterns/HashLife/loafer-gun-p8388608-linear.mc.gz
share/golly/Patterns/HashLife/logarithmic-width.mc
share/golly/Patterns/HashLife/metacatacryst.mc
@ -133,35 +120,38 @@ share/golly/Patterns/HashLife/nick-gotts-2.mc
share/golly/Patterns/HashLife/puzzle.mc
share/golly/Patterns/HashLife/ruler.mc
share/golly/Patterns/HashLife/totalperiodic.mc
share/golly/Patterns/HashLife/triple-Snark-wick-extruder.rle.gz
share/golly/Patterns/HashLife/unlimited-novelty.mc
share/golly/Patterns/HashLife/wedge-grow.mc
share/golly/Patterns/HashLife/wolfram22.mc
share/golly/Patterns/JvN/
share/golly/Patterns/JvN/Boustrophedon-replicator.rle
share/golly/Patterns/JvN/Hutton-replicator.rle
share/golly/Patterns/JvN/JvN-loop-replicator.rle.gz
share/golly/Patterns/JvN/N-compressed-replicator.rle
share/golly/Patterns/JvN/NP-mutation.rle.gz
share/golly/Patterns/JvN/NP-replicator.rle.gz
share/golly/Patterns/JvN/cell-coders-demo.rle
share/golly/Patterns/JvN/codon4-auto-retract.rle
share/golly/Patterns/JvN/codon5-auto-retract.rle
share/golly/Patterns/JvN/construction-arm-demo.rle
share/golly/Patterns/JvN/counter-demo.rle
share/golly/Patterns/JvN/golly-constructor.rle
share/golly/Patterns/JvN/partial-constructor.mc.gz
share/golly/Patterns/JvN/read-arm-demo.rle
share/golly/Patterns/JvN/sphinx-midpoint.mc.gz
share/golly/Patterns/JvN/sphinx-spark.mc.gz
share/golly/Patterns/JvN/sphinx.mc.gz
share/golly/Patterns/Larger-than-Life/
share/golly/Patterns/Larger-than-Life/Blinkers.mcl
share/golly/Patterns/Larger-than-Life/Bosco.mcl
share/golly/Patterns/Larger-than-Life/BugCollection.rle
share/golly/Patterns/Larger-than-Life/BugGun.rle
share/golly/Patterns/Larger-than-Life/BugReactions.rle
share/golly/Patterns/Larger-than-Life/Butterfly.rle
share/golly/Patterns/Larger-than-Life/Globe.mcl
share/golly/Patterns/Larger-than-Life/Gnarl.mcl
share/golly/Patterns/Larger-than-Life/GunCollection.rle
share/golly/Patterns/Larger-than-Life/Jitterbug.rle
share/golly/Patterns/Larger-than-Life/Majority.mcl
share/golly/Patterns/Larger-than-Life/ModernArt.mcl
share/golly/Patterns/Larger-than-Life/R100-NN-bug.rle
share/golly/Patterns/Larger-than-Life/R100-alien-bug.rle
share/golly/Patterns/Larger-than-Life/R500-alien-bug.rle
share/golly/Patterns/Larger-than-Life/SlowShip.rle
share/golly/Patterns/Larger-than-Life/SoldierBugs.rle
share/golly/Patterns/Larger-than-Life/Waffle.mcl
share/golly/Patterns/Life/
share/golly/Patterns/Life-Like/
share/golly/Patterns/Life-Like/Day-and-Night-gun-and-antigun.rle
share/golly/Patterns/Life-Like/HighLife-replicator-spaceship.rle
share/golly/Patterns/Life-Like/Morley/
share/golly/Patterns/Life-Like/Morley/breeder2.rle
share/golly/Patterns/Life-Like/Morley/enterprise-gun.rle
share/golly/Patterns/Life-Like/Morley/growing-ship.rle
share/golly/Patterns/Life-Like/alt-wicks.py
share/golly/Patterns/Life-Like/alt-wicks.lua
share/golly/Patterns/Life-Like/coral.rle
share/golly/Patterns/Life-Like/ice-nine.rle
share/golly/Patterns/Life-Like/p168-knightship.rle
@ -192,6 +182,7 @@ share/golly/Patterns/Life/Breeders/slide-breeder.rle
share/golly/Patterns/Life/Breeders/spacefiller.rle
share/golly/Patterns/Life/Breeders/switch-engine-breeder-MR.rle
share/golly/Patterns/Life/Breeders/switch-engine-breeder.rle
share/golly/Patterns/Life/Breeders/switch-engine-ping-pong.rle
share/golly/Patterns/Life/Guns/
share/golly/Patterns/Life/Guns/2c5-spaceship-gun-p416.rle
share/golly/Patterns/Life/Guns/2c5-spaceship-gun-p690.rle
@ -241,10 +232,12 @@ share/golly/Patterns/Life/Oscillators/DRH-oscillators.rle
share/golly/Patterns/Life/Oscillators/billiard-table.rle
share/golly/Patterns/Life/Oscillators/extensible-low-period.rle
share/golly/Patterns/Life/Oscillators/glider-stream-crystal.rle
share/golly/Patterns/Life/Oscillators/honey-farm-hasslers.rle
share/golly/Patterns/Life/Oscillators/low-period.rle
share/golly/Patterns/Life/Oscillators/p103079214841.rle
share/golly/Patterns/Life/Oscillators/p138.rle
share/golly/Patterns/Life/Oscillators/p59-glider-loop.py
share/golly/Patterns/Life/Oscillators/p59-glider-loop.lua
share/golly/Patterns/Life/Oscillators/phase-shift.rle
share/golly/Patterns/Life/Oscillators/queen-bee-turn.rle
share/golly/Patterns/Life/Oscillators/traffic-light-hasslers.rle
share/golly/Patterns/Life/Oscillators/unique-high-period.rle
@ -268,24 +261,27 @@ share/golly/Patterns/Life/Rakes/c5-adjustable-rake.rle
share/golly/Patterns/Life/Rakes/forward-LWSS-rake-p90.rle
share/golly/Patterns/Life/Rakes/p270-frothing-puffer-rake.rle
share/golly/Patterns/Life/Rakes/spider-rake.rle
share/golly/Patterns/Life/Rakes/weekender-distaff.rle.gz
share/golly/Patterns/Life/Signal-Circuitry/
share/golly/Patterns/Life/Signal-Circuitry/Herschel-conduit-stamp-collection.rle
share/golly/Patterns/Life/Signal-Circuitry/Turing-Machine-3-state.rle
share/golly/Patterns/Life/Signal-Circuitry/Unit-Life-Cell-512x512.rle
share/golly/Patterns/Life/Signal-Circuitry/Unit-Life-Deep-Cell.rle
share/golly/Patterns/Life/Signal-Circuitry/advancer.rle
share/golly/Patterns/Life/Signal-Circuitry/chase-the-glider.rle
share/golly/Patterns/Life/Signal-Circuitry/constructor-memory-loop.rle
share/golly/Patterns/Life/Signal-Circuitry/constructor-memory-tape.rle
share/golly/Patterns/Life/Signal-Circuitry/h-to-h-collection-26Aug2017.zip
share/golly/Patterns/Life/Signal-Circuitry/heisenblinker-30.rle
share/golly/Patterns/Life/Signal-Circuitry/heisenburp-30.rle
share/golly/Patterns/Life/Signal-Circuitry/heisenburp-46-natural.rle
share/golly/Patterns/Life/Signal-Circuitry/heisenburp-46.rle
share/golly/Patterns/Life/Signal-Circuitry/lightspeed-telegraph.rle
share/golly/Patterns/Life/Signal-Circuitry/high-bandwidth-telegraph.rle.gz
share/golly/Patterns/Life/Signal-Circuitry/p30-racetrack.rle
share/golly/Patterns/Life/Signal-Circuitry/p46racetrack.rle
share/golly/Patterns/Life/Signal-Circuitry/reflectors.rle
share/golly/Patterns/Life/Signal-Circuitry/reflectors2.rle
share/golly/Patterns/Life/Signal-Circuitry/signal-turn.rle
share/golly/Patterns/Life/Signal-Circuitry/signal-turns-and-fizzles.rle.gz
share/golly/Patterns/Life/Signal-Circuitry/single-channel-spiral-growth.rle.gz
share/golly/Patterns/Life/Signal-Circuitry/stargate.rle
share/golly/Patterns/Life/Signal-Circuitry/traffic-lights-extruder.rle
share/golly/Patterns/Life/Spaceships/
@ -300,7 +296,7 @@ share/golly/Patterns/Life/Spaceships/c4-orthogonal.rle
share/golly/Patterns/Life/Spaceships/corderships.rle
share/golly/Patterns/Life/Spaceships/diagonal.rle
share/golly/Patterns/Life/Spaceships/orthogonal.rle
share/golly/Patterns/Life/Spaceships/short-thin-race.rle
share/golly/Patterns/Life/Spaceships/short-thin.rle
share/golly/Patterns/Life/Spaceships/smallest-low-period.rle
share/golly/Patterns/Life/Spaceships/spaceship-types.rle
share/golly/Patterns/Life/Still-Lifes/
@ -316,7 +312,6 @@ share/golly/Patterns/Life/Syntheses/29-still-lifes.rle
share/golly/Patterns/Life/Syntheses/blockish-and-blockic-seeds.rle
share/golly/Patterns/Life/Syntheses/life-integer-constructions.rle
share/golly/Patterns/Life/Syntheses/make-harbor.rle
share/golly/Patterns/Life/Syntheses/make-lightbulb.rle
share/golly/Patterns/Life/Syntheses/make-osc-p3.rle
share/golly/Patterns/Life/Syntheses/make-osc-p4.rle
share/golly/Patterns/Life/Syntheses/make-osc-p5-plus.rle
@ -324,7 +319,9 @@ share/golly/Patterns/Life/Syntheses/make-p11.rle
share/golly/Patterns/Life/Syntheses/make-p18.rle
share/golly/Patterns/Life/Syntheses/make-p33.rle
share/golly/Patterns/Life/Syntheses/oscillator-syntheses.rle
share/golly/Patterns/Life/Syntheses/slow-salvo-MWSS-oscillator.rle.gz
share/golly/Patterns/Life/Syntheses/slow-salvo-eater-recipes.rle
share/golly/Patterns/Life/Syntheses/syntheses-of-c2-spaceships.rle.gz
share/golly/Patterns/Life/Syntheses/two-glider-collisions.rle
share/golly/Patterns/Loops/
share/golly/Patterns/Loops/Byl-Loop.rle
@ -350,11 +347,29 @@ share/golly/Patterns/Margolus/TMGas.rle
share/golly/Patterns/Margolus/TMGas_largeWithHole.rle
share/golly/Patterns/Margolus/TripATron.rle
share/golly/Patterns/Margolus/TripATron_BlockAligned.rle
share/golly/Patterns/Non-Totalistic/
share/golly/Patterns/Non-Totalistic/JustFriends/
share/golly/Patterns/Non-Totalistic/JustFriends/oscillators.rle
share/golly/Patterns/Non-Totalistic/JustFriends/p137loop.rle
share/golly/Patterns/Non-Totalistic/JustFriends/p384drifter.rle
share/golly/Patterns/Non-Totalistic/JustFriends/p8256c4dirtyrake.rle
share/golly/Patterns/Non-Totalistic/JustFriends/spaceships.rle
share/golly/Patterns/Non-Totalistic/Sierpinski-builder.rle
share/golly/Patterns/Non-Totalistic/horiship-guns.rle
share/golly/Patterns/Non-Totalistic/infinite-binary-ruler-generator.rle
share/golly/Patterns/Non-Totalistic/intergalactic-cruise-ship-factory.rle
share/golly/Patterns/Non-Totalistic/limited-spacefiller.rle
share/golly/Patterns/Non-Totalistic/p42-knightship.rle
share/golly/Patterns/Non-Totalistic/pondpuffer-spaceship.rle
share/golly/Patterns/Non-Totalistic/reflectorless-rotating-oscillator-puffer.rle
share/golly/Patterns/Non-Totalistic/rr14gun.rle
share/golly/Patterns/Non-Totalistic/unit-fraction-orthogonal-spaceships.zip
share/golly/Patterns/Other-Rules/
share/golly/Patterns/Other-Rules/Ed-rep.rle
share/golly/Patterns/Other-Rules/HPP-demo-small.rle
share/golly/Patterns/Other-Rules/HPP-demo.rle
share/golly/Patterns/Other-Rules/Langtons-Ant.rle
share/golly/Patterns/Other-Rules/factorize-84.zip
share/golly/Patterns/Other-Rules/golly-ants.rle
share/golly/Patterns/Other-Rules/life-on-the-edge.rle
share/golly/Patterns/Other-Rules/life-on-the-slope.rle
@ -364,6 +379,55 @@ share/golly/Patterns/Patersons-Worms/worm-1042015.rle
share/golly/Patterns/Patersons-Worms/worm-1042020.rle
share/golly/Patterns/Patersons-Worms/worm-1252121.rle
share/golly/Patterns/Patersons-Worms/worm-1525115.rle
share/golly/Patterns/Self-Rep/
share/golly/Patterns/Self-Rep/Banks/
share/golly/Patterns/Self-Rep/Banks/Banks-I-demo.rle
share/golly/Patterns/Self-Rep/Banks/Banks-II-demo.rle
share/golly/Patterns/Self-Rep/Banks/Banks-III-demo.rle
share/golly/Patterns/Self-Rep/Banks/Banks-IV-constructor.rle.gz
share/golly/Patterns/Self-Rep/Banks/Banks-IV-demo.rle
share/golly/Patterns/Self-Rep/Codd/
share/golly/Patterns/Self-Rep/Codd/Goucher-replicator.mc.gz
share/golly/Patterns/Self-Rep/Codd/clocking-on-demo.rle
share/golly/Patterns/Self-Rep/Codd/coders-demo.rle
share/golly/Patterns/Self-Rep/Codd/construction-arm-demo.rle
share/golly/Patterns/Self-Rep/Codd/crossover-unidir-demo.rle
share/golly/Patterns/Self-Rep/Codd/decoder-4bit-demo.rle.gz
share/golly/Patterns/Self-Rep/Codd/echo-discriminator.rle
share/golly/Patterns/Self-Rep/Codd/echo-switch-demo.rle
share/golly/Patterns/Self-Rep/Codd/extend-coder-demo.rle
share/golly/Patterns/Self-Rep/Codd/gates-demo.rle
share/golly/Patterns/Self-Rep/Codd/golly-constructor.rle.gz
share/golly/Patterns/Self-Rep/Codd/repeater-emitter-demo.rle
share/golly/Patterns/Self-Rep/Codd/sensing-demo.rle
share/golly/Patterns/Self-Rep/Codd/sheathing-demo.rle
share/golly/Patterns/Self-Rep/Codd/sheathing-problems.rle
share/golly/Patterns/Self-Rep/Codd/signals-demo.rle
share/golly/Patterns/Self-Rep/Codd/tape-reader-demo.rle
share/golly/Patterns/Self-Rep/Devore/
share/golly/Patterns/Self-Rep/Devore/Devore-body.rle
share/golly/Patterns/Self-Rep/Devore/Devore-rep.rle
share/golly/Patterns/Self-Rep/Devore/crossover.rle
share/golly/Patterns/Self-Rep/Devore/discriminator.rle
share/golly/Patterns/Self-Rep/JvN/
share/golly/Patterns/Self-Rep/JvN/Boustrophedon-replicator.rle
share/golly/Patterns/Self-Rep/JvN/CY_Lee_computer.zip
share/golly/Patterns/Self-Rep/JvN/Hutton-replicator.rle
share/golly/Patterns/Self-Rep/JvN/JvN-loop-replicator.rle.gz
share/golly/Patterns/Self-Rep/JvN/N-compressed-replicator.rle
share/golly/Patterns/Self-Rep/JvN/NP-mutation.rle.gz
share/golly/Patterns/Self-Rep/JvN/NP-replicator.rle.gz
share/golly/Patterns/Self-Rep/JvN/cell-coders-demo.rle
share/golly/Patterns/Self-Rep/JvN/codon4-auto-retract.rle
share/golly/Patterns/Self-Rep/JvN/codon5-auto-retract.rle
share/golly/Patterns/Self-Rep/JvN/construction-arm-demo.rle
share/golly/Patterns/Self-Rep/JvN/counter-demo.rle
share/golly/Patterns/Self-Rep/JvN/golly-constructor.rle
share/golly/Patterns/Self-Rep/JvN/partial-constructor.mc.gz
share/golly/Patterns/Self-Rep/JvN/read-arm-demo.rle
share/golly/Patterns/Self-Rep/JvN/sphinx-midpoint.mc.gz
share/golly/Patterns/Self-Rep/JvN/sphinx-spark.mc.gz
share/golly/Patterns/Self-Rep/JvN/sphinx.mc.gz
share/golly/Patterns/Turmites/
share/golly/Patterns/Turmites/AlienCounter.rle
share/golly/Patterns/Turmites/ComputerArt.rle
@ -434,6 +498,7 @@ share/golly/Rules/TreeGenerators/LifeOnTheEdge.cpp
share/golly/Rules/TreeGenerators/LifeOnTheSlope.cpp
share/golly/Rules/TreeGenerators/RuleTreeGen.cpp
share/golly/Rules/TreeGenerators/RuleTreeGen.java
share/golly/Rules/TreeGenerators/RuleTreeGen.lua
share/golly/Rules/TreeGenerators/RuleTreeGen.pl
share/golly/Rules/TreeGenerators/RuleTreeGen.py
share/golly/Rules/TriTurmite_120010.rule
@ -451,19 +516,51 @@ share/golly/Rules/Worm-1525115.rule
share/golly/Rules/Worm-complement.rule
share/golly/Rules/Worm-shared.rule
share/golly/Scripts/
share/golly/Scripts/Perl/
share/golly/Scripts/Perl/density.pl
share/golly/Scripts/Perl/envelope.pl
share/golly/Scripts/Perl/giffer.pl
share/golly/Scripts/Perl/goto.pl
share/golly/Scripts/Perl/invert.pl
share/golly/Scripts/Perl/make-torus.pl
share/golly/Scripts/Perl/oscar.pl
share/golly/Scripts/Perl/p1100-MWSS-gun.pl
share/golly/Scripts/Perl/pop-plot.pl
share/golly/Scripts/Perl/shift.pl
share/golly/Scripts/Perl/tile-with-clip.pl
share/golly/Scripts/Perl/tile.pl
share/golly/Scripts/Lua/
share/golly/Scripts/Lua/3D.lua
share/golly/Scripts/Lua/breakout.lua
share/golly/Scripts/Lua/bricklayer.lua
share/golly/Scripts/Lua/browse-patterns.lua
share/golly/Scripts/Lua/credits.lua
share/golly/Scripts/Lua/density.lua
share/golly/Scripts/Lua/draw-lines.lua
share/golly/Scripts/Lua/envelope.lua
share/golly/Scripts/Lua/flood-fill.lua
share/golly/Scripts/Lua/giffer.lua
share/golly/Scripts/Lua/goto.lua
share/golly/Scripts/Lua/gplus/
share/golly/Scripts/Lua/gplus/guns.lua
share/golly/Scripts/Lua/gplus/init.lua
share/golly/Scripts/Lua/gplus/objects.lua
share/golly/Scripts/Lua/gplus/strict.lua
share/golly/Scripts/Lua/gplus/text.lua
share/golly/Scripts/Lua/gun-demo.lua
share/golly/Scripts/Lua/heisenburp.lua
share/golly/Scripts/Lua/hexgrid.lua
share/golly/Scripts/Lua/invert.lua
share/golly/Scripts/Lua/life-integer-gun30.lua
share/golly/Scripts/Lua/lifeviewer.lua
share/golly/Scripts/Lua/make-torus.lua
share/golly/Scripts/Lua/metafier.lua
share/golly/Scripts/Lua/move-object.lua
share/golly/Scripts/Lua/move-selection.lua
share/golly/Scripts/Lua/oplus/
share/golly/Scripts/Lua/oplus/images/
share/golly/Scripts/Lua/oplus/images/lifeviewer.png
share/golly/Scripts/Lua/oplus/init.lua
share/golly/Scripts/Lua/oplus/sounds/
share/golly/Scripts/Lua/oplus/sounds/README.txt
share/golly/Scripts/Lua/oscar.lua
share/golly/Scripts/Lua/overlay-demo.lua
share/golly/Scripts/Lua/p1100-MWSS-gun.lua
share/golly/Scripts/Lua/pd-glider.lua
share/golly/Scripts/Lua/pop-plot.lua
share/golly/Scripts/Lua/shift.lua
share/golly/Scripts/Lua/slide-show.lua
share/golly/Scripts/Lua/tile-with-clip.lua
share/golly/Scripts/Lua/tile.lua
share/golly/Scripts/Lua/toLife.lua
share/golly/Scripts/Lua/toLifeHistory.lua
share/golly/Scripts/Python/
share/golly/Scripts/Python/Margolus/
share/golly/Scripts/Python/Margolus/convert-MCell-string.py
@ -488,6 +585,7 @@ share/golly/Scripts/Python/envelope.py
share/golly/Scripts/Python/flood-fill.py
share/golly/Scripts/Python/glife/
share/golly/Scripts/Python/glife/BuiltinIcons.py
share/golly/Scripts/Python/glife/BuiltinIcons.pyc
share/golly/Scripts/Python/glife/EmulateHexagonal.py
share/golly/Scripts/Python/glife/EmulateMargolus.py
share/golly/Scripts/Python/glife/EmulateOneDimensional.py
@ -497,13 +595,19 @@ share/golly/Scripts/Python/glife/RuleTree.py
share/golly/Scripts/Python/glife/WriteBMP.py
share/golly/Scripts/Python/glife/WriteRuleTable.py
share/golly/Scripts/Python/glife/__init__.py
share/golly/Scripts/Python/glife/__init__.pyc
share/golly/Scripts/Python/glife/base.py
share/golly/Scripts/Python/glife/base.pyc
share/golly/Scripts/Python/glife/gun24.py
share/golly/Scripts/Python/glife/gun24.pyc
share/golly/Scripts/Python/glife/gun256.py
share/golly/Scripts/Python/glife/gun30.py
share/golly/Scripts/Python/glife/gun30.pyc
share/golly/Scripts/Python/glife/gun46.py
share/golly/Scripts/Python/glife/gun46.pyc
share/golly/Scripts/Python/glife/herschel.py
share/golly/Scripts/Python/glife/text.py
share/golly/Scripts/Python/glife/text.pyc
share/golly/Scripts/Python/goto.py
share/golly/Scripts/Python/goto_expression.py
share/golly/Scripts/Python/gun-demo.py

36
net/filezilla/Makefile
View File

@ -1,44 +1,48 @@
# $OpenBSD: Makefile,v 1.56 2018/06/29 22:16:19 espie Exp $
# $OpenBSD: Makefile,v 1.57 2019/01/02 12:43:19 jca Exp $
COMMENT= fast FTP and SFTP GUI client with a lot of features
BROKEN-hppa= serverpath.h:17:19: error: variable 'CServerPath final' has initializer but incomplete type
BROKEN-alpha= serverpath.h:17:19: error: variable 'CServerPath final' has initializer but incomplete type
V= 3.8.1
V= 3.39.0
PKGNAME= filezilla-$V
DISTNAME= FileZilla_$V_src
EXTRACT_SUFX= .tar.bz2
REVISION= 11
MAINTAINER= Giovanni Bechis <giovanni@openbsd.org>
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=filezilla/}
HOMEPAGE= http://www.filezilla-project.org/
MASTER_SITES= https://download.filezilla-project.org/client/
HOMEPAGE= https://www.filezilla-project.org/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ICE SDL SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
WANTLIB += dbus-1 expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0
WANTLIB += graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz hogweed
WANTLIB += iconv idn idn2 intl jpeg m mspack nettle p11-kit pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += sndio sqlite3 ${LIBCXX} tasn1 tiff unistring usbhid wx_base
WANTLIB += wx_base_net wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core
WANTLIB += wx_gtk2_html wx_gtk2_xrc xcb xcb-render xcb-shm z
WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
WANTLIB += dbus-1 epoxy expat ffi filezilla fontconfig freetype
WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gmp gnutls gobject-2.0 graphite2 gthread-2.0 gtk-3
WANTLIB += harfbuzz hogweed iconv idn idn2 intl jpeg m mspack
WANTLIB += nettle notify p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png16 pugixml samplerate sndio sqlite3
WANTLIB += tasn1 tiff unistring usbhid wx_baseu-3.0 wx_baseu_xml-3.0
WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0
WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_xrc-3.0 xcb xcb-render xcb-shm
WANTLIB += z
COMPILER = base-clang ports-gcc
LIB_DEPENDS= databases/sqlite3 \
devel/harfbuzz \
devel/libidn \
net/libfilezilla \
security/gnutls \
textproc/pugixml \
x11/dbus \
x11/wxWidgets>=2.8.6
x11/wxWidgets>=3.0.4
BUILD_DEPENDS= devel/cppunit \
devel/gettext-tools \

4
net/filezilla/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (FileZilla_3.8.1_src.tar.bz2) = ZrycCChD/9y5FceQKQC5K9+SHtcxDypA/2uWsDz6Hk8=
SIZE (FileZilla_3.8.1_src.tar.bz2) = 4089186
SHA256 (FileZilla_3.39.0_src.tar.bz2) = +1Fek3deWtlP8nVbOWBbYrPo/PwRJXV/QR2PWA0WRE8=
SIZE (FileZilla_3.39.0_src.tar.bz2) = 4995713

23
net/filezilla/patches/patch-src_interface_file_utils_cpp
View File

@ -1,23 +1,24 @@
$OpenBSD: patch-src_interface_file_utils_cpp,v 1.1 2014/07/12 12:42:55 giovanni Exp $
--- src/interface/file_utils.cpp.orig Thu May 1 21:29:19 2014
+++ src/interface/file_utils.cpp Fri Jul 11 12:06:55 2014
@@ -6,8 +6,8 @@
#ifdef __WXMSW__
$OpenBSD: patch-src_interface_file_utils_cpp,v 1.2 2019/01/02 12:43:19 jca Exp $
Index: src/interface/file_utils.cpp
--- src/interface/file_utils.cpp.orig
+++ src/interface/file_utils.cpp
@@ -7,8 +7,8 @@
#include <wx/dynlib.h> // Used by GetDownloadDir
#include <knownfolders.h>
#else
+#include <glob.h>
#include <wx/textfile.h>
-#include <wordexp.h>
#endif //__WXMSW__
#endif
wxString GetAsURL(const wxString& dir)
@@ -334,12 +334,12 @@ wxString ShellUnescape( wxString const& path )
std::wstring GetAsURL(std::wstring const& dir)
@@ -359,12 +359,12 @@ wxString ShellUnescape(wxString const& path)
const wxWX2MBbuf buf = path.mb_str();
if( buf && *buf ) {
if (buf && *buf) {
- wordexp_t p;
- int res = wordexp( buf, &p, WRDE_NOCMD );
- if( !res && p.we_wordc == 1 && p.we_wordv ) {
- int res = wordexp(buf, &p, WRDE_NOCMD);
- if (!res && p.we_wordc == 1 && p.we_wordv) {
- ret = wxString(p.we_wordv[0], wxConvLocal);
+ glob_t p;
+ int res = glob( buf, GLOB_ERR, NULL, &p );

330
net/filezilla/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.17 2018/06/29 22:16:19 espie Exp $
@comment $OpenBSD: PLIST,v 1.18 2019/01/02 12:43:19 jca Exp $
@bin bin/filezilla
@bin bin/fzputtygen
@bin bin/fzsftp
@ -6,63 +6,33 @@
@man man/man1/fzputtygen.1
@man man/man1/fzsftp.1
@man man/man5/fzdefaults.xml.5
share/appdata/
share/appdata/filezilla.appdata.xml
share/applications/filezilla.desktop
share/examples/filezilla/
share/examples/filezilla/fzdefaults.xml.example
share/filezilla/
share/filezilla/resources/
share/filezilla/resources/16x16/
share/filezilla/resources/16x16/ascii.png
share/filezilla/resources/16x16/auto.png
share/filezilla/resources/16x16/binary.png
share/filezilla/resources/16x16/bookmark.png
share/filezilla/resources/16x16/cancel.png
share/filezilla/resources/16x16/compare.png
share/filezilla/resources/16x16/disconnect.png
share/filezilla/resources/16x16/download.png
share/filezilla/resources/16x16/downloadadd.png
share/filezilla/resources/16x16/file.png
share/filezilla/resources/16x16/filezilla.png
share/filezilla/resources/16x16/filter.png
share/filezilla/resources/16x16/find.png
share/filezilla/resources/16x16/folder.png
share/filezilla/resources/16x16/folderclosed.png
share/filezilla/resources/16x16/localtreeview.png
share/filezilla/resources/16x16/lock.png
share/filezilla/resources/16x16/logview.png
share/filezilla/resources/16x16/processqueue.png
share/filezilla/resources/16x16/queueview.png
share/filezilla/resources/16x16/reconnect.png
share/filezilla/resources/16x16/refresh.png
share/filezilla/resources/16x16/remotetreeview.png
share/filezilla/resources/16x16/server.png
share/filezilla/resources/16x16/sitemanager.png
share/filezilla/resources/16x16/sort_down_dark.png
share/filezilla/resources/16x16/sort_down_light.png
share/filezilla/resources/16x16/sort_up_dark.png
share/filezilla/resources/16x16/sort_up_light.png
share/filezilla/resources/16x16/speedlimits.png
share/filezilla/resources/16x16/symlink.png
share/filezilla/resources/16x16/synchronize.png
share/filezilla/resources/16x16/throbber.gif
share/filezilla/resources/16x16/unknown.png
share/filezilla/resources/16x16/upload.png
share/filezilla/resources/16x16/uploadadd.png
share/filezilla/resources/20x20/
share/filezilla/resources/20x20/unknown.png
share/filezilla/resources/24x24/
share/filezilla/resources/24x24/unknown.png
share/filezilla/resources/32x32/
share/filezilla/resources/32x32/file.png
share/filezilla/resources/32x32/filezilla.png
share/filezilla/resources/480x480/
share/filezilla/resources/480x480/filezilla.png
share/filezilla/resources/48x48/
share/filezilla/resources/48x48/filezilla.png
share/filezilla/resources/48x48/speedlimits.png
share/filezilla/resources/blukis/
share/filezilla/resources/blukis/16x16/
share/filezilla/resources/blukis/16x16/ascii.png
share/filezilla/resources/blukis/16x16/auto.png
share/filezilla/resources/blukis/16x16/binary.png
share/filezilla/resources/blukis/16x16/bookmark.png
share/filezilla/resources/blukis/16x16/bookmarks.png
share/filezilla/resources/blukis/16x16/cancel.png
share/filezilla/resources/blukis/16x16/compare.png
@ -95,6 +65,7 @@ share/filezilla/resources/blukis/32x32/
share/filezilla/resources/blukis/32x32/ascii.png
share/filezilla/resources/blukis/32x32/auto.png
share/filezilla/resources/blukis/32x32/binary.png
share/filezilla/resources/blukis/32x32/bookmark.png
share/filezilla/resources/blukis/32x32/bookmarks.png
share/filezilla/resources/blukis/32x32/cancel.png
share/filezilla/resources/blukis/32x32/compare.png
@ -116,6 +87,7 @@ share/filezilla/resources/blukis/32x32/queueview.png
share/filezilla/resources/blukis/32x32/reconnect.png
share/filezilla/resources/blukis/32x32/refresh.png
share/filezilla/resources/blukis/32x32/remotetreeview.png
share/filezilla/resources/blukis/32x32/server.png
share/filezilla/resources/blukis/32x32/showhidden.png
share/filezilla/resources/blukis/32x32/sitemanager.png
share/filezilla/resources/blukis/32x32/speedlimits.png
@ -126,6 +98,7 @@ share/filezilla/resources/blukis/48x48/
share/filezilla/resources/blukis/48x48/ascii.png
share/filezilla/resources/blukis/48x48/auto.png
share/filezilla/resources/blukis/48x48/binary.png
share/filezilla/resources/blukis/48x48/bookmark.png
share/filezilla/resources/blukis/48x48/bookmarks.png
share/filezilla/resources/blukis/48x48/cancel.png
share/filezilla/resources/blukis/48x48/compare.png
@ -147,6 +120,7 @@ share/filezilla/resources/blukis/48x48/queueview.png
share/filezilla/resources/blukis/48x48/reconnect.png
share/filezilla/resources/blukis/48x48/refresh.png
share/filezilla/resources/blukis/48x48/remotetreeview.png
share/filezilla/resources/blukis/48x48/server.png
share/filezilla/resources/blukis/48x48/showhidden.png
share/filezilla/resources/blukis/48x48/sitemanager.png
share/filezilla/resources/blukis/48x48/speedlimits.png
@ -154,6 +128,38 @@ share/filezilla/resources/blukis/48x48/synchronize.png
share/filezilla/resources/blukis/48x48/upload.png
share/filezilla/resources/blukis/48x48/uploadadd.png
share/filezilla/resources/blukis/theme.xml
share/filezilla/resources/classic/
share/filezilla/resources/classic/16x16/
share/filezilla/resources/classic/16x16/ascii.png
share/filezilla/resources/classic/16x16/auto.png
share/filezilla/resources/classic/16x16/binary.png
share/filezilla/resources/classic/16x16/bookmark.png
share/filezilla/resources/classic/16x16/cancel.png
share/filezilla/resources/classic/16x16/compare.png
share/filezilla/resources/classic/16x16/disconnect.png
share/filezilla/resources/classic/16x16/download.png
share/filezilla/resources/classic/16x16/downloadadd.png
share/filezilla/resources/classic/16x16/file.png
share/filezilla/resources/classic/16x16/filter.png
share/filezilla/resources/classic/16x16/find.png
share/filezilla/resources/classic/16x16/folder.png
share/filezilla/resources/classic/16x16/folderclosed.png
share/filezilla/resources/classic/16x16/localtreeview.png
share/filezilla/resources/classic/16x16/lock.png
share/filezilla/resources/classic/16x16/logview.png
share/filezilla/resources/classic/16x16/processqueue.png
share/filezilla/resources/classic/16x16/queueview.png
share/filezilla/resources/classic/16x16/reconnect.png
share/filezilla/resources/classic/16x16/refresh.png
share/filezilla/resources/classic/16x16/remotetreeview.png
share/filezilla/resources/classic/16x16/server.png
share/filezilla/resources/classic/16x16/sitemanager.png
share/filezilla/resources/classic/16x16/speedlimits.png
share/filezilla/resources/classic/16x16/symlink.png
share/filezilla/resources/classic/16x16/synchronize.png
share/filezilla/resources/classic/16x16/upload.png
share/filezilla/resources/classic/16x16/uploadadd.png
share/filezilla/resources/classic/theme.xml
share/filezilla/resources/cyril/
share/filezilla/resources/cyril/16x16/
share/filezilla/resources/cyril/16x16/ascii.png
@ -186,11 +192,179 @@ share/filezilla/resources/cyril/16x16/synchronize.png
share/filezilla/resources/cyril/16x16/upload.png
share/filezilla/resources/cyril/16x16/uploadadd.png
share/filezilla/resources/cyril/theme.xml
share/filezilla/resources/default/
share/filezilla/resources/default/480x480/
share/filezilla/resources/default/480x480/ascii.png
share/filezilla/resources/default/480x480/auto.png
share/filezilla/resources/default/480x480/binary.png
share/filezilla/resources/default/480x480/bookmark.png
share/filezilla/resources/default/480x480/bookmarks.png
share/filezilla/resources/default/480x480/cancel.png
share/filezilla/resources/default/480x480/close.png
share/filezilla/resources/default/480x480/compare.png
share/filezilla/resources/default/480x480/disconnect.png
share/filezilla/resources/default/480x480/download.png
share/filezilla/resources/default/480x480/downloadadd.png
share/filezilla/resources/default/480x480/dropdown.png
share/filezilla/resources/default/480x480/file.png
share/filezilla/resources/default/480x480/filter.png
share/filezilla/resources/default/480x480/find.png
share/filezilla/resources/default/480x480/folder.png
share/filezilla/resources/default/480x480/folderback.png
share/filezilla/resources/default/480x480/folderclosed.png
share/filezilla/resources/default/480x480/folderup.png
share/filezilla/resources/default/480x480/help.png
share/filezilla/resources/default/480x480/leds.png
share/filezilla/resources/default/480x480/localtreeview.png
share/filezilla/resources/default/480x480/lock.png
share/filezilla/resources/default/480x480/logview.png
share/filezilla/resources/default/480x480/processqueue.png
share/filezilla/resources/default/480x480/queueview.png
share/filezilla/resources/default/480x480/reconnect.png
share/filezilla/resources/default/480x480/refresh.png
share/filezilla/resources/default/480x480/remotetreeview.png
share/filezilla/resources/default/480x480/server.png
share/filezilla/resources/default/480x480/showhidden.png
share/filezilla/resources/default/480x480/sitemanager.png
share/filezilla/resources/default/480x480/sort_down_dark.png
share/filezilla/resources/default/480x480/sort_down_light.png
share/filezilla/resources/default/480x480/sort_up_dark.png
share/filezilla/resources/default/480x480/sort_up_light.png
share/filezilla/resources/default/480x480/speedlimits.png
share/filezilla/resources/default/480x480/symlink.png
share/filezilla/resources/default/480x480/synchronize.png
share/filezilla/resources/default/480x480/synctransfer.png
share/filezilla/resources/default/480x480/upload.png
share/filezilla/resources/default/480x480/uploadadd.png
share/filezilla/resources/default/theme.xml
share/filezilla/resources/defaultfilters.xml
share/filezilla/resources/down.png
share/filezilla/resources/dropdown.png
share/filezilla/resources/finished.wav
share/filezilla/resources/leds.png
share/filezilla/resources/flatzilla/
share/filezilla/resources/flatzilla/16x16/
share/filezilla/resources/flatzilla/16x16/ascii.png
share/filezilla/resources/flatzilla/16x16/auto.png
share/filezilla/resources/flatzilla/16x16/binary.png
share/filezilla/resources/flatzilla/16x16/bookmark.png
share/filezilla/resources/flatzilla/16x16/cancel.png
share/filezilla/resources/flatzilla/16x16/compare.png
share/filezilla/resources/flatzilla/16x16/disconnect.png
share/filezilla/resources/flatzilla/16x16/download.png
share/filezilla/resources/flatzilla/16x16/downloadadd.png
share/filezilla/resources/flatzilla/16x16/file.png
share/filezilla/resources/flatzilla/16x16/filter.png
share/filezilla/resources/flatzilla/16x16/find.png
share/filezilla/resources/flatzilla/16x16/folder.png
share/filezilla/resources/flatzilla/16x16/folderclosed.png
share/filezilla/resources/flatzilla/16x16/help.png
share/filezilla/resources/flatzilla/16x16/leds.png
share/filezilla/resources/flatzilla/16x16/localtreeview.png
share/filezilla/resources/flatzilla/16x16/lock.png
share/filezilla/resources/flatzilla/16x16/logview.png
share/filezilla/resources/flatzilla/16x16/processqueue.png
share/filezilla/resources/flatzilla/16x16/queueview.png
share/filezilla/resources/flatzilla/16x16/reconnect.png
share/filezilla/resources/flatzilla/16x16/refresh.png
share/filezilla/resources/flatzilla/16x16/remotetreeview.png
share/filezilla/resources/flatzilla/16x16/server.png
share/filezilla/resources/flatzilla/16x16/sitemanager.png
share/filezilla/resources/flatzilla/16x16/speedlimits.png
share/filezilla/resources/flatzilla/16x16/synchronize.png
share/filezilla/resources/flatzilla/16x16/upload.png
share/filezilla/resources/flatzilla/16x16/uploadadd.png
share/filezilla/resources/flatzilla/24x24/
share/filezilla/resources/flatzilla/24x24/ascii.png
share/filezilla/resources/flatzilla/24x24/auto.png
share/filezilla/resources/flatzilla/24x24/binary.png
share/filezilla/resources/flatzilla/24x24/bookmark.png
share/filezilla/resources/flatzilla/24x24/cancel.png
share/filezilla/resources/flatzilla/24x24/compare.png
share/filezilla/resources/flatzilla/24x24/disconnect.png
share/filezilla/resources/flatzilla/24x24/download.png
share/filezilla/resources/flatzilla/24x24/downloadadd.png
share/filezilla/resources/flatzilla/24x24/file.png
share/filezilla/resources/flatzilla/24x24/filter.png
share/filezilla/resources/flatzilla/24x24/find.png
share/filezilla/resources/flatzilla/24x24/folder.png
share/filezilla/resources/flatzilla/24x24/folderclosed.png
share/filezilla/resources/flatzilla/24x24/help.png
share/filezilla/resources/flatzilla/24x24/leds.png
share/filezilla/resources/flatzilla/24x24/localtreeview.png
share/filezilla/resources/flatzilla/24x24/lock.png
share/filezilla/resources/flatzilla/24x24/logview.png
share/filezilla/resources/flatzilla/24x24/processqueue.png
share/filezilla/resources/flatzilla/24x24/queueview.png
share/filezilla/resources/flatzilla/24x24/reconnect.png
share/filezilla/resources/flatzilla/24x24/refresh.png
share/filezilla/resources/flatzilla/24x24/remotetreeview.png
share/filezilla/resources/flatzilla/24x24/server.png
share/filezilla/resources/flatzilla/24x24/sitemanager.png
share/filezilla/resources/flatzilla/24x24/speedlimits.png
share/filezilla/resources/flatzilla/24x24/synchronize.png
share/filezilla/resources/flatzilla/24x24/upload.png
share/filezilla/resources/flatzilla/24x24/uploadadd.png
share/filezilla/resources/flatzilla/32x32/
share/filezilla/resources/flatzilla/32x32/ascii.png
share/filezilla/resources/flatzilla/32x32/auto.png
share/filezilla/resources/flatzilla/32x32/binary.png
share/filezilla/resources/flatzilla/32x32/bookmark.png
share/filezilla/resources/flatzilla/32x32/cancel.png
share/filezilla/resources/flatzilla/32x32/compare.png
share/filezilla/resources/flatzilla/32x32/disconnect.png
share/filezilla/resources/flatzilla/32x32/download.png
share/filezilla/resources/flatzilla/32x32/downloadadd.png
share/filezilla/resources/flatzilla/32x32/file.png
share/filezilla/resources/flatzilla/32x32/filter.png
share/filezilla/resources/flatzilla/32x32/find.png
share/filezilla/resources/flatzilla/32x32/folder.png
share/filezilla/resources/flatzilla/32x32/folderclosed.png
share/filezilla/resources/flatzilla/32x32/help.png
share/filezilla/resources/flatzilla/32x32/leds.png
share/filezilla/resources/flatzilla/32x32/localtreeview.png
share/filezilla/resources/flatzilla/32x32/lock.png
share/filezilla/resources/flatzilla/32x32/logview.png
share/filezilla/resources/flatzilla/32x32/processqueue.png
share/filezilla/resources/flatzilla/32x32/queueview.png
share/filezilla/resources/flatzilla/32x32/reconnect.png
share/filezilla/resources/flatzilla/32x32/refresh.png
share/filezilla/resources/flatzilla/32x32/remotetreeview.png
share/filezilla/resources/flatzilla/32x32/server.png
share/filezilla/resources/flatzilla/32x32/sitemanager.png
share/filezilla/resources/flatzilla/32x32/speedlimits.png
share/filezilla/resources/flatzilla/32x32/synchronize.png
share/filezilla/resources/flatzilla/32x32/upload.png
share/filezilla/resources/flatzilla/32x32/uploadadd.png
share/filezilla/resources/flatzilla/48x48/
share/filezilla/resources/flatzilla/48x48/ascii.png
share/filezilla/resources/flatzilla/48x48/auto.png
share/filezilla/resources/flatzilla/48x48/binary.png
share/filezilla/resources/flatzilla/48x48/bookmark.png
share/filezilla/resources/flatzilla/48x48/cancel.png
share/filezilla/resources/flatzilla/48x48/compare.png
share/filezilla/resources/flatzilla/48x48/disconnect.png
share/filezilla/resources/flatzilla/48x48/download.png
share/filezilla/resources/flatzilla/48x48/downloadadd.png
share/filezilla/resources/flatzilla/48x48/file.png
share/filezilla/resources/flatzilla/48x48/filter.png
share/filezilla/resources/flatzilla/48x48/find.png
share/filezilla/resources/flatzilla/48x48/folder.png
share/filezilla/resources/flatzilla/48x48/folderclosed.png
share/filezilla/resources/flatzilla/48x48/help.png
share/filezilla/resources/flatzilla/48x48/leds.png
share/filezilla/resources/flatzilla/48x48/localtreeview.png
share/filezilla/resources/flatzilla/48x48/lock.png
share/filezilla/resources/flatzilla/48x48/logview.png
share/filezilla/resources/flatzilla/48x48/processqueue.png
share/filezilla/resources/flatzilla/48x48/queueview.png
share/filezilla/resources/flatzilla/48x48/reconnect.png
share/filezilla/resources/flatzilla/48x48/refresh.png
share/filezilla/resources/flatzilla/48x48/remotetreeview.png
share/filezilla/resources/flatzilla/48x48/server.png
share/filezilla/resources/flatzilla/48x48/sitemanager.png
share/filezilla/resources/flatzilla/48x48/speedlimits.png
share/filezilla/resources/flatzilla/48x48/synchronize.png
share/filezilla/resources/flatzilla/48x48/upload.png
share/filezilla/resources/flatzilla/48x48/uploadadd.png
share/filezilla/resources/flatzilla/theme.xml
share/filezilla/resources/lone/
share/filezilla/resources/lone/16x16/
share/filezilla/resources/lone/16x16/ascii.png
@ -292,6 +466,7 @@ share/filezilla/resources/minimal/16x16/
share/filezilla/resources/minimal/16x16/ascii.png
share/filezilla/resources/minimal/16x16/auto.png
share/filezilla/resources/minimal/16x16/binary.png
share/filezilla/resources/minimal/16x16/bookmark.png
share/filezilla/resources/minimal/16x16/bookmarks.png
share/filezilla/resources/minimal/16x16/cancel.png
share/filezilla/resources/minimal/16x16/compare.png
@ -427,6 +602,40 @@ share/filezilla/resources/opencrystal/48x48/synchronize.png
share/filezilla/resources/opencrystal/48x48/upload.png
share/filezilla/resources/opencrystal/48x48/uploadadd.png
share/filezilla/resources/opencrystal/theme.xml
share/filezilla/resources/sun/
share/filezilla/resources/sun/48x48/
share/filezilla/resources/sun/48x48/ascii.png
share/filezilla/resources/sun/48x48/auto.png
share/filezilla/resources/sun/48x48/binary.png
share/filezilla/resources/sun/48x48/bookmark.png
share/filezilla/resources/sun/48x48/cancel.png
share/filezilla/resources/sun/48x48/compare.png
share/filezilla/resources/sun/48x48/disconnect.png
share/filezilla/resources/sun/48x48/download.png
share/filezilla/resources/sun/48x48/downloadadd.png
share/filezilla/resources/sun/48x48/file.png
share/filezilla/resources/sun/48x48/filter.png
share/filezilla/resources/sun/48x48/find.png
share/filezilla/resources/sun/48x48/folder.png
share/filezilla/resources/sun/48x48/folderback.png
share/filezilla/resources/sun/48x48/folderclosed.png
share/filezilla/resources/sun/48x48/folderup.png
share/filezilla/resources/sun/48x48/help.png
share/filezilla/resources/sun/48x48/localtreeview.png
share/filezilla/resources/sun/48x48/lock.png
share/filezilla/resources/sun/48x48/logview.png
share/filezilla/resources/sun/48x48/processqueue.png
share/filezilla/resources/sun/48x48/queueview.png
share/filezilla/resources/sun/48x48/reconnect.png
share/filezilla/resources/sun/48x48/refresh.png
share/filezilla/resources/sun/48x48/remotetreeview.png
share/filezilla/resources/sun/48x48/showhidden.png
share/filezilla/resources/sun/48x48/sitemanager.png
share/filezilla/resources/sun/48x48/speedlimits.png
share/filezilla/resources/sun/48x48/synchronize.png
share/filezilla/resources/sun/48x48/upload.png
share/filezilla/resources/sun/48x48/uploadadd.png
share/filezilla/resources/sun/theme.xml
share/filezilla/resources/tango/
share/filezilla/resources/tango/16x16/
share/filezilla/resources/tango/16x16/ascii.png
@ -516,27 +725,25 @@ share/filezilla/resources/tango/48x48/unknown.png
share/filezilla/resources/tango/48x48/upload.png
share/filezilla/resources/tango/48x48/uploadadd.png
share/filezilla/resources/tango/theme.xml
share/filezilla/resources/theme.xml
share/filezilla/resources/up.png
share/filezilla/resources/xrc/
share/filezilla/resources/xrc/certificate.xrc
share/filezilla/resources/xrc/dialogs.xrc
share/filezilla/resources/xrc/inputdialog.xrc
share/filezilla/resources/xrc/menus.xrc
share/filezilla/resources/xrc/netconfwizard.xrc
share/filezilla/resources/xrc/quickconnectbar.xrc
share/filezilla/resources/xrc/settings.xrc
share/filezilla/resources/xrc/toolbar.xrc
share/filezilla/resources/xrc/sitemanager.xrc
share/filezilla/resources/xrc/storj.xrc
share/filezilla/resources/xrc/update.xrc
share/icons/hicolor/16x16/apps/filezilla.png
share/icons/hicolor/32x32/apps/filezilla.png
share/icons/hicolor/480x480/
share/icons/hicolor/480x480/apps/
share/icons/hicolor/480x480/apps/filezilla.png
share/icons/hicolor/48x48/apps/filezilla.png
share/icons/hicolor/scalable/apps/filezilla.svg
share/locale/an/
share/locale/an/LC_MESSAGES/
share/locale/an/LC_MESSAGES/filezilla.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/filezilla.mo
share/locale/az/LC_MESSAGES/filezilla.mo
share/locale/bg_BG/
share/locale/bg_BG/LC_MESSAGES/
share/locale/bg_BG/LC_MESSAGES/filezilla.mo
@ -550,19 +757,13 @@ share/locale/co/LC_MESSAGES/filezilla.mo
share/locale/cs_CZ/
share/locale/cs_CZ/LC_MESSAGES/
share/locale/cs_CZ/LC_MESSAGES/filezilla.mo
share/locale/da_DK/
share/locale/da_DK/LC_MESSAGES/
share/locale/da_DK/LC_MESSAGES/filezilla.mo
share/locale/cy/LC_MESSAGES/filezilla.mo
share/locale/da/LC_MESSAGES/filezilla.mo
share/locale/de/LC_MESSAGES/filezilla.mo
share/locale/el/LC_MESSAGES/filezilla.mo
share/locale/es/LC_MESSAGES/filezilla.mo
share/locale/et_EE/
share/locale/et_EE/LC_MESSAGES/
share/locale/et_EE/LC_MESSAGES/filezilla.mo
share/locale/et/LC_MESSAGES/filezilla.mo
share/locale/eu/LC_MESSAGES/filezilla.mo
share/locale/eu_ES/
share/locale/eu_ES/LC_MESSAGES/
share/locale/eu_ES/LC_MESSAGES/filezilla.mo
share/locale/fa_IR/
share/locale/fa_IR/LC_MESSAGES/
share/locale/fa_IR/LC_MESSAGES/filezilla.mo
@ -580,21 +781,15 @@ share/locale/hr/LC_MESSAGES/filezilla.mo
share/locale/hu_HU/
share/locale/hu_HU/LC_MESSAGES/
share/locale/hu_HU/LC_MESSAGES/filezilla.mo
share/locale/hy/
share/locale/hy/LC_MESSAGES/
share/locale/hy/LC_MESSAGES/filezilla.mo
share/locale/id_ID/
share/locale/id_ID/LC_MESSAGES/
share/locale/id_ID/LC_MESSAGES/filezilla.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/filezilla.mo
share/locale/it/LC_MESSAGES/filezilla.mo
share/locale/ja_JP/
share/locale/ja_JP/LC_MESSAGES/
share/locale/ja_JP/LC_MESSAGES/filezilla.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/filezilla.mo
share/locale/kab/
share/locale/kab/LC_MESSAGES/
@ -605,12 +800,13 @@ share/locale/km_KH/LC_MESSAGES/filezilla.mo
share/locale/ko_KR/
share/locale/ko_KR/LC_MESSAGES/
share/locale/ko_KR/LC_MESSAGES/filezilla.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
share/locale/ku/LC_MESSAGES/filezilla.mo
share/locale/ky/
share/locale/ky/LC_MESSAGES/
share/locale/ky/LC_MESSAGES/filezilla.mo
share/locale/lo_LA/
share/locale/lo_LA/LC_MESSAGES/
share/locale/lo_LA/LC_MESSAGES/filezilla.mo
share/locale/lt_LT/
share/locale/lt_LT/LC_MESSAGES/
share/locale/lt_LT/LC_MESSAGES/filezilla.mo
@ -623,15 +819,11 @@ share/locale/mk_MK/LC_MESSAGES/filezilla.mo
share/locale/nb_NO/
share/locale/nb_NO/LC_MESSAGES/
share/locale/nb_NO/LC_MESSAGES/filezilla.mo
share/locale/ne/
share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/filezilla.mo
share/locale/nl/LC_MESSAGES/filezilla.mo
share/locale/nn_NO/
share/locale/nn_NO/LC_MESSAGES/
share/locale/nn_NO/LC_MESSAGES/filezilla.mo
share/locale/oc/
share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/filezilla.mo
share/locale/pl_PL/
share/locale/pl_PL/LC_MESSAGES/

18
x11/py-wxPython/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:13 sthen Exp $
# $OpenBSD: Makefile,v 1.22 2019/01/02 12:43:19 jca Exp $
COMMENT= Python bindings for wxWidgets C++ class library
V= 2.8.12.0
REVISION= 5
V= 3.0.2.0
DISTNAME= wxPython-src-$V
PKGNAME= py-wxPython-$V
CATEGORIES= x11 devel
HOMEPAGE= http://www.wxpython.org/
HOMEPAGE= https://www.wxpython.org/
MAINTAINER= Aleksander Piotrowski <pelotasplus@gmail.com>
@ -19,11 +18,12 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxpython/}
EXTRACT_SUFX= .tar.bz2
MODULES= lang/python
LIB_DEPENDS= x11/wxWidgets>=2.8.12
WANTLIB += wx_gtk2_aui wx_gtk2_richtext wx_gtk2_gizmos wx_gtk2_stc \
wx_base_xml wx_gtk2_qa wx_base_odbc wx_gtk2_html \
wx_gtk2_gl wx_base wx_gtk2_adv wx_gtk2_xrc wx_gtk2_core \
wx_base_net wx_gtk2_dbgrid m pthread ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
LIB_DEPENDS= x11/wxWidgets>=3.0.4
WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} m
WANTLIB += wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0
WANTLIB += wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0 wx_gtk3u_gl-3.0
WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_propgrid-3.0 wx_gtk3u_qa-3.0
WANTLIB += wx_gtk3u_richtext-3.0 wx_gtk3u_stc-3.0 wx_gtk3u_xrc-3.0
COMPILER = base-clang ports-gcc base-gcc

4
x11/py-wxPython/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (wxPython-src-2.8.12.0.tar.bz2) = bV6CdyuHmBwqDXjXoIs6RJhSkSe+LwUBaJLohm6Yur0=
SIZE (wxPython-src-2.8.12.0.tar.bz2) = 31156191
SHA256 (wxPython-src-3.0.2.0.tar.bz2) = 1UEp5fvqT7gJHIeymAdgtywio4bLO53S7rySjvXo32E=
SIZE (wxPython-src-3.0.2.0.tar.bz2) = 58304944

46
x11/py-wxPython/patches/patch-wxPython_config_py
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-wxPython_config_py,v 1.3 2011/05/22 08:21:34 dcoppa Exp $
--- wxPython/config.py.orig Wed Oct 3 11:20:46 2007
+++ wxPython/config.py Wed Oct 3 11:21:52 2007
@@ -132,7 +132,7 @@ UNDEF_NDEBUG = 1 # Python 2.2 on Unix/Linux by defau
$OpenBSD: patch-wxPython_config_py,v 1.4 2019/01/02 12:43:19 jca Exp $
Index: wxPython/config.py
--- wxPython/config.py.orig
+++ wxPython/config.py
@@ -131,7 +131,7 @@ UNDEF_NDEBUG = 1 # Python 2.2 on Unix/Linux by defau
NO_SCRIPTS = 0 # Don't install the tool scripts
NO_HEADERS = 0 # Don't install the wxPython *.h and *.i files
@ -10,7 +11,7 @@ $OpenBSD: patch-wxPython_config_py,v 1.3 2011/05/22 08:21:34 dcoppa Exp $
# can co-exist. When turned on the wx and wxPython
# pacakges will be installed in a versioned subdir
# of site-packages, and a *.pth file will be
@@ -145,7 +145,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such t
@@ -144,7 +144,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such t
FLAVOUR = "" # Optional flavour string to be appended to VERSION
# in MULTIVERSION installs
@ -19,7 +20,16 @@ $OpenBSD: patch-wxPython_config_py,v 1.3 2011/05/22 08:21:34 dcoppa Exp $
# ansi/unicode settings can optionally be added to the
# subdir path used in site-packages
@@ -520,7 +520,7 @@ class wx_install_headers(distutils.command.install_hea
@@ -171,7 +171,7 @@ SYS_WX_CONFIG = None # When installing an in tree buil
# build_options.py, if it is different to that. The default
# is to use the value of WX_CONFIG.
-WXPORT = 'gtk2' # On Linux/Unix there are several ports of wxWidgets available.
+WXPORT = 'gtk3' # On Linux/Unix there are several ports of wxWidgets available.
# Setting this value lets you select which will be used for
# the wxPython build. Possibilities are 'gtk', 'gtk2',
# 'gtk3', and 'x11'. Currently only gtk2, and gtk3 work.
@@ -512,7 +512,7 @@ class wx_install_headers(distutils.command.install_hea
if not headers:
return
@ -28,30 +38,12 @@ $OpenBSD: patch-wxPython_config_py,v 1.3 2011/05/22 08:21:34 dcoppa Exp $
#print "WXPREFIX is %s, root is %s" % (WXPREFIX, root)
# hack for universal builds, which append i386/ppc
# to the root
@@ -529,7 +529,7 @@ class wx_install_headers(distutils.command.install_hea
for header, location in headers:
install_dir = os.path.normpath(root +
WXPREFIX +
- '/include/wx-%d.%d/wx' % (VER_MAJOR, VER_MINOR) +
+ '/include/wx' +
location)
self.mkpath(install_dir)
(out, _) = self.copy_file(header, install_dir)
@@ -594,7 +594,7 @@ def find_data_files(srcdir, *wildcards, **kw):
def makeLibName(name):
if os.name == 'posix' or COMPILER == 'mingw32':
- libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE)
+ libname = '%s_%s' % (WXBASENAME, name)
elif name:
libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name)
else:
@@ -1013,8 +1013,6 @@ elif os.name == 'posix' or COMPILER == 'mingw32':
@@ -1036,8 +1036,6 @@ elif os.name == 'posix' or COMPILER == 'mingw32':
if debug:
cflags.append('-g')
cflags.append('-ggdb')
cflags.append('-O0')
- else:
- cflags.append('-O3')
lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
lflags = getWxConfigValue('--libs')
MONOLITHIC = (lflags.find("_xrc") == -1)

22
x11/py-wxPython/patches/patch-wxPython_setup_py
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-wxPython_setup_py,v 1.4 2014/01/24 14:58:56 dcoppa Exp $
$OpenBSD: patch-wxPython_setup_py,v 1.5 2019/01/02 12:43:19 jca Exp $
Drop the building of the media extension to avoid the dependency
on wxWidgets-media
--- wxPython/setup.py.orig Wed Apr 13 23:06:34 2011
+++ wxPython/setup.py Fri Jan 24 15:00:06 2014
@@ -411,24 +411,6 @@ ext = Extension('_html', swig_sources,
)
Index: wxPython/setup.py
--- wxPython/setup.py.orig
+++ wxPython/setup.py
@@ -424,21 +424,6 @@ ext = Extension('_html', swig_sources,
wxpExtensions.append(ext)
-
-mediaLibs = libs[:]
-if not MONOLITHIC and findLib('media', libdirs):
- mediaLibs += makeLibName('media')
@ -25,13 +25,11 @@ on wxWidgets-media
- **depends
- )
-wxpExtensions.append(ext)
-
-
swig_sources = run_swig(['webkit.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('_webkit', swig_sources,
@@ -1053,7 +1035,7 @@ if __name__ == "__main__":
)
@@ -1011,7 +996,7 @@ if __name__ == "__main__":
if not PREP_ONLY:
if not EGGing:
- if INSTALL_MULTIVERSION:

14
x11/py-wxPython/patches/patch-wxPython_src_gtk_propgrid_wrap_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-wxPython_src_gtk_propgrid_wrap_cpp,v 1.1 2019/01/02 12:43:19 jca Exp $
Index: wxPython/src/gtk/propgrid_wrap.cpp
--- wxPython/src/gtk/propgrid_wrap.cpp.orig
+++ wxPython/src/gtk/propgrid_wrap.cpp
@@ -3639,7 +3639,7 @@ bool PyObject_to_wxPGPropArgCls( PyObject* input, wxPG
}
else if ( input == Py_None )
{
- *v = new wxPGPropArgCls(reinterpret_cast< wxPGProperty * >(NULL));
+ *v = new wxPGPropArgCls(static_cast< wxPGProperty * >(NULL));
}
else
{

2795
x11/py-wxPython/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff