Upgrade to 1.2.3. Set MAINTAINER to the submitter.

PR:		ports/46796
Submitted by:	Miguel Mendez, KATO Tsuguru

15 files changed, 100 insertions, 60 deletions

diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 2ab42e3f570a..60a0ded4973a 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	flynn@energyhq.homeip.net
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
@@ -27,10 +26,11 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	15
-AUTOMAKE=	${WRKSRC}/autogen.sh
-AUTOCONF=	${TRUE}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
@@ -59,12 +59,13 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-post-extract:
-	@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
-
 post-patch:
-	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
-		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
+.for file in src/Makefile.am src/frontends/Makefile.am
+	@${REINPLACE_CMD} -e 's|LIBS +=|LDFLAGS = @LDFLAGS@|g' ${WRKSRC}/${file}
+.endfor
+.for file in configure.in lib/reLyX/configure.in
+	@${REINPLACE_CMD} -e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g' ${WRKSRC}/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/print/lyx-devel/distinfo b/print/lyx-devel/distinfo
index eeb607bd3043..3486f46f5b88 100644
--- a/print/lyx-devel/distinfo
+++ b/print/lyx-devel/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
+MD5 (lyx-1.2.3.tar.gz) = 3a423e65f647bd0a8f9401dd43e5d912
diff --git a/print/lyx-devel/pkg-plist b/print/lyx-devel/pkg-plist
index 75ad1157c54f..7eab7ce8966d 100644
--- a/print/lyx-devel/pkg-plist
+++ b/print/lyx-devel/pkg-plist
@@ -83,6 +83,7 @@ share/lyx/doc/fr_Tutorial.lyx
 share/lyx/doc/fr_UserGuide.lyx
 share/lyx/doc/he_Intro.lyx
 share/lyx/doc/he_TOC.lyx
+share/lyx/doc/he_Tutorial.lyx
 share/lyx/doc/hu_Intro.lyx
 share/lyx/doc/hu_TOC.lyx
 share/lyx/doc/it_Customization.lyx
@@ -104,6 +105,7 @@ share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
 share/lyx/doc/ro_splash.lyx
+share/lyx/doc/ru_FAQ.lyx
 share/lyx/doc/ru_Intro.lyx
 share/lyx/doc/ru_TOC.lyx
 share/lyx/doc/ru_Tutorial.lyx
@@ -155,6 +157,9 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_mathed.lyx
 share/lyx/examples/fr_splash.lyx
+share/lyx/examples/he_example_raw.lyx
+share/lyx/examples/he_he_example_lyxified.lyx
+share/lyx/examples/he_he_example_raw.lyx
 share/lyx/examples/hu_splash.lyx
 share/lyx/examples/iecc05.fen
 share/lyx/examples/iecc07.fen
@@ -331,6 +336,7 @@ share/lyx/layouts/g-brief-en.layout
 share/lyx/layouts/heb-article.layout
 share/lyx/layouts/heb-letter.layout
 share/lyx/layouts/hollywood.layout
+share/lyx/layouts/ijmpd.layout
 share/lyx/layouts/kluwer.layout
 share/lyx/layouts/latex8.layout
 share/lyx/layouts/letter.layout
@@ -404,6 +410,7 @@ share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
+share/lyx/templates/ijmpd.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 2ab42e3f570a..60a0ded4973a 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	flynn@energyhq.homeip.net
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
@@ -27,10 +26,11 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	15
-AUTOMAKE=	${WRKSRC}/autogen.sh
-AUTOCONF=	${TRUE}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
@@ -59,12 +59,13 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-post-extract:
-	@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
-
 post-patch:
-	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
-		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
+.for file in src/Makefile.am src/frontends/Makefile.am
+	@${REINPLACE_CMD} -e 's|LIBS +=|LDFLAGS = @LDFLAGS@|g' ${WRKSRC}/${file}
+.endfor
+.for file in configure.in lib/reLyX/configure.in
+	@${REINPLACE_CMD} -e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g' ${WRKSRC}/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index eeb607bd3043..3486f46f5b88 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
+MD5 (lyx-1.2.3.tar.gz) = 3a423e65f647bd0a8f9401dd43e5d912
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index 75ad1157c54f..7eab7ce8966d 100644
--- a/print/lyx/pkg-plist
+++ b/print/lyx/pkg-plist
@@ -83,6 +83,7 @@ share/lyx/doc/fr_Tutorial.lyx
 share/lyx/doc/fr_UserGuide.lyx
 share/lyx/doc/he_Intro.lyx
 share/lyx/doc/he_TOC.lyx
+share/lyx/doc/he_Tutorial.lyx
 share/lyx/doc/hu_Intro.lyx
 share/lyx/doc/hu_TOC.lyx
 share/lyx/doc/it_Customization.lyx
@@ -104,6 +105,7 @@ share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
 share/lyx/doc/ro_splash.lyx
+share/lyx/doc/ru_FAQ.lyx
 share/lyx/doc/ru_Intro.lyx
 share/lyx/doc/ru_TOC.lyx
 share/lyx/doc/ru_Tutorial.lyx
@@ -155,6 +157,9 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_mathed.lyx
 share/lyx/examples/fr_splash.lyx
+share/lyx/examples/he_example_raw.lyx
+share/lyx/examples/he_he_example_lyxified.lyx
+share/lyx/examples/he_he_example_raw.lyx
 share/lyx/examples/hu_splash.lyx
 share/lyx/examples/iecc05.fen
 share/lyx/examples/iecc07.fen
@@ -331,6 +336,7 @@ share/lyx/layouts/g-brief-en.layout
 share/lyx/layouts/heb-article.layout
 share/lyx/layouts/heb-letter.layout
 share/lyx/layouts/hollywood.layout
+share/lyx/layouts/ijmpd.layout
 share/lyx/layouts/kluwer.layout
 share/lyx/layouts/latex8.layout
 share/lyx/layouts/letter.layout
@@ -404,6 +410,7 @@ share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
+share/lyx/templates/ijmpd.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 2ab42e3f570a..60a0ded4973a 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	flynn@energyhq.homeip.net
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
@@ -27,10 +26,11 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	15
-AUTOMAKE=	${WRKSRC}/autogen.sh
-AUTOCONF=	${TRUE}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
@@ -59,12 +59,13 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-post-extract:
-	@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
-
 post-patch:
-	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
-		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
+.for file in src/Makefile.am src/frontends/Makefile.am
+	@${REINPLACE_CMD} -e 's|LIBS +=|LDFLAGS = @LDFLAGS@|g' ${WRKSRC}/${file}
+.endfor
+.for file in configure.in lib/reLyX/configure.in
+	@${REINPLACE_CMD} -e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g' ${WRKSRC}/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/print/lyx14/distinfo b/print/lyx14/distinfo
index eeb607bd3043..3486f46f5b88 100644
--- a/print/lyx14/distinfo
+++ b/print/lyx14/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
+MD5 (lyx-1.2.3.tar.gz) = 3a423e65f647bd0a8f9401dd43e5d912
diff --git a/print/lyx14/pkg-plist b/print/lyx14/pkg-plist
index 75ad1157c54f..7eab7ce8966d 100644
--- a/print/lyx14/pkg-plist
+++ b/print/lyx14/pkg-plist
@@ -83,6 +83,7 @@ share/lyx/doc/fr_Tutorial.lyx
 share/lyx/doc/fr_UserGuide.lyx
 share/lyx/doc/he_Intro.lyx
 share/lyx/doc/he_TOC.lyx
+share/lyx/doc/he_Tutorial.lyx
 share/lyx/doc/hu_Intro.lyx
 share/lyx/doc/hu_TOC.lyx
 share/lyx/doc/it_Customization.lyx
@@ -104,6 +105,7 @@ share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
 share/lyx/doc/ro_splash.lyx
+share/lyx/doc/ru_FAQ.lyx
 share/lyx/doc/ru_Intro.lyx
 share/lyx/doc/ru_TOC.lyx
 share/lyx/doc/ru_Tutorial.lyx
@@ -155,6 +157,9 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_mathed.lyx
 share/lyx/examples/fr_splash.lyx
+share/lyx/examples/he_example_raw.lyx
+share/lyx/examples/he_he_example_lyxified.lyx
+share/lyx/examples/he_he_example_raw.lyx
 share/lyx/examples/hu_splash.lyx
 share/lyx/examples/iecc05.fen
 share/lyx/examples/iecc07.fen
@@ -331,6 +336,7 @@ share/lyx/layouts/g-brief-en.layout
 share/lyx/layouts/heb-article.layout
 share/lyx/layouts/heb-letter.layout
 share/lyx/layouts/hollywood.layout
+share/lyx/layouts/ijmpd.layout
 share/lyx/layouts/kluwer.layout
 share/lyx/layouts/latex8.layout
 share/lyx/layouts/letter.layout
@@ -404,6 +410,7 @@ share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
+share/lyx/templates/ijmpd.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 2ab42e3f570a..60a0ded4973a 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	flynn@energyhq.homeip.net
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
@@ -27,10 +26,11 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	15
-AUTOMAKE=	${WRKSRC}/autogen.sh
-AUTOCONF=	${TRUE}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
@@ -59,12 +59,13 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-post-extract:
-	@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
-
 post-patch:
-	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
-		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
+.for file in src/Makefile.am src/frontends/Makefile.am
+	@${REINPLACE_CMD} -e 's|LIBS +=|LDFLAGS = @LDFLAGS@|g' ${WRKSRC}/${file}
+.endfor
+.for file in configure.in lib/reLyX/configure.in
+	@${REINPLACE_CMD} -e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g' ${WRKSRC}/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/print/lyx15/distinfo b/print/lyx15/distinfo
index eeb607bd3043..3486f46f5b88 100644
--- a/print/lyx15/distinfo
+++ b/print/lyx15/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
+MD5 (lyx-1.2.3.tar.gz) = 3a423e65f647bd0a8f9401dd43e5d912
diff --git a/print/lyx15/pkg-plist b/print/lyx15/pkg-plist
index 75ad1157c54f..7eab7ce8966d 100644
--- a/print/lyx15/pkg-plist
+++ b/print/lyx15/pkg-plist
@@ -83,6 +83,7 @@ share/lyx/doc/fr_Tutorial.lyx
 share/lyx/doc/fr_UserGuide.lyx
 share/lyx/doc/he_Intro.lyx
 share/lyx/doc/he_TOC.lyx
+share/lyx/doc/he_Tutorial.lyx
 share/lyx/doc/hu_Intro.lyx
 share/lyx/doc/hu_TOC.lyx
 share/lyx/doc/it_Customization.lyx
@@ -104,6 +105,7 @@ share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
 share/lyx/doc/ro_splash.lyx
+share/lyx/doc/ru_FAQ.lyx
 share/lyx/doc/ru_Intro.lyx
 share/lyx/doc/ru_TOC.lyx
 share/lyx/doc/ru_Tutorial.lyx
@@ -155,6 +157,9 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_mathed.lyx
 share/lyx/examples/fr_splash.lyx
+share/lyx/examples/he_example_raw.lyx
+share/lyx/examples/he_he_example_lyxified.lyx
+share/lyx/examples/he_he_example_raw.lyx
 share/lyx/examples/hu_splash.lyx
 share/lyx/examples/iecc05.fen
 share/lyx/examples/iecc07.fen
@@ -331,6 +336,7 @@ share/lyx/layouts/g-brief-en.layout
 share/lyx/layouts/heb-article.layout
 share/lyx/layouts/heb-letter.layout
 share/lyx/layouts/hollywood.layout
+share/lyx/layouts/ijmpd.layout
 share/lyx/layouts/kluwer.layout
 share/lyx/layouts/latex8.layout
 share/lyx/layouts/letter.layout
@@ -404,6 +410,7 @@ share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
+share/lyx/templates/ijmpd.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 2ab42e3f570a..60a0ded4973a 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	flynn@energyhq.homeip.net
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
@@ -27,10 +26,11 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	15
-AUTOMAKE=	${WRKSRC}/autogen.sh
-AUTOCONF=	${TRUE}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
@@ -59,12 +59,13 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-post-extract:
-	@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
-
 post-patch:
-	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
-		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
+.for file in src/Makefile.am src/frontends/Makefile.am
+	@${REINPLACE_CMD} -e 's|LIBS +=|LDFLAGS = @LDFLAGS@|g' ${WRKSRC}/${file}
+.endfor
+.for file in configure.in lib/reLyX/configure.in
+	@${REINPLACE_CMD} -e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g' ${WRKSRC}/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/print/lyx16/distinfo b/print/lyx16/distinfo
index eeb607bd3043..3486f46f5b88 100644
--- a/print/lyx16/distinfo
+++ b/print/lyx16/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
+MD5 (lyx-1.2.3.tar.gz) = 3a423e65f647bd0a8f9401dd43e5d912
diff --git a/print/lyx16/pkg-plist b/print/lyx16/pkg-plist
index 75ad1157c54f..7eab7ce8966d 100644
--- a/print/lyx16/pkg-plist
+++ b/print/lyx16/pkg-plist
@@ -83,6 +83,7 @@ share/lyx/doc/fr_Tutorial.lyx
 share/lyx/doc/fr_UserGuide.lyx
 share/lyx/doc/he_Intro.lyx
 share/lyx/doc/he_TOC.lyx
+share/lyx/doc/he_Tutorial.lyx
 share/lyx/doc/hu_Intro.lyx
 share/lyx/doc/hu_TOC.lyx
 share/lyx/doc/it_Customization.lyx
@@ -104,6 +105,7 @@ share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
 share/lyx/doc/ro_splash.lyx
+share/lyx/doc/ru_FAQ.lyx
 share/lyx/doc/ru_Intro.lyx
 share/lyx/doc/ru_TOC.lyx
 share/lyx/doc/ru_Tutorial.lyx
@@ -155,6 +157,9 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_mathed.lyx
 share/lyx/examples/fr_splash.lyx
+share/lyx/examples/he_example_raw.lyx
+share/lyx/examples/he_he_example_lyxified.lyx
+share/lyx/examples/he_he_example_raw.lyx
 share/lyx/examples/hu_splash.lyx
 share/lyx/examples/iecc05.fen
 share/lyx/examples/iecc07.fen
@@ -331,6 +336,7 @@ share/lyx/layouts/g-brief-en.layout
 share/lyx/layouts/heb-article.layout
 share/lyx/layouts/heb-letter.layout
 share/lyx/layouts/hollywood.layout
+share/lyx/layouts/ijmpd.layout
 share/lyx/layouts/kluwer.layout
 share/lyx/layouts/latex8.layout
 share/lyx/layouts/letter.layout
@@ -404,6 +410,7 @@ share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
+share/lyx/templates/ijmpd.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx