Index: head/devel/gwenhywfar/Makefile =================================================================== --- head/devel/gwenhywfar/Makefile (revision 476243) +++ head/devel/gwenhywfar/Makefile (revision 476244) @@ -1,98 +1,98 @@ # $FreeBSD$ PORTNAME= gwenhywfar -PORTVERSION= 4.19.0 -PORTREVISION?= 1 +PORTVERSION= 4.20.0 +PORTREVISION?= 0 CATEGORIES= devel net security -MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=01&release=207&file=01&dummy=/ +MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=01&release=208&file=02&dummy=/ MAINTAINER?= jhale@FreeBSD.org COMMENT?= Multi-platform helper library for networking and security applications LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING 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 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 GWEN_SHLIB_VER= 60 PLIST_SUB= GWEN_SHLIB_VER="${GWEN_SHLIB_VER}" \ GWEN_MAJ_MIN_VER="${PORTVERSION:R}" .if !defined(SLAVEPORT) OPTIONS_DEFINE= DOXYGEN MEMDEBUG DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ dot:graphics/graphviz DOXYGEN_CONFIGURE_ENABLE= full-doc MEMDEBUG_DESC= Enable memory debugger statistic MEMDEBUG_CONFIGURE_ENABLE= memtrace .endif .include .if defined(SLAVEPORT) LIB_DEPENDS+= libgwenhywfar.so:devel/gwenhywfar BUILD_WRKSRC= ${WRKSRC}/gui INSTALL_WRKSRC= ${WRKSRC}/gui/${SLAVEPORT} . if ${SLAVEPORT}=="fox16" LIB_DEPENDS+= libFOX-1.6.so:x11-toolkits/fox16 CONFIGURE_ARGS+=--with-fox-includes=${LOCALBASE}/include/fox-1.6 \ --with-fox-libs=${LOCALBASE}/lib . elif ${SLAVEPORT}=="gtk2" 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" USES+= qmake:no_env qt:4 USE_QT= corelib gui moc_build uic_build CONFIGURE_ARGS+=--with-qt4-includes=${QT_INCDIR} \ --with-qt4-libs=${QT_LIBDIR} \ --with-qt4-moc=${MOC} \ --with-qt4-uic=${UIC} . elif ${SLAVEPORT}=="qt5" USES+= qmake:no_env qt:5 USE_GL= gl USE_QT= core gui widgets \ buildtools_build qmake_build CONFIGURE_ARGS+=--with-qt5-qmake=${QMAKE} \ --with-qt5-moc=${MOC} \ --with-qt5-uic=${UIC} . endif .endif post-patch: .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' \ -e 's|[$$][(]builddir[)]/../cpp/libgwengui-cpp.la|-lgwengui-cpp|g' \ -e 's|[$$][(]top_builddir[)]/gui/cpp/libgwengui-cpp.la|-lgwengui-cpp|g' \ -e '/^SUBDIRS/s|cpp ||g' .endif post-build-DOXYGEN-on: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} srcdoc post-install-DOXYGEN-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/apidoc cd ${WRKSRC}/apidoc && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/apidoc @${FIND} -P ${STAGEDIR}${DOCSDIR} -type f 2>/dev/null | \ ${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST} .include Index: head/devel/gwenhywfar/distinfo =================================================================== --- head/devel/gwenhywfar/distinfo (revision 476243) +++ head/devel/gwenhywfar/distinfo (revision 476244) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518718846 -SHA256 (gwenhywfar-4.19.0.tar.gz) = c54a9a162dc63ab69e4d3fc946aae92b929383ca60a2690b539adcdc58de9495 -SIZE (gwenhywfar-4.19.0.tar.gz) = 2362848 +TIMESTAMP = 1533231797 +SHA256 (gwenhywfar-4.20.0.tar.gz) = 5a88daabba1388f9528590aab5de527a12dd44a7da4572ce48469a29911b0fb0 +SIZE (gwenhywfar-4.20.0.tar.gz) = 2379537 Index: head/devel/gwenhywfar/files/patch-configure =================================================================== --- head/devel/gwenhywfar/files/patch-configure (revision 476243) +++ head/devel/gwenhywfar/files/patch-configure (revision 476244) @@ -1,81 +1,71 @@ -Prevent SO version rollback Fix dectection of fox libs Prevent linking to unneeded Qt5 libraries --- configure.orig 2018-02-10 18:33:05 UTC +++ configure -@@ -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 : - withval=$with_fox_libs; fox_libs="$withval" + withval=$with_fox_libs; local_fox_libs="$withval" else ac_ext=cpp @@ -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 -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 "\$(\$(@))\ " QMAKE_EXTRA_TARGETS += percent EOF $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile - QT_CXXFLAGS=`make -s -f $am_have_qt_makefile CXXFLAGS INCPATH` - QT_LIBS=`make -s -f $am_have_qt_makefile LIBS` + QT_CXXFLAGS=`make -s -f $am_have_qt_makefile -VCXXFLAGS -VINCPATH | tr '\n' ' '` + QT_LIBS=`make -s -f $am_have_qt_makefile -VLIBS | tr '\n' ' '` rm $am_have_qt_pro $am_have_qt_makefile # Look for specific tools in $PATH @@ -22582,8 +22555,8 @@ else fi - QT_LRELEASE=`which lrelease` - QT_LUPDATE=`which lupdate` + QT_LRELEASE=#none + QT_LUPDATE=#none # Get Qt version from qmake QT_DIR=`$QT_QMAKE --version | grep -o -E /.+` Index: head/devel/gwenhywfar/pkg-plist =================================================================== --- head/devel/gwenhywfar/pkg-plist (revision 476243) +++ head/devel/gwenhywfar/pkg-plist (revision 476244) @@ -1,191 +1,191 @@ bin/gct-tool bin/gsa bin/gwenhywfar-config bin/mklistdoc bin/typemaker bin/typemaker2 bin/xmlmerge include/gwenhywfar4/gwen-gui-cpp/api.h include/gwenhywfar4/gwen-gui-cpp/cppdialog.hpp include/gwenhywfar4/gwen-gui-cpp/cppgui.hpp include/gwenhywfar4/gwen-gui-cpp/cppwidget.hpp include/gwenhywfar4/gwenhywfar/args.h include/gwenhywfar4/gwenhywfar/base64.h include/gwenhywfar4/gwenhywfar/bindata.h include/gwenhywfar4/gwenhywfar/buffer.h include/gwenhywfar4/gwenhywfar/cgui.h include/gwenhywfar4/gwenhywfar/configmgr.h include/gwenhywfar4/gwenhywfar/configmgr_be.h include/gwenhywfar4/gwenhywfar/cryptalgo.h include/gwenhywfar4/gwenhywfar/cryptdefs.h include/gwenhywfar4/gwenhywfar/crypthead.h include/gwenhywfar4/gwenhywfar/cryptkey.h include/gwenhywfar4/gwenhywfar/cryptkey_be.h include/gwenhywfar4/gwenhywfar/cryptkeyrsa.h include/gwenhywfar4/gwenhywfar/cryptkeysym.h include/gwenhywfar4/gwenhywfar/cryptmgr.h include/gwenhywfar4/gwenhywfar/cryptmgr_be.h include/gwenhywfar4/gwenhywfar/cryptmgrkeys.h include/gwenhywfar4/gwenhywfar/ct.h include/gwenhywfar4/gwenhywfar/ct_be.h include/gwenhywfar4/gwenhywfar/ct_context.h include/gwenhywfar4/gwenhywfar/ct_keyinfo.h include/gwenhywfar4/gwenhywfar/ctf_context_be.h include/gwenhywfar4/gwenhywfar/ctfile_be.h include/gwenhywfar4/gwenhywfar/ctplugin.h include/gwenhywfar4/gwenhywfar/ctplugin_be.h include/gwenhywfar4/gwenhywfar/db.h include/gwenhywfar4/gwenhywfar/dbio.h include/gwenhywfar4/gwenhywfar/dbio_be.h include/gwenhywfar4/gwenhywfar/debug.h include/gwenhywfar4/gwenhywfar/dialog.h include/gwenhywfar4/gwenhywfar/dialog_be.h include/gwenhywfar4/gwenhywfar/directory.h include/gwenhywfar4/gwenhywfar/endianfns.h include/gwenhywfar4/gwenhywfar/error.h include/gwenhywfar4/gwenhywfar/fastbuffer.h include/gwenhywfar4/gwenhywfar/fslock.h include/gwenhywfar4/gwenhywfar/gui.h include/gwenhywfar4/gwenhywfar/gui_be.h include/gwenhywfar4/gwenhywfar/gwen_sar_fileheader.h include/gwenhywfar4/gwenhywfar/gwendate.h include/gwenhywfar4/gwenhywfar/gwenhywfar.h include/gwenhywfar4/gwenhywfar/gwenhywfarapi.h include/gwenhywfar4/gwenhywfar/gwensemaphore.h include/gwenhywfar4/gwenhywfar/gwensignal.h include/gwenhywfar4/gwenhywfar/gwentime.h include/gwenhywfar4/gwenhywfar/hashalgo.h include/gwenhywfar4/gwenhywfar/htmlctx_be.h include/gwenhywfar4/gwenhywfar/htmlfont_be.h include/gwenhywfar4/gwenhywfar/htmlimage_be.h include/gwenhywfar4/gwenhywfar/htmlobject_be.h include/gwenhywfar4/gwenhywfar/htmlprops_be.h include/gwenhywfar4/gwenhywfar/httpsession.h include/gwenhywfar4/gwenhywfar/i18n.h include/gwenhywfar4/gwenhywfar/idlist.h include/gwenhywfar4/gwenhywfar/idlist64.h include/gwenhywfar4/gwenhywfar/idmap.h include/gwenhywfar4/gwenhywfar/inetaddr.h include/gwenhywfar4/gwenhywfar/inetsocket.h include/gwenhywfar4/gwenhywfar/inherit.h include/gwenhywfar4/gwenhywfar/libloader.h include/gwenhywfar4/gwenhywfar/list.h include/gwenhywfar4/gwenhywfar/list1.h include/gwenhywfar4/gwenhywfar/list1.tmpl include/gwenhywfar4/gwenhywfar/list2.h include/gwenhywfar4/gwenhywfar/list2.tmpl include/gwenhywfar4/gwenhywfar/logger.h include/gwenhywfar4/gwenhywfar/mdigest.h include/gwenhywfar4/gwenhywfar/mdigest_be.h include/gwenhywfar4/gwenhywfar/memcache.h include/gwenhywfar4/gwenhywfar/memory.h include/gwenhywfar4/gwenhywfar/misc.h include/gwenhywfar4/gwenhywfar/misc2.h include/gwenhywfar4/gwenhywfar/msgengine.h include/gwenhywfar4/gwenhywfar/multicache.h include/gwenhywfar4/gwenhywfar/mutex.h include/gwenhywfar4/gwenhywfar/o_image_be.h include/gwenhywfar4/gwenhywfar/padd.h include/gwenhywfar4/gwenhywfar/paddalgo.h include/gwenhywfar4/gwenhywfar/param.h include/gwenhywfar4/gwenhywfar/param_fns.h include/gwenhywfar4/gwenhywfar/passwdstore.h include/gwenhywfar4/gwenhywfar/path.h include/gwenhywfar4/gwenhywfar/pathmanager.h include/gwenhywfar4/gwenhywfar/plugin.h include/gwenhywfar4/gwenhywfar/plugindescr.h include/gwenhywfar4/gwenhywfar/pointerlist.h include/gwenhywfar4/gwenhywfar/process.h include/gwenhywfar4/gwenhywfar/refptr.h include/gwenhywfar4/gwenhywfar/ringbuffer.h include/gwenhywfar4/gwenhywfar/sar.h include/gwenhywfar4/gwenhywfar/sighead.h include/gwenhywfar4/gwenhywfar/sigtail.h include/gwenhywfar4/gwenhywfar/smalltresor.h include/gwenhywfar4/gwenhywfar/ssl_cert_descr.h include/gwenhywfar4/gwenhywfar/ssl_cert_flags.h include/gwenhywfar4/gwenhywfar/stringlist.h include/gwenhywfar4/gwenhywfar/stringlist2.h include/gwenhywfar4/gwenhywfar/syncio.h include/gwenhywfar4/gwenhywfar/syncio_buffered.h include/gwenhywfar4/gwenhywfar/syncio_file.h include/gwenhywfar4/gwenhywfar/syncio_http.h include/gwenhywfar4/gwenhywfar/syncio_memory.h include/gwenhywfar4/gwenhywfar/syncio_socket.h include/gwenhywfar4/gwenhywfar/syncio_tls.h include/gwenhywfar4/gwenhywfar/system.h include/gwenhywfar4/gwenhywfar/tag16.h include/gwenhywfar4/gwenhywfar/text.h include/gwenhywfar4/gwenhywfar/tlv.h include/gwenhywfar4/gwenhywfar/tree.h include/gwenhywfar4/gwenhywfar/types.h include/gwenhywfar4/gwenhywfar/url.h include/gwenhywfar4/gwenhywfar/urlfns.h include/gwenhywfar4/gwenhywfar/version.h 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-%%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 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/ct/ohbci.xml lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/csv.so lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/csv.so.0 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/csv.so.0.0.1 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/csv.xml lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/olddb.so lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/olddb.so.0 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/olddb.so.0.0.1 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/olddb.xml lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.so lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.so.0 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.so.0.0.1 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.xml lib/libgwengui-cpp.so 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%%.19.0 +lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%%.19.1 libdata/pkgconfig/gwenhywfar.pc share/aclocal/gwenhywfar.m4 %%DATADIR%%/ca-bundle.crt %%DATADIR%%/dialogs/dlg_input.dlg %%DATADIR%%/dialogs/dlg_message.dlg %%DATADIR%%/dialogs/dlg_progress.dlg %%DATADIR%%/dialogs/dlg_showbox.dlg %%DATADIR%%/typemaker2/c/char.tm2 %%DATADIR%%/typemaker2/c/char_array.tm2 %%DATADIR%%/typemaker2/c/char_ptr.tm2 %%DATADIR%%/typemaker2/c/double.tm2 %%DATADIR%%/typemaker2/c/double_array.tm2 %%DATADIR%%/typemaker2/c/gwen_bindata.tm2 %%DATADIR%%/typemaker2/c/gwen_buffer.tm2 %%DATADIR%%/typemaker2/c/gwen_date.tm2 %%DATADIR%%/typemaker2/c/gwen_idlist64.tm2 %%DATADIR%%/typemaker2/c/gwen_multicache.tm2 %%DATADIR%%/typemaker2/c/gwen_multicache_type.tm2 %%DATADIR%%/typemaker2/c/gwen_param.tm2 %%DATADIR%%/typemaker2/c/gwen_param_list.tm2 %%DATADIR%%/typemaker2/c/gwen_param_list2.tm2 %%DATADIR%%/typemaker2/c/gwen_param_tree.tm2 %%DATADIR%%/typemaker2/c/gwen_stringlist2.tm2 %%DATADIR%%/typemaker2/c/gwen_time.tm2 %%DATADIR%%/typemaker2/c/idmap_base.tm2 %%DATADIR%%/typemaker2/c/int.tm2 %%DATADIR%%/typemaker2/c/int_base.tm2 %%DATADIR%%/typemaker2/c/list1_base.tm2 %%DATADIR%%/typemaker2/c/list2_base.tm2 %%DATADIR%%/typemaker2/c/struct_base.tm2 %%DATADIR%%/typemaker2/c/tree_base.tm2 %%DATADIR%%/typemaker2/c/uint32_t.tm2 %%DATADIR%%/typemaker2/c/uint32_t_array.tm2 %%DATADIR%%/typemaker2/c/uint64_t.tm2 %%DATADIR%%/typemaker2/c/uint8_t.tm2 %%DATADIR%%/typemaker2/c/uint8_t_array.tm2 share/locale/de/LC_MESSAGES/gwenhywfar.mo