Date: Fri, 10 Jan 2003 04:40:07 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-ports@FreeBSD.org Subject: Re: ports/46796: Update port: print/lyx to 1.2.2 Message-ID: <200301101240.h0ACe7GV096644@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/46796; it has been noted by GNATS. From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Miguel Mendez <flynn@energyhq.homeip.net> Subject: Re: ports/46796: Update port: print/lyx to 1.2.2 Date: Fri, 10 Jan 2003 21:36:23 +0900 On Thu, 9 Jan 2003 13:40:03 -0800 (PST) Miguel Mendez <flynn@energyhq.homeip.net> wrote: > Seems 1.2.3 just came out :) Since similar fixes are applied to latest source, some patches and extra files are not needed any more. I suppose following patch should be used instead. *** Remove file: files/patch-autogen.sh files/patch-config::pspell.m4 files/patch-src::FontLoader.C files/xforms.m4 *** diff -urN /usr/ports/print/lyx/Makefile print/lyx/Makefile --- /usr/ports/print/lyx/Makefile Mon Nov 11 19:00:56 2002 +++ print/lyx/Makefile Fri Jan 10 15:49:22 2003 @@ -6,8 +6,7 @@ # PORTNAME= lyx -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.2.3 CATEGORIES= print MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \ ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \ @@ -27,10 +26,11 @@ USE_PERL5= yes USE_GMAKE= yes USE_AUTOMAKE_VER= 15 -AUTOMAKE= ${WRKSRC}/autogen.sh -AUTOCONF= ${TRUE} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \ --with-extra-inc="${LOCALBASE}/include" +MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ + AUTOHEADER="${TRUE}" MAN1= lyx.1 reLyX.1 .if defined(WITH_ASPELL) @@ -59,12 +59,13 @@ @${ECHO_MSG} .endif -post-extract: - @${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config - post-patch: - @${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \ - s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g' +.for file in src/Makefile.am src/frontends/Makefile.am + @${REINPLACE_CMD} -e 's|LIBS +=|LDFLAGS = @LDFLAGS@|g' ${WRKSRC}/${file} +.endfor +.for file in configure.in lib/reLyX/configure.in + @${REINPLACE_CMD} -e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \ + s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g' ${WRKSRC}/${file} +.endfor .include <bsd.port.mk> diff -urN /usr/ports/print/lyx/distinfo print/lyx/distinfo --- /usr/ports/print/lyx/distinfo Fri Sep 20 19:34:06 2002 +++ print/lyx/distinfo Fri Jan 10 15:53:48 2003 @@ -1 +1 @@ -MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf +MD5 (lyx-1.2.3.tar.gz) = 3a423e65f647bd0a8f9401dd43e5d912 diff -urN /usr/ports/print/lyx/files/patch-autogen.sh print/lyx/files/patch-autogen.sh --- /usr/ports/print/lyx/files/patch-autogen.sh Thu Aug 1 23:24:58 2002 +++ print/lyx/files/patch-autogen.sh Thu Jan 1 09:00:00 1970 @@ -1,32 +0,0 @@ ---- autogen.sh Thu Apr 18 22:11:28 2002 -+++ autogen.sh Fri Jun 28 21:55:35 2002 -@@ -1,9 +1,9 @@ - #!/bin/sh - - ACLOCAL=aclocal --AUTOHEADER=autoheader -+AUTOHEADER=autoheader213 - AUTOMAKE="automake -a -c --foreign" --AUTOCONF=autoconf -+AUTOCONF=autoconf213 - GNUM4= - - ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4" -@@ -31,7 +31,7 @@ - echo "done." - - # Generate the Makefiles and configure files --if ( aclocal --version ) </dev/null > /dev/null 2>&1; then -+if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then - echo "Building macros..." - for dir in . lib/reLyX sigc++ ; do - echo " $dir" -@@ -43,7 +43,7 @@ - exit - fi - --if ( autoheader --version ) </dev/null > /dev/null 2>&1; then -+if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then - echo "Building config header template..." - for dir in . sigc++ ; do - echo " $dir" diff -urN /usr/ports/print/lyx/files/patch-config::pspell.m4 print/lyx/files/patch-config::pspell.m4 --- /usr/ports/print/lyx/files/patch-config::pspell.m4 Mon Oct 7 10:21:23 2002 +++ print/lyx/files/patch-config::pspell.m4 Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- 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/lyx/files/patch-src::FontLoader.C print/lyx/files/patch-src::FontLoader.C --- /usr/ports/print/lyx/files/patch-src::FontLoader.C Fri Sep 20 12:25:03 2002 +++ print/lyx/files/patch-src::FontLoader.C Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ ---- 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/lyx/files/xforms.m4 print/lyx/files/xforms.m4 --- /usr/ports/print/lyx/files/xforms.m4 Fri Sep 20 12:25:03 2002 +++ print/lyx/files/xforms.m4 Thu Jan 1 09:00:00 1970 @@ -1,98 +0,0 @@ -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/lyx/pkg-plist print/lyx/pkg-plist --- /usr/ports/print/lyx/pkg-plist Fri Sep 20 19:34:06 2002 +++ print/lyx/pkg-plist Tue Jan 7 09:42:17 2003 @@ -83,6 +83,7 @@ share/lyx/doc/fr_UserGuide.lyx share/lyx/doc/he_Intro.lyx share/lyx/doc/he_TOC.lyx +share/lyx/doc/he_Tutorial.lyx share/lyx/doc/hu_Intro.lyx share/lyx/doc/hu_TOC.lyx share/lyx/doc/it_Customization.lyx @@ -104,6 +105,7 @@ share/lyx/doc/ro_Intro.lyx share/lyx/doc/ro_TOC.lyx share/lyx/doc/ro_splash.lyx +share/lyx/doc/ru_FAQ.lyx share/lyx/doc/ru_Intro.lyx share/lyx/doc/ru_TOC.lyx share/lyx/doc/ru_Tutorial.lyx @@ -155,6 +157,9 @@ share/lyx/examples/fr_exemple_lyxifie.lyx share/lyx/examples/fr_mathed.lyx share/lyx/examples/fr_splash.lyx +share/lyx/examples/he_example_raw.lyx +share/lyx/examples/he_he_example_lyxified.lyx +share/lyx/examples/he_he_example_raw.lyx share/lyx/examples/hu_splash.lyx share/lyx/examples/iecc05.fen share/lyx/examples/iecc07.fen @@ -331,6 +336,7 @@ share/lyx/layouts/heb-article.layout share/lyx/layouts/heb-letter.layout share/lyx/layouts/hollywood.layout +share/lyx/layouts/ijmpd.layout share/lyx/layouts/kluwer.layout share/lyx/layouts/latex8.layout share/lyx/layouts/letter.layout @@ -404,6 +410,7 @@ share/lyx/templates/g-brief-de.lyx share/lyx/templates/g-brief-en.lyx share/lyx/templates/hollywood.lyx +share/lyx/templates/ijmpd.lyx share/lyx/templates/kluwer.lyx share/lyx/templates/latex8.lyx share/lyx/templates/letter.lyx 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?200301101240.h0ACe7GV096644>