From owner-svn-ports-all@freebsd.org Fri Oct 30 11:29:22 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B75D244F896; Fri, 30 Oct 2020 11:29:22 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CN0Sy4TX8z3bjx; Fri, 30 Oct 2020 11:29:22 +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 7D0DD15BD4; Fri, 30 Oct 2020 11:29:22 +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 09UBTM93061660; Fri, 30 Oct 2020 11:29:22 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09UBTKD2061651; Fri, 30 Oct 2020 11:29:20 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <202010301129.09UBTKD2061651@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Fri, 30 Oct 2020 11:29:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553680 - in head/devel: gwenhywfar gwenhywfar-fox16 gwenhywfar-gtk2 gwenhywfar-gtk3 gwenhywfar-qt5 gwenhywfar/files X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in head/devel: gwenhywfar gwenhywfar-fox16 gwenhywfar-gtk2 gwenhywfar-gtk3 gwenhywfar-qt5 gwenhywfar/files X-SVN-Commit-Revision: 553680 X-SVN-Commit-Repository: ports 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.33 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: Fri, 30 Oct 2020 11:29:22 -0000 Author: jhale Date: Fri Oct 30 11:29:20 2020 New Revision: 553680 URL: https://svnweb.freebsd.org/changeset/ports/553680 Log: devel/gwenhywfar: Update to 5.4.1 Modified: head/devel/gwenhywfar-fox16/pkg-plist head/devel/gwenhywfar-gtk2/pkg-plist head/devel/gwenhywfar-gtk3/pkg-plist head/devel/gwenhywfar-qt5/pkg-plist head/devel/gwenhywfar/Makefile head/devel/gwenhywfar/distinfo head/devel/gwenhywfar/files/patch-configure head/devel/gwenhywfar/pkg-descr head/devel/gwenhywfar/pkg-plist Modified: head/devel/gwenhywfar-fox16/pkg-plist ============================================================================== --- head/devel/gwenhywfar-fox16/pkg-plist Fri Oct 30 11:28:34 2020 (r553679) +++ head/devel/gwenhywfar-fox16/pkg-plist Fri Oct 30 11:29:20 2020 (r553680) @@ -6,5 +6,5 @@ include/gwenhywfar5/gwen-gui-fox16/fox16_htmltext.hpp include/gwenhywfar5/gwen-gui-fox16/theme.h lib/libgwengui-fox16.so lib/libgwengui-fox16.so.%%GWEN_SHLIB_VER%% -lib/libgwengui-fox16.so.%%GWEN_SHLIB_VER%%.3.0 +lib/libgwengui-fox16.so.%%GWEN_SHLIB_VER%%.4.1 libdata/pkgconfig/gwengui-fox16.pc Modified: head/devel/gwenhywfar-gtk2/pkg-plist ============================================================================== --- head/devel/gwenhywfar-gtk2/pkg-plist Fri Oct 30 11:28:34 2020 (r553679) +++ head/devel/gwenhywfar-gtk2/pkg-plist Fri Oct 30 11:29:20 2020 (r553680) @@ -1,5 +1,5 @@ include/gwenhywfar5/gwen-gui-gtk2/gtk2_gui.h lib/libgwengui-gtk2.so lib/libgwengui-gtk2.so.%%GWEN_SHLIB_VER%% -lib/libgwengui-gtk2.so.%%GWEN_SHLIB_VER%%.3.0 +lib/libgwengui-gtk2.so.%%GWEN_SHLIB_VER%%.4.1 libdata/pkgconfig/gwengui-gtk2.pc Modified: head/devel/gwenhywfar-gtk3/pkg-plist ============================================================================== --- head/devel/gwenhywfar-gtk3/pkg-plist Fri Oct 30 11:28:34 2020 (r553679) +++ head/devel/gwenhywfar-gtk3/pkg-plist Fri Oct 30 11:29:20 2020 (r553680) @@ -1,5 +1,5 @@ include/gwenhywfar5/gwen-gui-gtk3/gtk3_gui.h lib/libgwengui-gtk3.so lib/libgwengui-gtk3.so.%%GWEN_SHLIB_VER%% -lib/libgwengui-gtk3.so.%%GWEN_SHLIB_VER%%.3.0 +lib/libgwengui-gtk3.so.%%GWEN_SHLIB_VER%%.4.1 libdata/pkgconfig/gwengui-gtk3.pc Modified: head/devel/gwenhywfar-qt5/pkg-plist ============================================================================== --- head/devel/gwenhywfar-qt5/pkg-plist Fri Oct 30 11:28:34 2020 (r553679) +++ head/devel/gwenhywfar-qt5/pkg-plist Fri Oct 30 11:29:20 2020 (r553680) @@ -5,5 +5,5 @@ lib/cmake/gwengui-qt5-%%GWEN_MAJ_MIN_VER%%/gwengui-qt5 lib/cmake/gwengui-qt5-%%GWEN_MAJ_MIN_VER%%/gwengui-qt5-config.cmake lib/libgwengui-qt5.so lib/libgwengui-qt5.so.%%GWEN_SHLIB_VER%% -lib/libgwengui-qt5.so.%%GWEN_SHLIB_VER%%.3.0 +lib/libgwengui-qt5.so.%%GWEN_SHLIB_VER%%.4.1 libdata/pkgconfig/gwengui-qt5.pc Modified: head/devel/gwenhywfar/Makefile ============================================================================== --- head/devel/gwenhywfar/Makefile Fri Oct 30 11:28:34 2020 (r553679) +++ head/devel/gwenhywfar/Makefile Fri Oct 30 11:29:20 2020 (r553680) @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= gwenhywfar -PORTVERSION= 5.3.0 +PORTVERSION= 5.4.1 PORTREVISION?= 0 CATEGORIES= devel net security -MASTER_SITES= https://www.aquamaniac.de/rdm/attachments/download/319/ +MASTER_SITES= https://www.aquamaniac.de/rdm/attachments/download/344/ MAINTAINER?= jhale@FreeBSD.org COMMENT?= Multi-platform helper library for networking and security applications @@ -16,13 +16,12 @@ LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgnutls.so:security/gnutls \ libgpg-error.so:security/libgpg-error -USES= gettext gmake iconv:translit libtool pathfix pkgconfig ssl +USES= gettext gmake iconv:translit libtool localbase:ldflags \ + pathfix pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-release="yes" \ --with-guis="${SLAVEPORT}" -CPPFLAGS+= -isystem ${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lintl INSTALL_TARGET= install-strip USE_LDCONFIG= yes @@ -31,14 +30,26 @@ PLIST_SUB= GWEN_SHLIB_VER="${GWEN_SHLIB_VER}" \ GWEN_MAJ_MIN_VER="${PORTVERSION:R}" .if !defined(SLAVEPORT) -OPTIONS_DEFINE= DOXYGEN MEMDEBUG +OPTIONS_DEFINE= DOXYGEN LIBXML2 MEMDEBUG OPENSSL +OPTIONS_DEFAULT= OPENSSL +OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ dot:graphics/graphviz DOXYGEN_CONFIGURE_ENABLE= full-doc +LIBXML2_USES= gnome +LIBXML2_USE= gnome=libxml2 +LIBXML2_CONFIGURE_ON= --with-libxml2-code=yes + MEMDEBUG_DESC= Enable memory debugger statistic MEMDEBUG_CONFIGURE_ENABLE= memtrace + +OPENSSL_USES= ssl +OPENSSL_CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" +OPENSSL_CONFIGURE_ENV_OFF= OPENSSL_CFLAGS="" \ + OPENSSL_LIBS="" .endif .include @@ -72,6 +83,10 @@ CONFIGURE_ARGS+=--with-qt5-qmake=${QMAKE} \ .endif post-patch: + ${REINPLACE_CMD} -e '/^LIBS/s|$$| @i18n_libs@|' \ + ${WRKSRC}/tools/gcttool/Makefile.in \ + ${WRKSRC}/tools/typemaker/Makefile.in \ + ${WRKSRC}/tools/xmlmerge/Makefile.in .if defined(SLAVEPORT) @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ ${REINPLACE_CMD} -e 's|[$$][(]top_builddir[)]/src/[$$][(]gwenhywfar_internal_libname[)]|$$(gwenhywfar_libs)|g' \ Modified: head/devel/gwenhywfar/distinfo ============================================================================== --- head/devel/gwenhywfar/distinfo Fri Oct 30 11:28:34 2020 (r553679) +++ head/devel/gwenhywfar/distinfo Fri Oct 30 11:29:20 2020 (r553680) @@ -1,3 +1,3 @@ -TIMESTAMP = 1593351410 -SHA256 (gwenhywfar-5.3.0.tar.gz) = 3aec5982f5e136761863f4b6b12bbb4cd26b8ffb5f7553b58a48f72b6a4344a9 -SIZE (gwenhywfar-5.3.0.tar.gz) = 2358547 +TIMESTAMP = 1602631748 +SHA256 (gwenhywfar-5.4.1.tar.gz) = fbfd403410e3c1cf7e2957738cf51c6a01ceeec6ab4d2f546512c255d3c08a9b +SIZE (gwenhywfar-5.4.1.tar.gz) = 2373780 Modified: head/devel/gwenhywfar/files/patch-configure ============================================================================== --- head/devel/gwenhywfar/files/patch-configure Fri Oct 30 11:28:34 2020 (r553679) +++ head/devel/gwenhywfar/files/patch-configure Fri Oct 30 11:29:20 2020 (r553680) @@ -1,9 +1,9 @@ Fix dectection of fox libs Prevent linking to unneeded Qt5 libraries ---- configure.orig 2019-11-11 00:25:41 UTC +--- configure.orig 2020-10-11 12:07:56 UTC +++ configure -@@ -21664,7 +21664,7 @@ $as_echo_n "checking for fox libraries... " >&6; } +@@ -21622,7 +21622,7 @@ $as_echo_n "checking for fox libraries... " >&6; } # Check whether --with-fox-libs was given. if test "${with_fox_libs+set}" = set; then : @@ -12,42 +12,7 @@ Prevent linking to unneeded Qt5 libraries else ac_ext=cpp -@@ -23122,43 +23122,16 @@ win32 { - CONFIG -= debug_and_release - CONFIG += release - } --qtHaveModule(axcontainer): QT += axcontainer --qtHaveModule(axserver): QT += axserver --qtHaveModule(concurrent): QT += concurrent - qtHaveModule(core): QT += core --qtHaveModule(dbus): QT += dbus --qtHaveModule(declarative): QT += declarative --qtHaveModule(designer): QT += designer - qtHaveModule(gui): QT += gui --qtHaveModule(help): QT += help --qtHaveModule(multimedia): QT += multimedia --qtHaveModule(multimediawidgets): QT += multimediawidgets --qtHaveModule(network): QT += network --qtHaveModule(opengl): QT += opengl --qtHaveModule(printsupport): QT += printsupport --qtHaveModule(qml): QT += qml --qtHaveModule(qmltest): QT += qmltest --qtHaveModule(x11extras): QT += x11extras --qtHaveModule(script): QT += script --qtHaveModule(scripttools): QT += scripttools --qtHaveModule(sensors): QT += sensors --qtHaveModule(serialport): QT += serialport --qtHaveModule(sql): QT += sql --qtHaveModule(svg): QT += svg --qtHaveModule(testlib): QT += testlib --qtHaveModule(uitools): QT += uitools --qtHaveModule(webkit): QT += webkit --qtHaveModule(webkitwidgets): QT += webkitwidgets --qtHaveModule(xml): QT += xml --qtHaveModule(xmlpatterns): QT += xmlpatterns - qtHaveModule(widgets): QT += widgets - percent.target = % - percent.commands = @echo -n "\$(\$(@))\ " +@@ -23218,8 +23218,8 @@ percent.commands = @echo -n "\$(\$(@))\ " QMAKE_EXTRA_TARGETS += percent EOF $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile @@ -58,7 +23,7 @@ Prevent linking to unneeded Qt5 libraries rm $am_have_qt_pro $am_have_qt_makefile # Look for specific tools in $PATH -@@ -23182,8 +23155,8 @@ else +@@ -23243,8 +23243,8 @@ else fi @@ -69,3 +34,12 @@ Prevent linking to unneeded Qt5 libraries # Get Qt version from qmake QT_DIR=`$QT_QMAKE --version | grep -o -E /.+` +@@ -27214,7 +27214,7 @@ echo "Data Search Folder : $gwenhywfar_data + echo "Locale Search Folder : $gwenhywfar_locale_searchdir" + echo "Config Search Folder : $gwenhywfar_cfg_searchdir" + echo "Buffer Default Hard Limit : $gwenhywfar_buffer_hardlimit" +-echo "Symbol Visibility : $visibility_supported" ++echo "Symbol Visibility : $ac_cv_hidden_visibility_attribute" + echo "OpenSSL Support for gct-tool : $ssl_available" + echo "GUI Support : $gwenhywfar_guis" + echo "Use system-wide certificates : $enable_system_certs" Modified: head/devel/gwenhywfar/pkg-descr ============================================================================== --- head/devel/gwenhywfar/pkg-descr Fri Oct 30 11:28:34 2020 (r553679) +++ head/devel/gwenhywfar/pkg-descr Fri Oct 30 11:29:20 2020 (r553680) @@ -13,4 +13,4 @@ Gwenhywfar includes the following features, among seve - High-level cryptographic functions on top of OpenSSL functionality (src/crypt/) -WWW: https://www.aquamaniac.de/rdm/ +WWW: https://www.aquamaniac.de/rdm/projects/gwenhywfar Modified: head/devel/gwenhywfar/pkg-plist ============================================================================== --- head/devel/gwenhywfar/pkg-plist Fri Oct 30 11:28:34 2020 (r553679) +++ head/devel/gwenhywfar/pkg-plist Fri Oct 30 11:29:20 2020 (r553680) @@ -127,6 +127,12 @@ include/gwenhywfar5/gwenhywfar/version.h include/gwenhywfar5/gwenhywfar/widget_be.h include/gwenhywfar5/gwenhywfar/xml.h include/gwenhywfar5/gwenhywfar/xml2db.h +include/gwenhywfar5/gwenhywfar/xmlcmd.h +include/gwenhywfar5/gwenhywfar/xmlcmd_gxml.h +include/gwenhywfar5/gwenhywfar/xmlcmd_gxml_fromdb.h +include/gwenhywfar5/gwenhywfar/xmlcmd_gxml_todb.h +%%LIBXML2%%include/gwenhywfar5/gwenhywfar/xmlcmd_lxml.h +%%LIBXML2%%include/gwenhywfar5/gwenhywfar/xmlcmd_lxml_todb.h include/gwenhywfar5/gwenhywfar/xmlctx.h include/gwenhywfar5/gwenhywfar/xsdnode.h lib/cmake/gwengui-cpp-%%GWEN_MAJ_MIN_VER%%/gwengui-cpp-config-version.cmake @@ -151,10 +157,10 @@ lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.s lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.xml lib/libgwengui-cpp.so lib/libgwengui-cpp.so.%%GWEN_SHLIB_VER%% -lib/libgwengui-cpp.so.%%GWEN_SHLIB_VER%%.3.0 +lib/libgwengui-cpp.so.%%GWEN_SHLIB_VER%%.4.1 lib/libgwenhywfar.so lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%% -lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%%.3.0 +lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%%.4.1 libdata/pkgconfig/gwenhywfar.pc share/aclocal/gwenhywfar.m4 %%DATADIR%%/dialogs/dlg_input.dlg