diff options
Diffstat (limited to 'net/amule')
| -rw-r--r-- | net/amule/Makefile | 8 | ||||
| -rw-r--r-- | net/amule/PLIST | 10 | ||||
| -rw-r--r-- | net/amule/distinfo | 8 | ||||
| -rw-r--r-- | net/amule/patches/patch-aa | 28 | ||||
| -rw-r--r-- | net/amule/patches/patch-ab | 28 |
5 files changed, 74 insertions, 8 deletions
diff --git a/net/amule/Makefile b/net/amule/Makefile index 50af8d7bca0..5b8f08bd4f4 100644 --- a/net/amule/Makefile +++ b/net/amule/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2004/01/24 14:50:05 grant Exp $ +# $NetBSD: Makefile,v 1.8 2004/02/13 11:18:29 jmmv Exp $ # -DISTNAME= aMule-1.2.4 +DISTNAME= aMule-1.2.5 PKGNAME= ${DISTNAME:S/aMule/amule/} CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amule/} @@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://amule.sourceforge.net/ COMMENT= Another Emule P2P client -DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs +DEPENDS= xdg-dirs>=1.0:../../misc/xdg-dirs BUILD_USES_MSGFMT= yes CONFLICTS= xmule-[0-9]* @@ -22,6 +22,8 @@ USE_PKGLOCALEDIR= yes USE_X11= yes GNU_CONFIGURE= yes +LIBS+= -lm + .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" .include "../../www/curl/buildlink2.mk" diff --git a/net/amule/PLIST b/net/amule/PLIST index e12134afc46..3df9cfd19c4 100644 --- a/net/amule/PLIST +++ b/net/amule/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/01/14 22:31:27 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/02/13 11:18:29 jmmv Exp $ bin/amule bin/amulecmd bin/amulecmdDLG @@ -6,13 +6,19 @@ bin/amuleweb bin/amulewebDLG bin/ed2k share/applications/amule.desktop +${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/amule.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/amule.mo ${PKGLOCALEDIR}/locale/ee/LC_MESSAGES/amule.mo +${PKGLOCALEDIR}/locale/en/LC_MESSAGES/amule.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/amule.mo ${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/amule.mo +${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/amule.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/amule.mo +${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/amule.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/amule.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/amule.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/amule.mo -${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/amule.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/amule.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/amule.mo share/pixmaps/amule.xpm +@comment in xdg-dirs: @dirrm share/applications diff --git a/net/amule/distinfo b/net/amule/distinfo index 407e62385a8..df18c4cf4bb 100644 --- a/net/amule/distinfo +++ b/net/amule/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.2 2004/01/14 21:42:40 jmmv Exp $ +$NetBSD: distinfo,v 1.3 2004/02/13 11:18:29 jmmv Exp $ -SHA1 (aMule-1.2.4.tar.bz2) = 57f867f4b457736297c633a7681746b633c0f44f -Size (aMule-1.2.4.tar.bz2) = 1399311 bytes +SHA1 (aMule-1.2.5.tar.bz2) = 71604a0535c60fd702ef13bb32b0d733cd594f86 +Size (aMule-1.2.5.tar.bz2) = 1388150 bytes +SHA1 (patch-aa) = fb207779d163ce085726cf098e224994c2d0e288 +SHA1 (patch-ab) = dba5708c91f00d0530ceeee1fa9f0b27da8ac2e7 diff --git a/net/amule/patches/patch-aa b/net/amule/patches/patch-aa new file mode 100644 index 00000000000..1fb99accb31 --- /dev/null +++ b/net/amule/patches/patch-aa @@ -0,0 +1,28 @@ +$NetBSD: patch-aa,v 1.1 2004/02/13 11:18:29 jmmv Exp $ + +--- src/OScopeCtrl.cpp.orig 2004-02-10 02:36:27.000000000 +0100 ++++ src/OScopeCtrl.cpp +@@ -17,6 +17,8 @@ + // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + // + ++#include <config.h> ++ + #include "sys.h" + #include <cmath> + #include <algorithm> // Needed for std::max +@@ -265,11 +267,10 @@ void COScopeCtrl::RecreateGrid() + dcGrid->DrawText(strTemp,rectPlot.left-4-sizX, rectPlot.bottom); + + // x units +-#if defined(__GNUC__) && __GNUC__ >= 3 +- strTemp = CastSecondsToHM((nPlotWidth/nShiftPixels) * (int)round(sLastPeriod)); +-#endif +-#if !defined(__GNUC__) || __GNUC__ < 3 ++#if defined(HAVE_FLOOR) + strTemp = CastSecondsToHM((nPlotWidth/nShiftPixels) * (int)floor(sLastPeriod)); ++#else ++ strTemp = CastSecondsToHM((nPlotWidth/nShiftPixels) * (int)round(sLastPeriod)); + #endif + strXUnits.Format((bStopped ? "Disabled [%s]" : "%s"), strTemp.GetBuffer()); + diff --git a/net/amule/patches/patch-ab b/net/amule/patches/patch-ab new file mode 100644 index 00000000000..dffd1214d4e --- /dev/null +++ b/net/amule/patches/patch-ab @@ -0,0 +1,28 @@ +$NetBSD: patch-ab,v 1.1 2004/02/13 11:18:29 jmmv Exp $ + +--- src/UploadQueue.cpp.orig 2004-02-10 02:36:28.000000000 +0100 ++++ src/UploadQueue.cpp +@@ -15,6 +15,8 @@ + //along with this program; if not, write to the Free Software + //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + ++#include <config.h> ++ + #include "sys.h" + #include <cstring> + #include <cmath> // Needed for std::exp +@@ -335,11 +337,10 @@ bool CUploadQueue::AcceptNewClient() + } else { + uint16 nMaxSlots = 0; + if (theApp.glob_prefs->GetMaxUpload() >= 10) { +-#if defined(__GNUC__) && __GNUC__ >= 3 +- nMaxSlots = (uint16)round((float)theApp.glob_prefs->GetMaxUpload() / kBpsUpPerClient); +-#endif +-#if !defined(__GNUC__) || __GNUC__ < 3 ++#if defined(HAVE_FLOOR) + nMaxSlots = (uint16)floor((float)theApp.glob_prefs->GetMaxUpload() / kBpsUpPerClient); ++#else ++ nMaxSlots = (uint16)round((float)theApp.glob_prefs->GetMaxUpload() / kBpsUpPerClient); + #endif + if (nMaxSlots < MIN_UP_CLIENTS_ALLOWED) { + nMaxSlots=MIN_UP_CLIENTS_ALLOWED; |