4 files changed, 32 insertions, 19 deletions

diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 4e3db1e69243..05a08f1023a4 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,17 +1,21 @@
 # New ports collection makefile for:	lyx
-# Version required:	1.0.4
+# Version required:	1.1.4
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lyx-1.0.4
+DISTNAME=	lyx-1.1.4
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
+MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/devel/ \
 		ftp://la1ad.uio.no/pub/lyx/ \
-		ftp://alpha.tat.physik.uni-tuebingen.de/pub/lyx/stable/ \
-		ftp://ftp.sdsc.edu/pub/other/lyx/stable/
+		ftp://alpha.tat.physik.uni-tuebingen.de/pub/lyx/devel/ \
+		ftp://ftp.sdsc.edu/pub/other/lyx/devel/
+
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	patch-1.1.4fix1.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	dirk@FreeBSD.org
 
@@ -23,9 +27,9 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
+USE_NEWGCC=	yes
 USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-STRIP=
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11 ${LOCALBASE}/include"
 MAN1=		lyx.1 reLyX.1
 
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 36004be1ebce..31350b19f219 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1 +1,2 @@
-MD5 (lyx-1.0.4.tar.gz) = 955c73800eecc55ebfc9b49296c891d8
+MD5 (lyx-1.1.4.tar.gz) = 65a919db1ef4eff04e0d89ca705efa43
+MD5 (patch-1.1.4fix1.gz) = 091d7238b8c79fd05ca68f7ce66a8baa
diff --git a/print/lyx/pkg-descr b/print/lyx/pkg-descr
index 4ace7328c7a3..1e258d2b80eb 100644
--- a/print/lyx/pkg-descr
+++ b/print/lyx/pkg-descr
@@ -8,6 +8,3 @@ easy and intuitive. New features include spell-checking, international
 character support, WYSIWYG graphics, tables, and equations.
 
 WWW: http://www.lyx.org/
-
-Author:		Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
-Maintained-by:	Lars Gullik Bjønnes <larsbj@ifi.uio.no>
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index 5b9af8204e07..07ace1e666b7 100644
--- a/print/lyx/pkg-plist
+++ b/print/lyx/pkg-plist
@@ -14,6 +14,7 @@ share/locale/nl/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/pt/LC_MESSAGES/lyx.mo
+share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
 share/locale/sv/LC_MESSAGES/lyx.mo
@@ -24,6 +25,7 @@ share/lyx/bind/broadway.bind
 share/lyx/bind/cua.bind
 share/lyx/bind/de_menus.bind
 share/lyx/bind/emacs.bind
+share/lyx/bind/fi_menus.bind
 share/lyx/bind/fr_menus.bind
 share/lyx/bind/hollywood.bind
 share/lyx/bind/hu_menus.bind
@@ -36,6 +38,7 @@ share/lyx/bind/xemacs.bind
 share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
 share/lyx/configure
+share/lyx/configure.cmd
 share/lyx/doc/BUGS.lyx
 share/lyx/doc/Customization.lyx
 share/lyx/doc/DocStyle.lyx
@@ -43,6 +46,7 @@ share/lyx/doc/Extended.lyx
 share/lyx/doc/Intro.lyx
 share/lyx/doc/LaTeXConfig.lyx
 share/lyx/doc/LaTeXConfig.lyx.in
+share/lyx/doc/README.Documentation
 share/lyx/doc/Reference.lyx
 share/lyx/doc/Tutorial.lyx
 share/lyx/doc/UserGuide.lyx
@@ -67,6 +71,7 @@ share/lyx/doc/pl_Intro.lyx
 share/lyx/doc/pl_Tutorial.lyx
 share/lyx/doc/platypus.eps
 share/lyx/doc/pt_Intro.lyx
+share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/sl_Intro.lyx
 share/lyx/doc/sl_Tutorial.lyx
 share/lyx/doc/sv_Intro.lyx
@@ -83,29 +88,33 @@ share/lyx/examples/aa_paper.lyx
 share/lyx/examples/aas_sample.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
-share/lyx/examples/beispiel_gelyxt.lyx
-share/lyx/examples/beispiel_roh.lyx
 share/lyx/examples/ca_splash.lyx
+share/lyx/examples/de_beispiel_gelyxt.lyx
+share/lyx/examples/de_beispiel_roh.lyx
 share/lyx/examples/de_splash.lyx
 share/lyx/examples/docbook_example.lyx
-share/lyx/examples/ejemplo_con_lyx.lyx
-share/lyx/examples/ejemplo_sin_lyx.lyx
+share/lyx/examples/es_ejemplo_con_lyx.lyx
+share/lyx/examples/es_ejemplo_sin_lyx.lyx
 share/lyx/examples/es_splash.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
-share/lyx/examples/exemple_brut.lyx
-share/lyx/examples/exemple_lyxifie.lyx
+share/lyx/examples/fr_exemple_brut.lyx
+share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_splash.lyx
 share/lyx/examples/it_splash.lyx
 share/lyx/examples/landslide.lyx
+share/lyx/examples/multicol.lyx
+share/lyx/examples/nl_opsommingstekens.lyx
 share/lyx/examples/nl_splash.lyx
+share/lyx/examples/nl_voorbeeld_ruw.lyx
+share/lyx/examples/nl_voorbeeld_verlyxt.lyx
 share/lyx/examples/noweb2lyx.lyx
 share/lyx/examples/pl_splash.lyx
-share/lyx/examples/primer_lyxan.lyx
-share/lyx/examples/primer_surov.lyx
 share/lyx/examples/pt_splash.lyx
 share/lyx/examples/ru_splash.lyx
 share/lyx/examples/scriptone.lyx
+share/lyx/examples/sl_primer_lyxan.lyx
+share/lyx/examples/sl_primer_surov.lyx
 share/lyx/examples/sl_splash.lyx
 share/lyx/examples/splash.lyx
 share/lyx/images/amssymb.xbm
@@ -135,6 +144,7 @@ share/lyx/kbd/greek.kmap
 share/lyx/kbd/iso8859-1.cdef
 share/lyx/kbd/iso8859-2.cdef
 share/lyx/kbd/iso8859-7.cdef
+share/lyx/kbd/koi8-r.kmap
 share/lyx/kbd/magyar-2.kmap
 share/lyx/kbd/magyar-3.kmap
 share/lyx/kbd/magyar.kmap
@@ -219,6 +229,7 @@ share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
+share/lyx/templates/IEEEtran.lyx
 share/lyx/templates/aapaper.lyx
 share/lyx/templates/aastex.lyx
 share/lyx/templates/dinbrief.lyx