mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-24 00:45:52 +00:00
upgrade to 1.2.1
PR: 42742 Submitted by: Ports Fury
This commit is contained in:
Ying-Chieh Liao
parent
8be92a2e06
commit
8640cd64e2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=66780
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= lyx
|
||||
PORTVERSION= 1.2.0
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.2.1
|
||||
CATEGORIES= print
|
||||
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
|
||||
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
|
||||
@ -19,11 +18,23 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||
latex:${PORTSDIR}/print/teTeX
|
||||
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
|
||||
forms.1:${PORTSDIR}/x11-toolkits/xforms
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS}
|
||||
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||
latex:${PORTSDIR}/print/teTeX
|
||||
|
||||
USE_XPM= yes
|
||||
USE_REINPLACE= yes
|
||||
USE_PERL5= yes
|
||||
USE_GMAKE= yes
|
||||
USE_AUTOMAKE_VER= 15
|
||||
AUTOMAKE= ${WRKSRC}/autogen.sh
|
||||
AUTOCONF= ${TRUE}
|
||||
CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
|
||||
--with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
|
||||
MAN1= lyx.1 reLyX.1
|
||||
|
||||
.if defined(WITH_ASPELL)
|
||||
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
||||
CONFIGURE_ARGS+=--with-pspell
|
||||
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
||||
CONFIGURE_ARGS+= --with-pspell
|
||||
.endif
|
||||
|
||||
.if defined(WITH_ISPELL)
|
||||
@ -31,34 +42,26 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
.if !defined(WITH_ASPELL) && !defined(WITH_ISPELL)
|
||||
#
|
||||
# If you want to compile with Aspell/Pspell or Ispell support,
|
||||
# hit Ctrl-C right now and use
|
||||
# "make WITH_ASPELL=yes"
|
||||
# or
|
||||
# "make WITH_ISPELL=yes"
|
||||
#
|
||||
.if !defined(WITH_ASPELL)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "If you want to compile with Aspell/Pspell support,"
|
||||
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ASPELL=yes\""
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
USE_GMAKE= yes
|
||||
USE_XPM= yes
|
||||
USE_REINPLACE= yes
|
||||
REINPLACE_ARGS= -i ""
|
||||
USE_PERL5= yes
|
||||
USE_AUTOMAKE_VER=15
|
||||
AUTOMAKE= ${WRKSRC}/autogen.sh
|
||||
AUTOCONF= ${TRUE}
|
||||
CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
|
||||
--with-extra-inc="${X11BASE}/include/X11 ${X11BASE}/include \
|
||||
${LOCALBASE}/include"
|
||||
CONFIGURE_ENV+= LDFLAGS="-L${X11BASE}/lib -lXpm -lX11"
|
||||
MAN1= lyx.1 reLyX.1
|
||||
.if !defined(WITH_ISPELL)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "If you want to compile with Ispell support,"
|
||||
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ISPELL=yes\""
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
|
||||
|
||||
post-patch:
|
||||
@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} \
|
||||
-e 's|-lxforms|-lforms|g' \
|
||||
-e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g' \
|
||||
-e 's|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
|
||||
@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
|
||||
's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
|
||||
s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (lyx-1.2.0.tar.gz) = cc7592d311f3dfd2db01f9ca5e506fb6
|
||||
MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
Report, which font is missing to aid the user trying to configure things.
|
||||
--- src/FontLoader.C Thu Mar 21 12:25:07 2002
|
||||
+++ src/FontLoader.C Thu Aug 1 10:44:19 2002
|
||||
@@ -302,3 +302,4 @@
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
@ -1,7 +0,0 @@
|
||||
--- src/sp_spell.C Thu Mar 21 12:25:20 2002
|
||||
+++ src/sp_spell.C Wed Jul 31 18:49:57 2002
|
||||
@@ -371,3 +371,3 @@
|
||||
retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
|
||||
- SELECT_TYPE_ARG234 (&infds),
|
||||
+ &infds,
|
||||
0,
|
||||
12
print/lyx-devel/files/patch-src::FontLoader.C
Normal file
12
print/lyx-devel/files/patch-src::FontLoader.C
Normal file
@ -0,0 +1,12 @@
|
||||
--- src/FontLoader.C.orig Fri Mar 22 02:25:07 2002
|
||||
+++ src/FontLoader.C Fri Aug 23 03:38:09 2002
|
||||
@@ -300,7 +300,8 @@
|
||||
if (font == "fixed") {
|
||||
lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
}
|
||||
} else if (lyxerr.debugging(Debug::FONT)) {
|
||||
11
print/lyx-devel/files/patch-src::sp_spell.C
Normal file
11
print/lyx-devel/files/patch-src::sp_spell.C
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/sp_spell.C.orig Mon Aug 12 19:25:50 2002
|
||||
+++ src/sp_spell.C Fri Aug 23 03:38:09 2002
|
||||
@@ -379,7 +379,7 @@
|
||||
// Configure provides us with macros which are supposed to do
|
||||
// the right typecast.
|
||||
retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
|
||||
- SELECT_TYPE_ARG234 (&infds),
|
||||
+ &infds,
|
||||
0,
|
||||
0,
|
||||
SELECT_TYPE_ARG5 (&tv));
|
||||
@ -1,13 +0,0 @@
|
||||
--- src/frontends/xforms/GUIRunTime.C Thu Mar 21 16:18:03 2002
|
||||
+++ src/frontends/xforms/GUIRunTime.C Wed Jul 31 18:39:04 2002
|
||||
@@ -26,10 +26,2 @@
|
||||
|
||||
-// I keep these here so that it will be processed as early in
|
||||
-// the compilation process as possible.
|
||||
-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
|
||||
-#error LyX will not compile with this version of XForms.\
|
||||
- Please get version 0.89.\
|
||||
- If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
|
||||
-#endif
|
||||
-
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
--- src/graphics/GraphicsImageXPM.h Thu Mar 21 12:27:08 2002
|
||||
+++ src/graphics/GraphicsImageXPM.h Wed Jul 31 18:08:13 2002
|
||||
@@ -17,3 +17,3 @@
|
||||
#include "GraphicsImage.h"
|
||||
-#include XPM_H_LOCATION
|
||||
+#include <X11/xpm.h>
|
||||
#include "support/smart_ptr.h"
|
||||
98
print/lyx-devel/files/xforms.m4
Normal file
98
print/lyx-devel/files/xforms.m4
Normal file
@ -0,0 +1,98 @@
|
||||
dnl some macros to test for xforms-related functionality -*- sh -*-
|
||||
|
||||
dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
|
||||
dnl If it is found, the variable XFORMS_LIB is set to the relevant -l flags,
|
||||
dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
AC_REQUIRE([LYX_PATH_XPM])
|
||||
|
||||
AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
|
||||
[AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
|
||||
[LYX_LIB_ERROR(libforms or libxforms,xforms)], $XPM_LIB)], $XPM_LIB)
|
||||
AC_SUBST(XFORMS_LIB)
|
||||
|
||||
### Check for xforms headers
|
||||
lyx_cv_forms_h_location="<forms.h>"
|
||||
AC_CHECK_HEADER(X11/forms.h,[
|
||||
ac_cv_header_forms_h=yes
|
||||
lyx_cv_forms_h_location="<X11/forms.h>"],[
|
||||
AC_CHECK_HEADER(forms.h,[],[
|
||||
LYX_LIB_ERROR(forms.h,forms)])])
|
||||
AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location,
|
||||
[define this to the location of forms.h to be used with #include, e.g. <forms.h>])
|
||||
|
||||
if test $ac_cv_header_forms_h = yes; then
|
||||
AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
|
||||
[ cat > conftest.$ac_ext <<EOF
|
||||
#line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include FORMS_H_LOCATION
|
||||
#if ! defined(FL_INCLUDE_VERSION)
|
||||
"%%%"(unknown)"%%%"
|
||||
#else
|
||||
"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
|
||||
#endif
|
||||
EOF
|
||||
lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
|
||||
grep '^"%%%"' 2>/dev/null | \
|
||||
sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
|
||||
rm -f conftest*])
|
||||
|
||||
XFORMS_VERSION=$lyx_cv_xfversion
|
||||
case "$lyx_cv_xfversion" in
|
||||
"(unknown)"|0.8[1-7]*)
|
||||
LYX_ERROR(dnl
|
||||
Version $lyx_cv_xfversion of xforms is not compatible with LyX.
|
||||
This version of LyX works best with versions 0.88 (recommended) and later.) ;;
|
||||
0.88*) ;;
|
||||
0.89[01234]) LYX_WARNING(dnl
|
||||
LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
|
||||
it is an unproven version and might still have some bugs. You should
|
||||
probably use version 0.89.6 (or 0.88) instead) ;;
|
||||
0.89*) ;;
|
||||
0.9999*) ;;
|
||||
1.0*) ;;
|
||||
*) LYX_WARNING(dnl
|
||||
Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
|
||||
since it is newer than 0.89. You might have slight problems with it.);;
|
||||
esac
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[AC_REQUIRE([LYX_PATH_XFORMS])
|
||||
save_LIBS=$LIBS
|
||||
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_read_header,
|
||||
[XFORMS_IMAGE_LIB=-ljpeg
|
||||
LIBS="$LIBS -ljpeg"])
|
||||
AC_SEARCH_LIBS(flimage_dup, flimage,
|
||||
[lyx_use_xforms_image_loader=yes
|
||||
if test "$ac_cv_search_flimage_dup" != "none required" ; then
|
||||
XFORMS_IMAGE_LIB="-lflimage $XFORMS_IMAGE_LIB"
|
||||
LIBS="$XFORMS_IMAGE_LIB $LIBS"
|
||||
fi])
|
||||
AC_SUBST(XFORMS_IMAGE_LIB)
|
||||
|
||||
if test $lyx_use_xforms_image_loader = yes ; then
|
||||
lyx_flags="$lyx_flags xforms-image-loader"
|
||||
AC_DEFINE(USE_XFORMS_IMAGE_LOADER, 1,
|
||||
[Define if you want to use xforms built-in image loader])
|
||||
AC_CHECK_FUNCS(flimage_enable_ps flimage_enable_jpeg)
|
||||
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
|
||||
fi
|
||||
|
||||
### If the gui cannot load images itself, then we default to the
|
||||
### very simple one in graphics/GraphicsImageXPM.[Ch]
|
||||
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
|
||||
test $lyx_use_xforms_image_loader = no)
|
||||
AC_LANG_RESTORE
|
||||
LIBS=$save_LIBS])
|
||||
@ -27,9 +27,11 @@ share/locale/wa/LC_MESSAGES/lyx.mo
|
||||
share/lyx/CREDITS
|
||||
share/lyx/bind/broadway.bind
|
||||
share/lyx/bind/cua.bind
|
||||
share/lyx/bind/cyrkeys.bind
|
||||
share/lyx/bind/de_menus.bind
|
||||
share/lyx/bind/emacs.bind
|
||||
share/lyx/bind/fi_menus.bind
|
||||
share/lyx/bind/greekkeys.bind
|
||||
share/lyx/bind/hollywood.bind
|
||||
share/lyx/bind/latinkeys.bind
|
||||
share/lyx/bind/math.bind
|
||||
@ -79,6 +81,8 @@ share/lyx/doc/fr_Intro.lyx
|
||||
share/lyx/doc/fr_TOC.lyx
|
||||
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/hu_Intro.lyx
|
||||
share/lyx/doc/hu_TOC.lyx
|
||||
share/lyx/doc/it_Customization.lyx
|
||||
@ -142,12 +146,14 @@ share/lyx/examples/eu_splash.lyx
|
||||
share/lyx/examples/example_lyxified.lyx
|
||||
share/lyx/examples/example_raw.lyx
|
||||
share/lyx/examples/fr_AlignementDecimal.lyx
|
||||
share/lyx/examples/fr_CV.lyx
|
||||
share/lyx/examples/fr_ExemplesTableaux.lyx
|
||||
share/lyx/examples/fr_ListesPuces.lyx
|
||||
share/lyx/examples/fr_Minipage.lyx
|
||||
share/lyx/examples/fr_MultiColonnes.lyx
|
||||
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/hu_splash.lyx
|
||||
share/lyx/examples/iecc05.fen
|
||||
@ -182,6 +188,7 @@ share/lyx/images/banner.xpm
|
||||
share/lyx/images/buffer-close.xpm
|
||||
share/lyx/images/buffer-export_ascii.xpm
|
||||
share/lyx/images/buffer-export_latex.xpm
|
||||
share/lyx/images/buffer-new.xpm
|
||||
share/lyx/images/buffer-print.xpm
|
||||
share/lyx/images/buffer-update_dvi.xpm
|
||||
share/lyx/images/buffer-update_ps.xpm
|
||||
@ -233,6 +240,7 @@ share/lyx/kbd/arabic.kmap
|
||||
share/lyx/kbd/bg-bds-1251.kmap
|
||||
share/lyx/kbd/brazil.kmap
|
||||
share/lyx/kbd/brazil2.kmap
|
||||
share/lyx/kbd/cp1251.cdef
|
||||
share/lyx/kbd/czech-prg.kmap
|
||||
share/lyx/kbd/czech.kmap
|
||||
share/lyx/kbd/european.kmap
|
||||
@ -243,6 +251,7 @@ share/lyx/kbd/german-3.kmap
|
||||
share/lyx/kbd/german.kmap
|
||||
share/lyx/kbd/greek.kmap
|
||||
share/lyx/kbd/hebrew.kmap
|
||||
share/lyx/kbd/ibm866.cdef
|
||||
share/lyx/kbd/iso8859-1.cdef
|
||||
share/lyx/kbd/iso8859-15.cdef
|
||||
share/lyx/kbd/iso8859-2.cdef
|
||||
@ -251,7 +260,10 @@ share/lyx/kbd/iso8859-4.cdef
|
||||
share/lyx/kbd/iso8859-7.cdef
|
||||
share/lyx/kbd/iso8859-8.cdef
|
||||
share/lyx/kbd/iso8859-9.cdef
|
||||
share/lyx/kbd/koi8-r.cdef
|
||||
share/lyx/kbd/koi8-r.kmap
|
||||
share/lyx/kbd/koi8-t.cdef
|
||||
share/lyx/kbd/koi8-u.cdef
|
||||
share/lyx/kbd/koi8-u.kmap
|
||||
share/lyx/kbd/latvian.kmap
|
||||
share/lyx/kbd/magyar-2.kmap
|
||||
@ -291,6 +303,7 @@ share/lyx/layouts/article.layout
|
||||
share/lyx/layouts/book.layout
|
||||
share/lyx/layouts/broadway.layout
|
||||
share/lyx/layouts/chess.layout
|
||||
share/lyx/layouts/cl2emult.layout
|
||||
share/lyx/layouts/cv.layout
|
||||
share/lyx/layouts/db_lyxmacros.inc
|
||||
share/lyx/layouts/db_stdclass.inc
|
||||
@ -318,7 +331,6 @@ 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/iletter.layout
|
||||
share/lyx/layouts/kluwer.layout
|
||||
share/lyx/layouts/latex8.layout
|
||||
share/lyx/layouts/letter.layout
|
||||
@ -392,7 +404,6 @@ 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/iletter.lyx
|
||||
share/lyx/templates/kluwer.lyx
|
||||
share/lyx/templates/latex8.lyx
|
||||
share/lyx/templates/letter.lyx
|
||||
@ -403,7 +414,6 @@ share/lyx/templates/slides.lyx
|
||||
share/lyx/tex/broadway.cls
|
||||
share/lyx/tex/cv.cls
|
||||
share/lyx/tex/hollywood.cls
|
||||
share/lyx/tex/iletter.cls
|
||||
share/lyx/tex/lyxchess.sty
|
||||
share/lyx/tex/lyxskak.sty
|
||||
share/lyx/tex/revtex.cls
|
||||
|
||||
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= lyx
|
||||
PORTVERSION= 1.2.0
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.2.1
|
||||
CATEGORIES= print
|
||||
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
|
||||
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
|
||||
@ -19,11 +18,23 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||
latex:${PORTSDIR}/print/teTeX
|
||||
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
|
||||
forms.1:${PORTSDIR}/x11-toolkits/xforms
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS}
|
||||
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||
latex:${PORTSDIR}/print/teTeX
|
||||
|
||||
USE_XPM= yes
|
||||
USE_REINPLACE= yes
|
||||
USE_PERL5= yes
|
||||
USE_GMAKE= yes
|
||||
USE_AUTOMAKE_VER= 15
|
||||
AUTOMAKE= ${WRKSRC}/autogen.sh
|
||||
AUTOCONF= ${TRUE}
|
||||
CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
|
||||
--with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
|
||||
MAN1= lyx.1 reLyX.1
|
||||
|
||||
.if defined(WITH_ASPELL)
|
||||
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
||||
CONFIGURE_ARGS+=--with-pspell
|
||||
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
||||
CONFIGURE_ARGS+= --with-pspell
|
||||
.endif
|
||||
|
||||
.if defined(WITH_ISPELL)
|
||||
@ -31,34 +42,26 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
.if !defined(WITH_ASPELL) && !defined(WITH_ISPELL)
|
||||
#
|
||||
# If you want to compile with Aspell/Pspell or Ispell support,
|
||||
# hit Ctrl-C right now and use
|
||||
# "make WITH_ASPELL=yes"
|
||||
# or
|
||||
# "make WITH_ISPELL=yes"
|
||||
#
|
||||
.if !defined(WITH_ASPELL)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "If you want to compile with Aspell/Pspell support,"
|
||||
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ASPELL=yes\""
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
USE_GMAKE= yes
|
||||
USE_XPM= yes
|
||||
USE_REINPLACE= yes
|
||||
REINPLACE_ARGS= -i ""
|
||||
USE_PERL5= yes
|
||||
USE_AUTOMAKE_VER=15
|
||||
AUTOMAKE= ${WRKSRC}/autogen.sh
|
||||
AUTOCONF= ${TRUE}
|
||||
CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
|
||||
--with-extra-inc="${X11BASE}/include/X11 ${X11BASE}/include \
|
||||
${LOCALBASE}/include"
|
||||
CONFIGURE_ENV+= LDFLAGS="-L${X11BASE}/lib -lXpm -lX11"
|
||||
MAN1= lyx.1 reLyX.1
|
||||
.if !defined(WITH_ISPELL)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "If you want to compile with Ispell support,"
|
||||
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ISPELL=yes\""
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
|
||||
|
||||
post-patch:
|
||||
@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} \
|
||||
-e 's|-lxforms|-lforms|g' \
|
||||
-e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g' \
|
||||
-e 's|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
|
||||
@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
|
||||
's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
|
||||
s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (lyx-1.2.0.tar.gz) = cc7592d311f3dfd2db01f9ca5e506fb6
|
||||
MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
Report, which font is missing to aid the user trying to configure things.
|
||||
--- src/FontLoader.C Thu Mar 21 12:25:07 2002
|
||||
+++ src/FontLoader.C Thu Aug 1 10:44:19 2002
|
||||
@@ -302,3 +302,4 @@
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
@ -1,7 +0,0 @@
|
||||
--- src/sp_spell.C Thu Mar 21 12:25:20 2002
|
||||
+++ src/sp_spell.C Wed Jul 31 18:49:57 2002
|
||||
@@ -371,3 +371,3 @@
|
||||
retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
|
||||
- SELECT_TYPE_ARG234 (&infds),
|
||||
+ &infds,
|
||||
0,
|
||||
12
print/lyx/files/patch-src::FontLoader.C
Normal file
12
print/lyx/files/patch-src::FontLoader.C
Normal file
@ -0,0 +1,12 @@
|
||||
--- src/FontLoader.C.orig Fri Mar 22 02:25:07 2002
|
||||
+++ src/FontLoader.C Fri Aug 23 03:38:09 2002
|
||||
@@ -300,7 +300,8 @@
|
||||
if (font == "fixed") {
|
||||
lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
}
|
||||
} else if (lyxerr.debugging(Debug::FONT)) {
|
||||
11
print/lyx/files/patch-src::sp_spell.C
Normal file
11
print/lyx/files/patch-src::sp_spell.C
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/sp_spell.C.orig Mon Aug 12 19:25:50 2002
|
||||
+++ src/sp_spell.C Fri Aug 23 03:38:09 2002
|
||||
@@ -379,7 +379,7 @@
|
||||
// Configure provides us with macros which are supposed to do
|
||||
// the right typecast.
|
||||
retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
|
||||
- SELECT_TYPE_ARG234 (&infds),
|
||||
+ &infds,
|
||||
0,
|
||||
0,
|
||||
SELECT_TYPE_ARG5 (&tv));
|
||||
@ -1,13 +0,0 @@
|
||||
--- src/frontends/xforms/GUIRunTime.C Thu Mar 21 16:18:03 2002
|
||||
+++ src/frontends/xforms/GUIRunTime.C Wed Jul 31 18:39:04 2002
|
||||
@@ -26,10 +26,2 @@
|
||||
|
||||
-// I keep these here so that it will be processed as early in
|
||||
-// the compilation process as possible.
|
||||
-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
|
||||
-#error LyX will not compile with this version of XForms.\
|
||||
- Please get version 0.89.\
|
||||
- If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
|
||||
-#endif
|
||||
-
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
--- src/graphics/GraphicsImageXPM.h Thu Mar 21 12:27:08 2002
|
||||
+++ src/graphics/GraphicsImageXPM.h Wed Jul 31 18:08:13 2002
|
||||
@@ -17,3 +17,3 @@
|
||||
#include "GraphicsImage.h"
|
||||
-#include XPM_H_LOCATION
|
||||
+#include <X11/xpm.h>
|
||||
#include "support/smart_ptr.h"
|
||||
98
print/lyx/files/xforms.m4
Normal file
98
print/lyx/files/xforms.m4
Normal file
@ -0,0 +1,98 @@
|
||||
dnl some macros to test for xforms-related functionality -*- sh -*-
|
||||
|
||||
dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
|
||||
dnl If it is found, the variable XFORMS_LIB is set to the relevant -l flags,
|
||||
dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
AC_REQUIRE([LYX_PATH_XPM])
|
||||
|
||||
AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
|
||||
[AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
|
||||
[LYX_LIB_ERROR(libforms or libxforms,xforms)], $XPM_LIB)], $XPM_LIB)
|
||||
AC_SUBST(XFORMS_LIB)
|
||||
|
||||
### Check for xforms headers
|
||||
lyx_cv_forms_h_location="<forms.h>"
|
||||
AC_CHECK_HEADER(X11/forms.h,[
|
||||
ac_cv_header_forms_h=yes
|
||||
lyx_cv_forms_h_location="<X11/forms.h>"],[
|
||||
AC_CHECK_HEADER(forms.h,[],[
|
||||
LYX_LIB_ERROR(forms.h,forms)])])
|
||||
AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location,
|
||||
[define this to the location of forms.h to be used with #include, e.g. <forms.h>])
|
||||
|
||||
if test $ac_cv_header_forms_h = yes; then
|
||||
AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
|
||||
[ cat > conftest.$ac_ext <<EOF
|
||||
#line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include FORMS_H_LOCATION
|
||||
#if ! defined(FL_INCLUDE_VERSION)
|
||||
"%%%"(unknown)"%%%"
|
||||
#else
|
||||
"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
|
||||
#endif
|
||||
EOF
|
||||
lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
|
||||
grep '^"%%%"' 2>/dev/null | \
|
||||
sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
|
||||
rm -f conftest*])
|
||||
|
||||
XFORMS_VERSION=$lyx_cv_xfversion
|
||||
case "$lyx_cv_xfversion" in
|
||||
"(unknown)"|0.8[1-7]*)
|
||||
LYX_ERROR(dnl
|
||||
Version $lyx_cv_xfversion of xforms is not compatible with LyX.
|
||||
This version of LyX works best with versions 0.88 (recommended) and later.) ;;
|
||||
0.88*) ;;
|
||||
0.89[01234]) LYX_WARNING(dnl
|
||||
LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
|
||||
it is an unproven version and might still have some bugs. You should
|
||||
probably use version 0.89.6 (or 0.88) instead) ;;
|
||||
0.89*) ;;
|
||||
0.9999*) ;;
|
||||
1.0*) ;;
|
||||
*) LYX_WARNING(dnl
|
||||
Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
|
||||
since it is newer than 0.89. You might have slight problems with it.);;
|
||||
esac
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[AC_REQUIRE([LYX_PATH_XFORMS])
|
||||
save_LIBS=$LIBS
|
||||
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_read_header,
|
||||
[XFORMS_IMAGE_LIB=-ljpeg
|
||||
LIBS="$LIBS -ljpeg"])
|
||||
AC_SEARCH_LIBS(flimage_dup, flimage,
|
||||
[lyx_use_xforms_image_loader=yes
|
||||
if test "$ac_cv_search_flimage_dup" != "none required" ; then
|
||||
XFORMS_IMAGE_LIB="-lflimage $XFORMS_IMAGE_LIB"
|
||||
LIBS="$XFORMS_IMAGE_LIB $LIBS"
|
||||
fi])
|
||||
AC_SUBST(XFORMS_IMAGE_LIB)
|
||||
|
||||
if test $lyx_use_xforms_image_loader = yes ; then
|
||||
lyx_flags="$lyx_flags xforms-image-loader"
|
||||
AC_DEFINE(USE_XFORMS_IMAGE_LOADER, 1,
|
||||
[Define if you want to use xforms built-in image loader])
|
||||
AC_CHECK_FUNCS(flimage_enable_ps flimage_enable_jpeg)
|
||||
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
|
||||
fi
|
||||
|
||||
### If the gui cannot load images itself, then we default to the
|
||||
### very simple one in graphics/GraphicsImageXPM.[Ch]
|
||||
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
|
||||
test $lyx_use_xforms_image_loader = no)
|
||||
AC_LANG_RESTORE
|
||||
LIBS=$save_LIBS])
|
||||
@ -27,9 +27,11 @@ share/locale/wa/LC_MESSAGES/lyx.mo
|
||||
share/lyx/CREDITS
|
||||
share/lyx/bind/broadway.bind
|
||||
share/lyx/bind/cua.bind
|
||||
share/lyx/bind/cyrkeys.bind
|
||||
share/lyx/bind/de_menus.bind
|
||||
share/lyx/bind/emacs.bind
|
||||
share/lyx/bind/fi_menus.bind
|
||||
share/lyx/bind/greekkeys.bind
|
||||
share/lyx/bind/hollywood.bind
|
||||
share/lyx/bind/latinkeys.bind
|
||||
share/lyx/bind/math.bind
|
||||
@ -79,6 +81,8 @@ share/lyx/doc/fr_Intro.lyx
|
||||
share/lyx/doc/fr_TOC.lyx
|
||||
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/hu_Intro.lyx
|
||||
share/lyx/doc/hu_TOC.lyx
|
||||
share/lyx/doc/it_Customization.lyx
|
||||
@ -142,12 +146,14 @@ share/lyx/examples/eu_splash.lyx
|
||||
share/lyx/examples/example_lyxified.lyx
|
||||
share/lyx/examples/example_raw.lyx
|
||||
share/lyx/examples/fr_AlignementDecimal.lyx
|
||||
share/lyx/examples/fr_CV.lyx
|
||||
share/lyx/examples/fr_ExemplesTableaux.lyx
|
||||
share/lyx/examples/fr_ListesPuces.lyx
|
||||
share/lyx/examples/fr_Minipage.lyx
|
||||
share/lyx/examples/fr_MultiColonnes.lyx
|
||||
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/hu_splash.lyx
|
||||
share/lyx/examples/iecc05.fen
|
||||
@ -182,6 +188,7 @@ share/lyx/images/banner.xpm
|
||||
share/lyx/images/buffer-close.xpm
|
||||
share/lyx/images/buffer-export_ascii.xpm
|
||||
share/lyx/images/buffer-export_latex.xpm
|
||||
share/lyx/images/buffer-new.xpm
|
||||
share/lyx/images/buffer-print.xpm
|
||||
share/lyx/images/buffer-update_dvi.xpm
|
||||
share/lyx/images/buffer-update_ps.xpm
|
||||
@ -233,6 +240,7 @@ share/lyx/kbd/arabic.kmap
|
||||
share/lyx/kbd/bg-bds-1251.kmap
|
||||
share/lyx/kbd/brazil.kmap
|
||||
share/lyx/kbd/brazil2.kmap
|
||||
share/lyx/kbd/cp1251.cdef
|
||||
share/lyx/kbd/czech-prg.kmap
|
||||
share/lyx/kbd/czech.kmap
|
||||
share/lyx/kbd/european.kmap
|
||||
@ -243,6 +251,7 @@ share/lyx/kbd/german-3.kmap
|
||||
share/lyx/kbd/german.kmap
|
||||
share/lyx/kbd/greek.kmap
|
||||
share/lyx/kbd/hebrew.kmap
|
||||
share/lyx/kbd/ibm866.cdef
|
||||
share/lyx/kbd/iso8859-1.cdef
|
||||
share/lyx/kbd/iso8859-15.cdef
|
||||
share/lyx/kbd/iso8859-2.cdef
|
||||
@ -251,7 +260,10 @@ share/lyx/kbd/iso8859-4.cdef
|
||||
share/lyx/kbd/iso8859-7.cdef
|
||||
share/lyx/kbd/iso8859-8.cdef
|
||||
share/lyx/kbd/iso8859-9.cdef
|
||||
share/lyx/kbd/koi8-r.cdef
|
||||
share/lyx/kbd/koi8-r.kmap
|
||||
share/lyx/kbd/koi8-t.cdef
|
||||
share/lyx/kbd/koi8-u.cdef
|
||||
share/lyx/kbd/koi8-u.kmap
|
||||
share/lyx/kbd/latvian.kmap
|
||||
share/lyx/kbd/magyar-2.kmap
|
||||
@ -291,6 +303,7 @@ share/lyx/layouts/article.layout
|
||||
share/lyx/layouts/book.layout
|
||||
share/lyx/layouts/broadway.layout
|
||||
share/lyx/layouts/chess.layout
|
||||
share/lyx/layouts/cl2emult.layout
|
||||
share/lyx/layouts/cv.layout
|
||||
share/lyx/layouts/db_lyxmacros.inc
|
||||
share/lyx/layouts/db_stdclass.inc
|
||||
@ -318,7 +331,6 @@ 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/iletter.layout
|
||||
share/lyx/layouts/kluwer.layout
|
||||
share/lyx/layouts/latex8.layout
|
||||
share/lyx/layouts/letter.layout
|
||||
@ -392,7 +404,6 @@ 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/iletter.lyx
|
||||
share/lyx/templates/kluwer.lyx
|
||||
share/lyx/templates/latex8.lyx
|
||||
share/lyx/templates/letter.lyx
|
||||
@ -403,7 +414,6 @@ share/lyx/templates/slides.lyx
|
||||
share/lyx/tex/broadway.cls
|
||||
share/lyx/tex/cv.cls
|
||||
share/lyx/tex/hollywood.cls
|
||||
share/lyx/tex/iletter.cls
|
||||
share/lyx/tex/lyxchess.sty
|
||||
share/lyx/tex/lyxskak.sty
|
||||
share/lyx/tex/revtex.cls
|
||||
|
||||
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= lyx
|
||||
PORTVERSION= 1.2.0
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.2.1
|
||||
CATEGORIES= print
|
||||
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
|
||||
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
|
||||
@ -19,11 +18,23 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||
latex:${PORTSDIR}/print/teTeX
|
||||
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
|
||||
forms.1:${PORTSDIR}/x11-toolkits/xforms
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS}
|
||||
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||
latex:${PORTSDIR}/print/teTeX
|
||||
|
||||
USE_XPM= yes
|
||||
USE_REINPLACE= yes
|
||||
USE_PERL5= yes
|
||||
USE_GMAKE= yes
|
||||
USE_AUTOMAKE_VER= 15
|
||||
AUTOMAKE= ${WRKSRC}/autogen.sh
|
||||
AUTOCONF= ${TRUE}
|
||||
CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
|
||||
--with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
|
||||
MAN1= lyx.1 reLyX.1
|
||||
|
||||
.if defined(WITH_ASPELL)
|
||||
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
||||
CONFIGURE_ARGS+=--with-pspell
|
||||
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
||||
CONFIGURE_ARGS+= --with-pspell
|
||||
.endif
|
||||
|
||||
.if defined(WITH_ISPELL)
|
||||
@ -31,34 +42,26 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
.if !defined(WITH_ASPELL) && !defined(WITH_ISPELL)
|
||||
#
|
||||
# If you want to compile with Aspell/Pspell or Ispell support,
|
||||
# hit Ctrl-C right now and use
|
||||
# "make WITH_ASPELL=yes"
|
||||
# or
|
||||
# "make WITH_ISPELL=yes"
|
||||
#
|
||||
.if !defined(WITH_ASPELL)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "If you want to compile with Aspell/Pspell support,"
|
||||
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ASPELL=yes\""
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
USE_GMAKE= yes
|
||||
USE_XPM= yes
|
||||
USE_REINPLACE= yes
|
||||
REINPLACE_ARGS= -i ""
|
||||
USE_PERL5= yes
|
||||
USE_AUTOMAKE_VER=15
|
||||
AUTOMAKE= ${WRKSRC}/autogen.sh
|
||||
AUTOCONF= ${TRUE}
|
||||
CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
|
||||
--with-extra-inc="${X11BASE}/include/X11 ${X11BASE}/include \
|
||||
${LOCALBASE}/include"
|
||||
CONFIGURE_ENV+= LDFLAGS="-L${X11BASE}/lib -lXpm -lX11"
|
||||
MAN1= lyx.1 reLyX.1
|
||||
.if !defined(WITH_ISPELL)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "If you want to compile with Ispell support,"
|
||||
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ISPELL=yes\""
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
|
||||
|
||||
post-patch:
|
||||
@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} \
|
||||
-e 's|-lxforms|-lforms|g' \
|
||||
-e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g' \
|
||||
-e 's|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
|
||||
@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
|
||||
's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
|
||||
s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (lyx-1.2.0.tar.gz) = cc7592d311f3dfd2db01f9ca5e506fb6
|
||||
MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
Report, which font is missing to aid the user trying to configure things.
|
||||
--- src/FontLoader.C Thu Mar 21 12:25:07 2002
|
||||
+++ src/FontLoader.C Thu Aug 1 10:44:19 2002
|
||||
@@ -302,3 +302,4 @@
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
@ -1,7 +0,0 @@
|
||||
--- src/sp_spell.C Thu Mar 21 12:25:20 2002
|
||||
+++ src/sp_spell.C Wed Jul 31 18:49:57 2002
|
||||
@@ -371,3 +371,3 @@
|
||||
retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
|
||||
- SELECT_TYPE_ARG234 (&infds),
|
||||
+ &infds,
|
||||
0,
|
||||
12
print/lyx14/files/patch-src::FontLoader.C
Normal file
12
print/lyx14/files/patch-src::FontLoader.C
Normal file
@ -0,0 +1,12 @@
|
||||
--- src/FontLoader.C.orig Fri Mar 22 02:25:07 2002
|
||||
+++ src/FontLoader.C Fri Aug 23 03:38:09 2002
|
||||
@@ -300,7 +300,8 @@
|
||||
if (font == "fixed") {
|
||||
lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
}
|
||||
} else if (lyxerr.debugging(Debug::FONT)) {
|
||||
11
print/lyx14/files/patch-src::sp_spell.C
Normal file
11
print/lyx14/files/patch-src::sp_spell.C
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/sp_spell.C.orig Mon Aug 12 19:25:50 2002
|
||||
+++ src/sp_spell.C Fri Aug 23 03:38:09 2002
|
||||
@@ -379,7 +379,7 @@
|
||||
// Configure provides us with macros which are supposed to do
|
||||
// the right typecast.
|
||||
retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
|
||||
- SELECT_TYPE_ARG234 (&infds),
|
||||
+ &infds,
|
||||
0,
|
||||
0,
|
||||
SELECT_TYPE_ARG5 (&tv));
|
||||
@ -1,13 +0,0 @@
|
||||
--- src/frontends/xforms/GUIRunTime.C Thu Mar 21 16:18:03 2002
|
||||
+++ src/frontends/xforms/GUIRunTime.C Wed Jul 31 18:39:04 2002
|
||||
@@ -26,10 +26,2 @@
|
||||
|
||||
-// I keep these here so that it will be processed as early in
|
||||
-// the compilation process as possible.
|
||||
-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
|
||||
-#error LyX will not compile with this version of XForms.\
|
||||
- Please get version 0.89.\
|
||||
- If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
|
||||
-#endif
|
||||
-
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
--- src/graphics/GraphicsImageXPM.h Thu Mar 21 12:27:08 2002
|
||||
+++ src/graphics/GraphicsImageXPM.h Wed Jul 31 18:08:13 2002
|
||||
@@ -17,3 +17,3 @@
|
||||
#include "GraphicsImage.h"
|
||||
-#include XPM_H_LOCATION
|
||||
+#include <X11/xpm.h>
|
||||
#include "support/smart_ptr.h"
|
||||
98
print/lyx14/files/xforms.m4
Normal file
98
print/lyx14/files/xforms.m4
Normal file
@ -0,0 +1,98 @@
|
||||
dnl some macros to test for xforms-related functionality -*- sh -*-
|
||||
|
||||
dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
|
||||
dnl If it is found, the variable XFORMS_LIB is set to the relevant -l flags,
|
||||
dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
AC_REQUIRE([LYX_PATH_XPM])
|
||||
|
||||
AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
|
||||
[AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
|
||||
[LYX_LIB_ERROR(libforms or libxforms,xforms)], $XPM_LIB)], $XPM_LIB)
|
||||
AC_SUBST(XFORMS_LIB)
|
||||
|
||||
### Check for xforms headers
|
||||
lyx_cv_forms_h_location="<forms.h>"
|
||||
AC_CHECK_HEADER(X11/forms.h,[
|
||||
ac_cv_header_forms_h=yes
|
||||
lyx_cv_forms_h_location="<X11/forms.h>"],[
|
||||
AC_CHECK_HEADER(forms.h,[],[
|
||||
LYX_LIB_ERROR(forms.h,forms)])])
|
||||
AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location,
|
||||
[define this to the location of forms.h to be used with #include, e.g. <forms.h>])
|
||||
|
||||
if test $ac_cv_header_forms_h = yes; then
|
||||
AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
|
||||
[ cat > conftest.$ac_ext <<EOF
|
||||
#line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include FORMS_H_LOCATION
|
||||
#if ! defined(FL_INCLUDE_VERSION)
|
||||
"%%%"(unknown)"%%%"
|
||||
#else
|
||||
"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
|
||||
#endif
|
||||
EOF
|
||||
lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
|
||||
grep '^"%%%"' 2>/dev/null | \
|
||||
sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
|
||||
rm -f conftest*])
|
||||
|
||||
XFORMS_VERSION=$lyx_cv_xfversion
|
||||
case "$lyx_cv_xfversion" in
|
||||
"(unknown)"|0.8[1-7]*)
|
||||
LYX_ERROR(dnl
|
||||
Version $lyx_cv_xfversion of xforms is not compatible with LyX.
|
||||
This version of LyX works best with versions 0.88 (recommended) and later.) ;;
|
||||
0.88*) ;;
|
||||
0.89[01234]) LYX_WARNING(dnl
|
||||
LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
|
||||
it is an unproven version and might still have some bugs. You should
|
||||
probably use version 0.89.6 (or 0.88) instead) ;;
|
||||
0.89*) ;;
|
||||
0.9999*) ;;
|
||||
1.0*) ;;
|
||||
*) LYX_WARNING(dnl
|
||||
Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
|
||||
since it is newer than 0.89. You might have slight problems with it.);;
|
||||
esac
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[AC_REQUIRE([LYX_PATH_XFORMS])
|
||||
save_LIBS=$LIBS
|
||||
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_read_header,
|
||||
[XFORMS_IMAGE_LIB=-ljpeg
|
||||
LIBS="$LIBS -ljpeg"])
|
||||
AC_SEARCH_LIBS(flimage_dup, flimage,
|
||||
[lyx_use_xforms_image_loader=yes
|
||||
if test "$ac_cv_search_flimage_dup" != "none required" ; then
|
||||
XFORMS_IMAGE_LIB="-lflimage $XFORMS_IMAGE_LIB"
|
||||
LIBS="$XFORMS_IMAGE_LIB $LIBS"
|
||||
fi])
|
||||
AC_SUBST(XFORMS_IMAGE_LIB)
|
||||
|
||||
if test $lyx_use_xforms_image_loader = yes ; then
|
||||
lyx_flags="$lyx_flags xforms-image-loader"
|
||||
AC_DEFINE(USE_XFORMS_IMAGE_LOADER, 1,
|
||||
[Define if you want to use xforms built-in image loader])
|
||||
AC_CHECK_FUNCS(flimage_enable_ps flimage_enable_jpeg)
|
||||
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
|
||||
fi
|
||||
|
||||
### If the gui cannot load images itself, then we default to the
|
||||
### very simple one in graphics/GraphicsImageXPM.[Ch]
|
||||
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
|
||||
test $lyx_use_xforms_image_loader = no)
|
||||
AC_LANG_RESTORE
|
||||
LIBS=$save_LIBS])
|
||||
@ -27,9 +27,11 @@ share/locale/wa/LC_MESSAGES/lyx.mo
|
||||
share/lyx/CREDITS
|
||||
share/lyx/bind/broadway.bind
|
||||
share/lyx/bind/cua.bind
|
||||
share/lyx/bind/cyrkeys.bind
|
||||
share/lyx/bind/de_menus.bind
|
||||
share/lyx/bind/emacs.bind
|
||||
share/lyx/bind/fi_menus.bind
|
||||
share/lyx/bind/greekkeys.bind
|
||||
share/lyx/bind/hollywood.bind
|
||||
share/lyx/bind/latinkeys.bind
|
||||
share/lyx/bind/math.bind
|
||||
@ -79,6 +81,8 @@ share/lyx/doc/fr_Intro.lyx
|
||||
share/lyx/doc/fr_TOC.lyx
|
||||
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/hu_Intro.lyx
|
||||
share/lyx/doc/hu_TOC.lyx
|
||||
share/lyx/doc/it_Customization.lyx
|
||||
@ -142,12 +146,14 @@ share/lyx/examples/eu_splash.lyx
|
||||
share/lyx/examples/example_lyxified.lyx
|
||||
share/lyx/examples/example_raw.lyx
|
||||
share/lyx/examples/fr_AlignementDecimal.lyx
|
||||
share/lyx/examples/fr_CV.lyx
|
||||
share/lyx/examples/fr_ExemplesTableaux.lyx
|
||||
share/lyx/examples/fr_ListesPuces.lyx
|
||||
share/lyx/examples/fr_Minipage.lyx
|
||||
share/lyx/examples/fr_MultiColonnes.lyx
|
||||
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/hu_splash.lyx
|
||||
share/lyx/examples/iecc05.fen
|
||||
@ -182,6 +188,7 @@ share/lyx/images/banner.xpm
|
||||
share/lyx/images/buffer-close.xpm
|
||||
share/lyx/images/buffer-export_ascii.xpm
|
||||
share/lyx/images/buffer-export_latex.xpm
|
||||
share/lyx/images/buffer-new.xpm
|
||||
share/lyx/images/buffer-print.xpm
|
||||
share/lyx/images/buffer-update_dvi.xpm
|
||||
share/lyx/images/buffer-update_ps.xpm
|
||||
@ -233,6 +240,7 @@ share/lyx/kbd/arabic.kmap
|
||||
share/lyx/kbd/bg-bds-1251.kmap
|
||||
share/lyx/kbd/brazil.kmap
|
||||
share/lyx/kbd/brazil2.kmap
|
||||
share/lyx/kbd/cp1251.cdef
|
||||
share/lyx/kbd/czech-prg.kmap
|
||||
share/lyx/kbd/czech.kmap
|
||||
share/lyx/kbd/european.kmap
|
||||
@ -243,6 +251,7 @@ share/lyx/kbd/german-3.kmap
|
||||
share/lyx/kbd/german.kmap
|
||||
share/lyx/kbd/greek.kmap
|
||||
share/lyx/kbd/hebrew.kmap
|
||||
share/lyx/kbd/ibm866.cdef
|
||||
share/lyx/kbd/iso8859-1.cdef
|
||||
share/lyx/kbd/iso8859-15.cdef
|
||||
share/lyx/kbd/iso8859-2.cdef
|
||||
@ -251,7 +260,10 @@ share/lyx/kbd/iso8859-4.cdef
|
||||
share/lyx/kbd/iso8859-7.cdef
|
||||
share/lyx/kbd/iso8859-8.cdef
|
||||
share/lyx/kbd/iso8859-9.cdef
|
||||
share/lyx/kbd/koi8-r.cdef
|
||||
share/lyx/kbd/koi8-r.kmap
|
||||
share/lyx/kbd/koi8-t.cdef
|
||||
share/lyx/kbd/koi8-u.cdef
|
||||
share/lyx/kbd/koi8-u.kmap
|
||||
share/lyx/kbd/latvian.kmap
|
||||
share/lyx/kbd/magyar-2.kmap
|
||||
@ -291,6 +303,7 @@ share/lyx/layouts/article.layout
|
||||
share/lyx/layouts/book.layout
|
||||
share/lyx/layouts/broadway.layout
|
||||
share/lyx/layouts/chess.layout
|
||||
share/lyx/layouts/cl2emult.layout
|
||||
share/lyx/layouts/cv.layout
|
||||
share/lyx/layouts/db_lyxmacros.inc
|
||||
share/lyx/layouts/db_stdclass.inc
|
||||
@ -318,7 +331,6 @@ 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/iletter.layout
|
||||
share/lyx/layouts/kluwer.layout
|
||||
share/lyx/layouts/latex8.layout
|
||||
share/lyx/layouts/letter.layout
|
||||
@ -392,7 +404,6 @@ 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/iletter.lyx
|
||||
share/lyx/templates/kluwer.lyx
|
||||
share/lyx/templates/latex8.lyx
|
||||
share/lyx/templates/letter.lyx
|
||||
@ -403,7 +414,6 @@ share/lyx/templates/slides.lyx
|
||||
share/lyx/tex/broadway.cls
|
||||
share/lyx/tex/cv.cls
|
||||
share/lyx/tex/hollywood.cls
|
||||
share/lyx/tex/iletter.cls
|
||||
share/lyx/tex/lyxchess.sty
|
||||
share/lyx/tex/lyxskak.sty
|
||||
share/lyx/tex/revtex.cls
|
||||
|
||||
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= lyx
|
||||
PORTVERSION= 1.2.0
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.2.1
|
||||
CATEGORIES= print
|
||||
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
|
||||
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
|
||||
@ -19,11 +18,23 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||
latex:${PORTSDIR}/print/teTeX
|
||||
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
|
||||
forms.1:${PORTSDIR}/x11-toolkits/xforms
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS}
|
||||
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||
latex:${PORTSDIR}/print/teTeX
|
||||
|
||||
USE_XPM= yes
|
||||
USE_REINPLACE= yes
|
||||
USE_PERL5= yes
|
||||
USE_GMAKE= yes
|
||||
USE_AUTOMAKE_VER= 15
|
||||
AUTOMAKE= ${WRKSRC}/autogen.sh
|
||||
AUTOCONF= ${TRUE}
|
||||
CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
|
||||
--with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
|
||||
MAN1= lyx.1 reLyX.1
|
||||
|
||||
.if defined(WITH_ASPELL)
|
||||
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
||||
CONFIGURE_ARGS+=--with-pspell
|
||||
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
||||
CONFIGURE_ARGS+= --with-pspell
|
||||
.endif
|
||||
|
||||
.if defined(WITH_ISPELL)
|
||||
@ -31,34 +42,26 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
.if !defined(WITH_ASPELL) && !defined(WITH_ISPELL)
|
||||
#
|
||||
# If you want to compile with Aspell/Pspell or Ispell support,
|
||||
# hit Ctrl-C right now and use
|
||||
# "make WITH_ASPELL=yes"
|
||||
# or
|
||||
# "make WITH_ISPELL=yes"
|
||||
#
|
||||
.if !defined(WITH_ASPELL)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "If you want to compile with Aspell/Pspell support,"
|
||||
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ASPELL=yes\""
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
USE_GMAKE= yes
|
||||
USE_XPM= yes
|
||||
USE_REINPLACE= yes
|
||||
REINPLACE_ARGS= -i ""
|
||||
USE_PERL5= yes
|
||||
USE_AUTOMAKE_VER=15
|
||||
AUTOMAKE= ${WRKSRC}/autogen.sh
|
||||
AUTOCONF= ${TRUE}
|
||||
CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
|
||||
--with-extra-inc="${X11BASE}/include/X11 ${X11BASE}/include \
|
||||
${LOCALBASE}/include"
|
||||
CONFIGURE_ENV+= LDFLAGS="-L${X11BASE}/lib -lXpm -lX11"
|
||||
MAN1= lyx.1 reLyX.1
|
||||
.if !defined(WITH_ISPELL)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "If you want to compile with Ispell support,"
|
||||
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ISPELL=yes\""
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
|
||||
|
||||
post-patch:
|
||||
@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} \
|
||||
-e 's|-lxforms|-lforms|g' \
|
||||
-e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g' \
|
||||
-e 's|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
|
||||
@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
|
||||
's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
|
||||
s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (lyx-1.2.0.tar.gz) = cc7592d311f3dfd2db01f9ca5e506fb6
|
||||
MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
Report, which font is missing to aid the user trying to configure things.
|
||||
--- src/FontLoader.C Thu Mar 21 12:25:07 2002
|
||||
+++ src/FontLoader.C Thu Aug 1 10:44:19 2002
|
||||
@@ -302,3 +302,4 @@
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
@ -1,7 +0,0 @@
|
||||
--- src/sp_spell.C Thu Mar 21 12:25:20 2002
|
||||
+++ src/sp_spell.C Wed Jul 31 18:49:57 2002
|
||||
@@ -371,3 +371,3 @@
|
||||
retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
|
||||
- SELECT_TYPE_ARG234 (&infds),
|
||||
+ &infds,
|
||||
0,
|
||||
12
print/lyx15/files/patch-src::FontLoader.C
Normal file
12
print/lyx15/files/patch-src::FontLoader.C
Normal file
@ -0,0 +1,12 @@
|
||||
--- src/FontLoader.C.orig Fri Mar 22 02:25:07 2002
|
||||
+++ src/FontLoader.C Fri Aug 23 03:38:09 2002
|
||||
@@ -300,7 +300,8 @@
|
||||
if (font == "fixed") {
|
||||
lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
}
|
||||
} else if (lyxerr.debugging(Debug::FONT)) {
|
||||
11
print/lyx15/files/patch-src::sp_spell.C
Normal file
11
print/lyx15/files/patch-src::sp_spell.C
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/sp_spell.C.orig Mon Aug 12 19:25:50 2002
|
||||
+++ src/sp_spell.C Fri Aug 23 03:38:09 2002
|
||||
@@ -379,7 +379,7 @@
|
||||
// Configure provides us with macros which are supposed to do
|
||||
// the right typecast.
|
||||
retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
|
||||
- SELECT_TYPE_ARG234 (&infds),
|
||||
+ &infds,
|
||||
0,
|
||||
0,
|
||||
SELECT_TYPE_ARG5 (&tv));
|
||||
@ -1,13 +0,0 @@
|
||||
--- src/frontends/xforms/GUIRunTime.C Thu Mar 21 16:18:03 2002
|
||||
+++ src/frontends/xforms/GUIRunTime.C Wed Jul 31 18:39:04 2002
|
||||
@@ -26,10 +26,2 @@
|
||||
|
||||
-// I keep these here so that it will be processed as early in
|
||||
-// the compilation process as possible.
|
||||
-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
|
||||
-#error LyX will not compile with this version of XForms.\
|
||||
- Please get version 0.89.\
|
||||
- If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
|
||||
-#endif
|
||||
-
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
--- src/graphics/GraphicsImageXPM.h Thu Mar 21 12:27:08 2002
|
||||
+++ src/graphics/GraphicsImageXPM.h Wed Jul 31 18:08:13 2002
|
||||
@@ -17,3 +17,3 @@
|
||||
#include "GraphicsImage.h"
|
||||
-#include XPM_H_LOCATION
|
||||
+#include <X11/xpm.h>
|
||||
#include "support/smart_ptr.h"
|
||||
98
print/lyx15/files/xforms.m4
Normal file
98
print/lyx15/files/xforms.m4
Normal file
@ -0,0 +1,98 @@
|
||||
dnl some macros to test for xforms-related functionality -*- sh -*-
|
||||
|
||||
dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
|
||||
dnl If it is found, the variable XFORMS_LIB is set to the relevant -l flags,
|
||||
dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
AC_REQUIRE([LYX_PATH_XPM])
|
||||
|
||||
AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
|
||||
[AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
|
||||
[LYX_LIB_ERROR(libforms or libxforms,xforms)], $XPM_LIB)], $XPM_LIB)
|
||||
AC_SUBST(XFORMS_LIB)
|
||||
|
||||
### Check for xforms headers
|
||||
lyx_cv_forms_h_location="<forms.h>"
|
||||
AC_CHECK_HEADER(X11/forms.h,[
|
||||
ac_cv_header_forms_h=yes
|
||||
lyx_cv_forms_h_location="<X11/forms.h>"],[
|
||||
AC_CHECK_HEADER(forms.h,[],[
|
||||
LYX_LIB_ERROR(forms.h,forms)])])
|
||||
AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location,
|
||||
[define this to the location of forms.h to be used with #include, e.g. <forms.h>])
|
||||
|
||||
if test $ac_cv_header_forms_h = yes; then
|
||||
AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
|
||||
[ cat > conftest.$ac_ext <<EOF
|
||||
#line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include FORMS_H_LOCATION
|
||||
#if ! defined(FL_INCLUDE_VERSION)
|
||||
"%%%"(unknown)"%%%"
|
||||
#else
|
||||
"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
|
||||
#endif
|
||||
EOF
|
||||
lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
|
||||
grep '^"%%%"' 2>/dev/null | \
|
||||
sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
|
||||
rm -f conftest*])
|
||||
|
||||
XFORMS_VERSION=$lyx_cv_xfversion
|
||||
case "$lyx_cv_xfversion" in
|
||||
"(unknown)"|0.8[1-7]*)
|
||||
LYX_ERROR(dnl
|
||||
Version $lyx_cv_xfversion of xforms is not compatible with LyX.
|
||||
This version of LyX works best with versions 0.88 (recommended) and later.) ;;
|
||||
0.88*) ;;
|
||||
0.89[01234]) LYX_WARNING(dnl
|
||||
LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
|
||||
it is an unproven version and might still have some bugs. You should
|
||||
probably use version 0.89.6 (or 0.88) instead) ;;
|
||||
0.89*) ;;
|
||||
0.9999*) ;;
|
||||
1.0*) ;;
|
||||
*) LYX_WARNING(dnl
|
||||
Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
|
||||
since it is newer than 0.89. You might have slight problems with it.);;
|
||||
esac
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[AC_REQUIRE([LYX_PATH_XFORMS])
|
||||
save_LIBS=$LIBS
|
||||
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_read_header,
|
||||
[XFORMS_IMAGE_LIB=-ljpeg
|
||||
LIBS="$LIBS -ljpeg"])
|
||||
AC_SEARCH_LIBS(flimage_dup, flimage,
|
||||
[lyx_use_xforms_image_loader=yes
|
||||
if test "$ac_cv_search_flimage_dup" != "none required" ; then
|
||||
XFORMS_IMAGE_LIB="-lflimage $XFORMS_IMAGE_LIB"
|
||||
LIBS="$XFORMS_IMAGE_LIB $LIBS"
|
||||
fi])
|
||||
AC_SUBST(XFORMS_IMAGE_LIB)
|
||||
|
||||
if test $lyx_use_xforms_image_loader = yes ; then
|
||||
lyx_flags="$lyx_flags xforms-image-loader"
|
||||
AC_DEFINE(USE_XFORMS_IMAGE_LOADER, 1,
|
||||
[Define if you want to use xforms built-in image loader])
|
||||
AC_CHECK_FUNCS(flimage_enable_ps flimage_enable_jpeg)
|
||||
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
|
||||
fi
|
||||
|
||||
### If the gui cannot load images itself, then we default to the
|
||||
### very simple one in graphics/GraphicsImageXPM.[Ch]
|
||||
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
|
||||
test $lyx_use_xforms_image_loader = no)
|
||||
AC_LANG_RESTORE
|
||||
LIBS=$save_LIBS])
|
||||
@ -27,9 +27,11 @@ share/locale/wa/LC_MESSAGES/lyx.mo
|
||||
share/lyx/CREDITS
|
||||
share/lyx/bind/broadway.bind
|
||||
share/lyx/bind/cua.bind
|
||||
share/lyx/bind/cyrkeys.bind
|
||||
share/lyx/bind/de_menus.bind
|
||||
share/lyx/bind/emacs.bind
|
||||
share/lyx/bind/fi_menus.bind
|
||||
share/lyx/bind/greekkeys.bind
|
||||
share/lyx/bind/hollywood.bind
|
||||
share/lyx/bind/latinkeys.bind
|
||||
share/lyx/bind/math.bind
|
||||
@ -79,6 +81,8 @@ share/lyx/doc/fr_Intro.lyx
|
||||
share/lyx/doc/fr_TOC.lyx
|
||||
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/hu_Intro.lyx
|
||||
share/lyx/doc/hu_TOC.lyx
|
||||
share/lyx/doc/it_Customization.lyx
|
||||
@ -142,12 +146,14 @@ share/lyx/examples/eu_splash.lyx
|
||||
share/lyx/examples/example_lyxified.lyx
|
||||
share/lyx/examples/example_raw.lyx
|
||||
share/lyx/examples/fr_AlignementDecimal.lyx
|
||||
share/lyx/examples/fr_CV.lyx
|
||||
share/lyx/examples/fr_ExemplesTableaux.lyx
|
||||
share/lyx/examples/fr_ListesPuces.lyx
|
||||
share/lyx/examples/fr_Minipage.lyx
|
||||
share/lyx/examples/fr_MultiColonnes.lyx
|
||||
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/hu_splash.lyx
|
||||
share/lyx/examples/iecc05.fen
|
||||
@ -182,6 +188,7 @@ share/lyx/images/banner.xpm
|
||||
share/lyx/images/buffer-close.xpm
|
||||
share/lyx/images/buffer-export_ascii.xpm
|
||||
share/lyx/images/buffer-export_latex.xpm
|
||||
share/lyx/images/buffer-new.xpm
|
||||
share/lyx/images/buffer-print.xpm
|
||||
share/lyx/images/buffer-update_dvi.xpm
|
||||
share/lyx/images/buffer-update_ps.xpm
|
||||
@ -233,6 +240,7 @@ share/lyx/kbd/arabic.kmap
|
||||
share/lyx/kbd/bg-bds-1251.kmap
|
||||
share/lyx/kbd/brazil.kmap
|
||||
share/lyx/kbd/brazil2.kmap
|
||||
share/lyx/kbd/cp1251.cdef
|
||||
share/lyx/kbd/czech-prg.kmap
|
||||
share/lyx/kbd/czech.kmap
|
||||
share/lyx/kbd/european.kmap
|
||||
@ -243,6 +251,7 @@ share/lyx/kbd/german-3.kmap
|
||||
share/lyx/kbd/german.kmap
|
||||
share/lyx/kbd/greek.kmap
|
||||
share/lyx/kbd/hebrew.kmap
|
||||
share/lyx/kbd/ibm866.cdef
|
||||
share/lyx/kbd/iso8859-1.cdef
|
||||
share/lyx/kbd/iso8859-15.cdef
|
||||
share/lyx/kbd/iso8859-2.cdef
|
||||
@ -251,7 +260,10 @@ share/lyx/kbd/iso8859-4.cdef
|
||||
share/lyx/kbd/iso8859-7.cdef
|
||||
share/lyx/kbd/iso8859-8.cdef
|
||||
share/lyx/kbd/iso8859-9.cdef
|
||||
share/lyx/kbd/koi8-r.cdef
|
||||
share/lyx/kbd/koi8-r.kmap
|
||||
share/lyx/kbd/koi8-t.cdef
|
||||
share/lyx/kbd/koi8-u.cdef
|
||||
share/lyx/kbd/koi8-u.kmap
|
||||
share/lyx/kbd/latvian.kmap
|
||||
share/lyx/kbd/magyar-2.kmap
|
||||
@ -291,6 +303,7 @@ share/lyx/layouts/article.layout
|
||||
share/lyx/layouts/book.layout
|
||||
share/lyx/layouts/broadway.layout
|
||||
share/lyx/layouts/chess.layout
|
||||
share/lyx/layouts/cl2emult.layout
|
||||
share/lyx/layouts/cv.layout
|
||||
share/lyx/layouts/db_lyxmacros.inc
|
||||
share/lyx/layouts/db_stdclass.inc
|
||||
@ -318,7 +331,6 @@ 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/iletter.layout
|
||||
share/lyx/layouts/kluwer.layout
|
||||
share/lyx/layouts/latex8.layout
|
||||
share/lyx/layouts/letter.layout
|
||||
@ -392,7 +404,6 @@ 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/iletter.lyx
|
||||
share/lyx/templates/kluwer.lyx
|
||||
share/lyx/templates/latex8.lyx
|
||||
share/lyx/templates/letter.lyx
|
||||
@ -403,7 +414,6 @@ share/lyx/templates/slides.lyx
|
||||
share/lyx/tex/broadway.cls
|
||||
share/lyx/tex/cv.cls
|
||||
share/lyx/tex/hollywood.cls
|
||||
share/lyx/tex/iletter.cls
|
||||
share/lyx/tex/lyxchess.sty
|
||||
share/lyx/tex/lyxskak.sty
|
||||
share/lyx/tex/revtex.cls
|
||||
|
||||
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= lyx
|
||||
PORTVERSION= 1.2.0
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.2.1
|
||||
CATEGORIES= print
|
||||
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
|
||||
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
|
||||
@ -19,11 +18,23 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||
latex:${PORTSDIR}/print/teTeX
|
||||
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
|
||||
forms.1:${PORTSDIR}/x11-toolkits/xforms
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS}
|
||||
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
|
||||
latex:${PORTSDIR}/print/teTeX
|
||||
|
||||
USE_XPM= yes
|
||||
USE_REINPLACE= yes
|
||||
USE_PERL5= yes
|
||||
USE_GMAKE= yes
|
||||
USE_AUTOMAKE_VER= 15
|
||||
AUTOMAKE= ${WRKSRC}/autogen.sh
|
||||
AUTOCONF= ${TRUE}
|
||||
CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
|
||||
--with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
|
||||
MAN1= lyx.1 reLyX.1
|
||||
|
||||
.if defined(WITH_ASPELL)
|
||||
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
||||
CONFIGURE_ARGS+=--with-pspell
|
||||
LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell
|
||||
CONFIGURE_ARGS+= --with-pspell
|
||||
.endif
|
||||
|
||||
.if defined(WITH_ISPELL)
|
||||
@ -31,34 +42,26 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
.if !defined(WITH_ASPELL) && !defined(WITH_ISPELL)
|
||||
#
|
||||
# If you want to compile with Aspell/Pspell or Ispell support,
|
||||
# hit Ctrl-C right now and use
|
||||
# "make WITH_ASPELL=yes"
|
||||
# or
|
||||
# "make WITH_ISPELL=yes"
|
||||
#
|
||||
.if !defined(WITH_ASPELL)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "If you want to compile with Aspell/Pspell support,"
|
||||
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ASPELL=yes\""
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
USE_GMAKE= yes
|
||||
USE_XPM= yes
|
||||
USE_REINPLACE= yes
|
||||
REINPLACE_ARGS= -i ""
|
||||
USE_PERL5= yes
|
||||
USE_AUTOMAKE_VER=15
|
||||
AUTOMAKE= ${WRKSRC}/autogen.sh
|
||||
AUTOCONF= ${TRUE}
|
||||
CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
|
||||
--with-extra-inc="${X11BASE}/include/X11 ${X11BASE}/include \
|
||||
${LOCALBASE}/include"
|
||||
CONFIGURE_ENV+= LDFLAGS="-L${X11BASE}/lib -lXpm -lX11"
|
||||
MAN1= lyx.1 reLyX.1
|
||||
.if !defined(WITH_ISPELL)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "If you want to compile with Ispell support,"
|
||||
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ISPELL=yes\""
|
||||
@${ECHO_MSG}
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
|
||||
|
||||
post-patch:
|
||||
@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} \
|
||||
-e 's|-lxforms|-lforms|g' \
|
||||
-e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g' \
|
||||
-e 's|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
|
||||
@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
|
||||
's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
|
||||
s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (lyx-1.2.0.tar.gz) = cc7592d311f3dfd2db01f9ca5e506fb6
|
||||
MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
Report, which font is missing to aid the user trying to configure things.
|
||||
--- src/FontLoader.C Thu Mar 21 12:25:07 2002
|
||||
+++ src/FontLoader.C Thu Aug 1 10:44:19 2002
|
||||
@@ -302,3 +302,4 @@
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
@ -1,7 +0,0 @@
|
||||
--- src/sp_spell.C Thu Mar 21 12:25:20 2002
|
||||
+++ src/sp_spell.C Wed Jul 31 18:49:57 2002
|
||||
@@ -371,3 +371,3 @@
|
||||
retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
|
||||
- SELECT_TYPE_ARG234 (&infds),
|
||||
+ &infds,
|
||||
0,
|
||||
12
print/lyx16/files/patch-src::FontLoader.C
Normal file
12
print/lyx16/files/patch-src::FontLoader.C
Normal file
@ -0,0 +1,12 @@
|
||||
--- src/FontLoader.C.orig Fri Mar 22 02:25:07 2002
|
||||
+++ src/FontLoader.C Fri Aug 23 03:38:09 2002
|
||||
@@ -300,7 +300,8 @@
|
||||
if (font == "fixed") {
|
||||
lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
}
|
||||
} else if (lyxerr.debugging(Debug::FONT)) {
|
||||
11
print/lyx16/files/patch-src::sp_spell.C
Normal file
11
print/lyx16/files/patch-src::sp_spell.C
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/sp_spell.C.orig Mon Aug 12 19:25:50 2002
|
||||
+++ src/sp_spell.C Fri Aug 23 03:38:09 2002
|
||||
@@ -379,7 +379,7 @@
|
||||
// Configure provides us with macros which are supposed to do
|
||||
// the right typecast.
|
||||
retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
|
||||
- SELECT_TYPE_ARG234 (&infds),
|
||||
+ &infds,
|
||||
0,
|
||||
0,
|
||||
SELECT_TYPE_ARG5 (&tv));
|
||||
@ -1,13 +0,0 @@
|
||||
--- src/frontends/xforms/GUIRunTime.C Thu Mar 21 16:18:03 2002
|
||||
+++ src/frontends/xforms/GUIRunTime.C Wed Jul 31 18:39:04 2002
|
||||
@@ -26,10 +26,2 @@
|
||||
|
||||
-// I keep these here so that it will be processed as early in
|
||||
-// the compilation process as possible.
|
||||
-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
|
||||
-#error LyX will not compile with this version of XForms.\
|
||||
- Please get version 0.89.\
|
||||
- If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
|
||||
-#endif
|
||||
-
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
--- src/graphics/GraphicsImageXPM.h Thu Mar 21 12:27:08 2002
|
||||
+++ src/graphics/GraphicsImageXPM.h Wed Jul 31 18:08:13 2002
|
||||
@@ -17,3 +17,3 @@
|
||||
#include "GraphicsImage.h"
|
||||
-#include XPM_H_LOCATION
|
||||
+#include <X11/xpm.h>
|
||||
#include "support/smart_ptr.h"
|
||||
98
print/lyx16/files/xforms.m4
Normal file
98
print/lyx16/files/xforms.m4
Normal file
@ -0,0 +1,98 @@
|
||||
dnl some macros to test for xforms-related functionality -*- sh -*-
|
||||
|
||||
dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
|
||||
dnl If it is found, the variable XFORMS_LIB is set to the relevant -l flags,
|
||||
dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
AC_REQUIRE([LYX_PATH_XPM])
|
||||
|
||||
AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
|
||||
[AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
|
||||
[LYX_LIB_ERROR(libforms or libxforms,xforms)], $XPM_LIB)], $XPM_LIB)
|
||||
AC_SUBST(XFORMS_LIB)
|
||||
|
||||
### Check for xforms headers
|
||||
lyx_cv_forms_h_location="<forms.h>"
|
||||
AC_CHECK_HEADER(X11/forms.h,[
|
||||
ac_cv_header_forms_h=yes
|
||||
lyx_cv_forms_h_location="<X11/forms.h>"],[
|
||||
AC_CHECK_HEADER(forms.h,[],[
|
||||
LYX_LIB_ERROR(forms.h,forms)])])
|
||||
AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location,
|
||||
[define this to the location of forms.h to be used with #include, e.g. <forms.h>])
|
||||
|
||||
if test $ac_cv_header_forms_h = yes; then
|
||||
AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
|
||||
[ cat > conftest.$ac_ext <<EOF
|
||||
#line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include FORMS_H_LOCATION
|
||||
#if ! defined(FL_INCLUDE_VERSION)
|
||||
"%%%"(unknown)"%%%"
|
||||
#else
|
||||
"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
|
||||
#endif
|
||||
EOF
|
||||
lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
|
||||
grep '^"%%%"' 2>/dev/null | \
|
||||
sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
|
||||
rm -f conftest*])
|
||||
|
||||
XFORMS_VERSION=$lyx_cv_xfversion
|
||||
case "$lyx_cv_xfversion" in
|
||||
"(unknown)"|0.8[1-7]*)
|
||||
LYX_ERROR(dnl
|
||||
Version $lyx_cv_xfversion of xforms is not compatible with LyX.
|
||||
This version of LyX works best with versions 0.88 (recommended) and later.) ;;
|
||||
0.88*) ;;
|
||||
0.89[01234]) LYX_WARNING(dnl
|
||||
LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
|
||||
it is an unproven version and might still have some bugs. You should
|
||||
probably use version 0.89.6 (or 0.88) instead) ;;
|
||||
0.89*) ;;
|
||||
0.9999*) ;;
|
||||
1.0*) ;;
|
||||
*) LYX_WARNING(dnl
|
||||
Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
|
||||
since it is newer than 0.89. You might have slight problems with it.);;
|
||||
esac
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[AC_REQUIRE([LYX_PATH_XFORMS])
|
||||
save_LIBS=$LIBS
|
||||
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_read_header,
|
||||
[XFORMS_IMAGE_LIB=-ljpeg
|
||||
LIBS="$LIBS -ljpeg"])
|
||||
AC_SEARCH_LIBS(flimage_dup, flimage,
|
||||
[lyx_use_xforms_image_loader=yes
|
||||
if test "$ac_cv_search_flimage_dup" != "none required" ; then
|
||||
XFORMS_IMAGE_LIB="-lflimage $XFORMS_IMAGE_LIB"
|
||||
LIBS="$XFORMS_IMAGE_LIB $LIBS"
|
||||
fi])
|
||||
AC_SUBST(XFORMS_IMAGE_LIB)
|
||||
|
||||
if test $lyx_use_xforms_image_loader = yes ; then
|
||||
lyx_flags="$lyx_flags xforms-image-loader"
|
||||
AC_DEFINE(USE_XFORMS_IMAGE_LOADER, 1,
|
||||
[Define if you want to use xforms built-in image loader])
|
||||
AC_CHECK_FUNCS(flimage_enable_ps flimage_enable_jpeg)
|
||||
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
|
||||
fi
|
||||
|
||||
### If the gui cannot load images itself, then we default to the
|
||||
### very simple one in graphics/GraphicsImageXPM.[Ch]
|
||||
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
|
||||
test $lyx_use_xforms_image_loader = no)
|
||||
AC_LANG_RESTORE
|
||||
LIBS=$save_LIBS])
|
||||
@ -27,9 +27,11 @@ share/locale/wa/LC_MESSAGES/lyx.mo
|
||||
share/lyx/CREDITS
|
||||
share/lyx/bind/broadway.bind
|
||||
share/lyx/bind/cua.bind
|
||||
share/lyx/bind/cyrkeys.bind
|
||||
share/lyx/bind/de_menus.bind
|
||||
share/lyx/bind/emacs.bind
|
||||
share/lyx/bind/fi_menus.bind
|
||||
share/lyx/bind/greekkeys.bind
|
||||
share/lyx/bind/hollywood.bind
|
||||
share/lyx/bind/latinkeys.bind
|
||||
share/lyx/bind/math.bind
|
||||
@ -79,6 +81,8 @@ share/lyx/doc/fr_Intro.lyx
|
||||
share/lyx/doc/fr_TOC.lyx
|
||||
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/hu_Intro.lyx
|
||||
share/lyx/doc/hu_TOC.lyx
|
||||
share/lyx/doc/it_Customization.lyx
|
||||
@ -142,12 +146,14 @@ share/lyx/examples/eu_splash.lyx
|
||||
share/lyx/examples/example_lyxified.lyx
|
||||
share/lyx/examples/example_raw.lyx
|
||||
share/lyx/examples/fr_AlignementDecimal.lyx
|
||||
share/lyx/examples/fr_CV.lyx
|
||||
share/lyx/examples/fr_ExemplesTableaux.lyx
|
||||
share/lyx/examples/fr_ListesPuces.lyx
|
||||
share/lyx/examples/fr_Minipage.lyx
|
||||
share/lyx/examples/fr_MultiColonnes.lyx
|
||||
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/hu_splash.lyx
|
||||
share/lyx/examples/iecc05.fen
|
||||
@ -182,6 +188,7 @@ share/lyx/images/banner.xpm
|
||||
share/lyx/images/buffer-close.xpm
|
||||
share/lyx/images/buffer-export_ascii.xpm
|
||||
share/lyx/images/buffer-export_latex.xpm
|
||||
share/lyx/images/buffer-new.xpm
|
||||
share/lyx/images/buffer-print.xpm
|
||||
share/lyx/images/buffer-update_dvi.xpm
|
||||
share/lyx/images/buffer-update_ps.xpm
|
||||
@ -233,6 +240,7 @@ share/lyx/kbd/arabic.kmap
|
||||
share/lyx/kbd/bg-bds-1251.kmap
|
||||
share/lyx/kbd/brazil.kmap
|
||||
share/lyx/kbd/brazil2.kmap
|
||||
share/lyx/kbd/cp1251.cdef
|
||||
share/lyx/kbd/czech-prg.kmap
|
||||
share/lyx/kbd/czech.kmap
|
||||
share/lyx/kbd/european.kmap
|
||||
@ -243,6 +251,7 @@ share/lyx/kbd/german-3.kmap
|
||||
share/lyx/kbd/german.kmap
|
||||
share/lyx/kbd/greek.kmap
|
||||
share/lyx/kbd/hebrew.kmap
|
||||
share/lyx/kbd/ibm866.cdef
|
||||
share/lyx/kbd/iso8859-1.cdef
|
||||
share/lyx/kbd/iso8859-15.cdef
|
||||
share/lyx/kbd/iso8859-2.cdef
|
||||
@ -251,7 +260,10 @@ share/lyx/kbd/iso8859-4.cdef
|
||||
share/lyx/kbd/iso8859-7.cdef
|
||||
share/lyx/kbd/iso8859-8.cdef
|
||||
share/lyx/kbd/iso8859-9.cdef
|
||||
share/lyx/kbd/koi8-r.cdef
|
||||
share/lyx/kbd/koi8-r.kmap
|
||||
share/lyx/kbd/koi8-t.cdef
|
||||
share/lyx/kbd/koi8-u.cdef
|
||||
share/lyx/kbd/koi8-u.kmap
|
||||
share/lyx/kbd/latvian.kmap
|
||||
share/lyx/kbd/magyar-2.kmap
|
||||
@ -291,6 +303,7 @@ share/lyx/layouts/article.layout
|
||||
share/lyx/layouts/book.layout
|
||||
share/lyx/layouts/broadway.layout
|
||||
share/lyx/layouts/chess.layout
|
||||
share/lyx/layouts/cl2emult.layout
|
||||
share/lyx/layouts/cv.layout
|
||||
share/lyx/layouts/db_lyxmacros.inc
|
||||
share/lyx/layouts/db_stdclass.inc
|
||||
@ -318,7 +331,6 @@ 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/iletter.layout
|
||||
share/lyx/layouts/kluwer.layout
|
||||
share/lyx/layouts/latex8.layout
|
||||
share/lyx/layouts/letter.layout
|
||||
@ -392,7 +404,6 @@ 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/iletter.lyx
|
||||
share/lyx/templates/kluwer.lyx
|
||||
share/lyx/templates/latex8.lyx
|
||||
share/lyx/templates/letter.lyx
|
||||
@ -403,7 +414,6 @@ share/lyx/templates/slides.lyx
|
||||
share/lyx/tex/broadway.cls
|
||||
share/lyx/tex/cv.cls
|
||||
share/lyx/tex/hollywood.cls
|
||||
share/lyx/tex/iletter.cls
|
||||
share/lyx/tex/lyxchess.sty
|
||||
share/lyx/tex/lyxskak.sty
|
||||
share/lyx/tex/revtex.cls
|
||||
|
||||
Loading…
Reference in New Issue
Block a user