aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2001-01-08 00:47:21 +0800
committerwill <will@FreeBSD.org>2001-01-08 00:47:21 +0800
commit9db154207ad92a4738b5659eb4e7fc161bedbf10 (patch)
tree3b877ff901823ba92bdbfadaa538e07f2d44a125 /x11-toolkits
parentbc4960aa4bdbba665560c0f79052b5e023b4364d (diff)
downloadfreebsd-ports-gnome-9db154207ad92a4738b5659eb4e7fc161bedbf10.tar.gz
freebsd-ports-gnome-9db154207ad92a4738b5659eb4e7fc161bedbf10.tar.zst
freebsd-ports-gnome-9db154207ad92a4738b5659eb4e7fc161bedbf10.zip
Install threaded qt2 library. Nuke GL dependency (should have listened
to garbanzo long ago), to reduce complications involved when building on X4.0.2 with thread support. We don't need GL anyway. Bump PORTREVISION (unconditionally this time) to 3. Submitted by: Jeremy Shaffner <jeremy@external.org>
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/qt22/Makefile9
-rw-r--r--x11-toolkits/qt22/pkg-plist2
-rw-r--r--x11-toolkits/qt23/Makefile9
-rw-r--r--x11-toolkits/qt23/pkg-plist2
-rw-r--r--x11-toolkits/qt30/Makefile9
-rw-r--r--x11-toolkits/qt30/pkg-plist2
-rw-r--r--x11-toolkits/qt31/Makefile9
-rw-r--r--x11-toolkits/qt31/pkg-plist2
-rw-r--r--x11-toolkits/qt32/Makefile9
-rw-r--r--x11-toolkits/qt32/pkg-plist2
-rw-r--r--x11-toolkits/qt33/Makefile9
-rw-r--r--x11-toolkits/qt33/pkg-plist2
12 files changed, 36 insertions, 30 deletions
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -7,9 +7,7 @@
PORTNAME= qt
PORTVERSION= 2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION= 2
-.endif
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/
DISTNAME= qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ LIB_DEPENDS= mng.0:${PORTSDIR}/graphics/libmng \
YES?= /usr/bin/yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_MESA= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_NEWGCC= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
- -system-libmng -thread \
+ -system-libmng -thread -no-opengl \
-I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= ${YES} yes | QTDIR=${WRKSRC}
MAKE_ARGS+= MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
.endfor
${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+ ${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+ ${LN} -sf ${PREFIX}/lib/libqt2-mt.so.4 ${PREFIX}/lib//libqt2-mt.so
${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
.if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt22/pkg-plist b/x11-toolkits/qt22/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt22/pkg-plist
+++ b/x11-toolkits/qt22/pkg-plist
@@ -286,6 +286,8 @@ include/qt2/qxml.h
include/qt2/qxt.h
lib/libqt2.so
lib/libqt2.so.4
+lib/libqt2-mt.so
+lib/libqt2-mt.so.4
lib/libqutil.so
lib/libqutil.so.1
share/doc/qt2/ANNOUNCE
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -7,9 +7,7 @@
PORTNAME= qt
PORTVERSION= 2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION= 2
-.endif
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/
DISTNAME= qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ LIB_DEPENDS= mng.0:${PORTSDIR}/graphics/libmng \
YES?= /usr/bin/yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_MESA= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_NEWGCC= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
- -system-libmng -thread \
+ -system-libmng -thread -no-opengl \
-I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= ${YES} yes | QTDIR=${WRKSRC}
MAKE_ARGS+= MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
.endfor
${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+ ${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+ ${LN} -sf ${PREFIX}/lib/libqt2-mt.so.4 ${PREFIX}/lib//libqt2-mt.so
${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
.if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt23/pkg-plist
+++ b/x11-toolkits/qt23/pkg-plist
@@ -286,6 +286,8 @@ include/qt2/qxml.h
include/qt2/qxt.h
lib/libqt2.so
lib/libqt2.so.4
+lib/libqt2-mt.so
+lib/libqt2-mt.so.4
lib/libqutil.so
lib/libqutil.so.1
share/doc/qt2/ANNOUNCE
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -7,9 +7,7 @@
PORTNAME= qt
PORTVERSION= 2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION= 2
-.endif
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/
DISTNAME= qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ LIB_DEPENDS= mng.0:${PORTSDIR}/graphics/libmng \
YES?= /usr/bin/yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_MESA= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_NEWGCC= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
- -system-libmng -thread \
+ -system-libmng -thread -no-opengl \
-I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= ${YES} yes | QTDIR=${WRKSRC}
MAKE_ARGS+= MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
.endfor
${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+ ${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+ ${LN} -sf ${PREFIX}/lib/libqt2-mt.so.4 ${PREFIX}/lib//libqt2-mt.so
${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
.if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -286,6 +286,8 @@ include/qt2/qxml.h
include/qt2/qxt.h
lib/libqt2.so
lib/libqt2.so.4
+lib/libqt2-mt.so
+lib/libqt2-mt.so.4
lib/libqutil.so
lib/libqutil.so.1
share/doc/qt2/ANNOUNCE
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -7,9 +7,7 @@
PORTNAME= qt
PORTVERSION= 2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION= 2
-.endif
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/
DISTNAME= qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ LIB_DEPENDS= mng.0:${PORTSDIR}/graphics/libmng \
YES?= /usr/bin/yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_MESA= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_NEWGCC= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
- -system-libmng -thread \
+ -system-libmng -thread -no-opengl \
-I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= ${YES} yes | QTDIR=${WRKSRC}
MAKE_ARGS+= MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
.endfor
${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+ ${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+ ${LN} -sf ${PREFIX}/lib/libqt2-mt.so.4 ${PREFIX}/lib//libqt2-mt.so
${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
.if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -286,6 +286,8 @@ include/qt2/qxml.h
include/qt2/qxt.h
lib/libqt2.so
lib/libqt2.so.4
+lib/libqt2-mt.so
+lib/libqt2-mt.so.4
lib/libqutil.so
lib/libqutil.so.1
share/doc/qt2/ANNOUNCE
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -7,9 +7,7 @@
PORTNAME= qt
PORTVERSION= 2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION= 2
-.endif
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/
DISTNAME= qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ LIB_DEPENDS= mng.0:${PORTSDIR}/graphics/libmng \
YES?= /usr/bin/yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_MESA= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_NEWGCC= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
- -system-libmng -thread \
+ -system-libmng -thread -no-opengl \
-I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= ${YES} yes | QTDIR=${WRKSRC}
MAKE_ARGS+= MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
.endfor
${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+ ${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+ ${LN} -sf ${PREFIX}/lib/libqt2-mt.so.4 ${PREFIX}/lib//libqt2-mt.so
${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
.if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -286,6 +286,8 @@ include/qt2/qxml.h
include/qt2/qxt.h
lib/libqt2.so
lib/libqt2.so.4
+lib/libqt2-mt.so
+lib/libqt2-mt.so.4
lib/libqutil.so
lib/libqutil.so.1
share/doc/qt2/ANNOUNCE
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 6c597d5eccc4..ea89d309c284 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -7,9 +7,7 @@
PORTNAME= qt
PORTVERSION= 2.2.3
-.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
-PORTREVISION= 2
-.endif
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/
DISTNAME= qt-x11-${PORTVERSION}
@@ -28,13 +26,12 @@ LIB_DEPENDS= mng.0:${PORTSDIR}/graphics/libmng \
YES?= /usr/bin/yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_MESA= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_NEWGCC= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
- -system-libmng -thread \
+ -system-libmng -thread -no-opengl \
-I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= ${YES} yes | QTDIR=${WRKSRC}
MAKE_ARGS+= MAKE="${GMAKE} -j2"
@@ -98,7 +95,9 @@ do-install:
.endfor
${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+ ${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2-mt.so.4 ${PREFIX}/lib
${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+ ${LN} -sf ${PREFIX}/lib/libqt2-mt.so.4 ${PREFIX}/lib//libqt2-mt.so
${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
.if defined(WANT_STATIC)
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 5b26f2baddfe..4089bfe38f70 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -286,6 +286,8 @@ include/qt2/qxml.h
include/qt2/qxt.h
lib/libqt2.so
lib/libqt2.so.4
+lib/libqt2-mt.so
+lib/libqt2-mt.so.4
lib/libqutil.so
lib/libqutil.so.1
share/doc/qt2/ANNOUNCE