git: 6c89b2466880 - main - net-p2p/amule: Update to 3.0.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 Jun 2026 16:31:47 UTC
The branch main has been updated by eduardo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6c89b246688052679bfe40060cf1215f714960a5
commit 6c89b246688052679bfe40060cf1215f714960a5
Author: Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2026-06-16 09:48:05 +0000
Commit: Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2026-06-25 16:31:17 +0000
net-p2p/amule: Update to 3.0.1
- Use src tarball from release assets
- Add GEOIP option default ON
- Turn OFF TRANSLATED_MANPAGES so we can use pre-rendered man translations
- Remove upstreamed patches
ChangeLog: https://github.com/amule-org/amule/releases/tag/3.0.1
---
net-p2p/amule/Makefile | 25 +++++--
net-p2p/amule/distinfo | 6 +-
.../amule/files/patch-disable-try-to-use-ccache | 31 ---------
net-p2p/amule/files/patch-disable-version-check | 12 ----
.../amule/files/patch-fix-cryptopp-modern-version | 78 ----------------------
.../files/patch-use-xdg-open-as-preview-default | 17 -----
net-p2p/amule/pkg-plist | 5 +-
7 files changed, 25 insertions(+), 149 deletions(-)
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 7f9757a0dc8f..171bb3083b54 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -1,7 +1,8 @@
PORTNAME= amule
-DISTVERSION= 3.0.0
-PORTREVISION= 1
+DISTVERSION= 3.0.1
CATEGORIES= net-p2p
+MASTER_SITES= https://github.com/amule-org/amule/releases/download/${DISTVERSION}/
+DISTNAME= aMule-${DISTVERSION}-src
MAINTAINER= eduardo@FreeBSD.org
COMMENT= All-platform P2P client based on eMule
@@ -15,18 +16,20 @@ LIB_DEPENDS= libcurl.so:ftp/curl
USES= cmake:testing gettext-runtime gnome localbase:ldflags pkgconfig \
readline
-USE_GITHUB= yes
-GH_ACCOUNT= amule-org
USE_GNOME= glib20
USE_RC_SUBR= amuled
USE_WX= 3.2
CMAKE_ON= BUILD_ALC BUILD_ALCC BUILD_AMULECMD BUILD_DAEMON BUILD_ED2K \
BUILD_WXCAS
-CMAKE_OFF= BUILD_TESTING ENABLE_IP2COUNTRY HAVE_BFD
+CMAKE_OFF= BUILD_TESTING DEFAULT_VERSION_CHECK ENABLE_BFD ENABLE_CCACHE \
+ TRANSLATED_MANPAGES
-OPTIONS_DEFINE= CAS DOCS FILEVIEW NLS UPNP WEBSERVER
-OPTIONS_DEFAULT= AMULEGUI CAS FILEVIEW MONOLITHIC WEBSERVER
+WRKSRC= ${WRKDIR}/aMule-${DISTVERSION}
+
+OPTIONS_DEFINE= CAS DOCS FILEVIEW GEOIP NLS UPNP WEBSERVER
+OPTIONS_DEFAULT= AMULEGUI CAS FILEVIEW GEOIP MONOLITHIC \
+ WEBSERVER
OPTIONS_MULTI= COMPONENTS
OPTIONS_MULTI_COMPONENTS= AMULEGUI MONOLITHIC
OPTIONS_SUB= yes
@@ -43,6 +46,9 @@ CAS_CMAKE_BOOL= BUILD_CAS
FILEVIEW_CMAKE_BOOL= BUILD_FILEVIEW
+GEOIP_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb
+GEOIP_CMAKE_BOOL= ENABLE_IP2COUNTRY
+
MONOLITHIC_USES= desktop-file-utils
MONOLITHIC_CMAKE_BOOL= BUILD_MONOLITHIC
@@ -64,4 +70,9 @@ PLIST_SUB+= AMULESKIN=""
PLIST_SUB+= AMULESKIN="@comment "
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|"aMule GIT"|"aMule ${DISTVERSION}"|g' \
+ -e 's|VERSION "GIT"|VERSION "${DISTVERSION}"|g' \
+ ${WRKSRC}/CMakeLists.txt
+
.include <bsd.port.mk>
diff --git a/net-p2p/amule/distinfo b/net-p2p/amule/distinfo
index b041a4b39d9d..6ae319c1aa26 100644
--- a/net-p2p/amule/distinfo
+++ b/net-p2p/amule/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1781202570
-SHA256 (amule-org-amule-3.0.0_GH0.tar.gz) = 850a09d1a5ec7d1b8962e4051d51b29355ac3df84a7b0b1209f2d0dd5c62eab4
-SIZE (amule-org-amule-3.0.0_GH0.tar.gz) = 5444608
+TIMESTAMP = 1782324693
+SHA256 (aMule-3.0.1-src.tar.gz) = 44484f2b003e2e9de2e86f6a9e57c948401aa24d6d398e2af73e563fd66a3413
+SIZE (aMule-3.0.1-src.tar.gz) = 6011817
diff --git a/net-p2p/amule/files/patch-disable-try-to-use-ccache b/net-p2p/amule/files/patch-disable-try-to-use-ccache
deleted file mode 100644
index 24babe8b4a46..000000000000
--- a/net-p2p/amule/files/patch-disable-try-to-use-ccache
+++ /dev/null
@@ -1,31 +0,0 @@
-+ install LICENSE into DOCSDIR instead
-
---- CMakeLists.txt.orig 2026-06-08 08:48:19 UTC
-+++ CMakeLists.txt
-@@ -35,17 +35,6 @@ endif()
- )
- 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)
-@@ -420,7 +409,7 @@ install (FILES LICENSE.md
- )
-
- install (FILES LICENSE.md
-- DESTINATION "${CMAKE_INSTALL_DATADIR}"
-+ DESTINATION "${CMAKE_INSTALL_DOCDIR}"
- )
-
- if (ENABLE_NLS)
diff --git a/net-p2p/amule/files/patch-disable-version-check b/net-p2p/amule/files/patch-disable-version-check
deleted file mode 100644
index ba90689568e9..000000000000
--- a/net-p2p/amule/files/patch-disable-version-check
+++ /dev/null
@@ -1,12 +0,0 @@
-Disable NewVersionCheck by default
---- src/Preferences.cpp.orig 2026-06-08 08:48:19 UTC
-+++ src/Preferences.cpp
-@@ -1266,7 +1266,7 @@ void CPreferences::BuildItemList( const wxString& appd
- /**
- * Version check
- **/
-- NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( "/eMule/NewVersionCheck", s_NewVersionCheck, true )));
-+ NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( "/eMule/NewVersionCheck", s_NewVersionCheck, false )));
-
- /**
- * Obfuscation
diff --git a/net-p2p/amule/files/patch-fix-cryptopp-modern-version b/net-p2p/amule/files/patch-fix-cryptopp-modern-version
deleted file mode 100644
index a14c646b75e7..000000000000
--- a/net-p2p/amule/files/patch-fix-cryptopp-modern-version
+++ /dev/null
@@ -1,78 +0,0 @@
-From ad4dacd28d0510f2bfaa4dd8a38c6b24844de85e Mon Sep 17 00:00:00 2001
-From: got3nks <got3nks@users.noreply.github.com>
-Date: Tue, 16 Jun 2026 00:56:34 +0200
-Subject: [PATCH] cmake: accept cryptopp-modern's calendar CRYPTOPP_VERSION
-
-Two CRYPTOPP_VERSION encodings exist in the wild:
-
- - Classic Crypto++ (weidai11/cryptopp/config_ver.h:53):
- MAJOR*100 + MINOR*10 + REVISION
- so 8.9.0 -> 890, max for v1.x..v9.x is 999.
-
- - cryptopp-modern (https://github.com/cryptopp-modern/cryptopp-modern,
- calendar versioning per config_ver.h:50):
- YEAR*10000 + MONTH*100 + INCREMENT
- so the 2026.6 build is 20260600. Always >= 20,240,000 for any
- release from 2024 onwards.
-
-The previous regex pass parsed 20260600 as "2.0.26.0.600" and tripped
-MIN_CRYPTOPP_VERSION ("5.6"), making cryptopp-modern unbuildable
-against aMule -- the symptom reported in issue #167.
-
-The gap between 9,999 and 20,000,000 makes a single magnitude check
-enough to disambiguate the two encodings without collision risk now
-or in any realistic future, and would also gracefully accept a
-hypothetical classic Crypto++ 10.x.y in the 1000-9999 range as
-"clearly newer than MIN_CRYPTOPP_VERSION".
-
-Refs: #167
----
- cmake/cryptopp.cmake | 35 ++++++++++++++++++++++++++++-------
- 1 file changed, 28 insertions(+), 7 deletions(-)
-
-diff --git cmake/cryptopp.cmake cmake/cryptopp.cmake
-index 722d8646be..ac5421a80b 100644
---- cmake/cryptopp.cmake
-+++ cmake/cryptopp.cmake
-@@ -158,13 +158,34 @@ if (NOT CRYPTOPP_VERSION)# AND CRYPTO_COMPLETE)
- RUN_OUTPUT_VARIABLE CRYPTOPP_VERSION
- )
-
-- string (REGEX REPLACE "([0-9])([0-9])([0-9])" "\\1.\\2.\\3" CRYPTOPP_VERSION "${CRYPTOPP_VERSION}")
--
-- if (${CRYPTOPP_VERSION} VERSION_LESS ${MIN_CRYPTOPP_VERSION})
-- message (FATAL_ERROR "crypto++ version ${CRYPTOPP_VERSION} is too old")
-+ # Two CRYPTOPP_VERSION encodings exist in the wild:
-+ #
-+ # - Classic Crypto++ (weidai11/cryptopp/config_ver.h:53):
-+ # MAJOR*100 + MINOR*10 + REVISION
-+ # so 8.9.0 → 890, max for v1.x..v9.x is 999.
-+ #
-+ # - cryptopp-modern (cryptopp-modern/cryptopp-modern, calendar
-+ # versioning per their config_ver.h:50 doc comment):
-+ # YEAR*10000 + MONTH*100 + INCREMENT
-+ # so the 2026.6 build is 20260600. Always ≥ 20,240,000 for any
-+ # release from 2024 onwards.
-+ #
-+ # The gap between 9,999 and 20,000,000 is enormous, so a single
-+ # numeric threshold disambiguates without risk of collision either
-+ # now or in any realistic future (and would also gracefully accept
-+ # a hypothetical classic Crypto++ 10.x.y in the 1000-9999 range as
-+ # "clearly newer than MIN_CRYPTOPP_VERSION").
-+ if (CRYPTOPP_VERSION GREATER_EQUAL 10000)
-+ MESSAGE (STATUS "crypto++ version ${CRYPTOPP_VERSION} (calendar / cryptopp-modern variant) -- OK")
- else()
-- MESSAGE (STATUS "crypto++ version ${CRYPTOPP_VERSION} -- OK")
-- set (CRYPTOPP_CONFIG_FILE ${CRYPTOPP_CONFIG_FILE} CACHE STRING "Path to config.h of crypto-lib" FORCE)
-- set (CRYPTOPP_VERSION ${CRYPTOPP_VERSION} CACHE STRING "Version of cryptopp" FORCE)
-+ string (REGEX REPLACE "([0-9])([0-9])([0-9])" "\\1.\\2.\\3" CRYPTOPP_VERSION "${CRYPTOPP_VERSION}")
-+
-+ if (${CRYPTOPP_VERSION} VERSION_LESS ${MIN_CRYPTOPP_VERSION})
-+ message (FATAL_ERROR "crypto++ version ${CRYPTOPP_VERSION} is too old")
-+ else()
-+ MESSAGE (STATUS "crypto++ version ${CRYPTOPP_VERSION} -- OK")
-+ endif()
- endif()
-+ set (CRYPTOPP_CONFIG_FILE ${CRYPTOPP_CONFIG_FILE} CACHE STRING "Path to config.h of crypto-lib" FORCE)
-+ set (CRYPTOPP_VERSION ${CRYPTOPP_VERSION} CACHE STRING "Version of cryptopp" FORCE)
- endif()
diff --git a/net-p2p/amule/files/patch-use-xdg-open-as-preview-default b/net-p2p/amule/files/patch-use-xdg-open-as-preview-default
deleted file mode 100644
index 33c16bae8364..000000000000
--- a/net-p2p/amule/files/patch-use-xdg-open-as-preview-default
+++ /dev/null
@@ -1,17 +0,0 @@
-commit f54a851586ff3762e0426ea9265ffb3499f93ad5
-Author: Adeodato Simó <dato@net.com.org.es>
-Date: Sun Mar 1 14:10:15 2009 +0100
-
- src/DownloadListCtrl.cpp: use xdg-open as default instead of mplayer.
-
---- src/DownloadListCtrl.cpp.orig 2026-06-08 08:48:19 UTC
-+++ src/DownloadListCtrl.cpp
-@@ -1435,7 +1435,7 @@ void CDownloadListCtrl::PreviewFile(CPartFile* file)
- _("File preview"), wxOK, this);
- // Since newer versions for some reason mplayer does not automatically
- // select video output device and needs a parameter, go figure...
-- command = "xterm -T \"aMule Preview\" -iconic -e mplayer " QUOTE "$file" QUOTE;
-+ command = "xterm -T \"aMule Preview\" -iconic -e xdg-open " QUOTE "$file" QUOTE;
- } else {
- command = thePrefs::GetVideoPlayer();
- }
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index c7fe405c1792..a7ded2bcc366 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -52,7 +52,6 @@ bin/wxcas
%%WEBSERVER%%%%DATADIR%%/webserver/default/loginlogo.jpg
%%WEBSERVER%%%%DATADIR%%/webserver/default/loginlogo.png
%%WEBSERVER%%%%DATADIR%%/webserver/default/logo.png
-%%WEBSERVER%%%%DATADIR%%/webserver/default/maquette.dwt
%%WEBSERVER%%%%DATADIR%%/webserver/default/ok.png
%%WEBSERVER%%%%DATADIR%%/webserver/default/pause.png
%%WEBSERVER%%%%DATADIR%%/webserver/default/play.png
@@ -98,9 +97,11 @@ share/applications/wxcas.desktop
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/amulesig.md
%%MONOLITHIC%%share/icons/hicolor/128x128/apps/org.amule.aMule.png
+%%MONOLITHIC%%share/icons/hicolor/256x256/apps/org.amule.aMule.png
%%NLS%%share/locale/ar/LC_MESSAGES/amule.mo
%%NLS%%share/locale/ast/LC_MESSAGES/amule.mo
%%NLS%%share/locale/bg/LC_MESSAGES/amule.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/amule.mo
%%NLS%%share/locale/ca/LC_MESSAGES/amule.mo
%%NLS%%share/locale/cs/LC_MESSAGES/amule.mo
%%NLS%%share/locale/da/LC_MESSAGES/amule.mo
@@ -121,6 +122,7 @@ share/applications/wxcas.desktop
%%NLS%%share/locale/ja/LC_MESSAGES/amule.mo
%%NLS%%share/locale/ko_KR/LC_MESSAGES/amule.mo
%%NLS%%share/locale/lt/LC_MESSAGES/amule.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/amule.mo
%%NLS%%share/locale/nl/LC_MESSAGES/amule.mo
%%NLS%%share/locale/nn/LC_MESSAGES/amule.mo
%%NLS%%share/locale/pl/LC_MESSAGES/amule.mo
@@ -131,6 +133,7 @@ share/applications/wxcas.desktop
%%NLS%%share/locale/sl/LC_MESSAGES/amule.mo
%%NLS%%share/locale/sq/LC_MESSAGES/amule.mo
%%NLS%%share/locale/sv/LC_MESSAGES/amule.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/amule.mo
%%NLS%%share/locale/tr/LC_MESSAGES/amule.mo
%%NLS%%share/locale/uk/LC_MESSAGES/amule.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/amule.mo