5 files changed, 19 insertions, 210 deletions

diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 69247c7ae3bd..61a4e2e303ef 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.5.4
+PORTVERSION=	1.5.5
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.planetmirror.com/pub/lyx/stable/ \
@@ -81,8 +81,8 @@ post-configure:
 	# Removing explicit linking with -lc
 	${REINPLACE_CMD} -e 's,-lc ,,' ${WRKSRC}/*/Makefile
 
-post-build check test:
-	# Running vendor's self-tests:
+check test:
+	# Running vendor's self-tests (currently known to fail):
 	${GMAKE} -C ${WRKSRC} check
 
 post-install:
diff --git a/print/lyx15/distinfo b/print/lyx15/distinfo
index 67f2f557ab2e..0851887d3d9f 100644
--- a/print/lyx15/distinfo
+++ b/print/lyx15/distinfo
@@ -1,3 +1,3 @@
-MD5 (lyx-1.5.4.tar.bz2) = 6f424dc23af78e1d39c6962101cde2e9
-SHA256 (lyx-1.5.4.tar.bz2) = 6c8b9aafc287ee683b68ebb08166e660e27af9942a30291f14c18de39aca8f2b
-SIZE (lyx-1.5.4.tar.bz2) = 9045016
+MD5 (lyx-1.5.5.tar.bz2) = 310bf760e8fdf85c7ad3a19b90ddc91c
+SHA256 (lyx-1.5.5.tar.bz2) = 051e952d206a9b0ca7a4584821ecaa88b6ed5f88a241767d97370932258c7539
+SIZE (lyx-1.5.5.tar.bz2) = 9082787
diff --git a/print/lyx15/files/patch-test_biblio b/print/lyx15/files/patch-test_biblio
deleted file mode 100644
index b80e276e01ef..000000000000
--- a/print/lyx15/files/patch-test_biblio
+++ /dev/null
@@ -1,88 +0,0 @@
---- src/frontends/controllers/tests//Makefile.am	Wed Apr 25 20:04:04 2007
-+++ src/frontends/controllers/tests//Makefile.am	Wed Sep 12 21:12:51 2007
-@@ -1,14 +1,12 @@
- include $(top_srcdir)/config/common.am
- 
--EXTRA_DIST = pch.h test_biblio
-+EXTRA_DIST = pch.h
- 
- BUILT_SOURCES = $(PCH_FILE)
- 
- TESTS = \
--	test_biblio
- 
- check_PROGRAMS = \
--	biblio
- 
- AM_CPPFLAGS += $(BOOST_INCLUDES)
- 
---- src/frontends/controllers/tests//Makefile.in	Sat Aug  4 14:50:11 2007
-+++ src/frontends/controllers/tests//Makefile.in	Wed Sep 12 21:14:00 2007
-@@ -33,7 +33,7 @@
- target_triplet = @target@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/config/common.am
--check_PROGRAMS = biblio$(EXEEXT)
-+check_PROGRAMS = 
- subdir = src/frontends/controllers/tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/config/libtool.m4 \
-@@ -58,12 +58,6 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/src/config.h
- CONFIG_CLEAN_FILES =
--am_biblio_OBJECTS = biblio.$(OBJEXT) boost.$(OBJEXT)
--biblio_OBJECTS = $(am_biblio_OBJECTS)
--@USE_INCLUDED_BOOST_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
--biblio_DEPENDENCIES = $(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@
--depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-@@ -74,8 +68,8 @@
- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
--SOURCES = $(biblio_SOURCES)
--DIST_SOURCES = $(biblio_SOURCES)
-+SOURCES = 
-+DIST_SOURCES = 
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -287,15 +281,9 @@
- @USE_INCLUDED_BOOST_TRUE@BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
- @USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
- @USE_INCLUDED_BOOST_TRUE@BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
--EXTRA_DIST = pch.h test_biblio
-+EXTRA_DIST = pch.h 
- BUILT_SOURCES = $(PCH_FILE)
- TESTS = \
--	test_biblio
--
--biblio_LDADD = $(BOOST_REGEX)
--biblio_SOURCES = \
--	biblio.cpp \
--	boost.cpp
- 
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
-@@ -338,9 +326,6 @@
- 	  echo " rm -f $$p $$f"; \
- 	  rm -f $$p $$f ; \
- 	done
--biblio$(EXEEXT): $(biblio_OBJECTS) $(biblio_DEPENDENCIES) 
--	@rm -f biblio$(EXEEXT)
--	$(CXXLINK) $(biblio_OBJECTS) $(biblio_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -348,7 +333,6 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/biblio.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boost.Po@am__quote@
- 
- .cpp.o:
diff --git a/print/lyx15/files/patch-test_filetools b/print/lyx15/files/patch-test_filetools
deleted file mode 100644
index 73d70dd8e009..000000000000
--- a/print/lyx15/files/patch-test_filetools
+++ /dev/null
@@ -1,111 +0,0 @@
---- src/support/tests/Makefile.am	Wed Sep 12 14:50:37 2007
-+++ src/support/tests/Makefile.am	Wed Sep 12 14:50:52 2007
-@@ -1,17 +1,15 @@
- include $(top_srcdir)/config/common.am
- 
--EXTRA_DIST = pch.h test_convert test_filetools test_lstrings regfiles
-+EXTRA_DIST = pch.h test_convert test_lstrings regfiles
- 
- BUILT_SOURCES = $(PCH_FILE)
- 
- TESTS = \
- 	test_convert \
--	test_filetools \
- 	test_lstrings
- 
- check_PROGRAMS = \
- 	convert \
--	filetools \
- 	lstrings
- 
- AM_CPPFLAGS += $(BOOST_INCLUDES) -I$(srcdir)/../..
-@@ -21,11 +19,6 @@
- convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
- convert_SOURCES = \
- 	convert.cpp \
--	boost.cpp
--
--filetools_LDADD = ../../debug.o ../libsupport.la $(BOOST_REGEX) $(BOOST_FILESYSTEM)
--filetools_SOURCES = \
--	filetools.cpp \
- 	boost.cpp
- 
- lstrings_LDADD = ../../debug.o ../lstrings.o ../convert.o ../docstring.o ../unicode.o ../qstring_helpers.o $(QT4_CORE_LIB)
---- src/support/tests/Makefile.in	Wed Sep 12 14:50:44 2007
-+++ src/support/tests/Makefile.in	Wed Sep 12 14:50:58 2007
-@@ -33,7 +33,7 @@
- target_triplet = @target@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/config/common.am ChangeLog
--check_PROGRAMS = convert$(EXEEXT) filetools$(EXEEXT) lstrings$(EXEEXT)
-+check_PROGRAMS = convert$(EXEEXT) lstrings$(EXEEXT)
- subdir = src/support/tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/config/libtool.m4 \
-@@ -68,11 +68,6 @@
- convert_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- 	$(convert_LDFLAGS) $(LDFLAGS) -o $@
--am_filetools_OBJECTS = filetools.$(OBJEXT) boost.$(OBJEXT)
--filetools_OBJECTS = $(am_filetools_OBJECTS)
--@USE_INCLUDED_BOOST_TRUE@am__DEPENDENCIES_3 = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
--filetools_DEPENDENCIES = ../../debug.o ../libsupport.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
- am_lstrings_OBJECTS = lstrings.$(OBJEXT) boost.$(OBJEXT)
- lstrings_OBJECTS = $(am_lstrings_OBJECTS)
- lstrings_DEPENDENCIES = ../../debug.o ../lstrings.o ../convert.o \
-@@ -93,9 +88,8 @@
- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
--SOURCES = $(convert_SOURCES) $(filetools_SOURCES) $(lstrings_SOURCES)
--DIST_SOURCES = $(convert_SOURCES) $(filetools_SOURCES) \
--	$(lstrings_SOURCES)
-+SOURCES = $(convert_SOURCES) $(lstrings_SOURCES)
-+DIST_SOURCES = $(convert_SOURCES) $(lstrings_SOURCES)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -307,11 +301,10 @@
- @USE_INCLUDED_BOOST_TRUE@BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
- @USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
- @USE_INCLUDED_BOOST_TRUE@BOOST_IOSTREAMS = $(top_builddir)/boost/libs/iostreams/src/libboost_iostreams.la
--EXTRA_DIST = pch.h test_convert test_filetools test_lstrings regfiles
-+EXTRA_DIST = pch.h test_convert test_lstrings regfiles
- BUILT_SOURCES = $(PCH_FILE)
- TESTS = \
- 	test_convert \
--	test_filetools \
- 	test_lstrings
- 
- convert_LDADD = ../../debug.o ../convert.o ../docstring.o ../lstrings.o ../unicode.o ../qstring_helpers.o $(BOOST_REGEX) $(QT4_CORE_LIB)
-@@ -320,11 +313,6 @@
- 	convert.cpp \
- 	boost.cpp
- 
--filetools_LDADD = ../../debug.o ../libsupport.la $(BOOST_REGEX) $(BOOST_FILESYSTEM)
--filetools_SOURCES = \
--	filetools.cpp \
--	boost.cpp
--
- lstrings_LDADD = ../../debug.o ../lstrings.o ../convert.o ../docstring.o ../unicode.o ../qstring_helpers.o $(QT4_CORE_LIB)
- lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
- lstrings_SOURCES = \
-@@ -375,9 +363,6 @@
- convert$(EXEEXT): $(convert_OBJECTS) $(convert_DEPENDENCIES) 
- 	@rm -f convert$(EXEEXT)
- 	$(convert_LINK) $(convert_OBJECTS) $(convert_LDADD) $(LIBS)
--filetools$(EXEEXT): $(filetools_OBJECTS) $(filetools_DEPENDENCIES) 
--	@rm -f filetools$(EXEEXT)
--	$(CXXLINK) $(filetools_OBJECTS) $(filetools_LDADD) $(LIBS)
- lstrings$(EXEEXT): $(lstrings_OBJECTS) $(lstrings_DEPENDENCIES) 
- 	@rm -f lstrings$(EXEEXT)
- 	$(lstrings_LINK) $(lstrings_OBJECTS) $(lstrings_LDADD) $(LIBS)
-@@ -390,7 +375,6 @@
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boost.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filetools.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstrings.Po@am__quote@
- 
- .cpp.o:
diff --git a/print/lyx15/pkg-plist b/print/lyx15/pkg-plist
index 75098ed9e311..d39c759f9227 100644
--- a/print/lyx15/pkg-plist
+++ b/print/lyx15/pkg-plist
@@ -131,7 +131,9 @@ share/pixmaps/lyx.xpm
 %%DATADIR%%/doc/es/EmbeddedObjects.lyx
 %%DATADIR%%/doc/es/Extended.lyx
 %%DATADIR%%/doc/es/FAQ.lyx
+%%DATADIR%%/doc/es/Formula-numbering.lyx
 %%DATADIR%%/doc/es/Intro.lyx
+%%DATADIR%%/doc/es/Math.lyx
 %%DATADIR%%/doc/es/TOC.lyx
 %%DATADIR%%/doc/es/Tutorial.lyx
 %%DATADIR%%/doc/es/UserGuide.lyx
@@ -163,6 +165,7 @@ share/pixmaps/lyx.xpm
 %%DATADIR%%/doc/fr/EmbeddedObjects.lyx
 %%DATADIR%%/doc/fr/Extended.lyx
 %%DATADIR%%/doc/fr/FAQ.lyx
+%%DATADIR%%/doc/fr/Formula-numbering.lyx
 %%DATADIR%%/doc/fr/Intro.lyx
 %%DATADIR%%/doc/fr/Math.lyx
 %%DATADIR%%/doc/fr/TOC.lyx
@@ -192,6 +195,8 @@ share/pixmaps/lyx.xpm
 %%DATADIR%%/doc/it/TOC.lyx
 %%DATADIR%%/doc/it/Tutorial.lyx
 %%DATADIR%%/doc/it/UserGuide.lyx
+%%DATADIR%%/doc/it/clipart/it_footnoteQt4.png
+%%DATADIR%%/doc/it/clipart/it_referenceQt4.png
 %%DATADIR%%/doc/nb/Intro.lyx
 %%DATADIR%%/doc/nb/TOC.lyx
 %%DATADIR%%/doc/nl/Intro.lyx
@@ -261,9 +266,6 @@ share/pixmaps/lyx.xpm
 %%DATADIR%%/examples/de/serienbrief2.lyx
 %%DATADIR%%/examples/de/serienbrief3.lyx
 %%DATADIR%%/examples/de/splash.lyx
-%%DATADIR%%/examples/de/serienbrief1.lyx
-%%DATADIR%%/examples/de/serienbrief2.lyx
-%%DATADIR%%/examples/de/serienbrief3.lyx
 %%DATADIR%%/examples/docbook_article.lyx
 %%DATADIR%%/examples/es/ItemizeBullets.lyx
 %%DATADIR%%/examples/es/ejemplo_con_lyx.lyx
@@ -283,7 +285,6 @@ share/pixmaps/lyx.xpm
 %%DATADIR%%/examples/fr/Minipage.lyx
 %%DATADIR%%/examples/fr/exemple_brut.lyx
 %%DATADIR%%/examples/fr/exemple_lyxifie.lyx
-%%DATADIR%%/examples/fr/mathed.lyx
 %%DATADIR%%/examples/fr/multicol.lyx
 %%DATADIR%%/examples/fr/simplecv.lyx
 %%DATADIR%%/examples/fr/splash.lyx
@@ -428,7 +429,6 @@ share/pixmaps/lyx.xpm
 %%DATADIR%%/images/math/Re.xpm
 %%DATADIR%%/images/math/Rrightarrow.xpm
 %%DATADIR%%/images/math/Rsh.xpm
-%%DATADIR%%/images/math/Vert.xpm
 %%DATADIR%%/images/math/Vvdash.xpm
 %%DATADIR%%/images/math/acute.xpm
 %%DATADIR%%/images/math/aleph.xpm
@@ -901,6 +901,8 @@ share/pixmaps/lyx.xpm
 %%DATADIR%%/images/math/vec.xpm
 %%DATADIR%%/images/math/vee.xpm
 %%DATADIR%%/images/math/veebar.xpm
+%%DATADIR%%/images/math/vert.xpm
+%%DATADIR%%/images/math/vert2.xpm
 %%DATADIR%%/images/math/vphantom.xpm
 %%DATADIR%%/images/math/wedge.xpm
 %%DATADIR%%/images/math/widehat.xpm
@@ -1018,6 +1020,7 @@ share/pixmaps/lyx.xpm
 %%DATADIR%%/layouts/arab-article.layout
 %%DATADIR%%/layouts/armenian-article.layout
 %%DATADIR%%/layouts/article.layout
+%%DATADIR%%/layouts/article-beamer.layout
 %%DATADIR%%/layouts/beamer.layout
 %%DATADIR%%/layouts/book.layout
 %%DATADIR%%/layouts/broadway.layout
@@ -1084,6 +1087,7 @@ share/pixmaps/lyx.xpm
 %%DATADIR%%/layouts/revtex.layout
 %%DATADIR%%/layouts/revtex4.layout
 %%DATADIR%%/layouts/scrartcl.layout
+%%DATADIR%%/layouts/scrarticle-beamer.layout
 %%DATADIR%%/layouts/scrbook.layout
 %%DATADIR%%/layouts/scrclass.inc
 %%DATADIR%%/layouts/scrlettr.layout
@@ -1178,6 +1182,9 @@ share/pixmaps/lyx.xpm
 %%DATADIR%%/scripts/convertDefault.py
 %%DATADIR%%/scripts/convertDefault.pyc
 %%DATADIR%%/scripts/convertDefault.pyo
+%%DATADIR%%/scripts/csv2lyx.py
+%%DATADIR%%/scripts/csv2lyx.pyc
+%%DATADIR%%/scripts/csv2lyx.pyo
 %%DATADIR%%/scripts/date.py
 %%DATADIR%%/scripts/date.pyc
 %%DATADIR%%/scripts/date.pyo
@@ -1290,6 +1297,7 @@ share/pixmaps/lyx.xpm
 @dirrm %%DATADIR%%/doc/pl
 @dirrm %%DATADIR%%/doc/nl
 @dirrm %%DATADIR%%/doc/nb
+@dirrm %%DATADIR%%/doc/it/clipart
 @dirrm %%DATADIR%%/doc/it
 @dirrm %%DATADIR%%/doc/hu
 @dirrm %%DATADIR%%/doc/he