Date: Sat, 5 Oct 2002 02:39:47 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/43705: Update port: print/cjk-lyx to 1.2.1 Message-ID: <200210050939.g959dlU3059140@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 43705 >Category: ports >Synopsis: Update port: print/cjk-lyx to 1.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 05 02:40:07 PDT 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.6.2-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.2.1 New file: files/patch-config::pspell.m4 files/patch-src::FontLoader.C files/patch-src::WorkArea.C files/patch-src::sp_spell.C files/patch-src::xforms.m4 Remove file: files/patch-configure.in files/patch-src::frontends::xforms::GUIRutTime.C >How-To-Repeat: >Fix: diff -urN /usr/ports/print/cjk-lyx/Makefile print/cjk-lyx/Makefile --- /usr/ports/print/cjk-lyx/Makefile Tue Sep 10 20:24:45 2002 +++ print/cjk-lyx/Makefile Thu Oct 3 00:37:01 2002 @@ -6,8 +6,7 @@ # PORTNAME= lyx -PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTVERSION= 1.2.1 CATEGORIES= print MASTER_SITES= ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/ PKGNAMEPREFIX= cjk- @@ -29,17 +28,18 @@ USE_PERL5= yes USE_GMAKE= yes USE_AUTOMAKE_VER= 15 -USE_XPM= yes AUTOMAKE= ${WRKSRC}/autogen.sh AUTOCONF= ${TRUE} CONFIGURE_ENV= CPPFLAGS="-DI18N" -CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \ - --with-extra-inc="${X11BASE}/include ${LOCALBASE}/include" +CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \ + --with-extra-inc="${LOCALBASE}/include" MAN1= lyx.1 reLyX.1 .if defined(WITH_ASPELL) LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell -CONFIGURE_ARGS+= --with-pspell +CONFIGURE_ARGS+= --with-pspell \ + --with-pspell-lib="${LOCALBASE}/lib" \ + --with-pspell-include="${LOCALBASE}/include" .endif .if defined(WITH_ISPELL) @@ -60,6 +60,9 @@ @${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 \ diff -urN /usr/ports/print/cjk-lyx/distinfo print/cjk-lyx/distinfo --- /usr/ports/print/cjk-lyx/distinfo Tue Sep 10 20:24:45 2002 +++ print/cjk-lyx/distinfo Sat Sep 21 02:43:07 2002 @@ -1 +1 @@ -MD5 (CJK-LyX-1.2.0-src.tar.gz) = 0e0c33bb36d5d561ed83a230ef9837d0 +MD5 (CJK-LyX-1.2.1-src.tar.gz) = e29bfe38b25fc20c86d495701ae4ee08 diff -urN /usr/ports/print/cjk-lyx/files/patch-config::pspell.m4 print/cjk-lyx/files/patch-config::pspell.m4 --- /usr/ports/print/cjk-lyx/files/patch-config::pspell.m4 Thu Jan 1 09:00:00 1970 +++ print/cjk-lyx/files/patch-config::pspell.m4 Wed Oct 2 22:18:10 2002 @@ -0,0 +1,20 @@ +--- config/pspell.m4.orig Thu Jun 20 21:03:56 2002 ++++ config/pspell.m4 Wed Oct 2 22:10:21 2002 +@@ -12,7 +12,7 @@ + fi + ]) + +- AC_ARG_WITH(pspell-includes, [ --with-pspell-include where the pspell.h is located], ++ AC_ARG_WITH(pspell-include, [ --with-pspell-include where the pspell.h is located], + pspell_use_include="$withval", + pspell_use_include=NONE) + +@@ -22,7 +22,7 @@ + AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include) + fi + +- AC_ARG_WITH(pspell-libs, [ --with-pspell-lib where the libpspell.a is located], ++ AC_ARG_WITH(pspell-lib, [ --with-pspell-lib where the libpspell.a is located], + pspell_use_lib="$withval", + pspell_use_lib=NONE) + diff -urN /usr/ports/print/cjk-lyx/files/patch-configure.in print/cjk-lyx/files/patch-configure.in --- /usr/ports/print/cjk-lyx/files/patch-configure.in Fri Jul 12 16:25:42 2002 +++ print/cjk-lyx/files/patch-configure.in Thu Jan 1 09:00:00 1970 @@ -1,15 +0,0 @@ ---- work/CJK-LyX-1.2.0/configure.in.o Fri Jul 12 14:13:14 2002 -+++ configure.in Fri Jul 12 14:13:35 2002 -@@ -170,9 +170,9 @@ - # We should test for gcc version and see whether it supports -isystem, - # but since at least gcc 2.6.x supports it and it is still too old for - # us, it seems we are safe. --if test -n "$GXX" ; then -- X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'` --fi -+#if test -n "$GXX" ; then -+# X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'` -+#fi - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - - ## Check whether X is new enough to handle the input method stuff diff -urN /usr/ports/print/cjk-lyx/files/patch-src::FontLoader.C print/cjk-lyx/files/patch-src::FontLoader.C --- /usr/ports/print/cjk-lyx/files/patch-src::FontLoader.C Thu Jan 1 09:00:00 1970 +++ print/cjk-lyx/files/patch-src::FontLoader.C Thu Sep 12 04:05:10 2002 @@ -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)) { diff -urN /usr/ports/print/cjk-lyx/files/patch-src::WorkArea.C print/cjk-lyx/files/patch-src::WorkArea.C --- /usr/ports/print/cjk-lyx/files/patch-src::WorkArea.C Thu Jan 1 09:00:00 1970 +++ print/cjk-lyx/files/patch-src::WorkArea.C Thu Oct 3 00:33:01 2002 @@ -0,0 +1,14 @@ +--- src/WorkArea.C.orig Fri Aug 23 15:04:29 2002 ++++ src/WorkArea.C Thu Oct 3 00:30:28 2002 +@@ -409,9 +409,9 @@ + KeySym keysym = 0; + #ifdef I18N + char s_r[256]; +-#else +- char dummy[1]; ++ int num_bytes; + #endif ++ char dummy[1]; + XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev); + #if FL_VERSION < 1 && (FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)) + // XForms < 0.89.5 does not have compose support diff -urN /usr/ports/print/cjk-lyx/files/patch-src::frontends::xforms::GUIRunTime.C print/cjk-lyx/files/patch-src::frontends::xforms::GUIRunTime.C --- /usr/ports/print/cjk-lyx/files/patch-src::frontends::xforms::GUIRunTime.C Fri Jul 12 16:25:42 2002 +++ print/cjk-lyx/files/patch-src::frontends::xforms::GUIRunTime.C Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ -diff -ur c/src/frontends/xforms/GUIRunTime.C src/frontends/xforms/GUIRunTime.C ---- c/src/frontends/xforms/GUIRunTime.C Thu Jul 11 14:20:21 2002 -+++ src/frontends/xforms/GUIRunTime.C Thu Jul 11 14:23:55 2002 -@@ -26,11 +26,11 @@ - - // 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 -+//#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 - - - using std::endl; diff -urN /usr/ports/print/cjk-lyx/files/patch-src::sp_spell.C print/cjk-lyx/files/patch-src::sp_spell.C --- /usr/ports/print/cjk-lyx/files/patch-src::sp_spell.C Thu Jan 1 09:00:00 1970 +++ print/cjk-lyx/files/patch-src::sp_spell.C Thu Sep 12 04:05:14 2002 @@ -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)); diff -urN /usr/ports/print/cjk-lyx/files/xforms.m4 print/cjk-lyx/files/xforms.m4 --- /usr/ports/print/cjk-lyx/files/xforms.m4 Thu Jan 1 09:00:00 1970 +++ print/cjk-lyx/files/xforms.m4 Thu Sep 12 03:53:11 2002 @@ -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]) diff -urN /usr/ports/print/cjk-lyx/pkg-plist print/cjk-lyx/pkg-plist --- /usr/ports/print/cjk-lyx/pkg-plist Tue Sep 10 20:24:49 2002 +++ print/cjk-lyx/pkg-plist Thu Oct 3 00:47:16 2002 @@ -27,9 +27,11 @@ 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_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/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/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/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.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-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/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/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/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/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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210050939.g959dlU3059140>