Index: head/irc/hexchat/Makefile =================================================================== --- head/irc/hexchat/Makefile (revision 520625) +++ head/irc/hexchat/Makefile (revision 520626) @@ -1,92 +1,91 @@ # Created by: Rusmir Dusko # $FreeBSD$ PORTNAME= hexchat -PORTVERSION= 2.14.2 +PORTVERSION= 2.14.3 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= irc gnome -MAINTAINER= pkubaj@anongoth.pl +MAINTAINER= pkubaj@FreeBSD.org COMMENT= IRC chat program with GTK and Text Frontend LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes LIB_DEPENDS= libproxy.so:net/libproxy \ libfontconfig.so:x11-fonts/fontconfig \ libdbus-1.so:devel/dbus \ libfreetype.so:print/freetype2 RUN_DEPENDS= ${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes USES= compiler:c++11-lang desktop-file-utils gettext-tools gnome \ - libtool meson ninja pkgconfig python:3.5+ shebangfix ssl xorg + libtool localbase meson ninja pkgconfig python:3.5+ shebangfix \ + ssl xorg USE_GNOME= cairo gtk20 intltool libxml2 USE_XORG= x11 USE_GITHUB= yes MESON_ARGS= -Dwith-ssl=true -Dwith-gtk=true -Dwith-python=python-${PYTHON_VER} INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lX11 +LIBS+= -lX11 SUB_FILES= pkg-message PORTDOCS= * OPTIONS_DEFINE= CA_BUNDLE CANBERRA DBUS DOCS FISHLIM LUA NOTIFY \ PERL TEXTFE SYSINFO OPTIONS_DEFAULT= CA_BUNDLE CANBERRA DBUS NOTIFY PERL OPTIONS_SUB= yes CA_BUNDLE_DESC= Include CA bundle for SSL verification CANBERRA_DESC= Audio support via Libcanberra FISHLIM_DESC= FiSHLiM plugin TEXTFE_DESC= Text frontend SYSINFO_DESC= Sysinfo plugin CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss CA_BUNDLE_VARS= CA_BUNDLE="${LOCALBASE}/share/certs/ca-root-nss.crt" CA_BUNDLE_VARS_OFF= CA_BUNDLE=NULL CANBERRA_LIB_DEPENDS= libcanberra.so:audio/libcanberra CANBERRA_MESON_TRUE= with-libcanberra DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib DBUS_MESON_TRUE= with-dbus DBUS_USE= GNOME=gconf2 FISHLIM_MESON_TRUE= with-fishlim LUA_MESON_ON= -Dwith-lua=lua-${LUA_VER} LUA_MESON_OFF= -Dwith-lua=false LUA_USES= lua LUA_USE= GCC=any NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_MESON_TRUE= with-libnotify PERL_MESON_TRUE= with-perl PERL_USES= perl5 TEXTFE_MESON_TRUE= with-text SYSINFO_MESON_TRUE= with-sysinfo SHEBANG_FILES= meson_post_install.py \ plugins/perl/generate_header.py \ src/common/make-te.py post-patch: @${REINPLACE_CMD} -e 's|%%CA_BUNDLE%%|${CA_BUNDLE}|' \ ${WRKSRC}/src/common/server.c @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%PERL_VER%%|${PERL_VER}|g' \ ${WRKSRC}/plugins/perl/meson.build post-install: ${LN} -sf ../share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR} .include Index: head/irc/hexchat/distinfo =================================================================== --- head/irc/hexchat/distinfo (revision 520625) +++ head/irc/hexchat/distinfo (revision 520626) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535716329 -SHA256 (hexchat-hexchat-v2.14.2_GH0.tar.gz) = 4f2c2137020913513ea559f788c41039ca6230764d8158862d5d1ee8785592d9 -SIZE (hexchat-hexchat-v2.14.2_GH0.tar.gz) = 2759172 +TIMESTAMP = 1577021248 +SHA256 (hexchat-hexchat-v2.14.3_GH0.tar.gz) = 3e32b120a0fde6a3949cc9d2b87b00534e11c150b3249830736e7f86b050343a +SIZE (hexchat-hexchat-v2.14.3_GH0.tar.gz) = 2759502 Index: head/irc/hexchat/files/patch-meson.build =================================================================== --- head/irc/hexchat/files/patch-meson.build (revision 520625) +++ head/irc/hexchat/files/patch-meson.build (revision 520626) @@ -1,44 +1,44 @@ ---- meson.build.orig 2018-03-14 02:26:31 UTC +--- meson.build.orig 2019-12-21 06:38:06 UTC +++ meson.build @@ -16,11 +16,21 @@ cc = meson.get_compiler('c') libgio_dep = dependency('gio-2.0', version: '>= 2.34.0') libgmodule_dep = dependency('gmodule-2.0') global_deps = [] +libssl_dep_found = false if cc.get_id() == 'msvc' libssl_dep = cc.find_library('libeay32') else libssl_dep = dependency('openssl', version: '>= 0.9.8', - required: get_option('with-ssl')) + required: false) + if not libssl_dep.found() + libssl_dep = [ + cc.find_library('ssl', required: get_option('with-ssl')), + cc.find_library('crypto', required: get_option('with-ssl')) + ] + libssl_dep_found = libssl_dep[0].found() + else + libssl_dep_found = libssl_dep.found() + endif endif config_h = configuration_data() -@@ -49,7 +59,7 @@ config_h.set('GLIB_VERSION_MIN_REQUIRED' +@@ -49,7 +59,7 @@ config_h.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSIO config_h.set('HAVE_MEMRCHR', cc.has_function('memrchr')) config_h.set('HAVE_STRINGS_H', cc.has_header('strings.h')) -if libssl_dep.found() +if libssl_dep_found config_h.set('HAVE_X509_GET_SIGNATURE_NID', cc.has_function('X509_get_signature_nid', dependencies: libssl_dep) ) -@@ -131,9 +141,6 @@ global_ldflags = [] +@@ -129,9 +139,6 @@ global_ldflags = [] test_ldflags = [ '-Wl,-z,relro', '-Wl,-z,now', - # mingw - '-Wl,--dynamicbase', - '-Wl,--nxcompat', ] foreach ldflag : test_ldflags - if cc.has_argument(ldflag) and cc.links('int main (void) { return 0; }', args: ldflag) + if meson.version().version_compare('>= 0.46.0') Index: head/irc/hexchat/files/patch-plugins_sysinfo_meson.build =================================================================== --- head/irc/hexchat/files/patch-plugins_sysinfo_meson.build (revision 520625) +++ head/irc/hexchat/files/patch-plugins_sysinfo_meson.build (revision 520626) @@ -1,18 +1,18 @@ ---- plugins/sysinfo/meson.build.orig 2018-05-07 13:58:41 UTC +--- plugins/sysinfo/meson.build.orig 2019-12-22 13:48:33 UTC +++ plugins/sysinfo/meson.build @@ -13,13 +13,13 @@ sysinfo_includes = [] sysinfo_cargs = [] system = host_machine.system() --if system == 'linux' or system == 'darwin' -+if system == 'linux' or system == 'darwin' or system == 'freebsd' +-if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' ++if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' or system == 'freebsd' sysinfo_includes += 'shared' sysinfo_sources += [ 'shared/df.c' ] -- if system == 'linux' -+ if system == 'linux' or system == 'freebsd' +- if system == 'linux' or system == 'gnu' or system.startswith('gnu/') ++ if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'freebsd' libpci = dependency('libpci', required: false, method: 'pkg-config') if libpci.found() sysinfo_deps += libpci