update to amule-3.0.0

net/amule/Makefile

@@ -2,111 +2,75 @@ COMMENT-main =	another eDonkey P2P file sharing client
 COMMENT-web =	webserver interface to amuled
 COMMENT-daemon =stand-alone daemon/cmdline for amule
 
-V =		2.3.3
-DISTNAME =	aMule-$V
-REVISION-main =	0
-REVISION-web =	0
-REVISION-daemon =	0
+V =		3.0.0
+GH_ACCOUNT =	amule-org
+GH_PROJECT =	amule
+GH_TAGNAME =	$V
 
 CATEGORIES =	net
 
-HOMEPAGE =	http://www.amule.org/
-PORTROACH =	site:https://github.com/amule-project/amule/releases/
+HOMEPAGE =	https://amule-org.github.io/
 
 MULTI_PACKAGES =-main -web -daemon
 
 PKGNAME-main =	amule-$V
-PKGNAME-daemon =amuled-$V
 PKGNAME-web =	amuleweb-$V
+PKGNAME-daemon = amuled-$V
 
-# GPLv2
-PERMIT_PACKAGE =	Yes
+# GPLv2+
+PERMIT_PACKAGE = Yes
 
-SITES =		${SITE_SOURCEFORGE:=amule/}
-EXTRACT_SUFX =	.tar.xz
+WANTLIB =	${COMPILER_LIBCXX} \
+		c m pthread z \
+		cryptopp intl ixml upnp \
+		wx_baseu-3.2 wx_baseu_net-3.2 wx_gtk3u_core-3.2
 
-LIB_DEPENDS =
-WANTLIB =
-RUN_DEPENDS =
+WANTLIB-main =	${WANTLIB} cryptopp curl gd glib-2.0
+WANTLIB-web =	${WANTLIB} png readline
+WANTLIB-daemon = ${WANTLIB} cryptopp curl glib-2.0 readline
 
-COMPILER =		base-clang ports-gcc base-gcc
+COMPILER =	base-clang ports-gcc
 
-# bison needed if .y files are patched
-BUILD_DEPENDS =		devel/bison \
-			devel/gettext,-tools
+MODULES =	devel/cmake \
+		lang/python
+MODPY_RUNDEP =	No
 
-commonLIB_DEPENDS =	x11/wxWidgets>=3.0.4
+BUILD_DEPENDS =	devel/bison \
+		devel/gettext,-tools
 
-LIB_DEPENDS-main =	${LIB_DEPENDS} ${commonLIB_DEPENDS} \
-			devel/cryptopp>=5.6.0 \
-			graphics/gd
+LIB_DEPENDS =	devel/cryptopp \
+		net/libupnp \
+		x11/wxWidgets
 
-LIB_DEPENDS-daemon =	${LIB_DEPENDS} ${commonLIB_DEPENDS} \
-			devel/cryptopp>=5.6.0
+LIB_DEPENDS-main = ${LIB_DEPENDS} \
+		devel/cryptopp \
+		graphics/gd \
 
-LIB_DEPENDS-web =	${LIB_DEPENDS} ${commonLIB_DEPENDS} \
-			converters/libiconv \
-			devel/gettext,-runtime
+LIB_DEPENDS-web = ${LIB_DEPENDS} \
+		devel/gettext,-runtime
 
-RUN_DEPENDS-main =	${RUN_DEPENDS} \
-			devel/desktop-file-utils
+RUN_DEPENDS-main = devel/desktop-file-utils \
+		x11/gtk+4,-guic
 
-commonWANTLIB =		c execinfo m pthread ${COMPILER_LIBCXX} \
-			wx_baseu-3.2 wx_baseu_net-3.2 z
-WANTLIB-main =		${WANTLIB} ${commonWANTLIB} \
-			cryptopp gd readline wx_gtk3u_core-3.2
+CONFIGURE_ARGS = \
+	-D ENABLE_IP2COUNTRY=off \
+	-D BUILD_MONOLITHIC=on \
+	-D BUILD_ED2K=on \
+	-D BUILD_DAEMON=on \
+	-D BUILD_REMOTEGUI=on \
+	-D BUILD_AMULECMD=on \
+	-D BUILD_WEBSERVER=on \
+	-D BUILD_ALC=on \
+	-D BUILD_ALCC=on \
+	-D BUILD_CAS=on \
+	-D BUILD_WXCAS=on \
+	-D CRYPTOPP_INCLUDE_PREFIX=${LOCALBASE}/include/cryptopp \
 
-WANTLIB-daemon =	${WANTLIB} ${commonWANTLIB} \
-			cryptopp readline
-
-WANTLIB-web =		${WANTLIB} ${commonWANTLIB} \
-			iconv intl png readline
-
-USE_GMAKE =		Yes
-
-CONFIGURE_STYLE =	autoconf
-AUTOCONF_VERSION =	2.69
-
-CONFIGURE_ARGS =	--disable-optimize \
-			--disable-profile \
-			--disable-plasmamule \
-			--disable-upnp \
-			--disable-xas \
-			--enable-alc \
-			--enable-alcc \
-			--enable-amule-daemon \
-			--enable-amule-gui \
-			--enable-amulecmd \
-			--enable-cas \
-			--enable-webserver \
-			--enable-wxcas \
-			--with-denoise-level=0 \
-			--with-libiconv-prefix=${LOCALBASE} \
-			--with-libpng-config=${LOCALBASE}/bin/libpng-config
-
-.ifndef DEBUG
-CONFIGURE_ARGS +=	--disable-debug
-.else
-CONFIGURE_ARGS +=	--enable-debug
-.endif
-
-CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LDFLAGS="-lexecinfo -L${X11BASE}/lib" \
-			LOCALDIR="${LOCALBASE}" \
-			X11R6DIR="${X11BASE}" \
-			ac_cv_header_bfd_h=false
-
-MAKE_FLAGS +=		CXXFLAGS="${CXXFLAGS} -Wno-deprecated \
-				  -Wno-shadow -Wno-sign-compare \
-				  -Wno-unused"
+CXXFLAGS +=	-I${LOCALBASE}/include
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/src/utils/cas/configfile.c
-	rm ${WRKSRC}/docs/man/a*.*.1 \
-		${WRKSRC}/docs/man/e*.*.1 \
-		${WRKSRC}/src/utils/*/docs/a*.*.1 \
-		${WRKSRC}/src/utils/*/docs/c*.*.1 \
-		${WRKSRC}/src/utils/*/docs/w*.*.1
+	cd ${WRKSRC}; rm docs/man/[ae]*.*.1.in \
+		src/utils/*/docs/[acw]*.*.1.in
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIST}/src/utils/scripts/mldonkey_importer.pl \

net/amule/distinfo

@@ -1,2 +1,2 @@
-SHA256 (aMule-2.3.3.tar.xz) = pkcwlkIzHz4DP98BlucjLNxn9Gc50SoClL4GiF9wyL0=
-SIZE (aMule-2.3.3.tar.xz) = 3699376
+SHA256 (amule-3.0.0.tar.gz) = hQoJ0aXsfRuJYuQFHVGyk1WsPfhKewsSCfLQ3Vxi6rQ=
+SIZE (amule-3.0.0.tar.gz) = 5444608

net/amule/patches/patch-CMakeLists_txt

@@ -0,0 +1,21 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -35,17 +35,6 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_T
+ 	)
+ endif()
+ 
+-# Try to use ccache
+-find_program(CCACHE_PROGRAM ccache)
+-if(CCACHE_PROGRAM)
+-    message(STATUS "ccache found: ${CCACHE_PROGRAM}")
+-    set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+-    set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+-    # Add other languages if needed, e.g., CMAKE_CUDA_COMPILER_LAUNCHER
+-else()
+-    message(STATUS "ccache not found.")
+-endif()
+-
+ include (cmake/CmDaB.cmake)
+ include (cmake/manpage_install.cmake)
+ include (cmake/options.cmake)

net/amule/patches/patch-acinclude_m4

@@ -1,21 +0,0 @@
-Index: acinclude.m4
---- acinclude.m4.orig
-+++ acinclude.m4
-@@ -287,7 +287,7 @@ AC_DEFUN([MULE_CHECK_SYSTEM],
- 		;;
- 	openbsd*)
- 		SYS=openbsd
--		LIBS="$LIBS -L/usr/local/lib"
-+		LIBS="$LIBS -L${LOCALDIR}/lib"
- 		MULECPPFLAGS="-D__OPENBSD__"
- 		;;
- 	*cygwin* | *mingw32*)
-@@ -358,7 +358,7 @@ AC_DEFUN([MULE_COMPILATION_FLAGS],
- 		AS_IF([test ${GCC:-no} = yes],		[MULE_ADDCCXXFLAG([-W -Wall -Wshadow -Wundef -ggdb -fno-inline -fmessage-length=0])])
- 		AS_IF([test ${SYS:-unknown} = win32],	[MULE_ADDFLAG([RC], [-D__DEBUG__])])
- 	], [
--		AS_IF([test ${GCC:-no} = yes], [MULE_ADDCCXXFLAG([-W -Wall -Wshadow -Wundef])])
-+		AS_IF([test ${GCC:-no} = yes], [MULE_ADDCCXXFLAG([-W -Wall -Wshadow])])
- 	])
- 
- 	MULE_IF_ENABLED([profile],

net/amule/patches/patch-docs_man_Makefile_in

@@ -1,52 +0,0 @@
-Index: docs/man/Makefile.in
---- docs/man/Makefile.in.orig
-+++ docs/man/Makefile.in
-@@ -597,39 +597,20 @@ dist-hook:
- install-data-hook:
- 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
- 	for file in $(SELECTED_MANPAGES); do \
--		lang=`echo $$file |  sed -e 's/^[^.]*\.//'`; \
--		if test $$lang = 1; then \
--			echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/man1" ; \
--			$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; \
--			if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
--			else name=$$file; fi; \
--			inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
--			echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst" ; \
--			$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst ; \
--		else \
--			locale=`echo $$lang | sed -e 's/\..*//'` ; \
--			echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/$$locale/man1" ; \
--			$(mkinstalldirs) $(DESTDIR)$(mandir)/$$locale/man1 ; \
--			if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
--			else name=$$file; fi; \
--			inst=`echo $$file | sed -e "s/\.$${locale}\.1//" -e '$(transform)'`.1 ; \
--			echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/$$locale/man1/$$inst" ; \
--			$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
--		fi; \
-+		echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/man1" ; \
-+		$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; \
-+		if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
-+		else name=$$file; fi; \
-+		inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
-+		echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst" ; \
-+		$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst ; \
- 	done
- 
- uninstall-hook:
- 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
- 	for file in $(SELECTED_MANPAGES); do \
--		lang=`echo $$file |  sed -e 's/^[^.]*\.//'`; \
--		if test $$lang = 1; then \
--			inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
--			rm -f $(DESTDIR)$(mandir)/man1/$$inst ; \
--		else \
--			locale=`echo $$lang | sed -e 's/\..*//'` ; \
--			inst=`echo $$file | sed -e "s/\.$${locale}\.1//" -e '$(transform)'`.1 ; \
--			rm -f $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
--		fi; \
-+		inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
-+		rm -f $(DESTDIR)$(mandir)/man1/$$inst ; \
- 	done
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.

net/amule/patches/patch-m4_gettext_m4

@@ -1,21 +0,0 @@
-Index: m4/gettext.m4
---- m4/gettext.m4.orig
-+++ m4/gettext.m4
-@@ -265,7 +265,7 @@ return (long) gettext ("")]ifelse([$2], [need-ngettext
-     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-       if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-         AC_MSG_CHECKING([how to link with libintl])
--        AC_MSG_RESULT([$LIBINTL])
-+        AC_MSG_RESULT([$LTLIBINTL])
-         AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-       fi
- 
-@@ -315,7 +315,7 @@ return (long) gettext ("")]ifelse([$2], [need-ngettext
-   ])
- 
-   dnl For backward compatibility. Some Makefiles may be using this.
--  INTLLIBS="$LIBINTL"
-+  INTLLIBS="$LTLIBINTL"
-   AC_SUBST(INTLLIBS)
- 
-   dnl Make all documented variables known to autoconf.

net/amule/patches/patch-m4_iconv_m4

@@ -1,11 +0,0 @@
---- m4/iconv.m4.orig	Tue Aug 18 09:46:11 2015
-+++ m4/iconv.m4	Tue Aug 18 09:48:27 2015
-@@ -62,7 +62,7 @@ AC_DEFUN([AM_ICONV_LINK],
-   fi
-   if test "$am_cv_lib_iconv" = yes; then
-     AC_MSG_CHECKING([how to link with libiconv])
--    AC_MSG_RESULT([$LIBICONV])
-+    AC_MSG_RESULT([$LTLIBICONV])
-   else
-     dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-     dnl either.

net/amule/patches/patch-src_Preferences_cpp

@@ -1,13 +1,14 @@
 Disable checking for new versions at startup.
 
---- src/Preferences.cpp.orig	Fri Sep 16 09:55:06 2016
-+++ src/Preferences.cpp	Sun Sep 18 15:31:21 2016
-@@ -1211,7 +1211,7 @@ void CPreferences::BuildItemList( const wxString& appd
+Index: src/Preferences.cpp
+--- src/Preferences.cpp.orig
++++ src/Preferences.cpp
+@@ -1266,7 +1266,7 @@ void CPreferences::BuildItemList( const wxString& appd
  	/**
  	 * Version check
  	 **/
--	 NewCfgItem(IDC_NEWVERSION,	(new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, true )));
-+	 NewCfgItem(IDC_NEWVERSION,	(new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, false )));
+-	 NewCfgItem(IDC_NEWVERSION,	(new Cfg_Bool( "/eMule/NewVersionCheck", s_NewVersionCheck, true )));
++	 NewCfgItem(IDC_NEWVERSION,	(new Cfg_Bool( "/eMule/NewVersionCheck", s_NewVersionCheck, false )));
  
  	 /**
  	  * Obfuscation

net/amule/patches/patch-src_amule_cpp

@@ -1,21 +0,0 @@
-Disable checking for new versions at startup.
-
-Index: src/amule.cpp
---- src/amule.cpp.orig
-+++ src/amule.cpp
-@@ -524,6 +524,7 @@ bool CamuleApp::OnInit()
- 		AddLogLineNS(msg);
- 	}
- 
-+#ifndef __OPENBSD__
- 	// Test if there's any new version
- 	if (thePrefs::GetCheckNewVersion()) {
- 		// We use the thread base because I don't want a dialog to pop up.
-@@ -533,6 +534,7 @@ bool CamuleApp::OnInit()
- 		version_check->Create();
- 		version_check->Run();
- 	}
-+#endif
- 
- 	// Create main dialog, or fork to background (daemon).
- 	InitGui(m_geometryEnabled, m_geometryString);

net/amule/patches/patch-src_libs_ec_cpp_ECSocket_cpp

@@ -1,7 +1,7 @@
 Index: src/libs/ec/cpp/ECSocket.cpp
 --- src/libs/ec/cpp/ECSocket.cpp.orig
 +++ src/libs/ec/cpp/ECSocket.cpp
-@@ -523,8 +523,8 @@ static void ShowZError(int zerror, z_streamp strm)
+@@ -555,8 +555,8 @@ static void ShowZError(int zerror, z_streamp strm)
  	}
  	printf("ZLib operation returned %s\n", p);
  	printf("ZLib error message: %s\n", strm->msg);
@@ -9,6 +9,6 @@ Index: src/libs/ec/cpp/ECSocket.cpp
 -		strm->next_in, strm->avail_in, strm->total_in, strm->next_out, strm->avail_out, strm->total_out);
 +	printf("zstream state:\n\tnext_in=%p\n\tavail_in=%u\n\ttotal_in=%jd\n\tnext_out=%p\n\tavail_out=%u\n\ttotal_out=%jd\n",
 +		strm->next_in, strm->avail_in, (intmax_t)strm->total_in, strm->next_out, strm->avail_out, (intmax_t)strm->total_out);
- 	AddDebugLogLineN(logEC, wxT("ZLib error"));
+ 	AddDebugLogLineN(logEC, "ZLib error");
  }
  

net/amule/patches/patch-src_utils_aLinkCreator_docs_Makefile_in

@@ -1,52 +0,0 @@
-Index: src/utils/aLinkCreator/docs/Makefile.in
---- src/utils/aLinkCreator/docs/Makefile.in.orig
-+++ src/utils/aLinkCreator/docs/Makefile.in
-@@ -567,39 +567,20 @@ uninstall-am:
- install-data-hook:
- 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
- 	for file in $(SELECTED_MANPAGES); do \
--		lang=`echo $$file |  sed -e 's/^[^.]*\.//'`; \
--		if test $$lang = 1; then \
--			echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/man1" ; \
--			$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; \
--			if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
--			else name=$$file; fi; \
--			inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
--			echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst" ; \
--			$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst ; \
--		else \
--			locale=`echo $$lang | sed -e 's/\..*//'` ; \
--			echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/$$locale/man1" ; \
--			$(mkinstalldirs) $(DESTDIR)$(mandir)/$$locale/man1 ; \
--			if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
--			else name=$$file; fi; \
--			inst=`echo $$file | sed -e "s/\.$${locale}\.1//" -e '$(transform)'`.1 ; \
--			echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/$$locale/man1/$$inst" ; \
--			$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
--		fi; \
-+		echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/man1" ; \
-+		$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; \
-+		if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
-+		else name=$$file; fi; \
-+		inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
-+		echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst" ; \
-+		$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst ; \
- 	done
- 
- uninstall-hook:
- 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
- 	for file in $(SELECTED_MANPAGES); do \
--		lang=`echo $$file |  sed -e 's/^[^.]*\.//'`; \
--		if test $$lang = 1; then \
--			inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
--			rm -f $(DESTDIR)$(mandir)/man1/$$inst ; \
--		else \
--			locale=`echo $$lang | sed -e 's/\..*//'` ; \
--			inst=`echo $$file | sed -e "s/\.$${locale}\.1//" -e '$(transform)'`.1 ; \
--			rm -f $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
--		fi; \
-+		inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
-+		rm -f $(DESTDIR)$(mandir)/man1/$$inst ; \
- 	done
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.

net/amule/patches/patch-src_utils_cas_configfile_c

@@ -7,10 +7,10 @@ Sane defaults.
  		"# source_image - image where the text will be written\n",
  		"# *_line - x,y,[1/0] enabled or disabled\n\n",
 -		"font /usr/share/fonts/corefonts/times.ttf\n",
-+		"font ${X11BASE}/lib/X11/fonts/TTF/DejaVuSerif.ttf\n",
++		"font /usr/X11R6/lib/X11/fonts/TTF/DejaVuSerif.ttf\n",
  		"font_size 10.5\n",
 -		"source_image /usr/share/cas/stat.png\n",
-+		"source_image ${TRUEPREFIX}/share/cas/stat.png\n",
++		"source_image /usr/local/share/cas/stat.png\n",
  		"first_line 23,17,1\n",
  		"second_line 23,34,1\n",
  		"third_line 23,51,1\n",
@@ -19,7 +19,7 @@ Sane defaults.
  		"sixth_line 23,102,1\n",
  		"seventh_line 23,119,1\n",
 -		"template /usr/share/cas/tmp.html\n"
-+		"template ${TRUEPREFIX}/share/cas/tmp.html\n",
++		"template /usr/local/share/cas/tmp.html\n",
  		"img_type 0\n"
  	};
  

net/amule/patches/patch-src_utils_cas_docs_Makefile_in

@@ -1,52 +0,0 @@
-Index: src/utils/cas/docs/Makefile.in
---- src/utils/cas/docs/Makefile.in.orig
-+++ src/utils/cas/docs/Makefile.in
-@@ -556,39 +556,20 @@ uninstall-am:
- install-data-hook:
- 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
- 	for file in $(SELECTED_MANPAGES); do \
--		lang=`echo $$file |  sed -e 's/^[^.]*\.//'`; \
--		if test $$lang = 1; then \
--			echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/man1" ; \
--			$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; \
--			if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
--			else name=$$file; fi; \
--			inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
--			echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst" ; \
--			$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst ; \
--		else \
--			locale=`echo $$lang | sed -e 's/\..*//'` ; \
--			echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/$$locale/man1" ; \
--			$(mkinstalldirs) $(DESTDIR)$(mandir)/$$locale/man1 ; \
--			if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
--			else name=$$file; fi; \
--			inst=`echo $$file | sed -e "s/\.$${locale}\.1//" -e '$(transform)'`.1 ; \
--			echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/$$locale/man1/$$inst" ; \
--			$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
--		fi; \
-+		echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/man1" ; \
-+		$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; \
-+		if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
-+		else name=$$file; fi; \
-+		inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
-+		echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst" ; \
-+		$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst ; \
- 	done
- 
- uninstall-hook:
- 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
- 	for file in $(SELECTED_MANPAGES); do \
--		lang=`echo $$file |  sed -e 's/^[^.]*\.//'`; \
--		if test $$lang = 1; then \
--			inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
--			rm -f $(DESTDIR)$(mandir)/man1/$$inst ; \
--		else \
--			locale=`echo $$lang | sed -e 's/\..*//'` ; \
--			inst=`echo $$file | sed -e "s/\.$${locale}\.1//" -e '$(transform)'`.1 ; \
--			rm -f $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
--		fi; \
-+		inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
-+		rm -f $(DESTDIR)$(mandir)/man1/$$inst ; \
- 	done
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.

net/amule/patches/patch-src_utils_wxCas_docs_Makefile_in

@@ -1,52 +0,0 @@
-Index: src/utils/wxCas/docs/Makefile.in
---- src/utils/wxCas/docs/Makefile.in.orig
-+++ src/utils/wxCas/docs/Makefile.in
-@@ -556,39 +556,20 @@ uninstall-am:
- install-data-hook:
- 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
- 	for file in $(SELECTED_MANPAGES); do \
--		lang=`echo $$file |  sed -e 's/^[^.]*\.//'`; \
--		if test $$lang = 1; then \
--			echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/man1" ; \
--			$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; \
--			if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
--			else name=$$file; fi; \
--			inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
--			echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst" ; \
--			$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst ; \
--		else \
--			locale=`echo $$lang | sed -e 's/\..*//'` ; \
--			echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/$$locale/man1" ; \
--			$(mkinstalldirs) $(DESTDIR)$(mandir)/$$locale/man1 ; \
--			if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
--			else name=$$file; fi; \
--			inst=`echo $$file | sed -e "s/\.$${locale}\.1//" -e '$(transform)'`.1 ; \
--			echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/$$locale/man1/$$inst" ; \
--			$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
--		fi; \
-+		echo " $(mkinstalldirs) $(DESTDIR)$(mandir)/man1" ; \
-+		$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ; \
-+		if test -f $(srcdir)/$$file; then name=$(srcdir)/$$file; \
-+		else name=$$file; fi; \
-+		inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
-+		echo " $(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst" ; \
-+		$(INSTALL_DATA) $$name $(DESTDIR)$(mandir)/man1/$$inst ; \
- 	done
- 
- uninstall-hook:
- 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
- 	for file in $(SELECTED_MANPAGES); do \
--		lang=`echo $$file |  sed -e 's/^[^.]*\.//'`; \
--		if test $$lang = 1; then \
--			inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
--			rm -f $(DESTDIR)$(mandir)/man1/$$inst ; \
--		else \
--			locale=`echo $$lang | sed -e 's/\..*//'` ; \
--			inst=`echo $$file | sed -e "s/\.$${locale}\.1//" -e '$(transform)'`.1 ; \
--			rm -f $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
--		fi; \
-+		inst=`echo $$file | sed -e "s/\.1//" -e '$(transform)'`.1 ; \
-+		rm -f $(DESTDIR)$(mandir)/man1/$$inst ; \
- 	done
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.

net/amule/patches/patch-src_webserver_src_Makefile_in

@@ -1,12 +0,0 @@
-Index: src/webserver/src/Makefile.in
---- src/webserver/src/Makefile.in.orig
-+++ src/webserver/src/Makefile.in
-@@ -461,7 +461,7 @@ amuleweb_CFLAGS = $(MULECFLAGS) $(WX_CFLAGS_ONLY) $(LI
- amuleweb_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY) $(LIBPNG_CFLAGS) $(LIBUPNP_CFLAGS)
- amuleweb_LDFLAGS = $(MULELDFLAGS) -L../../libs/common -L../../libs/ec/cpp -L../.. $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(LIBUPNP_LDFLAGS)
- amuleweb_LDADD = -lec -lmulecommon -lmulesocket $(WXBASE_LIBS) $(BFD_LIBS) $(ZLIB_LIBS) \
--	$(READLINE_LIBS) $(LIBPNG_LIBS) $(RESOLV_LIB) $(LIBINTL) $(LIBUPNP_LIBS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
-+	$(READLINE_LIBS) $(LIBPNG_LIBS) $(RESOLV_LIB) $(LTLIBINTL) $(LIBUPNP_LIBS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
- 
- noinst_HEADERS = \
- 		 WebInterface.h \

net/amule/pkg/PLIST-main

@@ -14,6 +14,7 @@ bin/mldonkey_importer
 @man man/man1/cas.1
 @man man/man1/ed2k.1
 @man man/man1/wxcas.1
+@comment share/LICENSE.md
 share/amule/
 share/amule/skins/
 share/amule/skins/Mac_Gray.zip
@@ -24,21 +25,20 @@ share/amule/skins/priscilla.zip
 share/amule/skins/tango.zip
 share/amule/skins/xfce.zip
 share/applications/alc.desktop
-share/applications/amule.desktop
-share/applications/amulegui.desktop
+share/applications/org.amule.aMule.desktop
+share/applications/org.amule.aMule.gui.desktop
 share/applications/wxcas.desktop
 share/cas/
 share/cas/stat.png
 share/cas/tmp.html
 share/doc/amule/
-@comment share/doc/amule/ABOUT-NLS
-@comment share/doc/amule/Changelog
-share/doc/amule/EC_Protocol.txt
-@comment share/doc/amule/INSTALL
-share/doc/amule/README
-@comment share/doc/amule/TODO
-share/doc/amule/amulesig.txt
-share/doc/amule/license.txt
+share/doc/amule/CHANGELOG.md
+share/doc/amule/EC_Protocol.md
+share/doc/amule/INSTALL.md
+share/doc/amule/IP2Country.md
+share/doc/amule/README.md
+share/doc/amule/amulesig.md
+share/icons/hicolor/128x128/apps/org.amule.aMule.png
 share/locale/ar/LC_MESSAGES/amule.mo
 share/locale/ast/LC_MESSAGES/amule.mo
 share/locale/bg/LC_MESSAGES/amule.mo
@@ -64,8 +64,6 @@ share/locale/it_CH/
 share/locale/it_CH/LC_MESSAGES/
 share/locale/it_CH/LC_MESSAGES/amule.mo
 share/locale/ja/LC_MESSAGES/amule.mo
-share/locale/ko_KR/
-share/locale/ko_KR/LC_MESSAGES/
 share/locale/ko_KR/LC_MESSAGES/amule.mo
 share/locale/lt/LC_MESSAGES/amule.mo
 share/locale/nl/LC_MESSAGES/amule.mo
@@ -84,9 +82,11 @@ share/locale/tr/LC_MESSAGES/amule.mo
 share/locale/uk/LC_MESSAGES/amule.mo
 share/locale/zh_CN/LC_MESSAGES/amule.mo
 share/locale/zh_TW/LC_MESSAGES/amule.mo
+share/metainfo/
+share/metainfo/org.amule.aMule.metainfo.xml
 share/pixmaps/
 share/pixmaps/alc.xpm
-share/pixmaps/amule.xpm
-share/pixmaps/amulegui.xpm
+share/pixmaps/org.amule.aMule.png
 share/pixmaps/wxcas.xpm
 @tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor