diff -Nur mldonkey.orig/Makefile mldonkey/Makefile --- mldonkey.orig/Makefile Tue Feb 24 20:44:02 2004 +++ mldonkey/Makefile Tue Feb 24 20:37:38 2004 @@ -2,15 +2,14 @@ # Date created: 21 August 2002 # Whom: Holger Lamm # -# $FreeBSD: ports/net/mldonkey/Makefile,v 1.14 2004/02/04 05:08:14 marcus Exp $ +# $FreeBSD: ports/net/mldonkey/Makefile,v 1.12 2003/10/30 09:35:00 krion Exp $ # PORTNAME= mldonkey -PORTVERSION= 2.5.4 -PORTREVISION= 1 +PORTVERSION= 2.5.10 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= ${PORTNAME}/release-${PORTVERSION:C/\.(.)$/-\1/}/official +MASTER_SITES= http://mldonkey.org/downloads/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/} MAINTAINER= holger@e-gitt.net @@ -46,8 +45,8 @@ .endif .endif -DOCFILES= AUTHORS BUGS ChangeLog FAQ.html \ - INSTALL TODO ed2k_links.txt +DOCFILES= Authors.txt Bugs.txt ChangeLog Developers.txt FAQ.html \ + Install.txt Readme.txt Todo.txt ed2k_links.txt pre-everything:: .if !defined(WITHOUT_GUI) && !defined(WITHOUT_CORE) diff -Nur mldonkey.orig/distinfo mldonkey/distinfo --- mldonkey.orig/distinfo Tue Feb 24 20:44:02 2004 +++ mldonkey/distinfo Tue Feb 24 19:31:50 2004 @@ -1 +1,2 @@ -MD5 (mldonkey-2.5-4.tar.gz) = ef72a0c8e1337bfcce9f80f4a94dd927 +MD5 (mldonkey-2.5.10.tar.gz) = 1bab1c008e7f867ccb48d8f1fd7e278d +SIZE (mldonkey-2.5.10.tar.gz) = 3190624 diff -Nur mldonkey.orig/files/patch-configure mldonkey/files/patch-configure --- mldonkey.orig/files/patch-configure Tue Feb 24 20:44:02 2004 +++ mldonkey/files/patch-configure Tue Feb 24 20:16:42 2004 @@ -1,11 +1,179 @@ ---- config/configure.orig Sun Oct 12 20:41:28 2003 -+++ config/configure Wed Jan 7 13:24:29 2004 -@@ -3651,7 +3651,7 @@ +--- config/configure.orig Tue Feb 24 19:50:54 2004 ++++ config/configure Tue Feb 24 19:55:33 2004 +@@ -8147,7 +8147,7 @@ - case "$OCAMLVERSION" in - 3.06) TYPE_FORMAT="";; -- 3.07) TYPE_FORMAT="";; -+ 3.07*) TYPE_FORMAT="";; - *) TYPE_FORMAT="type ('a,'b,'c) ml_format = ('a,'b, 'c,'c) format type ('a,'b,'c) format = ('a,'b, 'c) ml_format";; - esac + +-for ac_header in endian.h ++for ac_header in sys/endian.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then +@@ -8303,167 +8303,6 @@ + fi + + done +- +- +- +-for ac_header in byteswap.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_header_compiler=no +-fi +-rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 +- +-# Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc in +- yes:no ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +- no:yes ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- ( +- cat <<\_ASBOX +-## ------------------------------------ ## +-## Report this to bug-autoconf@gnu.org. ## +-## ------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- eval "$as_ac_Header=$ac_header_preproc" +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +- +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-else +- +- echo "Do you want this script to install byteswap.h to /usr/include (y/n)?" +- read i +- case "$i" in +- y* | Y*) +- echo "Will now try to copy byteswap.h to /usr/include/" +- cp -i ../include/byteswap.h /usr/include +- mkdir -vp /usr/include/bits +- cp -i ../include/bits/byteswap.h /usr/include/bits/ +- ;; +- *) +- exit 1 +- ;; +- esac +- +-fi +- +-done +- +- + + # On linux plaforms, we will have to check that includes from kernel are + # available. diff -Nur mldonkey.orig/pkg-plist mldonkey/pkg-plist --- mldonkey.orig/pkg-plist Tue Feb 24 20:44:02 2004 +++ mldonkey/pkg-plist Tue Feb 24 20:38:25 2004 @@ -7,11 +7,13 @@ %%GUI%%bin/mlchat %%GUI%%bin/mlgui %%GUI%%bin/mlim -%%PORTDOCS%%share/doc/mldonkey/AUTHORS -%%PORTDOCS%%share/doc/mldonkey/BUGS +%%PORTDOCS%%share/doc/mldonkey/Authors.txt +%%PORTDOCS%%share/doc/mldonkey/Bugs.txt %%PORTDOCS%%share/doc/mldonkey/ChangeLog +%%PORTDOCS%%share/doc/mldonkey/Developers.txt %%PORTDOCS%%share/doc/mldonkey/FAQ.html -%%PORTDOCS%%share/doc/mldonkey/INSTALL -%%PORTDOCS%%share/doc/mldonkey/TODO +%%PORTDOCS%%share/doc/mldonkey/Install.txt +%%PORTDOCS%%share/doc/mldonkey/Readme.txt +%%PORTDOCS%%share/doc/mldonkey/Todo.txt %%PORTDOCS%%share/doc/mldonkey/ed2k_links.txt %%PORTDOCS%%@dirrm share/doc/mldonkey