Attachment #40816 for bug #64051

View | Details | Raw Unified | Return to bug 64051
Collapse All | Expand All




#

PORTNAME=	amaya
PORTVERSION=	8.3
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
		ftp://ftp.w3.org/pub/amaya/ \

GNU_CONFIGURE=	yes
CONFIGURE_SCRIPT=	../configure
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}"

CFLAGS+=	-fpermissive

CPPFLAGS=	-I${LOCALBASE}/include
LDFLAGS=	-L${LOCALBASE}/lib


.if ${XFREE86_VERSION} >= 4 && defined(WITH_OPENGL)
LIB_DEPENDS+=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
USE_GL=		yes
CONFIGURE_ARGS+=	--with-gl
CFLAGS+=	${PTHREAD_CFLAGS}
LDFLAGS+=	-lcompat ${PTHREAD_LIBS}
.endif

pre-everything::

Lines 1-8 Link Here

(-)www/amaya/distinfo (-2 / +10 lines)
1	MD5 (amaya/amaya-src-8.2.tgz) = 5c70a26cb3b97c40febd779f4b604a29	1	MD5 (amaya/amaya-src-8.3.tgz) = 17ecfe47e27a8517344650627cc7762d
		2	SIZE (amaya/amaya-src-8.3.tgz) = 9688629
2	MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981	3	MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
		4	SIZE (amaya/Dutch.tgz) = 1228989
3	MD5 (amaya/English.tgz) = c1f7122288329dc3cbb3871ea00eb4b4	5	MD5 (amaya/English.tgz) = c1f7122288329dc3cbb3871ea00eb4b4
4	MD5 (amaya/French.tgz) = 1d3705478bdcb4b5aca827c4492f2a90	6	SIZE (amaya/English.tgz) = 619699
		7	MD5 (amaya/French.tgz) = 2412b593ec42c7aac2a341e54a7bb936
		8	SIZE (amaya/French.tgz) = 803561
5	MD5 (amaya/German.tgz) = 400eeeae974a64d23de4fcdd609c30bc	9	MD5 (amaya/German.tgz) = 400eeeae974a64d23de4fcdd609c30bc
		10	SIZE (amaya/German.tgz) = 1132270
6	MD5 (amaya/Italian.tgz) = 05e2d25ee8af11faaaa25a33da89d504	11	MD5 (amaya/Italian.tgz) = 05e2d25ee8af11faaaa25a33da89d504
		12	SIZE (amaya/Italian.tgz) = 323845
7	MD5 (amaya/Spanish.tgz) = b504a75cd0f789a3046bf2041067b18b	13	MD5 (amaya/Spanish.tgz) = b504a75cd0f789a3046bf2041067b18b
		14	SIZE (amaya/Spanish.tgz) = 525267
8	MD5 (amaya/Swedish.tgz) = 6536ab2e31e3f58618ba79d9fddc7f76	15	MD5 (amaya/Swedish.tgz) = 6536ab2e31e3f58618ba79d9fddc7f76
		16	SIZE (amaya/Swedish.tgz) = 96316

Lines 1-15 Link Here

(-)www/amaya/files/patch-ad (-12 / +3 lines)
1	--- ../Options.in.orig Fri Sep 15 23:24:26 2000	1	--- ../Options.in.orig Fri Jan 30 01:06:42 2004
2	+++ ../Options.in Sat Mar 17 08:53:21 2001	2	+++ ../Options.in Wed Mar 10 14:37:42 2004
3	@@ -9,7 +9,7 @@	3	@@ -27,8 +27,8 @@
4	SHELL = /bin/sh
5
6	CC = @CC@
7	-CFLAGS = @CFLAGS@
8	+CFLAGS = @CFLAGS@ @CPPFLAGS@
9	CPP = @CPP@
10	LD = @CC@
11	LDFLAGS = @LDFLAGS@
12	@@ -24,8 +24,8 @@
13	DIFF = @DIFF@	4	DIFF = @DIFF@
14	INSTALL = @INSTALL@	5	INSTALL = @INSTALL@
15		6




--- ../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_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
+

Lines 10-15 Link Here

(-)www/amaya/pkg-plist (-1 / +19 lines)
10	Amaya/amaya/HTML.conf	10	Amaya/amaya/HTML.conf
11	Amaya/amaya/HTML.en	11	Amaya/amaya/HTML.en
12	Amaya/amaya/HTML.trans	12	Amaya/amaya/HTML.trans
		13	Amaya/amaya/HTML.trans.es
		14	Amaya/amaya/HTML.trans.fr
13	Amaya/amaya/HTMLP.PRS	15	Amaya/amaya/HTMLP.PRS
14	Amaya/amaya/HTMLPBW.PRS	16	Amaya/amaya/HTMLPBW.PRS
15	Amaya/amaya/HTMLPL.PRS	17	Amaya/amaya/HTMLPL.PRS
Lines 28-33 Link Here
28	Amaya/amaya/MathML.conf	30	Amaya/amaya/MathML.conf
29	Amaya/amaya/MathML.en	31	Amaya/amaya/MathML.en
30	Amaya/amaya/MathML.trans	32	Amaya/amaya/MathML.trans
		33	Amaya/amaya/MathML.trans.es
		34	Amaya/amaya/MathML.trans.fr
31	Amaya/amaya/MathMLP.PRS	35	Amaya/amaya/MathMLP.PRS
32	Amaya/amaya/MathMLT.TRA	36	Amaya/amaya/MathMLT.TRA
33	Amaya/amaya/MathMLTX.TRA	37	Amaya/amaya/MathMLTX.TRA
Lines 337-342 Link Here
337	Amaya/doc/html/Tables.html.fr	341	Amaya/doc/html/Tables.html.fr
338	Amaya/doc/html/Transform.html	342	Amaya/doc/html/Transform.html
339	Amaya/doc/html/Transform.html.es	343	Amaya/doc/html/Transform.html.es
		344	Amaya/doc/html/Tutorial.html.fr
340	Amaya/doc/html/Views.html	345	Amaya/doc/html/Views.html
341	Amaya/doc/html/Views.html.de	346	Amaya/doc/html/Views.html.de
342	Amaya/doc/html/Views.html.es	347	Amaya/doc/html/Views.html.es
Lines 707-713 Link Here
707	Amaya/doc/images/ColorMenu.gif	712	Amaya/doc/images/ColorMenu.gif
708	Amaya/doc/images/CooperationMenu.gif	713	Amaya/doc/images/CooperationMenu.gif
709	Amaya/doc/images/CooperationPreferences.gif	714	Amaya/doc/images/CooperationPreferences.gif
710	Amaya/doc/images/Cour.gif
711	Amaya/doc/images/DL.gif	715	Amaya/doc/images/DL.gif
712	Amaya/doc/images/Editor.gif	716	Amaya/doc/images/Editor.gif
713	Amaya/doc/images/Em.gif	717	Amaya/doc/images/Em.gif
Lines 721-726 Link Here
721	Amaya/doc/images/H3.gif	725	Amaya/doc/images/H3.gif
722	Amaya/doc/images/IDMenu.png	726	Amaya/doc/images/IDMenu.png
723	Amaya/doc/images/Image.gif	727	Amaya/doc/images/Image.gif
		728	Amaya/doc/images/Langue.png
724	Amaya/doc/images/LangueNegotiation-fr.gif	729	Amaya/doc/images/LangueNegotiation-fr.gif
725	Amaya/doc/images/LangueNegotiation.gif	730	Amaya/doc/images/LangueNegotiation.gif
726	Amaya/doc/images/LibraryDocDefaultStyle.gif	731	Amaya/doc/images/LibraryDocDefaultStyle.gif
Lines 745-754 Link Here
745	Amaya/doc/images/Strong.gif	750	Amaya/doc/images/Strong.gif
746	Amaya/doc/images/TemplatesMenu-fr.gif	751	Amaya/doc/images/TemplatesMenu-fr.gif
747	Amaya/doc/images/TemplatesMenu.gif	752	Amaya/doc/images/TemplatesMenu.gif
		753	Amaya/doc/images/View.png
748	Amaya/doc/images/align-de.png	754	Amaya/doc/images/align-de.png
749	Amaya/doc/images/alternateview-de.jpg	755	Amaya/doc/images/alternateview-de.jpg
750	Amaya/doc/images/alternateview.jpg	756	Amaya/doc/images/alternateview.jpg
751	Amaya/doc/images/amaya.gif	757	Amaya/doc/images/amaya.gif
		758	Amaya/doc/images/anim.gif
752	Amaya/doc/images/annot.png	759	Amaya/doc/images/annot.png
753	Amaya/doc/images/annotationicon-de.png	760	Amaya/doc/images/annotationicon-de.png
754	Amaya/doc/images/annotationicon-es.png	761	Amaya/doc/images/annotationicon-es.png
Lines 786-791 Link Here
786	Amaya/doc/images/configurebox-fr.png	793	Amaya/doc/images/configurebox-fr.png
787	Amaya/doc/images/configurebox.png	794	Amaya/doc/images/configurebox.png
788	Amaya/doc/images/createRule-de.png	795	Amaya/doc/images/createRule-de.png
		796	Amaya/doc/images/create_image-fr.png
		797	Amaya/doc/images/create_link-fr.png
		798	Amaya/doc/images/create_table-fr.png
789	Amaya/doc/images/css-fr.gif	799	Amaya/doc/images/css-fr.gif
790	Amaya/doc/images/css.gif	800	Amaya/doc/images/css.gif
791	Amaya/doc/images/dialog_save_as-de.png	801	Amaya/doc/images/dialog_save_as-de.png
Lines 803-819 Link Here
803	Amaya/doc/images/geometry_preferences-es.png	813	Amaya/doc/images/geometry_preferences-es.png
804	Amaya/doc/images/geometry_preferences.png	814	Amaya/doc/images/geometry_preferences.png
805	Amaya/doc/images/graphics_palette-de.png	815	Amaya/doc/images/graphics_palette-de.png
		816	Amaya/doc/images/home.gif
806	Amaya/doc/images/image_button.gif	817	Amaya/doc/images/image_button.gif
		818	Amaya/doc/images/invalid_profile-fr.png
807	Amaya/doc/images/language_negotiation-de.png	819	Amaya/doc/images/language_negotiation-de.png
808	Amaya/doc/images/language_negotiation-es.png	820	Amaya/doc/images/language_negotiation-es.png
809	Amaya/doc/images/language_negotiation.png	821	Amaya/doc/images/language_negotiation.png
810	Amaya/doc/images/left.gif	822	Amaya/doc/images/left.gif
		823	Amaya/doc/images/libsvg.gif
811	Amaya/doc/images/linksview-de.jpg	824	Amaya/doc/images/linksview-de.jpg
812	Amaya/doc/images/linksview.jpg	825	Amaya/doc/images/linksview.jpg
813	Amaya/doc/images/linkwindow.png	826	Amaya/doc/images/linkwindow.png
814	Amaya/doc/images/localfilter-es.png	827	Amaya/doc/images/localfilter-es.png
815	Amaya/doc/images/localfilter.png	828	Amaya/doc/images/localfilter.png
816	Amaya/doc/images/math_palette-de.png	829	Amaya/doc/images/math_palette-de.png
		830	Amaya/doc/images/not_well_formed-fr.png
817	Amaya/doc/images/open.png	831	Amaya/doc/images/open.png
818	Amaya/doc/images/printoptions_w32-de.png	832	Amaya/doc/images/printoptions_w32-de.png
819	Amaya/doc/images/profiles_preferences-de.png	833	Amaya/doc/images/profiles_preferences-de.png
Lines 829-837 Link Here
829	Amaya/doc/images/right.gif	843	Amaya/doc/images/right.gif
830	Amaya/doc/images/scenario_graphique.png	844	Amaya/doc/images/scenario_graphique.png
831	Amaya/doc/images/search_and_replace-de.png	845	Amaya/doc/images/search_and_replace-de.png
		846	Amaya/doc/images/search_and_replace-fr.png
832	Amaya/doc/images/sourceview-de.jpg	847	Amaya/doc/images/sourceview-de.jpg
833	Amaya/doc/images/sourceview.jpg	848	Amaya/doc/images/sourceview.jpg
834	Amaya/doc/images/spellchecking-de.png	849	Amaya/doc/images/spellchecking-de.png
		850	Amaya/doc/images/spellchecking-fr.png
		851	Amaya/doc/images/stop.gif
835	Amaya/doc/images/structureview-de.jpg	852	Amaya/doc/images/structureview-de.jpg
836	Amaya/doc/images/structureview.jpg	853	Amaya/doc/images/structureview.jpg
837	Amaya/doc/images/table.gif	854	Amaya/doc/images/table.gif
Lines 851-856 Link Here
851	Amaya/fonts/icones.pcf	868	Amaya/fonts/icones.pcf
852	Amaya/fonts/icones1.fb	869	Amaya/fonts/icones1.fb
853	Amaya/fonts/icones11.fb	870	Amaya/fonts/icones11.fb
		871	Amaya/resources/xrc/InitConfirmDlgWX.xrc
854	@dirrm Amaya/fonts	872	@dirrm Amaya/fonts
855	@dirrm Amaya/doc/images	873	@dirrm Amaya/doc/images
856	@dirrm Amaya/doc/html/viewing	874	@dirrm Amaya/doc/html/viewing

Return to bug 64051

Lines 6-13 Link Here

(-)www/amaya/Makefile (-5 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= amaya	8	PORTNAME= amaya
9	PORTVERSION= 8.2	9	PORTVERSION= 8.3
10	PORTREVISION= 1
11	CATEGORIES= www	10	CATEGORIES= www
12	MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \	11	MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \
13	ftp://ftp.w3.org/pub/amaya/ \	12	ftp://ftp.w3.org/pub/amaya/ \
Lines 34-40 Link Here
34	GNU_CONFIGURE= yes	33	GNU_CONFIGURE= yes
35	CONFIGURE_SCRIPT= ../configure	34	CONFIGURE_SCRIPT= ../configure
36	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}"	35	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}"
37	CONFIGURE_ARGS= --without-graphic-libs	36
		37	CFLAGS+= -fpermissive
38		38
39	CPPFLAGS= -I${LOCALBASE}/include	39	CPPFLAGS= -I${LOCALBASE}/include
40	LDFLAGS= -L${LOCALBASE}/lib	40	LDFLAGS= -L${LOCALBASE}/lib
Lines 59-67 Link Here
59		59
60	.if ${XFREE86_VERSION} >= 4 && defined(WITH_OPENGL)	60	.if ${XFREE86_VERSION} >= 4 && defined(WITH_OPENGL)
61	LIB_DEPENDS+= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea	61	LIB_DEPENDS+= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
62	USE_MESA= yes	62	USE_GL= yes
63	CONFIGURE_ARGS+= --with-gl	63	CONFIGURE_ARGS+= --with-gl
64	LDFLAGS+= -lcompat	64	CFLAGS+= ${PTHREAD_CFLAGS}
		65	LDFLAGS+= -lcompat ${PTHREAD_LIBS}
65	.endif	66	.endif
66		67
67	pre-everything::	68	pre-everything::

Lines 1-20 Link Here

(-)www/amaya/files/patch-configure (-12 / +12 lines)
1	--- ../configure.orig Mon Feb 3 23:43:57 2003	1	--- ../configure.orig Fri Jan 30 01:06:42 2004
2	+++ ../configure Wed Feb 5 01:18:24 2003	2	+++ ../configure Wed Mar 10 18:44:02 2004
3	@@ -6238,9 +6238,9 @@	3	@@ -12713,9 +12713,9 @@
4	fi	4	fi
5	done	5	done
6		6
7	-GTK_INCLUDES="`gtk-config --cflags`"	7	- GTK_INCLUDES="`gtk-config --cflags`"
8	+GTK_INCLUDES="`imlib-config --cflags-gdk`"	8	+ GTK_INCLUDES="`imlib-config --cflags-gdk`"
9		9
10	-GTK_LIBRARIES="`gtk-config --libs`"	10	- GTK_LIBRARIES="`gtk-config --libs`"
11	+GTK_LIBRARIES="`imlib-config --libs-gdk`"	11	+ GTK_LIBRARIES="`imlib-config --libs-gdk`"
12	if test "${with_gl}" != "yes" ; then	12	if test "${with_gl}" != "yes" ; then
13	GTK_LIBRARIES="${GTK_LIBRARIES} -lgdk_imlib"	13	GTK_LIBRARIES="${GTK_LIBRARIES} -lgdk_imlib"
14	fi	14	fi
15	@@ -7019,6 +7019,9 @@	15	@@ -13687,6 +13687,9 @@
16	if test "$with_dav" = "yes" ; then	16	if test "$with_dav" = "yes" ; then
17		17
18	dav_frag=$srcdir/davlib/Makefile.dav	18	dav_frag=$srcdir/davlib/Makefile.dav
19	+else	19	+else
20	+	20	+