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

update to 2.8.2, appears to work fine on both i386 and sparc64.

Browse Source
This commit is contained in:
espie 2007-02-02 19:28:52 +00:00
parent e485fc1daf
commit 9ece792b31
7 changed files with 47 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
net/mldonkey/stable/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2007/01/24 01:32:51 espie Exp $
# $OpenBSD: Makefile,v 1.18 2007/02/02 19:28:52 espie Exp $
COMMENT='e-donkey client'
CATEGORIES=net
COMMENT= 'e-donkey client'
CATEGORIES= net
MAINTAINER=Marc Espie <espie@openbsd.org>
MAINTAINER= Marc Espie <espie@openbsd.org>
# GPL
PERMIT_PACKAGE_FTP= Yes
@ -18,28 +18,28 @@ AUTOCONF_VERSION= 2.59
#CONFIGURE_ARGS+= --enable-ocamlver=3.07
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
HOMEPAGE=http://mldonkey.sourceforge.net/Main_Page
HOMEPAGE= http://mldonkey.sourceforge.net/Main_Page
MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=mldonkey/}
DISTNAME=mldonkey-2.8.1
PKGNAME=${DISTNAME}p1
EXTRACT_SUFX=.tar.bz2
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mldonkey/}
DISTNAME= mldonkey-2.8.2
PKGNAME= ${DISTNAME}
EXTRACT_SUFX= .tar.bz2
CONFIGURE_ARGS+=--enable-gui=newgui1
CONFIGURE_ENV+=CPPFLAGS='-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include'
CONFIGURE_ENV+=LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
CONFIGURE_ENV+= CPPFLAGS='-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include'
CONFIGURE_ENV+= LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
USE_X11=Yes
USE_GMAKE=Yes
MODULES=lang/ocaml
BUILD_DEPENDS=::x11/lablgtk
USE_X11= Yes
USE_GMAKE= Yes
MODULES= lang/ocaml
BUILD_DEPENDS= ::x11/lablgtk
LIB_DEPENDS= gdk.>=1,gtk.>=1::x11/gtk+ \
bz2::archivers/bzip2 \
gd::graphics/gd \
magic::devel/libmagic
FAKE_FLAGS=MODOCAML_NATIVE=${MODOCAML_NATIVE}
NO_REGRESS=Yes
FAKE_FLAGS= MODOCAML_NATIVE=${MODOCAML_NATIVE}
NO_REGRESS= Yes
post-install:
mkdir -p ${PREFIX}/share/mldonkey

8
net/mldonkey/stable/distinfo
View File

@ -1,4 +1,4 @@
MD5 (mldonkey-2.8.1.tar.bz2) = 10452ad305f105d0d0761977f825694d
RMD160 (mldonkey-2.8.1.tar.bz2) = 0b9e351d42178d8a6a6bdd71fc9b56eded44144d
SHA1 (mldonkey-2.8.1.tar.bz2) = c8ce8fd2b9fa4cbe147389893d2007edba054c35
SIZE (mldonkey-2.8.1.tar.bz2) = 2642676
MD5 (mldonkey-2.8.2.tar.bz2) = 123aeb79a3ca91a4943b59f044e98d4a
RMD160 (mldonkey-2.8.2.tar.bz2) = ce95184805ac8f4c690e37c75d418b5f7e265f92
SHA1 (mldonkey-2.8.2.tar.bz2) = 510fad86b4c83b54a7e8836cec3a3f30d67aed8a
SIZE (mldonkey-2.8.2.tar.bz2) = 2652074

10
net/mldonkey/stable/patches/patch-config_configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_configure_in,v 1.4 2006/10/27 07:23:50 espie Exp $
--- config/configure.in.orig Sun Sep 17 20:42:57 2006
+++ config/configure.in Thu Oct 26 20:10:28 2006
@@ -845,7 +845,7 @@ if test "$GD" != "no"; then
$OpenBSD: patch-config_configure_in,v 1.5 2007/02/02 19:28:52 espie Exp $
--- config/configure.in.orig Wed Nov 29 00:17:31 2006
+++ config/configure.in Fri Feb 2 13:50:33 2007
@@ -850,7 +850,7 @@ if test "$GD" != "no"; then
PNG_LDFLAGS=`$PNGLIBCONFIG --ldflags`
LDFLAGS="$LDFLAGS $PNG_LDFLAGS"
fi
@ -10,7 +10,7 @@ $OpenBSD: patch-config_configure_in,v 1.4 2006/10/27 07:23:50 espie Exp $
# restore variables
LIBS=$SAVE_LIBS_PNG
CFLAGS=$SAVE_CFLAGS_PNG
@@ -873,7 +873,7 @@ if test "$GD" != "no"; then
@@ -878,7 +878,7 @@ if test "$GD" != "no"; then
GD=yes
GD_PNG=yes
AC_MSG_RESULT(yes)

14
net/mldonkey/stable/patches/patch-src_networks_donkey_donkeyClient_ml
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_networks_donkey_donkeyClient_ml,v 1.1 2007/01/24 01:32:51 espie Exp $
--- src/networks/donkey/donkeyClient.ml.orig Tue Sep 5 16:18:24 2006
+++ src/networks/donkey/donkeyClient.ml Wed Jan 24 02:25:44 2007
@@ -438,15 +438,17 @@ let client_wants_file c md4 =
$OpenBSD: patch-src_networks_donkey_donkeyClient_ml,v 1.2 2007/02/02 19:28:52 espie Exp $
--- src/networks/donkey/donkeyClient.ml.orig Sun Nov 26 17:36:29 2006
+++ src/networks/donkey/donkeyClient.ml Fri Feb 2 13:51:15 2007
@@ -442,15 +442,17 @@ let client_wants_file c md4 =
let new_chunk up begin_pos end_pos =
if begin_pos <> end_pos then
@ -26,7 +26,7 @@ $OpenBSD: patch-src_networks_donkey_donkeyClient_ml,v 1.1 2007/01/24 01:32:51 es
let identify_client_brand c =
if c.client_brand = Brand_unknown then
@@ -1989,13 +1991,21 @@ end else *)
@@ -2039,13 +2041,21 @@ end else *)
set_rtimeout sock !!upload_timeout;
let up, waiting = match c.client_upload with
@ -49,7 +49,7 @@ $OpenBSD: patch-src_networks_donkey_donkeyClient_ml,v 1.1 2007/01/24 01:32:51 es
up_waiting = old_up.up_waiting;
}, old_up.up_waiting
| _ ->
@@ -2004,6 +2014,7 @@ end else *)
@@ -2054,6 +2064,7 @@ end else *)
up_pos = Int64.zero;
up_end_chunk = Int64.zero;
up_chunks = [];
@ -57,7 +57,7 @@ $OpenBSD: patch-src_networks_donkey_donkeyClient_ml,v 1.1 2007/01/24 01:32:51 es
up_waiting = false;
}, false
in
@@ -2091,12 +2102,12 @@ make 1500 connections/10 minutes. *)
@@ -2141,12 +2152,12 @@ make 1500 connections/10 minutes. *)
let init_client sock c =
set_handler sock WRITE_DONE (fun s ->
match c.client_upload with

16
net/mldonkey/stable/patches/patch-src_networks_donkey_donkeyFiles_ml
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_networks_donkey_donkeyFiles_ml,v 1.1 2007/01/24 01:32:51 espie Exp $
--- src/networks/donkey/donkeyFiles.ml.orig Sat May 20 01:43:54 2006
+++ src/networks/donkey/donkeyFiles.ml Wed Jan 24 02:25:44 2007
$OpenBSD: patch-src_networks_donkey_donkeyFiles_ml,v 1.2 2007/02/02 19:28:52 espie Exp $
--- src/networks/donkey/donkeyFiles.ml.orig Tue Nov 21 23:34:33 2006
+++ src/networks/donkey/donkeyFiles.ml Fri Feb 2 13:51:16 2007
@@ -123,7 +123,7 @@ module NewUpload = struct
(* lprintf "send_client_block\n"; *)
if per_client > 0 && CommonUploads.can_write_len sock max_msg_size then
@ -16,24 +16,24 @@ $OpenBSD: patch-src_networks_donkey_donkeyFiles_ml,v 1.1 2007/01/24 01:32:51 esp
begin
+ send_small_block c sock up.up_file up.up_pos max_len;
if !verbose_upload then
lprintf_nl "END OF CHUNK (%d) %Ld" max_len up.up_end_chunk;
lprintf_nl "End of chunk (%d) %Ld %s" max_len up.up_end_chunk (file_best_name up.up_file);
- send_small_block c sock up.up_file up.up_pos max_len;
+ up.up_flying_chunks <- up.up_flying_chunks @ [current_chunk];
+ up.up_flying_chunks <- up.up_flying_chunks @ [current_chunk];
up.up_chunks <- chunks;
let per_client = per_client - max_len in
match chunks with
- [] ->
+ | [] ->
+ | [] ->
if !verbose_upload then
- lprintf_nl "NO CHUNKS";
- c.client_upload <- None;
+ lprintf_nl "NO MORE CHUNKS";
+ up.up_waiting <- false;
+ up.up_waiting <- false;
| (begin_pos, end_pos) :: _ ->
up.up_pos <- begin_pos;
up.up_end_chunk <- end_pos;
@@ -168,10 +169,10 @@ module NewUpload = struct
let size = mini max_msg_size size in
let size = min max_msg_size size in
send_client_block c sock size;
(match c.client_upload with
- None -> ()

8
net/mldonkey/stable/patches/patch-src_networks_donkey_donkeyTypes_ml
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_networks_donkey_donkeyTypes_ml,v 1.1 2007/01/24 01:32:51 espie Exp $
--- src/networks/donkey/donkeyTypes.ml.orig Tue Sep 5 16:18:24 2006
+++ src/networks/donkey/donkeyTypes.ml Wed Jan 24 02:25:44 2007
@@ -569,6 +569,8 @@ and upload_info = {
$OpenBSD: patch-src_networks_donkey_donkeyTypes_ml,v 1.2 2007/02/02 19:28:52 espie Exp $
--- src/networks/donkey/donkeyTypes.ml.orig Sun Nov 26 17:36:29 2006
+++ src/networks/donkey/donkeyTypes.ml Fri Feb 2 13:51:16 2007
@@ -602,6 +602,8 @@ and upload_info = {
mutable up_pos : int64;
mutable up_end_chunk : int64;
mutable up_chunks : (int64 * int64) list;

12
net/mldonkey/stable/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2006/10/27 07:23:50 espie Exp $
@comment $OpenBSD: PLIST,v 1.7 2007/02/02 19:28:52 espie Exp $
bin/mlbt
bin/mlbt+gui
bin/mldc
@ -20,21 +20,13 @@ share/mldonkey/distrib/Bugs.txt
share/mldonkey/distrib/ChangeLog
share/mldonkey/distrib/Copying.txt
share/mldonkey/distrib/Developers.txt
share/mldonkey/distrib/FAQ.html
share/mldonkey/distrib/GeoIP_LICENSE.txt
share/mldonkey/distrib/Install.txt
share/mldonkey/distrib/Readme.txt
share/mldonkey/distrib/Todo.txt
share/mldonkey/distrib/ed2k_links.txt
share/mldonkey/distrib/ed2k_mozilla/
share/mldonkey/distrib/ed2k_mozilla/README
share/mldonkey/distrib/ed2k_mozilla/mldonkey_protocol_handler-1.7.xpi
share/mldonkey/distrib/ed2k_mozilla/src/
share/mldonkey/distrib/ed2k_mozilla/src/components/
share/mldonkey/distrib/ed2k_mozilla/src/components/ed2kprotocol.js
share/mldonkey/distrib/ed2k_mozilla/src/contents.rdf
share/mldonkey/distrib/ed2k_mozilla/src/install.js
share/mldonkey/distrib/ed2k_mozilla/src/install.rdf
share/mldonkey/distrib/ed2k_mozilla/mldonkey_protocol_handler-1.8.xpi
share/mldonkey/distrib/ed2k_submit/
share/mldonkey/distrib/ed2k_submit/README.MLdonkeySubmit
share/mldonkey/distrib/ed2k_submit/ed2k.protocol