mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-27 10:03:20 +00:00
Code Issues Releases Activity

1) net/mldonkey-devel port build got broken when lang/ocaml was

Browse Source 
updated to branch 3.09
2) Fix build with patches from ocaml CVS as of
   Sat Dec 10 23:54:24 UTC 2005
	- http://www.nongnu.org/mldonkey/

Obtained from:	MLDonkey CVS [2]
Pointy hat to:	garga [1],
		Marwan Burelle <marwan.burelle@lri.fr> [1]
This commit is contained in:
Mario Sergio Fujikawa Ferreira 2005-12-10 23:56:58 +00:00
parent 6fdf473cae
commit 34387509d2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=150839
8 changed files with 190 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net-p2p/mldonkey-devel/files/patch-config__Makefile.in Normal file
View File

@ -0,0 +1,20 @@
--- ../mldonkey.orig/config/Makefile.in Wed Nov 30 21:46:02 2005
+++ config/Makefile.in Sat Dec 10 17:44:06 2005
@@ -19,7 +19,7 @@
##################################################################
-DEVFLAGS= -warn-error Am
+DEVFLAGS= #-warn-error Am
# -dtypes
NO_LIBS_byte=
@@ -1722,7 +1722,7 @@
PA_ZOG_FILES=tools/zoggy/zog_types.ml tools/zoggy/zog_messages.ml tools/zoggy/zog_misc.ml tools/zoggy/pa_zog.ml
pa_zog.cma: $(PA_ZOG_FILES)
- $(OCAMLC) -I tools/zoggy -I +camlp4 -pp "$(CAMLP4) pa_o.cmo pr_dump.cmo" -a -o pa_zog.cma $(PA_ZOG_FILES)
+ $(OCAMLC) -I tools/zoggy -I +camlp4 -pp "$(CAMLP4) pa_o.cmo pr_dump.cmo -loc loc" -a -o pa_zog.cma $(PA_ZOG_FILES)
OCAMLPP=./ocamlpp.byte

31
net-p2p/mldonkey-devel/files/patch-config__configure.in Normal file
View File

@ -0,0 +1,31 @@
--- ../mldonkey.orig/config/configure.in Tue Dec 6 18:43:02 2005
+++ config/configure.in Sat Dec 10 17:44:06 2005
@@ -133,9 +133,9 @@
if test ! -z "$SUB_VERSION3"; then
MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
fi
-REQUIRED_OCAML=3.08.4
-DOWNLOAD_OCAML_MAJOR=3.08
-DOWNLOAD_OCAML=3.08.4
+REQUIRED_OCAML=3.09.0
+DOWNLOAD_OCAML_MAJOR=3.09
+DOWNLOAD_OCAML=3.09.0
REQUIRED_LABLGTK=1.2.7
@@ -332,6 +332,7 @@
OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
case "$OCAMLVERSION" in
"$REQUIRED_OCAML"*) ;;
+ 3.08.4*) ;;
3.08.3*) ;;
3.08.2*)
if test "$system" = "rhapsody"; then
@@ -503,6 +504,7 @@
REBUILD_OCAML=no
case "$OCAMLVERSION" in
"$REQUIRED_OCAML"*) ;;
+ 3.08.4*) ;;
3.08.3*) ;;
3.08.2*)
if test "$system" = "rhapsody"; then

30
net-p2p/mldonkey-devel/files/patch-src__daemon__common__commonInteractive.ml Normal file
View File

@ -0,0 +1,30 @@
--- ../mldonkey.orig/src/daemon/common/commonInteractive.ml Fri Dec 2 10:08:04 2005
+++ src/daemon/common/commonInteractive.ml Fri Dec 9 21:23:18 2005
@@ -106,7 +106,7 @@
let file_id = Filename.basename temp_name in
let size = Int64.to_string (file_size file) in
let duration =
- Date.time_to_string_long ((BasicSocket.last_time ()) - info.G.file_age)
+ string_of_int ((BasicSocket.last_time ()) - info.G.file_age)
in
let network = network_find_by_num info.G.file_network in
let filename = Filename.basename new_name in
@@ -117,6 +117,7 @@
(Int64.to_string (file_size file))
(Md4.to_string info.G.file_md4)
in
+ begin try
MlUnix.fork_and_exec !!file_completed_cmd
[| (* keep those for compatibility *)
"";
@@ -133,6 +134,10 @@
("INCOMING", incoming);
("NETWORK", network.network_name);
("ED2K_HASH", ed2k_hash)]
+ with e ->
+ lprintf_nl "[cInt] Exception %s while executing %s"
+ (Printexc2.to_string e) !!file_completed_cmd
+ end
(********
These two functions 'file_commit' and 'file_cancel' should be the two only

14
net-p2p/mldonkey-devel/files/patch-src__utils__lib__fst_hash.c Normal file
View File

@ -0,0 +1,14 @@
--- ../mldonkey.orig/src/utils/lib/fst_hash.c Mon Aug 1 20:53:33 2005
+++ src/utils/lib/fst_hash.c Sat Dec 10 17:44:06 2005
@@ -181,9 +181,9 @@
#include "caml/mlvalues.h"
/* returns checksum of fzhash */
-uint16 fst_hash_checksum (unsigned char *hash)
+unsigned short fst_hash_checksum (unsigned char *hash)
{
- uint16 sum = 0;
+ unsigned short sum = 0;
int i;
/* calculate 2 byte checksum used in the URL from 20 byte fthash */

20
net/mldonkey-devel/files/patch-config__Makefile.in Normal file
View File

@ -0,0 +1,20 @@
--- ../mldonkey.orig/config/Makefile.in Wed Nov 30 21:46:02 2005
+++ config/Makefile.in Sat Dec 10 17:44:06 2005
@@ -19,7 +19,7 @@
##################################################################
-DEVFLAGS= -warn-error Am
+DEVFLAGS= #-warn-error Am
# -dtypes
NO_LIBS_byte=
@@ -1722,7 +1722,7 @@
PA_ZOG_FILES=tools/zoggy/zog_types.ml tools/zoggy/zog_messages.ml tools/zoggy/zog_misc.ml tools/zoggy/pa_zog.ml
pa_zog.cma: $(PA_ZOG_FILES)
- $(OCAMLC) -I tools/zoggy -I +camlp4 -pp "$(CAMLP4) pa_o.cmo pr_dump.cmo" -a -o pa_zog.cma $(PA_ZOG_FILES)
+ $(OCAMLC) -I tools/zoggy -I +camlp4 -pp "$(CAMLP4) pa_o.cmo pr_dump.cmo -loc loc" -a -o pa_zog.cma $(PA_ZOG_FILES)
OCAMLPP=./ocamlpp.byte

31
net/mldonkey-devel/files/patch-config__configure.in Normal file
View File

@ -0,0 +1,31 @@
--- ../mldonkey.orig/config/configure.in Tue Dec 6 18:43:02 2005
+++ config/configure.in Sat Dec 10 17:44:06 2005
@@ -133,9 +133,9 @@
if test ! -z "$SUB_VERSION3"; then
MLDONKEY_VERSION=$MLDONKEY_VERSION.$SUB_VERSION3
fi
-REQUIRED_OCAML=3.08.4
-DOWNLOAD_OCAML_MAJOR=3.08
-DOWNLOAD_OCAML=3.08.4
+REQUIRED_OCAML=3.09.0
+DOWNLOAD_OCAML_MAJOR=3.09
+DOWNLOAD_OCAML=3.09.0
REQUIRED_LABLGTK=1.2.7
@@ -332,6 +332,7 @@
OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
case "$OCAMLVERSION" in
"$REQUIRED_OCAML"*) ;;
+ 3.08.4*) ;;
3.08.3*) ;;
3.08.2*)
if test "$system" = "rhapsody"; then
@@ -503,6 +504,7 @@
REBUILD_OCAML=no
case "$OCAMLVERSION" in
"$REQUIRED_OCAML"*) ;;
+ 3.08.4*) ;;
3.08.3*) ;;
3.08.2*)
if test "$system" = "rhapsody"; then

30
net/mldonkey-devel/files/patch-src__daemon__common__commonInteractive.ml Normal file
View File

@ -0,0 +1,30 @@
--- ../mldonkey.orig/src/daemon/common/commonInteractive.ml Fri Dec 2 10:08:04 2005
+++ src/daemon/common/commonInteractive.ml Fri Dec 9 21:23:18 2005
@@ -106,7 +106,7 @@
let file_id = Filename.basename temp_name in
let size = Int64.to_string (file_size file) in
let duration =
- Date.time_to_string_long ((BasicSocket.last_time ()) - info.G.file_age)
+ string_of_int ((BasicSocket.last_time ()) - info.G.file_age)
in
let network = network_find_by_num info.G.file_network in
let filename = Filename.basename new_name in
@@ -117,6 +117,7 @@
(Int64.to_string (file_size file))
(Md4.to_string info.G.file_md4)
in
+ begin try
MlUnix.fork_and_exec !!file_completed_cmd
[| (* keep those for compatibility *)
"";
@@ -133,6 +134,10 @@
("INCOMING", incoming);
("NETWORK", network.network_name);
("ED2K_HASH", ed2k_hash)]
+ with e ->
+ lprintf_nl "[cInt] Exception %s while executing %s"
+ (Printexc2.to_string e) !!file_completed_cmd
+ end
(********
These two functions 'file_commit' and 'file_cancel' should be the two only

14
net/mldonkey-devel/files/patch-src__utils__lib__fst_hash.c Normal file
View File

@ -0,0 +1,14 @@
--- ../mldonkey.orig/src/utils/lib/fst_hash.c Mon Aug 1 20:53:33 2005
+++ src/utils/lib/fst_hash.c Sat Dec 10 17:44:06 2005
@@ -181,9 +181,9 @@
#include "caml/mlvalues.h"
/* returns checksum of fzhash */
-uint16 fst_hash_checksum (unsigned char *hash)
+unsigned short fst_hash_checksum (unsigned char *hash)
{
- uint16 sum = 0;
+ unsigned short sum = 0;
int i;
/* calculate 2 byte checksum used in the URL from 20 byte fthash */