FreeBSD Bugzilla – Attachment 123540 Details for
Bug 166891
net-p2p/mldonkey: Update to version 3.1.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 7.03 KB, created by
tkato432
on 2012-04-12 19:40:13 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2012-04-12 19:40:13 UTC
Size:
7.03 KB
patch
obsolete
>diff -urN /usr/ports/net-p2p/mldonkey/Makefile net-p2p/mldonkey/Makefile >--- /usr/ports/net-p2p/mldonkey/Makefile 2011-09-24 14:01:55.000000000 +0900 >+++ net-p2p/mldonkey/Makefile 2012-04-10 22:30:48.000000000 +0900 >@@ -6,7 +6,7 @@ > # > > PORTNAME= mldonkey >-PORTVERSION= 3.1.0 >+PORTVERSION= 3.1.1 > CATEGORIES+= net-p2p > MASTER_SITES= SF > >@@ -38,12 +38,7 @@ > CPPFLAGS+= -I${LOCALBASE}/include > LDFLAGS+= -L${LOCALBASE}/lib > >-### >-## Library dependency handling >-### >-.if !exists(/usr/lib/libbz2.so) >-LIB_DEPENDS+= bz2:${PORTSDIR}/archivers/bzip2 >-.endif >+SUB_FILES= pkg-message > > ### > ## Options activation >@@ -101,7 +96,6 @@ > DOCFILES= Authors.txt Bugs.txt ChangeLog Developers.txt \ > Install.txt Todo.txt ed2k_links.txt > PORTDOCS= ${DOCFILES} >-PKGMESSAGE= ${WRKDIR}/pkg-message > > # build additional tools > ALL_TARGET+= \ >@@ -145,23 +139,16 @@ > -e 's|^(PTHREAD_LIBS[^=]*=).*$$|\1${PTHREAD_LIBS}|' \ > ${BUILD_WRKSRC}/config/Makefile.config > >-pre-install: >-.if exists(${.CURDIR}/pkg-message) >- @${SED} -e 's,%%DOCSDIR%%,${DOCSDIR},' \ >- < ${.CURDIR}/pkg-message > ${PKGMESSAGE} >-.elif exists(${MASTERDIR}/pkg-message) >- @${SED} -e 's,%%DOCSDIR%%,${DOCSDIR},' \ >- < ${MASTERDIR}/pkg-message > ${PKGMESSAGE} >-.endif >- > do-install: > .ifndef(WITHOUT_CORE) > @${INSTALL_PROGRAM} ${WRKSRC}/mld_hash ${PREFIX}/bin > @${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${PREFIX}/bin/mlnet-real > @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/mlnet >+.if !defined(NOPORTEXAMPLES) > @${MKDIR} ${EXAMPLESDIR} > @${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey ${EXAMPLESDIR} > .endif >+.endif > .ifndef(WITHOUT_GUI) > @${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${PREFIX}/bin > .endif >diff -urN /usr/ports/net-p2p/mldonkey/distinfo net-p2p/mldonkey/distinfo >--- /usr/ports/net-p2p/mldonkey/distinfo 2011-09-16 19:47:34.000000000 +0900 >+++ net-p2p/mldonkey/distinfo 2012-04-09 13:10:49.000000000 +0900 >@@ -1,2 +1,2 @@ >-SHA256 (mldonkey-3.1.0.tar.bz2) = fd0f132a1bea96c9dfa2f7837278c8ccbbb703efc2c7ac48386b5103a1450308 >-SIZE (mldonkey-3.1.0.tar.bz2) = 2820081 >+SHA256 (mldonkey-3.1.1.tar.bz2) = 996294aab274f324a913f6a3665006c70d3aa1748f75cc5cbc560ed0ddee40b2 >+SIZE (mldonkey-3.1.1.tar.bz2) = 2820894 >diff -urN /usr/ports/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc >--- /usr/ports/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc 2011-09-16 06:43:41.000000000 +0900 >+++ net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc 1970-01-01 09:00:00.000000000 +0900 >@@ -1,11 +0,0 @@ >---- src/utils/lib/CryptoPP.cc~ >-+++ src/utils/lib/CryptoPP.cc >-@@ -5413,7 +5413,7 @@ template <class T> const T& AbstractEucl >- Element g[3]={b, a}; >- unsigned int i0=0, i1=1, i2=2; >- >-- while (!Equal(g[i1], this->Identity())) >-+ while (!this->Equal(g[i1], this->Identity())) >- { >- g[i2] = Mod(g[i0], g[i1]); >- unsigned int t = i0; i0 = i1; i1 = i2; i2 = t; >diff -urN /usr/ports/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h >--- /usr/ports/net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h 2011-09-16 06:43:41.000000000 +0900 >+++ net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h 1970-01-01 09:00:00.000000000 +0900 >@@ -1,20 +0,0 @@ >---- src/utils/lib/CryptoPP.h~ >-+++ src/utils/lib/CryptoPP.h >-@@ -2632,7 +2633,7 @@ public: >- >- pointer allocate(size_type n, const void * = NULL) >- { >-- CheckSize(n); >-+ this->CheckSize(n); >- if (n == 0) >- return NULL; >- return new T[n]; >-@@ -5611,7 +5612,7 @@ template <class T, class B, class BASE> >- { >- this->ThrowIfInvalidTruncatedSize(size); >- >-- PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType)); >-+ this->PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType)); >- CorrectEndianess(this->m_data, this->m_data, this->BlockSize() - 2*sizeof(HashWordType)); >- >- this->m_data[this->m_data.size()-2] = B::ToEnum() ? this->GetBitCountHi() : this->GetBitCountLo(); >\ No newline at end of file >diff -urN /usr/ports/net-p2p/mldonkey/files/pkg-message.in net-p2p/mldonkey/files/pkg-message.in >--- /usr/ports/net-p2p/mldonkey/files/pkg-message.in 1970-01-01 09:00:00.000000000 +0900 >+++ net-p2p/mldonkey/files/pkg-message.in 2012-04-09 06:15:32.000000000 +0900 >@@ -0,0 +1,27 @@ >+ ATTENTIONATTENTION: >+ >+- If you want to know how to use mldonkey, read "INSTALL" or >+ "FAQ.html" in the port docs (%%DOCSDIR%%) >+ >+- It is not a bad idea to install mplayer. You will be able >+ to preview half-downloaded files (if you have the beginning). >+ >+- You can import the downloads you started with eDonkey >+ (try "import /home/directory/path/.edonkey2000-core" >+ on the console), but you can NOT go back! >+ >+- If this is the first time you install mldonkey, >+ please go to the mldonkey-gui ports dir as a user and enter: >+ >+ make install-user >+ >+ this will set up your user config. >+ >+- You have to enable the different protocols on the client >+ console. Go to the (mldonkey-) console, and try the commands >+ 'set enable_<protocol> true' (try 'voo' for reference). >+ >++------------------------------------------------------------+ >+|- For upgraders: The names of the binaries have changed. | >+| Core and GUI are called "mlnet" and "mlgui", respectively.| >++------------------------------------------------------------+ >diff -urN /usr/ports/net-p2p/mldonkey/pkg-message net-p2p/mldonkey/pkg-message >--- /usr/ports/net-p2p/mldonkey/pkg-message 2005-06-24 16:39:09.000000000 +0900 >+++ net-p2p/mldonkey/pkg-message 1970-01-01 09:00:00.000000000 +0900 >@@ -1,27 +0,0 @@ >- ATTENTIONATTENTION: >- >-- If you want to know how to use mldonkey, read "INSTALL" or >- "FAQ.html" in the port docs (%%DOCSDIR%%) >- >-- It is not a bad idea to install mplayer. You will be able >- to preview half-downloaded files (if you have the beginning). >- >-- You can import the downloads you started with eDonkey >- (try "import /home/directory/path/.edonkey2000-core" >- on the console), but you can NOT go back! >- >-- If this is the first time you install mldonkey, >- please go to the mldonkey-gui ports dir as a user and enter: >- >- make install-user >- >- this will set up your user config. >- >-- You have to enable the different protocols on the client >- console. Go to the (mldonkey-) console, and try the commands >- 'set enable_<protocol> true' (try 'voo' for reference). >- >-+------------------------------------------------------------+ >-|- For upgraders: The names of the binaries have changed. | >-| Core and GUI are called "mlnet" and "mlgui", respectively.| >-+------------------------------------------------------------+ >diff -urN /usr/ports/net-p2p/mldonkey/pkg-plist net-p2p/mldonkey/pkg-plist >--- /usr/ports/net-p2p/mldonkey/pkg-plist 2006-09-29 22:37:22.000000000 +0900 >+++ net-p2p/mldonkey/pkg-plist 2012-04-10 22:19:11.000000000 +0900 >@@ -1,9 +1,9 @@ > %%CORE%%bin/mld_hash > %%CORE%%bin/mlnet > %%CORE%%bin/mlnet-real >-%%CORE%%%%EXAMPLESDIR%%/kill_mldonkey >+%%CORE%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kill_mldonkey > %%GUICORE%%bin/mlguistarter > %%GUICORE%%bin/mldonkey_previewer > %%GUICORE%%bin/mlnet+gui > %%GUI%%bin/mlgui >-%%CORE%%@dirrm %%EXAMPLESDIR%% >+%%CORE%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 166891
: 123540