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.

5 files changed, 20 insertions, 63 deletions

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 @@
      ;;