- Update to 2.5.23 and unbreak

PR:		ports/70906
Submitted by:	Holger Lamm <holger@e-gitt.net> (maintainer)
Approved by:	portmgr (marcus)

6 files changed, 54 insertions, 18 deletions

diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index d74459c19109..2b11ba1e7f29 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -6,20 +6,25 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.5.21
+PORTVERSION=	2.5.23
 CATEGORIES+=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${DOWNLOADVERSION}
+
+PATCH_SITES=	http://www.schraegerpunkt.de/
+PATCHFILES=	mldonkey-${DOWNLOADVERSION}-${PORTVERSION:C/.+\.//}.patch.gz
 
 MAINTAINER?=	holger@e-gitt.net
 COMMENT?=	A OCAML client for multiple peer-to-peer networks
 
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
+DOWNLOADVERSION=2.5.22
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-pthread --enable-ocamlver=3
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION}
 USE_GMAKE=	yes
 ALL_TARGET=	depend opt
 
@@ -34,6 +39,7 @@ PKGNAMESUFFIX=	-core
 .else
 PLIST_SUB+=	GUI=""
 BUILD_DEPENDS+=	lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
+		autoconf213:${PORTSDIR}/devel/autoconf213 \
 		${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
@@ -50,16 +56,15 @@ DOCFILES=	Authors.txt Bugs.txt ChangeLog Developers.txt FAQ.html \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 pre-everything::
 .if !defined(WITHOUT_GUI) && !defined(WITHOUT_CORE)
 	@${ECHO_MSG} "You can disable the GUI by defining WITHOUT_GUI."
 	@${ECHO_MSG} "You can disable the CORE by defining WITHOUT_CORE."
 .endif
 
+pre-configure:
+	@cd ${WRKSRC}/config && ${AUTOCONF}
+
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
diff --git a/net-p2p/mldonkey-devel/distinfo b/net-p2p/mldonkey-devel/distinfo
index 68145dc76a58..5561d6c3ebf4 100644
--- a/net-p2p/mldonkey-devel/distinfo
+++ b/net-p2p/mldonkey-devel/distinfo
@@ -1,2 +1,4 @@
-MD5 (mldonkey-2.5.21.tar.gz) = 8a96738990f8ffc36eeb2c1f2f655826
-SIZE (mldonkey-2.5.21.tar.gz) = 3234137
+MD5 (mldonkey-2.5.22.tar.gz) = 958ffb63dbcfcb0f6e48788774dfbb42
+SIZE (mldonkey-2.5.22.tar.gz) = 3474104
+MD5 (mldonkey-2.5.22-23.patch.gz) = 091c77f0dd29be7443ac62e99cc41dc0
+SIZE (mldonkey-2.5.22-23.patch.gz) = 88210
diff --git a/net-p2p/mldonkey-devel/files/patch-Makefile b/net-p2p/mldonkey-devel/files/patch-Makefile
new file mode 100644
index 000000000000..3d2a0e606df0
--- /dev/null
+++ b/net-p2p/mldonkey-devel/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	Wed Sep  8 22:54:44 2004
++++ Makefile	Wed Sep  8 22:54:54 2004
+@@ -258,7 +258,7 @@
+ all: Makefile config/Makefile.config $(TARGET_TYPE)
+ 
+ config/configure: config/configure.in
+-	cd config; autoconf
++	cd config; autoconf213
+ 
+ ifeq ("$(MYCONFIG_ARGS_DEFINED)" , "yes")
+ 
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index d74459c19109..2b11ba1e7f29 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -6,20 +6,25 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.5.21
+PORTVERSION=	2.5.23
 CATEGORIES+=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${DOWNLOADVERSION}
+
+PATCH_SITES=	http://www.schraegerpunkt.de/
+PATCHFILES=	mldonkey-${DOWNLOADVERSION}-${PORTVERSION:C/.+\.//}.patch.gz
 
 MAINTAINER?=	holger@e-gitt.net
 COMMENT?=	A OCAML client for multiple peer-to-peer networks
 
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
+DOWNLOADVERSION=2.5.22
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-pthread --enable-ocamlver=3
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION}
 USE_GMAKE=	yes
 ALL_TARGET=	depend opt
 
@@ -34,6 +39,7 @@ PKGNAMESUFFIX=	-core
 .else
 PLIST_SUB+=	GUI=""
 BUILD_DEPENDS+=	lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
+		autoconf213:${PORTSDIR}/devel/autoconf213 \
 		${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
@@ -50,16 +56,15 @@ DOCFILES=	Authors.txt Bugs.txt ChangeLog Developers.txt FAQ.html \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 pre-everything::
 .if !defined(WITHOUT_GUI) && !defined(WITHOUT_CORE)
 	@${ECHO_MSG} "You can disable the GUI by defining WITHOUT_GUI."
 	@${ECHO_MSG} "You can disable the CORE by defining WITHOUT_CORE."
 .endif
 
+pre-configure:
+	@cd ${WRKSRC}/config && ${AUTOCONF}
+
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
diff --git a/net-p2p/mldonkey/distinfo b/net-p2p/mldonkey/distinfo
index 68145dc76a58..5561d6c3ebf4 100644
--- a/net-p2p/mldonkey/distinfo
+++ b/net-p2p/mldonkey/distinfo
@@ -1,2 +1,4 @@
-MD5 (mldonkey-2.5.21.tar.gz) = 8a96738990f8ffc36eeb2c1f2f655826
-SIZE (mldonkey-2.5.21.tar.gz) = 3234137
+MD5 (mldonkey-2.5.22.tar.gz) = 958ffb63dbcfcb0f6e48788774dfbb42
+SIZE (mldonkey-2.5.22.tar.gz) = 3474104
+MD5 (mldonkey-2.5.22-23.patch.gz) = 091c77f0dd29be7443ac62e99cc41dc0
+SIZE (mldonkey-2.5.22-23.patch.gz) = 88210
diff --git a/net-p2p/mldonkey/files/patch-Makefile b/net-p2p/mldonkey/files/patch-Makefile
new file mode 100644
index 000000000000..3d2a0e606df0
--- /dev/null
+++ b/net-p2p/mldonkey/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	Wed Sep  8 22:54:44 2004
++++ Makefile	Wed Sep  8 22:54:54 2004
+@@ -258,7 +258,7 @@
+ all: Makefile config/Makefile.config $(TARGET_TYPE)
+ 
+ config/configure: config/configure.in
+-	cd config; autoconf
++	cd config; autoconf213
+ 
+ ifeq ("$(MYCONFIG_ARGS_DEFINED)" , "yes")
+