Attachment 40816 Details for Bug 64051 – file.diff

[patch] file.diff

file.diff (text/plain), 7.20 KB, created by tkato on 2004-03-10 14:10:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2004-03-10 14:10:21 UTC

Size: 7.20 KB

patch

obsolete

>diff -urN /usr/ports/www/amaya/Makefile www/amaya/Makefile
>--- /usr/ports/www/amaya/Makefile	Wed Feb  4 19:05:08 2004
>+++ www/amaya/Makefile	Wed Mar 10 18:17:37 2004
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	amaya
>-PORTVERSION=	8.2
>-PORTREVISION=	1
>+PORTVERSION=	8.3
> CATEGORIES=	www
> MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
> 		ftp://ftp.w3.org/pub/amaya/ \
>@@ -34,7 +33,8 @@
> GNU_CONFIGURE=	yes
> CONFIGURE_SCRIPT=	../configure
> CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}"
>-CONFIGURE_ARGS=	--without-graphic-libs
>+
>+CFLAGS+=	-fpermissive
> 
> CPPFLAGS=	-I${LOCALBASE}/include
> LDFLAGS=	-L${LOCALBASE}/lib
>@@ -59,9 +59,10 @@
> 
> .if ${XFREE86_VERSION} >= 4 && defined(WITH_OPENGL)
> LIB_DEPENDS+=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
>-USE_MESA=	yes
>+USE_GL=		yes
> CONFIGURE_ARGS+=	--with-gl
>-LDFLAGS+=	-lcompat
>+CFLAGS+=	${PTHREAD_CFLAGS}
>+LDFLAGS+=	-lcompat ${PTHREAD_LIBS}
> .endif
> 
> pre-everything::
>diff -urN /usr/ports/www/amaya/distinfo www/amaya/distinfo
>--- /usr/ports/www/amaya/distinfo	Sun Nov 16 10:26:33 2003
>+++ www/amaya/distinfo	Wed Mar 10 18:37:28 2004
>@@ -1,8 +1,16 @@
>-MD5 (amaya/amaya-src-8.2.tgz) = 5c70a26cb3b97c40febd779f4b604a29
>+MD5 (amaya/amaya-src-8.3.tgz) = 17ecfe47e27a8517344650627cc7762d
>+SIZE (amaya/amaya-src-8.3.tgz) = 9688629
> MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
>+SIZE (amaya/Dutch.tgz) = 1228989
> MD5 (amaya/English.tgz) = c1f7122288329dc3cbb3871ea00eb4b4
>-MD5 (amaya/French.tgz) = 1d3705478bdcb4b5aca827c4492f2a90
>+SIZE (amaya/English.tgz) = 619699
>+MD5 (amaya/French.tgz) = 2412b593ec42c7aac2a341e54a7bb936
>+SIZE (amaya/French.tgz) = 803561
> MD5 (amaya/German.tgz) = 400eeeae974a64d23de4fcdd609c30bc
>+SIZE (amaya/German.tgz) = 1132270
> MD5 (amaya/Italian.tgz) = 05e2d25ee8af11faaaa25a33da89d504
>+SIZE (amaya/Italian.tgz) = 323845
> MD5 (amaya/Spanish.tgz) = b504a75cd0f789a3046bf2041067b18b
>+SIZE (amaya/Spanish.tgz) = 525267
> MD5 (amaya/Swedish.tgz) = 6536ab2e31e3f58618ba79d9fddc7f76
>+SIZE (amaya/Swedish.tgz) = 96316
>diff -urN /usr/ports/www/amaya/files/patch-ad www/amaya/files/patch-ad
>--- /usr/ports/www/amaya/files/patch-ad	Tue Mar 20 14:54:37 2001
>+++ www/amaya/files/patch-ad	Wed Mar 10 15:33:03 2004
>@@ -1,15 +1,6 @@
>---- ../Options.in.orig	Fri Sep 15 23:24:26 2000
>-+++ ../Options.in	Sat Mar 17 08:53:21 2001
>-@@ -9,7 +9,7 @@
>- SHELL	= /bin/sh
>- 
>- CC	= @CC@
>--CFLAGS	= @CFLAGS@
>-+CFLAGS	= @CFLAGS@ @CPPFLAGS@
>- CPP     = @CPP@
>- LD	= @CC@
>- LDFLAGS	= @LDFLAGS@
>-@@ -24,8 +24,8 @@
>+--- ../Options.in.orig	Fri Jan 30 01:06:42 2004
>++++ ../Options.in	Wed Mar 10 14:37:42 2004
>+@@ -27,8 +27,8 @@
>  DIFF	= @DIFF@
>  INSTALL	= @INSTALL@
>  
>diff -urN /usr/ports/www/amaya/files/patch-configure www/amaya/files/patch-configure
>--- /usr/ports/www/amaya/files/patch-configure	Sat Apr 12 23:29:53 2003
>+++ www/amaya/files/patch-configure	Wed Mar 10 18:44:13 2004
>@@ -1,20 +1,20 @@
>---- ../configure.orig	Mon Feb  3 23:43:57 2003
>-+++ ../configure	Wed Feb  5 01:18:24 2003
>-@@ -6238,9 +6238,9 @@
>+--- ../configure.orig	Fri Jan 30 01:06:42 2004
>++++ ../configure	Wed Mar 10 18:44:02 2004
>+@@ -12713,9 +12713,9 @@
>      fi
>    done
>  
>--GTK_INCLUDES="`gtk-config --cflags`"
>-+GTK_INCLUDES="`imlib-config --cflags-gdk`"
>+-  GTK_INCLUDES="`gtk-config --cflags`"
>++  GTK_INCLUDES="`imlib-config --cflags-gdk`"
>  
>--GTK_LIBRARIES="`gtk-config --libs`"
>-+GTK_LIBRARIES="`imlib-config --libs-gdk`"
>- if test "${with_gl}" != "yes" ; then
>-  GTK_LIBRARIES="${GTK_LIBRARIES} -lgdk_imlib"
>- fi
>-@@ -7019,6 +7019,9 @@
>+-  GTK_LIBRARIES="`gtk-config --libs`"
>++  GTK_LIBRARIES="`imlib-config --libs-gdk`"
>+     if test "${with_gl}" != "yes" ; then
>+    GTK_LIBRARIES="${GTK_LIBRARIES} -lgdk_imlib"
>+   fi
>+@@ -13687,6 +13687,9 @@
>  if test "$with_dav" = "yes" ; then
>-     
>+ 
>      dav_frag=$srcdir/davlib/Makefile.dav
> +else
> +
>diff -urN /usr/ports/www/amaya/pkg-plist www/amaya/pkg-plist
>--- /usr/ports/www/amaya/pkg-plist	Sun Nov 16 10:26:33 2003
>+++ www/amaya/pkg-plist	Wed Mar 10 16:40:34 2004
>@@ -10,6 +10,8 @@
> Amaya/amaya/HTML.conf
> Amaya/amaya/HTML.en
> Amaya/amaya/HTML.trans
>+Amaya/amaya/HTML.trans.es
>+Amaya/amaya/HTML.trans.fr
> Amaya/amaya/HTMLP.PRS
> Amaya/amaya/HTMLPBW.PRS
> Amaya/amaya/HTMLPL.PRS
>@@ -28,6 +30,8 @@
> Amaya/amaya/MathML.conf
> Amaya/amaya/MathML.en
> Amaya/amaya/MathML.trans
>+Amaya/amaya/MathML.trans.es
>+Amaya/amaya/MathML.trans.fr
> Amaya/amaya/MathMLP.PRS
> Amaya/amaya/MathMLT.TRA
> Amaya/amaya/MathMLTX.TRA
>@@ -337,6 +341,7 @@
> Amaya/doc/html/Tables.html.fr
> Amaya/doc/html/Transform.html
> Amaya/doc/html/Transform.html.es
>+Amaya/doc/html/Tutorial.html.fr
> Amaya/doc/html/Views.html
> Amaya/doc/html/Views.html.de
> Amaya/doc/html/Views.html.es
>@@ -707,7 +712,6 @@
> Amaya/doc/images/ColorMenu.gif
> Amaya/doc/images/CooperationMenu.gif
> Amaya/doc/images/CooperationPreferences.gif
>-Amaya/doc/images/Cour.gif
> Amaya/doc/images/DL.gif
> Amaya/doc/images/Editor.gif
> Amaya/doc/images/Em.gif
>@@ -721,6 +725,7 @@
> Amaya/doc/images/H3.gif
> Amaya/doc/images/IDMenu.png
> Amaya/doc/images/Image.gif
>+Amaya/doc/images/Langue.png
> Amaya/doc/images/LangueNegotiation-fr.gif
> Amaya/doc/images/LangueNegotiation.gif
> Amaya/doc/images/LibraryDocDefaultStyle.gif
>@@ -745,10 +750,12 @@
> Amaya/doc/images/Strong.gif
> Amaya/doc/images/TemplatesMenu-fr.gif
> Amaya/doc/images/TemplatesMenu.gif
>+Amaya/doc/images/View.png
> Amaya/doc/images/align-de.png
> Amaya/doc/images/alternateview-de.jpg
> Amaya/doc/images/alternateview.jpg
> Amaya/doc/images/amaya.gif
>+Amaya/doc/images/anim.gif
> Amaya/doc/images/annot.png
> Amaya/doc/images/annotationicon-de.png
> Amaya/doc/images/annotationicon-es.png
>@@ -786,6 +793,9 @@
> Amaya/doc/images/configurebox-fr.png
> Amaya/doc/images/configurebox.png
> Amaya/doc/images/createRule-de.png
>+Amaya/doc/images/create_image-fr.png
>+Amaya/doc/images/create_link-fr.png
>+Amaya/doc/images/create_table-fr.png
> Amaya/doc/images/css-fr.gif
> Amaya/doc/images/css.gif
> Amaya/doc/images/dialog_save_as-de.png
>@@ -803,17 +813,21 @@
> Amaya/doc/images/geometry_preferences-es.png
> Amaya/doc/images/geometry_preferences.png
> Amaya/doc/images/graphics_palette-de.png
>+Amaya/doc/images/home.gif
> Amaya/doc/images/image_button.gif
>+Amaya/doc/images/invalid_profile-fr.png
> Amaya/doc/images/language_negotiation-de.png
> Amaya/doc/images/language_negotiation-es.png
> Amaya/doc/images/language_negotiation.png
> Amaya/doc/images/left.gif
>+Amaya/doc/images/libsvg.gif
> Amaya/doc/images/linksview-de.jpg
> Amaya/doc/images/linksview.jpg
> Amaya/doc/images/linkwindow.png
> Amaya/doc/images/localfilter-es.png
> Amaya/doc/images/localfilter.png
> Amaya/doc/images/math_palette-de.png
>+Amaya/doc/images/not_well_formed-fr.png
> Amaya/doc/images/open.png
> Amaya/doc/images/printoptions_w32-de.png
> Amaya/doc/images/profiles_preferences-de.png
>@@ -829,9 +843,12 @@
> Amaya/doc/images/right.gif
> Amaya/doc/images/scenario_graphique.png
> Amaya/doc/images/search_and_replace-de.png
>+Amaya/doc/images/search_and_replace-fr.png
> Amaya/doc/images/sourceview-de.jpg
> Amaya/doc/images/sourceview.jpg
> Amaya/doc/images/spellchecking-de.png
>+Amaya/doc/images/spellchecking-fr.png
>+Amaya/doc/images/stop.gif
> Amaya/doc/images/structureview-de.jpg
> Amaya/doc/images/structureview.jpg
> Amaya/doc/images/table.gif
>@@ -851,6 +868,7 @@
> Amaya/fonts/icones.pcf
> Amaya/fonts/icones1.fb
> Amaya/fonts/icones11.fb
>+Amaya/resources/xrc/InitConfirmDlgWX.xrc
> @dirrm Amaya/fonts
> @dirrm Amaya/doc/images
> @dirrm Amaya/doc/html/viewing

Actions: View | Diff

Attachments on bug 64051: 40816