Subject: pkg/22407: Updated package pkgsrc/x11/fox to 1.0.43
To: None <gnats-bugs@gnats.netbsd.org>
From: None <juan@xtraeme.unixbsd.org>
List: netbsd-bugs
Date: 08/08/2003 19:34:09
>Number: 22407
>Category: pkg
>Synopsis: Updated package pkgsrc/x11/fox to 1.0.43
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Fri Aug 08 17:34:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator: Juan RP
>Release: NetBSD 1.6W
>Organization:
>Environment:
System: NetBSD Insomnio 1.6W NetBSD 1.6W (Insomnio) #0: Tue Aug 5 10:27:02 CEST 2003 juan@Insomnio:/usr/compile/obj/sys/arch/i386/compile/Insomnio i386
Architecture: i386
Machine: i386
>Description:
Please update the FOX package to the latest stable version (1.0.43).
A lot of changes were done ...
>How-To-Repeat:
>Fix:
diff -buN -r fox.new/Makefile fox/Makefile
--- fox.new/Makefile 2003-08-08 18:27:08.000000000 +0200
+++ fox/Makefile 2003-07-18 00:56:24.000000000 +0200
@@ -1,29 +1,41 @@
# $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
-DISTNAME= fox-1.0.43
+DISTNAME= fox-0.99.174
+PKGREVISION= 2
CATEGORIES= x11
-MASTER_SITES= http://www.fox-toolkit.org/ftp/
+MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \
+ ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
MAINTAINER= sakamoto@NetBSD.org
-HOMEPAGE= http://www.fox-toolkit.org/
+HOMEPAGE= http://www.cfdrc.com/FOX/fox.html
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_X11= # defined
+USE_X11BASE= # defined
USE_LIBTOOL= # defined
-GNU_CONFIGURE= # defined
+LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
-CONFIGURE_ARGS+= --with-opengl=mesa
-CONFIGURE_ARGS+= --with-x
-CONFIGURE_ARGS+= --with-shm=yes
-CONFIGURE_ARGS+= --enable-release
+GNU_CONFIGURE= # defined
+CONFIGURE_ARGS+=--with-opengl=mesa --with-x --with-shm=yes --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 -buN -r fox.new/PLIST fox/PLIST
--- fox.new/PLIST 2003-08-08 18:51:36.000000000 +0200
+++ fox/PLIST 2001-10-31 23:10:40.000000000 +0100
@@ -1,8 +1,8 @@
-@comment $NetBSD$
-bin/PathFinder
-bin/adie
-bin/calculator
+@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:40 zuntum Exp $
bin/reswrap
+bin/calculator
+bin/PathFinder
+bin/textedit
include/fox/FX4Splitter.h
include/fox/FXAccelTable.h
include/fox/FXApp.h
@@ -12,15 +12,12 @@
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
@@ -75,16 +72,14 @@
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/FXJPGIcon.h
-include/fox/FXJPGImage.h
+include/fox/FXJPEGIcon.h
+include/fox/FXJPEGImage.h
include/fox/FXLabel.h
include/fox/FXList.h
include/fox/FXListBox.h
@@ -110,15 +105,13 @@
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
@@ -126,7 +119,6 @@
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
@@ -144,15 +136,10 @@
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/FXTabBar.h
-include/fox/FXTabBook.h
-include/fox/FXTabItem.h
+include/fox/FXTab.h
include/fox/FXTable.h
include/fox/FXText.h
include/fox/FXTextField.h
@@ -177,99 +164,60 @@
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-1.0.so
-lib/libFOX-1.0.so.0
-lib/libFOX-1.0.so.0.43
+lib/libFOX-0.99.so.174.0
+lib/libFOX-0.99.so.174
+lib/libFOX-0.99.so
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/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/bigpenguin.png
+share/doc/html/fox/cfdrc.png
+share/doc/html/fox/cfdrclogo.png
share/doc/html/fox/datatarget.html
-share/doc/html/fox/doc.html
-share/doc/html/fox/download.html
+share/doc/html/fox/dlgedit1.gif
+share/doc/html/fox/dlgedit2.gif
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/goals.html
+share/doc/html/fox/foxback.png
+share/doc/html/fox/foxlogo.png
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/news.html
+share/doc/html/fox/nasafan.png
share/doc/html/fox/oldfox.html
-share/doc/html/fox/pathfinder.html
-share/doc/html/fox/projects.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/registry.html
-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/scribble.png
share/doc/html/fox/serialization.html
-share/doc/html/fox/styles.css
+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/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/window.html
-share/doc/html/fox/xml.html
-@dirrm share/doc/html/fox/screenshots
-@dirrm share/doc/html/fox/art
+share/doc/html/fox/wintextedit.png
@dirrm share/doc/html/fox
@dirrm include/fox
diff -buN -r fox.new/distinfo fox/distinfo
--- fox.new/distinfo 2003-08-08 18:17:14.000000000 +0200
+++ fox/distinfo 2001-08-05 19:04:21.000000000 +0200
@@ -1,9 +1,11 @@
$NetBSD: distinfo,v 1.6 2001/08/05 17:04:21 sakamoto Exp $
-SHA1 (fox-1.0.43.tar.gz) = 1c56abb70c5d731226754808efa97bdad97a761d
-Size (fox-1.0.43.tar.gz) = 2132787 bytes
-SHA1 (patch-aa) = 208ea88bc35421cb0759e58ac872723cf51ab6dc
-SHA1 (patch-ab) = 9f5196e9a321efa51a2f8a012fb89c93fa74d6bd
-SHA1 (patch-ac) = 42b744ed45a9ae2cdc36860300f5d3e4ae5f00c5
-SHA1 (patch-ad) = 1d0c28b28f0b75214ae50793f8e76eb7a4d33581
+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
diff -buN -r fox.new/patches/patch-aa fox/patches/patch-aa
--- fox.new/patches/patch-aa 2003-08-08 18:17:03.000000000 +0200
+++ fox/patches/patch-aa 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- doc/art/Makefile.in.orig 2003-08-08 18:15:15.000000000 +0200
-+++ doc/art/Makefile.in 2003-08-08 18:15:41.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 -buN -r fox.new/patches/patch-ab fox/patches/patch-ab
--- fox.new/patches/patch-ab 2003-08-08 18:13:45.000000000 +0200
+++ fox/patches/patch-ab 2001-08-05 19:04:21.000000000 +0200
@@ -1,13 +1,13 @@
-$NetBSD$
+$NetBSD: patch-ab,v 1.3 2001/08/05 17:04:21 sakamoto Exp $
---- Makefile.in.orig 2003-08-08 17:54:21.000000000 +0200
-+++ Makefile.in 2003-08-08 17:54:41.000000000 +0200
-@@ -92,7 +92,7 @@
+--- Makefile.in.orig Thu Apr 5 05:34:11 2001
++++ Makefile.in
+@@ -89,7 +89,7 @@
AUTOMAKE_OPTIONS = foreign dist-zip
#AUTOMAKE_OPTIONS = foreign dist-zip no-dependencies
--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
+-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
CLEANFILES = fox.tar.gz
diff -buN -r fox.new/patches/patch-ac fox/patches/patch-ac
--- fox.new/patches/patch-ac 2003-08-08 18:03:09.000000000 +0200
+++ fox/patches/patch-ac 2001-02-24 17:56:56.000000000 +0100
@@ -1,13 +1,13 @@
-$NetBSD$
+$NetBSD: patch-ac,v 1.1 2001/02/24 16:56:56 sakamoto Exp $
---- doc/Makefile.in.orig 2003-08-08 18:01:40.000000000 +0200
-+++ doc/Makefile.in 2003-08-08 18:02:08.000000000 +0200
-@@ -87,7 +87,7 @@
+--- doc/Makefile.in.orig Tue Feb 13 01:35:22 2001
++++ doc/Makefile.in
+@@ -84,7 +84,7 @@
VERSION = @VERSION@
X_BASE_LIBS = @X_BASE_LIBS@
-htmldir = $(prefix)/@PACKAGE@/html
+htmldir = $(prefix)/share/doc/html/@PACKAGE@
- SUBDIRS = art screenshots
-
+ # Source code documentation tool
+ PERCEPS = perceps
diff -buN -r fox.new/patches/patch-ad fox/patches/patch-ad
--- fox.new/patches/patch-ad 2003-08-08 18:17:12.000000000 +0200
+++ fox/patches/patch-ad 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- doc/screenshots/Makefile.in.orig 2003-08-08 18:16:07.000000000 +0200
-+++ doc/screenshots/Makefile.in 2003-08-08 18:16:32.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
>Release-Note:
>Audit-Trail:
>Unformatted: