Update to Qt-2.0.2

5 files changed, 31 insertions, 15 deletions

diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 1b9f0ba65257..90bcbb6b5f94 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for:   qt201
-# Version required:	2.0.1
+# New ports collection makefile for:   qt20
+# Version required:	2.0.2
 # Date created:		17 Jul 1999
 # Whom:			imura@cs.titech.ac.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	qt-2.0.1
+DISTNAME=	qt-2.0.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
-MAINTAINER=	imura@cs.titech.ac.jp
+MAINTAINER=	imura@FreeBSD.org
 
 LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png
 
@@ -34,7 +34,7 @@ USE_NEWGCC=	YES
 .if ${PORTOBJFORMAT} == "elf"
 VERSION=	2
 .else
-VERSION=	2.01
+VERSION=	2.02
 .endif
 PLIST_SUB=	VERSION=${VERSION}
 
@@ -60,7 +60,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/LICENSE.QPL ${PREFIX}/share/doc/qt2
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qt2
 	${INSTALL_DATA} ${WRKSRC}/README.QT ${PREFIX}/share/doc/qt2
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/qt2/html
+	${INSTALL_DATA} ${WRKSRC}/doc/[^q]* ${PREFIX}/share/doc/qt2/html
+	${INSTALL_DATA} ${WRKSRC}/doc/q[a-m]* ${PREFIX}/share/doc/qt2/html
+	${INSTALL_DATA} ${WRKSRC}/doc/q[n-z]* ${PREFIX}/share/doc/qt2/html
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt31/distinfo b/x11-toolkits/qt31/distinfo
index e9746a2567a9..27fdd45446a6 100644
--- a/x11-toolkits/qt31/distinfo
+++ b/x11-toolkits/qt31/distinfo
@@ -1 +1 @@
-MD5 (qt-2.0.1.tar.gz) = 32fe2ccb734d019d1156667e1f303495
+MD5 (qt-2.0.2.tar.gz) = afeaf554f538b415a2f46ff6b36657f4
diff --git a/x11-toolkits/qt31/files/manpages b/x11-toolkits/qt31/files/manpages
index 8af672302e06..6b77b5e17666 100644
--- a/x11-toolkits/qt31/files/manpages
+++ b/x11-toolkits/qt31/files/manpages
@@ -167,6 +167,7 @@ qresizeevent.3qt \
 qscrollbar.3qt \
 qscrollview.3qt \
 qsemimodal.3qt \
+qserversocket.3qt \
 qsessionmanager.3qt \
 qshared.3qt \
 qshowevent.3qt \
@@ -177,6 +178,8 @@ qsize.3qt \
 qsizegrip.3qt \
 qsizepolicy.3qt \
 qslider.3qt \
+qsocket.3qt \
+qsocketaddress.3qt \
 qsocketnotifier.3qt \
 qsortedlist.3qt \
 qspaceritem.3qt \
diff --git a/x11-toolkits/qt31/files/patch-aa b/x11-toolkits/qt31/files/patch-aa
index 6b46648a61aa..4adebbfe81c8 100644
--- a/x11-toolkits/qt31/files/patch-aa
+++ b/x11-toolkits/qt31/files/patch-aa
@@ -1,5 +1,5 @@
---- configs/freebsd-g++-shared.orig	Tue Jul 20 11:45:01 1999
-+++ configs/freebsd-g++-shared	Thu Aug 12 21:26:28 1999
+--- configs/freebsd-g++-shared.orig	Fri Sep 24 18:21:55 1999
++++ configs/freebsd-g++-shared	Fri Oct  1 22:07:46 1999
 @@ -1,33 +1,33 @@
  # Compiling
 -SYSCONF_CXX		= g++
@@ -81,10 +81,10 @@
  SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
  				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
  # Compiling application source
--SYSCONF_CXXFLAGS	= -pipe -DNO_DEBUG -O2
--SYSCONF_CFLAGS		= -pipe -DNO_DEBUG -O2
-+SYSCONF_CXXFLAGS	= $(SYS_CXXFLAGS) -DNO_DEBUG
-+SYSCONF_CFLAGS		= $(SYS_CXXFLAGS) -DNO_DEBUG
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= $(SYS_CXXFLAGS)
++SYSCONF_CFLAGS		= $(SYS_CXXFLAGS)
  # Compiling library source
  SYSCONF_CXXFLAGS_LIB	= -fPIC
  SYSCONF_CFLAGS_LIB	= -fPIC
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index 80793e5b031e..d3e52a97f33b 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -183,6 +183,7 @@ include/qt2/qscrbar.h
 include/qt2/qscrollbar.h
 include/qt2/qscrollview.h
 include/qt2/qsemimodal.h
+include/qt2/qserversocket.h
 include/qt2/qsession.h
 include/qt2/qsessionmanager.h
 include/qt2/qshared.h
@@ -196,6 +197,8 @@ include/qt2/qsizepolicy.h
 include/qt2/qsjiscodec.h
 include/qt2/qslider.h
 include/qt2/qsmartptr.h
+include/qt2/qsocket.h
+include/qt2/qsocketdevice.h
 include/qt2/qsocketnotifier.h
 include/qt2/qsocknot.h
 include/qt2/qsortedlist.h
@@ -282,7 +285,6 @@ share/doc/qt2/html/desktop-desktop-cpp.html
 share/doc/qt2/html/dialogs.html
 share/doc/qt2/html/dirview-main-cpp.html
 share/doc/qt2/html/dnd.html
-share/doc/qt2/html/dochead.jpg
 share/doc/qt2/html/dochead.png
 share/doc/qt2/html/drawdemo-drawdemo-cpp.html
 share/doc/qt2/html/drawing.html
@@ -846,6 +848,9 @@ share/doc/qt2/html/qscrollview.html
 share/doc/qt2/html/qsemimodal-h.html
 share/doc/qt2/html/qsemimodal-members.html
 share/doc/qt2/html/qsemimodal.html
+share/doc/qt2/html/qserversocket-h.html
+share/doc/qt2/html/qserversocket-members.html
+share/doc/qt2/html/qserversocket.html
 share/doc/qt2/html/qsessionmanager-h.html
 share/doc/qt2/html/qsessionmanager-members.html
 share/doc/qt2/html/qsessionmanager.html
@@ -877,6 +882,12 @@ share/doc/qt2/html/qslider-m.png
 share/doc/qt2/html/qslider-members.html
 share/doc/qt2/html/qslider-w.png
 share/doc/qt2/html/qslider.html
+share/doc/qt2/html/qsocket-h.html
+share/doc/qt2/html/qsocket-members.html
+share/doc/qt2/html/qsocket.html
+share/doc/qt2/html/qsocketaddress-members.html
+share/doc/qt2/html/qsocketaddress.html
+share/doc/qt2/html/qsocketdevice-h.html
 share/doc/qt2/html/qsocketnotifier-h.html
 share/doc/qt2/html/qsocketnotifier-members.html
 share/doc/qt2/html/qsocketnotifier.html
@@ -1164,6 +1175,6 @@ share/doc/qt2/html/wizard-main-cpp.html
 share/doc/qt2/html/xform-xform-cpp.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm include/qt2
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
+@dirrm include/qt2