Attachment #123540 for bug #166891

View | Details | Raw Unified | Return to bug 166891
Collapse All | Expand All




#

PORTNAME=	mldonkey
PORTVERSION=	3.1.1
CATEGORIES+=	net-p2p
MASTER_SITES=	SF


CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

SUB_FILES=	pkg-message
## Library dependency handling
###
.if !exists(/usr/lib/libbz2.so)
LIB_DEPENDS+=	bz2:${PORTSDIR}/archivers/bzip2
.endif

###
## Options activation

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+=	\

		-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

Lines 1-2 Link Here

(-)net-p2p/mldonkey/distinfo (-2 / +2 lines)
1	SHA256 (mldonkey-3.1.0.tar.bz2) = fd0f132a1bea96c9dfa2f7837278c8ccbbb703efc2c7ac48386b5103a1450308	1	SHA256 (mldonkey-3.1.1.tar.bz2) = 996294aab274f324a913f6a3665006c70d3aa1748f75cc5cbc560ed0ddee40b2
2	SIZE (mldonkey-3.1.0.tar.bz2) = 2820081	2	SIZE (mldonkey-3.1.1.tar.bz2) = 2820894

Lines 1-11 Link Here

(-)net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.cc (-11 lines)
1	--- src/utils/lib/CryptoPP.cc~
2	+++ src/utils/lib/CryptoPP.cc
3	@@ -5413,7 +5413,7 @@ template <class T> const T& AbstractEucl
4	Element g[3]={b, a};
5	unsigned int i0=0, i1=1, i2=2;
6
7	- while (!Equal(g[i1], this->Identity()))
8	+ while (!this->Equal(g[i1], this->Identity()))
9	{
10	g[i2] = Mod(g[i0], g[i1]);
11	unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;




--- 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();




	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.|
+------------------------------------------------------------+




	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.|
+------------------------------------------------------------+

Lines 1-9 Link Here

(-)net-p2p/mldonkey/pkg-plist (-2 / +2 lines)
1	%%CORE%%bin/mld_hash	1	%%CORE%%bin/mld_hash
2	%%CORE%%bin/mlnet	2	%%CORE%%bin/mlnet
3	%%CORE%%bin/mlnet-real	3	%%CORE%%bin/mlnet-real
4	%%CORE%%%%EXAMPLESDIR%%/kill_mldonkey	4	%%CORE%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kill_mldonkey
5	%%GUICORE%%bin/mlguistarter	5	%%GUICORE%%bin/mlguistarter
6	%%GUICORE%%bin/mldonkey_previewer	6	%%GUICORE%%bin/mldonkey_previewer
7	%%GUICORE%%bin/mlnet+gui	7	%%GUICORE%%bin/mlnet+gui
8	%%GUI%%bin/mlgui	8	%%GUI%%bin/mlgui
9	%%CORE%%@dirrm %%EXAMPLESDIR%%	9	%%CORE%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Return to bug 166891

Lines 6-12 Link Here

(-)net-p2p/mldonkey/Makefile (-17 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= mldonkey	8	PORTNAME= mldonkey
9	PORTVERSION= 3.1.0	9	PORTVERSION= 3.1.1
10	CATEGORIES+= net-p2p	10	CATEGORIES+= net-p2p
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12		12
Lines 38-49 Link Here
38	CPPFLAGS+= -I${LOCALBASE}/include	38	CPPFLAGS+= -I${LOCALBASE}/include
39	LDFLAGS+= -L${LOCALBASE}/lib	39	LDFLAGS+= -L${LOCALBASE}/lib
40		40
41	###	41	SUB_FILES= pkg-message
42	## Library dependency handling
43	###
44	.if !exists(/usr/lib/libbz2.so)
45	LIB_DEPENDS+= bz2:${PORTSDIR}/archivers/bzip2
46	.endif
47		42
48	###	43	###
49	## Options activation	44	## Options activation
Lines 101-107 Link Here
101	DOCFILES= Authors.txt Bugs.txt ChangeLog Developers.txt \	96	DOCFILES= Authors.txt Bugs.txt ChangeLog Developers.txt \
102	Install.txt Todo.txt ed2k_links.txt	97	Install.txt Todo.txt ed2k_links.txt
103	PORTDOCS= ${DOCFILES}	98	PORTDOCS= ${DOCFILES}
104	PKGMESSAGE= ${WRKDIR}/pkg-message
105		99
106	# build additional tools	100	# build additional tools
107	ALL_TARGET+= \	101	ALL_TARGET+= \
Lines 145-167 Link Here
145	-e 's\|^(PTHREAD_LIBS[^=]=).$$\|\1${PTHREAD_LIBS}\|' \	139	-e 's\|^(PTHREAD_LIBS[^=]=).$$\|\1${PTHREAD_LIBS}\|' \
146	${BUILD_WRKSRC}/config/Makefile.config	140	${BUILD_WRKSRC}/config/Makefile.config
147		141
148	pre-install:
149	.if exists(${.CURDIR}/pkg-message)
150	@${SED} -e 's,%%DOCSDIR%%,${DOCSDIR},' \
151	< ${.CURDIR}/pkg-message > ${PKGMESSAGE}
152	.elif exists(${MASTERDIR}/pkg-message)
153	@${SED} -e 's,%%DOCSDIR%%,${DOCSDIR},' \
154	< ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
155	.endif
156
157	do-install:	142	do-install:
158	.ifndef(WITHOUT_CORE)	143	.ifndef(WITHOUT_CORE)
159	@${INSTALL_PROGRAM} ${WRKSRC}/mld_hash ${PREFIX}/bin	144	@${INSTALL_PROGRAM} ${WRKSRC}/mld_hash ${PREFIX}/bin
160	@${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${PREFIX}/bin/mlnet-real	145	@${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${PREFIX}/bin/mlnet-real
161	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/mlnet	146	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/mlnet
		147	.if !defined(NOPORTEXAMPLES)
162	@${MKDIR} ${EXAMPLESDIR}	148	@${MKDIR} ${EXAMPLESDIR}
163	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey ${EXAMPLESDIR}	149	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey ${EXAMPLESDIR}
164	.endif	150	.endif
		151	.endif
165	.ifndef(WITHOUT_GUI)	152	.ifndef(WITHOUT_GUI)
166	@${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${PREFIX}/bin	153	@${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${PREFIX}/bin
167	.endif	154	.endif

Lines 1-20 Link Here

(-)net-p2p/mldonkey/files/patch-src__utils__lib__CryptoPP.h (-20 lines)
1	--- src/utils/lib/CryptoPP.h~
2	+++ src/utils/lib/CryptoPP.h
3	@@ -2632,7 +2633,7 @@ public:
4
5	pointer allocate(size_type n, const void * = NULL)
6	{
7	- CheckSize(n);
8	+ this->CheckSize(n);
9	if (n == 0)
10	return NULL;
11	return new T[n];
12	@@ -5611,7 +5612,7 @@ template <class T, class B, class BASE>
13	{
14	this->ThrowIfInvalidTruncatedSize(size);
15
16	- PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
17	+ this->PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
18	CorrectEndianess(this->m_data, this->m_data, this->BlockSize() - 2*sizeof(HashWordType));
19
20	this->m_data[this->m_data.size()-2] = B::ToEnum() ? this->GetBitCountHi() : this->GetBitCountLo();

Line 0 Link Here

(-)net-p2p/mldonkey/files/pkg-message.in (+27 lines)
	1	ATTENTIONATTENTION:
	2
	3	- If you want to know how to use mldonkey, read "INSTALL" or
	4	"FAQ.html" in the port docs (%%DOCSDIR%%)
	5
	6	- It is not a bad idea to install mplayer. You will be able
	7	to preview half-downloaded files (if you have the beginning).
	8
	9	- You can import the downloads you started with eDonkey
	10	(try "import /home/directory/path/.edonkey2000-core"
	11	on the console), but you can NOT go back!
	12
	13	- If this is the first time you install mldonkey,
	14	please go to the mldonkey-gui ports dir as a user and enter:
	15
	16	make install-user
	17
	18	this will set up your user config.
	19
	20	- You have to enable the different protocols on the client
	21	console. Go to the (mldonkey-) console, and try the commands
	22	'set enable_<protocol> true' (try 'voo' for reference).
	23
	24	+------------------------------------------------------------+
	25	\|- For upgraders: The names of the binaries have changed. \|
	26	\| Core and GUI are called "mlnet" and "mlgui", respectively.\|
	27	+------------------------------------------------------------+

Lines 1-27 Link Here

(-)net-p2p/mldonkey/pkg-message (-27 lines)
1	ATTENTIONATTENTION:
2
3	- If you want to know how to use mldonkey, read "INSTALL" or
4	"FAQ.html" in the port docs (%%DOCSDIR%%)
5
6	- It is not a bad idea to install mplayer. You will be able
7	to preview half-downloaded files (if you have the beginning).
8
9	- You can import the downloads you started with eDonkey
10	(try "import /home/directory/path/.edonkey2000-core"
11	on the console), but you can NOT go back!
12
13	- If this is the first time you install mldonkey,
14	please go to the mldonkey-gui ports dir as a user and enter:
15
16	make install-user
17
18	this will set up your user config.
19
20	- You have to enable the different protocols on the client
21	console. Go to the (mldonkey-) console, and try the commands
22	'set enable_<protocol> true' (try 'voo' for reference).
23
24	+------------------------------------------------------------+
25	\|- For upgraders: The names of the binaries have changed. \|
26	\| Core and GUI are called "mlnet" and "mlgui", respectively.\|
27	+------------------------------------------------------------+