- Introduce QTVERSION variable defined in qt2/Makefile.common to make

  upgrades easier.
- Preliminary work to split uic/libqutil from qt2-designer
- Some general tidy up

10 files changed, 59 insertions, 53 deletions

diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile
index af2ab8a0e20..2ebad21b093 100644
--- a/x11/qt2-designer/Makefile
+++ b/x11/qt2-designer/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2000/12/05 18:32:03 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2000/12/09 17:21:49 skrll Exp $
 #
 
-PKGNAME=	qt2-designer-2.2.2
-
 .include "../qt2-libs/Makefile.common"
 
+PKGNAME=	qt2-designer-${QTVERSION}
+
 DEPENDS+=	qt2-libs-*:../../x11/qt2-libs
 
 ALL_TARGET=	sub-tools
@@ -13,7 +13,7 @@ PATCHFILES+=	${PKGSRCDIR}/x11/qt2-libs/patches/patch-??
 ALLFILES=	${DISTFILES} # don't checksum shared patches
 
 CONFIGURE_ENV+=	QTDIR=${QTPREFIX}
-MAKE_ENV=	QTDIR=${QTPREFIX}
+MAKE_ENV+=	QTDIR=${QTPREFIX}
 
 do-install:
 	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib
diff --git a/x11/qt2-docs/Makefile b/x11/qt2-docs/Makefile
index a3946c99116..533561f066c 100644
--- a/x11/qt2-docs/Makefile
+++ b/x11/qt2-docs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2000/12/05 18:32:04 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2000/12/09 17:21:49 skrll Exp $
 #
 
-PKGNAME=	qt2-docs-2.2.2
+PKGNAME=	qt2-docs-${QTVERSION}
 
 .include "../qt2-libs/Makefile.common"
 
-DEPENDS+=	qt2-libs-*:../../x11/qt2-libs
+DEPENDS+=	qt2-libs-${QTVERSION}:../../x11/qt2-libs
 
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index cc5bdd82ec4..1da1e16c2b4 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2000/12/05 18:32:04 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2000/12/09 17:21:49 skrll Exp $
 #
 USE_MESA=	yes
 
 .include "../qt2-libs/Makefile.common"
 
-PKGNAME=	qt2-libs-2.2.2
+PKGNAME=	qt2-libs-${QTVERSION}
 
 DEPENDS+=	png-*:../../graphics/png
 DEPENDS+=	jpeg-*:../../graphics/jpeg
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index ed046df31de..806a363a26a 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile.common,v 1.2 2000/12/05 18:32:04 drochner Exp $
+# $NetBSD: Makefile.common,v 1.3 2000/12/09 17:21:49 skrll Exp $
 #
 
-DISTNAME=		qt-x11-2.2.2
-WRKSRC=			${WRKDIR}/qt-2.2.2
+
+DISTNAME=		qt-x11-${QTVERSION}
+WRKSRC=			${WRKDIR}/qt-${QTVERSION}
 CATEGORIES=		x11
 MASTER_SITES=	\
 	ftp://ftp.trolltech.com/qt/source/ \
 	ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/
 
-MAINTAINER=		skrll@netbsd.org
-HOMEPAGE=		http://www.trolltech.com/products/qt.html
+.include "../qt2/Makefile.common"
 
 HAS_CONFIGURE=		yes
 USE_X11BASE=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	-static -sm -system-zlib \
-			-system-libpng -system-jpeg -no-thread \
+CONFIGURE_ARGS+=	-static -sm -no-thread \
+			-system-zlib -system-libpng -system-jpeg \
 			-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 CONFIGURE_SCRIPT=	${ECHO} yes | ./configure
diff --git a/x11/qt2-libs/files/patch-sum b/x11/qt2-libs/files/patch-sum
index e3f278f3ae0..d9f44076e61 100644
--- a/x11/qt2-libs/files/patch-sum
+++ b/x11/qt2-libs/files/patch-sum
@@ -1,10 +1,10 @@
-$NetBSD: patch-sum,v 1.3 2000/12/05 18:32:04 drochner Exp $
+$NetBSD: patch-sum,v 1.4 2000/12/09 17:21:50 skrll Exp $
 
-MD5 (patch-aa) = 8065c4af83fe8ce8713510f6e32a7811
-MD5 (patch-ab) = f50a6c9d50b9817003b216fa6eff5729
+MD5 (patch-aa) = 58526c496bb5ff5ada2279c6c1b67bf0
+MD5 (patch-ab) = c306aeeeea479b11d441d889f014ca30
 MD5 (patch-ac) = 04de629d6d27a0030c190b175940d9ef
 MD5 (patch-ad) = 6bb4068dfa73008cefd6a860391caaf9
-MD5 (patch-ae) = bda1074af956f165e6fe827babc9105e
+MD5 (patch-ae) = 3d7114a72a4795962f6d5d1ade1ec791
 MD5 (patch-af) = eabc3b9b2a37d3b278ef9781305d4c93
 MD5 (patch-ag) = e37a1c2177d634a10cd13e3831317be6
 MD5 (patch-ah) = 17097e2d1020179a52b1df16bf69fdd1
diff --git a/x11/qt2-libs/patches/patch-aa b/x11/qt2-libs/patches/patch-aa
index 1215b14cd04..c12b03b350a 100644
--- a/x11/qt2-libs/patches/patch-aa
+++ b/x11/qt2-libs/patches/patch-aa
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/10/19 07:41:14 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2000/12/09 17:21:50 skrll Exp $
 
---- Makefile.orig	Wed Oct  4 10:55:36 2000
+--- Makefile.orig	Wed Nov  8 17:06:41 2000
 +++ Makefile
-@@ -25,7 +25,7 @@
+@@ -25,8 +25,14 @@
  	-rm -f bin/moc
  	cp src/moc/moc bin/moc
  
 -sub-tools: sub-src FORCE
 +sub-tools: FORCE
  	cd tools; $(MAKE)
++
++sub-designer: FORCE
++	cd tools; $(MAKE) designer
++
++sub-designer-utils: FORCE
++	cd tools; $(MAKE) designer-utils
  
  symlinks: .buildopts
+ 	@cd include; rm -f q*.h; ln -s ../src/*/q*.h .; ln -s ../extensions/*/src/q*.h .; rm -f q*_p.h
diff --git a/x11/qt2-libs/patches/patch-ab b/x11/qt2-libs/patches/patch-ab
index a27d5ecb678..4942f99684e 100644
--- a/x11/qt2-libs/patches/patch-ab
+++ b/x11/qt2-libs/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2000/12/05 18:32:04 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2000/12/09 17:21:50 skrll Exp $
 
---- configs/netbsd-g++-static.orig	Wed Nov  8 18:06:36 2000
-+++ configs/netbsd-g++-static	Thu Nov 30 13:01:14 2000
+--- configs/netbsd-g++-static.orig	Wed Nov  8 17:06:36 2000
++++ configs/netbsd-g++-static
 @@ -1,21 +1,22 @@
  # Compiling
  INTERFACE_DECL_PATH 	= .
@@ -25,9 +25,9 @@ $NetBSD: patch-ab,v 1.3 2000/12/05 18:32:04 drochner Exp $
 -SYSCONF_RPATH_X11	= 
 -SYSCONF_RPATH_QT	= 
 -SYSCONF_RPATH_OPENGL	= 
-+SYSCONF_RPATH_X11	= -Wl,-R/usr/X11R6/lib
-+SYSCONF_RPATH_QT	= -Wl,-R$(QTDIR)/lib
-+SYSCONF_RPATH_OPENGL	= -Wl,-R$(X11BASE)/lib -Wl,-R$(LOCALBASE)/lib
++SYSCONF_RPATH_X11	= -Wl,-R${X11BASE}/lib
++SYSCONF_RPATH_QT	= -Wl,-R${QTDIR}/lib
++SYSCONF_RPATH_OPENGL	= -Wl,-R${X11BASE}/lib -W,-R${LOCALBASE}/lib
  
  # Linking with support libraries
  # X11
@@ -53,7 +53,7 @@ $NetBSD: patch-ab,v 1.3 2000/12/05 18:32:04 drochner Exp $
  # Flags for threading
  SYSCONF_CFLAGS_THREAD	= 
  SYSCONF_CXXFLAGS_THREAD	= 
-@@ -51,34 +49,23 @@
+@@ -51,34 +49,24 @@
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
  
@@ -69,8 +69,9 @@ $NetBSD: patch-ab,v 1.3 2000/12/05 18:32:04 drochner Exp $
 -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_LINK_TARGET	= lib$(TARGET).la
 +SYSCONF_LINK_LIB	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET); \
-+	$(SYSCONF_LINK) -rpath $(QTPREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) \
-+	-o $(SYSCONF_LINK_TARGET) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS)
++	$(SYSCONF_LINK) $(LFLAGS) -rpath $(QTPREFIX)/lib \
++	-version-info $(VER_MAJ):$(VER_MIN) -o $(SYSCONF_LINK_TARGET) \
++	$(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS)
  
 -# Linking static libraries
 -#   - Build the $(TARGET) library, eg. lib$(TARGET).a
diff --git a/x11/qt2-libs/patches/patch-ae b/x11/qt2-libs/patches/patch-ae
index bc6cc180d36..a0292e1e115 100644
--- a/x11/qt2-libs/patches/patch-ae
+++ b/x11/qt2-libs/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2000/12/05 18:32:05 drochner Exp $
+$NetBSD: patch-ae,v 1.3 2000/12/09 17:21:50 skrll Exp $
 
---- src/Makefile.in.orig	Wed Nov  8 18:06:56 2000
-+++ src/Makefile.in	Thu Nov 30 13:15:27 2000
+--- src/Makefile.in.orig	Wed Nov  8 17:06:56 2000
++++ src/Makefile.in
 @@ -2,7 +2,7 @@
  
  ####### Compiler, tools and options
@@ -16,7 +16,7 @@ $NetBSD: patch-ae,v 1.2 2000/12/05 18:32:05 drochner Exp $
  ####### Target
  
 -DESTDIR = ../lib/
-+DESTDIR =
++DESTDIR = 
  VER_MAJ = 2
  VER_MIN = 2
  VER_PATCH = 2
@@ -41,12 +41,3 @@ $NetBSD: patch-ae,v 1.2 2000/12/05 18:32:05 drochner Exp $
  
  ####### Build rules
  
-@@ -390,7 +378,7 @@
- all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
- 
- $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
--	$(SYSCONF_LINK_LIB)
-+	$(SYSCONF_LINK_LIB) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
- 
- moc: $(SRCMOC)
- 
diff --git a/x11/qt2/Makefile b/x11/qt2/Makefile
index 9144587ba35..872bb5ffb08 100644
--- a/x11/qt2/Makefile
+++ b/x11/qt2/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2000/12/06 16:25:53 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/12/09 17:21:49 skrll Exp $
 #
 
-DISTNAME=	qt2-2.2.2
-PKGNAME=	qt2-2.2.2
+DISTNAME=	qt2-${QTVERSION}
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
-MAINTAINER=	skrll@netbsd.org
-HOMEPAGE=	http://www.trolltech.com/
+.include "Makefile.common"
 
-DEPENDS+=	qt2-libs-2.2.2:../../x11/qt2-libs
-DEPENDS+=	qt2-docs-2.2.2:../../x11/qt2-docs
-DEPENDS+=	qt2-designer-2.2.2:../../x11/qt2-designer
+DEPENDS+=	qt2-libs-${QTVERSION}:../../x11/qt2-libs
+DEPENDS+=	qt2-docs-${QTVERSION}:../../x11/qt2-docs
+DEPENDS+=	qt2-designer-${QTVERSION}:../../x11/qt2-designer
 
 USE_X11BASE=	yes
 EXTRACT_ONLY=	# empty
diff --git a/x11/qt2/Makefile.common b/x11/qt2/Makefile.common
new file mode 100644
index 00000000000..e16cec1e6f1
--- /dev/null
+++ b/x11/qt2/Makefile.common
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.common,v 1.1 2000/12/09 17:21:49 skrll Exp $
+#
+
+QTVERSION=	2.2.2
+
+MAINTAINER=	skrll@netbsd.org
+HOMEPAGE=	http://www.trolltech.com/products/qt.html
+
+USE_X11BASE=	yes