diff --git a/MOVED b/MOVED
index 3076d08f0..067331988 100644
--- a/MOVED
+++ b/MOVED
@@ -12852,11 +12852,9 @@ sysutils/log-courier||2019-09-05|Has expired: Broken for more than 6 months
 www/feedjack||2019-09-05|Has expired: Upstream gone
 www/havp||2019-09-05|Has expired: Broken for more than 6 months
 www/rubygem-webpack-rails-rails5|devel/rubygem-webpacker-rails5|2019-09-05|Has expired: Upstream no longer maintained, use devel/rubygem-webpacker-rails* instead
-x11-toolkits/p5-Wx-GLCanvas||2019-09-05|Has expired: Depends on expiring x11-toolkits/p5-Wx
 x11-toolkits/p5-Wx-Perl-ProcessStream||2019-09-05|Has expired: Depends on expiring x11-toolkits/p5-Wx
 x11-wm/golem||2019-09-05|Has expired: Broken for more than 6 months
 x11-wm/pawm||2019-09-05|Has expired: Broken for more than 6 months
-x11-toolkits/p5-Wx||2019-09-07|Has expired: Broken for more than 6 months
 graphics/luxrender14||2019-09-07|Has expired: Depends on expiring graphics/embree, broken with boost 1.70
 graphics/luxrender||2019-09-07|Has expired: Depends on expiring graphics/embree, broken with boost 1.70
 sysutils/libutempter||2019-09-11|Belong to base in all supported version of FreeBSD
diff --git a/cad/Makefile b/cad/Makefile
index 6a7a336bc..0b9c3dcd8 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -2,6 +2,8 @@
 
     SUBDIR += NASTRAN-95
     SUBDIR += PrusaSlicer
+    SUBDIR += Slic3r
+    SUBDIR += Slic3r-devel
     SUBDIR += abc
     SUBDIR += admesh
     SUBDIR += adms
diff --git a/cad/Slic3r-devel/Makefile b/cad/Slic3r-devel/Makefile
new file mode 100644
index 000000000..5d39369df
--- /dev/null
+++ b/cad/Slic3r-devel/Makefile
@@ -0,0 +1,80 @@
+# $FreeBSD$
+
+PORTNAME=	Slic3r
+DISTVERSION=	1.3.0
+CATEGORIES=	cad
+PKGNAMESUFFIX=  -devel
+
+MAINTAINER=	zielonka.michal@gmail.com
+COMMENT=	Slicing application for 3D printers
+
+LICENSE=	AGPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libwx_gtk3u_core-3.0.so:x11-toolkits/wxgtk30 \
+	libboost_system.so:devel/boost-libs \
+	libboost_thread.so:devel/boost-libs \
+	libboost_filesystem.so:devel/boost-libs
+BUILD_DEPENDS=	p5-Alien-wxWidgets>=0.69:x11-toolkits/p5-Alien-wxWidgets \
+		boost-libs>=1.64:devel/boost-libs \
+		wx30-gtk3>=3.0:x11-toolkits/wxgtk30 \
+		p5-Moo>=2.003004:devel/p5-Moo \
+		p5-Wx>=p5-Wx-0.9932:x11-toolkits/p5-Wx \
+		p5-Devel-CheckLib>=1.13:devel/p5-Devel-CheckLib \
+		p5-ExtUtils-CppGuess>=0.20:devel/p5-ExtUtils-CppGuess \
+		p5-Module-Build>=0.4229:devel/p5-Module-Build \
+		p5-Module-Build-WithXSpp>=0.14:devel/p5-Module-Build-WithXSpp \
+		p5-ExtUtils-Typemaps-Default>=1.05:devel/p5-ExtUtils-Typemaps-Default \
+		p5-Encode-Locale>=1.05:converters/p5-Encode-Locale
+RUN_DEPENDS=	p5-Alien-wxWidgets>=0.69:x11-toolkits/p5-Alien-wxWidgets \
+		boost-libs>=1.64:devel/boost-libs \
+		wx30-gtk3>=3.0:x11-toolkits/wxgtk30 \
+		p5-Moo>=2.003004:devel/p5-Moo \
+		p5-Wx>=p5-Wx-0.9932:x11-toolkits/p5-Wx \
+		p5-ExtUtils-Typemaps-Default>=1.05:devel/p5-ExtUtils-Typemaps-Default \
+		p5-Encode-Locale>=1.05:converters/p5-Encode-Locale \
+		p5-Class-Accessor>=0.51:devel/p5-Class-Accessor \
+		p5-OpenGL>=0.70:graphics/p5-OpenGL \
+		p5-Wx-GLCanvas>=0.09:x11-toolkits/p5-Wx-GLCanvas \
+		p5-libwww>=6.43:www/p5-libwww
+
+USES=		perl5 compiler:c++11-lang gl xorg
+
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+
+CC=	${CXX}
+CONFIGURE_ENV+= SLIC3R_NO_AUTO=1
+CONFIGURE_ENV+= WX_CONFIG=${LOCALBASE}/bin/wxgtk3u-3.0-config
+CONFIGURE_WRKSRC=	${WRKSRC}/xs
+BUILD_WRKSRC=	${WRKSRC}/xs
+INSTALL_WRKSRC=	${WRKSRC}/xs
+
+USE_PERL5=	modbuild
+USE_GITHUB=	yes
+USE_GL=		glew
+GH_TAGNAME=	b1a5500f427700ac3dffc0e7d9535ea65f993537
+GH_ACCOUNT=	slic3r
+
+post-install:
+	cd ${WRKSRC} && \
+		${FIND} var -type d -exec ${INSTALL_DATA} -d {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \; && \
+		${FIND} var -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \;
+	cd ${WRKSRC} && \
+		${FIND} lib -type d -exec ${INSTALL_DATA} -d {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \; && \
+		${FIND} lib -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \;
+	cd ${WRKSRC} && \
+		${FIND} utils -type d -exec ${INSTALL_DATA} -d {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \; && \
+		${FIND} utils -type f \! -name '*.orig' -exec ${INSTALL_DATA} {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \;
+	cd ${WRKSRC} && \
+		${FIND} translation -type d -exec ${INSTALL_DATA} -d {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \; && \
+		${FIND} translation -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \;
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} -d "${STAGEDIR}/${PREFIX}/bin" && \
+		${INSTALL_SCRIPT} slic3r.pl "${STAGEDIR}/${PREFIX}/${PORTNAME}/" && \
+		${LN} -sf "../${PORTNAME}/slic3r.pl" "${STAGEDIR}/${PREFIX}/bin/slic3r.pl"
+
+.include <bsd.port.mk>
diff --git a/cad/Slic3r-devel/distinfo b/cad/Slic3r-devel/distinfo
new file mode 100644
index 000000000..ff1bc010e
--- /dev/null
+++ b/cad/Slic3r-devel/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1642589740
+SHA256 (slic3r-Slic3r-1.3.0-b1a5500f427700ac3dffc0e7d9535ea65f993537_GH0.tar.gz) = 6e5834bd7fabdc785e570336a9dde46d5d214de1ebb5ea38d453dbf294d397d3
+SIZE (slic3r-Slic3r-1.3.0-b1a5500f427700ac3dffc0e7d9535ea65f993537_GH0.tar.gz) = 2482768
diff --git a/cad/Slic3r-devel/files/patch-no-local-real-bin b/cad/Slic3r-devel/files/patch-no-local-real-bin
new file mode 100644
index 000000000..b5f43a374
--- /dev/null
+++ b/cad/Slic3r-devel/files/patch-no-local-real-bin
@@ -0,0 +1,654 @@
+--- Build.PL.orig	2020-01-27 06:19:45 UTC
++++ Build.PL
+@@ -109,16 +109,7 @@ EOF
+         if !$cpanm;
+     my @cpanm_args = ();
+     push @cpanm_args, "--sudo" if $sudo;
+-    
+-    # install local::lib without --local-lib otherwise it's not usable afterwards
+-    if (!eval "use local::lib qw(local-lib); 1") {
+-        my $res = system $cpanm, @cpanm_args, 'local::lib';
+-        warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n"
+-            if $res != 0;
+-    }
+-    
+-    push @cpanm_args, ('--local-lib', 'local-lib');
+-    
++
+     # make sure our cpanm is updated (old ones don't support the ~ syntax)
+     system $cpanm, @cpanm_args, 'App::cpanminus';
+     
+--- lib/Slic3r.pm.orig	2020-01-27 06:19:45 UTC
++++ lib/Slic3r.pm
+@@ -43,9 +43,9 @@ warn "Running Slic3r under Perl 5.16 is neither suppor
+ 
+ use FindBin;
+ # Path to the images.
+-my $varpath = decode_path($FindBin::Bin) . "/var";
++my $varpath = decode_path($FindBin::RealBin) . "/var";
+ if ($^O eq 'darwin' && !-d $varpath) {
+-    $varpath = decode_path($FindBin::Bin) . "/../Resources/var";
++    $varpath = decode_path($FindBin::RealBin) . "/../Resources/var";
+ }
+ our $var = sub { "$varpath/$_[0]" };
+ 
+--- lib/Slic3r/GUI.pm.orig	2020-01-27 06:19:45 UTC
++++ lib/Slic3r/GUI.pm
+@@ -179,7 +179,7 @@ sub OnInit {
+     
+     # load init bundle
+     {
+-        my @dirs = ($FindBin::Bin);
++        my @dirs = ($FindBin::RealBin);
+         if (&Wx::wxMAC) {
+             push @dirs, qw();
+         } elsif (&Wx::wxMSW) {
+--- slic3r.pl.orig	2020-01-27 06:19:45 UTC
++++ slic3r.pl
+@@ -5,8 +5,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/lib";
+-    use local::lib '--no-create', "$FindBin::Bin/local-lib";
++    use lib "$FindBin::RealBin/lib";
+ }
+ 
+ use File::Basename qw(basename);
+@@ -78,9 +77,9 @@ if ($opt{load}) {
+         $configfile = Slic3r::decode_path($configfile);
+         if (-e Slic3r::encode_path($configfile)) {
+             push @external_configs, Slic3r::Config->load($configfile);
+-        } elsif (-e Slic3r::encode_path("$FindBin::Bin/$configfile")) {
+-            printf STDERR "Loading $FindBin::Bin/$configfile\n";
+-            push @external_configs, Slic3r::Config->load("$FindBin::Bin/$configfile");
++        } elsif (-e Slic3r::encode_path("$FindBin::RealBin/$configfile")) {
++            printf STDERR "Loading $FindBin::RealBin/$configfile\n";
++            push @external_configs, Slic3r::Config->load("$FindBin::RealBin/$configfile");
+         } else {
+             $opt{ignore_nonexistent_config} or die "Cannot find specified configuration file ($configfile).\n";
+         }
+--- t/adaptive_slicing.t.orig	2020-01-27 06:19:45 UTC
++++ t/adaptive_slicing.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum);
+--- t/adaptive_width.t.orig	2020-01-27 06:19:45 UTC
++++ t/adaptive_width.t
+@@ -6,8 +6,7 @@ plan tests => 32;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/angles.t.orig	2020-01-27 06:19:45 UTC
++++ t/angles.t
+@@ -6,10 +6,7 @@ plan tests => 34;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use lib "$FindBin::Bin/../lib";
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+@@ -92,4 +89,4 @@ sub line_orientation {
+ sub line_direction {
+     my ($l) = @_;
+     return Slic3r::Line->new(@$l)->direction;
+-}
+\ No newline at end of file
++}
+--- t/arcs.t.orig	2020-01-27 06:19:45 UTC
++++ t/arcs.t
+@@ -6,8 +6,7 @@ plan tests => 24;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/avoid_crossing_perimeters.t.orig	2020-01-27 06:19:45 UTC
++++ t/avoid_crossing_perimeters.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum);
+--- t/bridges.t.orig	2020-01-27 06:19:45 UTC
++++ t/bridges.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum);
+--- t/clean_polylines.t.orig	2020-01-27 06:19:45 UTC
++++ t/clean_polylines.t
+@@ -6,8 +6,7 @@ plan tests => 6;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/clipper.t.orig	2020-01-27 06:19:45 UTC
++++ t/clipper.t
+@@ -6,8 +6,7 @@ plan tests => 6;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(sum);
+--- t/collinear.t.orig	2020-01-27 06:19:45 UTC
++++ t/collinear.t
+@@ -6,8 +6,7 @@ plan tests => 11;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/combineinfill.t.orig	2020-01-27 06:19:45 UTC
++++ t/combineinfill.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/config.t.orig	2020-01-27 06:19:45 UTC
++++ t/config.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/cooling.t.orig	2020-01-27 06:19:45 UTC
++++ t/cooling.t
+@@ -6,8 +6,7 @@ plan tests => 13;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(none all);
+--- t/custom_gcode.t.orig	2020-01-27 06:19:45 UTC
++++ t/custom_gcode.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/fill.t.orig	2020-01-27 06:19:45 UTC
++++ t/fill.t
+@@ -6,8 +6,7 @@ plan tests => 95;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum max);
+--- t/flow.t.orig	2020-01-27 06:19:45 UTC
++++ t/flow.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum);
+--- t/gaps.t.orig	2020-01-27 06:19:45 UTC
++++ t/gaps.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/gcode.t.orig	2020-01-27 06:19:45 UTC
++++ t/gcode.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/geometry.t.orig	2020-01-27 06:19:45 UTC
++++ t/geometry.t
+@@ -6,8 +6,7 @@ plan tests => 44;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/layers.t.orig	2020-01-27 06:19:45 UTC
++++ t/layers.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/loops.t.orig	2020-01-27 06:19:45 UTC
++++ t/loops.t
+@@ -6,8 +6,7 @@ plan tests => 4;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/multi.t.orig	2020-01-27 06:19:45 UTC
++++ t/multi.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/perimeters.t.orig	2020-01-27 06:19:45 UTC
++++ t/perimeters.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r::ExtrusionLoop ':roles';
+--- t/polyclip.t.orig	2020-01-27 06:19:45 UTC
++++ t/polyclip.t
+@@ -6,8 +6,7 @@ plan tests => 18;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/pressure.t.orig	2020-01-27 06:19:45 UTC
++++ t/pressure.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw();
+--- t/print.t.orig	2020-01-27 06:19:45 UTC
++++ t/print.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/retraction.t.orig	2020-01-27 06:19:45 UTC
++++ t/retraction.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(any);
+--- t/shells.t.orig	2020-01-27 06:19:45 UTC
++++ t/shells.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum);
+--- t/skirt_brim.t.orig	2020-01-27 06:19:45 UTC
++++ t/skirt_brim.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/slice.t.orig	2020-01-27 06:19:45 UTC
++++ t/slice.t
+@@ -7,8 +7,7 @@ plan tests => 16;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ # temporarily disable compilation errors due to constant not being exported anymore
+--- t/speed.t.orig	2020-01-27 06:19:45 UTC
++++ t/speed.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(none);
+--- t/support.t.orig	2020-01-27 06:19:45 UTC
++++ t/support.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/svg.t.orig	2020-01-27 06:19:45 UTC
++++ t/svg.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/thin.t.orig	2020-01-27 06:19:45 UTC
++++ t/thin.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/threads.t.orig	2020-01-27 06:19:45 UTC
++++ t/threads.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/vibrationlimit.t.orig	2020-01-27 06:19:45 UTC
++++ t/vibrationlimit.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- utils/amf-to-stl.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/amf-to-stl.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use File::Basename qw(basename);
+--- utils/config-bundle-to-config.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/config-bundle-to-config.pl
+@@ -8,8 +8,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- utils/dump-stl.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/dump-stl.pl
+@@ -7,8 +7,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- utils/estimate-gcode-time.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/estimate-gcode-time.pl
+@@ -5,8 +5,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- utils/gcode_sectioncut.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/gcode_sectioncut.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- utils/pdf-slices.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/pdf-slices.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- utils/send-gcode.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/send-gcode.pl
+@@ -5,8 +5,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- utils/split_stl.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/split_stl.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use File::Basename qw(basename);
+--- utils/stl-to-amf.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/stl-to-amf.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use File::Basename qw(basename);
+--- utils/view-mesh.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/view-mesh.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- utils/view-toolpaths.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/view-toolpaths.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- utils/wireframe.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/wireframe.pl
+@@ -7,8 +7,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- xs/t/18_motionplanner.t.orig	2020-01-27 06:19:45 UTC
++++ xs/t/18_motionplanner.t
+@@ -5,7 +5,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../../lib";
++    use lib "$FindBin::RealBin/../../lib";
+ }
+ 
+ use Slic3r::XS;
diff --git a/cad/Slic3r-devel/files/patch-src_CMakeLists.txt b/cad/Slic3r-devel/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000..949f94059
--- /dev/null
+++ b/cad/Slic3r-devel/files/patch-src_CMakeLists.txt
@@ -0,0 +1,8 @@
+--- src/CMakeLists.txt.orig	2020-01-27 06:19:45 UTC
++++ src/CMakeLists.txt
+@@ -563,4 +563,6 @@ if (BUILD_EXTRUDE_TIN)
+     target_link_libraries (extrude-tin libslic3r ${LIBSLIC3R_DEPENDS})
+ endif()
+ 
++install(TARGETS slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
++
diff --git a/cad/Slic3r-devel/files/patch-xs_src_libslic3r_GCodeSender.hpp b/cad/Slic3r-devel/files/patch-xs_src_libslic3r_GCodeSender.hpp
new file mode 100644
index 000000000..d403ac57e
--- /dev/null
+++ b/cad/Slic3r-devel/files/patch-xs_src_libslic3r_GCodeSender.hpp
@@ -0,0 +1,11 @@
+--- xs/src/libslic3r/GCodeSender.hpp.orig	2022-01-18 22:24:03.648119000 +0000
++++ xs/src/libslic3r/GCodeSender.hpp	2022-01-18 22:07:01.684316000 +0000
+@@ -14,7 +14,7 @@
+ 
+ namespace asio = boost::asio;
+ 
+-class GCodeSender : private boost::noncopyable {
++class GCodeSender : private asio::noncopyable {
+     public:
+     GCodeSender();
+     ~GCodeSender();
diff --git a/cad/Slic3r-devel/pkg-descr b/cad/Slic3r-devel/pkg-descr
new file mode 100644
index 000000000..279ba4c6e
--- /dev/null
+++ b/cad/Slic3r-devel/pkg-descr
@@ -0,0 +1,3 @@
+Open Source toolpath generator for 3D printers.
+
+WWW: https://slic3r.org/
diff --git a/cad/Slic3r-devel/pkg-plist b/cad/Slic3r-devel/pkg-plist
new file mode 100644
index 000000000..5892eb42b
--- /dev/null
+++ b/cad/Slic3r-devel/pkg-plist
@@ -0,0 +1,212 @@
+Slic3r/lib/Slic3r.pm
+Slic3r/lib/Slic3r.pm.orig
+Slic3r/lib/Slic3r/Config.pm
+Slic3r/lib/Slic3r/ExPolygon.pm
+Slic3r/lib/Slic3r/ExtrusionLoop.pm
+Slic3r/lib/Slic3r/ExtrusionPath.pm
+Slic3r/lib/Slic3r/Flow.pm
+Slic3r/lib/Slic3r/GCode/ArcFitting.pm
+Slic3r/lib/Slic3r/GCode/MotionPlanner.pm
+Slic3r/lib/Slic3r/GCode/PressureRegulator.pm
+Slic3r/lib/Slic3r/GCode/Reader.pm
+Slic3r/lib/Slic3r/GCode/VibrationLimit.pm
+Slic3r/lib/Slic3r/GUI.pm
+Slic3r/lib/Slic3r/GUI.pm.orig
+Slic3r/lib/Slic3r/GUI/2DBed.pm
+Slic3r/lib/Slic3r/GUI/3DScene.pm
+Slic3r/lib/Slic3r/GUI/AboutDialog.pm
+Slic3r/lib/Slic3r/GUI/BedShapeDialog.pm
+Slic3r/lib/Slic3r/GUI/BonjourBrowser.pm
+Slic3r/lib/Slic3r/GUI/ColorScheme.pm
+Slic3r/lib/Slic3r/GUI/ConfigWizard.pm
+Slic3r/lib/Slic3r/GUI/Controller.pm
+Slic3r/lib/Slic3r/GUI/Controller/ManualControlDialog.pm
+Slic3r/lib/Slic3r/GUI/Controller/PrinterPanel.pm
+Slic3r/lib/Slic3r/GUI/MainFrame.pm
+Slic3r/lib/Slic3r/GUI/Notifier.pm
+Slic3r/lib/Slic3r/GUI/OptionsGroup.pm
+Slic3r/lib/Slic3r/GUI/OptionsGroup/Field.pm
+Slic3r/lib/Slic3r/GUI/Plater.pm
+Slic3r/lib/Slic3r/GUI/Plater/2D.pm
+Slic3r/lib/Slic3r/GUI/Plater/2DToolpaths.pm
+Slic3r/lib/Slic3r/GUI/Plater/3D.pm
+Slic3r/lib/Slic3r/GUI/Plater/3DPreview.pm
+Slic3r/lib/Slic3r/GUI/Plater/LambdaObjectDialog.pm
+Slic3r/lib/Slic3r/GUI/Plater/ObjectCutDialog.pm
+Slic3r/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm
+Slic3r/lib/Slic3r/GUI/Plater/ObjectRotateFaceDialog.pm
+Slic3r/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm
+Slic3r/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
+Slic3r/lib/Slic3r/GUI/Plater/SplineControl.pm
+Slic3r/lib/Slic3r/GUI/Preferences.pm
+Slic3r/lib/Slic3r/GUI/Preset.pm
+Slic3r/lib/Slic3r/GUI/PresetEditor.pm
+Slic3r/lib/Slic3r/GUI/PresetEditorDialog.pm
+Slic3r/lib/Slic3r/GUI/ProgressStatusBar.pm
+Slic3r/lib/Slic3r/GUI/Projector.pm
+Slic3r/lib/Slic3r/GUI/ReloadDialog.pm
+Slic3r/lib/Slic3r/GUI/SLAPrintOptions.pm
+Slic3r/lib/Slic3r/Geometry.pm
+Slic3r/lib/Slic3r/Geometry/Clipper.pm
+Slic3r/lib/Slic3r/Layer.pm
+Slic3r/lib/Slic3r/Line.pm
+Slic3r/lib/Slic3r/Model.pm
+Slic3r/lib/Slic3r/Point.pm
+Slic3r/lib/Slic3r/Polygon.pm
+Slic3r/lib/Slic3r/Polyline.pm
+Slic3r/lib/Slic3r/Print.pm
+Slic3r/lib/Slic3r/Print/GCode.pm
+Slic3r/lib/Slic3r/Print/Object.pm
+Slic3r/lib/Slic3r/Print/Simple.pm
+Slic3r/lib/Slic3r/Print/State.pm
+Slic3r/lib/Slic3r/Print/SupportMaterial.pm
+Slic3r/lib/Slic3r/SVG.pm
+Slic3r/lib/Slic3r/Surface.pm
+Slic3r/lib/Slic3r/Test.pm
+Slic3r/lib/Slic3r/Test/SectionCut.pm
+Slic3r/slic3r.pl
+Slic3r/translation/de_DE.po
+Slic3r/translation/en_US.po
+Slic3r/translation/fr_FR.po
+Slic3r/translation/nl_NL.po
+Slic3r/translation/zh_CN.po
+Slic3r/utils/amf-to-stl.pl
+Slic3r/utils/clang_format
+Slic3r/utils/config-bundle-to-config.pl
+Slic3r/utils/dump-stl.pl
+Slic3r/utils/estimate-gcode-time.pl
+Slic3r/utils/gcode_sectioncut.pl
+Slic3r/utils/modifier_helpers/layer_generator.jscad
+Slic3r/utils/modifier_helpers/solid_layers.scad
+Slic3r/utils/pdf-slices.pl
+Slic3r/utils/post-processing/decimate.pl
+Slic3r/utils/post-processing/fan_kickstart.py
+Slic3r/utils/post-processing/filament-weight.pl
+Slic3r/utils/post-processing/flowrate.pl
+Slic3r/utils/post-processing/prowl-notification.pl
+Slic3r/utils/post-processing/strip-toolchange.pl
+Slic3r/utils/post-processing/z-every-line.pl
+Slic3r/utils/send-gcode.pl
+Slic3r/utils/split_stl.pl
+Slic3r/utils/stl-to-amf.pl
+Slic3r/utils/view-mesh.pl
+Slic3r/utils/view-toolpaths.pl
+Slic3r/utils/wireframe.pl
+Slic3r/utils/zsh/README.markdown
+Slic3r/utils/zsh/functions/_slic3r
+Slic3r/var/Slic3r.icns
+Slic3r/var/Slic3r.ico
+Slic3r/var/Slic3r.png
+Slic3r/var/Slic3r_128px.png
+Slic3r/var/Slic3r_192px.png
+Slic3r/var/Slic3r_192px_transparent.png
+Slic3r/var/add.png
+Slic3r/var/application_view_tile.png
+Slic3r/var/arrow_down.png
+Slic3r/var/arrow_in.png
+Slic3r/var/arrow_left.png
+Slic3r/var/arrow_out.png
+Slic3r/var/arrow_redo.png
+Slic3r/var/arrow_refresh.png
+Slic3r/var/arrow_right.png
+Slic3r/var/arrow_rotate_anticlockwise.png
+Slic3r/var/arrow_rotate_clockwise.png
+Slic3r/var/arrow_rotate_x_anticlockwise.png
+Slic3r/var/arrow_rotate_x_clockwise.png
+Slic3r/var/arrow_rotate_y_anticlockwise.png
+Slic3r/var/arrow_rotate_y_clockwise.png
+Slic3r/var/arrow_rotate_z_anticlockwise.png
+Slic3r/var/arrow_rotate_z_clockwise.png
+Slic3r/var/arrow_undo.png
+Slic3r/var/arrow_up.png
+Slic3r/var/box.png
+Slic3r/var/brick.png
+Slic3r/var/brick_add.png
+Slic3r/var/brick_delete.png
+Slic3r/var/brick_go.png
+Slic3r/var/bricks.png
+Slic3r/var/building.png
+Slic3r/var/bullet_black.png
+Slic3r/var/bullet_blue.png
+Slic3r/var/bullet_green.png
+Slic3r/var/bullet_red.png
+Slic3r/var/bullet_white.png
+Slic3r/var/cog.png
+Slic3r/var/cog_go.png
+Slic3r/var/control_pause.png
+Slic3r/var/control_pause_blue.png
+Slic3r/var/control_play.png
+Slic3r/var/control_play_blue.png
+Slic3r/var/control_stop.png
+Slic3r/var/control_stop_blue.png
+Slic3r/var/cross.png
+Slic3r/var/delete.png
+Slic3r/var/disk.png
+Slic3r/var/error.png
+Slic3r/var/film.png
+Slic3r/var/funnel.png
+Slic3r/var/gcode.icns
+Slic3r/var/gcode.ico
+Slic3r/var/hourglass.png
+Slic3r/var/house.png
+Slic3r/var/infill.png
+Slic3r/var/joystick.png
+Slic3r/var/layers.png
+Slic3r/var/lorry_add.png
+Slic3r/var/lorry_go.png
+Slic3r/var/lorry_import.png
+Slic3r/var/map_add.png
+Slic3r/var/note.png
+Slic3r/var/package.png
+Slic3r/var/package_green.png
+Slic3r/var/page_white_go.png
+Slic3r/var/plugin.png
+Slic3r/var/plugin_add.png
+Slic3r/var/plugin_go.png
+Slic3r/var/printer_empty.png
+Slic3r/var/rotate_face.png
+Slic3r/var/script.png
+Slic3r/var/shape_flip_horizontal.png
+Slic3r/var/shape_flip_horizontal_x.png
+Slic3r/var/shape_flip_horizontal_y.png
+Slic3r/var/shape_flip_horizontal_z.png
+Slic3r/var/shape_handles.png
+Slic3r/var/shape_ungroup.png
+Slic3r/var/slt.ico
+Slic3r/var/solarized/arrow_rotate_x_180.png
+Slic3r/var/solarized/arrow_rotate_x_180_16.png
+Slic3r/var/solarized/arrow_rotate_x_anticlockwise90.png
+Slic3r/var/solarized/arrow_rotate_x_anticlockwise90_16.png
+Slic3r/var/solarized/arrow_rotate_x_clockwise90.png
+Slic3r/var/solarized/arrow_rotate_x_clockwise90_16.png
+Slic3r/var/solarized/arrow_rotate_y_180.png
+Slic3r/var/solarized/arrow_rotate_y_180_16.png
+Slic3r/var/solarized/arrow_rotate_y_anticlockwise90.png
+Slic3r/var/solarized/arrow_rotate_y_anticlockwise90_16.png
+Slic3r/var/solarized/arrow_rotate_y_clockwise90.png
+Slic3r/var/solarized/arrow_rotate_y_clockwise90_16.png
+Slic3r/var/solarized/arrow_rotate_z_180.png
+Slic3r/var/solarized/arrow_rotate_z_180_16.png
+Slic3r/var/solarized/arrow_rotate_z_anticlockwise45.png
+Slic3r/var/solarized/arrow_rotate_z_anticlockwise45_16.png
+Slic3r/var/solarized/arrow_rotate_z_anticlockwise90.png
+Slic3r/var/solarized/arrow_rotate_z_anticlockwise90_16.png
+Slic3r/var/solarized/arrow_rotate_z_clockwise45.png
+Slic3r/var/solarized/arrow_rotate_z_clockwise45_16.png
+Slic3r/var/solarized/arrow_rotate_z_clockwise90.png
+Slic3r/var/solarized/arrow_rotate_z_clockwise90_16.png
+Slic3r/var/spool.png
+Slic3r/var/stl.icns
+Slic3r/var/tag_blue.png
+Slic3r/var/textfield.png
+Slic3r/var/tick.png
+Slic3r/var/time.png
+Slic3r/var/variable_layer_height.png
+Slic3r/var/wand.png
+Slic3r/var/wrench.png
+Slic3r/var/zoom.png
+Slic3r/var/zoom_in.png
+Slic3r/var/zoom_out.png
+bin/slic3r.pl
+%%SITE_ARCH%%/Slic3r/XS.pm
+%%SITE_ARCH%%/auto/Slic3r/XS/XS.so
diff --git a/cad/Slic3r/Makefile b/cad/Slic3r/Makefile
new file mode 100644
index 000000000..8589c3d01
--- /dev/null
+++ b/cad/Slic3r/Makefile
@@ -0,0 +1,76 @@
+# $FreeBSD$
+
+PORTNAME=	Slic3r
+DISTVERSION=	1.3.0
+CATEGORIES=	cad
+
+MAINTAINER=	zielonka.michal@gmail.com
+COMMENT=	Slicing application for 3D printers
+
+LICENSE=	AGPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libwx_gtk3u_core-3.0.so:x11-toolkits/wxgtk30 \
+	libboost_system.so:devel/boost-libs \
+	libboost_thread.so:devel/boost-libs \
+	libboost_filesystem.so:devel/boost-libs
+BUILD_DEPENDS=	p5-Alien-wxWidgets>=0.69:x11-toolkits/p5-Alien-wxWidgets \
+		boost-libs>=1.64:devel/boost-libs \
+		wx30-gtk3>=3.0:x11-toolkits/wxgtk30 \
+		p5-Moo>=2.003004:devel/p5-Moo \
+		p5-Wx>=p5-Wx-0.9932:x11-toolkits/p5-Wx \
+		p5-Devel-CheckLib>=1.13:devel/p5-Devel-CheckLib \
+		p5-ExtUtils-CppGuess>=0.20:devel/p5-ExtUtils-CppGuess \
+		p5-Module-Build>=0.4229:devel/p5-Module-Build \
+		p5-Module-Build-WithXSpp>=0.14:devel/p5-Module-Build-WithXSpp \
+		p5-ExtUtils-Typemaps-Default>=1.05:devel/p5-ExtUtils-Typemaps-Default \
+		p5-Encode-Locale>=1.05:converters/p5-Encode-Locale
+RUN_DEPENDS=	p5-Alien-wxWidgets>=0.69:x11-toolkits/p5-Alien-wxWidgets \
+		boost-libs>=1.64:devel/boost-libs \
+		wx30-gtk3>=3.0:x11-toolkits/wxgtk30 \
+		p5-Moo>=2.003004:devel/p5-Moo \
+		p5-Wx>=p5-Wx-0.9932:x11-toolkits/p5-Wx \
+		p5-ExtUtils-Typemaps-Default>=1.05:devel/p5-ExtUtils-Typemaps-Default \
+		p5-Encode-Locale>=1.05:converters/p5-Encode-Locale \
+		p5-Class-Accessor>=0.51:devel/p5-Class-Accessor \
+		p5-OpenGL>=0.70:graphics/p5-OpenGL \
+		p5-Wx-GLCanvas>=0.09:x11-toolkits/p5-Wx-GLCanvas \
+		p5-libwww>=6.43:www/p5-libwww
+
+USES=		perl5 compiler:c++11-lang gl xorg
+
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+
+CC=	${CXX}
+CONFIGURE_ENV+= SLIC3R_NO_AUTO=1
+CONFIGURE_ENV+= WX_CONFIG=${LOCALBASE}/bin/wxgtk3u-3.0-config
+CONFIGURE_WRKSRC=	${WRKSRC}/xs
+BUILD_WRKSRC=	${WRKSRC}/xs
+INSTALL_WRKSRC=	${WRKSRC}/xs
+
+USE_PERL5=	modbuild
+USE_GITHUB=	yes
+USE_GL=		glew
+GH_TAGNAME=	1.3.0
+GH_ACCOUNT=	slic3r
+
+post-install:
+	cd ${WRKSRC} && \
+		${FIND} var -type d -exec ${INSTALL_DATA} -d {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \; && \
+		${FIND} var -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \;
+	cd ${WRKSRC} && \
+		${FIND} lib -type d -exec ${INSTALL_DATA} -d {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \; && \
+		${FIND} lib -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \;
+	cd ${WRKSRC} && \
+		${FIND} utils -type d -exec ${INSTALL_DATA} -d {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \; && \
+		${FIND} utils -type f \! -name '*.orig' -exec ${INSTALL_DATA} {} "${STAGEDIR}/${PREFIX}/${PORTNAME}/{}" \;
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} -d "${STAGEDIR}/${PREFIX}/bin" && \
+		${INSTALL_SCRIPT} slic3r.pl "${STAGEDIR}/${PREFIX}/${PORTNAME}/" && \
+		${LN} -sf "../${PORTNAME}/slic3r.pl" "${STAGEDIR}/${PREFIX}/bin/slic3r.pl"
+
+.include <bsd.port.mk>
diff --git a/cad/Slic3r/distinfo b/cad/Slic3r/distinfo
new file mode 100644
index 000000000..0c6af7626
--- /dev/null
+++ b/cad/Slic3r/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1642540220
+SHA256 (slic3r-Slic3r-1.3.0_GH0.tar.gz) = 4fb351c1ae25c213cc6f17022eb62e2f0ce9678c0439916cb536d5cb3503da31
+SIZE (slic3r-Slic3r-1.3.0_GH0.tar.gz) = 2104094
diff --git a/cad/Slic3r/files/patch-no-local-real-bin b/cad/Slic3r/files/patch-no-local-real-bin
new file mode 100644
index 000000000..b5f43a374
--- /dev/null
+++ b/cad/Slic3r/files/patch-no-local-real-bin
@@ -0,0 +1,654 @@
+--- Build.PL.orig	2020-01-27 06:19:45 UTC
++++ Build.PL
+@@ -109,16 +109,7 @@ EOF
+         if !$cpanm;
+     my @cpanm_args = ();
+     push @cpanm_args, "--sudo" if $sudo;
+-    
+-    # install local::lib without --local-lib otherwise it's not usable afterwards
+-    if (!eval "use local::lib qw(local-lib); 1") {
+-        my $res = system $cpanm, @cpanm_args, 'local::lib';
+-        warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n"
+-            if $res != 0;
+-    }
+-    
+-    push @cpanm_args, ('--local-lib', 'local-lib');
+-    
++
+     # make sure our cpanm is updated (old ones don't support the ~ syntax)
+     system $cpanm, @cpanm_args, 'App::cpanminus';
+     
+--- lib/Slic3r.pm.orig	2020-01-27 06:19:45 UTC
++++ lib/Slic3r.pm
+@@ -43,9 +43,9 @@ warn "Running Slic3r under Perl 5.16 is neither suppor
+ 
+ use FindBin;
+ # Path to the images.
+-my $varpath = decode_path($FindBin::Bin) . "/var";
++my $varpath = decode_path($FindBin::RealBin) . "/var";
+ if ($^O eq 'darwin' && !-d $varpath) {
+-    $varpath = decode_path($FindBin::Bin) . "/../Resources/var";
++    $varpath = decode_path($FindBin::RealBin) . "/../Resources/var";
+ }
+ our $var = sub { "$varpath/$_[0]" };
+ 
+--- lib/Slic3r/GUI.pm.orig	2020-01-27 06:19:45 UTC
++++ lib/Slic3r/GUI.pm
+@@ -179,7 +179,7 @@ sub OnInit {
+     
+     # load init bundle
+     {
+-        my @dirs = ($FindBin::Bin);
++        my @dirs = ($FindBin::RealBin);
+         if (&Wx::wxMAC) {
+             push @dirs, qw();
+         } elsif (&Wx::wxMSW) {
+--- slic3r.pl.orig	2020-01-27 06:19:45 UTC
++++ slic3r.pl
+@@ -5,8 +5,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/lib";
+-    use local::lib '--no-create', "$FindBin::Bin/local-lib";
++    use lib "$FindBin::RealBin/lib";
+ }
+ 
+ use File::Basename qw(basename);
+@@ -78,9 +77,9 @@ if ($opt{load}) {
+         $configfile = Slic3r::decode_path($configfile);
+         if (-e Slic3r::encode_path($configfile)) {
+             push @external_configs, Slic3r::Config->load($configfile);
+-        } elsif (-e Slic3r::encode_path("$FindBin::Bin/$configfile")) {
+-            printf STDERR "Loading $FindBin::Bin/$configfile\n";
+-            push @external_configs, Slic3r::Config->load("$FindBin::Bin/$configfile");
++        } elsif (-e Slic3r::encode_path("$FindBin::RealBin/$configfile")) {
++            printf STDERR "Loading $FindBin::RealBin/$configfile\n";
++            push @external_configs, Slic3r::Config->load("$FindBin::RealBin/$configfile");
+         } else {
+             $opt{ignore_nonexistent_config} or die "Cannot find specified configuration file ($configfile).\n";
+         }
+--- t/adaptive_slicing.t.orig	2020-01-27 06:19:45 UTC
++++ t/adaptive_slicing.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum);
+--- t/adaptive_width.t.orig	2020-01-27 06:19:45 UTC
++++ t/adaptive_width.t
+@@ -6,8 +6,7 @@ plan tests => 32;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/angles.t.orig	2020-01-27 06:19:45 UTC
++++ t/angles.t
+@@ -6,10 +6,7 @@ plan tests => 34;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use lib "$FindBin::Bin/../lib";
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+@@ -92,4 +89,4 @@ sub line_orientation {
+ sub line_direction {
+     my ($l) = @_;
+     return Slic3r::Line->new(@$l)->direction;
+-}
+\ No newline at end of file
++}
+--- t/arcs.t.orig	2020-01-27 06:19:45 UTC
++++ t/arcs.t
+@@ -6,8 +6,7 @@ plan tests => 24;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/avoid_crossing_perimeters.t.orig	2020-01-27 06:19:45 UTC
++++ t/avoid_crossing_perimeters.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum);
+--- t/bridges.t.orig	2020-01-27 06:19:45 UTC
++++ t/bridges.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum);
+--- t/clean_polylines.t.orig	2020-01-27 06:19:45 UTC
++++ t/clean_polylines.t
+@@ -6,8 +6,7 @@ plan tests => 6;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/clipper.t.orig	2020-01-27 06:19:45 UTC
++++ t/clipper.t
+@@ -6,8 +6,7 @@ plan tests => 6;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(sum);
+--- t/collinear.t.orig	2020-01-27 06:19:45 UTC
++++ t/collinear.t
+@@ -6,8 +6,7 @@ plan tests => 11;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/combineinfill.t.orig	2020-01-27 06:19:45 UTC
++++ t/combineinfill.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/config.t.orig	2020-01-27 06:19:45 UTC
++++ t/config.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/cooling.t.orig	2020-01-27 06:19:45 UTC
++++ t/cooling.t
+@@ -6,8 +6,7 @@ plan tests => 13;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(none all);
+--- t/custom_gcode.t.orig	2020-01-27 06:19:45 UTC
++++ t/custom_gcode.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/fill.t.orig	2020-01-27 06:19:45 UTC
++++ t/fill.t
+@@ -6,8 +6,7 @@ plan tests => 95;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum max);
+--- t/flow.t.orig	2020-01-27 06:19:45 UTC
++++ t/flow.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum);
+--- t/gaps.t.orig	2020-01-27 06:19:45 UTC
++++ t/gaps.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/gcode.t.orig	2020-01-27 06:19:45 UTC
++++ t/gcode.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/geometry.t.orig	2020-01-27 06:19:45 UTC
++++ t/geometry.t
+@@ -6,8 +6,7 @@ plan tests => 44;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/layers.t.orig	2020-01-27 06:19:45 UTC
++++ t/layers.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/loops.t.orig	2020-01-27 06:19:45 UTC
++++ t/loops.t
+@@ -6,8 +6,7 @@ plan tests => 4;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/multi.t.orig	2020-01-27 06:19:45 UTC
++++ t/multi.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/perimeters.t.orig	2020-01-27 06:19:45 UTC
++++ t/perimeters.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r::ExtrusionLoop ':roles';
+--- t/polyclip.t.orig	2020-01-27 06:19:45 UTC
++++ t/polyclip.t
+@@ -6,8 +6,7 @@ plan tests => 18;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/pressure.t.orig	2020-01-27 06:19:45 UTC
++++ t/pressure.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw();
+--- t/print.t.orig	2020-01-27 06:19:45 UTC
++++ t/print.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/retraction.t.orig	2020-01-27 06:19:45 UTC
++++ t/retraction.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(any);
+--- t/shells.t.orig	2020-01-27 06:19:45 UTC
++++ t/shells.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first sum);
+--- t/skirt_brim.t.orig	2020-01-27 06:19:45 UTC
++++ t/skirt_brim.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/slice.t.orig	2020-01-27 06:19:45 UTC
++++ t/slice.t
+@@ -7,8 +7,7 @@ plan tests => 16;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ # temporarily disable compilation errors due to constant not being exported anymore
+--- t/speed.t.orig	2020-01-27 06:19:45 UTC
++++ t/speed.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(none);
+--- t/support.t.orig	2020-01-27 06:19:45 UTC
++++ t/support.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/svg.t.orig	2020-01-27 06:19:45 UTC
++++ t/svg.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/thin.t.orig	2020-01-27 06:19:45 UTC
++++ t/thin.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- t/threads.t.orig	2020-01-27 06:19:45 UTC
++++ t/threads.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use List::Util qw(first);
+--- t/vibrationlimit.t.orig	2020-01-27 06:19:45 UTC
++++ t/vibrationlimit.t
+@@ -4,8 +4,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- utils/amf-to-stl.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/amf-to-stl.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use File::Basename qw(basename);
+--- utils/config-bundle-to-config.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/config-bundle-to-config.pl
+@@ -8,8 +8,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- utils/dump-stl.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/dump-stl.pl
+@@ -7,8 +7,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- utils/estimate-gcode-time.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/estimate-gcode-time.pl
+@@ -5,8 +5,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- utils/gcode_sectioncut.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/gcode_sectioncut.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- utils/pdf-slices.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/pdf-slices.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- utils/send-gcode.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/send-gcode.pl
+@@ -5,8 +5,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Slic3r;
+--- utils/split_stl.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/split_stl.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use File::Basename qw(basename);
+--- utils/stl-to-amf.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/stl-to-amf.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use File::Basename qw(basename);
+--- utils/view-mesh.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/view-mesh.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- utils/view-toolpaths.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/view-toolpaths.pl
+@@ -6,8 +6,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- utils/wireframe.pl.orig	2020-01-27 06:19:45 UTC
++++ utils/wireframe.pl
+@@ -7,8 +7,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../lib";
+-    use local::lib "$FindBin::Bin/../local-lib";
++    use lib "$FindBin::RealBin/../lib";
+ }
+ 
+ use Getopt::Long qw(:config no_auto_abbrev);
+--- xs/t/18_motionplanner.t.orig	2020-01-27 06:19:45 UTC
++++ xs/t/18_motionplanner.t
+@@ -5,7 +5,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/../../lib";
++    use lib "$FindBin::RealBin/../../lib";
+ }
+ 
+ use Slic3r::XS;
diff --git a/cad/Slic3r/files/patch-src_CMakeLists.txt b/cad/Slic3r/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000..13a43751f
--- /dev/null
+++ b/cad/Slic3r/files/patch-src_CMakeLists.txt
@@ -0,0 +1,9 @@
+--- src/CMakeLists.txt.orig	2022-01-18 21:30:33.992628000 +0000
++++ src/CMakeLists.txt	2022-01-18 21:33:56.226995000 +0000
+@@ -174,3 +174,6 @@
+ ENDIF(WIN32)
+ 
+ target_link_libraries (extrude-tin libslic3r admesh BSpline clipper expat polypartition poly2tri ${Boost_LIBRARIES})
++
++install(TARGETS slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
++
diff --git a/cad/Slic3r/files/patch-xs_src_libslic3r_GCodeSender.hpp b/cad/Slic3r/files/patch-xs_src_libslic3r_GCodeSender.hpp
new file mode 100644
index 000000000..d403ac57e
--- /dev/null
+++ b/cad/Slic3r/files/patch-xs_src_libslic3r_GCodeSender.hpp
@@ -0,0 +1,11 @@
+--- xs/src/libslic3r/GCodeSender.hpp.orig	2022-01-18 22:24:03.648119000 +0000
++++ xs/src/libslic3r/GCodeSender.hpp	2022-01-18 22:07:01.684316000 +0000
+@@ -14,7 +14,7 @@
+ 
+ namespace asio = boost::asio;
+ 
+-class GCodeSender : private boost::noncopyable {
++class GCodeSender : private asio::noncopyable {
+     public:
+     GCodeSender();
+     ~GCodeSender();
diff --git a/cad/Slic3r/pkg-descr b/cad/Slic3r/pkg-descr
new file mode 100644
index 000000000..279ba4c6e
--- /dev/null
+++ b/cad/Slic3r/pkg-descr
@@ -0,0 +1,3 @@
+Open Source toolpath generator for 3D printers.
+
+WWW: https://slic3r.org/
diff --git a/cad/Slic3r/pkg-plist b/cad/Slic3r/pkg-plist
new file mode 100644
index 000000000..fa4afc36d
--- /dev/null
+++ b/cad/Slic3r/pkg-plist
@@ -0,0 +1,173 @@
+Slic3r/lib/Slic3r.pm
+Slic3r/lib/Slic3r.pm.orig
+Slic3r/lib/Slic3r/Config.pm
+Slic3r/lib/Slic3r/ExPolygon.pm
+Slic3r/lib/Slic3r/ExtrusionLoop.pm
+Slic3r/lib/Slic3r/ExtrusionPath.pm
+Slic3r/lib/Slic3r/Flow.pm
+Slic3r/lib/Slic3r/GCode/ArcFitting.pm
+Slic3r/lib/Slic3r/GCode/MotionPlanner.pm
+Slic3r/lib/Slic3r/GCode/PressureRegulator.pm
+Slic3r/lib/Slic3r/GCode/Reader.pm
+Slic3r/lib/Slic3r/GCode/VibrationLimit.pm
+Slic3r/lib/Slic3r/GUI.pm
+Slic3r/lib/Slic3r/GUI.pm.orig
+Slic3r/lib/Slic3r/GUI/2DBed.pm
+Slic3r/lib/Slic3r/GUI/3DScene.pm
+Slic3r/lib/Slic3r/GUI/AboutDialog.pm
+Slic3r/lib/Slic3r/GUI/BedShapeDialog.pm
+Slic3r/lib/Slic3r/GUI/BonjourBrowser.pm
+Slic3r/lib/Slic3r/GUI/ColorScheme.pm
+Slic3r/lib/Slic3r/GUI/ConfigWizard.pm
+Slic3r/lib/Slic3r/GUI/Controller.pm
+Slic3r/lib/Slic3r/GUI/Controller/ManualControlDialog.pm
+Slic3r/lib/Slic3r/GUI/Controller/PrinterPanel.pm
+Slic3r/lib/Slic3r/GUI/MainFrame.pm
+Slic3r/lib/Slic3r/GUI/Notifier.pm
+Slic3r/lib/Slic3r/GUI/OptionsGroup.pm
+Slic3r/lib/Slic3r/GUI/OptionsGroup/Field.pm
+Slic3r/lib/Slic3r/GUI/Plater.pm
+Slic3r/lib/Slic3r/GUI/Plater/2D.pm
+Slic3r/lib/Slic3r/GUI/Plater/2DToolpaths.pm
+Slic3r/lib/Slic3r/GUI/Plater/3D.pm
+Slic3r/lib/Slic3r/GUI/Plater/3DPreview.pm
+Slic3r/lib/Slic3r/GUI/Plater/LambdaObjectDialog.pm
+Slic3r/lib/Slic3r/GUI/Plater/ObjectCutDialog.pm
+Slic3r/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm
+Slic3r/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm
+Slic3r/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
+Slic3r/lib/Slic3r/GUI/Plater/SplineControl.pm
+Slic3r/lib/Slic3r/GUI/Preferences.pm
+Slic3r/lib/Slic3r/GUI/Preset.pm
+Slic3r/lib/Slic3r/GUI/PresetEditor.pm
+Slic3r/lib/Slic3r/GUI/PresetEditorDialog.pm
+Slic3r/lib/Slic3r/GUI/ProgressStatusBar.pm
+Slic3r/lib/Slic3r/GUI/Projector.pm
+Slic3r/lib/Slic3r/GUI/ReloadDialog.pm
+Slic3r/lib/Slic3r/GUI/SLAPrintOptions.pm
+Slic3r/lib/Slic3r/Geometry.pm
+Slic3r/lib/Slic3r/Geometry/Clipper.pm
+Slic3r/lib/Slic3r/Layer.pm
+Slic3r/lib/Slic3r/Line.pm
+Slic3r/lib/Slic3r/Model.pm
+Slic3r/lib/Slic3r/Point.pm
+Slic3r/lib/Slic3r/Polygon.pm
+Slic3r/lib/Slic3r/Polyline.pm
+Slic3r/lib/Slic3r/Print.pm
+Slic3r/lib/Slic3r/Print/GCode.pm
+Slic3r/lib/Slic3r/Print/Object.pm
+Slic3r/lib/Slic3r/Print/Simple.pm
+Slic3r/lib/Slic3r/Print/State.pm
+Slic3r/lib/Slic3r/Print/SupportMaterial.pm
+Slic3r/lib/Slic3r/SVG.pm
+Slic3r/lib/Slic3r/Surface.pm
+Slic3r/lib/Slic3r/Test.pm
+Slic3r/lib/Slic3r/Test/SectionCut.pm
+Slic3r/slic3r.pl
+Slic3r/utils/amf-to-stl.pl
+Slic3r/utils/config-bundle-to-config.pl
+Slic3r/utils/dump-stl.pl
+Slic3r/utils/estimate-gcode-time.pl
+Slic3r/utils/gcode_sectioncut.pl
+Slic3r/utils/modifier_helpers/layer_generator.jscad
+Slic3r/utils/modifier_helpers/solid_layers.scad
+Slic3r/utils/pdf-slices.pl
+Slic3r/utils/post-processing/decimate.pl
+Slic3r/utils/post-processing/fan_kickstart.py
+Slic3r/utils/post-processing/filament-weight.pl
+Slic3r/utils/post-processing/flowrate.pl
+Slic3r/utils/post-processing/prowl-notification.pl
+Slic3r/utils/post-processing/strip-toolchange.pl
+Slic3r/utils/post-processing/z-every-line.pl
+Slic3r/utils/send-gcode.pl
+Slic3r/utils/split_stl.pl
+Slic3r/utils/stl-to-amf.pl
+Slic3r/utils/view-mesh.pl
+Slic3r/utils/view-toolpaths.pl
+Slic3r/utils/wireframe.pl
+Slic3r/utils/zsh/README.markdown
+Slic3r/utils/zsh/functions/_slic3r
+Slic3r/var/Slic3r.icns
+Slic3r/var/Slic3r.ico
+Slic3r/var/Slic3r.png
+Slic3r/var/Slic3r_128px.png
+Slic3r/var/Slic3r_192px.png
+Slic3r/var/Slic3r_192px_transparent.png
+Slic3r/var/add.png
+Slic3r/var/application_view_tile.png
+Slic3r/var/arrow_down.png
+Slic3r/var/arrow_in.png
+Slic3r/var/arrow_left.png
+Slic3r/var/arrow_out.png
+Slic3r/var/arrow_redo.png
+Slic3r/var/arrow_refresh.png
+Slic3r/var/arrow_right.png
+Slic3r/var/arrow_rotate_anticlockwise.png
+Slic3r/var/arrow_rotate_clockwise.png
+Slic3r/var/arrow_undo.png
+Slic3r/var/arrow_up.png
+Slic3r/var/box.png
+Slic3r/var/brick.png
+Slic3r/var/brick_add.png
+Slic3r/var/brick_delete.png
+Slic3r/var/brick_go.png
+Slic3r/var/bricks.png
+Slic3r/var/building.png
+Slic3r/var/bullet_black.png
+Slic3r/var/bullet_blue.png
+Slic3r/var/bullet_green.png
+Slic3r/var/bullet_red.png
+Slic3r/var/bullet_white.png
+Slic3r/var/cog.png
+Slic3r/var/cog_go.png
+Slic3r/var/control_pause.png
+Slic3r/var/control_pause_blue.png
+Slic3r/var/control_play.png
+Slic3r/var/control_play_blue.png
+Slic3r/var/control_stop.png
+Slic3r/var/control_stop_blue.png
+Slic3r/var/cross.png
+Slic3r/var/delete.png
+Slic3r/var/disk.png
+Slic3r/var/error.png
+Slic3r/var/film.png
+Slic3r/var/funnel.png
+Slic3r/var/gcode.icns
+Slic3r/var/gcode.ico
+Slic3r/var/hourglass.png
+Slic3r/var/house.png
+Slic3r/var/infill.png
+Slic3r/var/joystick.png
+Slic3r/var/layers.png
+Slic3r/var/lorry_add.png
+Slic3r/var/lorry_go.png
+Slic3r/var/lorry_import.png
+Slic3r/var/map_add.png
+Slic3r/var/note.png
+Slic3r/var/package.png
+Slic3r/var/package_green.png
+Slic3r/var/page_white_go.png
+Slic3r/var/plugin.png
+Slic3r/var/plugin_add.png
+Slic3r/var/plugin_go.png
+Slic3r/var/printer_empty.png
+Slic3r/var/script.png
+Slic3r/var/shape_flip_horizontal.png
+Slic3r/var/shape_handles.png
+Slic3r/var/shape_ungroup.png
+Slic3r/var/slt.ico
+Slic3r/var/spool.png
+Slic3r/var/stl.icns
+Slic3r/var/tag_blue.png
+Slic3r/var/textfield.png
+Slic3r/var/tick.png
+Slic3r/var/time.png
+Slic3r/var/variable_layer_height.png
+Slic3r/var/wand.png
+Slic3r/var/wrench.png
+Slic3r/var/zoom.png
+Slic3r/var/zoom_in.png
+Slic3r/var/zoom_out.png
+bin/slic3r.pl
+%%SITE_ARCH%%/Slic3r/XS.pm
+%%SITE_ARCH%%/auto/Slic3r/XS/XS.so
diff --git a/devel/Makefile b/devel/Makefile
index 506da8438..435be1760 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2407,6 +2407,7 @@
     SUBDIR += p5-ExtUtils-Manifest
     SUBDIR += p5-ExtUtils-ParseXS
     SUBDIR += p5-ExtUtils-PkgConfig
+    SUBDIR += p5-ExtUtils-Typemaps-Default
     SUBDIR += p5-ExtUtils-XSBuilder
     SUBDIR += p5-ExtUtils-XSpp
     SUBDIR += p5-FFI-CheckLib
diff --git a/devel/p5-ExtUtils-Typemaps-Default/Makefile b/devel/p5-ExtUtils-Typemaps-Default/Makefile
new file mode 100644
index 000000000..0836131b1
--- /dev/null
+++ b/devel/p5-ExtUtils-Typemaps-Default/Makefile
@@ -0,0 +1,25 @@
+# Created by: Michał Zielonka <zielonka.michal@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	ExtUtils-Typemaps-Default
+PORTVERSION=	1.05
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	zielonka.michal@gmail.com
+COMMENT=	This is a set of useful typemaps
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-ExtUtils-ParseXS>=3.18:devel/p5-ExtUtils-ParseXS
+
+USES=		perl5
+
+NO_ARCH=	yes
+USE_PERL5=	modbuild
+ALL_TARGET=	build
+
+.include <bsd.port.mk>
diff --git a/devel/p5-ExtUtils-Typemaps-Default/distinfo b/devel/p5-ExtUtils-Typemaps-Default/distinfo
new file mode 100644
index 000000000..fa62fd268
--- /dev/null
+++ b/devel/p5-ExtUtils-Typemaps-Default/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1582723002
+SHA256 (ExtUtils-Typemaps-Default-1.05.tar.gz) = 3dfaf5837ebfdc007895bfca84c3c2e76d589a7d336400e8dfb3243d818215de
+SIZE (ExtUtils-Typemaps-Default-1.05.tar.gz) = 9327
diff --git a/devel/p5-ExtUtils-Typemaps-Default/pkg-descr b/devel/p5-ExtUtils-Typemaps-Default/pkg-descr
new file mode 100644
index 000000000..ab8a5e4da
--- /dev/null
+++ b/devel/p5-ExtUtils-Typemaps-Default/pkg-descr
@@ -0,0 +1,3 @@
+ExtUtils::Typemaps::Default A set of useful typemaps for ExtUtils::ParseXS
+
+WWW: https://metacpan.org/release/ExtUtils-Typemaps-Default
diff --git a/devel/p5-ExtUtils-Typemaps-Default/pkg-plist b/devel/p5-ExtUtils-Typemaps-Default/pkg-plist
new file mode 100644
index 000000000..e7715e622
--- /dev/null
+++ b/devel/p5-ExtUtils-Typemaps-Default/pkg-plist
@@ -0,0 +1,26 @@
+%%SITE_PERL%%/ExtUtils/Typemap/Basic.pm
+%%SITE_PERL%%/ExtUtils/Typemap/Default.pm
+%%SITE_PERL%%/ExtUtils/Typemap/ObjectMap.pm
+%%SITE_PERL%%/ExtUtils/Typemap/STL.pm
+%%SITE_PERL%%/ExtUtils/Typemap/STL/String.pm
+%%SITE_PERL%%/ExtUtils/Typemap/STL/Vector.pm
+%%SITE_PERL%%/ExtUtils/Typemaps/Basic.pm
+%%SITE_PERL%%/ExtUtils/Typemaps/Default.pm
+%%SITE_PERL%%/ExtUtils/Typemaps/ObjectMap.pm
+%%SITE_PERL%%/ExtUtils/Typemaps/STL.pm
+%%SITE_PERL%%/ExtUtils/Typemaps/STL/List.pm
+%%SITE_PERL%%/ExtUtils/Typemaps/STL/String.pm
+%%SITE_PERL%%/ExtUtils/Typemaps/STL/Vector.pm
+%%PERL5_MAN3%%/ExtUtils::Typemap::Basic.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemap::Default.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemap::ObjectMap.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemap::STL.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemap::STL::String.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemap::STL::Vector.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemaps::Basic.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemaps::Default.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemaps::ObjectMap.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemaps::STL.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemaps::STL::List.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemaps::STL::String.3.gz
+%%PERL5_MAN3%%/ExtUtils::Typemaps::STL::Vector.3.gz
diff --git a/graphics/p5-OpenGL/Makefile b/graphics/p5-OpenGL/Makefile
index ad0e4870e..b8f363d65 100644
--- a/graphics/p5-OpenGL/Makefile
+++ b/graphics/p5-OpenGL/Makefile
@@ -1,7 +1,7 @@
 # Created by: ijliao
 
 PORTNAME=	OpenGL
-PORTVERSION=	0.66
+PORTVERSION=	0.70
 PORTREVISION=	7
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
@@ -11,8 +11,6 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to display 3D data using OpenGL, GLU, GLUT, and GLX
 
-MANUAL_PACKAGE_BUILD=	needs the X server it will be used with to build
-
 PORTSCOUT=	limit:^[0-9\.]*$$
 
 CONFIGURE_ARGS=	interface=FREEGLUT
diff --git a/graphics/p5-OpenGL/distinfo b/graphics/p5-OpenGL/distinfo
index 3c0769d53..fb8c258f2 100644
--- a/graphics/p5-OpenGL/distinfo
+++ b/graphics/p5-OpenGL/distinfo
@@ -1,2 +1,3 @@
-SHA256 (OpenGL-0.66.tar.gz) = 8837bf244d41e415e9ef05bece8fb60861293389d96a4115f0a64929650627df
-SIZE (OpenGL-0.66.tar.gz) = 611606
+TIMESTAMP = 1642579979
+SHA256 (OpenGL-0.70.tar.gz) = b20e2af4404b4901ab35bba6ad5e3a8aa60bff72413c99288f01018c4cf874e0
+SIZE (OpenGL-0.70.tar.gz) = 783810
diff --git a/graphics/p5-OpenGL/files/patch-Makefile.PL b/graphics/p5-OpenGL/files/patch-Makefile.PL
new file mode 100644
index 000000000..297fedca4
--- /dev/null
+++ b/graphics/p5-OpenGL/files/patch-Makefile.PL
@@ -0,0 +1,98 @@
+--- Makefile.PL.orig	2016-10-08 21:11:14.000000000 +0200
++++ Makefile.PL	2016-12-24 21:08:08.674243142 +0100
+@@ -601,9 +601,9 @@
+   {
+     FILES =>
+       "Config.pm ".
+-      "utils/glversion.txt ".
+-      "utils/glversion$Config{exe_ext} ".
+-      "utils/glversion$Config{obj_ext}"
++      "utils/glversion.txt "
++      #"utils/glversion$Config{exe_ext} ".
++      #"utils/glversion$Config{obj_ext}"
+   }
+ };
+ 
+@@ -824,65 +824,6 @@
+     print "GLUT not found\n";
+   }
+ 
+-  # Platform-specific makefiles for glversion
+-  my $make_ver;
+-  if ($IS_STRAWBERRY)
+-  {
+-    $make_ver = "&strawberry.bat";
+-    print "strawberry glversion: '$make_ver'\n" if $verbose>1;
+-  }
+-  elsif ($IS_MINGW)
+-  {
+-    $make_ver = "&mingw.bat";
+-    print "mingw glversion: '$make_ver'\n" if $verbose>1;
+-  }
+-  elsif ($IS_W32API)
+-  {
+-    $make_ver = ";make -f Makefile.cygwin " .  (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : "");
+-    print "cygwin glversion: '$make_ver'\n" if $verbose>1;
+-  }
+-  elsif ($^O eq 'MSWin32')
+-  {
+-    $make_ver = '&nmake -f makefile.mak ' . (length($def) ? "GLUT_DEF=$def " : "");
+-    print "MSWin32 glversion: '$make_ver'\n" if $verbose>1;
+-  }
+-  elsif ($^O eq 'darwin')
+-  {
+-    $make_ver = ";make -f Makefile.macosx " .  (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : "");
+-    print "MacOSX glversion: '$make_ver'\n" if $verbose>1;
+-  }
+-  else
+-  {
+-    if ($ENV{TERM} ne 'xterm')
+-    {
+-      print "\nIn order to test your GPU's capabilities, run this make under an X11 shell\n\n";
+-    }
+-
+-    $make_ver = ";make -f Makefile " .  (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : "");
+-    print "glversion: '$make_ver'\n" if $verbose>1;
+-  }
+-  my $exec = 'cd utils'."$make_ver clean".$make_ver;
+-  print "glversion: $exec\n" if ($verbose);
+-  my $stat = `$exec`;
+-  print "\n$stat\n\n" if ($verbose);
+-  unlink "utils/freeglut.dll" or die "could not remove temporary freeglut: $!" if -f "utils/freeglut.dll";
+-
+-  # Parse glversion.txt file
+-  open GLDATA, $glv_file or die "get_extensions: could not open $glv_file: $!\n";
+-  my $gldata = {};
+-  my @gldata = <GLDATA>;
+-  close(GLDATA);
+-
+-  foreach my $line (@gldata)
+-  {
+-    $line =~ s|[\r\n]+||;
+-    my($key,$val) = split('=',$line);
+-    $gldata->{$key} = $val;
+-  }
+-  die "get_extensions: no extensions found in $glv_file\n" if !keys %$gldata;
+-
+-  print "This looks like OpenGL Version: $gldata->{VERSION}\n";
+-
+   # Parse glext_procs.h file
+   open GLEXT, "glext_procs.h" or die "get_extensions: could not open glext_procs.h: $!\n";
+   my @lines = <GLEXT>;
+@@ -896,14 +837,11 @@
+     next if ($ext =~ m|^GL_VERSION_|);
+     $no_ext->{$ext}++;
+   }
+-
++  use Config;
++  my $gldata = { };
+ 
+   # Create gl_exclude.h
+   die "Unable to write to $exc_file\n" if (!open(GLEXC,">$exc_file"));
+-  print GLEXC "// OpenGL Extension Exclusions - may be modified before building.\n";
+-  print GLEXC "//\n";
+-  print GLEXC "// Generated for ".$gldata->{VENDOR}.", ".$gldata->{RENDERER}."\n";
+-  print GLEXC "// OpenGL v".$gldata->{VERSION}.", using ";
+ 
+   # Fix GLUT flags based on results
+   if ($gldata->{FREEGLUT})
diff --git a/graphics/p5-OpenGL/files/patch-gl_util.c b/graphics/p5-OpenGL/files/patch-gl_util.c
deleted file mode 100644
index e7224d17d..000000000
--- a/graphics/p5-OpenGL/files/patch-gl_util.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- gl_util.c.orig	2011-07-07 08:39:22.000000000 -0500
-+++ gl_util.c	2011-10-12 22:09:31.520959086 -0500
-@@ -756,6 +756,12 @@ int gl_component_count(GLenum format, GL
- 
- /* 18 */
- #ifdef GL_EXT_cmyka
-+# ifndef GL_CMYK
-+#  define GL_CMYK GL_CMYK_EXT
-+# endif
-+# ifndef GL_CMYKA
-+#  define GL_CMYKA GL_CMYKA_EXT
-+# endif
- 		case GL_CMYK:
- 			n = 4; break;
- 		case GL_CMYKA:
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index bc8b1969e..29727eb41 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -142,6 +142,8 @@
     SUBDIR += p5-Tk-TableMatrix
     SUBDIR += p5-Tk-ToolBar
     SUBDIR += p5-Tk-WaitBox
+    SUBDIR += p5-Wx
+    SUBDIR += p5-Wx-GLCanvas
     SUBDIR += pango
     SUBDIR += pangolin
     SUBDIR += pangomm
diff --git a/x11-toolkits/p5-Wx-GLCanvas/Makefile b/x11-toolkits/p5-Wx-GLCanvas/Makefile
new file mode 100644
index 000000000..a201ad90b
--- /dev/null
+++ b/x11-toolkits/p5-Wx-GLCanvas/Makefile
@@ -0,0 +1,43 @@
+# Created by: mr
+# $FreeBSD$
+
+PORTNAME=	Wx-GLCanvas
+PORTVERSION=	0.09
+PORTREVISION=	4
+CATEGORIES=	x11-toolkits perl5
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MBARBON
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	mr@FreeBSD.org
+COMMENT=	Perl interface to wxWidgets' OpenGL canvas
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=  p5-OpenGL>=0.66:graphics/p5-OpenGL \
+		p5-Wx>=0.5000:x11-toolkits/p5-Wx
+RUN_DEPENDS=    p5-OpenGL>=0.66:graphics/p5-OpenGL \
+		p5-Wx>=0.5000:x11-toolkits/p5-Wx
+
+USES=           compiler:c++11-lib perl5
+
+PORTSCOUT=	limit:^[0-9\.]*$$
+
+USE_CXXSTD=     c++11
+USE_PERL5=      configure
+USE_WX=         3.0
+CONFIGURE_ENV=  CXX="${CXX}"
+
+CFLAGS+=        -pthread -Wno-write-strings -I${LOCALBASE}/include
+
+post-configure:
+	@${FIND} ${WRKSRC} -name "Makefile" -type f | ${XARGS} \
+		${REINPLACE_CMD} -e \
+		's|$$(CC)|$$(CXX)|g ; \
+		s|$$(CCFLAGS)|$$(CXXFLAGS)|g'
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/Makefile.PL
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Wx-GLCanvas/distinfo b/x11-toolkits/p5-Wx-GLCanvas/distinfo
new file mode 100644
index 000000000..429a3271f
--- /dev/null
+++ b/x11-toolkits/p5-Wx-GLCanvas/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1536929122
+SHA256 (Wx-GLCanvas-0.09.tar.gz) = 6ad2c29ff06ff80a5c8b4b9d1d6bf0aed57489e831be59c94494f4f688dc8fe0
+SIZE (Wx-GLCanvas-0.09.tar.gz) = 13910
diff --git a/x11-toolkits/p5-Wx-GLCanvas/pkg-descr b/x11-toolkits/p5-Wx-GLCanvas/pkg-descr
new file mode 100644
index 000000000..793ff4cda
--- /dev/null
+++ b/x11-toolkits/p5-Wx-GLCanvas/pkg-descr
@@ -0,0 +1,6 @@
+Wx::GLCanvas - interface to wxWidgets' OpenGL canvas
+
+The documentation for this module is included in the main wxPerl
+distribution (wxGLCanvas).
+
+WWW: https://metacpan.org/release/Wx-GLCanvas
diff --git a/x11-toolkits/p5-Wx-GLCanvas/pkg-plist b/x11-toolkits/p5-Wx-GLCanvas/pkg-plist
new file mode 100644
index 000000000..4999d65b6
--- /dev/null
+++ b/x11-toolkits/p5-Wx-GLCanvas/pkg-plist
@@ -0,0 +1,5 @@
+%%SITE_ARCH%%/Wx/DemoModules/wxGLCanvas.pm
+%%SITE_ARCH%%/Wx/GLCanvas.pm
+%%SITE_ARCH%%/auto/Wx/GLCanvas/.packlist
+%%SITE_ARCH%%/auto/Wx/GLCanvas/GLCanvas.so
+%%PERL5_MAN3%%/Wx::GLCanvas.3.gz
diff --git a/x11-toolkits/p5-Wx/Makefile b/x11-toolkits/p5-Wx/Makefile
new file mode 100644
index 000000000..a855febae
--- /dev/null
+++ b/x11-toolkits/p5-Wx/Makefile
@@ -0,0 +1,42 @@
+# Created by: Cezary Morga <cm@therek.net>
+# $FreeBSD$
+
+PORTNAME=	Wx
+PORTVERSION=	0.9932
+PORTREVISION=	5
+CATEGORIES=	x11-toolkits perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	perl@FreeBSD.org
+COMMENT=	Perl5 interface to the wxWidgets cross-platform GUI toolkit
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-ExtUtils-XSpp>=0.16.03:devel/p5-ExtUtils-XSpp \
+		p5-Alien-wxWidgets>=0.25:x11-toolkits/p5-Alien-wxWidgets
+
+USES=		compiler:c++11-lib perl5
+USE_CXXSTD=	c++11
+USE_PERL5=	configure
+USE_WX=		3.0
+CONFIGURE_ENV=	CXX="${CXX}"
+
+CFLAGS+=	-pthread -Wno-write-strings
+
+post-configure:
+	@${FIND} ${WRKSRC} -name "Makefile" -type f | ${XARGS} \
+		${REINPLACE_CMD} -e \
+		's|$$(CC)|$$(CXX)|g ; \
+		 s|$$(CCFLAGS)|$$(CXXFLAGS)|g'
+
+pre-build:
+	@(cd ${WRKSRC} && ${DO_MAKE_BUILD} generated)
+
+post-install:
+	@${FIND} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} -name "*.so" -type f \
+		| ${XARGS} ${STRIP_CMD}
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Wx/distinfo b/x11-toolkits/p5-Wx/distinfo
new file mode 100644
index 000000000..a50423317
--- /dev/null
+++ b/x11-toolkits/p5-Wx/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1492523811
+SHA256 (Wx-0.9932.tar.gz) = 1cfdb6535a0f4676e6f1aab2c9d8e16d577be3eb3b7cc04c8074d685e6651b70
+SIZE (Wx-0.9932.tar.gz) = 486326
diff --git a/x11-toolkits/p5-Wx/files/patch-XS-Colour.xs b/x11-toolkits/p5-Wx/files/patch-XS-Colour.xs
new file mode 100644
index 000000000..85a9d68df
--- /dev/null
+++ b/x11-toolkits/p5-Wx/files/patch-XS-Colour.xs
@@ -0,0 +1,13 @@
+--- XS/Colour.xs.orig	2014-03-08 13:01:15 UTC
++++ XS/Colour.xs
+@@ -115,8 +115,9 @@ wxColour::GetAsString( long flags )
+ #endif
+ 
+ #if !defined(__WXMAC__)
+-
++#if WXPERL_W_VERSION_LT( 3, 0, 0 )
+ long
+ wxColour::GetPixel()
+ 
++#endif
+ #endif
diff --git a/x11-toolkits/p5-Wx/files/patch-build_Wx_build_MakeMaker_Any__wx__config.pm b/x11-toolkits/p5-Wx/files/patch-build_Wx_build_MakeMaker_Any__wx__config.pm
new file mode 100644
index 000000000..7b815f5bf
--- /dev/null
+++ b/x11-toolkits/p5-Wx/files/patch-build_Wx_build_MakeMaker_Any__wx__config.pm
@@ -0,0 +1,18 @@
+--- build/Wx/build/MakeMaker/Any_wx_config.pm.orig	2014-03-08 13:01:15 UTC
++++ build/Wx/build/MakeMaker/Any_wx_config.pm
+@@ -39,15 +39,6 @@ sub get_flags {
+   return %config;
+ }
+ 
+-sub const_config {
+-    my $text = shift->SUPER::const_config( @_ );
+-
+-    $text =~ s{^(LD(?:DL)?FLAGS\s*=.*?)-L/usr/local/lib64/?}{$1}mg;
+-    $text =~ s{^(LD(?:DL)?FLAGS\s*=.*?)-L/usr/local/lib/?}{$1}mg;
+-
+-    return $text;
+-}
+-
+ 1;
+ 
+ # local variables:
diff --git a/x11-toolkits/p5-Wx/files/patch-ext-propgrid-XS-PGProperty.xsp b/x11-toolkits/p5-Wx/files/patch-ext-propgrid-XS-PGProperty.xsp
new file mode 100644
index 000000000..c1c5c2982
--- /dev/null
+++ b/x11-toolkits/p5-Wx/files/patch-ext-propgrid-XS-PGProperty.xsp
@@ -0,0 +1,20 @@
+--- ext/propgrid/XS/PGProperty.xsp.orig	2014-03-08 13:01:20 UTC
++++ ext/propgrid/XS/PGProperty.xsp
+@@ -1115,7 +1115,7 @@ wxColourPropertyValue::CLONE() (public)
+ 
+     bool SetPlValue( wxColourPropertyValue* col, int flags = wxPG_SETVAL_REFRESH_EDITOR )
+       %code{%
+-            wxVariant value = wxVariant(*col);
++            wxVariant value = wxVariant((const wxAny&)*col);
+             THIS->SetValue(value, NULL, flags );
+             RETVAL = true;
+       %};
+@@ -1148,7 +1148,7 @@ wxColourPropertyValue::CLONE() (public)
+     bool SetPlValue( wxColour* col, int flags = wxPG_SETVAL_REFRESH_EDITOR )
+       %code{%
+             if( col->IsOk() ) {
+-                wxVariant value = wxVariant(*col);
++                wxVariant value = wxVariant((const wxAny&)*col);
+                 THIS->SetValue(value, NULL, flags );
+                 RETVAL = true;
+             } else {
diff --git a/x11-toolkits/p5-Wx/pkg-descr b/x11-toolkits/p5-Wx/pkg-descr
new file mode 100644
index 000000000..4539eee86
--- /dev/null
+++ b/x11-toolkits/p5-Wx/pkg-descr
@@ -0,0 +1,5 @@
+wxPerl is an extension module allowing the creation of GUI (Graphical
+User Interface) from Perl; it is built as a wrapper for the wxWidgets
+C++ GUI toolkit.
+
+WWW: http://www.wxperl.it/
diff --git a/x11-toolkits/p5-Wx/pkg-plist b/x11-toolkits/p5-Wx/pkg-plist
new file mode 100644
index 000000000..3024b32a5
--- /dev/null
+++ b/x11-toolkits/p5-Wx/pkg-plist
@@ -0,0 +1,110 @@
+bin/wxperl_overload
+%%SITE_ARCH%%/Wx.pm
+%%SITE_ARCH%%/Wx/AUI.pm
+%%SITE_ARCH%%/Wx/Api.pod
+%%SITE_ARCH%%/Wx/App.pm
+%%SITE_ARCH%%/Wx/ArtProvider.pm
+%%SITE_ARCH%%/Wx/Calendar.pm
+%%SITE_ARCH%%/Wx/DND.pm
+%%SITE_ARCH%%/Wx/DataView.pm
+%%SITE_ARCH%%/Wx/DateTime.pm
+%%SITE_ARCH%%/Wx/DocView.pm
+%%SITE_ARCH%%/Wx/DropSource.pm
+%%SITE_ARCH%%/Wx/Event.pm
+%%SITE_ARCH%%/Wx/FS.pm
+%%SITE_ARCH%%/Wx/Grid.pm
+%%SITE_ARCH%%/Wx/Help.pm
+%%SITE_ARCH%%/Wx/Html.pm
+%%SITE_ARCH%%/Wx/IPC.pm
+%%SITE_ARCH%%/Wx/Loader.pod
+%%SITE_ARCH%%/Wx/Locale.pm
+%%SITE_ARCH%%/Wx/MDI.pm
+%%SITE_ARCH%%/Wx/Media.pm
+%%SITE_ARCH%%/Wx/Menu.pm
+%%SITE_ARCH%%/Wx/Mini.pm
+%%SITE_ARCH%%/Wx/NewClass.pod
+%%SITE_ARCH%%/Wx/Overload/Driver.pm
+%%SITE_ARCH%%/Wx/Overload/Handle.pm
+%%SITE_ARCH%%/Wx/Perl/Carp.pm
+%%SITE_ARCH%%/Wx/Perl/SplashFast.pm
+%%SITE_ARCH%%/Wx/Perl/TextValidator.pm
+%%SITE_ARCH%%/Wx/PerlTest.pm
+%%SITE_ARCH%%/Wx/Print.pm
+%%SITE_ARCH%%/Wx/PropertyGrid.pm
+%%SITE_ARCH%%/Wx/RadioBox.pm
+%%SITE_ARCH%%/Wx/Ribbon.pm
+%%SITE_ARCH%%/Wx/RichText.pm
+%%SITE_ARCH%%/Wx/STC.pm
+%%SITE_ARCH%%/Wx/Socket.pm
+%%SITE_ARCH%%/Wx/Thread.pod
+%%SITE_ARCH%%/Wx/Timer.pm
+%%SITE_ARCH%%/Wx/WebView.pm
+%%SITE_ARCH%%/Wx/Wx_Exp.pm
+%%SITE_ARCH%%/Wx/XRC.pm
+%%SITE_ARCH%%/Wx/XSP/Enum.pm
+%%SITE_ARCH%%/Wx/XSP/Event.pm
+%%SITE_ARCH%%/Wx/XSP/Overload.pm
+%%SITE_ARCH%%/Wx/XSP/Virtual.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Any_OS.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Any_wx_config.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Core.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Hacks.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/MacOSX_GCC.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Win32.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Win32_MSVC.pm
+%%SITE_ARCH%%/Wx/build/MakeMaker/Win32_MinGW.pm
+%%SITE_ARCH%%/Wx/build/Opt.pm
+%%SITE_ARCH%%/Wx/build/Options.pm
+%%SITE_ARCH%%/Wx/build/Utils.pm
+%%SITE_ARCH%%/Wx/cpp/chkconfig.h
+%%SITE_ARCH%%/Wx/cpp/compat.h
+%%SITE_ARCH%%/Wx/cpp/constants.h
+%%SITE_ARCH%%/Wx/cpp/e_cback.h
+%%SITE_ARCH%%/Wx/cpp/event.h
+%%SITE_ARCH%%/Wx/cpp/helpers.h
+%%SITE_ARCH%%/Wx/cpp/overload.h
+%%SITE_ARCH%%/Wx/cpp/setup.h
+%%SITE_ARCH%%/Wx/cpp/streams.h
+%%SITE_ARCH%%/Wx/cpp/v_cback.h
+%%SITE_ARCH%%/Wx/cpp/v_cback_def.h
+%%SITE_ARCH%%/Wx/cpp/wxapi.h
+%%SITE_ARCH%%/Wx/typemap
+%%SITE_ARCH%%/auto/Wx/AUI/AUI.so
+%%SITE_ARCH%%/auto/Wx/Calendar/Calendar.so
+%%SITE_ARCH%%/auto/Wx/DND/DND.so
+%%SITE_ARCH%%/auto/Wx/DataView/DataView.so
+%%SITE_ARCH%%/auto/Wx/DateTime/DateTime.so
+%%SITE_ARCH%%/auto/Wx/DocView/DocView.so
+%%SITE_ARCH%%/auto/Wx/FS/FS.so
+%%SITE_ARCH%%/auto/Wx/Grid/Grid.so
+%%SITE_ARCH%%/auto/Wx/Help/Help.so
+%%SITE_ARCH%%/auto/Wx/Html/Html.so
+%%SITE_ARCH%%/auto/Wx/IPC/IPC.so
+%%SITE_ARCH%%/auto/Wx/MDI/MDI.so
+%%SITE_ARCH%%/auto/Wx/Media/Media.so
+%%SITE_ARCH%%/auto/Wx/PerlTest/PerlTest.so
+%%SITE_ARCH%%/auto/Wx/Print/Print.so
+%%SITE_ARCH%%/auto/Wx/PropertyGrid/PropertyGrid.so
+%%SITE_ARCH%%/auto/Wx/Ribbon/Ribbon.so
+%%SITE_ARCH%%/auto/Wx/RichText/RichText.so
+%%SITE_ARCH%%/auto/Wx/STC/STC.so
+%%SITE_ARCH%%/auto/Wx/Socket/Socket.so
+%%SITE_ARCH%%/auto/Wx/WebView/WebView.so
+%%SITE_ARCH%%/auto/Wx/Wx.so
+%%SITE_ARCH%%/auto/Wx/XRC/XRC.so
+%%PERL5_MAN1%%/wxperl_overload.1.gz
+%%PERL5_MAN3%%/Wx.3.gz
+%%PERL5_MAN3%%/Wx::Api.3.gz
+%%PERL5_MAN3%%/Wx::Loader.3.gz
+%%PERL5_MAN3%%/Wx::NewClass.3.gz
+%%PERL5_MAN3%%/Wx::Perl::Carp.3.gz
+%%PERL5_MAN3%%/Wx::Perl::SplashFast.3.gz
+%%PERL5_MAN3%%/Wx::Perl::TextValidator.3.gz
+%%PERL5_MAN3%%/Wx::Socket.3.gz
+%%PERL5_MAN3%%/Wx::Thread.3.gz
+%%PERL5_MAN3%%/Wx::XSP::Overload.3.gz
+%%PERL5_MAN3%%/Wx::build::MakeMaker.3.gz
+%%PERL5_MAN3%%/Wx::build::MakeMaker::Win32_MSVC.3.gz
+%%PERL5_MAN3%%/Wx::build::Options.3.gz
+%%PERL5_MAN3%%/Wx::build::Utils.3.gz