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.

3 files changed, 14 insertions, 33 deletions

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)
  #