From fd3b49f93ac23779275af50c08299f4bf7043ef2 Mon Sep 17 00:00:00 2001 From: drochner Date: Fri, 4 Jun 1999 15:29:32 +0000 Subject: [PATCH] update to qt-1.44 --- x11/qt/Makefile | 6 ++-- x11/qt/files/md5 | 4 +-- x11/qt/patches/patch-aa | 80 ++++++++++++++++++++++++++++------------- x11/qt/patches/patch-ab | 38 ++++++++++---------- x11/qt/pkg/PLIST | 10 +++--- 5 files changed, 86 insertions(+), 52 deletions(-) diff --git a/x11/qt/Makefile b/x11/qt/Makefile index e79e905b5e3d..ec45a7873e8e 100644 --- a/x11/qt/Makefile +++ b/x11/qt/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 1999/02/20 22:48:47 hubertf Exp $ +# $NetBSD: Makefile,v 1.25 1999/06/04 15:29:32 drochner Exp $ # -DISTNAME= qt-1.42 +DISTNAME= qt-1.44 CATEGORIES= x11 MASTER_SITES= ftp://ftp.troll.no/qt/source/ \ ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/ @@ -9,6 +9,8 @@ MASTER_SITES= ftp://ftp.troll.no/qt/source/ \ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.troll.no/products/qt.html +CONFLICTS= qt-1.* + USE_X11BASE= yes USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/x11/qt/files/md5 b/x11/qt/files/md5 index 25675ba72855..ca009a620254 100644 --- a/x11/qt/files/md5 +++ b/x11/qt/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.7 1998/12/29 19:34:47 tron Exp $ +$NetBSD: md5,v 1.8 1999/06/04 15:29:32 drochner Exp $ -MD5 (qt-1.42.tar.gz) = 0d1b32b6838d33074fe84088a2942028 +MD5 (qt-1.44.tar.gz) = 143a6b7001c04843c304c96cfe608ed8 diff --git a/x11/qt/patches/patch-aa b/x11/qt/patches/patch-aa index 18d4c74e8f45..31cc84420e16 100644 --- a/x11/qt/patches/patch-aa +++ b/x11/qt/patches/patch-aa @@ -1,35 +1,67 @@ -$NetBSD: patch-aa,v 1.4 1998/12/29 19:34:48 tron Exp $ - ---- configs/netbsd-g++-static.orig Tue Nov 17 15:19:08 1998 -+++ configs/netbsd-g++-static Tue Dec 29 20:11:13 1998 -@@ -2,9 +2,9 @@ - SYSCONF_CC = g++ +--- configs/netbsd-g++-static.orig Fri Feb 26 18:02:07 1999 ++++ configs/netbsd-g++-static Fri Jun 4 14:00:58 1999 +@@ -1,5 +1,6 @@ + # Compiling + SYSCONF_CXX = g++ ++SYSCONF_CXX_LIB = $(LIBTOOL) --mode=compile g++ # Compiling with support libraries --SYSCONF_CFLAGS_X11 = -I/usr/X11R6/include -+SYSCONF_CFLAGS_X11 = -I$(X11BASE)/include - SYSCONF_CFLAGS_QT = -I$(QTDIR)/include --SYSCONF_CFLAGS_OPENGL = -I/usr/X11R6/include -+SYSCONF_CFLAGS_OPENGL = -I$(X11BASE)/include + SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include +@@ -14,8 +15,8 @@ + SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib + SYSCONF_LIBS_X11 = -lX11 -lXext + # Qt, Qt+OpenGL +-SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib +-SYSCONF_LIBS_QT = -lqt ++SYSCONF_LFLAGS_QT = ++SYSCONF_LIBS_QT = $(QTDIR)/src/libqt.la + SYSCONF_LIBS_QT_OPENGL = -lqgl + # OpenGL + SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib +@@ -24,38 +25,24 @@ + SYSCONF_LIBS_YACC = - # Compiline YACC output - SYSCONF_CFLAGS_YACC = -Wno-unused -Wno-parentheses -@@ -47,14 +47,14 @@ + # Linking applications +-SYSCONF_LINK = g++ ++SYSCONF_LINK = $(LIBTOOL) --mode=link g++ + SYSCONF_LFLAGS = + SYSCONF_LIBS = + +-# Link flags shared objects +-SYSCONF_LFLAGS_SHOBJ = -Bshareable +- + # Meta-object compiler + 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 / +-# - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN) +-# +-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) +- +-# Linking static libraries ++# Linking libtool libraries # - Build the $(TARGET) library, eg. lib$(TARGET).a # - Place target in $(DESTDIR) - which has a trailing / # -SYSCONF_AR = ar cqs -SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a -+SYSCONF_AR = $(LIBTOOL) $(SYSCONF_CC) -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o -+SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).la - SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ -- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) -+ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) +-SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ +- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ++SYSCONF_LINK_TARGET = lib$(TARGET).la ++SYSCONF_LINK_LIB = rm -f $(SYSCONF_LINK_TARGET) ; \ ++ $(LIBTOOL) --mode=link g++ -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) \ ++ -o $(SYSCONF_LINK_TARGET) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) # Compiling application source - SYSCONF_CFLAGS = -O2 -fno-strength-reduce + SYSCONF_CXXFLAGS = -O2 -fno-strength-reduce # Compiling library source --SYSCONF_CFLAGS_LIB = -O2 -fno-strength-reduce -fPIC -+SYSCONF_CFLAGS_LIB = +-SYSCONF_CXXFLAGS_LIB = -O2 -fno-strength-reduce -fPIC ++SYSCONF_CXXFLAGS_LIB = # Compiling shared-object source - SYSCONF_CFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC - SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) +-SYSCONF_CXXFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC +-SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) +-SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) ++SYSCONF_CXXFLAGS_SHOBJ = -O2 -fno-strength-reduce diff --git a/x11/qt/patches/patch-ab b/x11/qt/patches/patch-ab index 94ed9afbb33b..1f8e632a5085 100644 --- a/x11/qt/patches/patch-ab +++ b/x11/qt/patches/patch-ab @@ -1,14 +1,14 @@ -$NetBSD: patch-ab,v 1.3 1998/10/02 15:02:33 tv Exp $ +$NetBSD: patch-ab,v 1.4 1999/06/04 15:29:33 drochner Exp $ ---- src/Makefile.in.orig Sun Jul 19 14:30:55 1998 -+++ src/Makefile.in Sun Jul 19 16:51:42 1998 +--- src/Makefile.in.orig Thu Jun 3 21:09:55 1999 ++++ src/Makefile.in Thu Jun 3 21:25:50 1999 @@ -14,7 +14,7 @@ ####### Compiler, tools and options --CC = $(SYSCONF_CC) -+CC = $(LIBTOOL) $(SYSCONF_CC) - CFLAGS = $(SYSCONF_CFLAGS_QT) $(SYSCONF_CFLAGS_X11) $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) +-CXX = $(SYSCONF_CXX) ++CXX = $(SYSCONF_CXX_LIB) + CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) LFLAGS = $(SYSCONF_LFLAGS_X11) $(SYSCONF_LFLAGS) LIBS = $(SYSCONF_LIBS_X11) @@ -23,7 +23,7 @@ @@ -16,30 +16,32 @@ $NetBSD: patch-ab,v 1.3 1998/10/02 15:02:33 tv Exp $ TARGET = qt -DESTDIR = ../lib/ -+DESTDIR = ++DESTDIR = VER_MAJ = 1 - VER_MIN = 40 + VER_MIN = 44 -@@ -506,20 +506,8 @@ +@@ -505,22 +505,10 @@ - .SUFFIXES: .cpp .cxx .cc .C .c + ####### Implicit rules --.cpp.o: -- $(CC) -c $(CFLAGS) -o $@ $< +-.SUFFIXES: .cpp .cxx .cc .C .c ++.SUFFIXES: .cpp + + .cpp.o: +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.cxx.o: -- $(CC) -c $(CFLAGS) -o $@ $< +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.cc.o: -- $(CC) -c $(CFLAGS) -o $@ $< +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.C.o: -- $(CC) -c $(CFLAGS) -o $@ $< +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -.c.o: -- $(CC) -c $(CFLAGS) -o $@ $< -+.cpp.o .cxx.o .cc.o .C.o .c.o: -+ @cd `dirname $@` && $(CC) -c $(CFLAGS) `basename $<` +- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< ++ @cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<` ####### Build rules diff --git a/x11/qt/pkg/PLIST b/x11/qt/pkg/PLIST index 7e44d36e1f75..719f36a63512 100644 --- a/x11/qt/pkg/PLIST +++ b/x11/qt/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 1998/12/29 19:34:48 tron Exp $ +@comment $NetBSD: PLIST,v 1.11 1999/06/04 15:29:33 drochner Exp $ bin/moc include/qt/jri.h include/qt/jri_md.h @@ -168,6 +168,7 @@ include/qt/qstatusbar.h include/qt/qstring.h include/qt/qstrlist.h include/qt/qstrvec.h +include/qt/qt_gif.h include/qt/qtabbar.h include/qt/qtabdialog.h include/qt/qtabdlg.h @@ -192,8 +193,9 @@ include/qt/qwindefs.h include/qt/qwindow.h include/qt/qwindowdefs.h include/qt/qwmatrix.h +include/qt/qxt.h lib/libqt.a -lib/libqt.so.1.42 +lib/libqt.so.1.44 man/man1/moc.1 man/man3/QAccel.3 man/man3/QApplication.3 @@ -252,8 +254,6 @@ man/man3/QGCache.3 man/man3/QGCacheIterator.3 man/man3/QGDict.3 man/man3/QGDictIterator.3 -man/man3/QGIFFormat.3 -man/man3/QGIFFormatType.3 man/man3/QGLContext.3 man/man3/QGLFormat.3 man/man3/QGLWidget.3 @@ -429,8 +429,6 @@ man/man3/qgcache.3 man/man3/qgcacheiterator.3 man/man3/qgdict.3 man/man3/qgdictiterator.3 -man/man3/qgifformat.3 -man/man3/qgifformattype.3 man/man3/qglcontext.3 man/man3/qglformat.3 man/man3/qglist.3