Jeremie Courreges-Anglas <j...@wxcvbn.org> writes:
> j...@wxcvbn.org (Jeremie Courreges-Anglas) writes:
>
>> There are a few ports that use lrelease4, but there is no abstraction in
>> the port module.
>
> Please forget this messed up patch, updated version below.
>
>> Comments / ok?
After feedback from zhuk@, here's a new diff for x11/qt*, for
consistency, and a diff for port-modules(5).
Index: x11/qt3/qt3.port.mk
===================================================================
RCS file: /cvs/ports/x11/qt3/qt3.port.mk,v
retrieving revision 1.14
diff -u -p -r1.14 qt3.port.mk
--- x11/qt3/qt3.port.mk 22 Nov 2010 08:37:04 -0000 1.14
+++ x11/qt3/qt3.port.mk 17 May 2016 11:49:16 -0000
@@ -35,6 +35,8 @@ MODQT3_UIC = ${LOCALBASE}/bin/uic3-mt
MODQT_UIC ?= ${MODQT3_UIC}
MODQT3_QTDIR = ${LOCALBASE}/lib/qt3
MODQT_QTDIR ?= ${MODQT3_QTDIR}
+MODQT3_LRELEASE = ${LOCALBASE}/bin/lrelease-mt
+MODQT_LRELEASE ?= ${MODQT3_LRELEASE}
MODQT3_PLUGINS =lib/qt3/plugins-33
MODQT_PLUGINS ?=${MODQT3_PLUGINS}
Index: x11/qt4/qt4.port.mk
===================================================================
RCS file: /cvs/ports/x11/qt4/qt4.port.mk,v
retrieving revision 1.12
diff -u -p -r1.12 qt4.port.mk
--- x11/qt4/qt4.port.mk 26 Mar 2016 20:37:35 -0000 1.12
+++ x11/qt4/qt4.port.mk 17 May 2016 11:49:16 -0000
@@ -30,6 +30,8 @@ MODQT4_QMAKE = ${LOCALBASE}/bin/qmake4
MODQT_QMAKE ?= ${MODQT4_QMAKE}
MODQT4_QTDIR = ${LOCALBASE}/lib/qt4
MODQT_QTDIR ?= ${MODQT4_QTDIR}
+MODQT4_LRELEASE = ${LOCALBASE}/bin/lrelease4
+MODQT_LRELEASE ?= ${MODQT4_LRELEASE}
MODQT4_LIB_DEPENDS = x11/qt4
MODQT_LIB_DEPENDS ?= ${MODQT4_LIB_DEPENDS}
Index: x11/qt5/qt5.port.mk
===================================================================
RCS file: /cvs/ports/x11/qt5/qt5.port.mk,v
retrieving revision 1.11
diff -u -p -r1.11 qt5.port.mk
--- x11/qt5/qt5.port.mk 26 Mar 2016 20:37:35 -0000 1.11
+++ x11/qt5/qt5.port.mk 17 May 2016 11:49:16 -0000
@@ -28,6 +28,8 @@ MODQT5_QMAKE = ${LOCALBASE}/bin/qmake-qt
MODQT_QMAKE ?= ${MODQT5_QMAKE}
MODQT5_QTDIR = ${LOCALBASE}/lib/qt5
MODQT_QTDIR ?= ${MODQT5_QTDIR}
+MODQT5_LRELEASE = ${LOCALBASE}/bin/lrelease-qt5
+MODQT_LRELEASE ?= ${MODQT5_LRELEASE}
_MODQT5_CMAKE_PKGS = \
Qt5 \
Index: port-modules.5
===================================================================
RCS file: /cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.205
diff -u -p -r1.205 port-modules.5
--- port-modules.5 26 Apr 2016 16:25:09 -0000 1.205
+++ port-modules.5 17 May 2016 11:51:04 -0000
@@ -1852,11 +1852,13 @@ as the global qt directory location,
as standard GNU configure-style parameters to locate the include and libraries.
.Pp
The location of qt specific tools
+.Nm lrelease ,
.Nm moc ,
.Nm qmake
and
.Nm uic
is available through
+.Ev MODQT*_LRELEASE ,
.Ev MODQT*_MOC ,
.Ev MODQT*_QMAKE
and
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
