aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorlioux <lioux@FreeBSD.org>2005-03-16 11:45:21 +0800
committerlioux <lioux@FreeBSD.org>2005-03-16 11:45:21 +0800
commit7dc73192912814cecab5fbb9132a9e0ad67c23bb (patch)
tree3a16f60b1c9aa8b1dd058a5dbfdacdb907e23af5 /net
parentb4fe6448ca1a4c4ae28ec25310abc1a2c2fe463b (diff)
downloadfreebsd-ports-gnome-7dc73192912814cecab5fbb9132a9e0ad67c23bb.tar.gz
freebsd-ports-gnome-7dc73192912814cecab5fbb9132a9e0ad67c23bb.tar.zst
freebsd-ports-gnome-7dc73192912814cecab5fbb9132a9e0ad67c23bb.zip
Update to development version 2.5.30 patch kit b
Diffstat (limited to 'net')
-rw-r--r--net/mldonkey-devel/Makefile14
-rw-r--r--net/mldonkey-devel/distinfo8
-rw-r--r--net/mldonkey-devel/files/patch-Makefile6
-rw-r--r--net/mldonkey-devel/files/patch-src::utils::net::ip.ml11
4 files changed, 15 insertions, 24 deletions
diff --git a/net/mldonkey-devel/Makefile b/net/mldonkey-devel/Makefile
index e9a6d8c778e5..01c6d3de2731 100644
--- a/net/mldonkey-devel/Makefile
+++ b/net/mldonkey-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= mldonkey
-PORTVERSION= 2.5.28.s1
-PORTREVISION= 2
+PORTVERSION= 2.5.30.b
CATEGORIES+= net
MASTER_SITES= http://download.berlios.de/pub/mldonkey/spiralvoice/cvs/
PKGNAMESUFFIX= -devel
@@ -27,15 +26,13 @@ NO_LATEST_LINK= yes
CONFLICTS= mldonkey-[0-9]* mldonkey-{core,gui}-[0.9]*
USE_BZIP2= yes
-USE_AUTOCONF_VER= 213
+WANT_AUTOCONF_VER= 213
USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
ALL_TARGET= opt
CONFIGURE_ARGS= --disable-pthread --enable-ocamlver=3
-CONFIGURE_WRKSRC= ${WRKSRC}/config
-MAKE_ENV= OCAMLRUNPARAM="l=256M"
WRKSRC= ${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION}
@@ -53,6 +50,8 @@ BUILD_DEPENDS+= 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= gtk12
+
+MAKE_ENV+= OCAMLRUNPARAM="l=256M"
.if defined(WITHOUT_CORE)
PKGNAMESUFFIX= -gui-devel
PLIST_SUB+= CORE="@comment " GUICORE="@comment "
@@ -78,7 +77,10 @@ post-patch:
${WRKDIR}/wrapper.sh
@${REINPLACE_CMD} -E \
-e 's|%%AUTOCONF%%|${AUTOCONF}|' \
- ${BUILD_WRKSRC}/${MAKEFILE}
+ ${BUILD_WRKSRC}/config/Makefile.in
+
+pre-configure:
+ cd ${WRKSRC}/config && ${AUTOCONF}
do-install:
.ifndef(WITHOUT_CORE)
diff --git a/net/mldonkey-devel/distinfo b/net/mldonkey-devel/distinfo
index b08944cf6948..2e9384dca3f5 100644
--- a/net/mldonkey-devel/distinfo
+++ b/net/mldonkey-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (mldonkey-2.5.28.tar.bz2) = bee2811a76f83c543ca19e45a9d04ff4
-SIZE (mldonkey-2.5.28.tar.bz2) = 2767585
-MD5 (patch_pack28s1.gz) = b1030e702611914f4104dff52889ec39
-SIZE (patch_pack28s1.gz) = 100551
+MD5 (mldonkey-2.5.30.tar.bz2) = 9b1a10ba903de3d69922980b6f48a648
+SIZE (mldonkey-2.5.30.tar.bz2) = 3026991
+MD5 (patch_pack30b.gz) = 6c316d198061fdb1b0f6c668f006b7fc
+SIZE (patch_pack30b.gz) = 79700
diff --git a/net/mldonkey-devel/files/patch-Makefile b/net/mldonkey-devel/files/patch-Makefile
index bbd57ad8fff1..70a82ad39143 100644
--- a/net/mldonkey-devel/files/patch-Makefile
+++ b/net/mldonkey-devel/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig Wed Sep 8 22:54:44 2004
-+++ Makefile Wed Sep 8 22:54:54 2004
-@@ -258,7 +258,7 @@
+--- config/Makefile.in.orig Wed Sep 8 22:54:44 2004
++++ config/Makefile.in Wed Sep 8 22:54:54 2004
+@@ -280,7 +280,7 @@
all: Makefile config/Makefile.config $(TARGET_TYPE)
config/configure: config/configure.in
diff --git a/net/mldonkey-devel/files/patch-src::utils::net::ip.ml b/net/mldonkey-devel/files/patch-src::utils::net::ip.ml
deleted file mode 100644
index 3c6c93f3fe4f..000000000000
--- a/net/mldonkey-devel/files/patch-src::utils::net::ip.ml
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils/net/ip.ml.orig Sun Jan 30 16:45:11 2005
-+++ src/utils/net/ip.ml Sun Jan 30 16:45:17 2005
-@@ -84,7 +84,7 @@
- j > 0 && j < 224 &&
- k >= 0 && k <= 255 &&
- l >= 0 && l <= 255 &&
-- i >= 0 && i <= 255
-+ i > 0 && i <= 255
-
- let reachable ip =
- !allow_local_network ||