From owner-svn-ports-head@freebsd.org Sat Feb 17 01:26:37 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0D30F003D1; Sat, 17 Feb 2018 01:26:36 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8DDA57D6AF; Sat, 17 Feb 2018 01:26:36 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 86A8415A80; Sat, 17 Feb 2018 01:26: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 w1H1QaIL060391; Sat, 17 Feb 2018 01:26:36 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1H1QZAC060384; Sat, 17 Feb 2018 01:26:35 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201802170126.w1H1QZAC060384@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Sat, 17 Feb 2018 01:26:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462080 - in head/devel: . gwenhywfar gwenhywfar-gtk3 gwenhywfar/files X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in head/devel: . gwenhywfar gwenhywfar-gtk3 gwenhywfar/files X-SVN-Commit-Revision: 462080 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Feb 2018 01:26:37 -0000 Author: jhale Date: Sat Feb 17 01:26:35 2018 New Revision: 462080 URL: https://svnweb.freebsd.org/changeset/ports/462080 Log: Update devel/gwenhywfar* to 4.19.0 Add devel/gwenhywfar-gtk3 slave port - support library for GTK3+ Remove unneeded linguisttools dependency from devel/gwenhywfar-qt5 Added: head/devel/gwenhywfar-gtk3/ - copied from r461940, head/devel/gwenhywfar-gtk2/ Modified: head/devel/Makefile head/devel/gwenhywfar-gtk3/Makefile head/devel/gwenhywfar-gtk3/pkg-plist head/devel/gwenhywfar/Makefile head/devel/gwenhywfar/distinfo head/devel/gwenhywfar/files/patch-configure head/devel/gwenhywfar/pkg-plist Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sat Feb 17 01:19:27 2018 (r462079) +++ head/devel/Makefile Sat Feb 17 01:26:35 2018 (r462080) @@ -885,6 +885,7 @@ SUBDIR += gwenhywfar SUBDIR += gwenhywfar-fox16 SUBDIR += gwenhywfar-gtk2 + SUBDIR += gwenhywfar-gtk3 SUBDIR += gwenhywfar-qt4 SUBDIR += gwenhywfar-qt5 SUBDIR += gzstream Modified: head/devel/gwenhywfar-gtk3/Makefile ============================================================================== --- head/devel/gwenhywfar-gtk2/Makefile Thu Feb 15 17:46:56 2018 (r461940) +++ head/devel/gwenhywfar-gtk3/Makefile Sat Feb 17 01:26:35 2018 (r462080) @@ -4,10 +4,10 @@ PORTREVISION= 0 PKGNAMESUFFIX= -${SLAVEPORT} MAINTAINER= jhale@FreeBSD.org -COMMENT= Gwenhywfar GTK2+ support library +COMMENT= Gwenhywfar GTK3+ support library MASTERDIR= ${.CURDIR}/../../devel/gwenhywfar -SLAVEPORT= gtk2 +SLAVEPORT= gtk3 PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Modified: head/devel/gwenhywfar-gtk3/pkg-plist ============================================================================== --- head/devel/gwenhywfar-gtk2/pkg-plist Thu Feb 15 17:46:56 2018 (r461940) +++ head/devel/gwenhywfar-gtk3/pkg-plist Sat Feb 17 01:26:35 2018 (r462080) @@ -1,5 +1,5 @@ -include/gwenhywfar4/gwen-gui-gtk2/gtk2_gui.h -lib/libgwengui-gtk2.so -lib/libgwengui-gtk2.so.0 -lib/libgwengui-gtk2.so.0.0.0 -libdata/pkgconfig/gwengui-gtk2.pc +include/gwenhywfar4/gwen-gui-gtk3/gtk3_gui.h +lib/libgwengui-gtk3.so +lib/libgwengui-gtk3.so.0 +lib/libgwengui-gtk3.so.0.0.0 +libdata/pkgconfig/gwengui-gtk3.pc Modified: head/devel/gwenhywfar/Makefile ============================================================================== --- head/devel/gwenhywfar/Makefile Sat Feb 17 01:19:27 2018 (r462079) +++ head/devel/gwenhywfar/Makefile Sat Feb 17 01:26:35 2018 (r462080) @@ -1,15 +1,15 @@ # $FreeBSD$ PORTNAME= gwenhywfar -PORTVERSION= 4.18.0 +PORTVERSION= 4.19.0 PORTREVISION?= 0 CATEGORIES= devel net security -MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=01&release=206&file=01&dummy=/ +MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=01&release=207&file=01&dummy=/ MAINTAINER?= jhale@FreeBSD.org COMMENT?= Multi-platform helper library for networking and security applications -LICENSE= LGPL21 +LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ @@ -56,6 +56,8 @@ CONFIGURE_ARGS+=--with-fox-includes=${LOCALBASE}/inclu LIB_DEPENDS+= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig USE_GNOME+= cairo gdkpixbuf2 gtk20 +. elif ${SLAVEPORT}=="gtk3" +USE_GNOME+= cairo gdkpixbuf2 gtk30 . elif ${SLAVEPORT}=="qt4" USE_QT4= corelib gui moc_build uic_build QT_NONSTANDARD= yes @@ -66,13 +68,11 @@ CONFIGURE_ARGS+=--with-qt4-includes=${QT_INCDIR} \ . elif ${SLAVEPORT}=="qt5" USE_GL= gl USE_QT5= core gui widgets \ - buildtools_build linguisttools_build qmake_build + buildtools_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} + --with-qt5-uic=${UIC} . endif .endif Modified: head/devel/gwenhywfar/distinfo ============================================================================== --- head/devel/gwenhywfar/distinfo Sat Feb 17 01:19:27 2018 (r462079) +++ head/devel/gwenhywfar/distinfo Sat Feb 17 01:26:35 2018 (r462080) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501744741 -SHA256 (gwenhywfar-4.18.0.tar.gz) = 6915bba42d8b7f0213cee186a944296e5e5e97cdbde5b539a924261af03086ca -SIZE (gwenhywfar-4.18.0.tar.gz) = 2333059 +TIMESTAMP = 1518718846 +SHA256 (gwenhywfar-4.19.0.tar.gz) = c54a9a162dc63ab69e4d3fc946aae92b929383ca60a2690b539adcdc58de9495 +SIZE (gwenhywfar-4.19.0.tar.gz) = 2362848 Modified: head/devel/gwenhywfar/files/patch-configure ============================================================================== --- head/devel/gwenhywfar/files/patch-configure Sat Feb 17 01:19:27 2018 (r462079) +++ head/devel/gwenhywfar/files/patch-configure Sat Feb 17 01:26:35 2018 (r462080) @@ -1,28 +1,19 @@ +Prevent SO version rollback Fix dectection of fox libs -Allow configuring the locations of lrelease and lupdate Prevent linking to unneeded Qt5 libraries ---- configure.orig 2017-07-30 14:20:32 UTC +--- configure.orig 2018-02-10 18:33:05 UTC +++ configure -@@ -951,6 +951,8 @@ with_x - with_qt5_qmake - with_qt5_moc - with_qt5_uic -+with_qt5_lrelease -+with_qt5_lupdate - with_docpath - enable_release - enable_memtrace -@@ -1672,6 +1674,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 -@@ -21084,7 +21088,7 @@ $as_echo_n "checking for fox libraries.. +@@ -2888,7 +2888,7 @@ GWENHYWFAR_VERSION_TAG="stable" + # + # SO version for Gwenhywfar + # +-GWENHYWFAR_SO_CURRENT="78" ++GWENHYWFAR_SO_CURRENT="79" + GWENHYWFAR_SO_AGE="19" + GWENHYWFAR_SO_REVISION="0" + GWENHYWFAR_SO_EFFECTIVE="`echo \$(($GWENHYWFAR_SO_CURRENT-$GWENHYWFAR_SO_AGE))`" +@@ -21093,7 +21093,7 @@ $as_echo_n "checking for fox libraries... " >&6; } # Check whether --with-fox-libs was given. if test "${with_fox_libs+set}" = set; then : @@ -31,7 +22,7 @@ Prevent linking to unneeded Qt5 libraries else ac_ext=cpp -@@ -22415,43 +22419,16 @@ $as_echo_n "checking for Qt... " >&6; } +@@ -22522,43 +22522,16 @@ $as_echo_n "checking for Qt... " >&6; } am_have_qt_makefile=`mktemp` # http://qt-project.org/doc/qt-5/qmake-variable-reference.html#qt cat > $am_have_qt_pro << EOF @@ -77,27 +68,14 @@ Prevent linking to unneeded Qt5 libraries rm $am_have_qt_pro $am_have_qt_makefile # Look for specific tools in $PATH -@@ -22474,9 +22451,21 @@ else - +@@ -22582,8 +22555,8 @@ 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 ++ QT_LRELEASE=#none ++ QT_LUPDATE=#none # 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 Feb 17 01:19:27 2018 (r462079) +++ head/devel/gwenhywfar/pkg-plist Sat Feb 17 01:26:35 2018 (r462080) @@ -151,7 +151,7 @@ lib/libgwengui-cpp.so.0 lib/libgwengui-cpp.so.0.0.0 lib/libgwenhywfar.so lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%% -lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%%.18.0 +lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%%.19.0 libdata/pkgconfig/gwenhywfar.pc share/aclocal/gwenhywfar.m4 %%DATADIR%%/ca-bundle.crt