From 72be7ecce4b2cf64830849844887e3e81115f149 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 17 Feb 2006 23:24:17 +0000 Subject: Enable STL (auto) + revision bump --- x11/qt3-libs/Makefile | 12 ++++++------ x11/qt3-libs/Makefile.common | 16 ++++++++-------- x11/qt3-libs/buildlink3.mk | 10 ++++------ x11/qt3-tools/Makefile | 10 +++++----- x11/qt3-tools/buildlink3.mk | 6 +++--- 5 files changed, 26 insertions(+), 28 deletions(-) (limited to 'x11') diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index f2850fd657b..ef0356d155c 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.46 2006/02/05 23:11:42 joerg Exp $ +# $NetBSD: Makefile,v 1.47 2006/02/17 23:24:17 adam Exp $ -PKGNAME= qt3-libs-${QTVERSION} -PKGREVISION= 3 -MAINTAINER= adam@NetBSD.org -COMMENT= C++ X GUI toolkit +PKGNAME= qt3-libs-${QTVERSION} +PKGREVISION= 4 +MAINTAINER= adam@NetBSD.org +COMMENT= C++ X GUI toolkit LIBQT= ${WRKSRC}/lib/libqt-mt.la @@ -21,7 +21,7 @@ PTHREAD_OPTS+= require UNLIMIT_RESOURCES= datasize -BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX} +BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX} PKGCONFIG_OVERRIDE= lib/qt-mt.pc diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index e65f815aa70..c1b40282c2f 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.58 2005/12/05 20:51:19 rillig Exp $ -# -DISTNAME= qt-x11-free-${QTVERSION} -CATEGORIES= x11 -MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ - ftp://ftp.bero.org/pub/qt/source/ -EXTRACT_SUFX= .tar.bz2 +# $NetBSD: Makefile.common,v 1.59 2006/02/17 23:24:17 adam Exp $ + +DISTNAME= qt-x11-free-${QTVERSION} +CATEGORIES= x11 +MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ + ftp://ftp.bero.org/pub/qt/source/ +EXTRACT_SUFX= .tar.bz2 .include "../../x11/qt3/Makefile.common" @@ -20,7 +20,7 @@ USE_LIBTOOL= yes QTPREFIX= ${PREFIX}/qt3 CONFIGURE_ARGS+= -prefix ${QTPREFIX} -CONFIGURE_ARGS+= -shared -sm -thread -no-stl \ +CONFIGURE_ARGS+= -shared -sm -thread \ -system-zlib -system-libpng \ -system-libmng -system-libjpeg \ ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//} diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk index 16a4796b9bb..55ec275e4a1 100644 --- a/x11/qt3-libs/buildlink3.mk +++ b/x11/qt3-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 23:24:17 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QT3_LIBS_BUILDLINK3_MK:= ${QT3_LIBS_BUILDLINK3_MK}+ @@ -12,17 +12,15 @@ BUILDLINK_PACKAGES+= qt3-libs .if !empty(QT3_LIBS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.qt3-libs+= qt3-libs>=3.2.3 -BUILDLINK_RECOMMENDED.qt3-libs+=qt3-libs>=3.3.3nb4 -BUILDLINK_RECOMMENDED.qt3-libs?= qt3-libs>=3.3.5nb3 +BUILDLINK_RECOMMENDED.qt3-libs?= qt3-libs>=3.3.5nb4 BUILDLINK_PKGSRCDIR.qt3-libs?= ../../x11/qt3-libs BUILDLINK_INCDIRS.qt3-libs+= qt3/include BUILDLINK_LIBDIRS.qt3-libs+= qt3/lib - .endif # QT3_LIBS_BUILDLINK3_MK QTDIR= ${BUILDLINK_PREFIX.qt3-libs}/qt3 -BUILDLINK_PASSTHRU_DIRS+= ${QTDIR} +BUILDLINK_PASSTHRU_DIRS+= ${QTDIR} PTHREAD_OPTS+= require @@ -47,4 +45,4 @@ CONFIGURE_ENV+= QTDIR=${QTDIR:Q} MAKE_ENV+= QTDIR=${QTDIR:Q} .endif -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile index c104e0a56de..aeb6ca623a1 100644 --- a/x11/qt3-tools/Makefile +++ b/x11/qt3-tools/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.40 2006/02/05 23:11:42 joerg Exp $ +# $NetBSD: Makefile,v 1.41 2006/02/17 23:26:26 adam Exp $ .include "../../mk/bsd.prefs.mk" # XXX: hack - work round an ICE with GCC 3.3 on sparc .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc" -GCC_REQD+= 3.4 +GCC_REQD+= 3.4 .endif .include "../../x11/qt3-libs/Makefile.common" -PKGNAME= qt3-tools-${QTVERSION} -PKGREVISION= 2 -COMMENT= QT GUI (WYSIWYG) builder and other tools +PKGNAME= qt3-tools-${QTVERSION} +PKGREVISION= 3 +COMMENT= QT GUI (WYSIWYG) builder and other tools CONFIGURE_ARGS+= -I${QTDIR}/include \ -L${QTDIR}/lib diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk index 67c565963be..ca8ea484f1f 100644 --- a/x11/qt3-tools/buildlink3.mk +++ b/x11/qt3-tools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2006/02/17 23:26:26 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QT3_TOOLS_BUILDLINK3_MK:= ${QT3_TOOLS_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= qt3-tools .if !empty(QT3_TOOLS_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.qt3-tools+= qt3-tools>=3.1.2nb3 -BUILDLINK_RECOMMENDED.qt3-tools+= qt3-tools>=3.3.5nb2 +BUILDLINK_RECOMMENDED.qt3-tools+= qt3-tools>=3.3.5nb3 BUILDLINK_PKGSRCDIR.qt3-tools?= ../../x11/qt3-tools BUILDLINK_DEPMETHOD.qt3-tools?= build .endif # QT3_TOOLS_BUILDLINK3_MK @@ -31,4 +31,4 @@ MAKE_ENV+= QMAKE="${QTDIR}/bin/qmake" CONFIGURE_ENV+= QMAKESPEC=${QTDIR}/mkspecs/netbsd-g++ MAKE_ENV+= QMAKESPEC=${QTDIR}/mkspecs/netbsd-g++ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3