Date: Sat, 14 Feb 2004 14:04:20 +0100 From: "alexander" <arundel@gmx.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/62835: update of /net/mldonkey to v2.5.10 Message-ID: <20040214130420.GA55753@gmx.net> Resent-Message-ID: <200402141310.i1EDADeA072502@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62835
>Category: ports
>Synopsis: update of /net/mldonkey to v2.5.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 14 05:10:13 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: No Name
>Release: FreeBSD 4.9-STABLE i386
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD skatecity 4.9-STABLE FreeBSD 4.9-STABLE #0: Sun Feb 8 17:15=
:36 CET 2004 arundel@skatecity:/usr/obj/usr/src/sys/ARUNDEL i386
>Description:
update of /net/mldonkey to v2.5.10
>How-To-Repeat:
>Fix:
--- output begins here ---
diff -urP /usr/ports/net/mldonkey/Makefile /usr/ports/custom/mldonkey/Makef=
ile
--- /usr/ports/net/mldonkey/Makefile Sat Feb 7 07:08:15 2004
+++ /usr/ports/custom/mldonkey/Makefile Sat Feb 14 13:57:00 2004
@@ -6,87 +6,106 @@
#
=20
PORTNAME=3D mldonkey
-PORTVERSION=3D 2.5.4
-PORTREVISION=3D 1
+PORTVERSION=3D 2.5.10
CATEGORIES=3D net
MASTER_SITES=3D ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=3D ${PORTNAME}/release-${PORTVERSION:C/\.(.)$/-\1/}/off=
icial
-DISTNAME=3D ${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}
+MASTER_SITE_SUBDIR=3D ${PORTNAME}
+DISTNAME=3D ${PORTNAME}-${PORTVERSION}
=20
MAINTAINER=3D holger@e-gitt.net
COMMENT?=3D A OCAML client for multiple peer-to-peer networks
=20
-BUILD_DEPENDS=3D ocamlc:${PORTSDIR}/lang/ocaml
+BUILD_DEPENDS=3D ocamlc:${PORTSDIR}/lang/ocaml \
+ lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
+ ${LOCALBASE}/lib/ocaml/jabbr.cma:${PORTSDIR}/net/ocaml-jabbr
=20
GNU_CONFIGURE=3D yes
-CONFIGURE_ARGS=3D --enable-pthread --enable-ocamlver=3D3
-WRKSRC=3D ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}
+USE_AUTOCONF=3D yes
+USE_AUTOCONF_VER=3D 213
+CONFIGURE_WRKSRC=3D ${WRKSRC}/config
+CONFIGURE_ARGS=3D --enable-pthread --enable-ocamlver=3D3.07+2
+WRKSRC=3D ${WRKDIR}/${DISTNAME}
USE_GMAKE=3D yes
+USE_GNOME=3D gtk12
ALL_TARGET=3D depend opt
=20
-.if defined(WITHOUT_GUI)
-.if defined(WITHOUT_CORE)
+.ifdef(WITHOUT_GUI) && (WITHOUT_CORE)
.error "Cool, you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll =
do nothing."
.endif
-# have no 'without-' flag
+
+.ifdef(WITHOUT_GUI)
CONFIGURE_ARGS+=3D--disable-gui
+USE_GNOME=3D
PLIST_SUB+=3D CORE=3D"" GUI=3D"@comment " GUICORE=3D"@comment "
+BUILD_DEPENDS=3D ocamlc:${PORTSDIR}/lang/ocaml
PKGNAMESUFFIX=3D -core
-.else
-PLIST_SUB+=3D GUI=3D""
-BUILD_DEPENDS+=3D lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
- ${LOCALBASE}/lib/ocaml/jabbr.cma:${PORTSDIR}/net/ocaml-jabbr
-# we don't need lablgtk as RUN dependency, but we need gtk+glib
-USE_GNOME=3D gtk12
-.if defined(WITHOUT_CORE)
+.endif
+
+.ifdef(WITHOUT_CORE)
+PLIST_SUB+=3D GUI=3D"" CORE=3D"@comment " GUICORE=3D"@comment "
PKGNAMESUFFIX=3D -gui
-PLIST_SUB+=3D CORE=3D"@comment " GUICORE=3D"@comment "
-.else
-PLIST_SUB+=3D CORE=3D"" GUICORE=3D""
.endif
+
+.ifdef(WITHOUT_MULTINET)
+CONFIGURE_ARGS+=3D--disable-multinet
.endif
=20
-DOCFILES=3D AUTHORS BUGS ChangeLog FAQ.html \
- INSTALL TODO ed2k_links.txt
+DOC_FILES=3D Authors.txt Bugs.txt ChangeLog FAQ.html \
+ Install.txt Todo.txt Readme.txt ed2k_links.txt
+
+TARGET_DIR=3D ${PREFIX}/bin
=20
pre-everything::
-.if !defined(WITHOUT_GUI) && !defined(WITHOUT_CORE)
+.ifndef(WITHOUT_GUI)
@${ECHO_MSG} "You can disable the GUI by defining WITHOUT_GUI."
+.endif
+
+.ifndef(WITHOUT_CORE)
@${ECHO_MSG} "You can disable the CORE by defining WITHOUT_CORE."
.endif
=20
+.ifndef(WITHOUT_MULTINET)
+ @${ECHO_MSG} "You can only compile support for edonkey by defining WITHOU=
T_MULTINET."
+.endif
+
post-patch:
- @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
+ @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${SCRIPTDIR}/wrapper.sh > \
${WRKDIR}/wrapper.sh
=20
do-install:
.ifndef(WITHOUT_CORE)
- @${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${PREFIX}/bin/mlnet-real
- @${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey ${PREFIX}/bin
- @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/mlnet
+ ${INSTALL} -d ${TARGET_DIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${TARGET_DIR}/mlnet-real
+ ${INSTALL_SCRIPT} ${SCRIPTDIR}/kill_mldonkey ${TARGET_DIR}
+ ${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${TARGET_DIR}/mlnet
.endif
.ifndef(WITHOUT_GUI)
- @${INSTALL_PROGRAM} ${WRKSRC}/mlchat ${PREFIX}/bin
- @${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${PREFIX}/bin
- @${INSTALL_PROGRAM} ${WRKSRC}/mlim ${PREFIX}/bin
+ ${INSTALL} -d ${TARGET_DIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/mlchat ${TARGET_DIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${TARGET_DIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/mlim ${TARGET_DIR}
.endif
.ifndef(WITHOUT_CORE && WITHOUT_GUI)
- @${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${PREFIX}/bin
- @${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter ${PREFIX}/bin
- @${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui ${PREFIX}/bin
+ ${INSTALL} -d ${TARGET_DIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${TARGET_DIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter ${TARGET_DIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui ${TARGET_DIR}
.endif
+
+post-install:
.ifndef(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
-.for file in ${DOCFILES}
- @${INSTALL_DATA} ${WRKSRC}/distrib/${file} ${DOCSDIR}
+
+.for file in ${DOC_FILES}
+ @${INSTALL_MAN} ${WRKSRC}/distrib/${file} ${DOCSDIR}
.endfor
.endif
=20
-post-install:
- @${CAT} ${PKGMESSAGE}
+ ${SED} -e "s|%%DOCSDIR%%|${DOCSDIR}|" ${PKGMESSAGE} | \
+ ${SED} -e "s|%%DISTRIB%%|${WRKSRC}/distrib|" > /dev/tty
=20
install-user: extract
-.if !defined(LANG)
+.ifndef (LANG)
@${ECHO_MSG} "Please call as: make install-user LANG=3D<lang>"
@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !"
.else
diff -urP /usr/ports/net/mldonkey/distinfo /usr/ports/custom/mldonkey/disti=
nfo
--- /usr/ports/net/mldonkey/distinfo Sat Nov 1 11:01:54 2003
+++ /usr/ports/custom/mldonkey/distinfo Tue Feb 10 13:18:10 2004
@@ -1 +1 @@
-MD5 (mldonkey-2.5-4.tar.gz) =3D ef72a0c8e1337bfcce9f80f4a94dd927
+MD5 (mldonkey-2.5.10.tar.gz) =3D 1bab1c008e7f867ccb48d8f1fd7e278d
Only in /usr/ports/net/mldonkey/files: kill_mldonkey
diff -urP /usr/ports/net/mldonkey/files/patch-aa /usr/ports/custom/mldonkey=
/files/patch-aa
--- /usr/ports/net/mldonkey/files/patch-aa Thu Jan 1 01:00:00 1970
+++ /usr/ports/custom/mldonkey/files/patch-aa Thu Feb 12 22:46:08 2004
@@ -0,0 +1,74 @@
+--- config/configure.in.orig Tue Feb 10 00:06:46 2004
++++ config/configure.in Thu Feb 12 22:45:22 2004
+@@ -203,13 +203,6 @@
+=20
+ AC_CHECK_PROG(RPMBUILD,rpmbuild,rpmbuild)
+ AC_CHECK_PROG(RPMBUILD,rpm,rpm)
+-AC_CHECK_PROG(WGET, wget, wget)
+-if test -z "$ac_cv_prog_WGET"; then=20
+- $CC -o wget wget.c || echo "Cannot compile wget.c"
+- AC_PATH_PROG(WGET, wget,,$SOURCE_DIR/config) =20
+- ac_cv_prog_WGET=3D"$ac_cv_path_WGET"
+-fi
+-WGET=3D"$ac_cv_prog_WGET"
+=20
+ if test "$BUILD_OCAML" =3D "yes"; then
+=20
+@@ -224,7 +217,7 @@
+ if test ! -f ocaml-"$DOWNLOAD_OCAML".tar.gz; then
+ echo Downloading ...
+=20
+- $WGET http://pauillac.inria.fr/caml/distrib/ocaml-"$REQUIR=
ED_OCAML"/ocaml-"$DOWNLOAD_OCAML".tar.gz
++ fetch http://pauillac.inria.fr/caml/distrib/ocaml-"$REQUIRED_OCAM=
L"/ocaml-"$DOWNLOAD_OCAML".tar.gz
+=20
+ # $WGET http://savannah.nongnu.org/download/mldonkey/tools/ocaml-=
"$REQUIRED_OCAML".tar.gz
+ # $WGET http://pauillac.inria.fr/~lefessan/mldonkey/ocaml-"$REQUI=
RED_OCAML".tar.gz
+@@ -381,39 +374,6 @@
+ AC_CHECK_LIB(iconv,iconv_open,[ICONV=3Dyes])
+=20
+=20
+-AC_CHECK_HEADERS(endian.h,,[=09
+- echo "Do you want this script to install endian.h to /usr/include (y/n=
)?"
+- read i
+- case "$i" in
+- y* | Y*)
+- echo "Will now try to copy endian.h to /usr/include/"
+- cp -i ../include/endian.h /usr/include
+- mkdir -vp /usr/include/bits
+- cp -i ../include/bits/endian.h /usr/include/bits/
+- ;;
+- *)=20
+- exit 1
+- ;;
+- esac
+- ])
+-
+-AC_CHECK_HEADERS(byteswap.h,,[=09
+- 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/
+- ;;
+- *)=20
+- exit 1
+- ;;
+- esac
+- ])
+-
+-
+ # On linux plaforms, we will have to check that includes from kernel are
+ # available.
+ OS_FILES=3Dunix
+@@ -617,7 +577,7 @@
+ rm -rf lablgtk-"$REQUIRED_LABLGTK"
+ if test ! -f lablgtk-"$REQUIRED_LABLGTK".tar.gz; then
+ echo Downloading ...
+- $WGET http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablg=
tk-"$REQUIRED_LABLGTK".tar.gz
++ fetch http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablg=
tk-"$REQUIRED_LABLGTK".tar.gz
+ fi
+ if test ! -f lablgtk-"$REQUIRED_LABLGTK".tar.gz; then exit 1; fi
+=20
Only in /usr/ports/net/mldonkey/files: patch-configure
Only in /usr/ports/net/mldonkey/files: wrapper.sh
diff -urP /usr/ports/net/mldonkey/pkg-message /usr/ports/custom/mldonkey/pk=
g-message
--- /usr/ports/net/mldonkey/pkg-message Fri Jun 27 04:27:26 2003
+++ /usr/ports/custom/mldonkey/pkg-message Fri Feb 13 01:03:52 2004
@@ -1,7 +1,7 @@
ATTENTION=08=08=08=08=08=08=08=08=08ATTENTION:
=20
- If you want to know how to use mldonkey, read "INSTALL" or
- "FAQ.html" in the port docs (/usr/local/share/doc/mldonkey)
+ "FAQ.html" in the port docs (%%DOCSDIR%%)
=20
- It is not a bad idea to install mplayer. You will be able
to preview half-downloaded files (if you have the beginning).
@@ -20,6 +20,10 @@
- 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).
+
+- Maybe you want to have a look at
+ %%DISTRIB%%.
+ You might find some useful browser plugins and stuff.
=20
+------------------------------------------------------------+
|- For upgraders: The names of the binaries have changed. |
diff -urP /usr/ports/net/mldonkey/pkg-plist /usr/ports/custom/mldonkey/pkg-=
plist
--- /usr/ports/net/mldonkey/pkg-plist Fri Jun 27 04:27:26 2003
+++ /usr/ports/custom/mldonkey/pkg-plist Sat Feb 14 13:35:59 2004
@@ -7,11 +7,12 @@
%%GUI%%bin/mlchat
%%GUI%%bin/mlgui
%%GUI%%bin/mlim
-%%PORTDOCS%%share/doc/mldonkey/AUTHORS
-%%PORTDOCS%%share/doc/mldonkey/BUGS
-%%PORTDOCS%%share/doc/mldonkey/ChangeLog
-%%PORTDOCS%%share/doc/mldonkey/FAQ.html
-%%PORTDOCS%%share/doc/mldonkey/INSTALL
-%%PORTDOCS%%share/doc/mldonkey/TODO
-%%PORTDOCS%%share/doc/mldonkey/ed2k_links.txt
+%%PORTDOCS%%%%DOCSDIR%%/Authors.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/Bugs.txt
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/Install.txt
+%%PORTDOCS%%%%DOCSDIR%%/Todo.txt
+%%PORTDOCS%%%%DOCSDIR%%/ed2k_links.txt
%%PORTDOCS%%@dirrm share/doc/mldonkey
diff -urP /usr/ports/net/mldonkey/scripts/kill_mldonkey /usr/ports/custom/m=
ldonkey/scripts/kill_mldonkey
--- /usr/ports/net/mldonkey/scripts/kill_mldonkey Thu Jan 1 01:00:00 1970
+++ /usr/ports/custom/mldonkey/scripts/kill_mldonkey Tue Feb 10 13:13:08 20=
04
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2003
+# Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
+# Holger Lamm <holger@e-gitt.net>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO=
SE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI=
AL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI=
CT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+#!/bin/sh
+
+#
+# Add Username and password here
+# like this:
+#
+HTTPUSER=3D"you"
+HTTPPASS=3D"yourpassword"
+
+# Add location and port of mldonkey core
+HTTPURL=3D"127.0.0.1:4080"
+
+# internal configuration
+HTTP_COMMAND=3D"/usr/bin/fetch"
+HTTP_COMMAND_ARGS=3D"-1 -q -s"
+
+if [ -n "${HTTPUSER}" -a -n "${HTTPPASS}" ]
+then
+ export HTTP_AUTH=3Dbasic:*:${HTTPUSER}:${HTTPPASS}
+fi
+
+${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} "http://${HTTPURL}/submit?q=3Dkill"
+
diff -urP /usr/ports/net/mldonkey/scripts/wrapper.sh /usr/ports/custom/mldo=
nkey/scripts/wrapper.sh
--- /usr/ports/net/mldonkey/scripts/wrapper.sh Thu Jan 1 01:00:00 1970
+++ /usr/ports/custom/mldonkey/scripts/wrapper.sh Tue Feb 10 13:13:08 2004
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+PREFIX=3D"%%PREFIX%%/bin"
+PROGRAM=3D"${0}"
+DIRNAME=3D${HOME}/.mldonkey
+
+if [ ! -d ${DIRNAME} ]
+then
+ mkdir -p ${DIRNAME}
+fi
+
+echo " ${*} " | grep " \-createdironly " ||
+{
+ cd ${DIRNAME} &&
+ echo Running under ${DIRNAME} &&
+ exec ${PREFIX}/${PROGRAM##*/}-real "${@}" ||
+ echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the =
proper permissions to create it and try again
+}
--- output ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040214130420.GA55753>