revert my last (conflicting) import

8 files changed, 365 insertions, 373 deletions

diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index a3bfeb92117..8fc9d7a6e72 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,20 +1,23 @@
-# $NetBSD: Makefile,v 1.1.1.2 2000/08/31 22:23:59 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/31 22:56:37 dmcmahill Exp $
 #
 
-DISTNAME=	wxGTK-2.2.1
-CATEGORIES=	x11 devel
+DISTNAME=	wxGTK-2.2.0
+CATEGORIES=	x11
 MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.freiburg.linux.de/~wxxt/
 
-DEPENDS+=	gtk+>=1.2.7:../../x11/gtk
+DEPENDS+=       gtk+>=1.2.7:../../x11/gtk
+DEPENDS+=       jpeg-6b:../../graphics/jpeg
+DEPENDS+=       png>=1.0.3:../../graphics/png
+DEPENDS+=       tiff>=3.5.2:../../graphics/tiff
 
 WRKSRC=		${WRKDIR}/wxGTK
-GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
-USE_LIBTOOL=	YES
 
-CONFIGURE_ARGS+=	--disable-threads
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--with-gtk --disable-threads
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK/files/md5 b/x11/wxGTK/files/md5
index d57a6ae6e0a..c227f69841d 100644
--- a/x11/wxGTK/files/md5
+++ b/x11/wxGTK/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.2 2000/08/31 22:24:00 dmcmahill Exp $
+$NetBSD: md5,v 1.2 2000/08/31 22:56:37 dmcmahill Exp $
 
-MD5 (wxGTK-2.2.1.tar.gz) = b5d92f8e103477b906176e0451086f07
+MD5 (wxGTK-2.2.0.tgz) = 69d37f49d02b5ac8fbcf91c29a09ca34
diff --git a/x11/wxGTK/patches/patch-aa b/x11/wxGTK/patches/patch-aa
index 87b24e7da9b..3df14df8ac5 100644
--- a/x11/wxGTK/patches/patch-aa
+++ b/x11/wxGTK/patches/patch-aa
@@ -1,12 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.2 2000/08/31 22:24:00 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/31 22:56:37 dmcmahill Exp $
 
---- include/wx/defs.h.orig	Sun Aug 20 04:52:54 2000
-+++ include/wx/defs.h	Thu Aug 31 12:38:24 2000
-@@ -26,5 +26,6 @@
+We're Unix-like, not Windows-like.
+
+--- include/wx/defs.h.orig	Wed Jul 26 20:36:00 2000
++++ include/wx/defs.h	Wed Jul 26 20:36:21 2000
+@@ -25,7 +25,8 @@
+ #if defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
      defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
      defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
 -    defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
 +    defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || \
-+    defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
++    defined(__NetBSD__)
  
      #define __UNIX_LIKE__
+ 
diff --git a/x11/wxGTK/patches/patch-ab b/x11/wxGTK/patches/patch-ab
index ee44cc9bdde..dc0589441da 100644
--- a/x11/wxGTK/patches/patch-ab
+++ b/x11/wxGTK/patches/patch-ab
@@ -1,145 +1,196 @@
-$NetBSD: patch-ab,v 1.1.1.2 2000/08/31 22:24:00 dmcmahill Exp $
-
---- Makefile.in.orig	Sun Aug 20 04:52:53 2000
-+++ Makefile.in	Thu Aug 31 16:20:35 2000
-@@ -20,11 +20,11 @@
+--- Makefile.in.orig	Sun Jul  9 05:04:14 2000
++++ Makefile.in	Thu Jul 27 21:55:59 2000
+@@ -37,16 +37,12 @@
+ VP4 = @top_srcdir@/src/generic
+ VP5 = @top_srcdir@/src/unix
+ VP6 = @top_srcdir@/src/html
+-VP7 = @top_srcdir@/src/png
+-VP8 = @top_srcdir@/src/jpeg
+-VP9 = @top_srcdir@/src/tiff
+-VP10 = @top_srcdir@/src/zlib
+ VP11 = @top_srcdir@/src/iodbc
  
- .c.o :
--	$(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
-+	${LIBTOOL} --mode=compile $(CCC)  -c @DEP_INFO_FLAGS@ $(CFLAGS) -o $@ $<
+ # the comment at the end of the next line is needed because otherwise autoconf
+ # would remove this line completely - it contains a built-in hack to remove
+ # any VPATH assignment not containing ':'
+-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
++VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP11) # ':' for autoconf
  
- .cpp.o :
--	$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
-+	${LIBTOOL} --mode=compile $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) -o $@ $<
+ top_srcdir = @top_srcdir@
+ prefix = @prefix@
+@@ -75,6 +71,8 @@
  
- .cxx.o :
--	$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
-+	${LIBTOOL} --mode=compile $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) -o $@ $<
+ top_builddir = .
  
- ########################### Paths #################################
-@@ -79,8 +79,9 @@
++EXTRALIBS=-lz -L@prefix@/lib -R@prefix@/lib -ljpeg -lpng -ltiff
++
+ INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_DATA_DIR = ${BSD_INSTALL_DATA_DIR}
- # my autoconf doesn't set this
--#INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- # maybe do an additional chmod if needed?
--INSTALL_SCRIPT = @INSTALL@
-+#INSTALL_SCRIPT = @INSTALL@
- transform = @program_transform_name@
- 
-@@ -304,8 +305,11 @@
- all: @WX_ALL@
- 
--@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
-+CREATE_LINKS: $(top_builddir)/lib/@WX_LIBRARY_NAME@
-+
-+CREATE_INSTALLED_LINKS: preinstall
-+
-+$(top_builddir)/lib/@WX_LIBRARY_NAME@:  $(OBJECTS)
- 	@$(INSTALL) -d ./lib
--	$(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
--	$(RANLIB) ./lib/$@
-+	${LIBTOOL} --mode=link cc -o $(top_builddir)/lib/@WX_LIBRARY_NAME@  ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:1:1
- 
- @WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
-@@ -314,52 +318,12 @@
- 	$(RANLIB) ./lib/$@
- 
--@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
--	@$(INSTALL) -d ./lib
--	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
--	
- @WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o
- 	@$(INSTALL) -d ./lib
- 	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
- 	
--CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
--	@$(RM) ./lib/@WX_LIBRARY_LINK1@
--	@$(RM) ./lib/@WX_LIBRARY_LINK2@
--	@$(RM) ./lib/@WX_LIBRARY_LINK3@
--	cd lib \
--		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
--		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
--		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
--	
--CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
--	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
--	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
--	@$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
--	cd lib \
--		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
--		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
--		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
--	
--CREATE_INSTALLED_LINKS: preinstall
--	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
--	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
--	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
--	cd $(libdir) \
--		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
--		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
--		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
--	
--CREATE_INSTALLED_LINKS_GL: preinstall_gl
--	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
--	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
--	$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
--	cd $(libdir) \
--		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
--		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
--		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
--	
- $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
- 
- parser.o:    parser.c lexer.c
--	$(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
-+	${LIBTOOL} --mode=compile $(CCLEX) -c $(CFLAGS)  -o $@ parser.c
- 
- parser.c:	$(COMMDIR)/parser.y lexer.c
-@@ -393,24 +357,22 @@
- # this is the real install target: copies the library, wx-config and the
- # headers to the installation directory
--preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config
-+preinstall: $(top_builddir)/lib/@WX_LIBRARY_NAME@ $(top_builddir)/wx@TOOLKIT_NAME@-config
- 	@echo " "
- 	@echo " Installing wxWindows..."
- 	@echo " "
- 
--	$(INSTALL) -d $(prefix)
--	$(INSTALL) -d $(bindir)
--	$(INSTALL) -d $(libdir)
- 
- 	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
- 	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
--	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
-+	${LIBTOOL} --mode=install ${INSTALL_DATA} $(top_builddir)/lib/@WX_LIBRARY_NAME@ ${libdir}
-+
+@@ -110,10 +108,6 @@
+ COMMDIR  = $(WXDIR)/src/common
+ HTMLDIR  = $(WXDIR)/src/html
+ UNIXDIR  = $(WXDIR)/src/unix
+-PNGDIR   = $(WXDIR)/src/png
+-JPEGDIR  = $(WXDIR)/src/jpeg
+-TIFFDIR  = $(WXDIR)/src/tiff
+-ZLIBDIR  = $(WXDIR)/src/zlib
+ GTKDIR   = $(WXDIR)/src/gtk
+ MOTIFDIR = $(WXDIR)/src/motif
+ MSWDIR   = $(WXDIR)/src/msw
+@@ -153,125 +147,6 @@
+ OBJECTS = @ALL_OBJECTS@
+ DEPFILES = @ALL_DEPFILES@
  
--	$(INSTALL) -d $(libdir)/wx
--	$(INSTALL) -d $(libdir)/wx/include
--	$(INSTALL) -d $(libdir)/wx/include/wx
--	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
-+	$(INSTALL_DATA_DIR) $(libdir)/wx
-+	$(INSTALL_DATA_DIR) $(libdir)/wx/include
-+	$(INSTALL_DATA_DIR) $(libdir)/wx/include/wx
-+	$(INSTALL_DATA_DIR) $(libdir)/wx/include/wx/@TOOLKIT_NAME@
- 	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
- 	
--	$(INSTALL) -d $(includedir)/wx
-+	$(INSTALL_DATA_DIR) $(includedir)/wx
- 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
- 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
-@@ -423,8 +385,8 @@
- 	done
+-# the object files of sublibraries (we assume that they don't change [often],
+-# so we don't generate these lists with tmake but embed them here)
+-ZLIBOBJS    = \
+-		adler32.o \
+-		compress.o \
+-		crc32.o \
+-		gzio.o \
+-		uncompr.o \
+-		deflate.o \
+-		trees.o \
+-		zutil.o \
+-		inflate.o \
+-		infblock.o \
+-		inftrees.o \
+-		infcodes.o \
+-		infutil.o \
+-		inffast.o
+-
+-PNGOBJS     = \
+-		png.o \
+-		pngread.o \
+-		pngrtran.o \
+-		pngrutil.o \
+-		pngpread.o \
+-		pngtrans.o \
+-		pngwrite.o \
+-		pngwtran.o \
+-		pngwutil.o \
+-		pngerror.o \
+-		pngmem.o \
+-		pngwio.o \
+-		pngrio.o \
+-		pngget.o \
+-		pngset.o
+-
+-
+-JPEGOBJS    = \
+-		jcomapi.o \
+-		jutils.o \
+-		jerror.o \
+-		jmemmgr.o \
+-		jmemnobs.o \
+-		jcapimin.o \
+-		jcapistd.o \
+-		jctrans.o \
+-		jcparam.o \
+-		jdatadst.o \
+-		jcinit.o \
+-		jcmaster.o \
+-		jcmarker.o \
+-		jcmainct.o \
+-		jcprepct.o \
+-		jccoefct.o \
+-		jccolor.o \
+-		jcsample.o \
+-		jchuff.o \
+-		jcphuff.o \
+-		jcdctmgr.o \
+-		jfdctfst.o \
+-		jfdctflt.o \
+-		jfdctint.o \
+-		jdapimin.o \
+-		jdapistd.o \
+-		jdtrans.o \
+-		jdatasrc.o \
+-		jdmaster.o \
+-		jdinput.o \
+-		jdmarker.o \
+-		jdhuff.o \
+-		jdphuff.o \
+-		jdmainct.o \
+-		jdcoefct.o \
+-		jdpostct.o \
+-		jddctmgr.o \
+-		jidctfst.o \
+-		jidctflt.o \
+-		jidctint.o \
+-		jidctred.o \
+-		jdsample.o \
+-		jdcolor.o \
+-		jquant1.o \
+-		jquant2.o \
+-		jdmerge.o
+-
+-TIFFOBJS	= \
+-		tif_aux.o \
+-		tif_close.o \
+-		tif_codec.o \
+-		tif_compress.o \
+-		tif_dir.o \
+-		tif_dirinfo.o \
+-		tif_dirread.o \
+-		tif_dirwrite.o \
+-		tif_dumpmode.o \
+-		tif_error.o \
+-		tif_fax3.o \
+-		tif_fax3sm.o \
+-		tif_getimage.o \
+-		tif_jpeg.o \
+-		tif_flush.o \
+-		tif_lzw.o \
+-		tif_luv.o \
+-		tif_next.o \
+-		tif_open.o \
+-		tif_packbits.o \
+-		tif_pixarlog.o \
+-		tif_predict.o \
+-		tif_print.o \
+-		tif_read.o \
+-		tif_swab.o \
+-		tif_strip.o \
+-		tif_thunder.o \
+-		tif_tile.o \
+-		tif_unix.o \
+-		tif_version.o \
+-		tif_warning.o \
+-		tif_write.o \
+-		tif_zip.o
+-
+ IODBCOBJS = \
+ 		catalog.o \
+ 		connect.o \
+@@ -515,11 +390,6 @@
+ 	cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
+ 	cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
+ 	mkdir $(DISTDIR)/src
+-	mkdir $(DISTDIR)/src/zlib
+-	cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
+-	cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
+-	cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
+-	cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
  
--	$(INSTALL) -d $(localedir)
-+	$(INSTALL_DATA_DIR) (localedir)
- 	@for p in $(WX_LINGUAS); do \
--	  $(INSTALL) -d $(localedir)/$$p; \
--	  $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \
-+	  $(INSTALL_DATA_DIR) $(localedir)/$$p; \
-+	  $(INSTALL_DATA_DIR) $(localedir)/$$p/LC_MESSAGES; \
- 	  $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
- 	  echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
+ # this target is the common part of distribution script for all GUI toolkits,
+ # but is not used when building wxBase distribution
+@@ -550,7 +420,6 @@
+ 	mkdir $(DISTDIR)/src/html/bitmaps
+ 	mkdir $(DISTDIR)/src/$(TOOLKITDIR)
+ 	mkdir $(DISTDIR)/src/png
+-	mkdir $(DISTDIR)/src/jpeg
+ 	mkdir $(DISTDIR)/src/tiff
+ 	mkdir $(DISTDIR)/src/iodbc
+ 	mkdir $(DISTDIR)/src/unix
+@@ -573,9 +442,6 @@
+ 	cp $(PNGDIR)/*.h $(DISTDIR)/src/png
+ 	cp $(PNGDIR)/*.c $(DISTDIR)/src/png
+ 	cp $(PNGDIR)/README $(DISTDIR)/src/png
+-	cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
+-	cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
+-	cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
+ 	cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
+ 	cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
+ 	cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
diff --git a/x11/wxGTK/patches/patch-ac b/x11/wxGTK/patches/patch-ac
index 0942040124d..120208630b4 100644
--- a/x11/wxGTK/patches/patch-ac
+++ b/x11/wxGTK/patches/patch-ac
@@ -1,87 +1,23 @@
-$NetBSD: patch-ac,v 1.1.1.2 2000/08/31 22:24:00 dmcmahill Exp $
-
---- src/makelib.env.in.orig	Sun Aug 20 04:52:57 2000
-+++ src/makelib.env.in	Thu Aug 31 14:03:25 2000
-@@ -34,23 +34,21 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_DATA = @INSTALL_DATA_DIR@
- 
--TARGETLIB_STATIC = $(TARGET_LIBNAME).a
--TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
--TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
--TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
-+#TARGETLIB_STATIC = $(TARGET_LIBNAME).a
-+#TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
- 
--TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
- 
- # Clears all default suffixes
--.SUFFIXES:	.o .cpp .c .cxx
-+.SUFFIXES:	.o .cpp .c .cxx
- 
--.c.o :
--	$(CCC) -c $(CFLAGS) $(PICFLAGS) -o $@ $<
-+.c.o :
-+	${LIBTOOL} --mode=compile $(CCC) -c $(CFLAGS)  -o $@ $<
- 
--.cpp.o :
--	$(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
-+.cpp.o :
-+	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS)  -o $@ $<
- 
--.cxx.o :
--	$(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $<
-+.cxx.o :
-+	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS)  -o $@ $<
- 
- # the comment at the end of the next line is needed because otherwise autoconf
-@@ -62,40 +60,19 @@
- 
- 
--all: libtype_@WX_TARGET_LIBRARY_TYPE@
-+all: $(TARGET_LIBNAME).la 
- 
--libtype_so: CREATE_LINKS
- 
--libtype_a: $(TARGETLIB_STATIC)
--
--
--$(TARGETLIB_SHARED): $(OBJECTS)
--	@$(INSTALL) -d $(top_builddir)/lib
--	$(SHARED_LD) $(top_builddir)/lib/$@ $(TARGETLIB_SONAME) $(OBJECTS)
--
--CREATE_LINKS: $(TARGETLIB_SHARED)
--	cd $(top_builddir)/lib \
--		&& $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
--		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
--		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
--
--$(TARGETLIB_STATIC): $(OBJECTS)
-+$(TARGET_LIBNAME).la: $(OBJECTS)
- 	@$(INSTALL) -d $(top_builddir)/lib
--	ar $(AROPTIONS) $(top_builddir)/lib/$@ $(OBJECTS)
--	$(RANLIB) $(top_builddir)/lib/$@
--
--install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers
-+	${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJECTS:.o=.lo} \
-+	-rpath ${PREFIX}/lib -version-info major:minor \
- 
--install_so:
--	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)
--	@$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2)
--	cd $(libdir) \
--		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
--		&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
-+install: install_lib install_headers
- 
--install_a:
--	$(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC)
-+install_lib:
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${TARGET_LIBNAME}.la ${PREFIX}/lib
- 
- install_headers:
--	$(INSTALL) -d $(includedir)/wx/$(HEADER_SUBDIR)
-+	$(INSTALL_DATA_DIR)  $(includedir)/wx/$(HEADER_SUBDIR)
- 	@for h in $(HEADERS); do \
- 	  $(INSTALL_DATA) $(HEADER_PATH)/$(HEADER_SUBDIR)/$$h $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
+--- configure.orig	Thu Jul 27 21:25:46 2000
++++ configure	Thu Jul 27 21:26:53 2000
+@@ -8706,14 +8706,14 @@
+ WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+ WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
+ 
+-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
++WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
++WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+ 
+-WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
+-WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
++WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so.${WX_CURRENT}.${WX_REVISION}"
++WX_LIBRARY_LINK2="lib${WX_LIBRARY}.so.${WX_CURRENT}"
+ WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
+-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
+-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
++WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so.${WX_CURRENT}.${WX_REVISION}"
++WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl.so.${WX_CURRENT}"
+ WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
+ 
+ SHARED_LD=
diff --git a/x11/wxGTK/pkg/COMMENT b/x11/wxGTK/pkg/COMMENT
index f697c7fc120..a01709f0f63 100644
--- a/x11/wxGTK/pkg/COMMENT
+++ b/x11/wxGTK/pkg/COMMENT
@@ -1 +1 @@
-free C++ library for cross-platform GUI development
+A GTK-based implementation of the wxWindows GUI library
diff --git a/x11/wxGTK/pkg/DESCR b/x11/wxGTK/pkg/DESCR
index 087ccee0446..89e1b80c257 100644
--- a/x11/wxGTK/pkg/DESCR
+++ b/x11/wxGTK/pkg/DESCR
@@ -1,9 +1,16 @@
-wxGTK is the GTK based version of wxWindows.
+A GTK+-based implementation of the wxWindows cross-platform GUI library.
 
-wxWindows is a free C++ library for cross-platform GUI development.
+wxWindows is a set of libraries that allows C++ applications to compile
+and run on several different types of computer, with minimal source code
+changes.  There is one library per supported GUI (such as Windows, GTK+,
+Motif, and Mac). 
 
-This lets you create native applications for different operating systems
-from the same source code. 
+wxWindows is free, well-established, well-documented, and very broad in
+its coverage of GUI functionality.  It has some extras that make it
+stand out from the crowd, such as the many convenience dialogs, built-in
+HTML display and printing, virtual filesystems, easy-to-use OLE
+automation controller class, Open GL support, and many other features
+that make it easier to write modern and user-friendly applications. 
 
-wxWindows is currently merging libraries based on GTK+, Windows, Motif
-and Mac with OS/2 started. 
+There is also a python interface available, wxPython (see the
+py-wxWindows pkg).
diff --git a/x11/wxGTK/pkg/PLIST b/x11/wxGTK/pkg/PLIST
index b549036e35e..f4caa946cc0 100644
--- a/x11/wxGTK/pkg/PLIST
+++ b/x11/wxGTK/pkg/PLIST
@@ -1,6 +1,120 @@
-@comment $NetBSD: PLIST,v 1.1.1.2 2000/08/31 22:24:00 dmcmahill Exp $
-bin/wx-config
+@comment $NetBSD: PLIST,v 1.2 2000/08/31 22:56:38 dmcmahill Exp $
 bin/wxgtk-config
+bin/wx-config
+include/wx/gtk/accel.h
+include/wx/gtk/app.h
+include/wx/gtk/bitmap.h
+include/wx/gtk/bmpbuttn.h
+include/wx/gtk/brush.h
+include/wx/gtk/button.h
+include/wx/gtk/checkbox.h
+include/wx/gtk/checklst.h
+include/wx/gtk/choice.h
+include/wx/gtk/clipbrd.h
+include/wx/gtk/colour.h
+include/wx/gtk/combobox.h
+include/wx/gtk/control.h
+include/wx/gtk/cursor.h
+include/wx/gtk/dataform.h
+include/wx/gtk/dataobj.h
+include/wx/gtk/dataobj2.h
+include/wx/gtk/dc.h
+include/wx/gtk/dcclient.h
+include/wx/gtk/dcmemory.h
+include/wx/gtk/dcscreen.h
+include/wx/gtk/dialog.h
+include/wx/gtk/dnd.h
+include/wx/gtk/filedlg.h
+include/wx/gtk/font.h
+include/wx/gtk/fontdlg.h
+include/wx/gtk/frame.h
+include/wx/gtk/gauge.h
+include/wx/gtk/gdiobj.h
+include/wx/gtk/glcanvas.h
+include/wx/gtk/icon.h
+include/wx/gtk/joystick.h
+include/wx/gtk/listbox.h
+include/wx/gtk/mdi.h
+include/wx/gtk/menu.h
+include/wx/gtk/menuitem.h
+include/wx/gtk/minifram.h
+include/wx/gtk/notebook.h
+include/wx/gtk/palette.h
+include/wx/gtk/pen.h
+include/wx/gtk/radiobox.h
+include/wx/gtk/radiobut.h
+include/wx/gtk/region.h
+include/wx/gtk/scrolbar.h
+include/wx/gtk/settings.h
+include/wx/gtk/slider.h
+include/wx/gtk/spinbutt.h
+include/wx/gtk/spinctrl.h
+include/wx/gtk/statbmp.h
+include/wx/gtk/statbox.h
+include/wx/gtk/statline.h
+include/wx/gtk/timer.h
+include/wx/gtk/stattext.h
+include/wx/gtk/tbargtk.h
+include/wx/gtk/textctrl.h
+include/wx/gtk/tooltip.h
+include/wx/gtk/treectrl.h
+include/wx/gtk/wave.h
+include/wx/gtk/win_gtk.h
+include/wx/gtk/window.h
+include/wx/html/forcelnk.h
+include/wx/html/helpctrl.h
+include/wx/html/helpdata.h
+include/wx/html/helpfrm.h
+include/wx/html/htmlcell.h
+include/wx/html/htmldefs.h
+include/wx/html/htmlfilt.h
+include/wx/html/htmlpars.h
+include/wx/html/htmltag.h
+include/wx/html/htmlwin.h
+include/wx/html/htmprint.h
+include/wx/html/m_templ.h
+include/wx/html/winpars.h
+include/wx/generic/calctrl.h
+include/wx/generic/caret.h
+include/wx/generic/choicdgg.h
+include/wx/generic/colrdlgg.h
+include/wx/generic/dcpsg.h
+include/wx/generic/dirdlgg.h
+include/wx/generic/dragimgg.h
+include/wx/generic/filedlgg.h
+include/wx/generic/fontdlgg.h
+include/wx/generic/grid.h
+include/wx/generic/gridg.h
+include/wx/generic/helpext.h
+include/wx/generic/helphtml.h
+include/wx/generic/helpwxht.h
+include/wx/generic/helpxlp.h
+include/wx/generic/imaglist.h
+include/wx/generic/laywin.h
+include/wx/generic/listctrl.h
+include/wx/generic/msgdlgg.h
+include/wx/generic/notebook.h
+include/wx/generic/panelg.h
+include/wx/generic/plot.h
+include/wx/generic/printps.h
+include/wx/generic/prntdlgg.h
+include/wx/generic/progdlgg.h
+include/wx/generic/sashwin.h
+include/wx/generic/scrolwin.h
+include/wx/generic/splitter.h
+include/wx/generic/statusbr.h
+include/wx/generic/tabg.h
+include/wx/generic/textdlgg.h
+include/wx/generic/treectrl.h
+include/wx/generic/wizard.h
+include/wx/protocol/file.h
+include/wx/protocol/ftp.h
+include/wx/protocol/http.h
+include/wx/protocol/protocol.h
+include/wx/unix/execute.h
+include/wx/unix/fontutil.h
+include/wx/unix/gsockunx.h
+include/wx/unix/mimetype.h
 include/wx/accel.h
 include/wx/app.h
 include/wx/arrimpl.cpp
@@ -75,123 +189,17 @@ include/wx/fs_zip.h
 include/wx/gauge.h
 include/wx/gdicmn.h
 include/wx/gdiobj.h
-include/wx/generic/calctrl.h
-include/wx/generic/caret.h
-include/wx/generic/choicdgg.h
-include/wx/generic/colrdlgg.h
-include/wx/generic/dcpsg.h
-include/wx/generic/dirdlgg.h
-include/wx/generic/dragimgg.h
-include/wx/generic/filedlgg.h
-include/wx/generic/fontdlgg.h
-include/wx/generic/grid.h
-include/wx/generic/gridg.h
-include/wx/generic/helpext.h
-include/wx/generic/helphtml.h
-include/wx/generic/helpwxht.h
-include/wx/generic/helpxlp.h
-include/wx/generic/imaglist.h
-include/wx/generic/laywin.h
-include/wx/generic/listctrl.h
-include/wx/generic/msgdlgg.h
-include/wx/generic/notebook.h
-include/wx/generic/panelg.h
-include/wx/generic/plot.h
-include/wx/generic/printps.h
-include/wx/generic/prntdlgg.h
-include/wx/generic/progdlgg.h
-include/wx/generic/sashwin.h
-include/wx/generic/scrolwin.h
-include/wx/generic/splitter.h
-include/wx/generic/statusbr.h
-include/wx/generic/tabg.h
-include/wx/generic/textdlgg.h
-include/wx/generic/treectrl.h
-include/wx/generic/wizard.h
 include/wx/geometry.h
 include/wx/gifdecod.h
 include/wx/glcanvas.h
 include/wx/grid.h
 include/wx/gsocket.h
-include/wx/gtk/accel.h
-include/wx/gtk/app.h
-include/wx/gtk/bitmap.h
-include/wx/gtk/bmpbuttn.h
-include/wx/gtk/brush.h
-include/wx/gtk/button.h
-include/wx/gtk/checkbox.h
-include/wx/gtk/checklst.h
-include/wx/gtk/choice.h
-include/wx/gtk/clipbrd.h
-include/wx/gtk/colour.h
-include/wx/gtk/combobox.h
-include/wx/gtk/control.h
-include/wx/gtk/cursor.h
-include/wx/gtk/dataform.h
-include/wx/gtk/dataobj.h
-include/wx/gtk/dataobj2.h
-include/wx/gtk/dc.h
-include/wx/gtk/dcclient.h
-include/wx/gtk/dcmemory.h
-include/wx/gtk/dcscreen.h
-include/wx/gtk/dialog.h
-include/wx/gtk/dnd.h
-include/wx/gtk/filedlg.h
-include/wx/gtk/font.h
-include/wx/gtk/fontdlg.h
-include/wx/gtk/frame.h
-include/wx/gtk/gauge.h
-include/wx/gtk/gdiobj.h
-include/wx/gtk/glcanvas.h
-include/wx/gtk/icon.h
-include/wx/gtk/joystick.h
-include/wx/gtk/listbox.h
-include/wx/gtk/mdi.h
-include/wx/gtk/menu.h
-include/wx/gtk/menuitem.h
-include/wx/gtk/minifram.h
-include/wx/gtk/notebook.h
-include/wx/gtk/palette.h
-include/wx/gtk/pen.h
-include/wx/gtk/radiobox.h
-include/wx/gtk/radiobut.h
-include/wx/gtk/region.h
-include/wx/gtk/scrolbar.h
-include/wx/gtk/settings.h
-include/wx/gtk/slider.h
-include/wx/gtk/spinbutt.h
-include/wx/gtk/spinctrl.h
-include/wx/gtk/statbmp.h
-include/wx/gtk/statbox.h
-include/wx/gtk/statline.h
-include/wx/gtk/stattext.h
-include/wx/gtk/tbargtk.h
-include/wx/gtk/textctrl.h
-include/wx/gtk/timer.h
-include/wx/gtk/tooltip.h
-include/wx/gtk/treectrl.h
-include/wx/gtk/wave.h
-include/wx/gtk/win_gtk.h
-include/wx/gtk/window.h
 include/wx/hash.h
 include/wx/help.h
 include/wx/helpbase.h
 include/wx/helphtml.h
 include/wx/helpwin.h
 include/wx/helpxlp.h
-include/wx/html/forcelnk.h
-include/wx/html/helpctrl.h
-include/wx/html/helpdata.h
-include/wx/html/helpfrm.h
-include/wx/html/htmlcell.h
-include/wx/html/htmldefs.h
-include/wx/html/htmlfilt.h
-include/wx/html/htmlpars.h
-include/wx/html/htmltag.h
-include/wx/html/htmlwin.h
-include/wx/html/htmprint.h
-include/wx/html/m_templ.h
-include/wx/html/winpars.h
 include/wx/icon.h
 include/wx/imagbmp.h
 include/wx/image.h
@@ -246,10 +254,6 @@ include/wx/progdlg.h
 include/wx/prop.h
 include/wx/propform.h
 include/wx/proplist.h
-include/wx/protocol/file.h
-include/wx/protocol/ftp.h
-include/wx/protocol/http.h
-include/wx/protocol/protocol.h
 include/wx/radiobox.h
 include/wx/radiobut.h
 include/wx/region.h
@@ -295,10 +299,6 @@ include/wx/tooltip.h
 include/wx/treectrl.h
 include/wx/txtstrm.h
 include/wx/types.h
-include/wx/unix/execute.h
-include/wx/unix/fontutil.h
-include/wx/unix/gsockunx.h
-include/wx/unix/mimetype.h
 include/wx/url.h
 include/wx/utils.h
 include/wx/valgen.h
@@ -321,17 +321,8 @@ include/wx/wxprec.h
 include/wx/xpmhand.h
 include/wx/zipstrm.h
 include/wx/zstream.h
-lib/libwx_gtk.a
-lib/libwx_gtk.la
-lib/libwx_gtk.so.0.1
+lib/libwx_gtk.so.0.0.0
 lib/wx/include/wx/gtk/setup.h
-share/locale/cs/LC_MESSAGES/wxstd.mo
-share/locale/da/LC_MESSAGES/wxstd.mo
-share/locale/de/LC_MESSAGES/wxstd.mo
-share/locale/fi/LC_MESSAGES/wxstd.mo
-share/locale/fr/LC_MESSAGES/wxstd.mo
-share/locale/it/LC_MESSAGES/wxstd.mo
-share/locale/ru/LC_MESSAGES/wxstd.mo
 share/wx/afm/Cour.afm
 share/wx/afm/CourBo.afm
 share/wx/afm/CourBoO.afm