diff options
| author | knu <knu@FreeBSD.org> | 2001-03-20 06:15:52 +0800 |
|---|---|---|
| committer | knu <knu@FreeBSD.org> | 2001-03-20 06:15:52 +0800 |
| commit | ccd630eb444008d79b511ffcb19921c55ea0788d (patch) | |
| tree | cd935e5e86efd1e01f6d3b94a9cb1e02404d9553 /x11-toolkits | |
| parent | d58abf077c8a544d23f3be86422f6ab51b3bb1a2 (diff) | |
| download | freebsd-ports-graphics-ccd630eb444008d79b511ffcb19921c55ea0788d.tar.gz freebsd-ports-graphics-ccd630eb444008d79b511ffcb19921c55ea0788d.tar.zst freebsd-ports-graphics-ccd630eb444008d79b511ffcb19921c55ea0788d.zip | |
Use the threaded version of Qt2 library for 5-CURRENT.
Mark ruby-qt2gl broken for 4-STABLE due to the thread library problem.
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/ruby-qt2/Makefile | 9 | ||||
| -rw-r--r-- | x11-toolkits/ruby-qt2/Makefile.common | 16 | ||||
| -rw-r--r-- | x11-toolkits/ruby-qt2canvas/Makefile | 9 | ||||
| -rw-r--r-- | x11-toolkits/ruby-qt2iconview/Makefile | 9 | ||||
| -rw-r--r-- | x11-toolkits/ruby-qt2table/Makefile | 9 |
5 files changed, 32 insertions, 20 deletions
diff --git a/x11-toolkits/ruby-qt2/Makefile b/x11-toolkits/ruby-qt2/Makefile index 68f13879d1f..3cda39abdb7 100644 --- a/x11-toolkits/ruby-qt2/Makefile +++ b/x11-toolkits/ruby-qt2/Makefile @@ -7,6 +7,7 @@ PORTNAME= qt2 PORTVERSION= ${RUBY_QT2_PORTVERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits ruby MASTER_SITES= ${RUBY_QT2_MASTER_SITES} PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -22,13 +23,11 @@ USE_RUBY_EXTCONF= yes USE_GMAKE= yes +.include <bsd.port.pre.mk> .include "${.CURDIR}/Makefile.common" WRKSRC= ${RUBY_QT2_WRKSRC} -CONFIGURE_ARGS= --with-qt2-include=${X11BASE}/include/qt2 \ - --with-qt2-lib=${X11BASE}/lib \ - --with-qt2=qt2 \ - --with-x11-dir=${X11BASE} +CONFIGURE_ARGS= ${RUBY_QT2_CONFIGURE_ARGS} MAKE_ARGS= LOCAL_LIBS=-lgcc INSTALL_TARGET= site-install @@ -48,4 +47,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/${PORTNAME}/ja/ .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/ruby-qt2/Makefile.common b/x11-toolkits/ruby-qt2/Makefile.common index 27b6ce208b4..83a6e0b16bd 100644 --- a/x11-toolkits/ruby-qt2/Makefile.common +++ b/x11-toolkits/ruby-qt2/Makefile.common @@ -8,5 +8,21 @@ RUBY_QT2_DISTNAME= ruby-qt2-${RUBY_QT2_VERSION} RUBY_QT2_PORTDIR= ${PORTSDIR}/x11-toolkits/ruby-qt2 RUBY_QT2_WRKSRC= ${WRKDIR}/qt2 +RUBY_QT2_CONFIGURE_ARGS= \ + --with-qt2-include=${X11BASE}/include/qt2 \ + --with-qt2-lib=${X11BASE}/lib \ + --with-x11-dir=${X11BASE} +.if ${OSVERSION} >= 500018 +RUBY_QT2_CONFIGURE_ARGS+= \ + --with-ldflags=-lc_r \ + --with-qt2=qt2-mt +.else +.if ${PORTNAME} == qt2gl +BROKEN= "Qt2's GL support is only supported on 5-CURRENT due to a problem with the thread library." +.endif + +RUBY_QT2_CONFIGURE_ARGS+= \ + --with-qt2=qt2 +.endif MD5_FILE= ${RUBY_QT2_PORTDIR}/distinfo diff --git a/x11-toolkits/ruby-qt2canvas/Makefile b/x11-toolkits/ruby-qt2canvas/Makefile index ad9e7f41ae1..2e10945e353 100644 --- a/x11-toolkits/ruby-qt2canvas/Makefile +++ b/x11-toolkits/ruby-qt2canvas/Makefile @@ -7,6 +7,7 @@ PORTNAME= qt2canvas PORTVERSION= ${RUBY_QT2_PORTVERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits ruby MASTER_SITES= ${RUBY_QT2_MASTER_SITES} PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -23,13 +24,11 @@ USE_RUBY_EXTCONF= yes USE_GMAKE= yes +.include <bsd.port.pre.mk> .include "${.CURDIR}/../ruby-qt2/Makefile.common" WRKSRC= ${RUBY_QT2_WRKSRC}/modules/canvas -CONFIGURE_ARGS= --with-qt2-include=${X11BASE}/include/qt2 \ - --with-qt2-lib=${X11BASE}/lib \ - --with-qt2=qt2 \ - --with-x11-dir=${X11BASE} +CONFIGURE_ARGS= ${RUBY_QT2_CONFIGURE_ARGS} MAKE_ARGS= LOCAL_LIBS=-lgcc INSTALL_TARGET= site-install @@ -39,4 +38,4 @@ post-install: ${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/ .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/ruby-qt2iconview/Makefile b/x11-toolkits/ruby-qt2iconview/Makefile index 854a6359fb4..fd71b7871de 100644 --- a/x11-toolkits/ruby-qt2iconview/Makefile +++ b/x11-toolkits/ruby-qt2iconview/Makefile @@ -7,6 +7,7 @@ PORTNAME= qt2iconview PORTVERSION= ${RUBY_QT2_PORTVERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits ruby MASTER_SITES= ${RUBY_QT2_MASTER_SITES} PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -23,13 +24,11 @@ USE_RUBY_EXTCONF= yes USE_GMAKE= yes +.include <bsd.port.pre.mk> .include "${.CURDIR}/../ruby-qt2/Makefile.common" WRKSRC= ${RUBY_QT2_WRKSRC}/modules/iconview -CONFIGURE_ARGS= --with-qt2-include=${X11BASE}/include/qt2 \ - --with-qt2-lib=${X11BASE}/lib \ - --with-qt2=qt2 \ - --with-x11-dir=${X11BASE} +CONFIGURE_ARGS= ${RUBY_QT2_CONFIGURE_ARGS} MAKE_ARGS= LOCAL_LIBS=-lgcc INSTALL_TARGET= site-install @@ -39,4 +38,4 @@ post-install: ${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/ .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/ruby-qt2table/Makefile b/x11-toolkits/ruby-qt2table/Makefile index dddb8fb4a4f..d7e33c2bd7a 100644 --- a/x11-toolkits/ruby-qt2table/Makefile +++ b/x11-toolkits/ruby-qt2table/Makefile @@ -7,6 +7,7 @@ PORTNAME= qt2table PORTVERSION= ${RUBY_QT2_PORTVERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits ruby MASTER_SITES= ${RUBY_QT2_MASTER_SITES} PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -23,13 +24,11 @@ USE_RUBY_EXTCONF= yes USE_GMAKE= yes +.include <bsd.port.pre.mk> .include "${.CURDIR}/../ruby-qt2/Makefile.common" WRKSRC= ${RUBY_QT2_WRKSRC}/modules/table -CONFIGURE_ARGS= --with-qt2-include=${X11BASE}/include/qt2 \ - --with-qt2-lib=${X11BASE}/lib \ - --with-qt2=qt2 \ - --with-x11-dir=${X11BASE} +CONFIGURE_ARGS= ${RUBY_QT2_CONFIGURE_ARGS} MAKE_ARGS= LOCAL_LIBS=-lgcc INSTALL_TARGET= site-install @@ -39,4 +38,4 @@ post-install: ${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/ .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> |