Updated fox to 1.0.43. Many changes and fixes to paste here, to see

a full list of changes:

http://www.fox-toolkit.org/news.html

Closes my own PR pkg/22407. Ok'ed by wiz@

9 files changed, 155 insertions, 93 deletions

diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index 2b9c244da91..fae49906219 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,41 +1,27 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:24 grant Exp $
-# FreeBSD Id: ports/x11-toolkits/fox/Makefile,v 1.14 2001/02/23 19:00:05 knu Exp
+# $NetBSD: Makefile,v 1.13 2003/08/29 10:16:11 xtraeme Exp $
+#
 
-DISTNAME=	fox-0.99.174
-PKGREVISION=	2
+DISTNAME=	fox-1.0.43
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.cfdrc.com/pub/FOX/ \
-		ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
+MASTER_SITES=	http://www.fox-toolkit.org/ftp/
 
 MAINTAINER=	sakamoto@NetBSD.org
-HOMEPAGE=	http://www.cfdrc.com/FOX/fox.html
+HOMEPAGE=	http://www.fox-toolkit.org/
 COMMENT=	Fast and extensive C++ GUI toolkit
 
-.if !defined(FOX_USE_XUNICODE) || ${FOX_USE_XUNICODE} == "YES"
-
-MASTER_SITES+=	http://www.ab.wakwak.com/~tino/jatk/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xunicode-0.3.3${EXTRACT_SUFX}
-
-PATCH_SITES=	http://www.ab.wakwak.com/~tino/jatk/fox/
-PATCHFILES=	${DISTNAME:C/-/-unicode-/}.diff
-PATCH_DIST_STRIP=-p1
-
-CPPFLAGS+=	-I..
-X_CFLAGS=	-DUSE_UNICODE
-CONFIGURE_ENV+=	X_CFLAGS="${X_CFLAGS}"
-
-.endif
-
 USE_BUILDLINK2=	# defined
-USE_X11BASE=	# defined
+USE_X11=	# defined
 USE_LIBTOOL=	# defined
-LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-
 GNU_CONFIGURE=	# defined
-CONFIGURE_ARGS+=--with-opengl=mesa --with-x --with-shm=yes --enable-release
+
+CONFIGURE_ARGS+=	--with-opengl=mesa 
+CONFIGURE_ARGS+=	--with-x
+CONFIFURE_ARGS+=	--with-shm=yes
+CONFIGURE_ARGS+=	--enable-release
 
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
 .include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../graphics/glu/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fox/PLIST b/x11/fox/PLIST
index a7ad0360473..193960afe12 100644
--- a/x11/fox/PLIST
+++ b/x11/fox/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:40 zuntum Exp $
-bin/reswrap
-bin/calculator
+@comment $NetBSD: PLIST,v 1.2 2003/08/29 10:16:12 xtraeme Exp $
 bin/PathFinder
-bin/textedit
+bin/adie
+bin/calculator
+bin/reswrap
 include/fox/FX4Splitter.h
 include/fox/FXAccelTable.h
 include/fox/FXApp.h
@@ -12,12 +12,15 @@ include/fox/FXBMPIcon.h
 include/fox/FXBMPImage.h
 include/fox/FXBitmap.h
 include/fox/FXButton.h
+include/fox/FXCURCursor.h
 include/fox/FXCanvas.h
 include/fox/FXCharset.h
 include/fox/FXCheckButton.h
+include/fox/FXColorBar.h
 include/fox/FXColorDialog.h
 include/fox/FXColorSelector.h
 include/fox/FXColorWell.h
+include/fox/FXColorWheel.h
 include/fox/FXComboBox.h
 include/fox/FXComposite.h
 include/fox/FXCursor.h
@@ -72,14 +75,16 @@ include/fox/FXHMat.h
 include/fox/FXHVec.h
 include/fox/FXHeader.h
 include/fox/FXHorizontalFrame.h
+include/fox/FXICOIcon.h
+include/fox/FXICOImage.h
 include/fox/FXIcon.h
 include/fox/FXIconList.h
 include/fox/FXId.h
 include/fox/FXImage.h
 include/fox/FXImageView.h
 include/fox/FXInputDialog.h
-include/fox/FXJPEGIcon.h
-include/fox/FXJPEGImage.h
+include/fox/FXJPGIcon.h
+include/fox/FXJPGImage.h
 include/fox/FXLabel.h
 include/fox/FXList.h
 include/fox/FXListBox.h
@@ -105,13 +110,15 @@ include/fox/FXPCXImage.h
 include/fox/FXPNGIcon.h
 include/fox/FXPNGImage.h
 include/fox/FXPacker.h
+include/fox/FXPicker.h
 include/fox/FXPoint.h
 include/fox/FXPopup.h
 include/fox/FXPrintDialog.h
-include/fox/FXProfiler.h
 include/fox/FXProgressBar.h
 include/fox/FXProgressDialog.h
 include/fox/FXQuat.h
+include/fox/FXRGBIcon.h
+include/fox/FXRGBImage.h
 include/fox/FXRadioButton.h
 include/fox/FXRange.h
 include/fox/FXRecentFiles.h
@@ -119,6 +126,7 @@ include/fox/FXRectangle.h
 include/fox/FXRegion.h
 include/fox/FXRegistry.h
 include/fox/FXReplaceDialog.h
+include/fox/FXRex.h
 include/fox/FXRootWindow.h
 include/fox/FXScrollArea.h
 include/fox/FXScrollWindow.h
@@ -136,10 +144,15 @@ include/fox/FXStatusbar.h
 include/fox/FXStatusline.h
 include/fox/FXStream.h
 include/fox/FXString.h
+include/fox/FXStringDict.h
 include/fox/FXSwitcher.h
+include/fox/FXTGAIcon.h
+include/fox/FXTGAImage.h
 include/fox/FXTIFIcon.h
 include/fox/FXTIFImage.h
-include/fox/FXTab.h
+include/fox/FXTabBar.h
+include/fox/FXTabBook.h
+include/fox/FXTabItem.h
 include/fox/FXTable.h
 include/fox/FXText.h
 include/fox/FXTextField.h
@@ -164,60 +177,99 @@ include/fox/fx.h
 include/fox/fx3d.h
 include/fox/fxdefs.h
 include/fox/fxkeys.h
-include/fox/fxregex.h
 include/fox/fxver.h
 include/fox/xincs.h
-lib/libFOX-0.99.so.174.0
-lib/libFOX-0.99.so.174
-lib/libFOX-0.99.so
+lib/libFOX-1.0.so
+lib/libFOX-1.0.so.0
+lib/libFOX-1.0.so.0.43
 lib/libFOX.a
 lib/libFOX.la
 lib/libFOX.so
+man/man1/PathFinder.1
+man/man1/adie.1
+man/man1/calculator.1
 man/man1/reswrap.1
+share/doc/html/fox/adie.html
 share/doc/html/fox/app.html
-share/doc/html/fox/bigpenguin.png
-share/doc/html/fox/cfdrc.png
-share/doc/html/fox/cfdrclogo.png
+share/doc/html/fox/art/bigpenguin.png
+share/doc/html/fox/art/foxlogo.png
+share/doc/html/fox/art/foxstart.png
+share/doc/html/fox/art/freespeach.gif
+share/doc/html/fox/art/ill.gif
+share/doc/html/fox/art/ilr.gif
+share/doc/html/fox/art/innernerd.gif
+share/doc/html/fox/art/iul.gif
+share/doc/html/fox/art/iur.gif
+share/doc/html/fox/art/nerd_inside.gif
+share/doc/html/fox/art/oll.gif
+share/doc/html/fox/art/olr.gif
+share/doc/html/fox/art/opengl_logo.png
+share/doc/html/fox/art/oul.gif
+share/doc/html/fox/art/oul_grey.gif
+share/doc/html/fox/art/our.gif
+share/doc/html/fox/art/progress.png
+share/doc/html/fox/art/scribble.png
+share/doc/html/fox/art/sgitextedit.png
+share/doc/html/fox/art/slingerzbutton1.gif
+share/doc/html/fox/art/win32-libraries.png
+share/doc/html/fox/art/win32-linkoutput.png
+share/doc/html/fox/art/win32-postbuild.png
+share/doc/html/fox/art/win32-preprocessor.png
+share/doc/html/fox/art/win32-project.png
+share/doc/html/fox/art/win32-tooloptions.png
+share/doc/html/fox/art/wintextedit.png
+share/doc/html/fox/calc.html
 share/doc/html/fox/datatarget.html
-share/doc/html/fox/dlgedit1.gif
-share/doc/html/fox/dlgedit2.gif
+share/doc/html/fox/doc.html
+share/doc/html/fox/download.html
 share/doc/html/fox/draganddrop.html
 share/doc/html/fox/faq.html
+share/doc/html/fox/filefuncs.html
 share/doc/html/fox/focus.html
 share/doc/html/fox/fonts.html
 share/doc/html/fox/foreword.html
 share/doc/html/fox/fox.html
-share/doc/html/fox/foxback.png
-share/doc/html/fox/foxlogo.png
+share/doc/html/fox/goals.html
 share/doc/html/fox/guiupdate.html
 share/doc/html/fox/icons.html
 share/doc/html/fox/introduction.html
 share/doc/html/fox/layout.html
 share/doc/html/fox/messages.html
-share/doc/html/fox/nasafan.png
+share/doc/html/fox/news.html
 share/doc/html/fox/oldfox.html
-share/doc/html/fox/opengl_logo.png
-share/doc/html/fox/owl-anim.png
-share/doc/html/fox/pathfinder.png
-share/doc/html/fox/pcboard.png
-share/doc/html/fox/platforms.html
-share/doc/html/fox/progress.png
+share/doc/html/fox/pathfinder.html
+share/doc/html/fox/projects.html
 share/doc/html/fox/registry.html
-share/doc/html/fox/scribble.png
+share/doc/html/fox/rex.html
+share/doc/html/fox/screenshots.html
+share/doc/html/fox/screenshots/adie.jpg
+share/doc/html/fox/screenshots/adie_colors.jpg
+share/doc/html/fox/screenshots/adie_del.jpg
+share/doc/html/fox/screenshots/adie_edit.jpg
+share/doc/html/fox/screenshots/adie_font.jpg
+share/doc/html/fox/screenshots/adie_pat.jpg
+share/doc/html/fox/screenshots/colordialog.png
+share/doc/html/fox/screenshots/dirdialog.png
+share/doc/html/fox/screenshots/filedialog.png
+share/doc/html/fox/screenshots/fontdialog.png
+share/doc/html/fox/screenshots/foxcalc.jpg
+share/doc/html/fox/screenshots/foxcalc_prefdialog_01_small.jpg
+share/doc/html/fox/screenshots/foxcalc_prefdialog_02_small.jpg
+share/doc/html/fox/screenshots/foxcalc_prefdialog_03_small.jpg
+share/doc/html/fox/screenshots/glview.png
+share/doc/html/fox/screenshots/pathfinder.png
+share/doc/html/fox/screenshots/printdialog.png
+share/doc/html/fox/screenshots/replacedialog.png
+share/doc/html/fox/screenshots/searchdialog.png
+share/doc/html/fox/screenshots/table.png
 share/doc/html/fox/serialization.html
-share/doc/html/fox/sgitextedit.png
-share/doc/html/fox/tb-paste.png
-share/doc/html/fox/textedit.png
-share/doc/html/fox/textedit2.png
+share/doc/html/fox/styles.css
 share/doc/html/fox/timers.html
 share/doc/html/fox/widgets.html
-share/doc/html/fox/win32-libraries.png
-share/doc/html/fox/win32-linkoutput.png
-share/doc/html/fox/win32-postbuild.png
-share/doc/html/fox/win32-preprocessor.png
-share/doc/html/fox/win32-project.png
-share/doc/html/fox/win32-tooloptions.png
 share/doc/html/fox/win32.html
-share/doc/html/fox/wintextedit.png
+share/doc/html/fox/window.html
+share/doc/html/fox/xml.html
+@dirrm share/doc/html/fox/screenshots
+@dirrm share/doc/html/fox/art
 @dirrm share/doc/html/fox
 @dirrm include/fox
diff --git a/x11/fox/buildlink2.mk b/x11/fox/buildlink2.mk
index 6aa1f31a098..431d3d1cca2 100644
--- a/x11/fox/buildlink2.mk
+++ b/x11/fox/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 02:28:38 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/08/29 10:16:12 xtraeme Exp $
 
 .if !defined(FOX_BUILDLINK2_MK)
 FOX_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		fox
-BUILDLINK_DEPENDS.fox?=		fox>=0.99.174nb1
+BUILDLINK_DEPENDS.fox?=		fox>=1.0.43
 BUILDLINK_PKGSRCDIR.fox?=	../../x11/fox
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.fox=fox
diff --git a/x11/fox/distinfo b/x11/fox/distinfo
index 72f4226180d..31bfa92ef88 100644
--- a/x11/fox/distinfo
+++ b/x11/fox/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.6 2001/08/05 17:04:21 sakamoto Exp $
+$NetBSD: distinfo,v 1.7 2003/08/29 10:16:12 xtraeme Exp $
 
-SHA1 (fox-0.99.174.tar.gz) = 4c9455646e689f5d35b6cb541db20a9646156fa2
-Size (fox-0.99.174.tar.gz) = 1631360 bytes
-SHA1 (xunicode-0.3.3.tar.gz) = 279c7b7990774bf585ffdbb37fdcbb3099354206
-Size (xunicode-0.3.3.tar.gz) = 142790 bytes
-SHA1 (fox-unicode-0.99.174.diff) = cfd394f0032a69d5a4c9918f2b6788f1cb11f5ca
-Size (fox-unicode-0.99.174.diff) = 225018 bytes
-SHA1 (patch-ab) = 959b64df0a5b30e81a09e15e04020b48598a6c39
-SHA1 (patch-ac) = 4558237957c3bcec13cd11c521fa94b8e98fac40
-SHA1 (patch-ae) = 33e70da09da4fa637e6f1aeb89b52b54f454562d
+SHA1 (fox-1.0.43.tar.gz) = 1c56abb70c5d731226754808efa97bdad97a761d
+Size (fox-1.0.43.tar.gz) = 2132787 bytes
+SHA1 (patch-aa) = 0d56368c0d106d944956bfa1a33672f141cae69b
+SHA1 (patch-ab) = 705946d84fd48666479abbd4c59c4e75ca914436
+SHA1 (patch-ac) = c338e3747b5cb717794be526837ffa70330f9069
+SHA1 (patch-ad) = 33f032fcc13c32ab5e31a3224278626b5083838d
+SHA1 (patch-ae) = 5b2ddf420db89c6c0960e891c4778d639f728978
diff --git a/x11/fox/patches/patch-aa b/x11/fox/patches/patch-aa
new file mode 100644
index 00000000000..4f204dfe7e3
--- /dev/null
+++ b/x11/fox/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2003/08/29 10:16:12 xtraeme Exp $
+
+--- doc/art/Makefile.in.orig	2003-08-29 10:35:39.000000000 +0200
++++ doc/art/Makefile.in	2003-08-29 10:35:53.000000000 +0200
+@@ -87,7 +87,7 @@
+ VERSION = @VERSION@
+ X_BASE_LIBS = @X_BASE_LIBS@
+ 
+-artdir = $(prefix)/@PACKAGE@/html/art
++artdir = $(prefix)/share/doc/html/@PACKAGE@/art
+ 
+ ART_FILES =  	bigpenguin.png 	foxlogo.png 	foxstart.png 	freespeach.gif 	ill.gif 	ilr.gif 	innernerd.gif 	iul.gif 	iur.gif 	nerd_inside.gif 	oll.gif 	olr.gif 	opengl_logo.png 	oul.gif 	oul_grey.gif 	our.gif 	progress.png 	scribble.png 	sgitextedit.png 	slingerzbutton1.gif 	win32-libraries.png 	win32-linkoutput.png 	win32-postbuild.png 	win32-preprocessor.png 	win32-project.png 	win32-tooloptions.png 	wintextedit.png
+ 
diff --git a/x11/fox/patches/patch-ab b/x11/fox/patches/patch-ab
index 8f71725559c..f1fc7d5e50b 100644
--- a/x11/fox/patches/patch-ab
+++ b/x11/fox/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2001/08/05 17:04:21 sakamoto Exp $
+$NetBSD: patch-ab,v 1.4 2003/08/29 10:16:12 xtraeme Exp $
 
---- Makefile.in.orig	Thu Apr  5 05:34:11 2001
-+++ Makefile.in
-@@ -89,7 +89,7 @@
+--- Makefile.in.orig	2003-08-29 10:15:35.000000000 +0200
++++ Makefile.in	2003-08-29 10:16:35.000000000 +0200
+@@ -92,7 +92,7 @@
  AUTOMAKE_OPTIONS = foreign dist-zip
  #AUTOMAKE_OPTIONS = foreign dist-zip no-dependencies
  
--SUBDIRS = utils include src doc tests textedit pathfinder calculator
-+SUBDIRS = utils include src doc textedit pathfinder calculator
- EXTRA_DIST = ADDITIONS AUTHORS BUGS INSTALL LICENSE TRACING README fox.lsm index.html aclocal.m4
+-SUBDIRS = utils include src doc tests adie pathfinder calculator
++SUBDIRS = utils include src doc adie pathfinder calculator
+ EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE TRACING README fox.lsm index.html aclocal.m4
  
  CLEANFILES = fox.tar.gz
diff --git a/x11/fox/patches/patch-ac b/x11/fox/patches/patch-ac
index 0aedb3ac43f..01399e962a1 100644
--- a/x11/fox/patches/patch-ac
+++ b/x11/fox/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2001/02/24 16:56:56 sakamoto Exp $
+$NetBSD: patch-ac,v 1.2 2003/08/29 10:16:12 xtraeme Exp $
 
---- doc/Makefile.in.orig	Tue Feb 13 01:35:22 2001
-+++ doc/Makefile.in
-@@ -84,7 +84,7 @@
+--- doc/Makefile.in.orig	2003-08-29 10:16:59.000000000 +0200
++++ doc/Makefile.in	2003-08-29 10:17:21.000000000 +0200
+@@ -87,7 +87,7 @@
  VERSION = @VERSION@
  X_BASE_LIBS = @X_BASE_LIBS@
  
 -htmldir = $(prefix)/@PACKAGE@/html
 +htmldir = $(prefix)/share/doc/html/@PACKAGE@
  
- # Source code documentation tool
- PERCEPS = perceps
+ SUBDIRS = art screenshots
+ 
diff --git a/x11/fox/patches/patch-ad b/x11/fox/patches/patch-ad
new file mode 100644
index 00000000000..76bc3bd907a
--- /dev/null
+++ b/x11/fox/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/08/29 10:16:12 xtraeme Exp $
+
+--- doc/screenshots/Makefile.in.orig	2003-08-29 10:19:21.000000000 +0200
++++ doc/screenshots/Makefile.in	2003-08-29 10:19:44.000000000 +0200
+@@ -87,7 +87,7 @@
+ VERSION = @VERSION@
+ X_BASE_LIBS = @X_BASE_LIBS@
+ 
+-screenshotsdir = $(prefix)/@PACKAGE@/html/screenshots
++screenshotsdir = $(prefix)/share/doc/html/@PACKAGE@/screenshots
+ 
+ # Icons
+ SCREENSHOTS_FILES =                adie_colors.jpg               adie_del.jpg               adie_edit.jpg               adie_font.jpg               adie.jpg               adie_pat.jpg               colordialog.png               dirdialog.png               filedialog.png               fontdialog.png               foxcalc.jpg               foxcalc_prefdialog_01_small.jpg               foxcalc_prefdialog_02_small.jpg               foxcalc_prefdialog_03_small.jpg               glview.png               pathfinder.png               printdialog.png               replacedialog.png               searchdialog.png               table.png
diff --git a/x11/fox/patches/patch-ae b/x11/fox/patches/patch-ae
index 4a474e418a2..779bf98ee77 100644
--- a/x11/fox/patches/patch-ae
+++ b/x11/fox/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2001/02/24 16:56:56 sakamoto Exp $
+$NetBSD: patch-ae,v 1.2 2003/08/29 10:16:13 xtraeme Exp $
 
---- configure.orig	Tue Feb 13 01:25:29 2001
-+++ configure
-@@ -3607,7 +3607,7 @@
+--- configure.orig	2003-08-29 10:26:11.000000000 +0200
++++ configure	2003-08-29 10:26:44.000000000 +0200
+@@ -7782,7 +7782,7 @@
      GL_TESTS="gltest glviewer"
      if test "x$MESA" = "xHAVE_MESA" ; then
        CXXFLAGS="${CXXFLAGS} -DHAVE_MESA"