Make this package work on Solaris.

2 files changed, 82 insertions, 3 deletions

diff --git a/x11/qt/Makefile b/x11/qt/Makefile
index ec45a7873e8..ffee8bbd08a 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 1999/06/04 15:29:32 drochner Exp $
+# $NetBSD: Makefile,v 1.26 1999/07/07 17:34:51 agc Exp $
 #
 
 DISTNAME=	qt-1.44
@@ -18,8 +18,18 @@ USE_LIBTOOL=	yes
 MAKE_ENV=	QTDIR=${WRKSRC}
 ALL_TARGET=	src
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+DEPENDS+=	egcs-1.1.2:../../lang/egcs
+REAL_OPSYS=	solaris
+CXX=		${LOCALBASE}/egcs/bin/g++
+.else
+REAL_OPSYS=	${LOWER_OPSYS}
+.endif
+
 do-configure:
-	@cd ${WRKSRC} && ${MAKE} QTDIR=${WRKSRC} netbsd-g++-static
+	@cd ${WRKSRC} && ${MAKE} QTDIR=${WRKSRC} ${REAL_OPSYS}-g++-static
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${PREFIX}/bin/
@@ -32,7 +42,8 @@ do-install:
 	    ${ECHO} installing ${PREFIX}/man/man3/$${PAGE}; \
 	    set - X `head -1 $${PAGE}qt`; \
 	    if [ $$# -eq 3 ] && [ "$$2" = .so ]; then \
-		${LN} -sf `basename $$3 | ${SED} s/qt$$//` \
+		${RM} -f ${PREFIX}/man/man3/$${PAGE}; \
+		${LN} -s `basename $$3 | ${SED} s/qt$$//` \
 		${PREFIX}/man/man3/$${PAGE}; \
 	    else \
 		${INSTALL_MAN} $${PAGE}qt \
diff --git a/x11/qt/patches/patch-ac b/x11/qt/patches/patch-ac
new file mode 100644
index 00000000000..8365235d18f
--- /dev/null
+++ b/x11/qt/patches/patch-ac
@@ -0,0 +1,68 @@
+$NetBSD: patch-ac,v 1.1 1999/07/07 17:34:52 agc Exp $
+
+Make this compile on Solaris, using egcs, and X11R6
+
+--- configs/solaris-g++-static	1999/07/07 15:52:56	1.1
++++ configs/solaris-g++-static	1999/07/07 16:02:02
+@@ -1,30 +1,31 @@
+ # Compiling
+-SYSCONF_CXX		= g++
++SYSCONF_CXX		= ${LOCALBASE}/egcs/bin/g++
++SYSCONF_CXX_LIB		= $(LIBTOOL) --mode=compile ${SYSCONF_CXX}
+ 
+ # Compiling with support libraries
+-SYSCONF_CXXFLAGS_X11	= -I/usr/openwin/include
++SYSCONF_CXXFLAGS_X11	= -I${X11BASE}/include
+ SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
+-SYSCONF_CXXFLAGS_OPENGL	= 
++SYSCONF_CXXFLAGS_OPENGL	= -I${X11BASE}/include
+ 
+ # Compiline YACC output
+ SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
+ 
+ # Linking with support libraries
+ # X11
+-SYSCONF_LFLAGS_X11	= -L/usr/openwin/lib
++SYSCONF_LFLAGS_X11	= -L${X11BASE}/lib
+ SYSCONF_LIBS_X11	= -lX11 -lXext
+ # Qt, Qt+OpenGL
+ SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
+ SYSCONF_LIBS_QT		= -lqt
+ SYSCONF_LIBS_QT_OPENGL	= -lqgl
+ # OpenGL
+-SYSCONF_LFLAGS_OPENGL	= 
+-SYSCONF_LIBS_OPENGL	= -lGL -lGLU -lXmu
++SYSCONF_LFLAGS_OPENGL	= -L${X11BASE}/lib
++SYSCONF_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu -lXext -lm
+ # Yacc
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= g++
++SYSCONF_LINK		= ${LOCALBASE}/egcs/bin/g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= 
+ 
+@@ -39,7 +40,7 @@
+ #   - Place target in $(DESTDIR) - which has a trailing /
+ #   - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
+ #
+-SYSCONF_LINK_SHLIB	= g++
++SYSCONF_LINK_SHLIB	= ${LOCALBASE}/egcs/bin/g++
+ SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
+ SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -h $(TARGET1) -shared  \
+ 				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+@@ -54,10 +55,10 @@
+ #   - 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_AR		= $(LIBTOOL) --mode=link $(SYSCONF_CXX) -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) 
+ # Compiling application source
+ SYSCONF_CXXFLAGS	= -O2 -fno-strength-reduce
+ # Compiling library source