aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2000-10-24 02:44:31 +0800
committerknu <knu@FreeBSD.org>2000-10-24 02:44:31 +0800
commit3a3cafe52b39686e9a7a059fab1fa3491bcb7fbf (patch)
tree8957e359d1dbfc50e87ebb1ed078bd9805a997ae /x11-toolkits
parent313cd0bc67c05d201e2d60bc175e05dfd860c1da (diff)
downloadfreebsd-ports-gnome-3a3cafe52b39686e9a7a059fab1fa3491bcb7fbf.tar.gz
freebsd-ports-gnome-3a3cafe52b39686e9a7a059fab1fa3491bcb7fbf.tar.zst
freebsd-ports-gnome-3a3cafe52b39686e9a7a059fab1fa3491bcb7fbf.zip
Detach the WITH_I18N knob and always configure for the int'lized
version of Qt.
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/ruby-qt/Makefile14
-rw-r--r--x11-toolkits/ruby-qt2/Makefile14
2 files changed, 4 insertions, 24 deletions
diff --git a/x11-toolkits/ruby-qt/Makefile b/x11-toolkits/ruby-qt/Makefile
index d315b6fe1a93..71d51fe22216 100644
--- a/x11-toolkits/ruby-qt/Makefile
+++ b/x11-toolkits/ruby-qt/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
-LIB_DEPENDS= ${QTLIB}.${QTLIB_SHLIBVER}:${PORTSDIR}/x11-toolkits/${QT_PORTNAME}
+LIB_DEPENDS= qt.3:${PORTSDIR}/x11-toolkits/qt145
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
@@ -28,17 +28,7 @@ CONFIGURE_ARGS= --with-qt-include=${X11BASE}/include/X11/qt \
MAKE_ARGS= LOCAL_LIBS=-lgcc
INSTALL_TARGET= site-install
-.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
-QT_PORTNAME= qt145
-.endif
+CONFIGURE_ARGS+= --with-qti18n
post-patch:
${RUBY} -i -pe 'gsub %r"/usr/X11\b", "${X11BASE}"' ${WRKSRC}/lib/qt.rb
diff --git a/x11-toolkits/ruby-qt2/Makefile b/x11-toolkits/ruby-qt2/Makefile
index d315b6fe1a93..71d51fe22216 100644
--- a/x11-toolkits/ruby-qt2/Makefile
+++ b/x11-toolkits/ruby-qt2/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
-LIB_DEPENDS= ${QTLIB}.${QTLIB_SHLIBVER}:${PORTSDIR}/x11-toolkits/${QT_PORTNAME}
+LIB_DEPENDS= qt.3:${PORTSDIR}/x11-toolkits/qt145
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
@@ -28,17 +28,7 @@ CONFIGURE_ARGS= --with-qt-include=${X11BASE}/include/X11/qt \
MAKE_ARGS= LOCAL_LIBS=-lgcc
INSTALL_TARGET= site-install
-.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
-QT_PORTNAME= qt145
-.endif
+CONFIGURE_ARGS+= --with-qti18n
post-patch:
${RUBY} -i -pe 'gsub %r"/usr/X11\b", "${X11BASE}"' ${WRKSRC}/lib/qt.rb