Sat Jun 5 13:05:56 2021 UTC ()
amule: updated to 2.3.3

2.3.3 - The "delayed too many times, but still not too late" version

Yes, it's been delayed too many times, but finally it's out! With all the new features and bug fixes from the past four years! Let me highlight some for you:

CMake support. CMake provides us platform-independent configuration files and generates native makefiles and workspaces for the compiler of your choice. It's highly experimental in its current state, but it aims to take the place of good old autoconf/automake one day.
Command completion with the TAB key in amulecmd.
Supports compilation with the latest C++ standard (C++17).
Scope graphs now (should) work on Mac.
Notification when a download completes.


(adam)
diff -r1.93 -r1.94 pkgsrc/net/amule/Makefile
diff -r1.15 -r1.16 pkgsrc/net/amule/PLIST
diff -r1.22 -r1.23 pkgsrc/net/amule/distinfo
diff -r1.1 -r0 pkgsrc/net/amule/patches/patch-src_ClientCreditsList.cpp
diff -r1.1 -r0 pkgsrc/net/amule/patches/patch-src_UPnPBase.cpp
diff -r1.1 -r0 pkgsrc/net/amule/patches/patch-src_UPnPBase.h
cvs diff -r1.93 -r1.94 pkgsrc/net/amule/Makefile (expand / switch to unified diff)

--- pkgsrc/net/amule/Makefile 2021/05/24 19:53:14 1.93
+++ pkgsrc/net/amule/Makefile 2021/06/05 13:05:56 1.94
@@ -1,47 +1,45 @@ @@ -1,47 +1,45 @@
1# $NetBSD: Makefile,v 1.93 2021/05/24 19:53:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.94 2021/06/05 13:05:56 adam Exp $
2 2
3DISTNAME= aMule-2.3.2 3DISTNAME= aMule-2.3.3
4PKGNAME= ${DISTNAME:tl} 4PKGNAME= ${DISTNAME:tl}
5PKGREVISION= 1 
6CATEGORIES= net 5CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amule/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amule/}
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= tripledes@eslack.org 9MAINTAINER= tripledes@eslack.org
11HOMEPAGE= http://www.amule.org/ 10HOMEPAGE= http://www.amule.org/
12COMMENT= Another Emule P2P client 11COMMENT= Another Emule P2P client
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15CONFLICTS= xmule-[0-9]* 14CONFLICTS= xmule-[0-9]*
16 15
17USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
18USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
19USE_TOOLS+= gmake intltool msgfmt pkg-config perl:run 18USE_TOOLS+= gmake intltool msgfmt pkg-config perl:run
20GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
21CONFIGURE_ARGS+= --with-wx-config=${BUILDLINK_PREFIX.wxGTK28}/bin/wx-config 20CONFIGURE_ARGS+= --with-wx-config=${BUILDLINK_PREFIX.wxGTK30}/bin/wx-config
22CONFIGURE_ARGS+= --with-crypto-prefix=${BUILDLINK_PREFIX.cryptopp} 21CONFIGURE_ARGS+= --with-crypto-prefix=${BUILDLINK_PREFIX.cryptopp}
23CONFIGURE_ARGS+= --with-language=all 22CONFIGURE_ARGS+= --with-language=all
24CONFIGURE_ARGS+= --enable-xas 23CONFIGURE_ARGS+= --enable-xas
 24TEST_TARGET= check
25 25
26CXXFLAGS+= -Wno-undef 26CXXFLAGS+= -Wno-undef
27 27
28.include "options.mk" 28.include "options.mk"
29 29
30REPLACE_PERL= src/libs/ec/file_generator.pl \ 30REPLACE_PERL= src/libs/ec/file_generator.pl \
31 src/utils/scripts/kadnodescreate.pl \ 31 src/utils/scripts/kadnodescreate.pl \
32 src/utils/scripts/stats.pl \ 32 src/utils/scripts/stats.pl \
33 src/utils/scripts/mldonkey_importer.pl \ 33 src/utils/scripts/mldonkey_importer.pl \
34 src/utils/xas/xas.pl 34 src/utils/xas/xas.pl
35 35
36LIBS+= -lm # for pow(3) 36LIBS+= -lm # for pow(3)
37 37
38UNLIMIT_RESOURCES+= datasize 38UNLIMIT_RESOURCES+= datasize
39 39
40TEST_TARGET= check 
41 
42.include "../../devel/gettext-lib/buildlink3.mk" 40.include "../../devel/gettext-lib/buildlink3.mk"
43.include "../../devel/zlib/buildlink3.mk" 41.include "../../devel/zlib/buildlink3.mk"
44.include "../../security/crypto++/buildlink3.mk" 42.include "../../security/crypto++/buildlink3.mk"
45.include "../../x11/wxGTK28/buildlink3.mk" 43.include "../../x11/wxGTK30/buildlink3.mk"
46.include "../../mk/pthread.buildlink3.mk" 44.include "../../mk/pthread.buildlink3.mk"
47.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/net/amule/PLIST (expand / switch to unified diff)

--- pkgsrc/net/amule/PLIST 2020/11/19 20:01:40 1.15
+++ pkgsrc/net/amule/PLIST 2021/06/05 13:05:56 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.15 2020/11/19 20:01:40 nia Exp $ 1@comment $NetBSD: PLIST,v 1.16 2021/06/05 13:05:56 adam Exp $
2${PLIST.alc}bin/alc 2${PLIST.alc}bin/alc
3${PLIST.alcc}bin/alcc 3${PLIST.alcc}bin/alcc
4${PLIST.amule}bin/amule 4${PLIST.amule}bin/amule
5${PLIST.cmd}bin/amulecmd 5${PLIST.cmd}bin/amulecmd
6${PLIST.daemon}bin/amuled 6${PLIST.daemon}bin/amuled
7${PLIST.gui}bin/amulegui 7${PLIST.gui}bin/amulegui
8${PLIST.web}bin/amuleweb 8${PLIST.web}bin/amuleweb
9bin/autostart-xas 9bin/autostart-xas
10${PLIST.cas}bin/cas 10${PLIST.cas}bin/cas
11${PLIST.ed2k}bin/ed2k 11${PLIST.ed2k}bin/ed2k
12${PLIST.wxcas}bin/wxcas 12${PLIST.wxcas}bin/wxcas
13lib/xchat/plugins/xas.pl 13lib/xchat/plugins/xas.pl
14${PLIST.alc}man/de/man1/alc.1 14${PLIST.alc}man/de/man1/alc.1
@@ -73,63 +73,68 @@ ${PLIST.cmd}man/man1/amulecmd.1 @@ -73,63 +73,68 @@ ${PLIST.cmd}man/man1/amulecmd.1
73${PLIST.daemon}man/man1/amuled.1 73${PLIST.daemon}man/man1/amuled.1
74${PLIST.gui}man/man1/amulegui.1 74${PLIST.gui}man/man1/amulegui.1
75${PLIST.web}man/man1/amuleweb.1 75${PLIST.web}man/man1/amuleweb.1
76${PLIST.cas}man/man1/cas.1 76${PLIST.cas}man/man1/cas.1
77${PLIST.ed2k}man/man1/ed2k.1 77${PLIST.ed2k}man/man1/ed2k.1
78${PLIST.wxcas}man/man1/wxcas.1 78${PLIST.wxcas}man/man1/wxcas.1
79man/man1/xas.1 79man/man1/xas.1
80${PLIST.alc}man/ro/man1/alc.1 80${PLIST.alc}man/ro/man1/alc.1
81${PLIST.alcc}man/ro/man1/alcc.1 81${PLIST.alcc}man/ro/man1/alcc.1
82${PLIST.amule}man/ro/man1/amule.1 82${PLIST.amule}man/ro/man1/amule.1
83${PLIST.cmd}man/ro/man1/amulecmd.1 83${PLIST.cmd}man/ro/man1/amulecmd.1
84${PLIST.daemon}man/ro/man1/amuled.1 84${PLIST.daemon}man/ro/man1/amuled.1
85${PLIST.gui}man/ro/man1/amulegui.1 85${PLIST.gui}man/ro/man1/amulegui.1
 86${PLIST.web}man/ro/man1/amuleweb.1
86${PLIST.cas}man/ro/man1/cas.1 87${PLIST.cas}man/ro/man1/cas.1
87${PLIST.ed2k}man/ro/man1/ed2k.1 88${PLIST.ed2k}man/ro/man1/ed2k.1
88${PLIST.wxcas}man/ro/man1/wxcas.1 89${PLIST.wxcas}man/ro/man1/wxcas.1
89man/ro/man1/xas.1 90man/ro/man1/xas.1
90${PLIST.alc}man/ru/man1/alc.1 91${PLIST.alc}man/ru/man1/alc.1
91${PLIST.alcc}man/ru/man1/alcc.1 92${PLIST.alcc}man/ru/man1/alcc.1
92${PLIST.amule}man/ru/man1/amule.1 93${PLIST.amule}man/ru/man1/amule.1
93${PLIST.cmd}man/ru/man1/amulecmd.1 94${PLIST.cmd}man/ru/man1/amulecmd.1
94${PLIST.daemon}man/ru/man1/amuled.1 95${PLIST.daemon}man/ru/man1/amuled.1
95${PLIST.gui}man/ru/man1/amulegui.1 96${PLIST.gui}man/ru/man1/amulegui.1
 97${PLIST.web}man/ru/man1/amuleweb.1
96${PLIST.cas}man/ru/man1/cas.1 98${PLIST.cas}man/ru/man1/cas.1
97${PLIST.ed2k}man/ru/man1/ed2k.1 99${PLIST.ed2k}man/ru/man1/ed2k.1
98${PLIST.wxcas}man/ru/man1/wxcas.1 100${PLIST.wxcas}man/ru/man1/wxcas.1
99man/ru/man1/xas.1 101man/ru/man1/xas.1
100${PLIST.alc}man/tr/man1/alc.1 102${PLIST.alc}man/tr/man1/alc.1
101${PLIST.alcc}man/tr/man1/alcc.1 103${PLIST.alcc}man/tr/man1/alcc.1
102${PLIST.amule}man/tr/man1/amule.1 104${PLIST.amule}man/tr/man1/amule.1
103${PLIST.cmd}man/tr/man1/amulecmd.1 105${PLIST.cmd}man/tr/man1/amulecmd.1
104${PLIST.daemon}man/tr/man1/amuled.1 106${PLIST.daemon}man/tr/man1/amuled.1
105${PLIST.gui}man/tr/man1/amulegui.1 107${PLIST.gui}man/tr/man1/amulegui.1
 108${PLIST.web}man/tr/man1/amuleweb.1
106${PLIST.cas}man/tr/man1/cas.1 109${PLIST.cas}man/tr/man1/cas.1
107${PLIST.ed2k}man/tr/man1/ed2k.1 110${PLIST.ed2k}man/tr/man1/ed2k.1
108${PLIST.wxcas}man/tr/man1/wxcas.1 111${PLIST.wxcas}man/tr/man1/wxcas.1
109man/tr/man1/xas.1 112man/tr/man1/xas.1
110${PLIST.alc}man/zh_TW/man1/alc.1 113${PLIST.alc}man/zh_TW/man1/alc.1
111${PLIST.alcc}man/zh_TW/man1/alcc.1 114${PLIST.alcc}man/zh_TW/man1/alcc.1
112${PLIST.amule}man/zh_TW/man1/amule.1 115${PLIST.amule}man/zh_TW/man1/amule.1
113${PLIST.cmd}man/zh_TW/man1/amulecmd.1 116${PLIST.cmd}man/zh_TW/man1/amulecmd.1
114${PLIST.daemon}man/zh_TW/man1/amuled.1 117${PLIST.daemon}man/zh_TW/man1/amuled.1
115${PLIST.gui}man/zh_TW/man1/amulegui.1 118${PLIST.gui}man/zh_TW/man1/amulegui.1
 119${PLIST.web}man/zh_TW/man1/amuleweb.1
116${PLIST.cas}man/zh_TW/man1/cas.1 120${PLIST.cas}man/zh_TW/man1/cas.1
117${PLIST.ed2k}man/zh_TW/man1/ed2k.1 121${PLIST.ed2k}man/zh_TW/man1/ed2k.1
118${PLIST.wxcas}man/zh_TW/man1/wxcas.1 122${PLIST.wxcas}man/zh_TW/man1/wxcas.1
119man/zh_TW/man1/xas.1 123man/zh_TW/man1/xas.1
120${PLIST.skins}share/amule/skins/Mac_Gray.zip 124${PLIST.skins}share/amule/skins/Mac_Gray.zip
121${PLIST.skins}share/amule/skins/gnome.zip 125${PLIST.skins}share/amule/skins/gnome.zip
122${PLIST.skins}share/amule/skins/kde4.zip 126${PLIST.skins}share/amule/skins/kde4.zip
 127${PLIST.skins}share/amule/skins/papirus.zip
123${PLIST.skins}share/amule/skins/priscilla.zip 128${PLIST.skins}share/amule/skins/priscilla.zip
124${PLIST.skins}share/amule/skins/tango.zip 129${PLIST.skins}share/amule/skins/tango.zip
125${PLIST.skins}share/amule/skins/xfce.zip 130${PLIST.skins}share/amule/skins/xfce.zip
126${PLIST.web}share/amule/webserver/default/amuleweb-main-dload.php 131${PLIST.web}share/amule/webserver/default/amuleweb-main-dload.php
127${PLIST.web}share/amule/webserver/default/amuleweb-main-kad.php 132${PLIST.web}share/amule/webserver/default/amuleweb-main-kad.php
128${PLIST.web}share/amule/webserver/default/amuleweb-main-log.php 133${PLIST.web}share/amule/webserver/default/amuleweb-main-log.php
129${PLIST.web}share/amule/webserver/default/amuleweb-main-prefs.php 134${PLIST.web}share/amule/webserver/default/amuleweb-main-prefs.php
130${PLIST.web}share/amule/webserver/default/amuleweb-main-search.php 135${PLIST.web}share/amule/webserver/default/amuleweb-main-search.php
131${PLIST.web}share/amule/webserver/default/amuleweb-main-servers.php 136${PLIST.web}share/amule/webserver/default/amuleweb-main-servers.php
132${PLIST.web}share/amule/webserver/default/amuleweb-main-shared.php 137${PLIST.web}share/amule/webserver/default/amuleweb-main-shared.php
133${PLIST.web}share/amule/webserver/default/amuleweb-main-stats.php 138${PLIST.web}share/amule/webserver/default/amuleweb-main-stats.php
134${PLIST.web}share/amule/webserver/default/black.gif 139${PLIST.web}share/amule/webserver/default/black.gif
135${PLIST.web}share/amule/webserver/default/blank1x1.gif 140${PLIST.web}share/amule/webserver/default/blank1x1.gif
cvs diff -r1.22 -r1.23 pkgsrc/net/amule/distinfo (expand / switch to unified diff)

--- pkgsrc/net/amule/distinfo 2020/11/19 20:01:40 1.22
+++ pkgsrc/net/amule/distinfo 2021/06/05 13:05:56 1.23
@@ -1,11 +1,8 @@ @@ -1,11 +1,8 @@
1$NetBSD: distinfo,v 1.22 2020/11/19 20:01:40 nia Exp $ 1$NetBSD: distinfo,v 1.23 2021/06/05 13:05:56 adam Exp $
2 2
3SHA1 (aMule-2.3.2.tar.bz2) = 65bb4197a5c2d9c95dc18bb458fa33d221035244 3SHA1 (aMule-2.3.3.tar.bz2) = 1c88e238b2ce3f3e1516c7a6cb94c611aa187dce
4RMD160 (aMule-2.3.2.tar.bz2) = 71ed96bff4e81bdd8fa97045f8589531609b1232 4RMD160 (aMule-2.3.3.tar.bz2) = a66491555184bee73a7cdebe11d22cb62fff1706
5SHA512 (aMule-2.3.2.tar.bz2) = 55567aa82c48c741bc9af92e9118a68a76b33b696639802f1bf627c02c1fa1f76af9e3b611bec443e68ff42eac3d508cb8522c97b83366c0a9258075f7a3fd31 5SHA512 (aMule-2.3.3.tar.bz2) = eb42646dc835fb49f81def5c3ecceca2adceacb6dc9e4a7fec08e9ab8d7bd20d2fa623a33b476a984c7a809e624f61cad3b9b40f68a3363dd936be25cda72211
6Size (aMule-2.3.2.tar.bz2) = 4950017 bytes 6Size (aMule-2.3.3.tar.bz2) = 4606514 bytes
7SHA1 (patch-aa) = af77036649caac372890c45840d24a404ab1a7d6 7SHA1 (patch-aa) = af77036649caac372890c45840d24a404ab1a7d6
8SHA1 (patch-src_ClientCreditsList.cpp) = 03bf1956dd848fcc117d5043703840a51880ee9d 
9SHA1 (patch-src_OScopeCtrl.cpp) = d9ee907eeb49c3f54972b4d1cabdd64c6d4b88d5 8SHA1 (patch-src_OScopeCtrl.cpp) = d9ee907eeb49c3f54972b4d1cabdd64c6d4b88d5
10SHA1 (patch-src_UPnPBase.cpp) = 6f8baa3af408632fcc0f0ff7d8e6f33a2d7ddb3d 
11SHA1 (patch-src_UPnPBase.h) = 554eaa417df23918985b9a0fd16d5f77844f145a 
File Deleted: pkgsrc/net/amule/patches/Attic/patch-src_ClientCreditsList.cpp
File Deleted: pkgsrc/net/amule/patches/Attic/patch-src_UPnPBase.cpp
File Deleted: pkgsrc/net/amule/patches/Attic/patch-src_UPnPBase.h