Commit 2fee8d4b authored by jhale's avatar jhale
Browse files

New port: devel/gwenhywfar-qt5, the Gwenhywfar Qt5 support library

While here:
- Clean up if statements in the master port
- Substitute the major.minor version in all gwenhywfar pkg-plists

devel/gwenhywfar/files/patch-configure had to be reworked, but the
changes only affect the new port and the other changes do not
affect the packages, so no PORTREVISON bump.
parent c9d62287
......@@ -811,6 +811,7 @@
SUBDIR += gwenhywfar-fox16
SUBDIR += gwenhywfar-gtk2
SUBDIR += gwenhywfar-qt4
SUBDIR += gwenhywfar-qt5
SUBDIR += gzstream
SUBDIR += hachoir-core
SUBDIR += hachoir-parser
......
include/gwenhywfar4/gwen-gui-qt4/qt4_gui.hpp
lib/cmake/gwengui-qt4-4.15/gwengui-qt4-config-version.cmake
lib/cmake/gwengui-qt4-4.15/gwengui-qt4-config.cmake
lib/cmake/gwengui-qt4-%%GWEN_MAJ_MIN_VER%%/gwengui-qt4-config-version.cmake
lib/cmake/gwengui-qt4-%%GWEN_MAJ_MIN_VER%%/gwengui-qt4-config.cmake
lib/libgwengui-qt4.so
lib/libgwengui-qt4.so.0
lib/libgwengui-qt4.so.0.0.0
......
# $FreeBSD$
PORTREVISION= 0
PKGNAMESUFFIX= -${SLAVEPORT}
MAINTAINER= jhale@FreeBSD.org
COMMENT= Gwenhywfar Qt5 support library
MASTERDIR= ${.CURDIR}/../../devel/gwenhywfar
SLAVEPORT= qt5
PLIST= ${.CURDIR}/pkg-plist
.include "${MASTERDIR}/Makefile"
include/gwenhywfar4/gwen-gui-qt5/qt5_gui.hpp
lib/cmake/gwengui-qt5-%%GWEN_MAJ_MIN_VER%%/gwengui-qt5-config-version.cmake
lib/cmake/gwengui-qt5-%%GWEN_MAJ_MIN_VER%%/gwengui-qt5-config.cmake
lib/libgwengui-qt5.so
lib/libgwengui-qt5.so.0
lib/libgwengui-qt5.so.0.0.0
libdata/pkgconfig/gwengui-qt5.pc
......@@ -27,7 +27,8 @@ INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
GWEN_SHLIB_VER= 60
PLIST_SUB= GWEN_SHLIB_VER="${GWEN_SHLIB_VER}"
PLIST_SUB= GWEN_SHLIB_VER="${GWEN_SHLIB_VER}" \
GWEN_MAJ_MIN_VER="${PORTVERSION:R}"
.if !defined(SLAVEPORT)
OPTIONS_DEFINE= DOXYGEN MEMDEBUG
......@@ -51,21 +52,27 @@ INSTALL_WRKSRC= ${WRKSRC}/gui/${SLAVEPORT}
LIB_DEPENDS+= libFOX-1.6.so:x11-toolkits/fox16
CONFIGURE_ARGS+=--with-fox-includes=${LOCALBASE}/include/fox-1.6 \
--with-fox-libs=${LOCALBASE}/lib
. endif
. if ${SLAVEPORT}=="gtk2"
. elif ${SLAVEPORT}=="gtk2"
LIB_DEPENDS+= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
USE_GNOME+= cairo gdkpixbuf2 gtk20
. endif
. if ${SLAVEPORT}=="qt4"
. elif ${SLAVEPORT}=="qt4"
USE_QT4= corelib gui moc_build uic_build
QT_NONSTANDARD= yes
CONFIGURE_ARGS+=--with-qt4-includes=${QT_INCDIR} \
--with-qt4-libs=${QT_LIBDIR} \
--with-qt4-moc=${MOC} \
--with-qt4-uic=${UIC}
. elif ${SLAVEPORT}=="qt5"
USE_GL= gl
USE_QT5= core dbus gui network printsupport qml testlib widgets xml \
buildtools_build linguisttools_build qmake_build
QT_NONSTANDARD= yes
CONFIGURE_ARGS+=--with-qt5-qmake=${QMAKE} \
--with-qt5-moc=${MOC} \
--with-qt5-uic=${UIC} \
--with-qt5-lrelease=${LRELEASE} \
--with-qt5-lupdate=${LUPDATE}
. endif
.endif
......
--- configure.orig 2015-05-25 16:16:33 UTC
--- configure.orig 2016-04-23 16:22:43 UTC
+++ configure
@@ -20986,7 +20986,7 @@ $as_echo_n "checking for fox libraries..
@@ -948,6 +948,8 @@ with_x
with_qt5_qmake
with_qt5_moc
with_qt5_uic
+with_qt5_lrelease
+with_qt5_lupdate
with_docpath
enable_release
enable_memtrace
@@ -1668,6 +1670,8 @@ Optional Packages:
--with-qt5-qmake=FILE uses given qmake
--with-qt5-moc=FILE uses given qt moc
--with-qt5-uic=FILE uses given qt uic
+ --with-qt5-lrelease=FILE uses given qt lrelease
+ --with-qt5-lupdate=FILE uses given qt lupdate
--with-docpath=DIR where to store the apidoc
--with-buffer-hardlimit=VALUE new default buffer hard limit
--with-plugins-ct=LIST list of CT plugins to build
@@ -21079,7 +21083,7 @@ $as_echo_n "checking for fox libraries..
# Check whether --with-fox-libs was given.
if test "${with_fox_libs+set}" = set; then :
......@@ -9,3 +27,38 @@
else
ac_ext=cpp
@@ -22445,8 +22449,8 @@ percent.commands = @echo -n "\$(\$(@))\
QMAKE_EXTRA_TARGETS += percent
EOF
$QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile
- QT_CXXFLAGS=`make -f $am_have_qt_makefile CXXFLAGS INCPATH`
- QT_LIBS=`make -f $am_have_qt_makefile LIBS`
+ QT_CXXFLAGS=`make -f $am_have_qt_makefile -VCXXFLAGS -VINCPATH | tr '\n' ' '`
+ QT_LIBS=`make -f $am_have_qt_makefile -VLIBS | tr '\n' ' '`
rm $am_have_qt_pro $am_have_qt_makefile
# Look for specific tools in $PATH
@@ -22469,9 +22473,21 @@ else
fi
+# Check whether --with-qt5-lrelease was given.
+if test "${with_qt5_lrelease+set}" = set; then :
+ withval=$with_qt5_lrelease; QT_LRELEASE="$withval"
+else
+ QT_RELEASE=`which lrelease`
+
+fi
+
+# Check whether --with-qt5-lupdate was given.
+if test "${with_qt5_lupdate+set}" = set; then :
+ withval=$with_qt5_lupdate; QT_LUPDATE="$withval"
+else
+ QT_LUPDATE=`which lupdate`
- QT_LRELEASE=`which lrelease`
- QT_LUPDATE=`which lupdate`
+fi
# Get Qt version from qmake
QT_DIR=`$QT_QMAKE --version | grep -o -E /.+`
......@@ -125,10 +125,10 @@ include/gwenhywfar4/gwenhywfar/widget_be.h
include/gwenhywfar4/gwenhywfar/xml.h
include/gwenhywfar4/gwenhywfar/xmlctx.h
include/gwenhywfar4/gwenhywfar/xsdnode.h
lib/cmake/gwengui-cpp-4.15/gwengui-cpp-config-version.cmake
lib/cmake/gwengui-cpp-4.15/gwengui-cpp-config.cmake
lib/cmake/gwenhywfar-4.15/gwenhywfar-config-version.cmake
lib/cmake/gwenhywfar-4.15/gwenhywfar-config.cmake
lib/cmake/gwengui-cpp-%%GWEN_MAJ_MIN_VER%%/gwengui-cpp-config-version.cmake
lib/cmake/gwengui-cpp-%%GWEN_MAJ_MIN_VER%%/gwengui-cpp-config.cmake
lib/cmake/gwenhywfar-%%GWEN_MAJ_MIN_VER%%/gwenhywfar-config-version.cmake
lib/cmake/gwenhywfar-%%GWEN_MAJ_MIN_VER%%/gwenhywfar-config.cmake
lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/configmgr/dir.so
lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/configmgr/dir.xml
lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/ct/ohbci.so
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment