make qt1 install in its own directory instead of renaming its installed

components. This allows users of Qt to specify QTDIR=/path/to/qt instead of having to patch all configure scripts and makefiles to look for alternate names. This is the recommended approach from Troll Tech (Qt authors). update pkgs which use qt1 to reflect this.
author: dmcmahill <dmcmahill> 2000-03-28 00:09:19 +0000
committer: dmcmahill <dmcmahill> 2000-03-28 00:09:19 +0000
commit: 485df84fe5b267a5ee80411df9eb943a049e6451 (patch)
tree: c5f4a711bf29a6633f7270cfd946002d75aceb5f
parent: 20f29d5d48f48f149b8dcf39185f89a4450d2ccd (diff)
download: pkgsrc-485df84fe5b267a5ee80411df9eb943a049e6451.tar.gz
31 files changed, 698 insertions, 799 deletions
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 701ee051b8e..02755b2b04f 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/03/23 21:34:20 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/28 00:09:20 dmcmahill Exp $
 
 DISTNAME=	musicbox-1.01p2
 CATEGORIES=	audio
@@ -14,6 +14,8 @@ USE_X11=	yes
 
 WRKSRC=		${WRKDIR}/musicbox-1.01
 
+PATH=	${X11BASE}/qt1/bin:$$PATH
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/musicbox ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/share/doc/musicbox
diff --git a/audio/musicbox/files/patch-sum b/audio/musicbox/files/patch-sum
index 452f2705db1..ce737ff0322 100644
--- a/audio/musicbox/files/patch-sum
+++ b/audio/musicbox/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/03/23 21:34:21 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
 
-MD5 (patch-aa) = 8cbf3f832ebda9a18652d96307147ecc
+MD5 (patch-aa) = 32bfeca94d688734b1b9ef9ac9ae4d35
 MD5 (patch-ab) = 67daa6701175e11d0e772cbe43676f4d
 MD5 (patch-ac) = c85da557cf69d463f19b213ca774cac1
 MD5 (patch-ad) = d88bfc82b85f2615b1feb2fbe6701140
diff --git a/audio/musicbox/patches/patch-aa b/audio/musicbox/patches/patch-aa
index 4005dd4b96d..d40d7228c38 100644
--- a/audio/musicbox/patches/patch-aa
+++ b/audio/musicbox/patches/patch-aa
@@ -1,16 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2000/03/23 21:34:21 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2000/03/28 00:09:21 dmcmahill Exp $
 
 --- Makefile.orig	Wed Nov 12 14:01:58 1997
-+++ Makefile	Wed Mar 22 18:32:06 2000
++++ Makefile	Sun Mar 26 11:00:40 2000
 @@ -1,13 +1,17 @@
  # change following for your environment
 -INC = /usr/X11R6/include/X11/qt
 -LIB = /usr/X11R6/lib
--MOC = moc
 +#INC = /usr/X11R6/include/X11/qt
-+INC = ${X11BASE}/include/qt1
-+LIB = ${X11BASE}/lib
-+MOC = moc1
++INC = -I${X11BASE}/include -I${X11BASE}/qt1/include
++LIB = -L${X11BASE}/qt1/lib -Wl,-R${X11BASE}/qt1/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
+ MOC = moc
  
  # if you use freebsd
 -CFLAGS = -DFreeBSD
@@ -28,83 +27,83 @@ $NetBSD: patch-aa,v 1.3 2000/03/23 21:34:21 dmcmahill Exp $
  
  all:	${ALL}
 -	${GCC} ${ALL} -o ${PKG} -L${LIB} -I${INC} -lqt
-+	${GCC} ${ALL} -o ${PKG} -L${LIB} -Wl,-R${LIB} -lqt1 -lX11 -lXext -lossaudio
++	${GCC} ${ALL} -o ${PKG} ${LIB}  -lqt -lX11 -lXext -lossaudio
  
 -player.o:
 -	${GCC} -c player.cpp -o player.o ${CFLAGS} -L${LIB} -I${INC}
 +player.o: player.cpp
-+	${GCC} -c player.cpp -o player.o ${CFLAGS} -I${INC}
++	${GCC} -c player.cpp -o player.o ${CFLAGS} ${INC}
  
  mplayer.o: mplayer.cpp
 -	${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} -L${LIB} -I${INC}
-+	${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} -I${INC}
++	${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} ${INC}
  
  mplayer.cpp:
 @@ -31,13 +35,13 @@
  
  ListView.o:
 -	${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -L${LIB} -I${INC} 
-+	${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -I${INC} 
++	${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} ${INC} 
  
  mListView.o: mListView.cpp
 -	${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} -L${LIB} -I${INC}
-+	${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} -I${INC}
++	${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} ${INC}
  
  mListView.cpp:
  	${MOC} ListView.h -o mListView.cpp
  clock.o:
 -	${GCC} -c clock.cpp -o clock.o -L${LIB} -I${INC}
-+	${GCC} -c clock.cpp -o clock.o -I${INC}
++	${GCC} -c clock.cpp -o clock.o ${INC}
  
  mclock.cpp:
 @@ -45,5 +49,5 @@
  
  mclock.o: mclock.cpp
 -	${GCC} -c mclock.cpp -o mclock.o -L${LIB} -I${INC}
-+	${GCC} -c mclock.cpp -o mclock.o -I${INC}
++	${GCC} -c mclock.cpp -o mclock.o ${INC}
  
  mfilebrowse.cpp: 
 @@ -51,14 +55,14 @@
  
  filebrowse.o :
 -	${GCC} -c filebrowse.cpp -o filebrowse.o -L${LIB} -I${INC}
-+	${GCC} -c filebrowse.cpp -o filebrowse.o -I${INC}
++	${GCC} -c filebrowse.cpp -o filebrowse.o ${INC}
  
  mfilebrowse.o: mfilebrowse.cpp
 -	${GCC} -c mfilebrowse.cpp -o mfilebrowse.o -L${LIB} -I${INC}
-+	${GCC} -c mfilebrowse.cpp -o mfilebrowse.o -I${INC}
++	${GCC} -c mfilebrowse.cpp -o mfilebrowse.o ${INC}
  
  diskbrowse.o:
 -	${GCC} -c diskbrowse.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c diskbrowse.cpp -o $@ -I${INC}
++	${GCC} -c diskbrowse.cpp -o $@ ${INC}
  
  mdiskbrowse.o: mdiskbrowse.cpp
 -	${GCC} -c mdiskbrowse.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c mdiskbrowse.cpp -o $@ -I${INC}
++	${GCC} -c mdiskbrowse.cpp -o $@ ${INC}
  
  mdiskbrowse.cpp:
 @@ -66,8 +70,8 @@
  
  qktstreelist.o:
 -	${GCC} -c qktstreelist.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c qktstreelist.cpp -o $@ -I${INC}
++	${GCC} -c qktstreelist.cpp -o $@ ${INC}
  
  mqktstreelist.o: mqktstreelist.cpp
 -	${GCC} -c mqktstreelist.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c mqktstreelist.cpp -o $@ -I${INC}
++	${GCC} -c mqktstreelist.cpp -o $@ ${INC}
  
  mqktstreelist.cpp:
 @@ -75,5 +79,5 @@
  
  MultiListBox.o:
 -	${GCC} -c MultiListBox.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c MultiListBox.cpp -o $@ -I${INC}
++	${GCC} -c MultiListBox.cpp -o $@ ${INC}
  	
  mMultiListBox.cpp:
 @@ -81,5 +85,5 @@
  
  mMultiListBox.o: mMultiListBox.cpp
 -	${GCC} -c mMultiListBox.cpp -o $@ -L${LIB} -I${INC}
-+	${GCC} -c mMultiListBox.cpp -o $@ -I${INC}
++	${GCC} -c mMultiListBox.cpp -o $@ ${INC}
  
  clean:
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 2359936bc36..65e970e5311 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/03/23 23:27:24 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
 # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp
 #
 
@@ -19,11 +19,10 @@ CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS}"
 USE_GMAKE=	yes
 USE_X11BASE=	yes
 
-CONFIGURE_ARGS+=	--with-qt-includes=${X11BASE}/include/qt1 \
-			--with-qt-libs=${X11BASE}/lib \
+CONFIGURE_ARGS+=	"--with-qt-dir=${X11BASE}/qt1" \
 
-tst:
-	echo ${INSTALL}
+CONFIGURE_ENV+=	"QTDIR=${X11BASE}/qt1"
+CONFIGURE_ENV+=	"MOC=${X11BASE}/qt1/bin/moc"
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin
diff --git a/audio/xamp/files/patch-sum b/audio/xamp/files/patch-sum
index c5386324413..9ace978bca2 100644
--- a/audio/xamp/files/patch-sum
+++ b/audio/xamp/files/patch-sum
@@ -1,11 +1,11 @@
-$NetBSD: patch-sum,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
 
 MD5 (patch-aa) = 01e268f9ad2bf936744ad1acc50175d2
 MD5 (patch-ab) = 6c6eca722a46d0151c1b2392945e1136
 MD5 (patch-ac) = e4c19506ef2163d2b1ac239d300b44b6
 MD5 (patch-ad) = 4b477706bbaf6ecd6218ef94279de0de
-MD5 (patch-ae) = 327f4dcfc2767bccc95c161c99dd9264
+MD5 (patch-ae) = 22bc923503d26fe3b2634323907ddb8f
 MD5 (patch-af) = bf81124d051be2e04ff6be01c1f71e13
 MD5 (patch-ag) = 825e22e159d0c3ea81833489c8598758
-MD5 (patch-ah) = debf433414670c9accf1a4500663d293
-MD5 (patch-ai) = 97bcd152234e208d46f48a1d2f125e61
+MD5 (patch-ah) = 10ca40d39c0a1f868516a0374a469d8f
+MD5 (patch-ai) = 88ab8bd5ed85ac6378b2bb9cdc0d0d9e
diff --git a/audio/xamp/patches/patch-ae b/audio/xamp/patches/patch-ae
index cbbba7be117..f432081c137 100644
--- a/audio/xamp/patches/patch-ae
+++ b/audio/xamp/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
 
 --- Makefile.in.orig	Tue Feb 10 17:37:20 1998
-+++ Makefile.in	Wed Mar 22 18:48:42 2000
++++ Makefile.in	Sun Mar 26 13:58:33 2000
 @@ -15,5 +15,6 @@
  CFLAGS = @CFLAGS@ ${DEFINES} ${DEBUG} ${BACK}
  LDFLAGS = @LDFLAGS@
@@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
  	backs/backs.o
  	
 -LIBS = @QT_LDFLAGS@ -lm -lqt
-+LIBS = @QT_LDFLAGS@ -lm -lqt1 -Wl,-rpath,$(X11BASE)/lib -lX11 -lXext
++LIBS = @QT_LDFLAGS@ -lm -L${X11BASE}/qt1/lib -Wl,-R${X11BASE}/qt1/lib -L${X11BASE}/lib -Wl,-R,$(X11BASE)/lib -lqt -lX11 -lXext
  
  all: xamp
 @@ -60,5 +61,5 @@
@@ -24,10 +24,3 @@ $NetBSD: patch-ae,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
 +	$(CXX) -o xamp $(OBJ) $(LDFLAGS) $(LIBS) -lossaudio
  	
  install:
-@@ -94,5 +95,5 @@
- 
- qembed.cpp:
--	$(CXX) qembed.cpp -o qembed -lqt
-+	$(CXX) qembed.cpp -o qembed -lqt1
- .SUFFIXES: .cpp
- .cpp.o:
diff --git a/audio/xamp/patches/patch-ah b/audio/xamp/patches/patch-ah
index 8851da295c0..ca05d7af6bf 100644
--- a/audio/xamp/patches/patch-ah
+++ b/audio/xamp/patches/patch-ah
@@ -1,19 +1,7 @@
-$NetBSD: patch-ah,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
 
 --- configure.in.orig	Sun Oct  5 12:42:34 1997
-+++ configure.in	Wed Mar 22 18:49:34 2000
-@@ -9,9 +9,9 @@
- AC_PROG_CC
- AC_PROG_CXX
--AC_PATH_PROG(MOC, moc, /usr/bin/moc)
-+AC_PATH_PROG(MOC, moc1, /usr/bin/moc1)
- AC_PROG_INSTALL(INSTALL, /usr/bin/install)
- 
- dnl Checks for libraries.
--AC_HAVE_LIBRARY(qt,,,-lX11)
-+AC_HAVE_LIBRARY(qt1,,,-lX11)
- 
- dnl Checks for header files.
++++ configure.in	Sun Mar 26 13:59:52 2000
 @@ -58,5 +58,5 @@
      ;;
  
diff --git a/audio/xamp/patches/patch-ai b/audio/xamp/patches/patch-ai
index 6852c147eea..a88fb93da81 100644
--- a/audio/xamp/patches/patch-ai
+++ b/audio/xamp/patches/patch-ai
@@ -1,37 +1,14 @@
-$NetBSD: patch-ai,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.3 2000/03/28 00:09:21 dmcmahill Exp $
 
 --- configure.orig	Sun Oct 26 11:55:34 1997
-+++ configure	Thu Mar 23 18:12:08 2000
-@@ -841,6 +841,6 @@
- fi
++++ configure	Sun Mar 26 14:37:02 2000
+@@ -971,5 +971,5 @@
  
--# Extract the first word of "moc", so it can be a program name with args.
--set dummy moc; ac_word=$2
-+# Extract the first word of "moc1", so it can be a program name with args.
-+set dummy moc1; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:841: checking for $ac_word" >&5
-@@ -862,5 +862,5 @@
-   done
-   IFS="$ac_save_ifs"
--  test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc"
-+  test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc1"
-   ;;
- esac
-@@ -970,5 +970,5 @@
- #try to guess qt locations
+ qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt $x_includes $QTINC"
+-test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
++test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR/include/qt $QTDIR $qt_incdirs"
  
--qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt $x_includes $QTINC"
-+qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt1 $x_includes $QTINC"
- test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
- 
-@@ -993,5 +993,5 @@
- for i in $qt_libdirs;
- do
--  for j in libqt.so libqt.a libqt.sl;
-+  for j in libqt1.so libqt1.a libqt1.sl;
-   do
-     if test -r "$i/$j"; then
+ qt_incdir=NO
 @@ -1701,5 +1701,5 @@
      ;;
  
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 3fbd7a97030..25896614765 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/03/23 22:07:12 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.7 2000/03/28 00:09:22 dmcmahill Exp $
 #
 
 DISTNAME=	xsidplay-1_3_8
@@ -20,10 +20,10 @@ USE_GMAKE=	yes
 
 CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \
 		--with-sidplay-library=${LOCALBASE}/lib \
-		--with-qt-includes=${LOCALBASE}/include/qt1 \
-		--with-qt-libraries=${LOCALBASE}/lib \
-		--with-qt-includes=${X11BASE}/include/qt1 \
-		--with-qt-libraries=${X11BASE}/lib
+		--with-qt-libraries=${X11BASE}/qt1/lib \
+		--with-qt-dir=${X11BASE}/qt1
+
+CONFIGURE_ENV+=	"MOC=${PREFIX}/qt1/bin/moc"
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
diff --git a/audio/xsidplay/files/patch-sum b/audio/xsidplay/files/patch-sum
index 29cd91ce2af..95d68dda306 100644
--- a/audio/xsidplay/files/patch-sum
+++ b/audio/xsidplay/files/patch-sum
@@ -1,6 +1,3 @@
-$NetBSD: patch-sum,v 1.2 2000/03/23 22:07:13 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/28 00:09:22 dmcmahill Exp $
 
-MD5 (patch-aa) = c9deffe4688f37d23dc4af76ac2c8106
-MD5 (patch-ab) = e868c68c0871d933f163787267b97b09
-MD5 (patch-ac) = 09cd1be09d3eaa61ed196e99d53c732a
-MD5 (patch-ad) = 41513e7ae935c2d4e4294e716d6b792e
+MD5 (patch-aa) = 5d720e1440ccbc7c73f919dd3eda5a4b
diff --git a/audio/xsidplay/patches/patch-aa b/audio/xsidplay/patches/patch-aa
index 0b04757d2db..83c7e50c1ee 100644
--- a/audio/xsidplay/patches/patch-aa
+++ b/audio/xsidplay/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2000/03/23 22:07:13 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2000/03/28 00:09:22 dmcmahill Exp $
 
 --- src/Makefile.in.orig	Fri Jul  2 12:37:40 1999
 +++ src/Makefile.in	Fri Dec 17 13:31:49 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.4 2000/03/23 22:07:13 dmcmahill Exp $
  LIBIOS				= @LIBIOS@
  LIBAUDIO			= @LIBAUDIO@
 -LIBS				= @LIBS@ -lqt -lX11 -lsidplay $(LIBM) $(LIBIOS) $(LIBAUDIO)
-+LIBS				= @LIBS@ -lqt1 -lX11 -lXext -lsidplay $(LIBM) $(LIBIOS) $(LIBAUDIO)
++LIBS				= @LIBS@ -L${PREFIX}/qt1/lib -Wl,-R${PREFIX}/qt1/lib -lqt -lX11 -lXext -lsidplay $(LIBM) $(LIBIOS) $(LIBAUDIO)
  
  # Part of Qt.
  MOC					= @MOC@
diff --git a/audio/xsidplay/patches/patch-ab b/audio/xsidplay/patches/patch-ab
deleted file mode 100644
index f01cf2373b2..00000000000
--- a/audio/xsidplay/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/03/23 22:07:13 dmcmahill Exp $
-
---- acinclude.m4.orig	Thu Oct  8 20:08:24 1998
-+++ acinclude.m4	Thu Mar 23 16:38:53 2000
-@@ -283,5 +283,5 @@
- qt_libdirs="$ac_qt_libraries /usr/lib/qt/lib /usr/local/qt/lib /usr/lib/qt /usr/lib $x_libraries $QTLIB"
- test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
--AC_FIND_FILE(libqt.so libqt.so.1.40 libqt.so.1.41 libqt.so.1 libqt.a libqt.sl, $qt_libdirs, qt_libdir)
-+AC_FIND_FILE(libqt1.so libqt1.so.1.40 libqt1.so.1.41 libqt1.so.1 libqt1.a libqt1.sl, $qt_libdirs, qt_libdir)
- ac_qt_libraries=$qt_libdir
- 
-@@ -372,5 +372,5 @@
- AC_DEFUN(AC_PATH_QT_MOC,
- [
--AC_PATH_PROG(MOC,moc,/usr/bin/moc,
-+AC_PATH_PROG(MOC,moc1,/usr/bin/moc1,
-              $PATH:/usr/bin:/usr/X11R6/bin:$QTDIR/bin:/usr/lib/qt/bin:/usr/local/qt/bin)
- ])
diff --git a/audio/xsidplay/patches/patch-ac b/audio/xsidplay/patches/patch-ac
deleted file mode 100644
index 6c345598ae2..00000000000
--- a/audio/xsidplay/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2000/03/23 22:07:14 dmcmahill Exp $
-
---- aclocal.m4.orig	Thu Oct  8 20:08:24 1998
-+++ aclocal.m4	Thu Mar 23 16:39:44 2000
-@@ -295,5 +295,5 @@
- qt_libdirs="$ac_qt_libraries /usr/lib/qt/lib /usr/local/qt/lib /usr/lib/qt /usr/lib $x_libraries $QTLIB"
- test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
--AC_FIND_FILE(libqt.so libqt.so.1.40 libqt.so.1.41 libqt.so.1 libqt.a libqt.sl, $qt_libdirs, qt_libdir)
-+AC_FIND_FILE(libqt1.so libqt1.so.1.40 libqt1.so.1.41 libqt1.so.1 libqt1.a libqt1.sl, $qt_libdirs, qt_libdir)
- ac_qt_libraries=$qt_libdir
- 
-@@ -384,5 +384,5 @@
- AC_DEFUN(AC_PATH_QT_MOC,
- [
--AC_PATH_PROG(MOC,moc,/usr/bin/moc,
-+AC_PATH_PROG(MOC,moc1,/usr/bin/moc1,
-              $PATH:/usr/bin:/usr/X11R6/bin:$QTDIR/bin:/usr/lib/qt/bin:/usr/local/qt/bin)
- ])
diff --git a/audio/xsidplay/patches/patch-ad b/audio/xsidplay/patches/patch-ad
deleted file mode 100644
index af0a8bf61bd..00000000000
--- a/audio/xsidplay/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/03/23 22:07:14 dmcmahill Exp $
-
---- configure.orig	Sun Jul  4 03:11:29 1999
-+++ configure	Thu Mar 23 16:40:15 2000
-@@ -1407,5 +1407,5 @@
- 	for i in $qt_libdirs;
- 	do
--	  for j in libqt.so libqt.so.1.40 libqt.so.1.41 libqt.so.1 libqt.a libqt.sl;
-+	  for j in libqt1.so libqt1.so.1.40 libqt1.so.1.41 libqt1.so.1 libqt1.a libqt1.sl;
- 	  do
- 	    if test -r "$i/$j"; then
-@@ -1483,6 +1483,6 @@
- 
- 
--# Extract the first word of "moc", so it can be a program name with args.
--set dummy moc; ac_word=$2
-+# Extract the first word of "moc1", so it can be a program name with args.
-+set dummy moc1; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:1489: checking for $ac_word" >&5
-@@ -1508,5 +1508,5 @@
-   done
-   IFS="$ac_save_ifs"
--  test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc"
-+  test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc1"
-   ;;
- esac
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index c045a1c11b8..16adfa3e960 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/03/23 22:07:17 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2000/03/28 00:09:23 dmcmahill Exp $
 #
 
 DISTNAME=	vipec-1.07
@@ -12,6 +12,10 @@ DEPENDS+=	qt1-1.44:../../x11/qt1
 
 USE_X11=	yes
 
+PATH=	${X11BASE}/qt1/bin:$$PATH
+
+MAKE_ENV+=	"QTDIR=${X11BASE}/qt1"
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vipec ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vipec
diff --git a/cad/vipec/files/patch-sum b/cad/vipec/files/patch-sum
index 21be69009e4..734431e6464 100644
--- a/cad/vipec/files/patch-sum
+++ b/cad/vipec/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.2 2000/03/23 22:07:17 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
 
-MD5 (patch-aa) = a56454f95657188cc5d4eb3132239d76
+MD5 (patch-aa) = 28831310d38588f82020bdcf415d0a2a
diff --git a/cad/vipec/patches/patch-aa b/cad/vipec/patches/patch-aa
index 15f693cd361..65e59713065 100644
--- a/cad/vipec/patches/patch-aa
+++ b/cad/vipec/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2000/03/23 22:07:18 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
 
 --- Makefile.orig	Tue May 25 02:52:00 1999
 +++ Makefile	Thu Mar 23 17:01:44 2000
@@ -6,12 +6,12 @@ $NetBSD: patch-aa,v 1.2 2000/03/23 22:07:18 dmcmahill Exp $
  CFLAGS	=	-Wall -W -O2 -fno-strength-reduce
  CXXFLAGS=	-Wall -W -O2 -fno-strength-reduce
 -INCPATH	=	-I$(QTDIR)/include
-+INCPATH	=	-I$(X11BASE)/include/qt1 -I$(X11BASE)/include
++INCPATH	=	-I${X11BASE}/include -I$(QTDIR)/include 
  LINK	=	g++
  LFLAGS	=	
 -LIBS	=	-L$(QTDIR)/lib -lqt -lX11 -lXext
 -MOC	=	moc
-+LIBS	=	-L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lqt1  -lX11 -lXext
-+MOC	=	moc1
++LIBS	=	-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt  -lX11 -lXext
++MOC	=	moc
  
  TAR	=	tar -cf
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile
index 9d274413302..86f793d6b20 100644
--- a/x11/qt1/Makefile
+++ b/x11/qt1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2000/03/28 00:09:19 dmcmahill Exp $
 #
 
 DISTNAME=	qt-1.44
@@ -32,26 +32,33 @@ pre-build:
 	cd ${WRKSRC} && ${PATCH} <${FILESDIR}/enablegif.patch
 .endif
 
+QTPREFIX=${PREFIX}/qt1
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc1 ${PREFIX}/bin/moc1
-	@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt1.la ${PREFIX}/lib/
-	${INSTALL_DATA_DIR} ${PREFIX}/include/qt1
-	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/qt1/
-	${INSTALL_MAN} ${WRKSRC}/man/man1/moc.1 ${PREFIX}/man/man1/moc1.1
+	${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin
+	${INSTALL_DATA_DIR} ${QTPREFIX}/lib
+	@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib/
+	${LN} -fs ${QTPREFIX}/lib/libqt.so.1.44 ${PREFIX}/lib/libqt.so.1.44
+	${INSTALL_DATA_DIR} ${QTPREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include/
+	${INSTALL_MAN_DIR} ${QTPREFIX}/man/man1
+	${INSTALL_MAN_DIR} ${QTPREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/man/man1/moc.1 ${QTPREFIX}/man/man1/moc.1
 	@cd ${WRKSRC}/man/man3; PAGES="`ls -1 | ${SED} -e 's,\.3qt$$,,'`"; \
 	(for PAGE in $$PAGES; do \
-	    ${ECHO} installing ${PREFIX}/man/man3/$${PAGE}_1.3; \
+	    ${ECHO} installing ${QTPREFIX}/man/man3/$${PAGE}.3; \
 	    set - X `head -1 $${PAGE}.3qt`; \
 	    if [ $$# -eq 3 ] && [ "$$2" = .so ]; then \
-		${RM} -f ${PREFIX}/man/man3/$${PAGE}_1.3 ;\
-		${LN} -s `basename $$3 | ${SED} s/\.3qt$$/_1\.3/` \
-		${PREFIX}/man/man3/$${PAGE}_1.3; \
+		${RM} -f ${QTPREFIX}/man/man3/$${PAGE}.3 ;\
+		${LN} -s `basename $$3 | ${SED} s/\.3qt$$/\.3/` \
+		${QTPREFIX}/man/man3/$${PAGE}.3; \
 	    else \
 		${INSTALL_MAN} $${PAGE}.3qt \
-		${PREFIX}/man/man3/$${PAGE}_1.3; \
+		${QTPREFIX}/man/man3/$${PAGE}.3; \
 	    fi; \
 	 done)
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qt1
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README.QT ${PREFIX}/share/doc/qt1/
+	${INSTALL_DATA_DIR} ${QTPREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README.QT ${QTPREFIX}/share/doc/qt/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt1/files/patch-sum b/x11/qt1/files/patch-sum
index f8f3e63606d..55c71a5cd7c 100644
--- a/x11/qt1/files/patch-sum
+++ b/x11/qt1/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
 
-MD5 (patch-aa) = 840a2a94511d25b7bfbd778a52dbc636
-MD5 (patch-ab) = 7567236921ea16e35ac23df69e0f066e
-MD5 (patch-ac) = 22e980dfc4349e7ce8a19201a4e75933
-MD5 (patch-ad) = 948f6448dea12a2ec2c68fd50d771a94
+MD5 (patch-aa) = 17727abcf4dc511832d1827d923e4384
+MD5 (patch-ab) = 9c16fa8fac751338409018f296400416
+MD5 (patch-ac) = ccc3cfa69b1f10de39e3e6ff76104d6d
diff --git a/x11/qt1/patches/patch-aa b/x11/qt1/patches/patch-aa
index c68fd823967..df135320340 100644
--- a/x11/qt1/patches/patch-aa
+++ b/x11/qt1/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
 
 --- configs/netbsd-g++-static.orig	Fri Feb 26 12:02:07 1999
-+++ configs/netbsd-g++-static	Wed Mar 22 13:46:00 2000
++++ configs/netbsd-g++-static	Sun Mar 26 09:44:53 2000
 @@ -1,4 +1,5 @@
  # Compiling
  SYSCONF_CXX		= g++
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
 -SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
 -SYSCONF_LIBS_QT		= -lqt
 +SYSCONF_LFLAGS_QT	= 
-+SYSCONF_LIBS_QT		= $(QTDIR)/src/libqt1.la
++SYSCONF_LIBS_QT		= $(QTDIR)/src/libqt.la
  SYSCONF_LIBS_QT_OPENGL	= -lqgl
  # OpenGL
 @@ -25,37 +26,23 @@
@@ -29,8 +29,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
 -SYSCONF_LFLAGS_SHOBJ	= -Bshareable
 -
  # Meta-object compiler
--SYSCONF_MOC		= $(QTDIR)/bin/moc
--
+ SYSCONF_MOC		= $(QTDIR)/bin/moc
+ 
 -# Linking shared libraries
 -#   - Build the $(TARGET) library, eg. lib$(TARGET).so.0.0
 -#   - Place target in $(DESTDIR) - which has a trailing /
@@ -39,8 +39,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
 -SYSCONF_LINK_SHLIB	= ld
 -SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
 -SYSCONF_LINK_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS)
-+SYSCONF_MOC		= $(QTDIR)/bin/moc1
- 
+-
 -# Linking static libraries
 +# Linking libtool libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
diff --git a/x11/qt1/patches/patch-ab b/x11/qt1/patches/patch-ab
index 724861ef340..c90a143a592 100644
--- a/x11/qt1/patches/patch-ab
+++ b/x11/qt1/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
 
 --- src/Makefile.in.orig	Fri Feb 26 12:02:22 1999
-+++ src/Makefile.in	Wed Mar 22 13:52:22 2000
++++ src/Makefile.in	Sun Mar 26 09:45:44 2000
 @@ -15,5 +15,5 @@
  ####### Compiler, tools and options
  
@@ -9,12 +9,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
 +CXX	=	$(SYSCONF_CXX_LIB)
  CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
  LFLAGS	=	$(SYSCONF_LFLAGS_X11) $(SYSCONF_LFLAGS)
-@@ -23,6 +23,6 @@
- ####### Target
+@@ -24,5 +24,5 @@
  
--TARGET	= qt
+ TARGET	= qt
 -DESTDIR = ../lib/
-+TARGET	= qt1
 +DESTDIR =
  VER_MAJ = 1
  VER_MIN = 44
@@ -41,10 +39,3 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
 +	@cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<`
  
  ####### Build rules
-@@ -530,5 +518,5 @@
- 	$(SYSCONF_LINK_LIB)
- 
--moc: $(SRCMOC)
-+moc1: $(SRCMOC)
- 
- tmake:
diff --git a/x11/qt1/patches/patch-ac b/x11/qt1/patches/patch-ac
index 9fcfbf09b24..d82db292846 100644
--- a/x11/qt1/patches/patch-ac
+++ b/x11/qt1/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
 
 --- configs/solaris-g++-static.orig	Fri Feb 26 12:02:12 1999
-+++ configs/solaris-g++-static	Wed Mar 22 13:46:36 2000
++++ configs/solaris-g++-static	Sun Mar 26 09:45:22 2000
 @@ -1,9 +1,10 @@
  # Compiling
 -SYSCONF_CXX		= g++
@@ -16,16 +16,14 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
 +SYSCONF_CXXFLAGS_OPENGL	= -I${X11BASE}/include
  
  # Compiline YACC output
-@@ -12,18 +13,18 @@
+@@ -12,5 +13,5 @@
  # Linking with support libraries
  # X11
 -SYSCONF_LFLAGS_X11	= -L/usr/openwin/lib
 +SYSCONF_LFLAGS_X11	= -L${X11BASE}/lib
  SYSCONF_LIBS_X11	= -lX11 -lXext
  # Qt, Qt+OpenGL
- SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
--SYSCONF_LIBS_QT		= -lqt
-+SYSCONF_LIBS_QT		= -lqt1
+@@ -19,11 +20,11 @@
  SYSCONF_LIBS_QT_OPENGL	= -lqgl
  # OpenGL
 -SYSCONF_LFLAGS_OPENGL	= 
@@ -40,13 +38,6 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $
 +SYSCONF_LINK		= ${LOCALBASE}/egcs/bin/g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= 
-@@ -33,5 +34,5 @@
- 
- # Meta-object compiler
--SYSCONF_MOC		= $(QTDIR)/bin/moc
-+SYSCONF_MOC		= $(QTDIR)/bin/moc1
- 
- # Linking shared libraries
 @@ -40,5 +41,5 @@
  #   - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
  #
diff --git a/x11/qt1/pkg/DESCR b/x11/qt1/pkg/DESCR
index 9326fda099e..a97e51b64f9 100644
--- a/x11/qt1/pkg/DESCR
+++ b/x11/qt1/pkg/DESCR
@@ -1,5 +1,5 @@
 Qt is a toolkit for building a GUI for X in C++. The main documentation
-is in ${PREFIX}/share/doc/qt1 and is also available on the web. This
+is in ${PREFIX}/qt1/share/doc/qt and is also available on the web. This
 directory also contains a tutorial, and example programs (aclock, biff,
 connect, cursor, dclock, desktop, drawdemo, forever, hello, life, menu,
 makepic/ showpic, qmag, showimg, tetris, tictac, timestmp, widgets,
diff --git a/x11/qt1/pkg/MESSAGE b/x11/qt1/pkg/MESSAGE
index eac19d49442..0daedb6d23b 100644
--- a/x11/qt1/pkg/MESSAGE
+++ b/x11/qt1/pkg/MESSAGE
@@ -1,10 +1,16 @@
-$NetBSD: MESSAGE,v 1.1.1.1 2000/03/23 21:27:41 dmcmahill Exp $
+$NetBSD: MESSAGE,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
 
 Please note that this package is provided for those programs
 which will not work with newer versions of Qt.  To allow this
-package to coexist with newer versions of Qt the manual pages
-all have "_1" appended.  For example instead of 'man qwidget'
-you would use 'man qwidget_1' to get the Qt1 version of the
-manual page.  The header files have been installed in
-${PREFIX}/include/qt1 and the meta object compiler (moc) has
-been installed as "moc1".  
+package to coexist with newer versions of Qt, it has been installed
+in ${PREFIX}/qt1/{bin,include,lib,man}.
+
+You should be able to select this version of Qt when compiling
+programs which use it by ensuring that
+
+1) QTDIR is set to ${PREFIX}/qt1
+
+2) Use the "configure" argument "--with-qt-dir=${PREFIX}/qt1"
+
+3) you may also have to put ${PREFIX}/qt1/bin in your PATH
+
diff --git a/x11/qt1/pkg/PLIST b/x11/qt1/pkg/PLIST
index 8647d083747..eb75636e455 100644
--- a/x11/qt1/pkg/PLIST
+++ b/x11/qt1/pkg/PLIST
@@ -1,553 +1,563 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/03/23 21:27:41 dmcmahill Exp $
-bin/moc1
-include/qt1/jri.h
-include/qt1/jri_md.h
-include/qt1/jritypes.h
-include/qt1/npapi.h
-include/qt1/npupp.h
-include/qt1/qaccel.h
-include/qt1/qapp.h
-include/qt1/qapplication.h
-include/qt1/qarray.h
-include/qt1/qasyncimageio.h
-include/qt1/qasyncio.h
-include/qt1/qbitarray.h
-include/qt1/qbitarry.h
-include/qt1/qbitmap.h
-include/qt1/qbrush.h
-include/qt1/qbttngrp.h
-include/qt1/qbuffer.h
-include/qt1/qbutton.h
-include/qt1/qbuttongroup.h
-include/qt1/qcache.h
-include/qt1/qcheckbox.h
-include/qt1/qchkbox.h
-include/qt1/qclipboard.h
-include/qt1/qclipbrd.h
-include/qt1/qcollect.h
-include/qt1/qcollection.h
-include/qt1/qcolor.h
-include/qt1/qcombo.h
-include/qt1/qcombobox.h
-include/qt1/qconnect.h
-include/qt1/qconnection.h
-include/qt1/qcursor.h
-include/qt1/qdatastream.h
-include/qt1/qdatetime.h
-include/qt1/qdatetm.h
-include/qt1/qdialog.h
-include/qt1/qdict.h
-include/qt1/qdir.h
-include/qt1/qdragobject.h
-include/qt1/qdrawutil.h
-include/qt1/qdrawutl.h
-include/qt1/qdropsite.h
-include/qt1/qdstream.h
-include/qt1/qevent.h
-include/qt1/qfile.h
-include/qt1/qfiledef.h
-include/qt1/qfiledefs.h
-include/qt1/qfiledialog.h
-include/qt1/qfiledlg.h
-include/qt1/qfileinf.h
-include/qt1/qfileinfo.h
-include/qt1/qfocusdata.h
-include/qt1/qfont.h
-include/qt1/qfontdata.h
-include/qt1/qfontdta.h
-include/qt1/qfontinf.h
-include/qt1/qfontinfo.h
-include/qt1/qfontmet.h
-include/qt1/qfontmetrics.h
-include/qt1/qframe.h
-include/qt1/qgarray.h
-include/qt1/qgcache.h
-include/qt1/qgdict.h
-include/qt1/qgeneric.h
-include/qt1/qgl.h
-include/qt1/qglist.h
-include/qt1/qglobal.h
-include/qt1/qgmanager.h
-include/qt1/qgmanagr.h
-include/qt1/qgroupbox.h
-include/qt1/qgrpbox.h
-include/qt1/qgvector.h
-include/qt1/qheader.h
-include/qt1/qiconset.h
-include/qt1/qimage.h
-include/qt1/qimageio.h
-include/qt1/qintcach.h
-include/qt1/qintcache.h
-include/qt1/qintdict.h
-include/qt1/qiodev.h
-include/qt1/qiodevice.h
-include/qt1/qjpegio.h
-include/qt1/qkeycode.h
-include/qt1/qlabel.h
-include/qt1/qlayout.h
-include/qt1/qlcdnum.h
-include/qt1/qlcdnumber.h
-include/qt1/qlined.h
-include/qt1/qlineedit.h
-include/qt1/qlist.h
-include/qt1/qlistbox.h
-include/qt1/qlistview.h
-include/qt1/qmainwindow.h
-include/qt1/qmenubar.h
-include/qt1/qmenudata.h
-include/qt1/qmenudta.h
-include/qt1/qmessagebox.h
-include/qt1/qmetaobj.h
-include/qt1/qmetaobject.h
-include/qt1/qmlined.h
-include/qt1/qmovie.h
-include/qt1/qmsgbox.h
-include/qt1/qmultilinedit.h
-include/qt1/qnp.h
-include/qt1/qobjcoll.h
-include/qt1/qobjdefs.h
-include/qt1/qobject.h
-include/qt1/qobjectdefs.h
-include/qt1/qobjectdict.h
-include/qt1/qobjectlist.h
-include/qt1/qpaintd.h
-include/qt1/qpaintdc.h
-include/qt1/qpaintdevice.h
-include/qt1/qpaintdevicedefs.h
-include/qt1/qpaintdevicemetrics.h
-include/qt1/qpainter.h
-include/qt1/qpalette.h
-include/qt1/qpdevmet.h
-include/qt1/qpen.h
-include/qt1/qpicture.h
-include/qt1/qpixmap.h
-include/qt1/qpixmapcache.h
-include/qt1/qpmcache.h
-include/qt1/qpngio.h
-include/qt1/qpntarry.h
-include/qt1/qpoint.h
-include/qt1/qpointarray.h
-include/qt1/qpopmenu.h
-include/qt1/qpopupmenu.h
-include/qt1/qprintdialog.h
-include/qt1/qprinter.h
-include/qt1/qprndlg.h
-include/qt1/qprogbar.h
-include/qt1/qprogdlg.h
-include/qt1/qprogressbar.h
-include/qt1/qprogressdialog.h
-include/qt1/qpsprinter.h
-include/qt1/qpsprn.h
-include/qt1/qptrdict.h
-include/qt1/qpushbt.h
-include/qt1/qpushbutton.h
-include/qt1/qqueue.h
-include/qt1/qradiobt.h
-include/qt1/qradiobutton.h
-include/qt1/qrangecontrol.h
-include/qt1/qrangect.h
-include/qt1/qrect.h
-include/qt1/qregexp.h
-include/qt1/qregion.h
-include/qt1/qscrbar.h
-include/qt1/qscrollbar.h
-include/qt1/qscrollview.h
-include/qt1/qsemimodal.h
-include/qt1/qshared.h
-include/qt1/qsignal.h
-include/qt1/qsignalmapper.h
-include/qt1/qsignalslotimp.h
-include/qt1/qsize.h
-include/qt1/qslider.h
-include/qt1/qsocketnotifier.h
-include/qt1/qsocknot.h
-include/qt1/qspinbox.h
-include/qt1/qsplitter.h
-include/qt1/qstack.h
-include/qt1/qstatusbar.h
-include/qt1/qstring.h
-include/qt1/qstrlist.h
-include/qt1/qstrvec.h
-include/qt1/qt_gif.h
-include/qt1/qtabbar.h
-include/qt1/qtabdialog.h
-include/qt1/qtabdlg.h
-include/qt1/qtableview.h
-include/qt1/qtablevw.h
-include/qt1/qtextstream.h
-include/qt1/qtimer.h
-include/qt1/qtoolbar.h
-include/qt1/qtoolbutton.h
-include/qt1/qtooltip.h
-include/qt1/qtstream.h
-include/qt1/qvalidator.h
-include/qt1/qvector.h
-include/qt1/qwellarray.h
-include/qt1/qwhatsthis.h
-include/qt1/qwidcoll.h
-include/qt1/qwidget.h
-include/qt1/qwidgetintdict.h
-include/qt1/qwidgetlist.h
-include/qt1/qwidgetstack.h
-include/qt1/qwindefs.h
-include/qt1/qwindow.h
-include/qt1/qwindowdefs.h
-include/qt1/qwmatrix.h
-include/qt1/qxt.h
-lib/libqt1.a
-lib/libqt1.so.1.44
-man/man1/moc1.1
-man/man3/QAccel_1.3
-man/man3/QApplication_1.3
-man/man3/QArray_1.3
-man/man3/QAsyncIO_1.3
-man/man3/QBitArray_1.3
-man/man3/QBitVal_1.3
-man/man3/QBitmap_1.3
-man/man3/QBoxLayout_1.3
-man/man3/QBrush_1.3
-man/man3/QBuffer_1.3
-man/man3/QButton_1.3
-man/man3/QButtonGroup_1.3
-man/man3/QByteArray_1.3
-man/man3/QCache_1.3
-man/man3/QCacheIterator_1.3
-man/man3/QCheckBox_1.3
-man/man3/QCheckListItem_1.3
-man/man3/QChildEvent_1.3
-man/man3/QClipboard_1.3
-man/man3/QCloseEvent_1.3
-man/man3/QCollection_1.3
-man/man3/QColor_1.3
-man/man3/QColorGroup_1.3
-man/man3/QComboBox_1.3
-man/man3/QConnection_1.3
-man/man3/QCursor_1.3
-man/man3/QCustomEvent_1.3
-man/man3/QDataPump_1.3
-man/man3/QDataSink_1.3
-man/man3/QDataSource_1.3
-man/man3/QDataStream_1.3
-man/man3/QDate_1.3
-man/man3/QDateTime_1.3
-man/man3/QDialog_1.3
-man/man3/QDict_1.3
-man/man3/QDictIterator_1.3
-man/man3/QDir_1.3
-man/man3/QDoubleValidator_1.3
-man/man3/QDragMoveEvent_1.3
-man/man3/QDragObject_1.3
-man/man3/QDropEvent_1.3
-man/man3/QEvent_1.3
-man/man3/QFile_1.3
-man/man3/QFileDialog_1.3
-man/man3/QFileIconProvider_1.3
-man/man3/QFileInfo_1.3
-man/man3/QFocusData_1.3
-man/man3/QFocusEvent_1.3
-man/man3/QFont_1.3
-man/man3/QFontInfo_1.3
-man/man3/QFontMetrics_1.3
-man/man3/QFrame_1.3
-man/man3/QGArray_1.3
-man/man3/QGCache_1.3
-man/man3/QGCacheIterator_1.3
-man/man3/QGDict_1.3
-man/man3/QGDictIterator_1.3
-man/man3/QGLContext_1.3
-man/man3/QGLFormat_1.3
-man/man3/QGLWidget_1.3
-man/man3/QGList_1.3
-man/man3/QGListIterator_1.3
-man/man3/QGManager_1.3
-man/man3/QGridLayout_1.3
-man/man3/QGroupBox_1.3
-man/man3/QHBoxLayout_1.3
-man/man3/QHeader_1.3
-man/man3/QIODevice_1.3
-man/man3/QIODeviceSource_1.3
-man/man3/QIconSet_1.3
-man/man3/QImage_1.3
-man/man3/QImageConsumer_1.3
-man/man3/QImageDecoder_1.3
-man/man3/QImageDrag_1.3
-man/man3/QImageFormat_1.3
-man/man3/QImageFormatType_1.3
-man/man3/QImageIO_1.3
-man/man3/QIntCache_1.3
-man/man3/QIntCacheIterator_1.3
-man/man3/QIntDict_1.3
-man/man3/QIntDictIterator_1.3
-man/man3/QIntValidator_1.3
-man/man3/QKeyEvent_1.3
-man/man3/QLCDNumber_1.3
-man/man3/QLNode_1.3
-man/man3/QLabel_1.3
-man/man3/QLayout_1.3
-man/man3/QLineEdit_1.3
-man/man3/QList_1.3
-man/man3/QListBox_1.3
-man/man3/QListBoxItem_1.3
-man/man3/QListBoxPixmap_1.3
-man/man3/QListBoxText_1.3
-man/man3/QListIterator_1.3
-man/man3/QListView_1.3
-man/man3/QListViewItem_1.3
-man/man3/QMainWindow_1.3
-man/man3/QMenuBar_1.3
-man/man3/QMenuData_1.3
-man/man3/QMessageBox_1.3
-man/man3/QMouseEvent_1.3
-man/man3/QMoveEvent_1.3
-man/man3/QMovie_1.3
-man/man3/QMultiLineEdit_1.3
-man/man3/QNPInstance_1.3
-man/man3/QNPStream_1.3
-man/man3/QNPWidget_1.3
-man/man3/QNPlugin_1.3
-man/man3/QObject_1.3
-man/man3/QPaintDevice_1.3
-man/man3/QPaintDeviceMetrics_1.3
-man/man3/QPaintEvent_1.3
-man/man3/QPainter_1.3
-man/man3/QPalette_1.3
-man/man3/QPen_1.3
-man/man3/QPicture_1.3
-man/man3/QPixmap_1.3
-man/man3/QPixmapCache_1.3
-man/man3/QPoint_1.3
-man/man3/QPointArray_1.3
-man/man3/QPointVal_1.3
-man/man3/QPopupMenu_1.3
-man/man3/QPrintDialog_1.3
-man/man3/QPrinter_1.3
-man/man3/QProgressBar_1.3
-man/man3/QProgressDialog_1.3
-man/man3/QPtrDict_1.3
-man/man3/QPtrDictIterator_1.3
-man/man3/QPushButton_1.3
-man/man3/QQueue_1.3
-man/man3/QRadioButton_1.3
-man/man3/QRangeControl_1.3
-man/man3/QRect_1.3
-man/man3/QRegExp_1.3
-man/man3/QRegion_1.3
-man/man3/QResizeEvent_1.3
-man/man3/QScrollBar_1.3
-man/man3/QScrollView_1.3
-man/man3/QSemiModal_1.3
-man/man3/QShared_1.3
-man/man3/QSignal_1.3
-man/man3/QSignalMapper_1.3
-man/man3/QSize_1.3
-man/man3/QSlider_1.3
-man/man3/QSocketNotifier_1.3
-man/man3/QSpinBox_1.3
-man/man3/QSplitter_1.3
-man/man3/QStack_1.3
-man/man3/QStatusBar_1.3
-man/man3/QStoredDrag_1.3
-man/man3/QStrIList_1.3
-man/man3/QStrList_1.3
-man/man3/QString_1.3
-man/man3/QTabBar_1.3
-man/man3/QTabDialog_1.3
-man/man3/QTableView_1.3
-man/man3/QTextDrag_1.3
-man/man3/QTextStream_1.3
-man/man3/QTime_1.3
-man/man3/QTimer_1.3
-man/man3/QTimerEvent_1.3
-man/man3/QToolBar_1.3
-man/man3/QToolButton_1.3
-man/man3/QToolTip_1.3
-man/man3/QToolTipGroup_1.3
-man/man3/QUrlDrag_1.3
-man/man3/QVBoxLayout_1.3
-man/man3/QValidator_1.3
-man/man3/QWMatrix_1.3
-man/man3/QWhatsThis_1.3
-man/man3/QWidget_1.3
-man/man3/QWidgetStack_1.3
-man/man3/QWindow_1.3
-man/man3/QXtApplication_1.3
-man/man3/QXtWidget_1.3
-man/man3/qaccel_1.3
-man/man3/qapplication_1.3
-man/man3/qarray_1.3
-man/man3/qasyncio_1.3
-man/man3/qbitarray_1.3
-man/man3/qbitmap_1.3
-man/man3/qbitval_1.3
-man/man3/qboxlayout_1.3
-man/man3/qbrush_1.3
-man/man3/qbuffer_1.3
-man/man3/qbutton_1.3
-man/man3/qbuttongroup_1.3
-man/man3/qbytearray_1.3
-man/man3/qcache_1.3
-man/man3/qcacheiterator_1.3
-man/man3/qcheckbox_1.3
-man/man3/qchecklistitem_1.3
-man/man3/qchildevent_1.3
-man/man3/qclipboard_1.3
-man/man3/qcloseevent_1.3
-man/man3/qcollection_1.3
-man/man3/qcolor_1.3
-man/man3/qcolorgroup_1.3
-man/man3/qcombobox_1.3
-man/man3/qconnection_1.3
-man/man3/qcursor_1.3
-man/man3/qcustomevent_1.3
-man/man3/qdatapump_1.3
-man/man3/qdatasink_1.3
-man/man3/qdatasource_1.3
-man/man3/qdatastream_1.3
-man/man3/qdate_1.3
-man/man3/qdatetime_1.3
-man/man3/qdialog_1.3
-man/man3/qdict_1.3
-man/man3/qdictiterator_1.3
-man/man3/qdir_1.3
-man/man3/qdoublevalidator_1.3
-man/man3/qdragmoveevent_1.3
-man/man3/qdragobject_1.3
-man/man3/qdropevent_1.3
-man/man3/qevent_1.3
-man/man3/qfile_1.3
-man/man3/qfiledialog_1.3
-man/man3/qfileiconprovider_1.3
-man/man3/qfileinfo_1.3
-man/man3/qfocusdata_1.3
-man/man3/qfocusevent_1.3
-man/man3/qfont_1.3
-man/man3/qfontinfo_1.3
-man/man3/qfontmetrics_1.3
-man/man3/qframe_1.3
-man/man3/qgarray_1.3
-man/man3/qgcache_1.3
-man/man3/qgcacheiterator_1.3
-man/man3/qgdict_1.3
-man/man3/qgdictiterator_1.3
-man/man3/qglcontext_1.3
-man/man3/qglformat_1.3
-man/man3/qglist_1.3
-man/man3/qglistiterator_1.3
-man/man3/qglwidget_1.3
-man/man3/qgmanager_1.3
-man/man3/qgridlayout_1.3
-man/man3/qgroupbox_1.3
-man/man3/qhboxlayout_1.3
-man/man3/qheader_1.3
-man/man3/qiconset_1.3
-man/man3/qimage_1.3
-man/man3/qimageconsumer_1.3
-man/man3/qimagedecoder_1.3
-man/man3/qimagedrag_1.3
-man/man3/qimageformat_1.3
-man/man3/qimageformattype_1.3
-man/man3/qimageio_1.3
-man/man3/qintcache_1.3
-man/man3/qintcacheiterator_1.3
-man/man3/qintdict_1.3
-man/man3/qintdictiterator_1.3
-man/man3/qintvalidator_1.3
-man/man3/qiodevice_1.3
-man/man3/qiodevicesource_1.3
-man/man3/qkeyevent_1.3
-man/man3/qlabel_1.3
-man/man3/qlayout_1.3
-man/man3/qlcdnumber_1.3
-man/man3/qlineedit_1.3
-man/man3/qlist_1.3
-man/man3/qlistbox_1.3
-man/man3/qlistboxitem_1.3
-man/man3/qlistboxpixmap_1.3
-man/man3/qlistboxtext_1.3
-man/man3/qlistiterator_1.3
-man/man3/qlistview_1.3
-man/man3/qlistviewitem_1.3
-man/man3/qlnode_1.3
-man/man3/qmainwindow_1.3
-man/man3/qmenubar_1.3
-man/man3/qmenudata_1.3
-man/man3/qmessagebox_1.3
-man/man3/qmouseevent_1.3
-man/man3/qmoveevent_1.3
-man/man3/qmovie_1.3
-man/man3/qmultilineedit_1.3
-man/man3/qnpinstance_1.3
-man/man3/qnplugin_1.3
-man/man3/qnpstream_1.3
-man/man3/qnpwidget_1.3
-man/man3/qobject_1.3
-man/man3/qpaintdevice_1.3
-man/man3/qpaintdevicemetrics_1.3
-man/man3/qpainter_1.3
-man/man3/qpaintevent_1.3
-man/man3/qpalette_1.3
-man/man3/qpen_1.3
-man/man3/qpicture_1.3
-man/man3/qpixmap_1.3
-man/man3/qpixmapcache_1.3
-man/man3/qpoint_1.3
-man/man3/qpointarray_1.3
-man/man3/qpointval_1.3
-man/man3/qpopupmenu_1.3
-man/man3/qprintdialog_1.3
-man/man3/qprinter_1.3
-man/man3/qprogressbar_1.3
-man/man3/qprogressdialog_1.3
-man/man3/qptrdict_1.3
-man/man3/qptrdictiterator_1.3
-man/man3/qpushbutton_1.3
-man/man3/qqueue_1.3
-man/man3/qradiobutton_1.3
-man/man3/qrangecontrol_1.3
-man/man3/qrect_1.3
-man/man3/qregexp_1.3
-man/man3/qregion_1.3
-man/man3/qresizeevent_1.3
-man/man3/qscrollbar_1.3
-man/man3/qscrollview_1.3
-man/man3/qsemimodal_1.3
-man/man3/qshared_1.3
-man/man3/qsignal_1.3
-man/man3/qsignalmapper_1.3
-man/man3/qsize_1.3
-man/man3/qslider_1.3
-man/man3/qsocketnotifier_1.3
-man/man3/qspinbox_1.3
-man/man3/qsplitter_1.3
-man/man3/qstack_1.3
-man/man3/qstatusbar_1.3
-man/man3/qstoreddrag_1.3
-man/man3/qstrilist_1.3
-man/man3/qstring_1.3
-man/man3/qstrlist_1.3
-man/man3/qtabbar_1.3
-man/man3/qtabdialog_1.3
-man/man3/qtableview_1.3
-man/man3/qtextdrag_1.3
-man/man3/qtextstream_1.3
-man/man3/qtime_1.3
-man/man3/qtimer_1.3
-man/man3/qtimerevent_1.3
-man/man3/qtoolbar_1.3
-man/man3/qtoolbutton_1.3
-man/man3/qtooltip_1.3
-man/man3/qtooltipgroup_1.3
-man/man3/qurldrag_1.3
-man/man3/qvalidator_1.3
-man/man3/qvboxlayout_1.3
-man/man3/qwhatsthis_1.3
-man/man3/qwidget_1.3
-man/man3/qwidgetstack_1.3
-man/man3/qwindow_1.3
-man/man3/qwmatrix_1.3
-man/man3/qxtapplication_1.3
-man/man3/qxtwidget_1.3
-share/doc/qt1/README
-share/doc/qt1/README.QT
-@dirrm share/doc/qt1
-@dirrm include/qt1
+@comment $NetBSD: PLIST,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
+qt1/bin/moc
+qt1/include/jri.h
+qt1/include/jri_md.h
+qt1/include/jritypes.h
+qt1/include/npapi.h
+qt1/include/npupp.h
+qt1/include/qaccel.h
+qt1/include/qapp.h
+qt1/include/qapplication.h
+qt1/include/qarray.h
+qt1/include/qasyncimageio.h
+qt1/include/qasyncio.h
+qt1/include/qbitarray.h
+qt1/include/qbitarry.h
+qt1/include/qbitmap.h
+qt1/include/qbrush.h
+qt1/include/qbttngrp.h
+qt1/include/qbuffer.h
+qt1/include/qbutton.h
+qt1/include/qbuttongroup.h
+qt1/include/qcache.h
+qt1/include/qcheckbox.h
+qt1/include/qchkbox.h
+qt1/include/qclipboard.h
+qt1/include/qclipbrd.h
+qt1/include/qcollect.h
+qt1/include/qcollection.h
+qt1/include/qcolor.h
+qt1/include/qcombo.h
+qt1/include/qcombobox.h
+qt1/include/qconnect.h
+qt1/include/qconnection.h
+qt1/include/qcursor.h
+qt1/include/qdatastream.h
+qt1/include/qdatetime.h
+qt1/include/qdatetm.h
+qt1/include/qdialog.h
+qt1/include/qdict.h
+qt1/include/qdir.h
+qt1/include/qdragobject.h
+qt1/include/qdrawutil.h
+qt1/include/qdrawutl.h
+qt1/include/qdropsite.h
+qt1/include/qdstream.h
+qt1/include/qevent.h
+qt1/include/qfile.h
+qt1/include/qfiledef.h
+qt1/include/qfiledefs.h
+qt1/include/qfiledialog.h
+qt1/include/qfiledlg.h
+qt1/include/qfileinf.h
+qt1/include/qfileinfo.h
+qt1/include/qfocusdata.h
+qt1/include/qfont.h
+qt1/include/qfontdata.h
+qt1/include/qfontdta.h
+qt1/include/qfontinf.h
+qt1/include/qfontinfo.h
+qt1/include/qfontmet.h
+qt1/include/qfontmetrics.h
+qt1/include/qframe.h
+qt1/include/qgarray.h
+qt1/include/qgcache.h
+qt1/include/qgdict.h
+qt1/include/qgeneric.h
+qt1/include/qgl.h
+qt1/include/qglist.h
+qt1/include/qglobal.h
+qt1/include/qgmanager.h
+qt1/include/qgmanagr.h
+qt1/include/qgroupbox.h
+qt1/include/qgrpbox.h
+qt1/include/qgvector.h
+qt1/include/qheader.h
+qt1/include/qiconset.h
+qt1/include/qimage.h
+qt1/include/qimageio.h
+qt1/include/qintcach.h
+qt1/include/qintcache.h
+qt1/include/qintdict.h
+qt1/include/qiodev.h
+qt1/include/qiodevice.h
+qt1/include/qjpegio.h
+qt1/include/qkeycode.h
+qt1/include/qlabel.h
+qt1/include/qlayout.h
+qt1/include/qlcdnum.h
+qt1/include/qlcdnumber.h
+qt1/include/qlined.h
+qt1/include/qlineedit.h
+qt1/include/qlist.h
+qt1/include/qlistbox.h
+qt1/include/qlistview.h
+qt1/include/qmainwindow.h
+qt1/include/qmenubar.h
+qt1/include/qmenudata.h
+qt1/include/qmenudta.h
+qt1/include/qmessagebox.h
+qt1/include/qmetaobj.h
+qt1/include/qmetaobject.h
+qt1/include/qmlined.h
+qt1/include/qmovie.h
+qt1/include/qmsgbox.h
+qt1/include/qmultilinedit.h
+qt1/include/qnp.h
+qt1/include/qobjcoll.h
+qt1/include/qobjdefs.h
+qt1/include/qobject.h
+qt1/include/qobjectdefs.h
+qt1/include/qobjectdict.h
+qt1/include/qobjectlist.h
+qt1/include/qpaintd.h
+qt1/include/qpaintdc.h
+qt1/include/qpaintdevice.h
+qt1/include/qpaintdevicedefs.h
+qt1/include/qpaintdevicemetrics.h
+qt1/include/qpainter.h
+qt1/include/qpalette.h
+qt1/include/qpdevmet.h
+qt1/include/qpen.h
+qt1/include/qpicture.h
+qt1/include/qpixmap.h
+qt1/include/qpixmapcache.h
+qt1/include/qpmcache.h
+qt1/include/qpngio.h
+qt1/include/qpntarry.h
+qt1/include/qpoint.h
+qt1/include/qpointarray.h
+qt1/include/qpopmenu.h
+qt1/include/qpopupmenu.h
+qt1/include/qprintdialog.h
+qt1/include/qprinter.h
+qt1/include/qprndlg.h
+qt1/include/qprogbar.h
+qt1/include/qprogdlg.h
+qt1/include/qprogressbar.h
+qt1/include/qprogressdialog.h
+qt1/include/qpsprinter.h
+qt1/include/qpsprn.h
+qt1/include/qptrdict.h
+qt1/include/qpushbt.h
+qt1/include/qpushbutton.h
+qt1/include/qqueue.h
+qt1/include/qradiobt.h
+qt1/include/qradiobutton.h
+qt1/include/qrangecontrol.h
+qt1/include/qrangect.h
+qt1/include/qrect.h
+qt1/include/qregexp.h
+qt1/include/qregion.h
+qt1/include/qscrbar.h
+qt1/include/qscrollbar.h
+qt1/include/qscrollview.h
+qt1/include/qsemimodal.h
+qt1/include/qshared.h
+qt1/include/qsignal.h
+qt1/include/qsignalmapper.h
+qt1/include/qsignalslotimp.h
+qt1/include/qsize.h
+qt1/include/qslider.h
+qt1/include/qsocketnotifier.h
+qt1/include/qsocknot.h
+qt1/include/qspinbox.h
+qt1/include/qsplitter.h
+qt1/include/qstack.h
+qt1/include/qstatusbar.h
+qt1/include/qstring.h
+qt1/include/qstrlist.h
+qt1/include/qstrvec.h
+qt1/include/qt_gif.h
+qt1/include/qtabbar.h
+qt1/include/qtabdialog.h
+qt1/include/qtabdlg.h
+qt1/include/qtableview.h
+qt1/include/qtablevw.h
+qt1/include/qtextstream.h
+qt1/include/qtimer.h
+qt1/include/qtoolbar.h
+qt1/include/qtoolbutton.h
+qt1/include/qtooltip.h
+qt1/include/qtstream.h
+qt1/include/qvalidator.h
+qt1/include/qvector.h
+qt1/include/qwellarray.h
+qt1/include/qwhatsthis.h
+qt1/include/qwidcoll.h
+qt1/include/qwidget.h
+qt1/include/qwidgetintdict.h
+qt1/include/qwidgetlist.h
+qt1/include/qwidgetstack.h
+qt1/include/qwindefs.h
+qt1/include/qwindow.h
+qt1/include/qwindowdefs.h
+qt1/include/qwmatrix.h
+qt1/include/qxt.h
+qt1/lib/libqt.a
+qt1/lib/libqt.so.1.44
+@exec ln -fs %D/qt1/lib/libqt.so.1.44  %D/lib/libqt.so.1.44
+@unexec rm -f %D/lib/libqt.so.1.44
+qt1/man/man1/moc.1
+qt1/man/man3/QAccel.3
+qt1/man/man3/QApplication.3
+qt1/man/man3/QArray.3
+qt1/man/man3/QAsyncIO.3
+qt1/man/man3/QBitArray.3
+qt1/man/man3/QBitVal.3
+qt1/man/man3/QBitmap.3
+qt1/man/man3/QBoxLayout.3
+qt1/man/man3/QBrush.3
+qt1/man/man3/QBuffer.3
+qt1/man/man3/QButton.3
+qt1/man/man3/QButtonGroup.3
+qt1/man/man3/QByteArray.3
+qt1/man/man3/QCache.3
+qt1/man/man3/QCacheIterator.3
+qt1/man/man3/QCheckBox.3
+qt1/man/man3/QCheckListItem.3
+qt1/man/man3/QChildEvent.3
+qt1/man/man3/QClipboard.3
+qt1/man/man3/QCloseEvent.3
+qt1/man/man3/QCollection.3
+qt1/man/man3/QColor.3
+qt1/man/man3/QColorGroup.3
+qt1/man/man3/QComboBox.3
+qt1/man/man3/QConnection.3
+qt1/man/man3/QCursor.3
+qt1/man/man3/QCustomEvent.3
+qt1/man/man3/QDataPump.3
+qt1/man/man3/QDataSink.3
+qt1/man/man3/QDataSource.3
+qt1/man/man3/QDataStream.3
+qt1/man/man3/QDate.3
+qt1/man/man3/QDateTime.3
+qt1/man/man3/QDialog.3
+qt1/man/man3/QDict.3
+qt1/man/man3/QDictIterator.3
+qt1/man/man3/QDir.3
+qt1/man/man3/QDoubleValidator.3
+qt1/man/man3/QDragMoveEvent.3
+qt1/man/man3/QDragObject.3
+qt1/man/man3/QDropEvent.3
+qt1/man/man3/QEvent.3
+qt1/man/man3/QFile.3
+qt1/man/man3/QFileDialog.3
+qt1/man/man3/QFileIconProvider.3
+qt1/man/man3/QFileInfo.3
+qt1/man/man3/QFocusData.3
+qt1/man/man3/QFocusEvent.3
+qt1/man/man3/QFont.3
+qt1/man/man3/QFontInfo.3
+qt1/man/man3/QFontMetrics.3
+qt1/man/man3/QFrame.3
+qt1/man/man3/QGArray.3
+qt1/man/man3/QGCache.3
+qt1/man/man3/QGCacheIterator.3
+qt1/man/man3/QGDict.3
+qt1/man/man3/QGDictIterator.3
+qt1/man/man3/QGLContext.3
+qt1/man/man3/QGLFormat.3
+qt1/man/man3/QGLWidget.3
+qt1/man/man3/QGList.3
+qt1/man/man3/QGListIterator.3
+qt1/man/man3/QGManager.3
+qt1/man/man3/QGridLayout.3
+qt1/man/man3/QGroupBox.3
+qt1/man/man3/QHBoxLayout.3
+qt1/man/man3/QHeader.3
+qt1/man/man3/QIODevice.3
+qt1/man/man3/QIODeviceSource.3
+qt1/man/man3/QIconSet.3
+qt1/man/man3/QImage.3
+qt1/man/man3/QImageConsumer.3
+qt1/man/man3/QImageDecoder.3
+qt1/man/man3/QImageDrag.3
+qt1/man/man3/QImageFormat.3
+qt1/man/man3/QImageFormatType.3
+qt1/man/man3/QImageIO.3
+qt1/man/man3/QIntCache.3
+qt1/man/man3/QIntCacheIterator.3
+qt1/man/man3/QIntDict.3
+qt1/man/man3/QIntDictIterator.3
+qt1/man/man3/QIntValidator.3
+qt1/man/man3/QKeyEvent.3
+qt1/man/man3/QLCDNumber.3
+qt1/man/man3/QLNode.3
+qt1/man/man3/QLabel.3
+qt1/man/man3/QLayout.3
+qt1/man/man3/QLineEdit.3
+qt1/man/man3/QList.3
+qt1/man/man3/QListBox.3
+qt1/man/man3/QListBoxItem.3
+qt1/man/man3/QListBoxPixmap.3
+qt1/man/man3/QListBoxText.3
+qt1/man/man3/QListIterator.3
+qt1/man/man3/QListView.3
+qt1/man/man3/QListViewItem.3
+qt1/man/man3/QMainWindow.3
+qt1/man/man3/QMenuBar.3
+qt1/man/man3/QMenuData.3
+qt1/man/man3/QMessageBox.3
+qt1/man/man3/QMouseEvent.3
+qt1/man/man3/QMoveEvent.3
+qt1/man/man3/QMovie.3
+qt1/man/man3/QMultiLineEdit.3
+qt1/man/man3/QNPInstance.3
+qt1/man/man3/QNPStream.3
+qt1/man/man3/QNPWidget.3
+qt1/man/man3/QNPlugin.3
+qt1/man/man3/QObject.3
+qt1/man/man3/QPaintDevice.3
+qt1/man/man3/QPaintDeviceMetrics.3
+qt1/man/man3/QPaintEvent.3
+qt1/man/man3/QPainter.3
+qt1/man/man3/QPalette.3
+qt1/man/man3/QPen.3
+qt1/man/man3/QPicture.3
+qt1/man/man3/QPixmap.3
+qt1/man/man3/QPixmapCache.3
+qt1/man/man3/QPoint.3
+qt1/man/man3/QPointArray.3
+qt1/man/man3/QPointVal.3
+qt1/man/man3/QPopupMenu.3
+qt1/man/man3/QPrintDialog.3
+qt1/man/man3/QPrinter.3
+qt1/man/man3/QProgressBar.3
+qt1/man/man3/QProgressDialog.3
+qt1/man/man3/QPtrDict.3
+qt1/man/man3/QPtrDictIterator.3
+qt1/man/man3/QPushButton.3
+qt1/man/man3/QQueue.3
+qt1/man/man3/QRadioButton.3
+qt1/man/man3/QRangeControl.3
+qt1/man/man3/QRect.3
+qt1/man/man3/QRegExp.3
+qt1/man/man3/QRegion.3
+qt1/man/man3/QResizeEvent.3
+qt1/man/man3/QScrollBar.3
+qt1/man/man3/QScrollView.3
+qt1/man/man3/QSemiModal.3
+qt1/man/man3/QShared.3
+qt1/man/man3/QSignal.3
+qt1/man/man3/QSignalMapper.3
+qt1/man/man3/QSize.3
+qt1/man/man3/QSlider.3
+qt1/man/man3/QSocketNotifier.3
+qt1/man/man3/QSpinBox.3
+qt1/man/man3/QSplitter.3
+qt1/man/man3/QStack.3
+qt1/man/man3/QStatusBar.3
+qt1/man/man3/QStoredDrag.3
+qt1/man/man3/QStrIList.3
+qt1/man/man3/QStrList.3
+qt1/man/man3/QString.3
+qt1/man/man3/QTabBar.3
+qt1/man/man3/QTabDialog.3
+qt1/man/man3/QTableView.3
+qt1/man/man3/QTextDrag.3
+qt1/man/man3/QTextStream.3
+qt1/man/man3/QTime.3
+qt1/man/man3/QTimer.3
+qt1/man/man3/QTimerEvent.3
+qt1/man/man3/QToolBar.3
+qt1/man/man3/QToolButton.3
+qt1/man/man3/QToolTip.3
+qt1/man/man3/QToolTipGroup.3
+qt1/man/man3/QUrlDrag.3
+qt1/man/man3/QVBoxLayout.3
+qt1/man/man3/QValidator.3
+qt1/man/man3/QWMatrix.3
+qt1/man/man3/QWhatsThis.3
+qt1/man/man3/QWidget.3
+qt1/man/man3/QWidgetStack.3
+qt1/man/man3/QWindow.3
+qt1/man/man3/QXtApplication.3
+qt1/man/man3/QXtWidget.3
+qt1/man/man3/qaccel.3
+qt1/man/man3/qapplication.3
+qt1/man/man3/qarray.3
+qt1/man/man3/qasyncio.3
+qt1/man/man3/qbitarray.3
+qt1/man/man3/qbitmap.3
+qt1/man/man3/qbitval.3
+qt1/man/man3/qboxlayout.3
+qt1/man/man3/qbrush.3
+qt1/man/man3/qbuffer.3
+qt1/man/man3/qbutton.3
+qt1/man/man3/qbuttongroup.3
+qt1/man/man3/qbytearray.3
+qt1/man/man3/qcache.3
+qt1/man/man3/qcacheiterator.3
+qt1/man/man3/qcheckbox.3
+qt1/man/man3/qchecklistitem.3
+qt1/man/man3/qchildevent.3
+qt1/man/man3/qclipboard.3
+qt1/man/man3/qcloseevent.3
+qt1/man/man3/qcollection.3
+qt1/man/man3/qcolor.3
+qt1/man/man3/qcolorgroup.3
+qt1/man/man3/qcombobox.3
+qt1/man/man3/qconnection.3
+qt1/man/man3/qcursor.3
+qt1/man/man3/qcustomevent.3
+qt1/man/man3/qdatapump.3
+qt1/man/man3/qdatasink.3
+qt1/man/man3/qdatasource.3
+qt1/man/man3/qdatastream.3
+qt1/man/man3/qdate.3
+qt1/man/man3/qdatetime.3
+qt1/man/man3/qdialog.3
+qt1/man/man3/qdict.3
+qt1/man/man3/qdictiterator.3
+qt1/man/man3/qdir.3
+qt1/man/man3/qdoublevalidator.3
+qt1/man/man3/qdragmoveevent.3
+qt1/man/man3/qdragobject.3
+qt1/man/man3/qdropevent.3
+qt1/man/man3/qevent.3
+qt1/man/man3/qfile.3
+qt1/man/man3/qfiledialog.3
+qt1/man/man3/qfileiconprovider.3
+qt1/man/man3/qfileinfo.3
+qt1/man/man3/qfocusdata.3
+qt1/man/man3/qfocusevent.3
+qt1/man/man3/qfont.3
+qt1/man/man3/qfontinfo.3
+qt1/man/man3/qfontmetrics.3
+qt1/man/man3/qframe.3
+qt1/man/man3/qgarray.3
+qt1/man/man3/qgcache.3
+qt1/man/man3/qgcacheiterator.3
+qt1/man/man3/qgdict.3
+qt1/man/man3/qgdictiterator.3
+qt1/man/man3/qglcontext.3
+qt1/man/man3/qglformat.3
+qt1/man/man3/qglist.3
+qt1/man/man3/qglistiterator.3
+qt1/man/man3/qglwidget.3
+qt1/man/man3/qgmanager.3
+qt1/man/man3/qgridlayout.3
+qt1/man/man3/qgroupbox.3
+qt1/man/man3/qhboxlayout.3
+qt1/man/man3/qheader.3
+qt1/man/man3/qiconset.3
+qt1/man/man3/qimage.3
+qt1/man/man3/qimageconsumer.3
+qt1/man/man3/qimagedecoder.3
+qt1/man/man3/qimagedrag.3
+qt1/man/man3/qimageformat.3
+qt1/man/man3/qimageformattype.3
+qt1/man/man3/qimageio.3
+qt1/man/man3/qintcache.3
+qt1/man/man3/qintcacheiterator.3
+qt1/man/man3/qintdict.3
+qt1/man/man3/qintdictiterator.3
+qt1/man/man3/qintvalidator.3
+qt1/man/man3/qiodevice.3
+qt1/man/man3/qiodevicesource.3
+qt1/man/man3/qkeyevent.3
+qt1/man/man3/qlabel.3
+qt1/man/man3/qlayout.3
+qt1/man/man3/qlcdnumber.3
+qt1/man/man3/qlineedit.3
+qt1/man/man3/qlist.3
+qt1/man/man3/qlistbox.3
+qt1/man/man3/qlistboxitem.3
+qt1/man/man3/qlistboxpixmap.3
+qt1/man/man3/qlistboxtext.3
+qt1/man/man3/qlistiterator.3
+qt1/man/man3/qlistview.3
+qt1/man/man3/qlistviewitem.3
+qt1/man/man3/qlnode.3
+qt1/man/man3/qmainwindow.3
+qt1/man/man3/qmenubar.3
+qt1/man/man3/qmenudata.3
+qt1/man/man3/qmessagebox.3
+qt1/man/man3/qmouseevent.3
+qt1/man/man3/qmoveevent.3
+qt1/man/man3/qmovie.3
+qt1/man/man3/qmultilineedit.3
+qt1/man/man3/qnpinstance.3
+qt1/man/man3/qnplugin.3
+qt1/man/man3/qnpstream.3
+qt1/man/man3/qnpwidget.3
+qt1/man/man3/qobject.3
+qt1/man/man3/qpaintdevice.3
+qt1/man/man3/qpaintdevicemetrics.3
+qt1/man/man3/qpainter.3
+qt1/man/man3/qpaintevent.3
+qt1/man/man3/qpalette.3
+qt1/man/man3/qpen.3
+qt1/man/man3/qpicture.3
+qt1/man/man3/qpixmap.3
+qt1/man/man3/qpixmapcache.3
+qt1/man/man3/qpoint.3
+qt1/man/man3/qpointarray.3
+qt1/man/man3/qpointval.3
+qt1/man/man3/qpopupmenu.3
+qt1/man/man3/qprintdialog.3
+qt1/man/man3/qprinter.3
+qt1/man/man3/qprogressbar.3
+qt1/man/man3/qprogressdialog.3
+qt1/man/man3/qptrdict.3
+qt1/man/man3/qptrdictiterator.3
+qt1/man/man3/qpushbutton.3
+qt1/man/man3/qqueue.3
+qt1/man/man3/qradiobutton.3
+qt1/man/man3/qrangecontrol.3
+qt1/man/man3/qrect.3
+qt1/man/man3/qregexp.3
+qt1/man/man3/qregion.3
+qt1/man/man3/qresizeevent.3
+qt1/man/man3/qscrollbar.3
+qt1/man/man3/qscrollview.3
+qt1/man/man3/qsemimodal.3
+qt1/man/man3/qshared.3
+qt1/man/man3/qsignal.3
+qt1/man/man3/qsignalmapper.3
+qt1/man/man3/qsize.3
+qt1/man/man3/qslider.3
+qt1/man/man3/qsocketnotifier.3
+qt1/man/man3/qspinbox.3
+qt1/man/man3/qsplitter.3
+qt1/man/man3/qstack.3
+qt1/man/man3/qstatusbar.3
+qt1/man/man3/qstoreddrag.3
+qt1/man/man3/qstrilist.3
+qt1/man/man3/qstring.3
+qt1/man/man3/qstrlist.3
+qt1/man/man3/qtabbar.3
+qt1/man/man3/qtabdialog.3
+qt1/man/man3/qtableview.3
+qt1/man/man3/qtextdrag.3
+qt1/man/man3/qtextstream.3
+qt1/man/man3/qtime.3
+qt1/man/man3/qtimer.3
+qt1/man/man3/qtimerevent.3
+qt1/man/man3/qtoolbar.3
+qt1/man/man3/qtoolbutton.3
+qt1/man/man3/qtooltip.3
+qt1/man/man3/qtooltipgroup.3
+qt1/man/man3/qurldrag.3
+qt1/man/man3/qvalidator.3
+qt1/man/man3/qvboxlayout.3
+qt1/man/man3/qwhatsthis.3
+qt1/man/man3/qwidget.3
+qt1/man/man3/qwidgetstack.3
+qt1/man/man3/qwindow.3
+qt1/man/man3/qwmatrix.3
+qt1/man/man3/qxtapplication.3
+qt1/man/man3/qxtwidget.3
+qt1/share/doc/qt/README
+qt1/share/doc/qt/README.QT
+@dirrm qt1/bin
+@dirrm qt1/include
+@dirrm qt1/lib
+@dirrm qt1/man/man1
+@dirrm qt1/man/man3
+@dirrm qt1/man
+@dirrm qt1/share/doc/qt
+@dirrm qt1/share/doc
+@dirrm qt1/share
+@dirrm qt1
diff --git a/x11/qwt/files/Makefile.apps b/x11/qwt/files/Makefile.apps
index 7112dcc0239..435b360defc 100644
--- a/x11/qwt/files/Makefile.apps
+++ b/x11/qwt/files/Makefile.apps
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.apps,v 1.2 2000/03/23 23:15:26 dmcmahill Exp $
+# $NetBSD: Makefile.apps,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
 #
 #	Makefile rules for Qwt examples
 #	===============================
@@ -15,7 +15,7 @@ CFLAGS	=	-O2
 INCLUDES =	-I$(QWTINC) -I$(QTINC)
 LD	=	$(CC)
 LDFLAGS	=	
-LIBS	=	-L$(QTLIB) -W,l -R$(QTLIB) -lqt1 -lXext -lX11 -lqwt -lm
+LIBS	=	-L$(X11BASE) -Wl,-R$(X11BASE) -L$(QTLIB) -Wl,-R$(QTLIB) -lqt -lXext -lX11 -lqwt -lm
 
 #
 # IMPLICIT RULES
diff --git a/x11/qwt/files/Makefile.common b/x11/qwt/files/Makefile.common
index 3496ba9478c..d0bf172edbf 100644
--- a/x11/qwt/files/Makefile.common
+++ b/x11/qwt/files/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.2 2000/03/23 23:15:26 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $
 #
 # Paths for Qt headers and library
 #
 
-QTDIR=$(PREFIX)
-QTINC=$(QTDIR)/include/qt1
+QTDIR=$(X11BASE)/qt1
+QTINC=$(QTDIR)/include
 QTLIB=$(QTDIR)/lib
-MOC=$(QTDIR)/bin/moc1
+MOC=$(QTDIR)/bin/moc
 
 #
 # Paths for Qwt headers and library 
diff --git a/x11/qwt/files/Makefile.lib b/x11/qwt/files/Makefile.lib
index 1e31bc4481f..a09b755c787 100644
--- a/x11/qwt/files/Makefile.lib
+++ b/x11/qwt/files/Makefile.lib
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.1.1.1 1999/11/17 18:32:29 drochner Exp $
+# $NetBSD: Makefile.lib,v 1.2 2000/03/28 00:09:23 dmcmahill Exp $
 #
 #	Makefile rules for the Qwt Library
 #	==================================
@@ -11,7 +11,7 @@ include $(QWTDIR)/Makefile.common
 #
 LCXX	=	$(LIBTOOL) --mode=compile $(CXX)
 INCLUDES =	-I../include -I$(QTINC)
-LLD	=	$(LIBTOOL) --mode=link $(CXX) -rpath $(PREFIX)/lib \
+LLD	=	$(LIBTOOL) --mode=link $(CXX) -rpath $(QTLIB) -rpath $(PREFIX)/lib -rpath ${X11BASE}/lib \
 		-version-info 0:2
 
 #
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index 11c3abe925b..755bf017b43 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/03/23 21:31:40 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.9 2000/03/28 00:09:23 dmcmahill Exp $
 #
 
 DISTNAME=	xglobe-0.2
@@ -25,7 +25,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_X11BASE=	YES
 USE_GMAKE=	YES
-MAKE_ENV+=	QTDIR=${X11BASE}
+MAKE_ENV+=	QTDIR=${X11BASE}/qt1
 
 post-install:
 	${INSTALL_DATA_DIR} ${X11BASE}/lib/X11/xglobe
diff --git a/x11/xglobe/files/patch-sum b/x11/xglobe/files/patch-sum
index 34c95dff2f2..f8a6cc92993 100644
--- a/x11/xglobe/files/patch-sum
+++ b/x11/xglobe/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.3 2000/03/23 21:31:41 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.4 2000/03/28 00:09:24 dmcmahill Exp $
 
-MD5 (patch-aa) = c6c01730808a9fc2084ee5bcaa05dd8c
+MD5 (patch-aa) = df9a88ec39172c32584e77d1fe19a161
diff --git a/x11/xglobe/patches/patch-aa b/x11/xglobe/patches/patch-aa
index bb7bbf54b97..9d598aeae6f 100644
--- a/x11/xglobe/patches/patch-aa
+++ b/x11/xglobe/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.6 2000/03/28 00:09:24 dmcmahill Exp $
 
 --- Makefile.orig	Mon Apr 19 05:21:04 1999
 +++ Makefile	Wed Mar 22 16:07:59 2000
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $
 -X11_INCLUDE_DIR = /usr/X11R6/include
 -QT_INCLUDE_DIR  = /usr/lib/qt/include
 +X11_INCLUDE_DIR = ${X11BASE}/include
-+QT_INCLUDE_DIR  = $(QTDIR)/include/qt1
++QT_INCLUDE_DIR  = $(QTDIR)/include
  
 -QT_LIB_DIR      = /usr/lib/qt/lib
 -X11_LIB_DIR     = /usr/X11R6/lib
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $
  LINK    = g++
 -MOC     = moc
 -INSTALL = install
-+MOC     = moc1
++MOC     = ${QTDIR}/bin/moc
 +INSTALL = install -c
  
  ####### compile and link options
@@ -37,15 +37,15 @@ $NetBSD: patch-aa,v 1.5 2000/03/23 21:31:41 dmcmahill Exp $
  INCLUDE_DIRS = -I$(QT_INCLUDE_DIR) -I$(X11_INCLUDE_DIR)
  
 -LIB_DIRS     = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR)
-+LIB_DIRS     = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR) -Wl,-R$(X11_LIB_DIR)
++LIB_DIRS     = -L$(QT_LIB_DIR) -Wl,-R${QT_LIB_DIR} -L$(X11_LIB_DIR) -Wl,-R$(X11_LIB_DIR)
  
 -LIBS         = -lX11 -lqt -lm
-+LIBS         = -lX11 -lqt1 -lm
++LIBS         = -lX11 -lqt -lm
  # If you want to use the QImageIO lib (to support jpg and png maps) use this
  # line and comment the one above (don't forget to edit config.h as well!)
 @@ -41,4 +41,5 @@
  # If the linker complains about unresolved references try this:
  #LIBS         = -lX11 -lqt -lm -lqimgio -lpng -lz
-+LIBS	= -lqt1 -lm -lXext -lX11
++LIBS	= -lqt -lm -lXext -lX11
  
  ####### Target
author	dmcmahill <dmcmahill>	2000-03-28 00:09:19 +0000
committer	dmcmahill <dmcmahill>	2000-03-28 00:09:19 +0000
commit	485df84fe5b267a5ee80411df9eb943a049e6451 (patch)
tree	c5f4a711bf29a6633f7270cfd946002d75aceb5f
parent	20f29d5d48f48f149b8dcf39185f89a4450d2ccd (diff)
download	pkgsrc-485df84fe5b267a5ee80411df9eb943a049e6451.tar.gz