3 files changed, 32 insertions, 18 deletions

diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 466f7b23001a..1bded33a5e17 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.5.6
+PORTVERSION=	1.5.7
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
-		ftp://ftp.planetmirror.com/pub/lyx/stable/ \
-		http://www-ftp.lip6.fr/ftp/pub/lyx/stable/ \
-		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/ \
-		ftp://ftp.ntua.gr/pub/X11/LyX/stable/ \
-		http://sunsite.icm.edu.pl/pub/unix/editors/lyx/stable/ \
-		ftp://ftp.chg.ru/pub/X11/lyx/stable/ \
-		http://lyx.mirror.fr/stable/
+MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/${PORTVERSION:R}.x/ \
+		ftp://ftp.planetmirror.com/pub/lyx/stable/${PORTVERSION:R}.x/ \
+		http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${PORTVERSION:R}.x/ \
+		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/${PORTVERSION:R}.x/ \
+		ftp://ftp.ntua.gr/pub/X11/LyX/stable/${PORTVERSION:R}.x/ \
+		http://sunsite.icm.edu.pl/pub/unix/editors/lyx/stable/${PORTVERSION:R}.x/ \
+		ftp://ftp.chg.ru/pub/X11/lyx/stable/${PORTVERSION:R}.x/ \
+		http://lyx.mirror.fr/stable/${PORTVERSION:R}.x/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG) (stable)
 
 BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base
-LIB_DEPENDS=	boost_regex.4:${PORTSDIR}/devel/boost
+LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 		${LOCALBASE}/share/texmf/tex/latex/prettyref/prettyref.sty:${PORTSDIR}/print/latex-prettyref \
 		${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
diff --git a/print/lyx15/distinfo b/print/lyx15/distinfo
index dd187ee8d756..101934cfa6a4 100644
--- a/print/lyx15/distinfo
+++ b/print/lyx15/distinfo
@@ -1,3 +1,3 @@
-MD5 (lyx-1.5.6.tar.bz2) = 69f2eecba80b143554911c8b3d814a0e
-SHA256 (lyx-1.5.6.tar.bz2) = 386c4f3232142386579d48c638a7611301552a59574b2a19a7ab5ee725817d32
-SIZE (lyx-1.5.6.tar.bz2) = 9294565
+MD5 (lyx-1.5.7.tar.bz2) = c6d5da09d0b49e41292843dfb6c12c07
+SHA256 (lyx-1.5.7.tar.bz2) = 935cc3f7a099eba4e4a7296d79fe5102fb7ef2de20ab2b6164347fef8c70dba4
+SIZE (lyx-1.5.7.tar.bz2) = 9454238
diff --git a/print/lyx15/pkg-plist b/print/lyx15/pkg-plist
index 1e60db4a0c35..0437803fe011 100644
--- a/print/lyx15/pkg-plist
+++ b/print/lyx15/pkg-plist
@@ -95,6 +95,22 @@ share/applications/lyx.desktop
 %%DATADIR%%/doc/clipart/referenceQt4.png
 %%DATADIR%%/doc/clipart/with_fntright.pdf
 %%DATADIR%%/doc/clipart/without_fntright.pdf
+%%DATADIR%%/doc/ca/Intro.lyx
+%%DATADIR%%/doc/ca/TOC.lyx
+%%DATADIR%%/doc/uk/Intro.lyx
+%%DATADIR%%/doc/uk/TOC.lyx
+%%DATADIR%%/doc/uk/clipart/FootnoteQT4.png
+%%DATADIR%%/examples/ca/ItemizeBullets.lyx
+%%DATADIR%%/examples/ca/mathed.lyx
+%%DATADIR%%/layouts/elsarticle.layout
+%%DATADIR%%/layouts/sigplanconf.layout
+%%DATADIR%%/layouts/singlecol.layout
+%%DATADIR%%/layouts/svglobal3.layout
+%%DATADIR%%/lyx2lyx/lyx_1_6.py
+%%DATADIR%%/lyx2lyx/lyx_1_6.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_6.pyo
+%%DATADIR%%/templates/ACM-sigplan.lyx
+%%DATADIR%%/templates/elsarticle.lyx
 %%DATADIR%%/doc/cs/TOC.lyx
 %%DATADIR%%/doc/cs/Tutorial.lyx
 %%DATADIR%%/doc/da/Intro.lyx
@@ -230,7 +246,6 @@ share/applications/lyx.desktop
 %%DATADIR%%/examples/Foils.lyx
 %%DATADIR%%/examples/ItemizeBullets.lyx
 %%DATADIR%%/examples/Literate.lyx
-%%DATADIR%%/examples/Minipage.lyx
 %%DATADIR%%/examples/aa_sample.lyx
 %%DATADIR%%/examples/aas_sample.lyx
 %%DATADIR%%/examples/addressExample.adr
@@ -258,7 +273,6 @@ share/applications/lyx.desktop
 %%DATADIR%%/examples/de/Dezimal.lyx
 %%DATADIR%%/examples/de/ItemizeBullets.lyx
 %%DATADIR%%/examples/de/Lebenslauf.lyx
-%%DATADIR%%/examples/de/Minipage.lyx
 %%DATADIR%%/examples/de/beispiel_gelyxt.lyx
 %%DATADIR%%/examples/de/beispiel_roh.lyx
 %%DATADIR%%/examples/de/multicol.lyx
@@ -281,7 +295,6 @@ share/applications/lyx.desktop
 %%DATADIR%%/examples/fr/AlignementDecimal.lyx
 %%DATADIR%%/examples/fr/Foils.lyx
 %%DATADIR%%/examples/fr/ListesPuces.lyx
-%%DATADIR%%/examples/fr/Minipage.lyx
 %%DATADIR%%/examples/fr/exemple_brut.lyx
 %%DATADIR%%/examples/fr/exemple_lyxifie.lyx
 %%DATADIR%%/examples/fr/multicol.lyx
@@ -304,7 +317,6 @@ share/applications/lyx.desktop
 %%DATADIR%%/examples/ja/splash.lyx
 %%DATADIR%%/examples/landslide.lyx
 %%DATADIR%%/examples/listerrors.lyx
-%%DATADIR%%/examples/listings.lyx
 %%DATADIR%%/examples/modernCV.lyx
 %%DATADIR%%/examples/multicol.lyx
 %%DATADIR%%/examples/nl/multicol.lyx
@@ -1232,7 +1244,6 @@ share/applications/lyx.desktop
 %%DATADIR%%/templates/de_beamer-conference-ornate-20min.lyx
 %%DATADIR%%/templates/dinbrief.lyx
 %%DATADIR%%/templates/docbook_article.lyx
-%%DATADIR%%/templates/elsart.lyx
 %%DATADIR%%/templates/fr_beamer-conference-ornate-20min.lyx
 %%DATADIR%%/templates/g-brief-de.lyx
 %%DATADIR%%/templates/g-brief-en.lyx
@@ -1290,6 +1301,8 @@ share/pixmaps/lyx.xpm
 @dirrm %%DATADIR%%/examples/cs
 @dirrm %%DATADIR%%/examples/ca
 @dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/doc/uk/clipart
+@dirrm %%DATADIR%%/doc/uk
 @dirrm %%DATADIR%%/doc/sv
 @dirrm %%DATADIR%%/doc/sl
 @dirrm %%DATADIR%%/doc/sk
@@ -1314,6 +1327,7 @@ share/pixmaps/lyx.xpm
 @dirrm %%DATADIR%%/doc/da
 @dirrm %%DATADIR%%/doc/cs
 @dirrm %%DATADIR%%/doc/clipart
+@dirrm %%DATADIR%%/doc/ca
 @dirrm %%DATADIR%%/doc/biblio
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/bind/sv