diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-04-22 20:34:52 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2003-04-22 20:34:52 +0000 |
commit | 5fd5069620275cbcea73dbcbdb343d19d9aaac9a (patch) | |
tree | 283cf8b78ba05a812955a68bee34f638d9ccd590 /net/lmule | |
parent | Update to 0.13.95. (diff) |
o Update to 1.2.0
o Remove patches merged into the distribution
o Add PKGMESSAGE warning about some POLA changes in the way LMule
works
Notes
Notes:
svn path=/head/; revision=79474
Diffstat (limited to 'net/lmule')
-rw-r--r-- | net/lmule/Makefile | 22 | ||||
-rw-r--r-- | net/lmule/distinfo | 2 | ||||
-rw-r--r-- | net/lmule/files/patch-Makefile.in | 13 | ||||
-rw-r--r-- | net/lmule/files/patch-configure | 2 | ||||
-rw-r--r-- | net/lmule/files/patch-src::CFile.cpp | 26 | ||||
-rw-r--r-- | net/lmule/files/patch-src::PPgDirectories.cpp | 25 | ||||
-rw-r--r-- | net/lmule/files/patch-src::PartFile.cpp | 25 | ||||
-rw-r--r-- | net/lmule/files/patch-src::Preferences.cpp | 25 | ||||
-rw-r--r-- | net/lmule/files/patch-src::ServerList.cpp | 25 | ||||
-rw-r--r-- | net/lmule/files/patch-src::SharedFileList.cpp | 24 | ||||
-rw-r--r-- | net/lmule/files/patch-src::UDPSocket.cpp | 29 | ||||
-rw-r--r-- | net/lmule/files/patch-src::wx::Makefile.in | 13 | ||||
-rw-r--r-- | net/lmule/files/patch-src::wx::xrc::Makefile.in | 13 | ||||
-rw-r--r-- | net/lmule/pkg-message | 19 |
14 files changed, 39 insertions, 224 deletions
diff --git a/net/lmule/Makefile b/net/lmule/Makefile index bf99451acca5..58d7a36ff100 100644 --- a/net/lmule/Makefile +++ b/net/lmule/Makefile @@ -6,7 +6,7 @@ # PORTNAME= lmule -PORTVERSION= 1.1.13c +PORTVERSION= 1.2.0 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= lmule @@ -22,8 +22,8 @@ RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget USE_X_PREFIX= yes USE_GNOME= gnomehier \ gnomehack \ - gnomeprefix \ - gtk12 + gnomeprefix +USE_BZIP2= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -47,4 +47,18 @@ pre-configure: ${REINPLACE_CMD} -E \ -e 's!^(AUTOCONF|AUTOHEADER|AUTOMAKE|ACLOCAL).*$$!\1=${TRUE}!' -.include <bsd.port.mk> +post-install: + @${CAT} ${PKGMESSAGE} + +.include <bsd.port.pre.mk> + +# detect if wxgtk was linked against gtk1 or gtk2 +DECISION_GTK_1_OR_2!= ${WX_CONFIG} --cppflags + +.if (${DECISION_GTK_1_OR_2:Mgtk2} != "") +USE_GNOME+= gtk20 +.else +USE_GNOME+= gtk12 +.endif + +.include <bsd.port.post.mk> diff --git a/net/lmule/distinfo b/net/lmule/distinfo index f3467b342c87..40dd0411ab17 100644 --- a/net/lmule/distinfo +++ b/net/lmule/distinfo @@ -1 +1 @@ -MD5 (lmule-1.1.13c.tar.gz) = 9b7088f79e29c1b3e9f340970304843c +MD5 (lmule-1.2.0.tar.bz2) = f92585ddff138a9e258658bb37a5baed diff --git a/net/lmule/files/patch-Makefile.in b/net/lmule/files/patch-Makefile.in deleted file mode 100644 index c59fb39c3956..000000000000 --- a/net/lmule/files/patch-Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig Sun Mar 30 20:47:49 2003 -+++ Makefile.in Sun Mar 30 20:48:01 2003 -@@ -70,8 +70,10 @@ - BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ -+CFLAGS = @CFLAGS@ - CPP = @CPP@ - CXX = @CXX@ -+CXXFLAGS = @CXXFLAGS@ - DATADIRNAME = @DATADIRNAME@ - DEPDIR = @DEPDIR@ - DISABLE_PROGRESS = @DISABLE_PROGRESS@ diff --git a/net/lmule/files/patch-configure b/net/lmule/files/patch-configure index d6a4608344df..a0cca454fc69 100644 --- a/net/lmule/files/patch-configure +++ b/net/lmule/files/patch-configure @@ -1,6 +1,6 @@ --- configure.orig Sat Mar 29 14:13:57 2003 +++ configure Sat Mar 29 14:14:04 2003 -@@ -1704,8 +1704,6 @@ +@@ -1710,8 +1710,6 @@ # Checks for programs. # hopefully this prevents -O2 diff --git a/net/lmule/files/patch-src::CFile.cpp b/net/lmule/files/patch-src::CFile.cpp deleted file mode 100644 index 9a93a9788987..000000000000 --- a/net/lmule/files/patch-src::CFile.cpp +++ /dev/null @@ -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 --git a/net/lmule/files/patch-src::PPgDirectories.cpp b/net/lmule/files/patch-src::PPgDirectories.cpp deleted file mode 100644 index 62e2220c31e3..000000000000 --- a/net/lmule/files/patch-src::PPgDirectories.cpp +++ /dev/null @@ -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 --git a/net/lmule/files/patch-src::PartFile.cpp b/net/lmule/files/patch-src::PartFile.cpp deleted file mode 100644 index 754ef7fba952..000000000000 --- a/net/lmule/files/patch-src::PartFile.cpp +++ /dev/null @@ -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 --git a/net/lmule/files/patch-src::Preferences.cpp b/net/lmule/files/patch-src::Preferences.cpp deleted file mode 100644 index b5362cd0688a..000000000000 --- a/net/lmule/files/patch-src::Preferences.cpp +++ /dev/null @@ -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 --git a/net/lmule/files/patch-src::ServerList.cpp b/net/lmule/files/patch-src::ServerList.cpp deleted file mode 100644 index 19e5ae392a9d..000000000000 --- a/net/lmule/files/patch-src::ServerList.cpp +++ /dev/null @@ -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 --git a/net/lmule/files/patch-src::SharedFileList.cpp b/net/lmule/files/patch-src::SharedFileList.cpp deleted file mode 100644 index 1fbeec76fb7c..000000000000 --- a/net/lmule/files/patch-src::SharedFileList.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- src/SharedFileList.cpp.orig Sun Mar 23 01:02:07 2003 -+++ src/SharedFileList.cpp Sun Mar 23 01:02:34 2003 -@@ -15,6 +15,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 "stdafx.h" - #include "emule.h" - #include "emuleDlg.h" -@@ -28,6 +32,10 @@ - #include "ED2KLink.h" - #include "packets.h" - #include <time.h> -+ -+#if (defined(BSD) && (BSD >= 199103)) -+#include <libgen.h> -+#endif - - CSharedFileList::CSharedFileList(CPreferences* in_prefs,CServerConnect* in_server,CKnownFileList* in_filelist){ - app_prefs = in_prefs; diff --git a/net/lmule/files/patch-src::UDPSocket.cpp b/net/lmule/files/patch-src::UDPSocket.cpp deleted file mode 100644 index e3c102da0700..000000000000 --- a/net/lmule/files/patch-src::UDPSocket.cpp +++ /dev/null @@ -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; - } - diff --git a/net/lmule/files/patch-src::wx::Makefile.in b/net/lmule/files/patch-src::wx::Makefile.in deleted file mode 100644 index 17575f051500..000000000000 --- a/net/lmule/files/patch-src::wx::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- src/wx/Makefile.in.orig Sun Mar 30 20:48:21 2003 -+++ src/wx/Makefile.in Sun Mar 30 20:48:35 2003 -@@ -70,8 +70,10 @@ - BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ -+CFLAGS = @CFLAGS@ - CPP = @CPP@ - CXX = @CXX@ -+CXXFLAGS = @CXXFLAGS@ - DATADIRNAME = @DATADIRNAME@ - DEPDIR = @DEPDIR@ - DISABLE_PROGRESS = @DISABLE_PROGRESS@ diff --git a/net/lmule/files/patch-src::wx::xrc::Makefile.in b/net/lmule/files/patch-src::wx::xrc::Makefile.in deleted file mode 100644 index 421975fd9c95..000000000000 --- a/net/lmule/files/patch-src::wx::xrc::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- src/wx/xrc/Makefile.in.orig Sun Mar 30 20:48:55 2003 -+++ src/wx/xrc/Makefile.in Sun Mar 30 20:49:06 2003 -@@ -70,8 +70,10 @@ - BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ -+CFLAGS = @CFLAGS@ - CPP = @CPP@ - CXX = @CXX@ -+CXXFLAGS = @CXXFLAGS@ - DATADIRNAME = @DATADIRNAME@ - DEPDIR = @DEPDIR@ - DISABLE_PROGRESS = @DISABLE_PROGRESS@ diff --git a/net/lmule/pkg-message b/net/lmule/pkg-message new file mode 100644 index 000000000000..54d48749944d --- /dev/null +++ b/net/lmule/pkg-message @@ -0,0 +1,19 @@ + ATTENTIONATTENTION: + +Note: Settings were NEVER saved for SharedFile and QueueList and +possibly some other lists... Due to this, unless you are using LMule +for the first time, there will be no saved settings for these two +lists; thus, it will think all of their columns are to be hidden. + +Best fix: right-click on the grey top of each list and select each +item in that popup to display the columns... be SURE to quit LMule +after doing this because if it crashes you have to do this step +again! + +Messy fix: rm /homedir/.lmule/preferences.dat this will remove +EVERYTHING, including shares and whatnot. The preferences.dat is a +binary file, thus it will be *incredibly* difficult to change by +hand. + +Information taken from LMule developer +Ted R. Smith <un-thesis@users.sourceforge.net> |