aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/ruby-qt2gl/Makefile9
-rw-r--r--textproc/ruby-qt2xml/Makefile9
-rw-r--r--x11-toolkits/ruby-qt2/Makefile9
-rw-r--r--x11-toolkits/ruby-qt2/Makefile.common16
-rw-r--r--x11-toolkits/ruby-qt2canvas/Makefile9
-rw-r--r--x11-toolkits/ruby-qt2iconview/Makefile9
-rw-r--r--x11-toolkits/ruby-qt2table/Makefile9
7 files changed, 40 insertions, 30 deletions
diff --git a/graphics/ruby-qt2gl/Makefile b/graphics/ruby-qt2gl/Makefile
index ece13250f31e..21dc4ea40040 100644
--- a/graphics/ruby-qt2gl/Makefile
+++ b/graphics/ruby-qt2gl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qt2gl
PORTVERSION= ${RUBY_QT2_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= graphics x11-toolkits ruby
MASTER_SITES= ${RUBY_QT2_MASTER_SITES}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@@ -25,13 +26,11 @@ USE_RUBY_EXTCONF= yes
USE_GMAKE= yes
+.include <bsd.port.pre.mk>
.include "${.CURDIR}/../../x11-toolkits/ruby-qt2/Makefile.common"
WRKSRC= ${RUBY_QT2_WRKSRC}/modules/opengl
-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
@@ -46,4 +45,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/${PORTNAME}/
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/ruby-qt2xml/Makefile b/textproc/ruby-qt2xml/Makefile
index a76afd1fcac9..ad952c2a00b1 100644
--- a/textproc/ruby-qt2xml/Makefile
+++ b/textproc/ruby-qt2xml/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qt2xml
PORTVERSION= ${RUBY_QT2_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= textproc 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}/../../x11-toolkits/ruby-qt2/Makefile.common"
WRKSRC= ${RUBY_QT2_WRKSRC}/modules/xml
-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-qt2/Makefile b/x11-toolkits/ruby-qt2/Makefile
index 68f13879d1f1..3cda39abdb7b 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 27b6ce208b43..83a6e0b16bd1 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 ad9e7f41ae19..2e10945e353b 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 854a6359fb43..fd71b7871dea 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 dddb8fb4a4f7..d7e33c2bd7a1 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 16:47:41 +0000