From d1feb0a1ad1f19e6d94eadd8d6a6edf0d9a03250 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Fri, 28 May 1999 18:10:19 +0000
Subject: [PATCH] - fixup patches - remove BROKEN tag, Qt now compiles and
 works on SPARC

---
 x11/qt/Makefile         |  3 +--
 x11/qt/patches/patch-aa | 13 +++++++++++--
 x11/qt/patches/patch-ab | 13 +++++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/x11/qt/Makefile b/x11/qt/Makefile
index d0073d3ae46..b94ce0b9b37 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 1999/05/27 21:02:16 brad Exp $
+# $OpenBSD: Makefile,v 1.20 1999/05/28 18:10:19 brad Exp $
 # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
 
 DISTNAME=	qt-1.44
@@ -15,7 +15,6 @@ LIB_DEPENDS=	MesaGL.3.0:${PORTSDIR}/graphics/MesaGL \
 # Internal Compiler errors
 .if ${MACHINE_ARCH} == "sparc"
 PATCH_LIST=	patch-* sup-sparc
-BROKEN=		"Currently does not build on sparc due to ld bug"
 .endif
 
 USE_GMAKE=	yes
diff --git a/x11/qt/patches/patch-aa b/x11/qt/patches/patch-aa
index deb16d8259d..4f02c805c8f 100644
--- a/x11/qt/patches/patch-aa
+++ b/x11/qt/patches/patch-aa
@@ -1,5 +1,5 @@
---- configs/openbsd-g++-shared.orig	Thu May 27 13:06:43 1999
-+++ configs/openbsd-g++-shared	Thu May 27 13:17:04 1999
+--- configs/openbsd-g++-shared.orig	Fri Feb 26 12:02:08 1999
++++ configs/openbsd-g++-shared	Fri May 28 12:25:19 1999
 @@ -1,30 +1,30 @@
  # Compiling
 -SYSCONF_CXX		= g++
@@ -37,6 +37,15 @@
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= 
  
+@@ -41,7 +41,7 @@
+ #
+ 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_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
+ 
+ # Linking static libraries
+ #   - Build the $(TARGET) library, eg. lib$(TARGET).a
 @@ -53,11 +53,11 @@
  				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \
  				 ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
diff --git a/x11/qt/patches/patch-ab b/x11/qt/patches/patch-ab
index a4a1a01eb53..5154eae089f 100644
--- a/x11/qt/patches/patch-ab
+++ b/x11/qt/patches/patch-ab
@@ -1,5 +1,5 @@
---- configs/openbsd-g++-static.orig	Thu May 27 13:14:38 1999
-+++ configs/openbsd-g++-static	Thu May 27 13:16:02 1999
+--- configs/openbsd-g++-static.orig	Fri Feb 26 12:02:08 1999
++++ configs/openbsd-g++-static	Fri May 28 12:25:37 1999
 @@ -1,30 +1,30 @@
  # Compiling
 -SYSCONF_CXX		= g++
@@ -37,6 +37,15 @@
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= 
  
+@@ -41,7 +41,7 @@
+ #
+ 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_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
+ 
+ # Linking static libraries
+ #   - Build the $(TARGET) library, eg. lib$(TARGET).a
 @@ -53,10 +53,10 @@
  				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \
  				 ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)