Fix www/amaya/browser:
- don't declare static stuff (that's only needed in one file) as
extern in a header file.
- Use system jpeg again.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/amaya/browser/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 24 Apr 2010 20:18:39 -0000 1.21
+++ Makefile 5 Jun 2010 12:37:53 -0000
@@ -6,7 +6,7 @@ COMMENT= test-bed browser/authoring too
AMAYA_VERSION= 5.1
DISTNAME= amaya-src-${AMAYA_VERSION}
-PKGNAME= amaya-${AMAYA_VERSION}p5
+PKGNAME= amaya-${AMAYA_VERSION}p6
HOMEPAGE= http://www.w3.org/Amaya/
Index: patches/patch-Amaya_configure_in
===================================================================
RCS file: /cvs/ports/www/amaya/browser/patches/patch-Amaya_configure_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Amaya_configure_in
--- patches/patch-Amaya_configure_in 20 Dec 2003 01:17:43 -0000 1.2
+++ patches/patch-Amaya_configure_in 5 Jun 2010 12:37:53 -0000
@@ -1,6 +1,17 @@
$OpenBSD: patch-Amaya_configure_in,v 1.2 2003/12/20 01:17:43 espie Exp $
---- Amaya/configure.in.orig 2001-07-03 13:23:50.000000000 +0200
-+++ Amaya/configure.in 2003-12-20 02:05:54.000000000 +0100
+--- Amaya/configure.in.orig Tue Jul 3 13:23:50 2001
++++ Amaya/configure.in Sat Jun 5 14:30:06 2010
+@@ -55,8 +55,8 @@ AC_PATH_PROG(DIFF, diff, /usr/bin/diff, $PATH:/bin:/us
+ AC_ARG_WITH(graphic-libs, [ --without-graphic-libs doesn't use provided
libjpeg, libpng.])
+ if test "$withval" = "no" ; then
+ dnl
+- AC_MSG_CHECKING([for libjpeg version = 6b])
+- AC_EGREP_CPP([x 62 *x],
++ AC_MSG_CHECKING([for libjpeg version = 7])
++ AC_EGREP_CPP([x 70 *x],
+ [#include <jpeglib.h>
+ x JPEG_LIB_VERSION x],
+ dnl
@@ -69,8 +69,8 @@ dnl
)
dnl
@@ -45,7 +56,7 @@ $OpenBSD: patch-Amaya_configure_in,v 1.2
- break
- fi
- done
-+
+
+motif_includes_with=
+AC_ARG_WITH(motif-includes,
+[ --with-motif-includes=DIR
@@ -61,7 +72,7 @@ $OpenBSD: patch-Amaya_configure_in,v 1.2
+ use_gtk="$withval")
+no_gtk=yes
+if test "$use_gtk" != "no" ; then
-
++
GTK_INCLUDES="`gtk-config --cflags`"
AC_SUBST(GTK_INCLUDES)
GTK_LIBRARIES="`gtk-config --libs` -lgdk_imlib -ltiff -lgif"
Index: patches/patch-Amaya_thotlib_internals_var_boxes_tv_h
===================================================================
RCS file: patches/patch-Amaya_thotlib_internals_var_boxes_tv_h
diff -N patches/patch-Amaya_thotlib_internals_var_boxes_tv_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Amaya_thotlib_internals_var_boxes_tv_h 5 Jun 2010
12:37:53 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- Amaya/thotlib/internals/var/boxes_tv.h.orig Thu Mar 2 12:50:29 2000
++++ Amaya/thotlib/internals/var/boxes_tv.h Sat Jun 5 13:47:13 2010
+@@ -23,12 +23,3 @@ THOT_EXPORT ThotBool AnyWidthUpdate;
+ /* paragraphe to be reformatted after insertion */
+ THOT_EXPORT PtrAbstractBox LastInsertParagraph;
+ THOT_EXPORT PtrAbstractBox LastInsertCell;
+-
+-/* text element where the last insertion is done */
+-THOT_EXPORT PtrElement LastInsertElText;
+-THOT_EXPORT PtrElement LastInsertElement;
+-THOT_EXPORT int LastInsertThotWindow;
+-
+-/* attribute for which a presentation abstract box has been modified */
+-THOT_EXPORT PtrAttribute LastInsertAttr;
+-THOT_EXPORT PtrElement LastInsertAttrElem;
