aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2000-08-17 23:21:00 +0800
committerknu <knu@FreeBSD.org>2000-08-17 23:21:00 +0800
commit729f973186aa864bc3806dfa5de3ae6783bf4e1f (patch)
tree583a2c978d88ff91304a12fb23008cfb653d6736 /x11-toolkits
parenta27e0a71dfc56c919e07916c149d78538390a97a (diff)
downloadfreebsd-ports-gnome-729f973186aa864bc3806dfa5de3ae6783bf4e1f.tar.gz
freebsd-ports-gnome-729f973186aa864bc3806dfa5de3ae6783bf4e1f.tar.zst
freebsd-ports-gnome-729f973186aa864bc3806dfa5de3ae6783bf4e1f.zip
Improve configure scripts so that they take configure arguments from
the command line. Feedback status: Already sent to the author
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/ruby-qt/Makefile14
-rw-r--r--x11-toolkits/ruby-qt2/Makefile14
2 files changed, 8 insertions, 20 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)