Attachment 35820 Details for Bug 57705 – file.diff

[patch] file.diff

file.diff (text/plain), 3.57 KB, created by tkato on 2003-10-07 15:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-10-07 15:20:11 UTC

Size: 3.57 KB

patch

obsolete

>diff -urN /usr/ports/print/lyx/Makefile print/lyx/Makefile
>--- /usr/ports/print/lyx/Makefile	Wed Aug 27 09:37:41 2003
>+++ print/lyx/Makefile	Tue Oct  7 14:24:58 2003
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	lyx
>-PORTVERSION=	1.3.2
>-PORTREVISION=	1
>+PORTVERSION=	1.3.3
> CATEGORIES=	print
> MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
> 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
>@@ -26,8 +25,7 @@
> USE_PERL5=	yes
> USE_PYTHON=	yes
> USE_GMAKE=	yes
>-GNU_CONFIGURE=	yes
>-USE_REINPLACE=	yes
>+USE_LIBTOOL_VER=	14
> CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
> CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
> 		--with-extra-inc="${LOCALBASE}/include"
>@@ -38,6 +36,8 @@
> .if defined(WITH_QT)
> 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
>@@ -57,12 +57,7 @@
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 500035
>-CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
>-.if defined(WITH_QT)
>-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
>-		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
>-		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
>-.endif
>+CFLAGS+=	-Wno-non-template-friend -ftemplate-depth-30
> .endif
> 
> pre-everything::
>@@ -86,10 +81,5 @@
> 	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ISPELL=yes\""
> 	@${ECHO_MSG}
> .endif
>-
>-post-patch:
>-	@${REINPLACE_CMD} -E -e \
>-		's|CFLAGS=$$|#CFLAGS=|' \
>-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/print/lyx/distinfo print/lyx/distinfo
>--- /usr/ports/print/lyx/distinfo	Wed May  7 20:41:27 2003
>+++ print/lyx/distinfo	Tue Oct  7 12:01:04 2003
>@@ -1 +1 @@
>-MD5 (lyx-1.3.2.tar.bz2) = e33cf84f7c5be4ab9bbcc6ea587d4fdc
>+MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
>diff -urN /usr/ports/print/lyx/pkg-plist print/lyx/pkg-plist
>--- /usr/ports/print/lyx/pkg-plist	Wed May  7 20:41:29 2003
>+++ print/lyx/pkg-plist	Tue Oct  7 12:48:55 2003
>@@ -26,6 +26,7 @@
> share/locale/tr/LC_MESSAGES/lyx.mo
> share/locale/wa/LC_MESSAGES/lyx.mo
> %%DATADIR%%/CREDITS
>+%%DATADIR%%/bind/aqua.bind
> %%DATADIR%%/bind/broadway.bind
> %%DATADIR%%/bind/cua.bind
> %%DATADIR%%/bind/cyrkeys.bind
>@@ -155,10 +156,10 @@
> %%DATADIR%%/examples/fr_Foils.lyx
> %%DATADIR%%/examples/fr_ListesPuces.lyx
> %%DATADIR%%/examples/fr_Minipage.lyx
>-%%DATADIR%%/examples/fr_MultiColonnes.lyx
> %%DATADIR%%/examples/fr_exemple_brut.lyx
> %%DATADIR%%/examples/fr_exemple_lyxifie.lyx
> %%DATADIR%%/examples/fr_mathed.lyx
>+%%DATADIR%%/examples/fr_multicol.lyx
> %%DATADIR%%/examples/fr_splash.lyx
> %%DATADIR%%/examples/he_example_raw.lyx
> %%DATADIR%%/examples/he_he_example_lyxified.lyx
>@@ -804,6 +805,7 @@
> %%DATADIR%%/layouts/ltugboat.layout
> %%DATADIR%%/layouts/lyxmacros.inc
> %%DATADIR%%/layouts/manpage.layout
>+%%DATADIR%%/layouts/memoir.layout
> %%DATADIR%%/layouts/mwart.layout
> %%DATADIR%%/layouts/mwbk.layout
> %%DATADIR%%/layouts/mwrep.layout
>@@ -889,8 +891,9 @@
> %%DATADIR%%/templates/g-brief-de.lyx
> %%DATADIR%%/templates/g-brief-en.lyx
> %%DATADIR%%/templates/hollywood.lyx
>-%%DATADIR%%/templates/koma-letter2.lyx
>+%%DATADIR%%/templates/ijmpd.lyx
> %%DATADIR%%/templates/kluwer.lyx
>+%%DATADIR%%/templates/koma-letter2.lyx
> %%DATADIR%%/templates/latex8.lyx
> %%DATADIR%%/templates/letter.lyx
> %%DATADIR%%/templates/linuxdoc_article.lyx
>@@ -905,6 +908,7 @@
> %%DATADIR%%/tex/revtex.cls
> %%DATADIR%%/textclass.lst
> %%DATADIR%%/ui/default.ui
>+%%DATADIR%%/xfonts/PSres.upr
> %%DATADIR%%/xfonts/cmex10.pfb
> %%DATADIR%%/xfonts/cmmi10.pfb
> %%DATADIR%%/xfonts/cmr10.pfb

Actions: View | Diff

Attachments on bug 57705: 35820