diff options
| author | bouyer <bouyer> | 2004-03-22 15:06:52 +0000 |
|---|---|---|
| committer | bouyer <bouyer> | 2004-03-22 15:06:52 +0000 |
| commit | 85fca3f22adb401de06a981657220980eb28c4e0 (patch) | |
| tree | db8b1ba3cedb7353b1544b0e83ee34dc0c9a649e | |
| parent | cc0ab425d2848d19703bd222d12fa44d90c42cb2 (diff) | |
| download | pkgsrc-85fca3f22adb401de06a981657220980eb28c4e0.tar.gz | |
This package build fine with gcc3, don't insist on using egcs on SunOS.
This package use c++.
| -rw-r--r-- | x11/qt1/Makefile | 8 | ||||
| -rw-r--r-- | x11/qt1/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt1/patches/patch-ac | 17 |
3 files changed, 7 insertions, 22 deletions
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile index 418a397fc51..bd817bc8584 100644 --- a/x11/qt1/Makefile +++ b/x11/qt1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/24 15:30:33 grant Exp $ +# $NetBSD: Makefile,v 1.14 2004/03/22 15:06:52 bouyer Exp $ # DISTNAME= qt-1.44 @@ -14,6 +14,7 @@ COMMENT= C++ X GUI toolkit USE_BUILDLINK2= yes USE_X11BASE= yes USE_GNU_TOOLS+= make +USE_LANGUAGES= c c++ USE_LIBTOOL= yes QTPREFIX=${PREFIX}/qt1 @@ -24,11 +25,6 @@ ALL_TARGET= src .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -DEPENDS+= egcs-1.1.2:../../lang/egcs -CXX= ${LOCALBASE}/egcs/bin/g++ -.endif - do-configure: @cd ${WRKSRC} && ${MAKE} QTDIR=${WRKSRC} ${LOWER_OPSYS}-g++-static diff --git a/x11/qt1/distinfo b/x11/qt1/distinfo index 1650be803e2..a4b50f3906c 100644 --- a/x11/qt1/distinfo +++ b/x11/qt1/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2003/12/19 23:00:26 agc Exp $ +$NetBSD: distinfo,v 1.5 2004/03/22 15:06:52 bouyer Exp $ SHA1 (qt-1.44.tar.gz) = 08848fe5534bb210b151a1d9f3480fe83c0053c1 Size (qt-1.44.tar.gz) = 2659999 bytes SHA1 (patch-aa) = b94f2fadee75696e0afb98cd2d0839d991f98573 SHA1 (patch-ab) = 76d0ac60cd386518b5d8a48d15552abc5c8737ef -SHA1 (patch-ac) = 5554b60c0f4cbd13ea2fde8fcb8c287e8ac8b651 +SHA1 (patch-ac) = ffc97fce918d66d8581bfd6d307322d57fa23904 SHA1 (patch-ad) = cee971069a2f41219c14669ee5b4e1687d445dd8 SHA1 (patch-ae) = cef04901bf46e4511fafe08a9d7eee975ceae320 diff --git a/x11/qt1/patches/patch-ac b/x11/qt1/patches/patch-ac index 33793e08662..5ed10ae58d4 100644 --- a/x11/qt1/patches/patch-ac +++ b/x11/qt1/patches/patch-ac @@ -1,11 +1,10 @@ -$NetBSD: patch-ac,v 1.5 2001/05/01 16:43:40 jlam Exp $ +$NetBSD: patch-ac,v 1.6 2004/03/22 15:06:52 bouyer Exp $ --- configs/solaris-g++-static.orig Fri Feb 26 12:02:12 1999 +++ configs/solaris-g++-static @@ -1,30 +1,31 @@ # Compiling --SYSCONF_CXX = g++ -+SYSCONF_CXX = ${LOCALBASE}/egcs/bin/g++ + SYSCONF_CXX = g++ +SYSCONF_CXX_LIB = $(LIBTOOL) --mode=compile ${SYSCONF_CXX} # Compiling with support libraries @@ -36,20 +35,10 @@ $NetBSD: patch-ac,v 1.5 2001/05/01 16:43:40 jlam Exp $ SYSCONF_LIBS_YACC = # Linking applications --SYSCONF_LINK = g++ -+SYSCONF_LINK = ${LOCALBASE}/egcs/bin/g++ + SYSCONF_LINK = 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,15 +55,15 @@ # - Build the $(TARGET) library, eg. lib$(TARGET).a # - Place target in $(DESTDIR) - which has a trailing / |