summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--print/lyx-devel/Makefile20
-rw-r--r--print/lyx-devel/distinfo2
-rw-r--r--print/lyx-devel/pkg-plist8
-rw-r--r--print/lyx/Makefile20
-rw-r--r--print/lyx/distinfo2
-rw-r--r--print/lyx/pkg-plist8
-rw-r--r--print/lyx14/Makefile20
-rw-r--r--print/lyx14/distinfo2
-rw-r--r--print/lyx14/pkg-plist8
-rw-r--r--print/lyx15/Makefile20
-rw-r--r--print/lyx15/distinfo2
-rw-r--r--print/lyx15/pkg-plist8
-rw-r--r--print/lyx16/Makefile20
-rw-r--r--print/lyx16/distinfo2
-rw-r--r--print/lyx16/pkg-plist8
15 files changed, 60 insertions, 90 deletions
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 82f52bac1341..3d6f2408e7e3 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= lyx
-PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTVERSION= 1.3.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -26,8 +25,7 @@ USE_BZIP2= yes
USE_PERL5= yes
USE_PYTHON= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
-USE_REINPLACE= yes
+USE_LIBTOOL_VER= 14
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
@@ -38,6 +36,8 @@ MAN1= lyx.1 reLyX.1
.if defined(WITH_QT)
USE_QT_VER= 3
CONFIGURE_ARGS+= --with-frontend=qt
+QTCPPFLAGS+= ${PTHREAD_CFLAGS}
+QTCFGLIBS+= ${PTHREAD_LIBS}
.else
LIB_DEPENDS+= forms.1:${PORTSDIR}/x11-toolkits/xforms
USE_XPM= yes
@@ -57,12 +57,7 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
-.if defined(WITH_QT)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
-.endif
+CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30
.endif
pre-everything::
@@ -87,9 +82,4 @@ pre-everything::
@${ECHO_MSG}
.endif
-post-patch:
- @${REINPLACE_CMD} -E -e \
- 's|CFLAGS=$$|#CFLAGS=|' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
.include <bsd.port.post.mk>
diff --git a/print/lyx-devel/distinfo b/print/lyx-devel/distinfo
index 66a0a202dcb4..4592a0e89b5a 100644
--- a/print/lyx-devel/distinfo
+++ b/print/lyx-devel/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.3.2.tar.bz2) = e33cf84f7c5be4ab9bbcc6ea587d4fdc
+MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
diff --git a/print/lyx-devel/pkg-plist b/print/lyx-devel/pkg-plist
index 3d9c0330a9f2..4592b4ab03fe 100644
--- a/print/lyx-devel/pkg-plist
+++ b/print/lyx-devel/pkg-plist
@@ -26,6 +26,7 @@ share/locale/sv/LC_MESSAGES/lyx.mo
share/locale/tr/LC_MESSAGES/lyx.mo
share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/CREDITS
+%%DATADIR%%/bind/aqua.bind
%%DATADIR%%/bind/broadway.bind
%%DATADIR%%/bind/cua.bind
%%DATADIR%%/bind/cyrkeys.bind
@@ -155,10 +156,10 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/examples/fr_Foils.lyx
%%DATADIR%%/examples/fr_ListesPuces.lyx
%%DATADIR%%/examples/fr_Minipage.lyx
-%%DATADIR%%/examples/fr_MultiColonnes.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_splash.lyx
%%DATADIR%%/examples/he_example_raw.lyx
%%DATADIR%%/examples/he_he_example_lyxified.lyx
@@ -804,6 +805,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/layouts/ltugboat.layout
%%DATADIR%%/layouts/lyxmacros.inc
%%DATADIR%%/layouts/manpage.layout
+%%DATADIR%%/layouts/memoir.layout
%%DATADIR%%/layouts/mwart.layout
%%DATADIR%%/layouts/mwbk.layout
%%DATADIR%%/layouts/mwrep.layout
@@ -889,8 +891,9 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/templates/g-brief-de.lyx
%%DATADIR%%/templates/g-brief-en.lyx
%%DATADIR%%/templates/hollywood.lyx
-%%DATADIR%%/templates/koma-letter2.lyx
+%%DATADIR%%/templates/ijmpd.lyx
%%DATADIR%%/templates/kluwer.lyx
+%%DATADIR%%/templates/koma-letter2.lyx
%%DATADIR%%/templates/latex8.lyx
%%DATADIR%%/templates/letter.lyx
%%DATADIR%%/templates/linuxdoc_article.lyx
@@ -905,6 +908,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/tex/revtex.cls
%%DATADIR%%/textclass.lst
%%DATADIR%%/ui/default.ui
+%%DATADIR%%/xfonts/PSres.upr
%%DATADIR%%/xfonts/cmex10.pfb
%%DATADIR%%/xfonts/cmmi10.pfb
%%DATADIR%%/xfonts/cmr10.pfb
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 82f52bac1341..3d6f2408e7e3 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= lyx
-PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTVERSION= 1.3.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -26,8 +25,7 @@ USE_BZIP2= yes
USE_PERL5= yes
USE_PYTHON= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
-USE_REINPLACE= yes
+USE_LIBTOOL_VER= 14
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
@@ -38,6 +36,8 @@ MAN1= lyx.1 reLyX.1
.if defined(WITH_QT)
USE_QT_VER= 3
CONFIGURE_ARGS+= --with-frontend=qt
+QTCPPFLAGS+= ${PTHREAD_CFLAGS}
+QTCFGLIBS+= ${PTHREAD_LIBS}
.else
LIB_DEPENDS+= forms.1:${PORTSDIR}/x11-toolkits/xforms
USE_XPM= yes
@@ -57,12 +57,7 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
-.if defined(WITH_QT)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
-.endif
+CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30
.endif
pre-everything::
@@ -87,9 +82,4 @@ pre-everything::
@${ECHO_MSG}
.endif
-post-patch:
- @${REINPLACE_CMD} -E -e \
- 's|CFLAGS=$$|#CFLAGS=|' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
.include <bsd.port.post.mk>
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 66a0a202dcb4..4592a0e89b5a 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.3.2.tar.bz2) = e33cf84f7c5be4ab9bbcc6ea587d4fdc
+MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index 3d9c0330a9f2..4592b4ab03fe 100644
--- a/print/lyx/pkg-plist
+++ b/print/lyx/pkg-plist
@@ -26,6 +26,7 @@ share/locale/sv/LC_MESSAGES/lyx.mo
share/locale/tr/LC_MESSAGES/lyx.mo
share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/CREDITS
+%%DATADIR%%/bind/aqua.bind
%%DATADIR%%/bind/broadway.bind
%%DATADIR%%/bind/cua.bind
%%DATADIR%%/bind/cyrkeys.bind
@@ -155,10 +156,10 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/examples/fr_Foils.lyx
%%DATADIR%%/examples/fr_ListesPuces.lyx
%%DATADIR%%/examples/fr_Minipage.lyx
-%%DATADIR%%/examples/fr_MultiColonnes.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_splash.lyx
%%DATADIR%%/examples/he_example_raw.lyx
%%DATADIR%%/examples/he_he_example_lyxified.lyx
@@ -804,6 +805,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/layouts/ltugboat.layout
%%DATADIR%%/layouts/lyxmacros.inc
%%DATADIR%%/layouts/manpage.layout
+%%DATADIR%%/layouts/memoir.layout
%%DATADIR%%/layouts/mwart.layout
%%DATADIR%%/layouts/mwbk.layout
%%DATADIR%%/layouts/mwrep.layout
@@ -889,8 +891,9 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/templates/g-brief-de.lyx
%%DATADIR%%/templates/g-brief-en.lyx
%%DATADIR%%/templates/hollywood.lyx
-%%DATADIR%%/templates/koma-letter2.lyx
+%%DATADIR%%/templates/ijmpd.lyx
%%DATADIR%%/templates/kluwer.lyx
+%%DATADIR%%/templates/koma-letter2.lyx
%%DATADIR%%/templates/latex8.lyx
%%DATADIR%%/templates/letter.lyx
%%DATADIR%%/templates/linuxdoc_article.lyx
@@ -905,6 +908,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/tex/revtex.cls
%%DATADIR%%/textclass.lst
%%DATADIR%%/ui/default.ui
+%%DATADIR%%/xfonts/PSres.upr
%%DATADIR%%/xfonts/cmex10.pfb
%%DATADIR%%/xfonts/cmmi10.pfb
%%DATADIR%%/xfonts/cmr10.pfb
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 82f52bac1341..3d6f2408e7e3 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= lyx
-PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTVERSION= 1.3.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -26,8 +25,7 @@ USE_BZIP2= yes
USE_PERL5= yes
USE_PYTHON= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
-USE_REINPLACE= yes
+USE_LIBTOOL_VER= 14
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
@@ -38,6 +36,8 @@ MAN1= lyx.1 reLyX.1
.if defined(WITH_QT)
USE_QT_VER= 3
CONFIGURE_ARGS+= --with-frontend=qt
+QTCPPFLAGS+= ${PTHREAD_CFLAGS}
+QTCFGLIBS+= ${PTHREAD_LIBS}
.else
LIB_DEPENDS+= forms.1:${PORTSDIR}/x11-toolkits/xforms
USE_XPM= yes
@@ -57,12 +57,7 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
-.if defined(WITH_QT)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
-.endif
+CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30
.endif
pre-everything::
@@ -87,9 +82,4 @@ pre-everything::
@${ECHO_MSG}
.endif
-post-patch:
- @${REINPLACE_CMD} -E -e \
- 's|CFLAGS=$$|#CFLAGS=|' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
.include <bsd.port.post.mk>
diff --git a/print/lyx14/distinfo b/print/lyx14/distinfo
index 66a0a202dcb4..4592a0e89b5a 100644
--- a/print/lyx14/distinfo
+++ b/print/lyx14/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.3.2.tar.bz2) = e33cf84f7c5be4ab9bbcc6ea587d4fdc
+MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
diff --git a/print/lyx14/pkg-plist b/print/lyx14/pkg-plist
index 3d9c0330a9f2..4592b4ab03fe 100644
--- a/print/lyx14/pkg-plist
+++ b/print/lyx14/pkg-plist
@@ -26,6 +26,7 @@ share/locale/sv/LC_MESSAGES/lyx.mo
share/locale/tr/LC_MESSAGES/lyx.mo
share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/CREDITS
+%%DATADIR%%/bind/aqua.bind
%%DATADIR%%/bind/broadway.bind
%%DATADIR%%/bind/cua.bind
%%DATADIR%%/bind/cyrkeys.bind
@@ -155,10 +156,10 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/examples/fr_Foils.lyx
%%DATADIR%%/examples/fr_ListesPuces.lyx
%%DATADIR%%/examples/fr_Minipage.lyx
-%%DATADIR%%/examples/fr_MultiColonnes.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_splash.lyx
%%DATADIR%%/examples/he_example_raw.lyx
%%DATADIR%%/examples/he_he_example_lyxified.lyx
@@ -804,6 +805,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/layouts/ltugboat.layout
%%DATADIR%%/layouts/lyxmacros.inc
%%DATADIR%%/layouts/manpage.layout
+%%DATADIR%%/layouts/memoir.layout
%%DATADIR%%/layouts/mwart.layout
%%DATADIR%%/layouts/mwbk.layout
%%DATADIR%%/layouts/mwrep.layout
@@ -889,8 +891,9 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/templates/g-brief-de.lyx
%%DATADIR%%/templates/g-brief-en.lyx
%%DATADIR%%/templates/hollywood.lyx
-%%DATADIR%%/templates/koma-letter2.lyx
+%%DATADIR%%/templates/ijmpd.lyx
%%DATADIR%%/templates/kluwer.lyx
+%%DATADIR%%/templates/koma-letter2.lyx
%%DATADIR%%/templates/latex8.lyx
%%DATADIR%%/templates/letter.lyx
%%DATADIR%%/templates/linuxdoc_article.lyx
@@ -905,6 +908,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/tex/revtex.cls
%%DATADIR%%/textclass.lst
%%DATADIR%%/ui/default.ui
+%%DATADIR%%/xfonts/PSres.upr
%%DATADIR%%/xfonts/cmex10.pfb
%%DATADIR%%/xfonts/cmmi10.pfb
%%DATADIR%%/xfonts/cmr10.pfb
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 82f52bac1341..3d6f2408e7e3 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= lyx
-PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTVERSION= 1.3.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -26,8 +25,7 @@ USE_BZIP2= yes
USE_PERL5= yes
USE_PYTHON= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
-USE_REINPLACE= yes
+USE_LIBTOOL_VER= 14
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
@@ -38,6 +36,8 @@ MAN1= lyx.1 reLyX.1
.if defined(WITH_QT)
USE_QT_VER= 3
CONFIGURE_ARGS+= --with-frontend=qt
+QTCPPFLAGS+= ${PTHREAD_CFLAGS}
+QTCFGLIBS+= ${PTHREAD_LIBS}
.else
LIB_DEPENDS+= forms.1:${PORTSDIR}/x11-toolkits/xforms
USE_XPM= yes
@@ -57,12 +57,7 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
-.if defined(WITH_QT)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
-.endif
+CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30
.endif
pre-everything::
@@ -87,9 +82,4 @@ pre-everything::
@${ECHO_MSG}
.endif
-post-patch:
- @${REINPLACE_CMD} -E -e \
- 's|CFLAGS=$$|#CFLAGS=|' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
.include <bsd.port.post.mk>
diff --git a/print/lyx15/distinfo b/print/lyx15/distinfo
index 66a0a202dcb4..4592a0e89b5a 100644
--- a/print/lyx15/distinfo
+++ b/print/lyx15/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.3.2.tar.bz2) = e33cf84f7c5be4ab9bbcc6ea587d4fdc
+MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
diff --git a/print/lyx15/pkg-plist b/print/lyx15/pkg-plist
index 3d9c0330a9f2..4592b4ab03fe 100644
--- a/print/lyx15/pkg-plist
+++ b/print/lyx15/pkg-plist
@@ -26,6 +26,7 @@ share/locale/sv/LC_MESSAGES/lyx.mo
share/locale/tr/LC_MESSAGES/lyx.mo
share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/CREDITS
+%%DATADIR%%/bind/aqua.bind
%%DATADIR%%/bind/broadway.bind
%%DATADIR%%/bind/cua.bind
%%DATADIR%%/bind/cyrkeys.bind
@@ -155,10 +156,10 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/examples/fr_Foils.lyx
%%DATADIR%%/examples/fr_ListesPuces.lyx
%%DATADIR%%/examples/fr_Minipage.lyx
-%%DATADIR%%/examples/fr_MultiColonnes.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_splash.lyx
%%DATADIR%%/examples/he_example_raw.lyx
%%DATADIR%%/examples/he_he_example_lyxified.lyx
@@ -804,6 +805,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/layouts/ltugboat.layout
%%DATADIR%%/layouts/lyxmacros.inc
%%DATADIR%%/layouts/manpage.layout
+%%DATADIR%%/layouts/memoir.layout
%%DATADIR%%/layouts/mwart.layout
%%DATADIR%%/layouts/mwbk.layout
%%DATADIR%%/layouts/mwrep.layout
@@ -889,8 +891,9 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/templates/g-brief-de.lyx
%%DATADIR%%/templates/g-brief-en.lyx
%%DATADIR%%/templates/hollywood.lyx
-%%DATADIR%%/templates/koma-letter2.lyx
+%%DATADIR%%/templates/ijmpd.lyx
%%DATADIR%%/templates/kluwer.lyx
+%%DATADIR%%/templates/koma-letter2.lyx
%%DATADIR%%/templates/latex8.lyx
%%DATADIR%%/templates/letter.lyx
%%DATADIR%%/templates/linuxdoc_article.lyx
@@ -905,6 +908,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/tex/revtex.cls
%%DATADIR%%/textclass.lst
%%DATADIR%%/ui/default.ui
+%%DATADIR%%/xfonts/PSres.upr
%%DATADIR%%/xfonts/cmex10.pfb
%%DATADIR%%/xfonts/cmmi10.pfb
%%DATADIR%%/xfonts/cmr10.pfb
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 82f52bac1341..3d6f2408e7e3 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= lyx
-PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTVERSION= 1.3.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -26,8 +25,7 @@ USE_BZIP2= yes
USE_PERL5= yes
USE_PYTHON= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
-USE_REINPLACE= yes
+USE_LIBTOOL_VER= 14
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
@@ -38,6 +36,8 @@ MAN1= lyx.1 reLyX.1
.if defined(WITH_QT)
USE_QT_VER= 3
CONFIGURE_ARGS+= --with-frontend=qt
+QTCPPFLAGS+= ${PTHREAD_CFLAGS}
+QTCFGLIBS+= ${PTHREAD_LIBS}
.else
LIB_DEPENDS+= forms.1:${PORTSDIR}/x11-toolkits/xforms
USE_XPM= yes
@@ -57,12 +57,7 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
-.if defined(WITH_QT)
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
- CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
-.endif
+CFLAGS+= -Wno-non-template-friend -ftemplate-depth-30
.endif
pre-everything::
@@ -87,9 +82,4 @@ pre-everything::
@${ECHO_MSG}
.endif
-post-patch:
- @${REINPLACE_CMD} -E -e \
- 's|CFLAGS=$$|#CFLAGS=|' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
.include <bsd.port.post.mk>
diff --git a/print/lyx16/distinfo b/print/lyx16/distinfo
index 66a0a202dcb4..4592a0e89b5a 100644
--- a/print/lyx16/distinfo
+++ b/print/lyx16/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.3.2.tar.bz2) = e33cf84f7c5be4ab9bbcc6ea587d4fdc
+MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
diff --git a/print/lyx16/pkg-plist b/print/lyx16/pkg-plist
index 3d9c0330a9f2..4592b4ab03fe 100644
--- a/print/lyx16/pkg-plist
+++ b/print/lyx16/pkg-plist
@@ -26,6 +26,7 @@ share/locale/sv/LC_MESSAGES/lyx.mo
share/locale/tr/LC_MESSAGES/lyx.mo
share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/CREDITS
+%%DATADIR%%/bind/aqua.bind
%%DATADIR%%/bind/broadway.bind
%%DATADIR%%/bind/cua.bind
%%DATADIR%%/bind/cyrkeys.bind
@@ -155,10 +156,10 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/examples/fr_Foils.lyx
%%DATADIR%%/examples/fr_ListesPuces.lyx
%%DATADIR%%/examples/fr_Minipage.lyx
-%%DATADIR%%/examples/fr_MultiColonnes.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_splash.lyx
%%DATADIR%%/examples/he_example_raw.lyx
%%DATADIR%%/examples/he_he_example_lyxified.lyx
@@ -804,6 +805,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/layouts/ltugboat.layout
%%DATADIR%%/layouts/lyxmacros.inc
%%DATADIR%%/layouts/manpage.layout
+%%DATADIR%%/layouts/memoir.layout
%%DATADIR%%/layouts/mwart.layout
%%DATADIR%%/layouts/mwbk.layout
%%DATADIR%%/layouts/mwrep.layout
@@ -889,8 +891,9 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/templates/g-brief-de.lyx
%%DATADIR%%/templates/g-brief-en.lyx
%%DATADIR%%/templates/hollywood.lyx
-%%DATADIR%%/templates/koma-letter2.lyx
+%%DATADIR%%/templates/ijmpd.lyx
%%DATADIR%%/templates/kluwer.lyx
+%%DATADIR%%/templates/koma-letter2.lyx
%%DATADIR%%/templates/latex8.lyx
%%DATADIR%%/templates/letter.lyx
%%DATADIR%%/templates/linuxdoc_article.lyx
@@ -905,6 +908,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
%%DATADIR%%/tex/revtex.cls
%%DATADIR%%/textclass.lst
%%DATADIR%%/ui/default.ui
+%%DATADIR%%/xfonts/PSres.upr
%%DATADIR%%/xfonts/cmex10.pfb
%%DATADIR%%/xfonts/cmmi10.pfb
%%DATADIR%%/xfonts/cmr10.pfb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 00:51:53 +0000