Attachment 40401 Details for Bug 63498 – file.diff

[patch] file.diff

file.diff (text/plain), 6.62 KB, created by tkato on 2004-02-28 15:40:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2004-02-28 15:40:21 UTC

Size: 6.62 KB

patch

obsolete

>diff -urN /usr/ports/print/lyx/Makefile print/lyx/Makefile
>--- /usr/ports/print/lyx/Makefile	Fri Feb 27 19:03:50 2004
>+++ print/lyx/Makefile	Sat Feb 28 19:58:07 2004
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	lyx
>-PORTVERSION=	1.3.3
>-PORTREVISION=	1
>+PORTVERSION=	1.3.4
> CATEGORIES=	print
> MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
> 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
>@@ -34,14 +33,19 @@
> 		AUTOHEADER="${TRUE}"
> MAN1=		lyx.1 reLyX.1
> 
>+OPTIONS=	ASPELL "Aspell/Pspell support" off \
>+		ISPELL "Ispell support" off
>+#OPTIONS+=	QT "Qt3 frontend" off
>+
> .if defined(WITH_QT)
>+BROKEN=		imcompatible with Qt-3.2.x at now
> USE_QT_VER=	3
>-CONFIGURE_ARGS+=	--with-frontend=qt
>-QTCPPFLAGS+=	${PTHREAD_CFLAGS}
>-QTCFGLIBS+=	${PTHREAD_LIBS}
>-.else
>-LIB_DEPENDS+=	forms.1:${PORTSDIR}/x11-toolkits/xforms
>-USE_XPM=	yes
>+.endif
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 500035
>+CFLAGS+=	-Wno-non-template-friend -ftemplate-depth-30
> .endif
> 
> .if defined(WITH_ASPELL)
>@@ -55,32 +59,13 @@
> RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${OSVERSION} < 500035
>-CFLAGS+=	-Wno-non-template-friend -ftemplate-depth-30
>-.endif
>-
>-pre-everything::
>-.if !defined(WITH_QT)
>-	@${ECHO_MSG}
>-	@${ECHO_MSG} "If you want to build with the Qt3 frontend,"
>-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_QT=yes\""
>-	@${ECHO_MSG}
>-.endif
>-
>-.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
>-
>-.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}
>+.if defined(WITH_QT)
>+CONFIGURE_ARGS+=	--with-frontend=qt
>+QTCPPFLAGS+=	${PTHREAD_CFLAGS}
>+QTCFGLIBS+=	${PTHREAD_LIBS}
>+.else
>+LIB_DEPENDS+=	forms.1:${PORTSDIR}/x11-toolkits/xforms
>+USE_XPM=	yes
> .endif
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/print/lyx/distinfo print/lyx/distinfo
>--- /usr/ports/print/lyx/distinfo	Fri Nov  7 11:04:03 2003
>+++ print/lyx/distinfo	Sun Feb 22 20:01:29 2004
>@@ -1 +1,2 @@
>-MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
>+MD5 (lyx-1.3.4.tar.bz2) = 13fe7a7bcec0430e9a9436f2e3cfa04e
>+SIZE (lyx-1.3.4.tar.bz2) = 5404453
>diff -urN /usr/ports/print/lyx/files/patch-lib::Makefile.am print/lyx/files/patch-lib::Makefile.am
>--- /usr/ports/print/lyx/files/patch-lib::Makefile.am	Thu Feb 26 03:43:30 2004
>+++ print/lyx/files/patch-lib::Makefile.am	Thu Jan  1 09:00:00 1970
>@@ -1,15 +0,0 @@
>---- lib/Makefile.am.orig	Wed Sep 17 15:13:05 2003
>-+++ lib/Makefile.am	Wed Feb 18 18:24:39 2004
>-@@ -58,8 +58,10 @@
>- 	  ln -f -s `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \
>- 	done ; \
>- 	$(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir ; \
>--	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale
>--	test -f xfonts/PSres.upr && $(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr
>-+	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale ;
>-+	if test -f xfonts/PSres.upr ; then
>-+	$(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr ;
>-+	fi
>- 
>- uninstall-xfonts:
>- 	rm -rf $(DESTDIR)$(pkgdatadir)/xfonts
>diff -urN /usr/ports/print/lyx/pkg-plist print/lyx/pkg-plist
>--- /usr/ports/print/lyx/pkg-plist	Fri Nov  7 11:04:03 2003
>+++ print/lyx/pkg-plist	Sat Feb 28 18:53:23 2004
>@@ -1,30 +1,21 @@
> bin/lyx
> bin/noweb2lyx
> bin/reLyX
>-share/locale/bg/LC_MESSAGES/lyx.mo
>-share/locale/ca/LC_MESSAGES/lyx.mo
>-share/locale/cs/LC_MESSAGES/lyx.mo
> share/locale/da/LC_MESSAGES/lyx.mo
> share/locale/de/LC_MESSAGES/lyx.mo
> share/locale/es/LC_MESSAGES/lyx.mo
> share/locale/eu/LC_MESSAGES/lyx.mo
> share/locale/fi/LC_MESSAGES/lyx.mo
> share/locale/fr/LC_MESSAGES/lyx.mo
>-share/locale/he/LC_MESSAGES/lyx.mo
>-share/locale/hu/LC_MESSAGES/lyx.mo
> share/locale/it/LC_MESSAGES/lyx.mo
> share/locale/nl/LC_MESSAGES/lyx.mo
> share/locale/nn/LC_MESSAGES/lyx.mo
> share/locale/no/LC_MESSAGES/lyx.mo
> share/locale/pl/LC_MESSAGES/lyx.mo
>-share/locale/pt/LC_MESSAGES/lyx.mo
> share/locale/ro/LC_MESSAGES/lyx.mo
> share/locale/ru/LC_MESSAGES/lyx.mo
> share/locale/sk/LC_MESSAGES/lyx.mo
> share/locale/sl/LC_MESSAGES/lyx.mo
>-share/locale/sv/LC_MESSAGES/lyx.mo
>-share/locale/tr/LC_MESSAGES/lyx.mo
>-share/locale/wa/LC_MESSAGES/lyx.mo
> %%DATADIR%%/CREDITS
> %%DATADIR%%/bind/aqua.bind
> %%DATADIR%%/bind/broadway.bind
>@@ -73,9 +64,11 @@
> %%DATADIR%%/doc/es_TOC.lyx
> %%DATADIR%%/doc/es_Tutorial.lyx
> %%DATADIR%%/doc/escher-lsd.eps
>+%%DATADIR%%/doc/eu_Extended.lyx
> %%DATADIR%%/doc/eu_Intro.lyx
> %%DATADIR%%/doc/eu_TOC.lyx
> %%DATADIR%%/doc/eu_Tutorial.lyx
>+%%DATADIR%%/doc/eu_UserGuide.lyx
> %%DATADIR%%/doc/fr_Customization.lyx
> %%DATADIR%%/doc/fr_Extended.lyx
> %%DATADIR%%/doc/fr_FAQ.lyx
>@@ -97,6 +90,8 @@
> %%DATADIR%%/doc/nl_Intro.lyx
> %%DATADIR%%/doc/nl_TOC.lyx
> %%DATADIR%%/doc/nl_Tutorial.lyx
>+%%DATADIR%%/doc/no_Intro.lyx
>+%%DATADIR%%/doc/no_TOC.lyx
> %%DATADIR%%/doc/pl_Extended.lyx
> %%DATADIR%%/doc/pl_Intro.lyx
> %%DATADIR%%/doc/pl_TOC.lyx
>@@ -161,6 +156,7 @@
> %%DATADIR%%/examples/fr_mathed.lyx
> %%DATADIR%%/examples/fr_multicol.lyx
> %%DATADIR%%/examples/fr_splash.lyx
>+%%DATADIR%%/examples/g-brief2.lyx
> %%DATADIR%%/examples/he_example_raw.lyx
> %%DATADIR%%/examples/he_he_example_lyxified.lyx
> %%DATADIR%%/examples/he_he_example_raw.lyx
>@@ -700,6 +696,7 @@
> %%DATADIR%%/kbd/cp1251.cdef
> %%DATADIR%%/kbd/czech-prg.kmap
> %%DATADIR%%/kbd/czech.kmap
>+%%DATADIR%%/kbd/espanol.kmap
> %%DATADIR%%/kbd/european.kmap
> %%DATADIR%%/kbd/francais.kmap
> %%DATADIR%%/kbd/french.kmap
>@@ -748,6 +745,7 @@
> %%DATADIR%%/layouts/aapaper.inc
> %%DATADIR%%/layouts/aapaper.layout
> %%DATADIR%%/layouts/aastex.layout
>+%%DATADIR%%/layouts/agums.layout
> %%DATADIR%%/layouts/aguplus.inc
> %%DATADIR%%/layouts/amsart-plain.layout
> %%DATADIR%%/layouts/amsart-seq.layout
>@@ -766,6 +764,7 @@
> %%DATADIR%%/layouts/cv.layout
> %%DATADIR%%/layouts/db_lyxmacros.inc
> %%DATADIR%%/layouts/db_stdclass.inc
>+%%DATADIR%%/layouts/db_stdcounters.inc
> %%DATADIR%%/layouts/db_stdlayouts.inc
> %%DATADIR%%/layouts/db_stdlists.inc
> %%DATADIR%%/layouts/db_stdsections.inc
>@@ -788,6 +787,7 @@
> %%DATADIR%%/layouts/foils.layout
> %%DATADIR%%/layouts/g-brief-de.layout
> %%DATADIR%%/layouts/g-brief-en.layout
>+%%DATADIR%%/layouts/g-brief2.layout
> %%DATADIR%%/layouts/heb-article.layout
> %%DATADIR%%/layouts/heb-letter.layout
> %%DATADIR%%/layouts/hollywood.layout
>@@ -841,6 +841,7 @@
> %%DATADIR%%/lyx2lyx/error.py
> %%DATADIR%%/lyx2lyx/error.pyc
> %%DATADIR%%/lyx2lyx/lyx2lyx
>+%%DATADIR%%/lyx2lyx/lyxconvert_210.py
> %%DATADIR%%/lyx2lyx/lyxconvert_215.py
> %%DATADIR%%/lyx2lyx/lyxconvert_215.pyc
> %%DATADIR%%/lyx2lyx/lyxconvert_216.py

Actions: View | Diff

Attachments on bug 63498: 40401