Enclosed diff brings libfilezilla to 0.19.1, which is needed for an update of filezilla. Changelog can be found at https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?revision=9513&view=markup.
Major of SHARED_LIBS has been bumped as symbols have been removed. Run tested in combination with filezilla (amd64). Everything seems to work OK. Regression tests depend on cppunit>=1.13.0, which we do not have. As such, these tests fail. Comments/OK? diff --git Makefile Makefile index d554c0da9e2..5454662d019 100644 --- Makefile +++ Makefile @@ -2,9 +2,9 @@ COMMENT = support library for FileZilla -DISTNAME = libfilezilla-0.15.1 +DISTNAME = libfilezilla-0.19.1 -SHARED_LIBS += filezilla 0.0 # 0.0 +SHARED_LIBS += filezilla 1.0 # 2.0.0 CATEGORIES = net @@ -13,20 +13,32 @@ HOMEPAGE = https://lib.filezilla-project.org/ # GPLv2+ PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} gmp hogweed iconv m nettle +WANTLIB += ${COMPILER_LIBCXX} ffi gmp gnutls hogweed iconv idn2 +WANTLIB += intl m nettle p11-kit tasn1 unistring MASTER_SITES = https://download.filezilla-project.org/libfilezilla/ EXTRACT_SUFX = .tar.bz2 COMPILER = base-clang ports-gcc -BUILD_DEPENDS = devel/cppunit +BUILD_DEPENDS = devel/cppunit \ + devel/gettext,-tools LIB_DEPENDS = converters/libiconv \ + security/gnutls \ security/libnettle -CONFIGURE_STYLE = gnu +USE_GMAKE = Yes + +CONFIGURE_STYLE = autoreconf CONFIGURE_ARGS = --disable-doxygen-doc CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" +AUTOCONF_VERSION = 2.69 +AUTOMAKE_VERSION = 1.15 + +# XXX tests fail as cppunit>=1.13.0 is required. +do-test: + cd ${WRKSRC}/tests && ${MAKE_PROGRAM} check + .include <bsd.port.mk> diff --git distinfo distinfo index cf24891067f..21f410bf2fd 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (libfilezilla-0.15.1.tar.bz2) = IEjEEo8783oqTs4XyL6lRV89dBT+LgYK/PKosAqH9J8= -SIZE (libfilezilla-0.15.1.tar.bz2) = 404746 +SHA256 (libfilezilla-0.19.1.tar.bz2) = CkLv7YMgpurFGxDU1ZYMEpzEQr+qk6TW3xFbi8xmWjI= +SIZE (libfilezilla-0.19.1.tar.bz2) = 539952 diff --git patches/patch-configure_ac patches/patch-configure_ac new file mode 100644 index 00000000000..40914c1e92e --- /dev/null +++ patches/patch-configure_ac @@ -0,0 +1,15 @@ +$OpenBSD$ + +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -42,9 +42,7 @@ if ! test "$localesonly" = "yes"; then + + if test "X$GCC" = Xyes; then + AX_APPEND_FLAG(-Wall, CFLAGS) +- AX_APPEND_FLAG(-g, CFLAGS) + AX_APPEND_FLAG(-Wall, CXXFLAGS) +- AX_APPEND_FLAG(-g, CXXFLAGS) + fi + + # Do this early: Compiler and linker flags to work around a nasty bug in Xcode. diff --git pkg/PLIST pkg/PLIST index 8c7ba817a58..8797c497f14 100644 --- pkg/PLIST +++ pkg/PLIST @@ -10,11 +10,13 @@ include/libfilezilla/event_loop.hpp include/libfilezilla/file.hpp include/libfilezilla/format.hpp include/libfilezilla/glue/ +include/libfilezilla/glue/unix.hpp include/libfilezilla/glue/wx.hpp include/libfilezilla/hash.hpp include/libfilezilla/iputils.hpp include/libfilezilla/libfilezilla.hpp include/libfilezilla/local_filesys.hpp +include/libfilezilla/logger.hpp include/libfilezilla/mutex.hpp include/libfilezilla/optional.hpp include/libfilezilla/private/ @@ -22,17 +24,150 @@ include/libfilezilla/private/defs.hpp include/libfilezilla/private/visibility.hpp include/libfilezilla/private/windows.hpp include/libfilezilla/process.hpp +include/libfilezilla/rate_limited_layer.hpp +include/libfilezilla/rate_limiter.hpp include/libfilezilla/recursive_remove.hpp include/libfilezilla/shared.hpp include/libfilezilla/signature.hpp +include/libfilezilla/socket.hpp include/libfilezilla/string.hpp include/libfilezilla/thread.hpp include/libfilezilla/thread_pool.hpp include/libfilezilla/time.hpp +include/libfilezilla/tls_info.hpp +include/libfilezilla/tls_layer.hpp +include/libfilezilla/tls_system_trust_store.hpp +include/libfilezilla/translate.hpp include/libfilezilla/uri.hpp include/libfilezilla/util.hpp include/libfilezilla/version.hpp -lib/libfilezilla.a +@static-lib lib/libfilezilla.a lib/libfilezilla.la @lib lib/libfilezilla.so.${LIBfilezilla_VERSION} lib/pkgconfig/libfilezilla.pc +share/locale/an/ +share/locale/an/LC_MESSAGES/ +share/locale/an/LC_MESSAGES/libfilezilla.mo +share/locale/ar/ +share/locale/ar/LC_MESSAGES/ +share/locale/ar/LC_MESSAGES/libfilezilla.mo +share/locale/az/ +share/locale/az/LC_MESSAGES/ +share/locale/az/LC_MESSAGES/libfilezilla.mo +share/locale/bg_BG/ +share/locale/bg_BG/LC_MESSAGES/ +share/locale/bg_BG/LC_MESSAGES/libfilezilla.mo +share/locale/ca/LC_MESSAGES/libfilezilla.mo +share/locale/ca_ES@valencia/ +share/locale/ca_ES@valencia/LC_MESSAGES/ +share/locale/ca_ES@valencia/LC_MESSAGES/libfilezilla.mo +share/locale/co/ +share/locale/co/LC_MESSAGES/ +share/locale/co/LC_MESSAGES/libfilezilla.mo +share/locale/cs_CZ/ +share/locale/cs_CZ/LC_MESSAGES/ +share/locale/cs_CZ/LC_MESSAGES/libfilezilla.mo +share/locale/cy/ +share/locale/cy/LC_MESSAGES/ +share/locale/cy/LC_MESSAGES/libfilezilla.mo +share/locale/da/LC_MESSAGES/libfilezilla.mo +share/locale/de/LC_MESSAGES/libfilezilla.mo +share/locale/el/LC_MESSAGES/libfilezilla.mo +share/locale/es/LC_MESSAGES/libfilezilla.mo +share/locale/et/LC_MESSAGES/libfilezilla.mo +share/locale/eu/LC_MESSAGES/libfilezilla.mo +share/locale/fa_IR/ +share/locale/fa_IR/LC_MESSAGES/ +share/locale/fa_IR/LC_MESSAGES/libfilezilla.mo +share/locale/fi_FI/ +share/locale/fi_FI/LC_MESSAGES/ +share/locale/fi_FI/LC_MESSAGES/libfilezilla.mo +share/locale/fr/LC_MESSAGES/libfilezilla.mo +share/locale/gl_ES/ +share/locale/gl_ES/LC_MESSAGES/ +share/locale/gl_ES/LC_MESSAGES/libfilezilla.mo +share/locale/he_IL/ +share/locale/he_IL/LC_MESSAGES/ +share/locale/he_IL/LC_MESSAGES/libfilezilla.mo +share/locale/hr/LC_MESSAGES/libfilezilla.mo +share/locale/hu_HU/ +share/locale/hu_HU/LC_MESSAGES/ +share/locale/hu_HU/LC_MESSAGES/libfilezilla.mo +share/locale/hy/ +share/locale/hy/LC_MESSAGES/ +share/locale/hy/LC_MESSAGES/libfilezilla.mo +share/locale/id_ID/ +share/locale/id_ID/LC_MESSAGES/ +share/locale/id_ID/LC_MESSAGES/libfilezilla.mo +share/locale/is/ +share/locale/is/LC_MESSAGES/ +share/locale/is/LC_MESSAGES/libfilezilla.mo +share/locale/it/LC_MESSAGES/libfilezilla.mo +share/locale/ja_JP/ +share/locale/ja_JP/LC_MESSAGES/ +share/locale/ja_JP/LC_MESSAGES/libfilezilla.mo +share/locale/kab/ +share/locale/kab/LC_MESSAGES/ +share/locale/kab/LC_MESSAGES/libfilezilla.mo +share/locale/ko_KR/ +share/locale/ko_KR/LC_MESSAGES/ +share/locale/ko_KR/LC_MESSAGES/libfilezilla.mo +share/locale/ky/ +share/locale/ky/LC_MESSAGES/ +share/locale/ky/LC_MESSAGES/libfilezilla.mo +share/locale/lo_LA/ +share/locale/lo_LA/LC_MESSAGES/ +share/locale/lo_LA/LC_MESSAGES/libfilezilla.mo +share/locale/lt_LT/ +share/locale/lt_LT/LC_MESSAGES/ +share/locale/lt_LT/LC_MESSAGES/libfilezilla.mo +share/locale/lv_LV/ +share/locale/lv_LV/LC_MESSAGES/ +share/locale/lv_LV/LC_MESSAGES/libfilezilla.mo +share/locale/mk_MK/ +share/locale/mk_MK/LC_MESSAGES/ +share/locale/mk_MK/LC_MESSAGES/libfilezilla.mo +share/locale/nb_NO/ +share/locale/nb_NO/LC_MESSAGES/ +share/locale/nb_NO/LC_MESSAGES/libfilezilla.mo +share/locale/ne/ +share/locale/ne/LC_MESSAGES/ +share/locale/ne/LC_MESSAGES/libfilezilla.mo +share/locale/nl/LC_MESSAGES/libfilezilla.mo +share/locale/nn_NO/ +share/locale/nn_NO/LC_MESSAGES/ +share/locale/nn_NO/LC_MESSAGES/libfilezilla.mo +share/locale/oc/ +share/locale/oc/LC_MESSAGES/ +share/locale/oc/LC_MESSAGES/libfilezilla.mo +share/locale/pl_PL/ +share/locale/pl_PL/LC_MESSAGES/ +share/locale/pl_PL/LC_MESSAGES/libfilezilla.mo +share/locale/pt_BR/LC_MESSAGES/libfilezilla.mo +share/locale/pt_PT/ +share/locale/pt_PT/LC_MESSAGES/ +share/locale/pt_PT/LC_MESSAGES/libfilezilla.mo +share/locale/ro_RO/ +share/locale/ro_RO/LC_MESSAGES/ +share/locale/ro_RO/LC_MESSAGES/libfilezilla.mo +share/locale/ru/LC_MESSAGES/libfilezilla.mo +share/locale/sk_SK/ +share/locale/sk_SK/LC_MESSAGES/ +share/locale/sk_SK/LC_MESSAGES/libfilezilla.mo +share/locale/sl_SI/ +share/locale/sl_SI/LC_MESSAGES/ +share/locale/sl_SI/LC_MESSAGES/libfilezilla.mo +share/locale/sr/LC_MESSAGES/libfilezilla.mo +share/locale/sv/LC_MESSAGES/libfilezilla.mo +share/locale/th_TH/ +share/locale/th_TH/LC_MESSAGES/ +share/locale/th_TH/LC_MESSAGES/libfilezilla.mo +share/locale/tr/LC_MESSAGES/libfilezilla.mo +share/locale/uk_UA/ +share/locale/uk_UA/LC_MESSAGES/ +share/locale/uk_UA/LC_MESSAGES/libfilezilla.mo +share/locale/vi_VN/ +share/locale/vi_VN/LC_MESSAGES/ +share/locale/vi_VN/LC_MESSAGES/libfilezilla.mo +share/locale/zh_CN/LC_MESSAGES/libfilezilla.mo +share/locale/zh_TW/LC_MESSAGES/libfilezilla.mo
