diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2006-03-17 02:17:51 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2006-03-17 02:17:51 +0000 |
| commit | 37c34428b0ed67d3b51ae5a6eb7d40627ca205a8 (patch) | |
| tree | 4a5988a2283f8668b4f299a4da3652093ca36c4a /net-p2p | |
| parent | 74964e813de25a1fa32177da5cc3b7e5969b4dcf (diff) | |
| download | ports-37c34428b0ed67d3b51ae5a6eb7d40627ca205a8.tar.gz ports-37c34428b0ed67d3b51ae5a6eb7d40627ca205a8.zip | |
o Update to 2.7.4
o Move FILESDIR/mlnet.sh to FILESDIR/mlnet.in
o Properly use USE_RC_SUBR pointing at mlnet
o Depend upon archivers/bzip2 if libbz2.so is not available
o Use a new source for the startup server.met since the former is
no longer available
Notes
Notes:
svn path=/head/; revision=157470
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/mldonkey-devel/Makefile | 27 | ||||
| -rw-r--r-- | net-p2p/mldonkey-devel/distinfo | 6 | ||||
| -rw-r--r-- | net-p2p/mldonkey-devel/files/mlnet.in | 2 | ||||
| -rw-r--r-- | net-p2p/mldonkey-devel/pkg-plist | 1 |
4 files changed, 21 insertions, 15 deletions
diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile index df1670dc716d..2016d620a567 100644 --- a/net-p2p/mldonkey-devel/Makefile +++ b/net-p2p/mldonkey-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mldonkey -PORTVERSION= 2.7.3 -PORTREVISION= 3 +PORTVERSION= 2.7.4 CATEGORIES+= net-p2p MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -23,9 +22,8 @@ CONFLICTS= mldonkey-[0-9]* USE_BZIP2= yes USE_ICONV= yes -USE_RC_SUBR= yes +USE_RC_SUBR= mlnet USE_AUTOTOOLS= autoconf:259:env -USE_REINPLACE= yes GNU_CONFIGURE= yes USE_GMAKE= yes ALL_TARGET= opt @@ -41,6 +39,13 @@ CONFIGURE_ENV+= \ PTHREAD_LIBS="${PTHREAD_LIBS}" ### +## Library dependency handling +### +.if !exists(/usr/lib/libbz2.so) +LIB_DEPENDS+= bz2:${PORTSDIR}/archivers/bzip2 +.endif + +### ## Options activation ### .if defined(WITHOUT_GUI) @@ -127,9 +132,14 @@ post-patch: @${REINPLACE_CMD} -E \ -e 's|%%AUTOCONF%%|${AUTOCONF}|' \ ${BUILD_WRKSRC}/config/Makefile.in -# rc.d - @${SED} -e "s|%%PREFIX%%|${PREFIX}|" \ - ${FILESDIR}/mlnet.sh > ${WRKDIR}/mlnet.sh +# update server.met provider +.for file in \ + src/daemon/common/commonOptions.ml \ + src/networks/donkey/donkeyServers.ml + @${REINPLACE_CMD} -E \ + -e 's|http://www.gruk.org/server.met.gz|http://www.jd2k.com/server.met|' \ + ${WRKSRC}/${file} +.endfor pre-configure: cd ${WRKSRC}/config && ${AUTOCONF} @@ -173,9 +183,6 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/distrib/${file} ${DOCSDIR} .endfor .endif -# rc.d - @${INSTALL_SCRIPT} ${WRKDIR}/mlnet.sh \ - ${PREFIX}/etc/rc.d post-install: @${CAT} ${PKGMESSAGE} diff --git a/net-p2p/mldonkey-devel/distinfo b/net-p2p/mldonkey-devel/distinfo index 65b43abcc953..8bd46009e379 100644 --- a/net-p2p/mldonkey-devel/distinfo +++ b/net-p2p/mldonkey-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (mldonkey-2.7.3.tar.bz2) = f6c7c183fda53a9e9c26a09f8cdefda7 -SHA256 (mldonkey-2.7.3.tar.bz2) = 01411b8806629ac5ded65565bf1fc8018f5b6678043ecd9d06b8a341a1183566 -SIZE (mldonkey-2.7.3.tar.bz2) = 2807272 +MD5 (mldonkey-2.7.4.tar.bz2) = 94e9216086103114528b434fb61424d4 +SHA256 (mldonkey-2.7.4.tar.bz2) = 9c88088278b893e4d47613574078edc65d47b60674dfc6794f3c5824a8f27ffe +SIZE (mldonkey-2.7.4.tar.bz2) = 2810334 diff --git a/net-p2p/mldonkey-devel/files/mlnet.in b/net-p2p/mldonkey-devel/files/mlnet.in index ad55c9c7b347..128ff3835178 100644 --- a/net-p2p/mldonkey-devel/files/mlnet.in +++ b/net-p2p/mldonkey-devel/files/mlnet.in @@ -17,7 +17,7 @@ #mlnet_logfile="" # -. /etc/rc.subr +. %%RC_SUBR%% name="mlnet" rcvar=`set_rcvar` diff --git a/net-p2p/mldonkey-devel/pkg-plist b/net-p2p/mldonkey-devel/pkg-plist index 671b4482cf9e..b9af7d87b461 100644 --- a/net-p2p/mldonkey-devel/pkg-plist +++ b/net-p2p/mldonkey-devel/pkg-plist @@ -1,4 +1,3 @@ -etc/rc.d/mlnet.sh %%CORE%%bin/mld_hash %%CORE%%bin/mlnet %%CORE%%bin/mlnet-real |