cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to amule-2.2.6

Browse Source 
'go for it' espie@
This commit is contained in:
dcoppa 2011-06-24 08:42:31 +00:00
parent 141b35e679
commit cdb8acbb13
21 changed files with 487 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
net/amule/Makefile
View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.20 2010/11/19 22:31:32 espie Exp $
# $OpenBSD: Makefile,v 1.21 2011/06/24 08:42:31 dcoppa Exp $
COMMENT-main = another eMule p2p client
COMMENT-main = another eDonkey P2P file sharing client
COMMENT-web = webserver interface to amuled
COMMENT-daemon =stand-alone daemon/cmdline for amule
V = 2.1.3
V = 2.2.6
DISTNAME = aMule-$V
CATEGORIES = net
HOMEPAGE = http://www.amule.org/
MULTI_PACKAGES =-main -web -daemon
REVISION-main = 5
PKGNAME-main = amule-$V
PKGNAME-daemon =amuled-$V
PKGNAME-web = amuleweb-$V
@ -25,28 +24,79 @@ MAINTAINER = Marc Espie <espie@openbsd.org>
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=amule/}
EXTRACT_SUFX = .tar.bz2
RUN_DEPENDS-main=${RUN_DEPENDS} \
devel/desktop-file-utils
.if defined (SUBPACKAGE) && ${SUBPACKAGE:M-main}
MODULES += converters/libiconv
.endif
LIB_DEPENDS = x11/wxWidgets>=2.6.3
WANTLIB = c m pthread z stdc++ wx_base_net wx_base
LIB_DEPENDS =
WANTLIB =
RUN_DEPENDS =
USE_GMAKE = Yes
USE_GROFF = Yes
BUILD_DEPENDS = devel/flex \
devel/gettext
WANTLIB-main = ${WANTLIB} X11 pthread-stubs wx_gtk2_adv wx_gtk2_core xcb
WANTLIB-daemon =${WANTLIB} readline termcap
WANTLIB-web = ${WANTLIB} png readline termcap
commonLIB_DEPENDS = x11/wxWidgets>=2.8.0 \
net/libupnp>=1.6.6
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --disable-debug \
--with-x \
LIB_DEPENDS-main = ${LIB_DEPENDS} ${commonLIB_DEPENDS} \
devel/cryptopp>=5.6.0 \
graphics/gd \
net/GeoIP
LIB_DEPENDS-daemon = ${LIB_DEPENDS} ${commonLIB_DEPENDS} \
devel/cryptopp>=5.6.0
LIB_DEPENDS-web = ${LIB_DEPENDS} ${commonLIB_DEPENDS}
RUN_DEPENDS-main = ${RUN_DEPENDS} \
devel/desktop-file-utils
commonWANTLIB = c ixml m pthread stdc++ threadutil upnp \
wx_base wx_base_net z
WANTLIB-main = ${WANTLIB} ${commonWANTLIB} \
GeoIP X11 cryptopp fontconfig \
freetype gd jpeg png wx_gtk2_adv wx_gtk2_core
WANTLIB-daemon = ${WANTLIB} ${commonWANTLIB} \
cryptopp readline termcap
WANTLIB-web = ${WANTLIB} ${commonWANTLIB} \
png readline termcap
USE_GMAKE = Yes
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.59
CONFIGURE_ARGS = --disable-optimize \
--disable-profile \
--enable-alc \
--enable-alcc \
--enable-amule-daemon \
--enable-amule-gui \
--enable-amulecmd \
--enable-cas \
--enable-geoip \
--enable-webserver \
--enable-amule-gui
--enable-wxcas \
--with-denoise-level=0 \
--with-libiconv-prefix=${LOCALBASE} \
--with-x
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
.ifndef DEBUG
CONFIGURE_ARGS += --disable-debug
.else
CONFIGURE_ARGS += --enable-debug
.endif
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LOCALDIR="${LOCALBASE}" \
X11R6DIR="${X11BASE}" \
ac_cv_prog_LEX="${LOCALBASE}/bin/gflex"
MAKE_FLAGS += CXXFLAGS="${CXXFLAGS} -Wno-deprecated \
-Wno-sign-compare -Wno-unused"
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/utils/cas/configfile.c
post-install:
${INSTALL_SCRIPT} ${WRKDIST}/src/utils/scripts/mldonkey_importer.pl \

10
net/amule/distinfo
View File

@ -1,5 +1,5 @@
MD5 (aMule-2.1.3.tar.bz2) = Cq/dFZ7bitXwBk2oeZi0fQ==
RMD160 (aMule-2.1.3.tar.bz2) = /MNFAA5a0KIh0eltDVFPO+NkKMM=
SHA1 (aMule-2.1.3.tar.bz2) = 3Ufes456W4I1ULhRUPWoFMWXsnM=
SHA256 (aMule-2.1.3.tar.bz2) = bpfpR7t6wjG3XjshpQmi7AI5vNfp2/xgYsUgptE7AkQ=
SIZE (aMule-2.1.3.tar.bz2) = 3248530
MD5 (aMule-2.2.6.tar.bz2) = Uw2bSBh+NvePwhuxnpQybQ==
RMD160 (aMule-2.2.6.tar.bz2) = lIPrGQeAPTpqw3XE2Fp7DL2JXao=
SHA1 (aMule-2.2.6.tar.bz2) = Npu5UIl8Px9Z/BGQrHA0ETrCU9A=
SHA256 (aMule-2.2.6.tar.bz2) = bOMrXx2BE6IkqOhQY52VdlZiOgSnP7g9UjE8BsNIgSI=
SIZE (aMule-2.2.6.tar.bz2) = 4722143

38
net/amule/patches/patch-acinclude_m4 Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
--- acinclude.m4.orig Fri Jun 17 14:46:26 2011
+++ acinclude.m4 Fri Jun 17 15:11:57 2011
@@ -82,8 +82,8 @@ AC_DEFUN([MULE_CHECK_SYSTEM],
;;
openbsd*)
SYS=openbsd
- LIBS="$LIBS -L/usr/local/lib"
- X11LIBS="-lX11 -L/usr/X11R6/lib"
+ LIBS="$LIBS -L${LOCALDIR}/lib"
+ X11LIBS="-lX11 -L${X11R6DIR}/lib"
MULECPPFLAGS="-D__OPENBSD__"
;;
*cygwin* | *mingw32*)
@@ -113,11 +113,11 @@ AC_DEFUN([MULE_CHECK_SYSTEM],
;;
esac
- # -lpthread is needed by Debian but FreeBSD < 5 doesn't support it
+ # -lpthread is needed by Debian but OpenBSD doesn't support it
AS_IF([test ${SYS:-unknown} != win32],
[
- AC_MSG_CHECKING([if this is a FreeBSD 4 or earlier system])
- AS_IF([test x"`uname -s`" = xFreeBSD && test 0`uname -r | cut -c 1` -lt 5],
+ AC_MSG_CHECKING([if this is an OpenBSD system])
+ AS_IF([test x"`uname -s`" = xOpenBSD],
[
MULE_ADDFLAG([LD], [-pthread])
AC_MSG_RESULT(yes)
@@ -359,7 +359,7 @@ AC_DEFUN([MULE_CHECK_FLEX_EXTENDED],
[
AC_MSG_CHECKING([for extended flex capabilities])
- extended_flex=`flex --help | grep header-file`
+ extended_flex=`${LEX} --help | grep header-file`
AS_IF([test -n "$extended_flex"], [HAVE_FLEX_EXTENDED=yes], [HAVE_FLEX_EXTENDED=no])
AC_MSG_RESULT($HAVE_FLEX_EXTENDED)

32
net/amule/patches/patch-configure_in Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-configure_in,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
--- configure.in.orig Wed Sep 16 23:02:52 2009
+++ configure.in Fri Jun 17 20:27:14 2011
@@ -297,7 +297,7 @@ MULE_CHECK_CXXABI
AC_LANG_POP([C++])
# Ok, we have all needed libs, now checking for other stuff
-AS_IF([test "$LEX" = "flex"], [MULE_CHECK_FLEX_EXTENDED], [HAVE_FLEX_EXTENDED=no])
+MULE_CHECK_FLEX_EXTENDED
# Flush standard test results for speeding cache
AC_CACHE_SAVE
@@ -386,10 +386,6 @@ dnl AM_GNU_GETTEXT_VERSION *must not* be moved away fr
AM_GNU_GETTEXT_VERSION(0.11.5)
MULE_CHECK_NLS
-# Check for bfd.h (to have proper backtraces without using wxExecute)
-MULE_CHECK_BFD
-MULE_CHECK_EXECINFO
-
# Flush standard test results for speeding cache
AC_CACHE_SAVE
@@ -399,7 +395,7 @@ MULE_COMPILATION_FLAGS
# autoconf >= 2.60 already defines ${docdir}, but we always need it.
AC_MSG_CHECKING([for docdir])
-AS_IF([test -z "$docdir"], [docdir="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"])
+AS_IF([test -z "$docdir"], [docdir="${datadir}/doc/amule"])
AC_SUBST([docdir])dnl
AC_MSG_RESULT([$docdir])

12
net/amule/patches/patch-docs_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-docs_Makefile_in,v 1.3 2006/10/12 14:18:53 alek Exp $
--- docs/Makefile.in.orig Sun Jun 11 17:08:56 2006
+++ docs/Makefile.in Fri Oct 6 18:41:36 2006
@@ -253,7 +253,7 @@ ccache_prefix = @ccache_prefix@
crypto_prefix = @crypto_prefix@
datadir = @datadir@
datarootdir = @datarootdir@
-docdir = $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+docdir = $(datadir)/doc/amule
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@

29
net/amule/patches/patch-src_BaseClient_cpp Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-src_BaseClient_cpp,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
Backport a bugfix from upstream git: work around a crash when doubly
deleting a client.
--- src/BaseClient.cpp.orig Wed Sep 9 22:46:31 2009
+++ src/BaseClient.cpp Fri Dec 3 10:37:13 2010
@@ -336,6 +336,9 @@ CUpDownClient::~CUpDownClient()
delete m_pReqFileAICHHash;
m_pReqFileAICHHash = NULL;
}
+
+ // Allow detection of deleted clients that didn't go through Safe_Delete
+ m_clientState = CS_DYING;
}
void CUpDownClient::ClearHelloProperties()
@@ -1210,6 +1213,11 @@ void CUpDownClient::ClearDownloadBlockRequests()
bool CUpDownClient::Disconnected(const wxString& strReason, bool bFromSocket)
{
//wxASSERT(theApp->clientlist->IsValidClient(this));
+
+ if (HasBeenDeleted()) {
+ AddDebugLogLineM( false, logClient, wxT("Disconnected() called for already deleted client on ip ") + Uint32toStringIP(GetConnectIP()));
+ return false;
+ }
// was this a direct callback?
if (m_dwDirectCallbackTimeout != 0) {

12
net/amule/patches/patch-src_FileLock_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_FileLock_h,v 1.1 2006/10/12 14:18:53 alek Exp $
--- src/FileLock.h.orig Fri Oct 6 19:28:24 2006
+++ src/FileLock.h Fri Oct 6 19:28:28 2006
@@ -31,7 +31,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <cerrno>
-
+#include <unistd.h>
/**
* This class provides an easy way to lock non-critical

77
net/amule/patches/patch-src_MuleGifCtrl_cpp
View File

@ -1,77 +0,0 @@
$OpenBSD: patch-src_MuleGifCtrl_cpp,v 1.1 2007/10/26 15:00:39 steven Exp $
--- src/MuleGifCtrl.cpp.orig Fri Feb 3 20:14:05 2006
+++ src/MuleGifCtrl.cpp Wed Oct 10 17:53:08 2007
@@ -24,7 +24,6 @@
#include <wx/mstream.h>
#include <wx/gifdecod.h>
-#include <wx/window.h>
#include <wx/dcbuffer.h>
#include "MuleGifCtrl.h"
@@ -35,7 +34,51 @@ BEGIN_EVENT_TABLE(MuleGifCtrl, wxControl)
EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase)
END_EVENT_TABLE()
+#if wxCHECK_VERSION(2, 7, 1)
+// Wrapper that emulates old wxGIFDecoder API
+class MuleGIFDecoder : public wxGIFDecoder {
+public:
+ MuleGIFDecoder(wxInputStream* stream, bool dummy) {
+ m_stream = stream;
+ dummy = dummy; // Unused.
+ m_nframe = 0;
+ }
+
+ ~MuleGIFDecoder() { /* don't delete the stream! */ }
+
+ wxGIFErrorCode ReadGIF() {
+ return LoadGIF(*m_stream);
+ }
+
+ void GoFirstFrame() { m_nframe = 0; }
+ void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; }
+ void GoLastFrame() { m_nframe = GetFrameCount(); }
+
+ void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
+
+ size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); }
+ size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); }
+
+ size_t GetLeft() { return 0; }
+ size_t GetTop() { return 0; }
+
+ long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
+
+private:
+ uint32_t m_nframe;
+ wxInputStream* m_stream;
+};
+
+#else
+class MuleGIFDecoder : public wxGIFDecoder {
+public:
+ MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {};
+};
+#endif
+
+
+
MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos,
const wxSize& size, long style, const wxValidator& validator,
const wxString& name )
@@ -66,7 +109,7 @@ bool MuleGifCtrl::LoadData(const char* data, int size)
}
wxMemoryInputStream stream(data, size);
- m_decoder = new wxGIFDecoder(&stream, TRUE);
+ m_decoder = new MuleGIFDecoder(&stream, TRUE);
if ( m_decoder->ReadGIF() != wxGIF_OK ) {
delete m_decoder;
m_decoder = NULL;
@@ -137,3 +180,4 @@ void MuleGifCtrl::OnPaint( wxPaintEvent& WXUNUSED(even
dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true);
}
+// File_checked_for_headers

30
net/amule/patches/patch-src_MuleGifCtrl_h
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_MuleGifCtrl_h,v 1.1 2007/10/26 15:00:39 steven Exp $
--- src/MuleGifCtrl.h.orig Sun Jan 1 06:17:25 2006
+++ src/MuleGifCtrl.h Wed Oct 10 17:53:08 2007
@@ -27,11 +27,10 @@
#include <wx/control.h>
#include <wx/timer.h>
-#include <wx/bitmap.h>
const int GIFTIMERID = 271283;
-class wxGIFDecoder;
+class MuleGIFDecoder;
class wxBitmap;
/**
@@ -121,7 +120,7 @@ class MuleGifCtrl : public wxControl (private)
void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
//! A pointer to the current gif-animation.
- wxGIFDecoder* m_decoder;
+ MuleGIFDecoder* m_decoder;
//! Timer used for the delay between each frame.
wxTimer m_timer;
//! Current frame.
@@ -133,3 +132,4 @@ class MuleGifCtrl : public wxControl (private)
#endif
+// File_checked_for_headers

11
net/amule/patches/patch-src_MuleTextCtrl_cpp
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_MuleTextCtrl_cpp,v 1.1 2007/10/26 15:00:39 steven Exp $
--- src/MuleTextCtrl.cpp.orig Sun Jan 1 06:17:25 2006
+++ src/MuleTextCtrl.cpp Wed Oct 10 17:53:08 2007
@@ -26,6 +26,7 @@
#include <wx/menu.h>
#include <wx/intl.h>
#include <wx/clipbrd.h>
+#include <wx/dataobj.h>
/**
* These are the IDs used to identify the different menu-items.

15
net/amule/patches/patch-src_Preferences_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_Preferences_cpp,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
Disable checking for new versions at startup.
--- src/Preferences.cpp.orig Fri Jun 24 10:18:35 2011
+++ src/Preferences.cpp Fri Jun 24 10:19:23 2011
@@ -1152,7 +1152,7 @@ void CPreferences::BuildItemList( const wxString& appd
/**
* Version check
**/
- NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, true )));
+ NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, false )));
/**
* Obfuscation

12
net/amule/patches/patch-src_Scanner_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Scanner_cpp,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
--- src/Scanner.cpp.orig Thu Nov 4 17:41:09 2010
+++ src/Scanner.cpp Thu Nov 4 17:44:33 2010
@@ -31,7 +31,7 @@
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-#if __STDC_VERSION__ >= 199901L
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.

27
net/amule/patches/patch-src_StatTree_h
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_StatTree_h,v 1.1 2007/07/08 18:09:58 espie Exp $
--- src/StatTree.h.orig Tue Jun 26 12:52:37 2007
+++ src/StatTree.h Tue Jun 26 12:53:48 2007
@@ -38,22 +38,7 @@
#ifndef EC_REMOTE // CLIENT_GUI
-// Try to determine sizeof(int)
-#if defined(__INT_MAX__) && defined(__LONG_MAX__)
- #if __INT_MAX__ != __LONG_MAX__
- #define USE_64BIT_ARCH
- #endif
-#else
- // #include <bits/wordsize.h> would be enough, but we shouldn't depend on
- // non-standard includes. However, we still do it :)
- #include <stdint.h>
- #ifdef __WORDSIZE
- #if __WORDSIZE == 64
- #define USE_64BIT_ARCH
- #endif
- #endif
-#endif
-// If we cannot determine wordsize, assume that we use 32bit arch.
+#define USE_64BIT_ARCH
#define VIRTUAL virtual

28
net/amule/patches/patch-src_UploadBandwidthThrottler_cpp Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-src_UploadBandwidthThrottler_cpp,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
Bugfix from upstream git: fix a crash on close if the throttler is
active and sleeping when the sockets are destroyed.
--- src/UploadBandwidthThrottler.cpp.orig Sat Mar 28 20:29:59 2009
+++ src/UploadBandwidthThrottler.cpp Fri Dec 3 10:41:19 2010
@@ -287,7 +287,7 @@ void* UploadBandwidthThrottler::Entry()
uint32 rememberedSlotCounter = 0;
uint32 extraSleepTime = TIME_BETWEEN_UPLOAD_LOOPS;
- while (m_doRun) {
+ while (m_doRun && !TestDestroy()) {
uint32 timeSinceLastLoop = ::GetTickCountFullRes() - lastLoopTick;
// Get current speed from UploadSpeedSense
@@ -322,6 +322,11 @@ void* UploadBandwidthThrottler::Entry()
if(timeSinceLastLoop < sleepTime) {
Sleep(sleepTime-timeSinceLastLoop);
+ }
+
+ // Check after sleep in case the thread has been signaled to end
+ if (!m_doRun || TestDestroy()) {
+ break;
}
const uint32 thisLoopTick = ::GetTickCountFullRes();

30
net/amule/patches/patch-src_amule_cpp
View File

@ -1,11 +1,23 @@
$OpenBSD: patch-src_amule_cpp,v 1.1 2007/10/26 15:00:39 steven Exp $
--- src/amule.cpp.orig Fri Apr 21 05:13:51 2006
+++ src/amule.cpp Wed Oct 10 17:53:08 2007
@@ -97,6 +97,7 @@
#include <CoreFoundation/CFBundle.h>
#include <wx/mac/corefoundation/cfstring.h>
#endif
+ #include <wx/msgdlg.h>
#endif
$OpenBSD: patch-src_amule_cpp,v 1.2 2011/06/24 08:42:31 dcoppa Exp $
Disable checking for new versions at startup: it's useless and was
causing a crash with amuled on sparc64.
--- src/amule.cpp.orig Tue Aug 18 18:24:58 2009
+++ src/amule.cpp Thu Nov 4 15:25:39 2010
@@ -727,6 +727,7 @@ bool CamuleApp::OnInit()
printf("\n%s\n", (const char *)unicode2char(msg));
}
+#ifndef __OPENBSD__
// Test if there's any new version
if (thePrefs::CheckNewVersion()) {
// We use the thread base because I don't want a dialog to pop up.
@@ -736,6 +737,7 @@ bool CamuleApp::OnInit()
version_check->Create();
version_check->Run();
}
+#endif
// Create main dialog, or fork to background (daemon).
InitGui(geometry_enabled, geom_string);

27
net/amule/patches/patch-src_utils_cas_configfile_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-src_utils_cas_configfile_c,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
Sane defaults.
--- src/utils/cas/configfile.c.orig Wed Dec 1 16:59:01 2010
+++ src/utils/cas/configfile.c Wed Dec 1 17:01:45 2010
@@ -44,9 +44,9 @@ int writeconfig(void)
"# font_size - size the font\n",
"# source_image - image where the text will be writen\n",
"# *_line - x,y,[1/0] enabled or disabled\n\n",
- "font /usr/share/fonts/corefonts/times.ttf\n",
+ "font ${X11BASE}/lib/X11/fonts/TTF/DejaVuSerif.ttf\n",
"font_size 10.5\n",
- "source_image /usr/share/pixmaps/stat.png\n",
+ "source_image ${TRUEPREFIX}/share/cas/stat.png\n",
"first_line 23,17,1\n",
"second_line 23,34,1\n",
"third_line 23,51,1\n",
@@ -54,7 +54,7 @@ int writeconfig(void)
"fifth_line 23,85,1\n",
"sixth_line 23,102,1\n",
"seventh_line 23,119,1\n",
- "template /usr/share/pixmaps/tmp.html\n",
+ "template ${TRUEPREFIX}/share/cas/tmp.html\n",
"img_type 0\n"
};

20
net/amule/patches/patch-src_utils_wxCas_src_wxcasprefs_cpp
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_utils_wxCas_src_wxcasprefs_cpp,v 1.1 2007/10/26 15:00:39 steven Exp $
--- src/utils/wxCas/src/wxcasprefs.cpp.orig Fri Dec 16 13:09:29 2005
+++ src/utils/wxCas/src/wxcasprefs.cpp Wed Oct 10 17:53:08 2007
@@ -297,7 +297,7 @@ WxCasPrefs::WxCasPrefs ( wxWindow * parent ) : wxDialo
m_validateButton =
new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) );
m_cancelButton =
- new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) );
+ new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) );
m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 );
m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 );
@@ -321,7 +321,6 @@ BEGIN_EVENT_TABLE ( WxCasPrefs, wxDialog )
EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton )
EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton )
EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
-EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel ) // Defined in wxDialog
EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
END_EVENT_TABLE ()

13
net/amule/patches/patch-src_utils_wxCas_src_wxcasprefs_h
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_utils_wxCas_src_wxcasprefs_h,v 1.1 2007/10/26 15:00:39 steven Exp $
--- src/utils/wxCas/src/wxcasprefs.h.orig Fri Dec 16 13:09:29 2005
+++ src/utils/wxCas/src/wxcasprefs.h Wed Oct 10 17:53:08 2007
@@ -101,8 +101,7 @@ class WxCasPrefs: public wxDialog (private)
ID_AUTOSTATIMG_COMBO,
ID_AUTOSTATIMG_BROWSE_BUTTON,
ID_FTP_UPDATE_CHECK,
- ID_VALIDATE_BUTTON,
- ID_CANCEL_BUTTON
+ ID_VALIDATE_BUTTON
};
protected:

6
net/amule/pkg/PLIST-daemon
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-daemon,v 1.1 2007/07/08 18:09:58 espie Exp $
bin/amulecmd
bin/amuled
@comment $OpenBSD: PLIST-daemon,v 1.2 2011/06/24 08:42:31 dcoppa Exp $
@bin bin/amulecmd
@bin bin/amuled
@man man/man1/amulecmd.1
@man man/man1/amuled.1

132
net/amule/pkg/PLIST-main
View File

@ -1,30 +1,57 @@
@comment $OpenBSD: PLIST-main,v 1.4 2009/12/22 00:31:22 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2011/06/24 08:42:31 dcoppa Exp $
@pkgpath net/amule
bin/amule
bin/amulegui
bin/ed2k
@bin bin/alc
@bin bin/alcc
@bin bin/amule
@bin bin/amulegui
@comment bin/autostart-xas
@bin bin/cas
@bin bin/ed2k
bin/mldonkey_importer
@bin bin/wxcas
@comment lib/xchat/
@comment lib/xchat/plugins/
@comment lib/xchat/plugins/xas.pl
@comment man/de/
@comment man/de/man1/
@comment @man man/de/man1/alc.1
@comment @man man/de/man1/alcc.1
@comment @man man/de/man1/amule.1
@comment @man man/de/man1/amulecmd.1
@comment @man man/de/man1/amuled.1
@comment @man man/de/man1/amulegui.1
@comment @man man/de/man1/amuleweb.1
@comment @man man/de/man1/cas.1
@comment @man man/de/man1/ed2k.1
@comment @man man/de/man1/wxcas.1
@comment @man man/de/man1/xas.1
@comment man/es/
@comment man/es/man1/
@comment @man man/es/man1/alc.1
@comment @man man/es/man1/alcc.1
@comment @man man/es/man1/amule.1
@comment @man man/es/man1/amulecmd.1
@comment @man man/es/man1/amuled.1
@comment @man man/es/man1/amuleweb.1
@comment @man man/es/man1/cas.1
@comment @man man/es/man1/ed2k.1
@comment @man man/es/man1/wxcas.1
@comment @man man/es/man1/xas.1
@comment man/eu/
@comment man/eu/man1/
@comment @man man/eu/man1/alc.1
@comment @man man/eu/man1/alcc.1
@comment @man man/eu/man1/amule.1
@comment @man man/eu/man1/amulecmd.1
@comment @man man/eu/man1/amuled.1
@comment @man man/eu/man1/amuleweb.1
@comment @man man/eu/man1/cas.1
@comment @man man/eu/man1/ed2k.1
@comment @man man/eu/man1/wxcas.1
@comment @man man/eu/man1/xas.1
@comment man/fr/
@comment man/fr/man1/
@comment @man man/fr/man1/alcc.1
@comment @man man/fr/man1/amule.1
@comment @man man/fr/man1/amulecmd.1
@comment @man man/fr/man1/amuled.1
@ -32,21 +59,49 @@ bin/mldonkey_importer
@comment @man man/fr/man1/ed2k.1
@comment man/hu/
@comment man/hu/man1/
@comment @man man/hu/man1/alc.1
@comment @man man/hu/man1/alcc.1
@comment @man man/hu/man1/amule.1
@comment @man man/hu/man1/amulecmd.1
@comment @man man/hu/man1/amuled.1
@comment @man man/hu/man1/amuleweb.1
@comment @man man/hu/man1/cas.1
@comment @man man/hu/man1/ed2k.1
@comment @man man/hu/man1/wxcas.1
@comment @man man/hu/man1/xas.1
@comment man/it/
@comment man/it/man1/
@comment @man man/it/man1/amule.1
@comment @man man/it/man1/amulecmd.1
@comment @man man/it/man1/amuled.1
@comment @man man/it/man1/amulegui.1
@comment @man man/it/man1/amuleweb.1
@comment @man man/it/man1/ed2k.1
@man man/man1/alc.1
@man man/man1/alcc.1
@man man/man1/amule.1
@man man/man1/amulegui.1
@man man/man1/cas.1
@man man/man1/ed2k.1
@man man/man1/wxcas.1
@comment @man man/man1/xas.1
share/applications/
share/amule/
share/amule/skins/
share/amule/skins/gnome.zip
share/amule/skins/kde4.zip
share/amule/skins/tango.zip
share/amule/skins/xfce.zip
share/applications/alc.desktop
share/applications/amule.desktop
share/applications/amulegui.desktop
share/applications/wxcas.desktop
share/cas/
share/cas/stat.png
share/cas/tmp.html
share/doc/amule/
@comment share/doc/amule/Doxyfile
@comment share/doc/amule/ABOUT-NLS
@comment share/doc/amule/Changelog
@comment share/doc/amule/Doxyfile
@comment share/doc/amule/EC_Protocol.txt
share/doc/amule/ED2K-Links.HOWTO
@comment share/doc/amule/INSTALL
@ -56,89 +111,64 @@ share/doc/amule/README
share/doc/amule/amulesig.txt
share/doc/amule/license.txt
@comment share/doc/amule/socks4.protocol
share/locale/
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/amule.mo
share/locale/bg/
share/locale/bg/LC_MESSAGES/
share/locale/ast/
share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/amule.mo
share/locale/bg/LC_MESSAGES/amule.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/amule.mo
share/locale/da/
share/locale/da/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/amule.mo
share/locale/da/LC_MESSAGES/amule.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/amule.mo
share/locale/el/LC_MESSAGES/amule.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/amule.mo
share/locale/en_US/
share/locale/en_US/LC_MESSAGES/
share/locale/en_US/LC_MESSAGES/amule.mo
share/locale/es/
share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/amule.mo
share/locale/es_MX/
share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/amule.mo
share/locale/et_EE/
share/locale/et_EE/LC_MESSAGES/
share/locale/et_EE/LC_MESSAGES/amule.mo
share/locale/eu/
share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/amule.mo
share/locale/fi/
share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/amule.mo
share/locale/fr/
share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/amule.mo
share/locale/gl/
share/locale/gl/LC_MESSAGES/
share/locale/gl/LC_MESSAGES/amule.mo
share/locale/hr/
share/locale/hr/LC_MESSAGES/
share/locale/he/LC_MESSAGES/amule.mo
share/locale/hr/LC_MESSAGES/amule.mo
share/locale/hu/
share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/amule.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/amule.mo
share/locale/it_CH/
share/locale/it_CH/LC_MESSAGES/
share/locale/it_CH/LC_MESSAGES/amule.mo
share/locale/ja/LC_MESSAGES/amule.mo
share/locale/ko_KR/
share/locale/ko_KR/LC_MESSAGES/
share/locale/ko_KR/LC_MESSAGES/amule.mo
share/locale/nl/
share/locale/nl/LC_MESSAGES/
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/amule.mo
share/locale/nl/LC_MESSAGES/amule.mo
share/locale/pl/
share/locale/pl/LC_MESSAGES/
share/locale/nn/LC_MESSAGES/amule.mo
share/locale/pl/LC_MESSAGES/amule.mo
share/locale/pt_BR/
share/locale/pt_BR/LC_MESSAGES/
share/locale/pt_BR/LC_MESSAGES/amule.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/amule.mo
share/locale/ru/
share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/amule.mo
share/locale/sl/
share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/amule.mo
share/locale/zh_CN/
share/locale/zh_CN/LC_MESSAGES/
share/locale/sq/
share/locale/sq/LC_MESSAGES/
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/
share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/amule.mo
share/pixmaps/
share/pixmaps/alc.xpm
share/pixmaps/amule.xpm
share/pixmaps/amulegui.xpm
share/pixmaps/wxcas.xpm
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database

130
net/amule/pkg/PLIST-web
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-web,v 1.1 2007/07/08 18:09:58 espie Exp $
bin/amuleweb
@comment $OpenBSD: PLIST-web,v 1.2 2011/06/24 08:42:31 dcoppa Exp $
@bin bin/amuleweb
@man man/man1/amuleweb.1
share/amule/
share/amule/webserver/
@ -119,6 +119,76 @@ share/amule/webserver/default/tree-closed.gif
share/amule/webserver/default/tree-leaf.gif
share/amule/webserver/default/tree-open.gif
share/amule/webserver/default/yellow.gif
share/amule/webserver/litoral/
share/amule/webserver/litoral/amuleweb-main-dload.php
share/amule/webserver/litoral/amuleweb-main-kad.php
share/amule/webserver/litoral/amuleweb-main-log.php
share/amule/webserver/litoral/amuleweb-main-prefs.php
share/amule/webserver/litoral/amuleweb-main-search.php
share/amule/webserver/litoral/amuleweb-main-servers.php
share/amule/webserver/litoral/amuleweb-main-shared.php
share/amule/webserver/litoral/amuleweb-main-stats.php
share/amule/webserver/litoral/black.gif
share/amule/webserver/litoral/blank1x1.gif
share/amule/webserver/litoral/blue1.gif
share/amule/webserver/litoral/blue2.gif
share/amule/webserver/litoral/blue3.gif
share/amule/webserver/litoral/blue4.gif
share/amule/webserver/litoral/blue5.gif
share/amule/webserver/litoral/blue6.gif
share/amule/webserver/litoral/cancel.gif
share/amule/webserver/litoral/close.png
share/amule/webserver/litoral/col.png
share/amule/webserver/litoral/connect.gif
share/amule/webserver/litoral/down.png
share/amule/webserver/litoral/edkserv_0.png
share/amule/webserver/litoral/edkserv_1.png
share/amule/webserver/litoral/favicon.ico
share/amule/webserver/litoral/filter.png
share/amule/webserver/litoral/fond.gif
share/amule/webserver/litoral/fond_haut.png
share/amule/webserver/litoral/footer.php
share/amule/webserver/litoral/index.html
share/amule/webserver/litoral/kitty.gif
share/amule/webserver/litoral/log.php
share/amule/webserver/litoral/login.php
share/amule/webserver/litoral/loginfond.gif
share/amule/webserver/litoral/loginfond_haut.png
share/amule/webserver/litoral/loginlogo.jpg
share/amule/webserver/litoral/loginlogo.png
share/amule/webserver/litoral/logo.png
share/amule/webserver/litoral/maquette.dwt
share/amule/webserver/litoral/ok.png
share/amule/webserver/litoral/pause.png
share/amule/webserver/litoral/play.png
share/amule/webserver/litoral/red.gif
share/amule/webserver/litoral/refresh.png
share/amule/webserver/litoral/search_0.png
share/amule/webserver/litoral/search_1.png
share/amule/webserver/litoral/shared_0.png
share/amule/webserver/litoral/shared_1.png
share/amule/webserver/litoral/sheserv_0.png
share/amule/webserver/litoral/sheserv_1.png
share/amule/webserver/litoral/stats.php
share/amule/webserver/litoral/stats_0.png
share/amule/webserver/litoral/stats_1.png
share/amule/webserver/litoral/stats_tree.php
share/amule/webserver/litoral/style.css
share/amule/webserver/litoral/tab_bottom.png
share/amule/webserver/litoral/tab_bottom_left.png
share/amule/webserver/litoral/tab_bottom_right.png
share/amule/webserver/litoral/tab_left.png
share/amule/webserver/litoral/tab_right.png
share/amule/webserver/litoral/tab_top.png
share/amule/webserver/litoral/tab_top_left.png
share/amule/webserver/litoral/tab_top_right.png
share/amule/webserver/litoral/transf_0.png
share/amule/webserver/litoral/transf_1.png
share/amule/webserver/litoral/tree-closed.gif
share/amule/webserver/litoral/tree-leaf.gif
share/amule/webserver/litoral/tree-open.gif
share/amule/webserver/litoral/up.png
share/amule/webserver/litoral/yellow.gif
share/amule/webserver/php-default/
share/amule/webserver/php-default/amuleweb-main-dload.php
share/amule/webserver/php-default/amuleweb-main-kad.php
@ -166,3 +236,59 @@ share/amule/webserver/php-default/tree-closed.gif
share/amule/webserver/php-default/tree-leaf.gif
share/amule/webserver/php-default/tree-open.gif
share/amule/webserver/php-default/up.jpeg
share/applications/
share/locale/
share/locale/bg/
share/locale/bg/LC_MESSAGES/
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/cs/
share/locale/cs/LC_MESSAGES/
share/locale/da/
share/locale/da/LC_MESSAGES/
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/el/
share/locale/el/LC_MESSAGES/
share/locale/es/
share/locale/es/LC_MESSAGES/
share/locale/eu/
share/locale/eu/LC_MESSAGES/
share/locale/fi/
share/locale/fi/LC_MESSAGES/
share/locale/fr/
share/locale/fr/LC_MESSAGES/
share/locale/gl/
share/locale/gl/LC_MESSAGES/
share/locale/he/
share/locale/he/LC_MESSAGES/
share/locale/hr/
share/locale/hr/LC_MESSAGES/
share/locale/hu/
share/locale/hu/LC_MESSAGES/
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/ja/
share/locale/ja/LC_MESSAGES/
share/locale/nl/
share/locale/nl/LC_MESSAGES/
share/locale/nn/
share/locale/nn/LC_MESSAGES/
share/locale/pl/
share/locale/pl/LC_MESSAGES/
share/locale/pt_BR/
share/locale/pt_BR/LC_MESSAGES/
share/locale/ru/
share/locale/ru/LC_MESSAGES/
share/locale/sl/
share/locale/sl/LC_MESSAGES/
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/tr/
share/locale/tr/LC_MESSAGES/
share/locale/uk/
share/locale/uk/LC_MESSAGES/
share/locale/zh_CN/
share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_TW/
share/locale/zh_TW/LC_MESSAGES/