Don't depend on egcs for solaris, the gcc-2.95.3 provided with solaris9

works fine too.
libtoolize the library builds for solaris, and build shared libraries.

3 files changed, 53 insertions, 14 deletions

diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index 5d7483cda2d..31d02bcad6e 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2002/08/25 18:40:43 jlam Exp $
+# $NetBSD: Makefile.common,v 1.19 2002/10/25 10:56:05 bouyer Exp $
 #
 
 DISTNAME=	qt-x11-${QTVERSION}
@@ -36,8 +36,6 @@ PATCHDIR=		${.CURDIR}/../../x11/qt2-libs/patches
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-BUILD_DEPENDS+=		egcs-1.1.2:../../lang/egcs
-CXX=			${LOCALBASE}/egcs/bin/g++
 CONFIGURE_ARGS+=	-platform solaris-g++
 .endif
 
diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo
index 76d2db8cb34..b01bfc7ebc8 100644
--- a/x11/qt2-libs/distinfo
+++ b/x11/qt2-libs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2002/08/25 18:40:43 jlam Exp $
+$NetBSD: distinfo,v 1.8 2002/10/25 10:56:05 bouyer Exp $
 
 SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823
 Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes
 SHA1 (patch-aa) = 10f4cea8c2719c3c70becff88022e910778c4538
 SHA1 (patch-ab) = cada94d79878a49e24211ab7d17c097bbf5a9794
-SHA1 (patch-ac) = c94b7b93e991f89fbfe6b3e0e142d825c7e16eac
+SHA1 (patch-ac) = 0d94197bd40994b0c658e466d3ebb81fabfbf30c
 SHA1 (patch-ad) = 26482d22e1d016ef514a43a69a5d58b19f03193c
 SHA1 (patch-ae) = 3ca7c34f608458950e5036f4a0b9ca0c53f83343
 SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b
diff --git a/x11/qt2-libs/patches/patch-ac b/x11/qt2-libs/patches/patch-ac
index 406bb05f400..455b92efd38 100644
--- a/x11/qt2-libs/patches/patch-ac
+++ b/x11/qt2-libs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2002/08/25 18:40:44 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2002/10/25 10:56:05 bouyer Exp $
 
---- configs/solaris-g++-static.in.orig	Wed Jun 13 04:56:50 2001
-+++ configs/solaris-g++-static.in
-@@ -2,31 +2,32 @@
+--- configs/solaris-g++-static.in.orig	Wed Jun 13 10:56:50 2001
++++ configs/solaris-g++-static.in	Thu Oct 17 18:28:26 2002
+@@ -2,24 +2,25 @@
  INTERFACE_DECL_PATH 	= .
  SYSCONF_CXX		= g++
  SYSCONF_CC		= gcc
@@ -34,6 +34,7 @@ $NetBSD: patch-ac,v 1.5 2002/08/25 18:40:44 jlam Exp $
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm -lresolv -lsocket -lnsl
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
+@@ -26,13 +27,13 @@
  SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
@@ -42,16 +43,56 @@ $NetBSD: patch-ac,v 1.5 2002/08/25 18:40:44 jlam Exp $
  SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
  # Yacc
  SYSCONF_LIBS_YACC	= 
-@@ -77,13 +78,13 @@
- SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ 
+ # Linking applications
+-SYSCONF_LINK		= g++
++SYSCONF_LINK		= $(LIBTOOL) --mode=link g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= 
+ 
+@@ -51,39 +52,22 @@
+ # UI compiler
+ SYSCONF_UIC		= $(QTDIR)/bin/uic
+ 
+-# Linking shared libraries
+-#   - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
++# Linking libtool libraries
++#   - Build the $(TARGET) library, eg. lib$(TARGET).la
+ #   - Place target in $(DESTDIR) - which has a trailing /
+ #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
+ #
+-SYSCONF_LINK_SHLIB	= g++
+-SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
+-SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared -h $(TARGET1)  \
+-				     $(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) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
+-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
+-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
+-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
+-
+-# Linking static libraries
+-#   - Build the $(TARGET) library, eg. lib$(TARGET).a
+-#   - Place target in $(DESTDIR) - which has a trailing /
+-#
+-SYSCONF_AR		= ar cq
+-SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
+-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 $(DESTDIR)$(SYSCONF_LINK_TARGET); \
++	$(SYSCONF_LINK) $(LFLAGS) -rpath $(QTPREFIX)/lib \
++	-version-info $(VER_MAJ):$(VER_MIN) -o $(SYSCONF_LINK_TARGET) \
++	$(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS)
  # Compiling application source
 -SYSCONF_CXXFLAGS	= -O2
 -SYSCONF_CFLAGS		= -O2
+-SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
+-SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
 +#SYSCONF_CXXFLAGS	= -O2
 +#SYSCONF_CFLAGS		= -O2
- SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
- SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
  # Compiling library source
 -SYSCONF_CXXFLAGS_LIB	=
 -SYSCONF_CFLAGS_LIB	=