6 files changed, 66 insertions, 27 deletions

diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 2d905a9b26e9..5f99caa0ab80 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	lyx
 PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}
-PORTREVISION=	6
 CATEGORIES=	print editors
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
 		http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \
@@ -20,10 +19,10 @@ LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libmythes-1.2.so:textproc/mythes
 
 MAJOR_VERSION=	2.3
-MINOR_VERSION=	2
+MINOR_VERSION=	3
 
-USES=		compiler:c++11-lang desktop-file-utils gmake iconv pkgconfig \
-		perl5 python:2.7 qt:5 shebangfix tar:xz xorg
+USES=		autoreconf compiler:c++11-lang desktop-file-utils gmake iconv \
+		pkgconfig perl5 python:2.7 qt:5 shebangfix tar:xz xorg
 USE_QT=		core concurrent gui svg widgets x11extras buildtools_build qmake_build
 USE_XORG=	xcb
 GNU_CONFIGURE=	yes
@@ -33,6 +32,11 @@ CONFIGURE_ARGS=	--without-included-boost \
 		--with-qt-dir=${LOCALBASE}/lib/qt5 \
 		${ICONV_CONFIGURE_ARG} \
 		--with-extra-prefix=${LOCALBASE}
+EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions	\
+		--exclude 3rdparty	\
+		--exclude cygwin	\
+		--exclude MacOSX	\
+		--exclude Win32
 SHEBANG_FILES=	lib/configure.py \
 		lib/lyx2lyx/lyx2lyx \
 		lib/scripts/listerrors \
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 68ae902cf487..499a5fb2ea55 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546601537
-SHA256 (lyx-2.3.2.tar.xz) = f1a80fc7d0c69e5a28145275dd4f88d2a93bad1033b0cffe953f668fbbe4956c
-SIZE (lyx-2.3.2.tar.xz) = 15791748
+TIMESTAMP = 1567101095
+SHA256 (lyx-2.3.3.tar.xz) = 991eefebddb281d276a7693f8ac119bd971aab3fa9f554cd14e4b68b04284e39
+SIZE (lyx-2.3.3.tar.xz) = 15998188
diff --git a/print/lyx/files/patch-Makefile.am b/print/lyx/files/patch-Makefile.am
new file mode 100644
index 000000000000..39a97dc9dbbd
--- /dev/null
+++ b/print/lyx/files/patch-Makefile.am
@@ -0,0 +1,19 @@
+--- Makefile.am.orig	2019-11-23 15:26:28 UTC
++++ Makefile.am
+@@ -5,14 +5,14 @@ ACLOCAL_AMFLAGS = -I m4 -I config
+ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \
+ 	$(srcdir)/config.h.in
+ 
+-DIST_SUBDIRS = 3rdparty autotests m4 config development po src sourcedoc lib
++DIST_SUBDIRS = autotests m4 config po src sourcedoc lib
+ 
+ if BUILD_CLIENT_SUBDIR
+ CLIENT = src/client
+ endif
+ 
+ 
+-SUBDIRS = autotests config development po 3rdparty src sourcedoc lib \
++SUBDIRS = autotests config po src sourcedoc lib \
+ 	$(CLIENT) src/tex2lyx src/convert
+ 
+ 
diff --git a/print/lyx/files/patch-boost-1.69 b/print/lyx/files/patch-boost-1.69
deleted file mode 100644
index e79c25cea644..000000000000
--- a/print/lyx/files/patch-boost-1.69
+++ /dev/null
@@ -1,20 +0,0 @@
-https://www.lyx.org/trac/ticket/11349
-
---- src/support/FileName.cpp.orig	2018-02-25 00:11:18 UTC
-+++ src/support/FileName.cpp
-@@ -67,15 +67,6 @@
- using namespace std;
- using namespace lyx::support;
- 
--// OK, this is ugly, but it is the only workaround I found to compile
--// with gcc (any version) on a system which uses a non-GNU toolchain.
--// The problem is that gcc uses a weak symbol for a particular
--// instantiation and that the system linker usually does not
--// understand those weak symbols (seen on HP-UX, tru64, AIX and
--// others). Thus we force an explicit instanciation of this particular
--// template (JMarc)
--template struct boost::detail::crc_table_t<32, 0x04C11DB7, true>;
--
- namespace lyx {
- namespace support {
- 
diff --git a/print/lyx/files/patch-configure.ac b/print/lyx/files/patch-configure.ac
new file mode 100644
index 000000000000..b53754ea2507
--- /dev/null
+++ b/print/lyx/files/patch-configure.ac
@@ -0,0 +1,26 @@
+--- configure.ac.orig	2019-11-23 15:26:35 UTC
++++ configure.ac
+@@ -364,23 +364,9 @@ AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Pat
+ 
+ AC_CONFIG_FILES([Makefile \
+       lyx.1:lyx.1in \
+-      3rdparty/Makefile \
+-      3rdparty/boost/Makefile \
+-      3rdparty/hunspell/Makefile \
+-      3rdparty/mythes/Makefile \
+-      3rdparty/libiconv/Makefile \
+       $ICONV_ICONV_H_IN \
+-      3rdparty/zlib/Makefile \
+       autotests/Makefile \
+       config/Makefile \
+-      development/Makefile \
+-      development/MacOSX/Makefile \
+-      development/MacOSX/Info.plist \
+-      development/MacOSX/lyxrc.dist \
+-      development/MacOSX/spotlight/Makefile \
+-      development/cygwin/Makefile \
+-      development/cygwin/lyxrc.dist \
+-      development/lyx.spec \
+       lib/lyx.desktop-temp:lib/lyx.desktop.in
+       lib/Makefile \
+       lib/doc/Makefile \
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index db6fed5519b1..13b26374d8b6 100644
--- a/print/lyx/pkg-plist
+++ b/print/lyx/pkg-plist
@@ -5,6 +5,7 @@ man/man1/lyx.1.gz
 man/man1/lyxclient.1.gz
 man/man1/tex2lyx.1.gz
 %%NLS%%share/locale/ar/LC_MESSAGES/lyx.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/lyx.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/lyx.mo
 %%NLS%%share/locale/de/LC_MESSAGES/lyx.mo
 %%NLS%%share/locale/el/LC_MESSAGES/lyx.mo
@@ -270,6 +271,7 @@ share/icons/hicolor/scalable/apps/lyx.svg
 %%DATADIR%%/examples/PDF-form.lyx
 %%DATADIR%%/examples/aa_sample.lyx
 %%DATADIR%%/examples/aas_sample.lyx
+%%DATADIR%%/examples/aas_sample62.lyx
 %%DATADIR%%/examples/achemso.lyx
 %%DATADIR%%/examples/addressExample.adr
 %%DATADIR%%/examples/amsart-test.lyx
@@ -461,6 +463,7 @@ share/icons/hicolor/scalable/apps/lyx.svg
 %%DATADIR%%/examples/sweave.lyx
 %%DATADIR%%/examples/thesis/Acknowledgments.lyx
 %%DATADIR%%/examples/thesis/Appendix.lyx
+%%DATADIR%%/examples/thesis/Bibliography.lyx
 %%DATADIR%%/examples/thesis/Summary.lyx
 %%DATADIR%%/examples/thesis/alpha.bst
 %%DATADIR%%/examples/thesis/chapter-1.lyx
@@ -680,6 +683,7 @@ share/icons/hicolor/scalable/apps/lyx.svg
 %%DATADIR%%/images/classic/tabular-feature_multirow.png
 %%DATADIR%%/images/classic/tabular-feature_set-all-lines.png
 %%DATADIR%%/images/classic/tabular-feature_set-border-lines.png
+%%DATADIR%%/images/classic/tabular-feature_set-inner-lines.png
 %%DATADIR%%/images/classic/tabular-feature_set-longtabular.png
 %%DATADIR%%/images/classic/tabular-feature_set-rotate-cell.png
 %%DATADIR%%/images/classic/tabular-feature_set-rotate-tabular.png
@@ -2010,6 +2014,7 @@ share/icons/hicolor/scalable/apps/lyx.svg
 %%DATADIR%%/images/oxygen/tabular-feature_multirow.svgz
 %%DATADIR%%/images/oxygen/tabular-feature_set-all-lines.svgz
 %%DATADIR%%/images/oxygen/tabular-feature_set-border-lines.svgz
+%%DATADIR%%/images/oxygen/tabular-feature_set-inner-lines.svgz
 %%DATADIR%%/images/oxygen/tabular-feature_set-longtabular.svgz
 %%DATADIR%%/images/oxygen/tabular-feature_toggle-line-bottom.svgz
 %%DATADIR%%/images/oxygen/tabular-feature_toggle-line-left.svgz
@@ -2077,6 +2082,7 @@ share/icons/hicolor/scalable/apps/lyx.svg
 %%DATADIR%%/images/tabular-feature_multirow.svgz
 %%DATADIR%%/images/tabular-feature_set-all-lines.svgz
 %%DATADIR%%/images/tabular-feature_set-border-lines.svgz
+%%DATADIR%%/images/tabular-feature_set-inner-lines.svgz
 %%DATADIR%%/images/tabular-feature_set-longtabular.svgz
 %%DATADIR%%/images/tabular-feature_set-rotate-cell.svgz
 %%DATADIR%%/images/tabular-feature_set-rotate-tabular.svgz
@@ -2163,6 +2169,7 @@ share/icons/hicolor/scalable/apps/lyx.svg
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
 %%DATADIR%%/layouts/aastex6.layout
+%%DATADIR%%/layouts/aastex62.layout
 %%DATADIR%%/layouts/achemso.layout
 %%DATADIR%%/layouts/acm-sigs-alt.layout
 %%DATADIR%%/layouts/acm-sigs.inc
@@ -2277,6 +2284,7 @@ share/icons/hicolor/scalable/apps/lyx.svg
 %%DATADIR%%/layouts/logicalmkup.module
 %%DATADIR%%/layouts/ltugboat.layout
 %%DATADIR%%/layouts/lyxmacros.inc
+%%DATADIR%%/layouts/maa-monthly.layout
 %%DATADIR%%/layouts/memoir.layout
 %%DATADIR%%/layouts/minimalistic.module
 %%DATADIR%%/layouts/moderncv.layout
@@ -2515,6 +2523,7 @@ share/icons/hicolor/scalable/apps/lyx.svg
 %%DATADIR%%/templates/RJournal.lyx
 %%DATADIR%%/templates/aa.lyx
 %%DATADIR%%/templates/aastex6.lyx
+%%DATADIR%%/templates/aastex62.lyx
 %%DATADIR%%/templates/acmart.lyx
 %%DATADIR%%/templates/beamer-conference-ornate-20min.lyx
 %%DATADIR%%/templates/ctex.lyx
@@ -2532,6 +2541,7 @@ share/icons/hicolor/scalable/apps/lyx.svg
 %%DATADIR%%/templates/koma-letter2.lyx
 %%DATADIR%%/templates/letter.lyx
 %%DATADIR%%/templates/lettre.lyx
+%%DATADIR%%/templates/maa-monthly.lyx
 %%DATADIR%%/templates/obsolete/ACM-SIGS.lyx
 %%DATADIR%%/templates/obsolete/ACM-siggraph.lyx
 %%DATADIR%%/templates/obsolete/ACM-sigplan.lyx