Date: 02 May 2003 01:09:26 +0200 From: Andreas Kohn <andreas.kohn@gmx.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lioux@FreeBSD.org Subject: ports/51677: [PATCH] Update lmule-1.1.13c -> lmule-1.2.1 Message-ID: <1051830565.408.43.camel@klamath.ankon.homeip.net> Resent-Message-ID: <200305012310.h41NA5Zr054420@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 51677 >Category: ports >Synopsis: [PATCH] Update lmule-1.1.13c -> lmule-1.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu May 01 16:10:05 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Andreas Kohn >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: System: FreeBSD klamath.ankon.homeip.net 4.8-STABLE FreeBSD 4.8-STABLE #7: Sat Apr 12 20:56:38 CEST 2003 root@klamath.ankon.homeip.net:/usr/obj/usr/src/sys/KLAMATH i386 >Description: lmule was updated to version 1.2.1 on Apr 28 The patch below should update the net/lmule port to the new version (but there may be missing entries in pkg-plist) >How-To-Repeat: >Fix: Apply the following patch in /usr/ports/net with patch -E < lmule-1.2.1.diff, and remove the .orig files after patching. --- lmule-1.2.1.diff begins here --- diff -ruN lmule.old/Makefile lmule/Makefile --- lmule.old/Makefile Thu May 1 20:05:33 2003 +++ lmule/Makefile Thu May 1 20:04:44 2003 @@ -6,7 +6,7 @@ # PORTNAME= lmule -PORTVERSION= 1.1.13c +PORTVERSION= 1.2.1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= lmule diff -ruN lmule.old/distinfo lmule/distinfo --- lmule.old/distinfo Thu May 1 20:03:12 2003 +++ lmule/distinfo Thu May 1 20:04:25 2003 @@ -1 +1 @@ -MD5 (lmule-1.1.13c.tar.gz) = 9b7088f79e29c1b3e9f340970304843c +MD5 (lmule-1.2.1.tar.gz) = ef0efe29860873fd11a838d5c1d01a84 diff -ruN lmule.old/files/patch-src::CFile.cpp lmule/files/patch-src::CFile.cpp --- lmule.old/files/patch-src::CFile.cpp Sun Mar 23 05:46:03 2003 +++ lmule/files/patch-src::CFile.cpp Thu Jan 1 01:00:00 1970 @@ -1,26 +0,0 @@ ---- src/CFile.cpp.orig Sun Mar 23 00:13:37 2003 -+++ src/CFile.cpp Sun Mar 23 00:16:34 2003 -@@ -53,6 +53,10 @@ - #define NOMCX - #endif - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #elif (defined(__UNIX__) || defined(__GNUWIN32__)) - #include <unistd.h> - #ifdef __GNUWIN32__ -@@ -116,7 +120,11 @@ - #endif - - #ifndef MAX_PATH -- #define MAX_PATH 512 -+# if (defined(BSD) && (BSD >= 199103)) -+# define MAX_PATH MAXPATHLEN -+# else -+# define MAX_PATH 512 -+# endif - #endif - - // some broken compilers don't have 3rd argument in open() and creat() diff -ruN lmule.old/files/patch-src::PPgDirectories.cpp lmule/files/patch-src::PPgDirectories.cpp --- lmule.old/files/patch-src::PPgDirectories.cpp Sun Mar 23 05:46:03 2003 +++ lmule/files/patch-src::PPgDirectories.cpp Thu Jan 1 01:00:00 1970 @@ -1,25 +0,0 @@ ---- src/PPgDirectories.cpp.orig Sun Mar 23 00:10:03 2003 -+++ src/PPgDirectories.cpp Sun Mar 23 00:10:42 2003 -@@ -1,6 +1,10 @@ - // PPgDirectories.cpp : implementation file - // - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - //#include "stdafx.h" - #include "wintypes.h" - #include "emule.h" -@@ -13,7 +17,11 @@ - #include "wx/xrc/xmlres.h" - #include "wx/xrc/xh_all.h" - -+#if (defined(BSD) && (BSD >= 199103)) -+#define MAX_PATH MAXPATHLEN -+#else - #define MAX_PATH 2048 -+#endif - - #define GetDlgItem(x,clas) XRCCTRL(*this,#x,clas) - #define IsDlgButtonChecked(x) XRCCTRL(*this,#x,wxCheckBox)->GetValue() diff -ruN lmule.old/files/patch-src::PartFile.cpp lmule/files/patch-src::PartFile.cpp --- lmule.old/files/patch-src::PartFile.cpp Sun Mar 23 05:46:03 2003 +++ lmule/files/patch-src::PartFile.cpp Thu Jan 1 01:00:00 1970 @@ -1,25 +0,0 @@ ---- src/PartFile.cpp.orig Sun Mar 23 00:11:08 2003 -+++ src/PartFile.cpp Sun Mar 23 00:12:13 2003 -@@ -14,6 +14,10 @@ - //along with this program; if not, write to the Free Software - //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #include "PartFile.h" - #include "emule.h" - #include "updownclient.h" -@@ -177,7 +181,11 @@ - delete gaplist.GetAt(pos); - } - -+#if (defined(BSD) && (BSD >= 199103)) -+#define MAX_PATH MAXPATHLEN -+#else - #define MAX_PATH 1024 -+#endif - - void CPartFile::CreatePartFile(){ - // use lowest free partfilenumber for free file (InterCeptor) diff -ruN lmule.old/files/patch-src::Preferences.cpp lmule/files/patch-src::Preferences.cpp --- lmule.old/files/patch-src::Preferences.cpp Sun Mar 23 05:46:03 2003 +++ lmule/files/patch-src::Preferences.cpp Thu Jan 1 01:00:00 1970 @@ -1,25 +0,0 @@ ---- src/Preferences.cpp.orig Tue Mar 18 19:22:47 2003 -+++ src/Preferences.cpp Sun Mar 23 00:58:06 2003 -@@ -22,6 +22,10 @@ - #include <config.h> - #endif // HAVE_CONFIG_H - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #include "wintypes.h" - #include "Preferences.h" - #include <time.h> -@@ -41,7 +45,11 @@ - #include <sys/stat.h> - #include <sys/types.h> - -+#if (defined(BSD) && (BSD >= 199103)) -+#define MAX_PATH MAXPATHLEN -+#else - #define MAX_PATH 2048 -+#endif - - extern int sprintf(char *__restrict __s,__const char*__restrict __format,...) __attribute__ ((__format__ (__printf__, 2,3))); - diff -ruN lmule.old/files/patch-src::ServerList.cpp lmule/files/patch-src::ServerList.cpp --- lmule.old/files/patch-src::ServerList.cpp Sun Mar 23 05:46:03 2003 +++ lmule/files/patch-src::ServerList.cpp Thu Jan 1 01:00:00 1970 @@ -1,25 +0,0 @@ ---- src/ServerList.cpp.orig Sun Mar 23 00:12:47 2003 -+++ src/ServerList.cpp Sun Mar 23 00:13:13 2003 -@@ -15,6 +15,9 @@ - //along with this program; if not, write to the Free Software - //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif - - //#include "stdafx.h" - #include "ServerList.h" -@@ -346,7 +349,12 @@ - - #include <wx/txtstrm.h> - #include <wx/wfstream.h> -+ -+#if (defined(BSD) && (BSD >= 199103)) -+#define MAX_PATH MAXPATHLEN -+#else - #define MAX_PATH 1024 -+#endif - - void CServerList::AddServersFromTextFile(CString strFilename,bool isstaticserver) { - wxString strLine; diff -ruN lmule.old/files/patch-src::UDPSocket.cpp lmule/files/patch-src::UDPSocket.cpp --- lmule.old/files/patch-src::UDPSocket.cpp Sun Mar 23 05:46:03 2003 +++ lmule/files/patch-src::UDPSocket.cpp Thu Jan 1 01:00:00 1970 @@ -1,29 +0,0 @@ ---- src/UDPSocket.cpp.orig Sun Mar 23 00:20:02 2003 -+++ src/UDPSocket.cpp Sun Mar 23 00:22:39 2003 -@@ -25,7 +25,7 @@ - static pthread_attr_t attr;//=PTHREAD_CREATE_DETACHED; - - #ifdef __FreeBSD__ --static pthread_mutex_t gethostby_mutex = PTHREAD_MUTEX_INITIALIZER; -+static wxMutex *s_mutexProtectingGetHostByName; - - static int - convert (struct hostent *host, struct hostent *result, -@@ -131,7 +131,7 @@ - { - struct hostent *host; - -- pthread_mutex_lock (&gethostby_mutex); -+ s_mutexProtectingGetHostByName->Lock(); - - host = gethostbyname (name); - if (!host || -@@ -140,7 +140,7 @@ - result = NULL; - } - -- pthread_mutex_unlock (&gethostby_mutex); -+ s_mutexProtectingGetHostByName->Unlock(); - return result; - } - --- lmule-1.2.1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1051830565.408.43.camel>