Upgrade qt141 to qt142 after repository copy. qt141 will be deleted after

a short test period to make sure qt142 is an adequate replacement.

Note #1: I changed it to install libqt.so.2.0.  qt141 or newer are
         required for some software (most notably kde).  We missed the
         chance to change the shlib number in qt141 so I'm doing it now.

Note #2: After talking with Peter Wemm, I decided not to add extra
         -rpath directives.  The fix for kdesupport and other build
         problems are forthcoming in ld.

4 files changed, 47 insertions, 53 deletions

diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 028218cd3c5c..87a25eb27126 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   qt
-# Version required:	1.31
+# Version required:	1.42
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.28 1998/11/22 10:05:13 asami Exp $
+# $Id: Makefile,v 1.29 1998/11/23 17:41:10 andreas Exp $
 #
 
-DISTNAME=	qt-${MAJ}.${MIN}
+DISTNAME=	qt-1.42
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
@@ -14,12 +14,18 @@ MAINTAINER=	andreas@FreeBSD.ORG
 
 LIB_DEPENDS=	MesaGL.14:${PORTSDIR}/graphics/Mesa3
 
-MAJ=		1
-MIN=		41
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 MAKE_ENV=	QTDIR=${WRKSRC}
 
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+VERSION=	2
+.else
+VERSION=	2.0
+.endif
+
 MAN1=	moc.1
 MAN3=   QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \
 	QBitArray.3qt QBitVal.3qt QBitmap.3qt QBoxLayout.3qt \
@@ -117,26 +123,16 @@ post-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} freebsd-g++-shared
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKDIR)/qt-${MAJ}.${MIN}/bin/moc $(PREFIX)/bin
-	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${VERSION} \
-		$(PREFIX)/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc $(PREFIX)/bin
+	${INSTALL_DATA} ${WRKSRC}/lib/libqt.so.${VERSION} $(PREFIX)/lib
 	${LN} -sf $(PREFIX)/lib/libqt.so.$(VERSION) $(PREFIX)/lib/libqt.so
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m $(PREFIX)/lib
 	${MKDIR} $(PREFIX)/include/X11/qt
-	${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/include/* \
-		$(PREFIX)/include/X11/qt
-	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man1/* $(PREFIX)/man/man1
-	${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man3/* $(PREFIX)/man/man3
+	${INSTALL_DATA} ${WRKSRC}/include/* $(PREFIX)/include/X11/qt
+	${INSTALL_MAN} ${WRKSRC}/man/man1/* $(PREFIX)/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man3/* $(PREFIX)/man/man3
 	${MKDIR} ${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README \
-		${PREFIX}/share/doc/qt
-	${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README.QT \
-		${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qt
+	${INSTALL_DATA} ${WRKSRC}/README.QT ${PREFIX}/share/doc/qt
 
-.include <bsd.port.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-VERSION=	${MAJ}
-.else
-VERSION=	${MAJ}.${MIN}
-.endif
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt31/distinfo b/x11-toolkits/qt31/distinfo
index 194b63e1c228..89fbd0755568 100644
--- a/x11-toolkits/qt31/distinfo
+++ b/x11-toolkits/qt31/distinfo
@@ -1 +1 @@
-MD5 (qt-1.41.tar.gz) = a44bc8972a6997c63f5c34820b0f4901
+MD5 (qt-1.42.tar.gz) = 0d1b32b6838d33074fe84088a2942028
diff --git a/x11-toolkits/qt31/files/patch-aa b/x11-toolkits/qt31/files/patch-aa
index fa8d5891d925..aabb438685c3 100644
--- a/x11-toolkits/qt31/files/patch-aa
+++ b/x11-toolkits/qt31/files/patch-aa
@@ -1,40 +1,38 @@
---- configs/freebsd-g++-shared.orig	Thu Oct  1 23:12:11 1998
-+++ configs/freebsd-g++-shared	Mon Nov 23 18:05:47 1998
-@@ -38,8 +38,26 @@
+--- ./configs/freebsd-g++-shared.org	Tue Nov 17 06:19:01 1998
++++ ./configs/freebsd-g++-shared	Wed Jan  6 23:49:34 1999
+@@ -40,15 +44,26 @@
  #   - 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)
+ SYSCONF_LINK_SHLIB	= g++
 +ifeq ($(PORTOBJFORMAT),elf)
-+SYSCONF_LINK_TARGET_SHARED    = lib$(TARGET).so.$(VER_MAJ)
-+SYSCONF_LINK_LIB_SHARED       =  $(SYSCONF_LINK_SHLIB) -shared -soname \
-+	$(SYSCONF_LINK_TARGET_SHARED) $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED)\
-+	`lorder $(OBJECTS) $(OBJMOC) | tsort` $(LIBS); \
-+	mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
-+	cd $(DESTDIR); \
-+	rm -f lib$(TARGET).so; \
-+	ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so;
++SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ)
++SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared  \
++				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
++				     -Wl,-soname,$(SYSCONF_LINK_TARGET_SHARED) \
++				     $(OBJECTS) $(OBJMOC) $(LIBS); \
++				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
++				 cd $(DESTDIR); \
++				 rm -f lib$(TARGET).so; \
++				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
 +else
-+SYSCONF_LINK_TARGET_SHARED    = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
-+SYSCONF_LINK_LIB_SHARED       =  $(SYSCONF_LINK_SHLIB) -Bshareable \
-+	$(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
-+	`lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS); \
-+	mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
-+	cd $(DESTDIR); \
-+	rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \
-+	ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
-+	ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ)
+ SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
+ SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared  \
+ 				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+ 				     $(OBJECTS) $(OBJMOC) $(LIBS); \
+ 				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+ 				 cd $(DESTDIR); \
+-				 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \
+-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
+-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ)
++				 rm -f lib$(TARGET).so; \
++				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
 +endif
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -51,11 +69,11 @@
- 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) \
- 				 ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
+@@ -61,9 +76,9 @@
  # Compiling application source
--SYSCONF_CFLAGS		= -O2 -fno-strength-reduce
-+SYSCONF_CFLAGS		= -pipe -O2 -fno-strength-reduce
+ SYSCONF_CFLAGS		= -pipe -O2 -fno-strength-reduce
  # Compiling library source
 -SYSCONF_CFLAGS_LIB	= -O2 -fno-strength-reduce -fPIC
 +SYSCONF_CFLAGS_LIB	= -pipe -O2 -fno-strength-reduce -fPIC
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index 205b356aa46b..51afc2a81927 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -1,5 +1,5 @@
 lib/libqt.so
-lib/libqt.so.1.41
+lib/libqt.so.2
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 bin/moc