diff options
author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-05-09 20:27:24 +0000 |
---|---|---|
committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-05-09 20:27:24 +0000 |
commit | 2028cbcd2a5a7dade5292c61705cfcaa444effbb (patch) | |
tree | 00bbccbb7bad533a1de9e2eed8bf8b5b752f5ba4 /print/lyx | |
parent | Split off print/tex-dvipsk from print/texlive-base. libpaper support (diff) |
- Update to 2.0.6.
- Remove patch that has been upstreamed.
- Adjust pkg-message now that texlive is in ports.
- Update pkg-descr to its new format.
Notes
Notes:
svn path=/head/; revision=317748
Diffstat (limited to 'print/lyx')
-rw-r--r-- | print/lyx/Makefile | 3 | ||||
-rw-r--r-- | print/lyx/distinfo | 4 | ||||
-rw-r--r-- | print/lyx/files/patch-configure | 103 | ||||
-rw-r--r-- | print/lyx/pkg-descr | 2 | ||||
-rw-r--r-- | print/lyx/pkg-message | 2 | ||||
-rw-r--r-- | print/lyx/pkg-plist | 3 |
6 files changed, 8 insertions, 109 deletions
diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 209060518dc2..457456ef433c 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -3,7 +3,6 @@ PORTNAME= lyx PORTVERSION= ${MAJOR_VERSION}.${MINOR_VERSION} -PORTREVISION= 1 CATEGORIES= print editors MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \ @@ -22,7 +21,7 @@ LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs \ CONFLICTS= lyx-1.[0-9]* MAJOR_VERSION= 2.0 -MINOR_VERSION= 5.1 +MINOR_VERSION= 6 USE_XZ= yes USE_GMAKE= yes diff --git a/print/lyx/distinfo b/print/lyx/distinfo index 2241a546f693..38b3bc0734b6 100644 --- a/print/lyx/distinfo +++ b/print/lyx/distinfo @@ -1,2 +1,2 @@ -SHA256 (lyx-2.0.5.1.tar.xz) = 36e527765daf8425fef83240a6ccb82472b2d9e6283de666c5d46c40fec269a2 -SIZE (lyx-2.0.5.1.tar.xz) = 10312232 +SHA256 (lyx-2.0.6.tar.xz) = a5cb2bedee6e154b50881acd2316cf9d79162d6754e3aa159a6d579f5a828ad2 +SIZE (lyx-2.0.6.tar.xz) = 10390452 diff --git a/print/lyx/files/patch-configure b/print/lyx/files/patch-configure deleted file mode 100644 index c61ed1323bab..000000000000 --- a/print/lyx/files/patch-configure +++ /dev/null @@ -1,103 +0,0 @@ ---- configure.orig 2011-09-12 19:17:15.000000000 -0300 -+++ configure 2011-09-12 19:17:40.000000000 -0300 -@@ -7319,73 +7320,56 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lyx_cv_with_included_boost" >&5 - $as_echo "$lyx_cv_with_included_boost" >&6; } - if test x$lyx_cv_with_included_boost != xyes ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lboost_signals" >&5 --$as_echo_n "checking for main in -lboost_signals... " >&6; } --if ${ac_cv_lib_boost_signals_main+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lboost_signals -lm $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -+ SAVED_LDFLAGS=$LDFLAGS - -+ LDFLAGS="$SAVED_LDFLAGS -lboost_signals -lm" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <boost/signal.hpp> - int - main () - { --return main (); -+boost::signal<void ()> s; - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_boost_signals_main=yes --else -- ac_cv_lib_boost_signals_main=no -+if ac_fn_cxx_try_link "$LINENO"; then : -+ lyx_boost_underscore=yes - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_boost_signals_main" >&5 --$as_echo "$ac_cv_lib_boost_signals_main" >&6; } --if test "x$ac_cv_lib_boost_signals_main" = xyes; then : -- lyx_boost_underscore=yes --fi -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lboost_signals-mt" >&5 --$as_echo_n "checking for main in -lboost_signals-mt... " >&6; } --if ${ac_cv_lib_boost_signals_mt_main+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lboost_signals-mt -lm $LIBTHREAD $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ LDFLAGS="$SAVED_LDFLAGS -lboost_signals-mt -lm $LIBTHREAD" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -- -- -+#include <boost/signal.hpp> - int - main () - { --return main (); -+boost::signal<void ()> s; - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_boost_signals_mt_main=yes --else -- ac_cv_lib_boost_signals_mt_main=no -+if ac_fn_cxx_try_link "$LINENO"; then : -+ lyx_boost_underscore_mt=yes - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_boost_signals_mt_main" >&5 --$as_echo "$ac_cv_lib_boost_signals_mt_main" >&6; } --if test "x$ac_cv_lib_boost_signals_mt_main" = xyes; then : -- lyx_boost_underscore_mt=yes --fi -+ -+ LDFLAGS=$SAVED_LDFLAGS -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ - - if test x$lyx_boost_underscore_mt = xyes ; then - BOOST_MT="-mt" diff --git a/print/lyx/pkg-descr b/print/lyx/pkg-descr index 1d259742208e..a63997eba55b 100644 --- a/print/lyx/pkg-descr +++ b/print/lyx/pkg-descr @@ -19,4 +19,4 @@ boundaries. You just write. On screen, LyX looks like any word processor; its printed output - or richly cross-referenced PDF, just as readily produced - looks like nothing else. -WWW: http://www.lyx.org/ +WWW: http://www.lyx.org/ diff --git a/print/lyx/pkg-message b/print/lyx/pkg-message index 2d9ffd22aaa0..18430054c9df 100644 --- a/print/lyx/pkg-message +++ b/print/lyx/pkg-message @@ -1,7 +1,7 @@ For LyX to work you need to install some kind of TeX distribution. - The print/teTeX port in the ports tree. - - The TexLive ports in https://code.google.com/p/freebsd-texlive. + - The print/texlive-* ports in the ports tree. Either one should work fine. diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist index 0006919b9b73..b54ea2b26535 100644 --- a/print/lyx/pkg-plist +++ b/print/lyx/pkg-plist @@ -1411,6 +1411,7 @@ share/icons/hicolor/48x48/apps/lyx.png %%DATADIR%%/layouts/amsbook.layout %%DATADIR%%/layouts/amsdefs.inc %%DATADIR%%/layouts/apa.layout +%%DATADIR%%/layouts/apa6.layout %%DATADIR%%/layouts/arab-article.layout %%DATADIR%%/layouts/armenian-article.layout %%DATADIR%%/layouts/article-beamer.layout @@ -1501,6 +1502,7 @@ share/icons/hicolor/48x48/apps/lyx.png %%DATADIR%%/layouts/mwart.layout %%DATADIR%%/layouts/mwbk.layout %%DATADIR%%/layouts/mwrep.layout +%%DATADIR%%/layouts/natbibapa.module %%DATADIR%%/layouts/noweb.module %%DATADIR%%/layouts/numarticle.inc %%DATADIR%%/layouts/numreport.inc @@ -1686,6 +1688,7 @@ share/icons/hicolor/48x48/apps/lyx.png %%DATADIR%%/templates/ACM-siggraph.lyx %%DATADIR%%/templates/ACM-sigplan.lyx %%DATADIR%%/templates/AEA.lyx +%%DATADIR%%/templates/APA6.lyx %%DATADIR%%/templates/IEEEtran.lyx %%DATADIR%%/templates/JASA.lyx %%DATADIR%%/templates/JSS-article.lyx |