filezilla: use upstream version of build fix

4 files changed, 40 insertions, 30 deletions

diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile
index 4825676ef9c..2b4029ae037 100644
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2021/07/29 11:10:31 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2021/07/29 14:00:57 wiz Exp $
 
 VERSION=	3.55.0
 DISTNAME=	FileZilla_${VERSION}_src
@@ -18,6 +18,11 @@ USE_LANGUAGES=	c c++17
 USE_TOOLS+=	gmake pkg-config msgfmt msgmerge xgettext
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
+# remove on next update, when patch-src_commonui_Makefile.am is included
+USE_TOOLS+=	aclocal automake
+pre-configure:
+	cd ${WRKSRC} && aclocal && automake
+
 CONFIGURE_ARGS+=	--disable-autoupdatecheck
 # avoid xdg-utils dependency
 CONFIGURE_ENV+=		ac_cv_path_xdgopen=firefox
diff --git a/net/filezilla/distinfo b/net/filezilla/distinfo
index f14df0018cc..c27ee719c63 100644
--- a/net/filezilla/distinfo
+++ b/net/filezilla/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.61 2021/07/29 11:10:31 wiz Exp $
+$NetBSD: distinfo,v 1.62 2021/07/29 14:00:57 wiz Exp $
 
 SHA1 (FileZilla_3.55.0_src.tar.bz2) = 887c04c430ed798b5d3048a29bf7fd4fdc37b30d
 RMD160 (FileZilla_3.55.0_src.tar.bz2) = cd23b5e29692f3cfe034ece9c11408a6c19c63fc
 SHA512 (FileZilla_3.55.0_src.tar.bz2) = 8a1221e97719610be900d66f7feba90d1c5053a618b38084e93e8f2b11e51fc523336e11e110f51828eba3f17f60cea1fcd8060bd0cc5e7fdb3d24f35a4c1732
 Size (FileZilla_3.55.0_src.tar.bz2) = 4910040 bytes
-SHA1 (patch-src_commonui_Makefile.in) = d4e5133a621055dc9edc53a74b1a0a66c0ae3d4a
+SHA1 (patch-src_commonui_Makefile.am) = e70f467d2b5940a0a649db605cf198674bb4a1ab
diff --git a/net/filezilla/patches/patch-src_commonui_Makefile.am b/net/filezilla/patches/patch-src_commonui_Makefile.am
new file mode 100644
index 00000000000..d5d2eab3658
--- /dev/null
+++ b/net/filezilla/patches/patch-src_commonui_Makefile.am
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_commonui_Makefile.am,v 1.1 2021/07/29 14:00:57 wiz Exp $
+
+libtool: link: unable to infer tagged configuration
+libtool: error: specify a tag with '--tag'
+
+https://trac.filezilla-project.org/ticket/12499
+
+--- src/commonui/Makefile.am.orig	2021-05-27 11:11:47.000000000 +0000
++++ src/commonui/Makefile.am
+@@ -60,9 +60,20 @@ endif
+ 
+ if MACAPPBUNDLE
+ 
+-libfzclient_commonui_private_la_SOURCES += \
++noinst_LTLIBRARIES = libfzclient-commonui-private-mac.la
++
++libfzclient_commonui_private_mac_la_CPPFLAGS = -I$(top_builddir)/config
++libfzclient_commonui_private_mac_la_CPPFLAGS += $(LIBFILEZILLA_CFLAGS)
++libfzclient_commonui_private_mac_la_CPPFLAGS += -DBUILDING_FZ_COMMONUI
++
++libfzclient_commonui_private_mac_la_CXXFLAGS = -fvisibility=hidden
++
++libfzclient_commonui_private_mac_la_SOURCES = \
+ 	fz_paths_osx.mm
+ 
+-libfzclient_commonui_private_la_LDFLAGS += -framework Cocoa
++libfzclient_commonui_private_mac_la_LDFLAGS = -framework Cocoa
++
++libfzclient_commonui_private_la_LIBADD = libfzclient-commonui-private-mac.la
++libfzclient_commonui_private_la_DEPENDENCIES += libfzclient-commonui-private-mac.la
+ 
+ endif
diff --git a/net/filezilla/patches/patch-src_commonui_Makefile.in b/net/filezilla/patches/patch-src_commonui_Makefile.in
deleted file mode 100644
index 6cdce5f0626..00000000000
--- a/net/filezilla/patches/patch-src_commonui_Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_commonui_Makefile.in,v 1.1 2021/07/29 11:10:31 wiz Exp $
-
-libtool: link: unable to infer tagged configuration
-libtool: error: specify a tag with '--tag'
-
-https://trac.filezilla-project.org/ticket/12499
-
---- src/commonui/Makefile.in.orig	2021-07-09 13:41:24.000000000 +0000
-+++ src/commonui/Makefile.in
-@@ -192,7 +192,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
- libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
--	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=CXX --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
- AM_V_P = $(am__v_P_@AM_V@)
-@@ -260,7 +260,7 @@ am__v_OBJCXX_0 = @echo "  OBJCXX  " $@;
- am__v_OBJCXX_1 = 
- OBJCXXLD = $(OBJCXX)
- OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
-+	--tag=CXX --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
- am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)