Define RUBY_QT2_PORTREVISION and RUBY_WITH_PTHREAD in

x11-toolkits/ruby-qt2/Makefile.common.

Tidy up .include's.

7 files changed, 20 insertions, 30 deletions

diff --git a/graphics/ruby-qt2gl/Makefile b/graphics/ruby-qt2gl/Makefile
index 0586bc4a2339..cf67bc568883 100644
--- a/graphics/ruby-qt2gl/Makefile
+++ b/graphics/ruby-qt2gl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt2gl
 PORTVERSION=	${RUBY_QT2_PORTVERSION}
+PORTREVISION=	${RUBY_QT2_PORTREVISION}
 CATEGORIES=	graphics x11-toolkits ruby
 MASTER_SITES=	${RUBY_QT2_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -22,13 +23,9 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR} \
 USE_MESA=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-RUBY_WITH_PTHREAD=	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=	${RUBY_QT2_CONFIGURE_ARGS}
 MAKE_ARGS=	LOCAL_LIBS=-lgcc
@@ -45,4 +42,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/${PORTNAME}/
 .endif
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../x11-toolkits/ruby-qt2/Makefile.common"
+.include <bsd.port.mk>
diff --git a/textproc/ruby-qt2xml/Makefile b/textproc/ruby-qt2xml/Makefile
index e071aa987bb0..b7b40f5653af 100644
--- a/textproc/ruby-qt2xml/Makefile
+++ b/textproc/ruby-qt2xml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt2xml
 PORTVERSION=	${RUBY_QT2_PORTVERSION}
+PORTREVISION=	${RUBY_QT2_PORTREVISION}
 CATEGORIES=	textproc x11-toolkits ruby
 MASTER_SITES=	${RUBY_QT2_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -20,13 +21,9 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR}
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-RUBY_WITH_PTHREAD=	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=	${RUBY_QT2_CONFIGURE_ARGS}
 MAKE_ARGS=	LOCAL_LIBS=-lgcc
@@ -38,4 +35,5 @@ post-install:
 	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 .endif
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../x11-toolkits/ruby-qt2/Makefile.common"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-qt2/Makefile b/x11-toolkits/ruby-qt2/Makefile
index 69e1d318580b..73f618282f47 100644
--- a/x11-toolkits/ruby-qt2/Makefile
+++ b/x11-toolkits/ruby-qt2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt2
 PORTVERSION=	${RUBY_QT2_PORTVERSION}
+PORTREVISION=	${RUBY_QT2_PORTREVISION}
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_QT2_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -18,13 +19,9 @@ MAINTAINER=	knu@FreeBSD.org
 USE_QT_VER=	2
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-RUBY_WITH_PTHREAD=	yes
 
 USE_GMAKE=	yes
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/Makefile.common"
-
 WRKSRC=		${RUBY_QT2_WRKSRC}
 CONFIGURE_ARGS=	${RUBY_QT2_CONFIGURE_ARGS}
 MAKE_ARGS=	LOCAL_LIBS=-lgcc
@@ -46,4 +43,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/${PORTNAME}/ja/
 .endif
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/Makefile.common"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-qt2/Makefile.common b/x11-toolkits/ruby-qt2/Makefile.common
index c48f40c86ad3..bff9b9fadbe3 100644
--- a/x11-toolkits/ruby-qt2/Makefile.common
+++ b/x11-toolkits/ruby-qt2/Makefile.common
@@ -2,6 +2,7 @@
 
 RUBY_QT2_VERSION=	0.12
 RUBY_QT2_PORTVERSION=	${RUBY_QT2_VERSION}a.2
+RUBY_QT2_PORTREVISION=	# none
 RUBY_QT2_MASTER_SITES=	http://sfns.u-shizuoka-ken.ac.jp/geneng/horie_hp/ruby/
 RUBY_QT2_DISTNAME=	ruby-qt2-${RUBY_QT2_VERSION}
 
@@ -13,6 +14,7 @@ RUBY_QT2_CONFIGURE_ARGS= \
 			--with-qt2-lib=${X11BASE}/lib \
 			--with-x11-dir=${X11BASE} \
 			--with-qt2=qtgl
+RUBY_WITH_PTHREAD=	yes
 
 MD5_FILE=		${RUBY_QT2_PORTDIR}/distinfo
 
diff --git a/x11-toolkits/ruby-qt2canvas/Makefile b/x11-toolkits/ruby-qt2canvas/Makefile
index 7813113f84ab..2a0226df0479 100644
--- a/x11-toolkits/ruby-qt2canvas/Makefile
+++ b/x11-toolkits/ruby-qt2canvas/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt2canvas
 PORTVERSION=	${RUBY_QT2_PORTVERSION}
+PORTREVISION=	${RUBY_QT2_PORTREVISION}
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_QT2_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -20,13 +21,9 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR}
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-RUBY_WITH_PTHREAD=	yes
 
 USE_GMAKE=	yes
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../ruby-qt2/Makefile.common"
-
 WRKSRC=		${RUBY_QT2_WRKSRC}/modules/canvas
 CONFIGURE_ARGS=	${RUBY_QT2_CONFIGURE_ARGS}
 MAKE_ARGS=	LOCAL_LIBS=-lgcc
@@ -38,4 +35,5 @@ post-install:
 	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 .endif
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../ruby-qt2/Makefile.common"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-qt2iconview/Makefile b/x11-toolkits/ruby-qt2iconview/Makefile
index 616025c6e2f2..62ed6ae68281 100644
--- a/x11-toolkits/ruby-qt2iconview/Makefile
+++ b/x11-toolkits/ruby-qt2iconview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt2iconview
 PORTVERSION=	${RUBY_QT2_PORTVERSION}
+PORTREVISION=	${RUBY_QT2_PORTREVISION}
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_QT2_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -20,13 +21,9 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR}
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-RUBY_WITH_PTHREAD=	yes
 
 USE_GMAKE=	yes
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../ruby-qt2/Makefile.common"
-
 WRKSRC=		${RUBY_QT2_WRKSRC}/modules/iconview
 CONFIGURE_ARGS=	${RUBY_QT2_CONFIGURE_ARGS}
 MAKE_ARGS=	LOCAL_LIBS=-lgcc
@@ -38,4 +35,5 @@ post-install:
 	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 .endif
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../ruby-qt2/Makefile.common"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-qt2table/Makefile b/x11-toolkits/ruby-qt2table/Makefile
index 0d40f12b6318..8758e4cb4888 100644
--- a/x11-toolkits/ruby-qt2table/Makefile
+++ b/x11-toolkits/ruby-qt2table/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt2table
 PORTVERSION=	${RUBY_QT2_PORTVERSION}
+PORTREVISION=	${RUBY_QT2_PORTREVISION}
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_QT2_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -20,13 +21,9 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR}
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-RUBY_WITH_PTHREAD=	yes
 
 USE_GMAKE=	yes
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../ruby-qt2/Makefile.common"
-
 WRKSRC=		${RUBY_QT2_WRKSRC}/modules/table
 CONFIGURE_ARGS=	${RUBY_QT2_CONFIGURE_ARGS}
 MAKE_ARGS=	LOCAL_LIBS=-lgcc
@@ -38,4 +35,5 @@ post-install:
 	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 .endif
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../ruby-qt2/Makefile.common"
+.include <bsd.port.mk>