CVS commit: pkgsrc/net/amule

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/amule
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 24 Jun 2026 13:37:09 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jun 24 13:37:09 UTC 2026

Modified Files:
        pkgsrc/net/amule: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/net/amule/patches: patch-src_CMakeLists.txt
Removed Files:
        pkgsrc/net/amule/patches: patch-aa patch-src_libs_common_MuleDebug.cpp

Log Message:
amule: updated to 3.0.0

3.0.0

Highlights

Throughput rewrite. Disk I/O moved off the main thread, ASIO/EPOLLET races fixed, throttlers replaced with proper token-bucket limiters. Peer-to-peer download on the same hardware sees ~100–380× 
speedups across macOS / Linux / Windows over 2.3.3, plus aMule 3.0.0 sustains ~4.8× the upload throughput of eMule 0.70b on Windows. See Performance for the full matrix and per-PR breakdown.
Both throttlers (MaxUpload, MaxDownload) were also broken pre-fix — MaxUpload=0 capped at "current rate + 5 KB/s", MaxDownload was a ratio controller rather than a literal cap. Both rewritten. 
Important user-facing bug fixes, but secondary to the headline numbers.
Big-library / big-shareset scaling. Follow-up wave targeting nodes with 100 k+ shared files: per-file EC payload caches, skip-unchanged EC updates, local-peer ZLIB bypass, and a string of O(N²) → O(N 
log N) / O(1) algorithmic fixes across SharedFileList, SharedFilesCtrl, KnownFileList, wxListCtrl, ExternalConn, and amuleweb — the WebUI / amulegui stay responsive even on libraries where the 
previous GUI took minutes to redraw.
CMake replaces autotools. Single build system, modern toolchain — minimum CMake 3.10, minimum wxWidgets 3.2.0.
Native binaries for every major desktop. AppImage (x86_64 + aarch64), Flatpak (x86_64 + aarch64), macOS Universal2 .dmg (now bundling aMuleGUI.app alongside aMule.app), Windows portable .zip and NSIS 
installer (x64 + ARM64). First-run desktop integration prompt for AppImage; cross-platform autostart-on-login toggle.
Auto-rescan of shared folders. wxFileSystemWatcher-driven, with recursive vs explicit-share intent split and coverage of Incoming + per-category Incoming dirs.
HTTPS works again. CHTTPDownloadThread rewritten on top of wxWebRequest; the hand-rolled stack had silently stopped working against modern TLS.
Kad parallel searches with alpha-frontier widening.
MaxMindDB replaces deprecated GeoIP for IP→country.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/net/amule/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/amule/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/amule/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/amule/options.mk
cvs rdiff -u -r1.11 -r0 pkgsrc/net/amule/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/net/amule/patches/patch-src_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/amule/patches/patch-src_libs_common_MuleDebug.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/amule/Makefile
diff -u pkgsrc/net/amule/Makefile:1.115 pkgsrc/net/amule/Makefile:1.116
--- pkgsrc/net/amule/Makefile:1.115     Thu Jun 11 07:17:30 2026
+++ pkgsrc/net/amule/Makefile   Wed Jun 24 13:37:09 2026
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.115 2026/06/11 07:17:30 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2026/06/24 13:37:09 adam Exp $
 
-DISTNAME=      aMule-2.3.3
-PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   21
+DISTNAME=      amule-3.0.0
 CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=amule/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=amule-project/}
 
 MAINTAINER=    tripledes%eslack.org@localhost
-HOMEPAGE=      http://www.amule.org/
+HOMEPAGE=      https://www.amule.org/
 COMMENT=       Another Emule P2P client
 LICENSE=       gnu-gpl-v2
 
@@ -16,31 +13,25 @@ CONFLICTS=          xmule-[0-9]*
 
 USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake intltool msgfmt pkg-config perl:run
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --with-wx-config=${BUILDLINK_PREFIX.wxGTK30}/bin/wx-config
-CONFIGURE_ARGS+=       --with-crypto-prefix=${BUILDLINK_PREFIX.cryptopp}
-CONFIGURE_ARGS+=       --with-language=all
-CONFIGURE_ARGS+=       --enable-xas
-TEST_TARGET=           check
-
-CXXFLAGS+=             -Wno-undef
+USE_TOOLS+=            gmake intltool msgfmt perl:run pkg-config
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF # needs some options
+CMAKE_CONFIGURE_ARGS+= -DENABLE_NLS=ON
 
 .include "options.mk"
 
-REPLACE_PERL=          src/libs/ec/file_generator.pl           \
-                       src/utils/scripts/kadnodescreate.pl     \
-                       src/utils/scripts/stats.pl              \
-                       src/utils/scripts/mldonkey_importer.pl  \
-                       src/utils/xas/xas.pl
-
-LIBS+=                 -lm     # for pow(3)
-
-UNLIMIT_RESOURCES+=    datasize
+REPLACE_PERL+= src/libs/ec/file_generator.pl
+REPLACE_PERL+= src/utils/scripts/kadnodescreate.pl
+REPLACE_PERL+= src/utils/scripts/stats.pl
+REPLACE_PERL+= src/utils/scripts/mldonkey_importer.pl
+REPLACE_PERL+= src/utils/xas/xas.pl
 
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../net/libupnp/buildlink3.mk"
 .include "../../security/crypto++/buildlink3.mk"
-.include "../../x11/wxGTK30/buildlink3.mk"
+.include "../../x11/wxGTK32/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/amule/PLIST
diff -u pkgsrc/net/amule/PLIST:1.16 pkgsrc/net/amule/PLIST:1.17
--- pkgsrc/net/amule/PLIST:1.16 Sat Jun  5 13:05:56 2021
+++ pkgsrc/net/amule/PLIST      Wed Jun 24 13:37:09 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2021/06/05 13:05:56 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2026/06/24 13:37:09 adam Exp $
 ${PLIST.alc}bin/alc
 ${PLIST.alcc}bin/alcc
 ${PLIST.amule}bin/amule
@@ -6,11 +6,8 @@ ${PLIST.cmd}bin/amulecmd
 ${PLIST.daemon}bin/amuled
 ${PLIST.gui}bin/amulegui
 ${PLIST.web}bin/amuleweb
-bin/autostart-xas
-${PLIST.cas}bin/cas
 ${PLIST.ed2k}bin/ed2k
 ${PLIST.wxcas}bin/wxcas
-lib/xchat/plugins/xas.pl
 ${PLIST.alc}man/de/man1/alc.1
 ${PLIST.alcc}man/de/man1/alcc.1
 ${PLIST.amule}man/de/man1/amule.1
@@ -18,10 +15,8 @@ ${PLIST.cmd}man/de/man1/amulecmd.1
 ${PLIST.daemon}man/de/man1/amuled.1
 ${PLIST.gui}man/de/man1/amulegui.1
 ${PLIST.web}man/de/man1/amuleweb.1
-${PLIST.cas}man/de/man1/cas.1
 ${PLIST.ed2k}man/de/man1/ed2k.1
 ${PLIST.wxcas}man/de/man1/wxcas.1
-man/de/man1/xas.1
 ${PLIST.alc}man/es/man1/alc.1
 ${PLIST.alcc}man/es/man1/alcc.1
 ${PLIST.amule}man/es/man1/amule.1
@@ -29,10 +24,8 @@ ${PLIST.cmd}man/es/man1/amulecmd.1
 ${PLIST.daemon}man/es/man1/amuled.1
 ${PLIST.gui}man/es/man1/amulegui.1
 ${PLIST.web}man/es/man1/amuleweb.1
-${PLIST.cas}man/es/man1/cas.1
 ${PLIST.ed2k}man/es/man1/ed2k.1
 ${PLIST.wxcas}man/es/man1/wxcas.1
-man/es/man1/xas.1
 ${PLIST.alc}man/fr/man1/alc.1
 ${PLIST.alcc}man/fr/man1/alcc.1
 ${PLIST.amule}man/fr/man1/amule.1
@@ -40,10 +33,8 @@ ${PLIST.cmd}man/fr/man1/amulecmd.1
 ${PLIST.daemon}man/fr/man1/amuled.1
 ${PLIST.gui}man/fr/man1/amulegui.1
 ${PLIST.web}man/fr/man1/amuleweb.1
-${PLIST.cas}man/fr/man1/cas.1
 ${PLIST.ed2k}man/fr/man1/ed2k.1
 ${PLIST.wxcas}man/fr/man1/wxcas.1
-man/fr/man1/xas.1
 ${PLIST.alc}man/hu/man1/alc.1
 ${PLIST.alcc}man/hu/man1/alcc.1
 ${PLIST.amule}man/hu/man1/amule.1
@@ -51,10 +42,8 @@ ${PLIST.cmd}man/hu/man1/amulecmd.1
 ${PLIST.daemon}man/hu/man1/amuled.1
 ${PLIST.gui}man/hu/man1/amulegui.1
 ${PLIST.web}man/hu/man1/amuleweb.1
-${PLIST.cas}man/hu/man1/cas.1
 ${PLIST.ed2k}man/hu/man1/ed2k.1
 ${PLIST.wxcas}man/hu/man1/wxcas.1
-man/hu/man1/xas.1
 ${PLIST.alc}man/it/man1/alc.1
 ${PLIST.alcc}man/it/man1/alcc.1
 ${PLIST.amule}man/it/man1/amule.1
@@ -62,10 +51,8 @@ ${PLIST.cmd}man/it/man1/amulecmd.1
 ${PLIST.daemon}man/it/man1/amuled.1
 ${PLIST.gui}man/it/man1/amulegui.1
 ${PLIST.web}man/it/man1/amuleweb.1
-${PLIST.cas}man/it/man1/cas.1
 ${PLIST.ed2k}man/it/man1/ed2k.1
 ${PLIST.wxcas}man/it/man1/wxcas.1
-man/it/man1/xas.1
 ${PLIST.alc}man/man1/alc.1
 ${PLIST.alcc}man/man1/alcc.1
 ${PLIST.amule}man/man1/amule.1
@@ -73,10 +60,17 @@ ${PLIST.cmd}man/man1/amulecmd.1
 ${PLIST.daemon}man/man1/amuled.1
 ${PLIST.gui}man/man1/amulegui.1
 ${PLIST.web}man/man1/amuleweb.1
-${PLIST.cas}man/man1/cas.1
 ${PLIST.ed2k}man/man1/ed2k.1
 ${PLIST.wxcas}man/man1/wxcas.1
-man/man1/xas.1
+${PLIST.alc}man/pt_BR/man1/alc.1
+${PLIST.alcc}man/pt_BR/man1/alcc.1
+${PLIST.amule}man/pt_BR/man1/amule.1
+${PLIST.cmd}man/pt_BR/man1/amulecmd.1
+${PLIST.daemon}man/pt_BR/man1/amuled.1
+${PLIST.gui}man/pt_BR/man1/amulegui.1
+${PLIST.web}man/pt_BR/man1/amuleweb.1
+${PLIST.ed2k}man/pt_BR/man1/ed2k.1
+${PLIST.wxcas}man/pt_BR/man1/wxcas.1
 ${PLIST.alc}man/ro/man1/alc.1
 ${PLIST.alcc}man/ro/man1/alcc.1
 ${PLIST.amule}man/ro/man1/amule.1
@@ -84,10 +78,8 @@ ${PLIST.cmd}man/ro/man1/amulecmd.1
 ${PLIST.daemon}man/ro/man1/amuled.1
 ${PLIST.gui}man/ro/man1/amulegui.1
 ${PLIST.web}man/ro/man1/amuleweb.1
-${PLIST.cas}man/ro/man1/cas.1
 ${PLIST.ed2k}man/ro/man1/ed2k.1
 ${PLIST.wxcas}man/ro/man1/wxcas.1
-man/ro/man1/xas.1
 ${PLIST.alc}man/ru/man1/alc.1
 ${PLIST.alcc}man/ru/man1/alcc.1
 ${PLIST.amule}man/ru/man1/amule.1
@@ -95,10 +87,8 @@ ${PLIST.cmd}man/ru/man1/amulecmd.1
 ${PLIST.daemon}man/ru/man1/amuled.1
 ${PLIST.gui}man/ru/man1/amulegui.1
 ${PLIST.web}man/ru/man1/amuleweb.1
-${PLIST.cas}man/ru/man1/cas.1
 ${PLIST.ed2k}man/ru/man1/ed2k.1
 ${PLIST.wxcas}man/ru/man1/wxcas.1
-man/ru/man1/xas.1
 ${PLIST.alc}man/tr/man1/alc.1
 ${PLIST.alcc}man/tr/man1/alcc.1
 ${PLIST.amule}man/tr/man1/amule.1
@@ -106,10 +96,8 @@ ${PLIST.cmd}man/tr/man1/amulecmd.1
 ${PLIST.daemon}man/tr/man1/amuled.1
 ${PLIST.gui}man/tr/man1/amulegui.1
 ${PLIST.web}man/tr/man1/amuleweb.1
-${PLIST.cas}man/tr/man1/cas.1
 ${PLIST.ed2k}man/tr/man1/ed2k.1
 ${PLIST.wxcas}man/tr/man1/wxcas.1
-man/tr/man1/xas.1
 ${PLIST.alc}man/zh_TW/man1/alc.1
 ${PLIST.alcc}man/zh_TW/man1/alcc.1
 ${PLIST.amule}man/zh_TW/man1/amule.1
@@ -117,10 +105,9 @@ ${PLIST.cmd}man/zh_TW/man1/amulecmd.1
 ${PLIST.daemon}man/zh_TW/man1/amuled.1
 ${PLIST.gui}man/zh_TW/man1/amulegui.1
 ${PLIST.web}man/zh_TW/man1/amuleweb.1
-${PLIST.cas}man/zh_TW/man1/cas.1
 ${PLIST.ed2k}man/zh_TW/man1/ed2k.1
 ${PLIST.wxcas}man/zh_TW/man1/wxcas.1
-man/zh_TW/man1/xas.1
+share/LICENSE.md
 ${PLIST.skins}share/amule/skins/Mac_Gray.zip
 ${PLIST.skins}share/amule/skins/gnome.zip
 ${PLIST.skins}share/amule/skins/kde4.zip
@@ -197,57 +184,54 @@ ${PLIST.web}share/amule/webserver/defaul
 ${PLIST.web}share/amule/webserver/default/up.png
 ${PLIST.web}share/amule/webserver/default/yellow.gif
 ${PLIST.alc}share/applications/alc.desktop
-${PLIST.amule}share/applications/amule.desktop
-${PLIST.gui}share/applications/amulegui.desktop
+${PLIST.amule}share/applications/org.amule.aMule.desktop
+${PLIST.gui}share/applications/org.amule.aMule.gui.desktop
 ${PLIST.wxcas}share/applications/wxcas.desktop
-${PLIST.cas}share/cas/stat.png
-${PLIST.cas}share/cas/tmp.html
-share/doc/amule/ABOUT-NLS
-share/doc/amule/Changelog
-share/doc/amule/EC_Protocol.txt
-share/doc/amule/INSTALL
-share/doc/amule/README
-share/doc/amule/TODO
-share/doc/amule/amulesig.txt
-share/doc/amule/license.txt
-share/locale/ar/LC_MESSAGES/amule.mo
-share/locale/ast/LC_MESSAGES/amule.mo
-share/locale/bg/LC_MESSAGES/amule.mo
-share/locale/ca/LC_MESSAGES/amule.mo
-share/locale/cs/LC_MESSAGES/amule.mo
-share/locale/da/LC_MESSAGES/amule.mo
-share/locale/de/LC_MESSAGES/amule.mo
-share/locale/el/LC_MESSAGES/amule.mo
-share/locale/en_GB/LC_MESSAGES/amule.mo
-share/locale/es/LC_MESSAGES/amule.mo
-share/locale/et_EE/LC_MESSAGES/amule.mo
-share/locale/eu/LC_MESSAGES/amule.mo
-share/locale/fi/LC_MESSAGES/amule.mo
-share/locale/fr/LC_MESSAGES/amule.mo
-share/locale/gl/LC_MESSAGES/amule.mo
-share/locale/he/LC_MESSAGES/amule.mo
-share/locale/hr/LC_MESSAGES/amule.mo
-share/locale/hu/LC_MESSAGES/amule.mo
-share/locale/it/LC_MESSAGES/amule.mo
-share/locale/it_CH/LC_MESSAGES/amule.mo
-share/locale/ja/LC_MESSAGES/amule.mo
-share/locale/ko_KR/LC_MESSAGES/amule.mo
-share/locale/lt/LC_MESSAGES/amule.mo
-share/locale/nl/LC_MESSAGES/amule.mo
-share/locale/nn/LC_MESSAGES/amule.mo
-share/locale/pl/LC_MESSAGES/amule.mo
-share/locale/pt_BR/LC_MESSAGES/amule.mo
-share/locale/pt_PT/LC_MESSAGES/amule.mo
-share/locale/ro/LC_MESSAGES/amule.mo
-share/locale/ru/LC_MESSAGES/amule.mo
-share/locale/sl/LC_MESSAGES/amule.mo
-share/locale/sq/LC_MESSAGES/amule.mo
-share/locale/sv/LC_MESSAGES/amule.mo
-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/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
+${PLIST.amule}share/icons/hicolor/128x128/apps/org.amule.aMule.png
+${PLIST.amule}share/locale/ar/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/ast/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/bg/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/ca/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/cs/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/da/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/de/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/el/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/en_GB/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/es/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/et_EE/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/eu/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/fi/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/fr/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/gl/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/he/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/hr/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/hu/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/it/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/it_CH/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/ja/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/ko_KR/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/lt/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/nl/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/nn/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/pl/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/pt_BR/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/pt_PT/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/ro/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/ru/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/sl/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/sq/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/sv/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/tr/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/uk/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/zh_CN/LC_MESSAGES/amule.mo
+${PLIST.amule}share/locale/zh_TW/LC_MESSAGES/amule.mo
+share/metainfo/org.amule.aMule.metainfo.xml
 ${PLIST.alc}share/pixmaps/alc.xpm
-${PLIST.amule}share/pixmaps/amule.xpm
-${PLIST.gui}share/pixmaps/amulegui.xpm
+${PLIST.amule}share/pixmaps/org.amule.aMule.png
 ${PLIST.wxcas}share/pixmaps/wxcas.xpm

Index: pkgsrc/net/amule/distinfo
diff -u pkgsrc/net/amule/distinfo:1.26 pkgsrc/net/amule/distinfo:1.27
--- pkgsrc/net/amule/distinfo:1.26      Sat Jan  3 10:55:34 2026
+++ pkgsrc/net/amule/distinfo   Wed Jun 24 13:37:09 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2026/01/03 10:55:34 wiz Exp $
+$NetBSD: distinfo,v 1.27 2026/06/24 13:37:09 adam Exp $
 
-BLAKE2s (aMule-2.3.3.tar.bz2) = 4a7cc5c69741b485396e85c89b570c54397b625a5cec3d11f54a3edaa6d10c4d
-SHA512 (aMule-2.3.3.tar.bz2) = eb42646dc835fb49f81def5c3ecceca2adceacb6dc9e4a7fec08e9ab8d7bd20d2fa623a33b476a984c7a809e624f61cad3b9b40f68a3363dd936be25cda72211
-Size (aMule-2.3.3.tar.bz2) = 4606514 bytes
-SHA1 (patch-aa) = af77036649caac372890c45840d24a404ab1a7d6
+BLAKE2s (amule-3.0.0.tar.gz) = 7b674fd9bb1cad92babf65c0621a165a4fb5e89dc6f781c21c576e37bf48562c
+SHA512 (amule-3.0.0.tar.gz) = 3f027c9a169e0e6fae2f6159d420e348e756e5dd5e1484197f9d66b6ebada6e0f9ed75c38ca7be61eb347bd02d6fbcd4fcb4e9781b98066ac633821bbde53790
+Size (amule-3.0.0.tar.gz) = 5444608 bytes
+SHA1 (patch-po_CMakeLists.txt) = be9a086d44cea420cc34b288a5761a37cdf42e86
+SHA1 (patch-src_CMakeLists.txt) = 8b1b40899aa41cd19881087e501a48f61c00c09f
 SHA1 (patch-src_OScopeCtrl.cpp) = d9ee907eeb49c3f54972b4d1cabdd64c6d4b88d5
-SHA1 (patch-src_libs_common_MuleDebug.cpp) = 8054aa9445bd439b30417e840f1fea2b9f228c77

Index: pkgsrc/net/amule/options.mk
diff -u pkgsrc/net/amule/options.mk:1.2 pkgsrc/net/amule/options.mk:1.3
--- pkgsrc/net/amule/options.mk:1.2     Thu Nov 19 20:01:40 2020
+++ pkgsrc/net/amule/options.mk Wed Jun 24 13:37:09 2026
@@ -1,66 +1,65 @@
-# $NetBSD: options.mk,v 1.2 2020/11/19 20:01:40 nia Exp $
+# $NetBSD: options.mk,v 1.3 2026/06/24 13:37:09 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.amule
-PKG_SUPPORTED_OPTIONS= amule-monolithic
+PKG_SUPPORTED_OPTIONS= amule-cas amule-monolithic
 PKG_SUPPORTED_OPTIONS+=        amule-gui amule-daemon amule-cmd amule-webserver
-PKG_SUPPORTED_OPTIONS+=        amule-cas amule-wxcas amule-ed2k amule-alc amule-alcc
-PKG_SUPPORTED_OPTIONS+=        debug geoip upnp
-PKG_SUGGESTED_OPTIONS= amule-monolithic amule-ed2k upnp
+PKG_SUPPORTED_OPTIONS+=        amule-wxcas amule-ed2k amule-alc amule-alcc geoip
+PKG_SUGGESTED_OPTIONS= amule-monolithic amule-ed2k
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   skins alc alcc amule ed2k daemon gui cmd web cas wxcas
+PLIST_VARS+=   alc alcc amule cas cmd ed2k daemon gui skins web wxcas
 
 ###
 ### monolithic aMule app
 ###
 .if !empty(PKG_OPTIONS:Mamule-monolithic)
-CONFIGURE_ARGS+=       --enable-monolithic
+CMAKE_CONFIGURE_ARGS+= -DBUILD_MONOLITHIC=ON
 PLIST.amule=           yes
 PLIST.skins=           yes
 .else
-CONFIGURE_ARGS+=       --disable-monolithic
+CMAKE_CONFIGURE_ARGS+= -DBUILD_MONOLITHIC=OFF
 .endif
 
 ###
 ### aMule daemon version
 ###
 .if !empty(PKG_OPTIONS:Mamule-daemon)
-CONFIGURE_ARGS+=       --enable-amule-daemon
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DAEMON=ON
 PLIST.daemon=          yes
 .else
-CONFIGURE_ARGS+=       --disable-amule-daemon
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DAEMON=OFF
 .endif
 
 ###
 ### aMule remote GUI
 ###
 .if !empty(PKG_OPTIONS:Mamule-gui)
-CONFIGURE_ARGS+=       --enable-amule-gui
+CMAKE_CONFIGURE_ARGS+= -DBUILD_REMOTEGUI=ON
 PLIST.gui=             yes
 PLIST.skins=           yes
 .else
-CONFIGURE_ARGS+=       --disable-amule-gui
+CMAKE_CONFIGURE_ARGS+= -DBUILD_REMOTEGUI=OFF
 .endif
 
 ###
 ### aMule command line client
 ###
 .if !empty(PKG_OPTIONS:Mamule-cmd)
-CONFIGURE_ARGS+=       --enable-amulecmd
+CMAKE_CONFIGURE_ARGS+= -DBUILD_AMULECMD=ON
 PLIST.cmd=             yes
 .else
-CONFIGURE_ARGS+=       --disable-amulecmd
+CMAKE_CONFIGURE_ARGS+= -DBUILD_AMULECMD=OFF
 .endif
 
 ###
 ### aMule WebServer
 ###
 .if !empty(PKG_OPTIONS:Mamule-webserver)
-CONFIGURE_ARGS+=       --enable-webserver
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WEBSERVER=ON
 PLIST.web=             yes
 .else
-CONFIGURE_ARGS+=       --disable-webserver
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WEBSERVER=OFF
 .endif
 
 ###
@@ -68,82 +67,60 @@ CONFIGURE_ARGS+=    --disable-webserver
 ###
 .if !empty(PKG_OPTIONS:Mamule-cas)
 .include "../../graphics/gd/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-cas
-CONFIGURE_ARGS+=       --with-gdlib-config=${BUILDLINK_PREFIX.gd}/bin/gdlib-config
+CMAKE_CONFIGURE_ARGS+= -DBUILD_CAS=ON
 PLIST.cas=             yes
 .else
-CONFIGURE_ARGS+=       --disable-cas
+CMAKE_CONFIGURE_ARGS+= -DBUILD_CAS=OFF
 .endif
 
 ###
 ### aMule GUI Statistics
 ###
 .if !empty(PKG_OPTIONS:Mamule-wxcas)
-CONFIGURE_ARGS+=       --enable-wxcas
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WXCAS=ON
 PLIST.wxcas=           yes
 .else
-CONFIGURE_ARGS+=       --disable-wxcas
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WXCAS=OFF
 .endif
 
 ###
 ### aMule ed2k links handler
 ###
 .if !empty(PKG_OPTIONS:Mamule-ed2k)
-CONFIGURE_ARGS+=       --enable-ed2k
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ED2K=ON
 PLIST.ed2k=            yes
 .else
-CONFIGURE_ARGS+=       --disable-ed2k
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ED2K=OFF
 .endif
 
 ###
 ### aMule LinkCreator GUI version
 ###
 .if !empty(PKG_OPTIONS:Mamule-alc)
-CONFIGURE_ARGS+=       --enable-alc
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ALC=ON
 PLIST.alc=             yes
 .else
-CONFIGURE_ARGS+=       --disable-alc
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ALC=OFF
 .endif
 
 ###
 ### aMule LinkCreator for console
 ###
 .if !empty(PKG_OPTIONS:Mamule-alcc)
-CONFIGURE_ARGS+=       --enable-alcc
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ALCC=ON
 PLIST.alcc=            yes
 .else
-CONFIGURE_ARGS+=       --disable-alcc
-.endif
-
-###
-### Additional debugging output
-###
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=       --enable-debug
-.else
-CONFIGURE_ARGS+=       --disable-debug
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ALCC=OFF
 .endif
 
 ###
 ### GeoIP IP2Country support
 ###
 .if !empty(PKG_OPTIONS:Mgeoip)
-.include "../../net/GeoIP/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-geoip
-.else
-CONFIGURE_ARGS+=       --disable-geoip
-.endif
-
-###
-### UPnP support
-###
-.if !empty(PKG_OPTIONS:Mupnp)
-BUILDLINK_API_DEPENDS.libupnp+=        libupnp>=1.6.6
-.include "../../net/libupnp/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-upnp
-CONFIGURE_ARGS+=       --with-libupnp-prefix=${BUILDLINK_PREFIX.libupnp}
+.include "../../geography/libmaxminddb/buildlink3.mk"
+CMAKE_CONFIGURE_ARGS+= -DENABLE_IP2COUNTRY=ON
 .else
-CONFIGURE_ARGS+=       --disable-upnp
+CMAKE_CONFIGURE_ARGS+= -DENABLE_IP2COUNTRY=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mamule-alc) || \

Added files:

Index: pkgsrc/net/amule/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/net/amule/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null   Wed Jun 24 13:37:09 2026
+++ pkgsrc/net/amule/patches/patch-src_CMakeLists.txt   Wed Jun 24 13:37:09 2026
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2026/06/24 13:37:09 adam Exp $
+
+On Darwin, don't build app bundle.
+
+--- src/CMakeLists.txt.orig    2026-06-08 08:48:19.000000000 +0000
++++ src/CMakeLists.txt
+@@ -285,7 +285,7 @@ if (BUILD_MONOLITHIC)
+               )
+       endif()
+ 
+-      if (APPLE)
++      if (FALSE)
+               set_target_properties (amule PROPERTIES
+                       MACOSX_BUNDLE TRUE
+                       MACOSX_BUNDLE_BUNDLE_NAME "aMule"
+@@ -355,7 +355,6 @@ if (BUILD_MONOLITHIC)
+ 
+       install (TARGETS amule
+               RUNTIME DESTINATION bin
+-              BUNDLE DESTINATION .
+       )
+ 
+       # Legacy /usr/share/pixmaps/ fallback for desktops that don't
+@@ -425,7 +424,7 @@ if (BUILD_REMOTEGUI)
+               )
+       endif()
+ 
+-      if (APPLE)
++      if (FALSE)
+               # amulegui is a GUI wxApp (remote-control UI) — bundle it as a
+               # .app so macOS gives it an icon in the Dock, a menu bar and
+               # normal application lifecycle events, matching the monolithic
+@@ -492,7 +491,6 @@ if (BUILD_REMOTEGUI)
+ 
+       install (TARGETS amulegui
+               RUNTIME DESTINATION bin
+-              BUNDLE DESTINATION .
+       )
+ endif()
+

Prev by Date: CVS commit: pkgsrc/graphics/geeqie
Next by Date: CVS commit: pkgsrc/graphics/zxing-cpp
Previous by Thread: CVS commit: pkgsrc/graphics/geeqie
Next by Thread: CVS commit: pkgsrc/graphics/zxing-cpp
Indexes:

Home | Main Index | Thread Index | Old Index