Update to 1.6.6.1 for Qt4

Pass maintainership to submitter.

PR:		ports/147243
Submitted by:	Aldis Berjoza <aldis at bsdroot.lv>
Approved by:	mi@ (previous maintainer)
This commit is contained in:
Max Brazhnikov 2010-06-14 18:11:27 +00:00
parent 46e0b662ab
commit 442a99a9f1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=256530
27 changed files with 3591 additions and 2946 deletions

View file

@ -6,115 +6,70 @@
# #
PORTNAME= lyx PORTNAME= lyx
PORTVERSION= 1.4.5.1 PORTVERSION= ${MAJOR_VERSION}.6.1
PORTREVISION= 4 CATEGORIES= print editors
CATEGORIES= print MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/1.4.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \
http://www-ftp.lip6.fr/ftp/pub/lyx/stable/1.4.x/ \ ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/${MAJOR_VERSION}.x/ \
ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/1.4.x/ \ ftp://ftp.ntua.gr/pub/X11/LyX/stable/${MAJOR_VERSION}.x/ \
ftp://ftp.ntua.gr/pub/X11/LyX/stable/1.4.x/ \ http://sunsite.icm.edu.pl/pub/unix/editors/lyx/stable/${MAJOR_VERSION}.x/ \
http://sunsite.icm.edu.pl/pub/unix/editors/lyx/stable/1.4.x/ \ ftp://ftp.chg.ru/pub/X11/lyx/stable/${MAJOR_VERSION}.x/
ftp://ftp.chg.ru/pub/X11/lyx/stable/1.4.x/
MAINTAINER= mi@aldan.algebra.com MAINTAINER= aldis@bsdroot.lv
COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) (stable)
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs
OPTIONS= QT "Use Qt (instead of XForms)" ${QT_PRESENT} \ CONFLICTS= lyx-1.4*
ASPELL "Utilize ASPELL library" on \ MAJOR_VERSION= 1.6
AIKSAUR "Build Aiksaurus support (English thesaurus)" on \
ISPELL "Depend on ISPELL as well" off USE_BZIP= yes
ALL_TARGET= all check
USE_BZIP2= yes
USE_GNOME= gnometarget lthack
USE_PERL5= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes USE_GMAKE= yes
USE_QT_VER= 4
QT_COMPONENTS= gui moc_build uic_build rcc_build
USE_PYTHON= yes
USE_PERL= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
EXTRACT_AFTER_ARGS=| ${TAR} -xf - --exclude ${PORTNAME}-${PORTVERSION}/intl/*.[ch] --exclude ${PORTNAME}-${PORTVERSION}/boost CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \ CONFIGURE_ARGS= --with-frontend=qt4 \
--without-included-boost \ --without-included-boost \
--with-extra-inc="${LOCALBASE}/include" --without-included-gettext \
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ --with-libiconv-prefix=${LOCALBASE} \
AUTOHEADER="${TRUE}" --with-extra-prefix=${LOCALBASE}
MAN1= lyx.1 tex2lyx.1 lyxclient.1 MAKE_JOBS_SAFE= yes
post-patch: MAN1= lyx.1 lyxclient.1 tex2lyx.1
# Removing mention of the bundled boost
${REINPLACE_CMD} -e 's, boost/[^ ]*Makefile,,g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's,detail/nullstream,utils/nullstream,' \
${WRKSRC}/src/pch.h ${WRKSRC}/src/support/pch.h \
${WRKSRC}/src/support/debugstream.h
${REINPLACE_CMD} -e 's,boost/regex\.hpp,boost/cregex.hpp,' \
${WRKSRC}/src/support/filetools.C
${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' \
${WRKSRC}/src/support/tests/test_*
pre-configure: OPTIONS= ASPELL "Use Aspell library" on \
# If the installed Boost is 1.34 or later, we must compile AIKSAUR "Build Aiksaurus support (English thesaurus)" on \
# with exceptions enabled: NLS "Native language support" on
${AWK} '/#define BOOST_VERSION / {exit($$NF >= 103400)}' \
${LOCALBASE}/include/boost/version.hpp || \
${REINPLACE_CMD} -e 's,\(AM_CXXFLAGS="\)-fno-exceptions,\1,' \
${WRKSRC}/${CONFIGURE_SCRIPT}
post-configure: .include <bsd.port.options.mk>
# Removing explicit linking with -lc
${REINPLACE_CMD} -e 's,-lc ,,' ${WRKSRC}/*/Makefile
.include <bsd.port.pre.mk> .if !defined(WITHOUT_AIKSAUR)
.if exists(${LOCALBASE}/bin/makepsres)
PLIST_SUB+= PSRES=
.else
PLIST_SUB+= PSRES='@comment '
.endif
.if defined(WITH_AIKSAUR)
LIB_DEPENDS+= Aiksaurus:${PORTSDIR}/textproc/aiksaurus LIB_DEPENDS+= Aiksaurus:${PORTSDIR}/textproc/aiksaurus
.else .else
CONFIGURE_ARGS+=--without-aiksaurus CONFIGURE_ARGS+= --without-aiksaurus
.endif .endif
.if defined(WITH_QT) .if !defined(WITHOUT_ASPELL)
LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33
CONFIGURE_ARGS+= --with-frontend=qt
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS}
RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
.else
LIB_DEPENDS+= forms:${PORTSDIR}/x11-toolkits/xforms
CONFIGURE_ARGS+=--with-frontend=xforms
USE_XORG= x11
.endif
.if defined(WITH_ASPELL)
LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
CONFIGURE_ARGS+= --with-pspell \ CONFIGURE_ARGS+= --with-pspell \
--with-pspell-lib="${LOCALBASE}/lib" \ --with-pspell-lib="${LOCALBASE}/lib" \
--with-pspell-include="${LOCALBASE}/include" --with-pspell-include="${LOCALBASE}/include"
.else .else
CONFIGURE_ARGS+=--without-aspell --without-pspell CONFIGURE_ARGS+= --without-aspell --without-pspell
.endif .endif
.if defined(WITH_ISPELL) .if defined(WITHOUT_NLS)
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else .else
CONFIGURE_ARGS+=--without-ispell USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.endif .endif
.if exists(${LOCALBASE}/lib/libqt-mt.prl) post-install:
QT_PRESENT= on @${CAT} ${PKGMESSAGE}
.else
QT_PRESENT= off
.endif
.if ${OSVERSION} >= 700007 && ${ARCH} == i386 && ${CXX} == c++ .include <bsd.port.mk>
#BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER}
.endif
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
MD5 (lyx-1.4.5.1.tar.bz2) = b74d82e80c49c7edb782ec7395b7ca27 MD5 (lyx-1.6.6.1.tar.gz) = 5c43c3161cbec08c78f246cca5761636
SHA256 (lyx-1.4.5.1.tar.bz2) = b26a09cc29aaf77f4a4593d437b62fcf044926e481a8468ac6eb2e5ac695ca9b SHA256 (lyx-1.6.6.1.tar.gz) = e566acba82f886dc0276198c2a4a964e44845eec4e83d6fde1bd147130110d6f
SIZE (lyx-1.4.5.1.tar.bz2) = 8026585 SIZE (lyx-1.6.6.1.tar.gz) = 15698964

View file

@ -1,22 +0,0 @@
--- src/support/path.h Mon Oct 6 11:43:21 2003
+++ src/support/path.h Fri Jul 6 14:23:38 2007
@@ -55,5 +55,5 @@
// we add this macro:
///
-#ifndef PATH_C
+#if 0
#define Path(x) unnamed_Path;
#endif
--- src/client/client.C Wed Apr 12 05:37:33 2006
+++ src/client/client.C Fri Jul 6 15:47:26 2007
@@ -94,5 +94,10 @@
for (; beg != end; ++beg) {
if (prefixIs(beg->leaf(), "lyx_tmpdir" + pid)) {
+#include <boost/version.hpp>
+#if BOOST_VERSION < 103400
fs::path lyxsocket = *beg / "lyxsocket";
+#else
+ fs::path lyxsocket = beg->path() / "lyxsocket";
+#endif
if (fs::exists(lyxsocket)) {
dirlist.push_back(lyxsocket);

View file

@ -1,62 +0,0 @@
--- src/support/fs_extras.C.orig 2005-05-07 18:31:16.000000000 +0400
+++ src/support/fs_extras.C 2009-03-23 18:01:11.000000000 +0300
@@ -93,13 +93,15 @@
{
#ifdef BOOST_POSIX
+#include <boost/version.hpp>
int const infile = ::open(source.string().c_str(), O_RDONLY);
if (infile == -1) {
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
}
struct stat source_stat;
@@ -107,10 +109,11 @@
if (ret == -1) {
::close(infile);
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
}
int const flags = O_WRONLY | O_CREAT | (noclobber ? O_EXCL : O_TRUNC);
@@ -119,10 +122,11 @@
if (outfile == -1) {
::close(infile);
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
}
std::size_t const buf_sz = 32768;
@@ -149,10 +153,11 @@
if (in == -1 || out == -1)
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
#endif
#ifdef BOOST_WINDOWS
if (::CopyFile(source.string().c_str(), target.string().c_str(), noclobber) == 0) {

View file

@ -1,12 +0,0 @@
--- src/support/tests/convert.C.orig 2005-01-28 00:05:44.000000000 +0300
+++ src/support/tests/convert.C 2009-03-25 06:33:54.000000000 +0300
@@ -74,8 +74,7 @@
<< convert<string>(false) << '\n'
<< convert<string>('a') << '\n'
- << convert<string>(1.0) << '\n'
- << convert<string>(1.1) << endl;
+ << convert<string>(1.0) << endl;
}
int main()

View file

@ -1,7 +0,0 @@
--- src/support/tests/regfiles/convert.orig 2005-01-28 00:05:44.000000000 +0300
+++ src/support/tests/regfiles/convert 2009-03-25 06:34:11.000000000 +0300
@@ -46,4 +46,3 @@
false
a
1
-1.1

View file

@ -1,10 +1,26 @@
LyX is a document processor interfaced with LaTeX, which gives both the LyX is a document processor that encourages an approach to writing
ease-of-use of a wordprocessor, and the flexibility and power of based on the structure of your documents (WYSIWYM) and not simply
LaTeX. their appearance (WYSIWYG).
Quasi-WYSIWYG interface, many LaTeX styles and layouts automatically LyX combines the power and flexibility of TeX/LaTeX with the ease
generated. Speeds up learning LaTeX and makes complicated layouts of use of a graphical interface. This results in world-class support
easy and intuitive. New features include spell-checking, international for creation of mathematical content (via a fully integrated equation
character support, WYSIWYG graphics, tables, and equations. editor) and structured documents like academic articles, theses,
and books. In addition, staples of scientific authoring such as
reference list and index creation come standard. But you can also
use LyX to create a letter or a novel or a theatre play or film
script. A broad array of ready, well-designed document layouts are
built in.
WWW: http://www.lyx.org/ LyX is for people who want their writing to look great, right out
of the box. No more endless tinkering with formatting details,
"finger painting" font attributes or futzing around with page
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.
LyX is released under a Free Software/Open Source license, runs on
Linux/Unix, Windows, and Mac OS X, and is available in several
languages.
WWW: http://www.lyx.org/

View file

@ -0,0 +1,6 @@
For lyx to work you need to install some kind of TeX software.
The easiest way is porbably to install print/teTeX port which is quite old.
A newer alternative could be TeXLive:
http://code.google.com/p/freebsd-texlive/

File diff suppressed because it is too large Load diff

View file

@ -6,115 +6,70 @@
# #
PORTNAME= lyx PORTNAME= lyx
PORTVERSION= 1.4.5.1 PORTVERSION= ${MAJOR_VERSION}.6.1
PORTREVISION= 4 CATEGORIES= print editors
CATEGORIES= print MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/1.4.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \
http://www-ftp.lip6.fr/ftp/pub/lyx/stable/1.4.x/ \ ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/${MAJOR_VERSION}.x/ \
ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/1.4.x/ \ ftp://ftp.ntua.gr/pub/X11/LyX/stable/${MAJOR_VERSION}.x/ \
ftp://ftp.ntua.gr/pub/X11/LyX/stable/1.4.x/ \ http://sunsite.icm.edu.pl/pub/unix/editors/lyx/stable/${MAJOR_VERSION}.x/ \
http://sunsite.icm.edu.pl/pub/unix/editors/lyx/stable/1.4.x/ \ ftp://ftp.chg.ru/pub/X11/lyx/stable/${MAJOR_VERSION}.x/
ftp://ftp.chg.ru/pub/X11/lyx/stable/1.4.x/
MAINTAINER= mi@aldan.algebra.com MAINTAINER= aldis@bsdroot.lv
COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) (stable)
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs
OPTIONS= QT "Use Qt (instead of XForms)" ${QT_PRESENT} \ CONFLICTS= lyx-1.4*
ASPELL "Utilize ASPELL library" on \ MAJOR_VERSION= 1.6
AIKSAUR "Build Aiksaurus support (English thesaurus)" on \
ISPELL "Depend on ISPELL as well" off USE_BZIP= yes
ALL_TARGET= all check
USE_BZIP2= yes
USE_GNOME= gnometarget lthack
USE_PERL5= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes USE_GMAKE= yes
USE_QT_VER= 4
QT_COMPONENTS= gui moc_build uic_build rcc_build
USE_PYTHON= yes
USE_PERL= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
EXTRACT_AFTER_ARGS=| ${TAR} -xf - --exclude ${PORTNAME}-${PORTVERSION}/intl/*.[ch] --exclude ${PORTNAME}-${PORTVERSION}/boost CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \ CONFIGURE_ARGS= --with-frontend=qt4 \
--without-included-boost \ --without-included-boost \
--with-extra-inc="${LOCALBASE}/include" --without-included-gettext \
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ --with-libiconv-prefix=${LOCALBASE} \
AUTOHEADER="${TRUE}" --with-extra-prefix=${LOCALBASE}
MAN1= lyx.1 tex2lyx.1 lyxclient.1 MAKE_JOBS_SAFE= yes
post-patch: MAN1= lyx.1 lyxclient.1 tex2lyx.1
# Removing mention of the bundled boost
${REINPLACE_CMD} -e 's, boost/[^ ]*Makefile,,g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's,detail/nullstream,utils/nullstream,' \
${WRKSRC}/src/pch.h ${WRKSRC}/src/support/pch.h \
${WRKSRC}/src/support/debugstream.h
${REINPLACE_CMD} -e 's,boost/regex\.hpp,boost/cregex.hpp,' \
${WRKSRC}/src/support/filetools.C
${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' \
${WRKSRC}/src/support/tests/test_*
pre-configure: OPTIONS= ASPELL "Use Aspell library" on \
# If the installed Boost is 1.34 or later, we must compile AIKSAUR "Build Aiksaurus support (English thesaurus)" on \
# with exceptions enabled: NLS "Native language support" on
${AWK} '/#define BOOST_VERSION / {exit($$NF >= 103400)}' \
${LOCALBASE}/include/boost/version.hpp || \
${REINPLACE_CMD} -e 's,\(AM_CXXFLAGS="\)-fno-exceptions,\1,' \
${WRKSRC}/${CONFIGURE_SCRIPT}
post-configure: .include <bsd.port.options.mk>
# Removing explicit linking with -lc
${REINPLACE_CMD} -e 's,-lc ,,' ${WRKSRC}/*/Makefile
.include <bsd.port.pre.mk> .if !defined(WITHOUT_AIKSAUR)
.if exists(${LOCALBASE}/bin/makepsres)
PLIST_SUB+= PSRES=
.else
PLIST_SUB+= PSRES='@comment '
.endif
.if defined(WITH_AIKSAUR)
LIB_DEPENDS+= Aiksaurus:${PORTSDIR}/textproc/aiksaurus LIB_DEPENDS+= Aiksaurus:${PORTSDIR}/textproc/aiksaurus
.else .else
CONFIGURE_ARGS+=--without-aiksaurus CONFIGURE_ARGS+= --without-aiksaurus
.endif .endif
.if defined(WITH_QT) .if !defined(WITHOUT_ASPELL)
LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33
CONFIGURE_ARGS+= --with-frontend=qt
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS}
RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
.else
LIB_DEPENDS+= forms:${PORTSDIR}/x11-toolkits/xforms
CONFIGURE_ARGS+=--with-frontend=xforms
USE_XORG= x11
.endif
.if defined(WITH_ASPELL)
LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
CONFIGURE_ARGS+= --with-pspell \ CONFIGURE_ARGS+= --with-pspell \
--with-pspell-lib="${LOCALBASE}/lib" \ --with-pspell-lib="${LOCALBASE}/lib" \
--with-pspell-include="${LOCALBASE}/include" --with-pspell-include="${LOCALBASE}/include"
.else .else
CONFIGURE_ARGS+=--without-aspell --without-pspell CONFIGURE_ARGS+= --without-aspell --without-pspell
.endif .endif
.if defined(WITH_ISPELL) .if defined(WITHOUT_NLS)
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else .else
CONFIGURE_ARGS+=--without-ispell USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.endif .endif
.if exists(${LOCALBASE}/lib/libqt-mt.prl) post-install:
QT_PRESENT= on @${CAT} ${PKGMESSAGE}
.else
QT_PRESENT= off
.endif
.if ${OSVERSION} >= 700007 && ${ARCH} == i386 && ${CXX} == c++ .include <bsd.port.mk>
#BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER}
.endif
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
MD5 (lyx-1.4.5.1.tar.bz2) = b74d82e80c49c7edb782ec7395b7ca27 MD5 (lyx-1.6.6.1.tar.gz) = 5c43c3161cbec08c78f246cca5761636
SHA256 (lyx-1.4.5.1.tar.bz2) = b26a09cc29aaf77f4a4593d437b62fcf044926e481a8468ac6eb2e5ac695ca9b SHA256 (lyx-1.6.6.1.tar.gz) = e566acba82f886dc0276198c2a4a964e44845eec4e83d6fde1bd147130110d6f
SIZE (lyx-1.4.5.1.tar.bz2) = 8026585 SIZE (lyx-1.6.6.1.tar.gz) = 15698964

View file

@ -1,22 +0,0 @@
--- src/support/path.h Mon Oct 6 11:43:21 2003
+++ src/support/path.h Fri Jul 6 14:23:38 2007
@@ -55,5 +55,5 @@
// we add this macro:
///
-#ifndef PATH_C
+#if 0
#define Path(x) unnamed_Path;
#endif
--- src/client/client.C Wed Apr 12 05:37:33 2006
+++ src/client/client.C Fri Jul 6 15:47:26 2007
@@ -94,5 +94,10 @@
for (; beg != end; ++beg) {
if (prefixIs(beg->leaf(), "lyx_tmpdir" + pid)) {
+#include <boost/version.hpp>
+#if BOOST_VERSION < 103400
fs::path lyxsocket = *beg / "lyxsocket";
+#else
+ fs::path lyxsocket = beg->path() / "lyxsocket";
+#endif
if (fs::exists(lyxsocket)) {
dirlist.push_back(lyxsocket);

View file

@ -1,62 +0,0 @@
--- src/support/fs_extras.C.orig 2005-05-07 18:31:16.000000000 +0400
+++ src/support/fs_extras.C 2009-03-23 18:01:11.000000000 +0300
@@ -93,13 +93,15 @@
{
#ifdef BOOST_POSIX
+#include <boost/version.hpp>
int const infile = ::open(source.string().c_str(), O_RDONLY);
if (infile == -1) {
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
}
struct stat source_stat;
@@ -107,10 +109,11 @@
if (ret == -1) {
::close(infile);
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
}
int const flags = O_WRONLY | O_CREAT | (noclobber ? O_EXCL : O_TRUNC);
@@ -119,10 +122,11 @@
if (outfile == -1) {
::close(infile);
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
}
std::size_t const buf_sz = 32768;
@@ -149,10 +153,11 @@
if (in == -1 || out == -1)
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
#endif
#ifdef BOOST_WINDOWS
if (::CopyFile(source.string().c_str(), target.string().c_str(), noclobber) == 0) {

View file

@ -1,12 +0,0 @@
--- src/support/tests/convert.C.orig 2005-01-28 00:05:44.000000000 +0300
+++ src/support/tests/convert.C 2009-03-25 06:33:54.000000000 +0300
@@ -74,8 +74,7 @@
<< convert<string>(false) << '\n'
<< convert<string>('a') << '\n'
- << convert<string>(1.0) << '\n'
- << convert<string>(1.1) << endl;
+ << convert<string>(1.0) << endl;
}
int main()

View file

@ -1,7 +0,0 @@
--- src/support/tests/regfiles/convert.orig 2005-01-28 00:05:44.000000000 +0300
+++ src/support/tests/regfiles/convert 2009-03-25 06:34:11.000000000 +0300
@@ -46,4 +46,3 @@
false
a
1
-1.1

View file

@ -1,10 +1,26 @@
LyX is a document processor interfaced with LaTeX, which gives both the LyX is a document processor that encourages an approach to writing
ease-of-use of a wordprocessor, and the flexibility and power of based on the structure of your documents (WYSIWYM) and not simply
LaTeX. their appearance (WYSIWYG).
Quasi-WYSIWYG interface, many LaTeX styles and layouts automatically LyX combines the power and flexibility of TeX/LaTeX with the ease
generated. Speeds up learning LaTeX and makes complicated layouts of use of a graphical interface. This results in world-class support
easy and intuitive. New features include spell-checking, international for creation of mathematical content (via a fully integrated equation
character support, WYSIWYG graphics, tables, and equations. editor) and structured documents like academic articles, theses,
and books. In addition, staples of scientific authoring such as
reference list and index creation come standard. But you can also
use LyX to create a letter or a novel or a theatre play or film
script. A broad array of ready, well-designed document layouts are
built in.
WWW: http://www.lyx.org/ LyX is for people who want their writing to look great, right out
of the box. No more endless tinkering with formatting details,
"finger painting" font attributes or futzing around with page
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.
LyX is released under a Free Software/Open Source license, runs on
Linux/Unix, Windows, and Mac OS X, and is available in several
languages.
WWW: http://www.lyx.org/

6
print/lyx/pkg-message Normal file
View file

@ -0,0 +1,6 @@
For lyx to work you need to install some kind of TeX software.
The easiest way is porbably to install print/teTeX port which is quite old.
A newer alternative could be TeXLive:
http://code.google.com/p/freebsd-texlive/

File diff suppressed because it is too large Load diff

View file

@ -6,115 +6,70 @@
# #
PORTNAME= lyx PORTNAME= lyx
PORTVERSION= 1.4.5.1 PORTVERSION= ${MAJOR_VERSION}.6.1
PORTREVISION= 4 CATEGORIES= print editors
CATEGORIES= print MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/1.4.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \
http://www-ftp.lip6.fr/ftp/pub/lyx/stable/1.4.x/ \ ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/${MAJOR_VERSION}.x/ \
ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/1.4.x/ \ ftp://ftp.ntua.gr/pub/X11/LyX/stable/${MAJOR_VERSION}.x/ \
ftp://ftp.ntua.gr/pub/X11/LyX/stable/1.4.x/ \ http://sunsite.icm.edu.pl/pub/unix/editors/lyx/stable/${MAJOR_VERSION}.x/ \
http://sunsite.icm.edu.pl/pub/unix/editors/lyx/stable/1.4.x/ \ ftp://ftp.chg.ru/pub/X11/lyx/stable/${MAJOR_VERSION}.x/
ftp://ftp.chg.ru/pub/X11/lyx/stable/1.4.x/
MAINTAINER= mi@aldan.algebra.com MAINTAINER= aldis@bsdroot.lv
COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) (stable)
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs
OPTIONS= QT "Use Qt (instead of XForms)" ${QT_PRESENT} \ CONFLICTS= lyx-1.4*
ASPELL "Utilize ASPELL library" on \ MAJOR_VERSION= 1.6
AIKSAUR "Build Aiksaurus support (English thesaurus)" on \
ISPELL "Depend on ISPELL as well" off USE_BZIP= yes
ALL_TARGET= all check
USE_BZIP2= yes
USE_GNOME= gnometarget lthack
USE_PERL5= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes USE_GMAKE= yes
USE_QT_VER= 4
QT_COMPONENTS= gui moc_build uic_build rcc_build
USE_PYTHON= yes
USE_PERL= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
EXTRACT_AFTER_ARGS=| ${TAR} -xf - --exclude ${PORTNAME}-${PORTVERSION}/intl/*.[ch] --exclude ${PORTNAME}-${PORTVERSION}/boost CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \ CONFIGURE_ARGS= --with-frontend=qt4 \
--without-included-boost \ --without-included-boost \
--with-extra-inc="${LOCALBASE}/include" --without-included-gettext \
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ --with-libiconv-prefix=${LOCALBASE} \
AUTOHEADER="${TRUE}" --with-extra-prefix=${LOCALBASE}
MAN1= lyx.1 tex2lyx.1 lyxclient.1 MAKE_JOBS_SAFE= yes
post-patch: MAN1= lyx.1 lyxclient.1 tex2lyx.1
# Removing mention of the bundled boost
${REINPLACE_CMD} -e 's, boost/[^ ]*Makefile,,g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's,detail/nullstream,utils/nullstream,' \
${WRKSRC}/src/pch.h ${WRKSRC}/src/support/pch.h \
${WRKSRC}/src/support/debugstream.h
${REINPLACE_CMD} -e 's,boost/regex\.hpp,boost/cregex.hpp,' \
${WRKSRC}/src/support/filetools.C
${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' \
${WRKSRC}/src/support/tests/test_*
pre-configure: OPTIONS= ASPELL "Use Aspell library" on \
# If the installed Boost is 1.34 or later, we must compile AIKSAUR "Build Aiksaurus support (English thesaurus)" on \
# with exceptions enabled: NLS "Native language support" on
${AWK} '/#define BOOST_VERSION / {exit($$NF >= 103400)}' \
${LOCALBASE}/include/boost/version.hpp || \
${REINPLACE_CMD} -e 's,\(AM_CXXFLAGS="\)-fno-exceptions,\1,' \
${WRKSRC}/${CONFIGURE_SCRIPT}
post-configure: .include <bsd.port.options.mk>
# Removing explicit linking with -lc
${REINPLACE_CMD} -e 's,-lc ,,' ${WRKSRC}/*/Makefile
.include <bsd.port.pre.mk> .if !defined(WITHOUT_AIKSAUR)
.if exists(${LOCALBASE}/bin/makepsres)
PLIST_SUB+= PSRES=
.else
PLIST_SUB+= PSRES='@comment '
.endif
.if defined(WITH_AIKSAUR)
LIB_DEPENDS+= Aiksaurus:${PORTSDIR}/textproc/aiksaurus LIB_DEPENDS+= Aiksaurus:${PORTSDIR}/textproc/aiksaurus
.else .else
CONFIGURE_ARGS+=--without-aiksaurus CONFIGURE_ARGS+= --without-aiksaurus
.endif .endif
.if defined(WITH_QT) .if !defined(WITHOUT_ASPELL)
LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33
CONFIGURE_ARGS+= --with-frontend=qt
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS}
RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
.else
LIB_DEPENDS+= forms:${PORTSDIR}/x11-toolkits/xforms
CONFIGURE_ARGS+=--with-frontend=xforms
USE_XORG= x11
.endif
.if defined(WITH_ASPELL)
LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
CONFIGURE_ARGS+= --with-pspell \ CONFIGURE_ARGS+= --with-pspell \
--with-pspell-lib="${LOCALBASE}/lib" \ --with-pspell-lib="${LOCALBASE}/lib" \
--with-pspell-include="${LOCALBASE}/include" --with-pspell-include="${LOCALBASE}/include"
.else .else
CONFIGURE_ARGS+=--without-aspell --without-pspell CONFIGURE_ARGS+= --without-aspell --without-pspell
.endif .endif
.if defined(WITH_ISPELL) .if defined(WITHOUT_NLS)
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else .else
CONFIGURE_ARGS+=--without-ispell USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.endif .endif
.if exists(${LOCALBASE}/lib/libqt-mt.prl) post-install:
QT_PRESENT= on @${CAT} ${PKGMESSAGE}
.else
QT_PRESENT= off
.endif
.if ${OSVERSION} >= 700007 && ${ARCH} == i386 && ${CXX} == c++ .include <bsd.port.mk>
#BROKEN= C++ compiler seg-faults, try using a different one and report to ${MAINTAINER}
.endif
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
MD5 (lyx-1.4.5.1.tar.bz2) = b74d82e80c49c7edb782ec7395b7ca27 MD5 (lyx-1.6.6.1.tar.gz) = 5c43c3161cbec08c78f246cca5761636
SHA256 (lyx-1.4.5.1.tar.bz2) = b26a09cc29aaf77f4a4593d437b62fcf044926e481a8468ac6eb2e5ac695ca9b SHA256 (lyx-1.6.6.1.tar.gz) = e566acba82f886dc0276198c2a4a964e44845eec4e83d6fde1bd147130110d6f
SIZE (lyx-1.4.5.1.tar.bz2) = 8026585 SIZE (lyx-1.6.6.1.tar.gz) = 15698964

View file

@ -1,22 +0,0 @@
--- src/support/path.h Mon Oct 6 11:43:21 2003
+++ src/support/path.h Fri Jul 6 14:23:38 2007
@@ -55,5 +55,5 @@
// we add this macro:
///
-#ifndef PATH_C
+#if 0
#define Path(x) unnamed_Path;
#endif
--- src/client/client.C Wed Apr 12 05:37:33 2006
+++ src/client/client.C Fri Jul 6 15:47:26 2007
@@ -94,5 +94,10 @@
for (; beg != end; ++beg) {
if (prefixIs(beg->leaf(), "lyx_tmpdir" + pid)) {
+#include <boost/version.hpp>
+#if BOOST_VERSION < 103400
fs::path lyxsocket = *beg / "lyxsocket";
+#else
+ fs::path lyxsocket = beg->path() / "lyxsocket";
+#endif
if (fs::exists(lyxsocket)) {
dirlist.push_back(lyxsocket);

View file

@ -1,62 +0,0 @@
--- src/support/fs_extras.C.orig 2005-05-07 18:31:16.000000000 +0400
+++ src/support/fs_extras.C 2009-03-23 18:01:11.000000000 +0300
@@ -93,13 +93,15 @@
{
#ifdef BOOST_POSIX
+#include <boost/version.hpp>
int const infile = ::open(source.string().c_str(), O_RDONLY);
if (infile == -1) {
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
}
struct stat source_stat;
@@ -107,10 +109,11 @@
if (ret == -1) {
::close(infile);
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
}
int const flags = O_WRONLY | O_CREAT | (noclobber ? O_EXCL : O_TRUNC);
@@ -119,10 +122,11 @@
if (outfile == -1) {
::close(infile);
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
}
std::size_t const buf_sz = 32768;
@@ -149,10 +153,11 @@
if (in == -1 || out == -1)
boost::throw_exception(
- filesystem_error(
+ basic_filesystem_error<path>(
"boost::filesystem::copy_file",
source, target,
- fs::detail::system_error_code()));
+ boost::system::error_code(errno, boost::system::get_system_category()))
+ );
#endif
#ifdef BOOST_WINDOWS
if (::CopyFile(source.string().c_str(), target.string().c_str(), noclobber) == 0) {

View file

@ -1,12 +0,0 @@
--- src/support/tests/convert.C.orig 2005-01-28 00:05:44.000000000 +0300
+++ src/support/tests/convert.C 2009-03-25 06:33:54.000000000 +0300
@@ -74,8 +74,7 @@
<< convert<string>(false) << '\n'
<< convert<string>('a') << '\n'
- << convert<string>(1.0) << '\n'
- << convert<string>(1.1) << endl;
+ << convert<string>(1.0) << endl;
}
int main()

View file

@ -1,7 +0,0 @@
--- src/support/tests/regfiles/convert.orig 2005-01-28 00:05:44.000000000 +0300
+++ src/support/tests/regfiles/convert 2009-03-25 06:34:11.000000000 +0300
@@ -46,4 +46,3 @@
false
a
1
-1.1

View file

@ -1,10 +1,26 @@
LyX is a document processor interfaced with LaTeX, which gives both the LyX is a document processor that encourages an approach to writing
ease-of-use of a wordprocessor, and the flexibility and power of based on the structure of your documents (WYSIWYM) and not simply
LaTeX. their appearance (WYSIWYG).
Quasi-WYSIWYG interface, many LaTeX styles and layouts automatically LyX combines the power and flexibility of TeX/LaTeX with the ease
generated. Speeds up learning LaTeX and makes complicated layouts of use of a graphical interface. This results in world-class support
easy and intuitive. New features include spell-checking, international for creation of mathematical content (via a fully integrated equation
character support, WYSIWYG graphics, tables, and equations. editor) and structured documents like academic articles, theses,
and books. In addition, staples of scientific authoring such as
reference list and index creation come standard. But you can also
use LyX to create a letter or a novel or a theatre play or film
script. A broad array of ready, well-designed document layouts are
built in.
WWW: http://www.lyx.org/ LyX is for people who want their writing to look great, right out
of the box. No more endless tinkering with formatting details,
"finger painting" font attributes or futzing around with page
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.
LyX is released under a Free Software/Open Source license, runs on
Linux/Unix, Windows, and Mac OS X, and is available in several
languages.
WWW: http://www.lyx.org/

6
print/lyx16/pkg-message Normal file
View file

@ -0,0 +1,6 @@
For lyx to work you need to install some kind of TeX software.
The easiest way is porbably to install print/teTeX port which is quite old.
A newer alternative could be TeXLive:
http://code.google.com/p/freebsd-texlive/

File diff suppressed because it is too large Load diff