Improve configure scripts so that they take configure arguments from

the command line.

Feedback status:	Already sent to the author

3 files changed, 14 insertions, 37 deletions

diff --git a/x11-toolkits/ruby-qt/Makefile b/x11-toolkits/ruby-qt/Makefile
index cef298135c0a..d9b69da6faa0 100644
--- a/x11-toolkits/ruby-qt/Makefile
+++ b/x11-toolkits/ruby-qt/Makefile
@@ -20,6 +20,8 @@ LIB_DEPENDS=	${QTLIB}.${QTLIB_SHLIBVER}:${PORTSDIR}/x11-toolkits/${QT_PORTNAME}
 RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 
 INSTALL_TARGET=	site-install
+CONFIGURE_ARGS=	--with-qt-include=${X11BASE}/include/X11/qt \
+		--with-qt-lib=${X11BASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
@@ -28,14 +30,12 @@ RUBY?=		${LOCALBASE}/bin/ruby
 RUBY_VER?=	1.4
 RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
-QTLIBDIR=	${X11BASE}/lib
-QTINCDIR=	${X11BASE}/include/X11/qt
-
 .if defined(WITH_I18N)
 I18NQT=		-DI18NQT
 QTLIB=		qti18n
 QTLIB_SHLIBVER=	3
 QT_PORTNAME=	qt-i18n
+CONFIGURE_ARGS+=	--with-qti18n=qti18n
 .else
 QTLIB=		qt
 QTLIB_SHLIBVER=	3
@@ -44,18 +44,12 @@ QT_PORTNAME=	qt145
 
 post-patch:
 	${PERL} -i -pe ' \
-		s,%%I18NQT%%,${I18NQT},g; \
-		s,%%QTLIBDIR%%,${QTLIBDIR},g; \
-		s,%%QTINCDIR%%,${QTINCDIR},g; \
-		s,%%QTLIB%%,${QTLIB},g; \
-		' ${WRKSRC}/extconf.rb
-	${PERL} -i -pe ' \
 		s,/usr/X11\b,${X11BASE},g; \
 		' ${WRKSRC}/lib/qt.rb
 
 do-configure:
 	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb
+	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/ruby-qt2/Makefile b/x11-toolkits/ruby-qt2/Makefile
index cef298135c0a..d9b69da6faa0 100644
--- a/x11-toolkits/ruby-qt2/Makefile
+++ b/x11-toolkits/ruby-qt2/Makefile
@@ -20,6 +20,8 @@ LIB_DEPENDS=	${QTLIB}.${QTLIB_SHLIBVER}:${PORTSDIR}/x11-toolkits/${QT_PORTNAME}
 RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 
 INSTALL_TARGET=	site-install
+CONFIGURE_ARGS=	--with-qt-include=${X11BASE}/include/X11/qt \
+		--with-qt-lib=${X11BASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
@@ -28,14 +30,12 @@ RUBY?=		${LOCALBASE}/bin/ruby
 RUBY_VER?=	1.4
 RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
-QTLIBDIR=	${X11BASE}/lib
-QTINCDIR=	${X11BASE}/include/X11/qt
-
 .if defined(WITH_I18N)
 I18NQT=		-DI18NQT
 QTLIB=		qti18n
 QTLIB_SHLIBVER=	3
 QT_PORTNAME=	qt-i18n
+CONFIGURE_ARGS+=	--with-qti18n=qti18n
 .else
 QTLIB=		qt
 QTLIB_SHLIBVER=	3
@@ -44,18 +44,12 @@ QT_PORTNAME=	qt145
 
 post-patch:
 	${PERL} -i -pe ' \
-		s,%%I18NQT%%,${I18NQT},g; \
-		s,%%QTLIBDIR%%,${QTLIBDIR},g; \
-		s,%%QTINCDIR%%,${QTINCDIR},g; \
-		s,%%QTLIB%%,${QTLIB},g; \
-		' ${WRKSRC}/extconf.rb
-	${PERL} -i -pe ' \
 		s,/usr/X11\b,${X11BASE},g; \
 		' ${WRKSRC}/lib/qt.rb
 
 do-configure:
 	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb
+	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11/ruby-kde/Makefile b/x11/ruby-kde/Makefile
index 5320577c2ed3..ed683956657f 100644
--- a/x11/ruby-kde/Makefile
+++ b/x11/ruby-kde/Makefile
@@ -21,6 +21,10 @@ RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
 		${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/qt.rb:${PORTSDIR}/x11-toolkits/${RUBY_QT_PORTNAME}
 
 INSTALL_TARGET=	site-install
+CONFIGURE_ARGS=	--with-x-dir=${X11BASE} \
+		--with-qt-include=${X11BASE}/include/X11/qt \
+		--with-qt-lib=${X11BASE}/lib \
+		--with-kde-dir=${LOCALBASE}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
@@ -29,16 +33,12 @@ RUBY?=		${LOCALBASE}/bin/ruby
 RUBY_VER?=	1.4
 RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
-QTLIBDIR=	${X11BASE}/lib
-QTINCDIR=	${X11BASE}/include/X11/qt
-KDELIBDIR=	${LOCALBASE}/lib
-KDEINCDIR=	${LOCALBASE}/include
-
 .if defined(WITH_I18N)
 QTLIB=		qti18n
 KDELIB_SHLIBVER=	2
 KDE_PORTNAME=	kdelibs11-i18n
 RUBY_QT_PORTNAME=	ruby-qt-i18n
+CONFIGURE_ARGS+=	--with-qti18n=qti18n
 .else
 QTLIB=		qt
 KDELIB_SHLIBVER=	3
@@ -46,20 +46,9 @@ KDE_PORTNAME=	kdelibs11
 RUBY_QT_PORTNAME=	ruby-qt
 .endif
 
-post-patch:
-	${PERL} -i -pe ' \
-		s,%%X11BASE%%,${X11BASE},g; \
-		s,%%I18NQT%%,${I18NQT},g; \
-		s,%%QTLIBDIR%%,${QTLIBDIR},g; \
-		s,%%QTINCDIR%%,${QTINCDIR},g; \
-		s,%%KDELIBDIR%%,${KDELIBDIR},g; \
-		s,%%KDEINCDIR%%,${KDEINCDIR},g; \
-		s,%%QTLIB%%,${QTLIB},g; \
-		' ${WRKSRC}/extconf.rb
-
 do-configure:
 	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb
+	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
 
 post-install:
 .if !defined(NOPORTDOCS)