From owner-svn-ports-all@freebsd.org Sat Oct 29 11:38:37 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1EB5EC253CE; Sat, 29 Oct 2016 11:38:37 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D2E4CC8F; Sat, 29 Oct 2016 11:38:36 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9TBcaWu062585; Sat, 29 Oct 2016 11:38:36 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9TBcZwW062578; Sat, 29 Oct 2016 11:38:35 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201610291138.u9TBcZwW062578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Sat, 29 Oct 2016 11:38:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424900 - in head/devel: . gwenhywfar gwenhywfar-qt4 gwenhywfar-qt5 gwenhywfar/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2016 11:38:37 -0000 Author: jhale Date: Sat Oct 29 11:38:35 2016 New Revision: 424900 URL: https://svnweb.freebsd.org/changeset/ports/424900 Log: 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. Added: head/devel/gwenhywfar-qt5/ - copied from r424665, head/devel/gwenhywfar-qt4/ Modified: head/devel/Makefile head/devel/gwenhywfar-qt4/pkg-plist head/devel/gwenhywfar-qt5/Makefile head/devel/gwenhywfar-qt5/pkg-plist head/devel/gwenhywfar/Makefile head/devel/gwenhywfar/files/patch-configure head/devel/gwenhywfar/pkg-plist Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sat Oct 29 10:10:33 2016 (r424899) +++ head/devel/Makefile Sat Oct 29 11:38:35 2016 (r424900) @@ -811,6 +811,7 @@ SUBDIR += gwenhywfar-fox16 SUBDIR += gwenhywfar-gtk2 SUBDIR += gwenhywfar-qt4 + SUBDIR += gwenhywfar-qt5 SUBDIR += gzstream SUBDIR += hachoir-core SUBDIR += hachoir-parser Modified: head/devel/gwenhywfar-qt4/pkg-plist ============================================================================== --- head/devel/gwenhywfar-qt4/pkg-plist Sat Oct 29 10:10:33 2016 (r424899) +++ head/devel/gwenhywfar-qt4/pkg-plist Sat Oct 29 11:38:35 2016 (r424900) @@ -1,6 +1,6 @@ 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 Modified: head/devel/gwenhywfar-qt5/Makefile ============================================================================== --- head/devel/gwenhywfar-qt4/Makefile Wed Oct 26 02:49:52 2016 (r424665) +++ head/devel/gwenhywfar-qt5/Makefile Sat Oct 29 11:38:35 2016 (r424900) @@ -4,10 +4,10 @@ PORTREVISION= 0 PKGNAMESUFFIX= -${SLAVEPORT} MAINTAINER= jhale@FreeBSD.org -COMMENT= Gwenhywfar Qt4 support library +COMMENT= Gwenhywfar Qt5 support library MASTERDIR= ${.CURDIR}/../../devel/gwenhywfar -SLAVEPORT= qt4 +SLAVEPORT= qt5 PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Modified: head/devel/gwenhywfar-qt5/pkg-plist ============================================================================== --- head/devel/gwenhywfar-qt4/pkg-plist Wed Oct 26 02:49:52 2016 (r424665) +++ head/devel/gwenhywfar-qt5/pkg-plist Sat Oct 29 11:38:35 2016 (r424900) @@ -1,7 +1,7 @@ -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/libgwengui-qt4.so -lib/libgwengui-qt4.so.0 -lib/libgwengui-qt4.so.0.0.0 -libdata/pkgconfig/gwengui-qt4.pc +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 Modified: head/devel/gwenhywfar/Makefile ============================================================================== --- head/devel/gwenhywfar/Makefile Sat Oct 29 10:10:33 2016 (r424899) +++ head/devel/gwenhywfar/Makefile Sat Oct 29 11:38:35 2016 (r424900) @@ -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/${SLAVEPOR 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 Modified: head/devel/gwenhywfar/files/patch-configure ============================================================================== --- head/devel/gwenhywfar/files/patch-configure Sat Oct 29 10:10:33 2016 (r424899) +++ head/devel/gwenhywfar/files/patch-configure Sat Oct 29 11:38:35 2016 (r424900) @@ -1,6 +1,24 @@ ---- 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 /.+` Modified: head/devel/gwenhywfar/pkg-plist ============================================================================== --- head/devel/gwenhywfar/pkg-plist Sat Oct 29 10:10:33 2016 (r424899) +++ head/devel/gwenhywfar/pkg-plist Sat Oct 29 11:38:35 2016 (r424900) @@ -125,10 +125,10 @@ include/gwenhywfar4/gwenhywfar/widget_be 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