Date: Sun, 15 Feb 2004 18:31:22 +0100 (CET) From: Ganael LAPLANCHE <ganael.laplanche@martymac.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/62879: [PORT UPDATE] net/amule 1.2.5_1 Message-ID: <20040215173122.9043FEF@mail.martymac.com> Resent-Message-ID: <200402151730.i1FHUH38020131@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62879 >Category: ports >Synopsis: [PORT UPDATE] net/amule 1.2.5_1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Feb 15 09:30:17 PST 2004 >Closed-Date: >Last-Modified: >Originator: Ganael LAPLANCHE >Release: FreeBSD 5.1-RELEASE i386 >Organization: http://www.martymac.com >Environment: System: FreeBSD www.martymac.com 5.1-RELEASE FreeBSD 5.1-RELEASE >Description: Updates port 62731. Patches, options, deps modified. >How-To-Repeat: >Fix: --------------- aMule-1.2.5_1.shar starts here --------------- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # amule # amule/files # amule/files/patch-UploadQueue.cpp # amule/files/patch-SysTray.cpp # amule/files/patch-OScopeCtrl.cpp # amule/files/patch-Makefile.in # amule/pkg-descr # amule/distinfo # amule/pkg-plist # amule/Makefile # amule/pkg-message # echo c - amule mkdir -p amule > /dev/null 2>&1 echo c - amule/files mkdir -p amule/files > /dev/null 2>&1 echo x - amule/files/patch-UploadQueue.cpp sed 's/^X//' >amule/files/patch-UploadQueue.cpp << 'END-of-amule/files/patch-UploadQueue.cpp' X--- src/UploadQueue.cpp.orig Thu Feb 12 21:45:28 2004 X+++ src/UploadQueue.cpp Thu Feb 12 21:46:04 2004 X@@ -335,12 +335,8 @@ X } else { X uint16 nMaxSlots = 0; X if (theApp.glob_prefs->GetMaxUpload() >= 10) { X-#if defined(__GNUC__) && __GNUC__ >= 3 X- nMaxSlots = (uint16)round((float)theApp.glob_prefs->GetMaxUpload() / kBpsUpPerClient); X-#endif X-#if !defined(__GNUC__) || __GNUC__ < 3 X- nMaxSlots = (uint16)floor((float)theApp.glob_prefs->GetMaxUpload() / kBpsUpPerClient); X-#endif X+ nMaxSlots = (uint16)floor((float)theApp.glob_prefs->GetMaxUpload() / kBpsUpPerClient + 0.5); X+ // floor(x + 0.5) is a way of doing round(x) that works with gcc < 3 ... X if (nMaxSlots < MIN_UP_CLIENTS_ALLOWED) { X nMaxSlots=MIN_UP_CLIENTS_ALLOWED; X } END-of-amule/files/patch-UploadQueue.cpp echo x - amule/files/patch-SysTray.cpp sed 's/^X//' >amule/files/patch-SysTray.cpp << 'END-of-amule/files/patch-SysTray.cpp' X--- src/SysTray.cpp.orig Thu Feb 5 23:39:34 2004 X+++ src/SysTray.cpp Wed Feb 11 13:51:11 2004 X@@ -22,8 +22,8 @@ X #include "sys.h" X #include <libintl.h> X #include <clocale> // Needed for setlocale(3) X-#include <net/if.h> // Needed for struct ifreq X #include <sys/socket.h> // X+#include <net/if.h> // Needed for struct ifreq X #include <netinet/in.h> // Needed for inet_ntoa X #include <arpa/inet.h> // X #include <sys/ioctl.h> // Needed for SIOCGIFADDR END-of-amule/files/patch-SysTray.cpp echo x - amule/files/patch-OScopeCtrl.cpp sed 's/^X//' >amule/files/patch-OScopeCtrl.cpp << 'END-of-amule/files/patch-OScopeCtrl.cpp' X--- src/OScopeCtrl.cpp.orig Thu Feb 12 21:44:08 2004 X+++ src/OScopeCtrl.cpp Thu Feb 12 21:44:59 2004 X@@ -265,12 +265,9 @@ X dcGrid->DrawText(strTemp,rectPlot.left-4-sizX, rectPlot.bottom); X X // x units X-#if defined(__GNUC__) && __GNUC__ >= 3 X- strTemp = CastSecondsToHM((nPlotWidth/nShiftPixels) * (int)round(sLastPeriod)); X-#endif X-#if !defined(__GNUC__) || __GNUC__ < 3 X- strTemp = CastSecondsToHM((nPlotWidth/nShiftPixels) * (int)floor(sLastPeriod)); X-#endif X+ strTemp = CastSecondsToHM((nPlotWidth/nShiftPixels) * (int)floor(sLastPeriod+0.5)); X+ // floor(x + 0.5) is a way of doing round(x) that works with gcc < 3 ... X+ X strXUnits.Format((bStopped ? "Disabled [%s]" : "%s"), strTemp.GetBuffer()); X X dcGrid->GetTextExtent(strXUnits,&sizX,&sizY); END-of-amule/files/patch-OScopeCtrl.cpp echo x - amule/files/patch-Makefile.in sed 's/^X//' >amule/files/patch-Makefile.in << 'END-of-amule/files/patch-Makefile.in' X--- src/Makefile.in.orig Tue Feb 10 03:05:50 2004 X+++ src/Makefile.in Wed Feb 11 13:37:25 2004 X@@ -197,7 +197,7 @@ X sysconfdir = @sysconfdir@ X systray = @systray@ X target_alias = @target_alias@ X-bin_PROGRAMS = $(am__append_1) ed2k amule X+bin_PROGRAMS = $(am__append_1) amule X X BUILT_SOURCES = sys.h X EXTRA_DIST = sys.h.in strings.en *.h pixmaps bitmaps Makengfile X@@ -356,8 +356,8 @@ X CONFIG_CLEAN_FILES = timestamp-sys.h X @COMPILE_CMD_TRUE@bin_PROGRAMS = amulecmd$(EXEEXT) amulecmdDLG$(EXEEXT) \ X @COMPILE_CMD_TRUE@ amuleweb$(EXEEXT) amulewebDLG$(EXEEXT) \ X-@COMPILE_CMD_TRUE@ ed2k$(EXEEXT) amule$(EXEEXT) X-@COMPILE_CMD_FALSE@bin_PROGRAMS = ed2k$(EXEEXT) amule$(EXEEXT) X+@COMPILE_CMD_TRUE@ amule$(EXEEXT) X+@COMPILE_CMD_FALSE@bin_PROGRAMS = amule$(EXEEXT) X PROGRAMS = $(bin_PROGRAMS) X X am__amule_SOURCES_DIST = ListenSocket.cpp EMSocket.cpp AddFriend.cpp \ END-of-amule/files/patch-Makefile.in echo x - amule/pkg-descr sed 's/^X//' >amule/pkg-descr << 'END-of-amule/pkg-descr' X[ from README ] X XThis program is a multiplatform fork of X xMule client using wxWindows class library. X XWWW: http://sourceforge.net/projects/amule/ END-of-amule/pkg-descr echo x - amule/distinfo sed 's/^X//' >amule/distinfo << 'END-of-amule/distinfo' XMD5 (aMule-1.2.5.tar.gz) = 9d2ae2cbd6143cf8b2e9534b1dfe7c48 XSIZE (aMule-1.2.5.tar.gz) = 1760929 END-of-amule/distinfo echo x - amule/pkg-plist sed 's/^X//' >amule/pkg-plist << 'END-of-amule/pkg-plist' Xbin/amule Xbin/amule-ed2k-handler Xbin/amulecmd Xbin/amulecmdDLG Xbin/amuleweb Xbin/amulewebDLG Xshare/gnome/applications/amule.desktop Xshare/gnome/pixmaps/amule.xpm Xshare/locale/bg/LC_MESSAGES/amule.mo Xshare/locale/de/LC_MESSAGES/amule.mo Xshare/locale/ee/LC_MESSAGES/amule.mo Xshare/locale/en/LC_MESSAGES/amule.mo Xshare/locale/es/LC_MESSAGES/amule.mo Xshare/locale/es_MX/LC_MESSAGES/amule.mo Xshare/locale/eu/LC_MESSAGES/amule.mo Xshare/locale/fr/LC_MESSAGES/amule.mo Xshare/locale/gl/LC_MESSAGES/amule.mo Xshare/locale/it/LC_MESSAGES/amule.mo Xshare/locale/ko/LC_MESSAGES/amule.mo Xshare/locale/pl/LC_MESSAGES/amule.mo Xshare/locale/pt_BR/LC_MESSAGES/amule.mo Xshare/locale/ru/LC_MESSAGES/amule.mo X@dirrm share/locale/ru/LC_MESSAGES X@dirrm share/locale/ru X@dirrm share/locale/pt_BR/LC_MESSAGES X@dirrm share/locale/pt_BR X@dirrm share/locale/pl/LC_MESSAGES X@dirrm share/locale/pl X@dirrm share/locale/ko/LC_MESSAGES X@dirrm share/locale/ko X@dirrm share/locale/it/LC_MESSAGES X@dirrm share/locale/it X@dirrm share/locale/gl/LC_MESSAGES X@dirrm share/locale/gl X@dirrm share/locale/fr/LC_MESSAGES X@dirrm share/locale/fr X@dirrm share/locale/eu/LC_MESSAGES X@dirrm share/locale/eu X@dirrm share/locale/es_MX/LC_MESSAGES X@dirrm share/locale/es_MX X@dirrm share/locale/es/LC_MESSAGES X@dirrm share/locale/es X@dirrm share/locale/en/LC_MESSAGES X@dirrm share/locale/en X@dirrm share/locale/ee/LC_MESSAGES X@dirrm share/locale/ee X@dirrm share/locale/de/LC_MESSAGES X@dirrm share/locale/de X@dirrm share/locale/bg/LC_MESSAGES X@dirrm share/locale/bg END-of-amule/pkg-plist echo x - amule/Makefile sed 's/^X//' >amule/Makefile << 'END-of-amule/Makefile' X# New ports collection makefile for: amule X# Date created: Wed Nov 05 09:30:00 UTC 2003 X# Whom: Ganael LAPLANCHE <ganael.laplanche@martymac.com> X# X# $FreeBSD$ X# X XPORTNAME= aMule XPORTVERSION= 1.2.5 XPORTREVISION= 1 XCATEGORIES= net XMASTER_SITES= ${MASTER_SITE_SOURCEFORGE} XMASTER_SITE_SUBDIR= amule X XMAINTAINER= ganael.laplanche@martymac.com XCOMMENT= Just aNOTHER eMule P2P Client X XLIB_DEPENDS= wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk \ X curl.2:${PORTSDIR}/ftp/curl X XUSE_GETTEXT= yes XUSE_X_PREFIX= yes XUSE_GNOME= gnomehier \ X gnomehack \ X gnomeprefix X XUSE_REINPLACE= yes X XUSE_GMAKE= yes XGNU_CONFIGURE= yes XCONFIGURE_ARGS= --without-included-gettext \ X --with-libintl-prefix=${LOCALBASE} \ X --with-libiconv-prefix=${LOCALBASE} \ X --with-wx-config=${WX_CONFIG} \ X --with-wxbase-config=${WX_CONFIG} X XOPTIONS= OPTIMIZE "Build with optimization" off \ X STATIC "Enable static linking" off \ X RELGRP "Use release group code" off X XCONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ X LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" X XWX_CONFIG?= ${X11BASE}/bin/wx-config X Xpost-build: X# Build the generic named ed2k binary X# It will be installed in an adhoc fashion X @cd ${BUILD_WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ed2k X Xpost-install: X# Do not install a generic named ed2k binary X# Install it under a more specific name X @${INSTALL_PROGRAM} ${WRKSRC}/src/ed2k \ X ${PREFIX}/bin/amule-ed2k-handler X X# Displays the pkg-message file X @${CAT} pkg-message X X.include <bsd.port.pre.mk> X X# FreeBSD version check X.if ${OSVERSION} < 500000 XBROKEN= "This port only supports FreeBSD 5.x" X.endif X X# Configure options X.if defined(WITH_OPTIMIZE) XCONFIGURE_ARGS+= --enable-optimise X.endif X X.if defined(WITH_STATIC) XCONFIGURE_ARGS+= --enable-static X.endif X X.if defined(WITH_RELGRP) XCONFIGURE_ARGS+= --enable-releasegrp X.endif X X# Detect if wxgtk was linked against gtk1 or gtk2 X.if exists(${WX_CONFIG}) XDECISION_GTK_1_OR_2!= ${WX_CONFIG} --static --libs X.else XDECISION_GTK_1_OR_2= "" X.endif X X.if ${DECISION_GTK_1_OR_2:M*glib-2.0} != "" XUSE_GNOME+= gtk20 X.else XUSE_GNOME+= gtk12 X.endif X X.include <bsd.port.post.mk> END-of-amule/Makefile echo x - amule/pkg-message sed 's/^X//' >amule/pkg-message << 'END-of-amule/pkg-message' X############################################# X aMule is now ready ! X X http://www.amule.org X http://www.sourceforge.net/projects/amule X############################################# END-of-amule/pkg-message exit --------------- aMule-1.2.5_1.shar ends here --------------- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040215173122.9043FEF>