Index: head/net-p2p/mldonkey/Makefile
===================================================================
--- head/net-p2p/mldonkey/Makefile	(revision 457384)
+++ head/net-p2p/mldonkey/Makefile	(revision 457385)
@@ -1,164 +1,159 @@
 # Created by: Holger Lamm <holger@e-gitt.net>
 # $FreeBSD$
 
 PORTNAME=	mldonkey
 PORTVERSION=	3.1.5
 PORTREVISION=	1
 CATEGORIES+=	net-p2p
 MASTER_SITES=	SF
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	OCAML client for multiple peer-to-peer networks
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/Copying.txt
 
 CONFLICTS=	mldonkey{-{core,gui},}-devel-[0-9]*
 
-USES=		iconv tar:bzip2 gmake
-USE_AUTOTOOLS=	autoconf:env
+USES=		autoreconf iconv tar:bzip2 gmake
 USE_OCAML=	yes
 USE_OCAML_CAMLP4=yes
 GNU_CONFIGURE=	yes
 ALL_TARGET=	opt
+AUTORECONF_WRKSRC=	${WRKSRC}/config
 MAKE_ENV+=	OCAMLRUNPARAM="l=256M"
 MAKE_JOBS_UNSAFE=	yes
 
 CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG}
 CONFIGURE_ENV+=	NEWCXX="${CXX}" \
 		PTHREAD_LIBS="-lpthread"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
 
 ###
 ## Options activation
 ###
 
 OPTIONS_DEFINE=	GD DOCS EXAMPLES
 OPTIONS_DEFAULT=CORE GD GUI
 OPTIONS_MULTI=	CLIENT
 OPTIONS_MULTI_CLIENT=CORE GUI
 CORE_DESC=	Client 'core' support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE}
 CONFLICTS+=	mldonkey-core-[0.9]*
 CONFLICTS+=	mldonkey-gui-[0.9]*
 
 PLIST_SUB+=	CORE="" GUI="" GUICORE=""
 .else # (${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE})
 
 . if !${PORT_OPTIONS:MGUI}
 PKGNAMESUFFIX=	-core
 
 CONFLICTS+=	mldonkey-gui-[0.9]*
 
 CONFIGURE_ARGS+=--disable-gui
 PLIST_SUB+=	CORE="" GUI="@comment " GUICORE="@comment "
 . endif # !${PORT_OPTIONS:MGUI}
 
 . if !${PORT_OPTIONS:MCORE}
 PKGNAMESUFFIX=	-gui
 
 CONFLICTS+=	mldonkey-core-[0.9]*
 
 PLIST_SUB+=	CORE="@comment " GUI="" GUICORE="@comment "
 . endif # !${PORT_OPTIONS:MCORE}
 
 .endif # ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE}
 
 .if ${PORT_OPTIONS:MGUI}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/lablrsvg.cma:x11-toolkits/ocaml-lablgtk2
 LIB_DEPENDS+=	librsvg-2.so:graphics/librsvg2
 
 CONFIGURE_ARGS+=--enable-gui=newgui2
 # we don't need lablgtk as RUN dependency, but we need gtk+glib
 USE_GNOME=	gtk20
 .endif # ${PORT_OPTIONS:MGUI}
 
 .if ${PORT_OPTIONS:MCORE}
 USE_RC_SUBR=	mlnet
 SUB_LIST+=	SH=${SH:Q}
 
 . if ${PORT_OPTIONS:MGD}
 LIB_DEPENDS+=	libgd.so:graphics/gd
 . else
 CONFIGURE_ARGS+=--disable-gd
 . endif
 .endif
 
 PORTDOCS=	Authors.txt Bugs.txt ChangeLog Developers.txt \
 		Install.txt Todo.txt ed2k_links.txt
 
 # build additional tools
 ALL_TARGET+=	\
 		mld_hash
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${SED} \
 		-e "s|%%PREFIX%%|${PREFIX}|" \
 		-e "s|%%SH%%|${SH}|" \
 		${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
 	@${REINPLACE_CMD} -E \
-		-e 's|%%AUTOCONF%%|${AUTOCONF}|' \
-		${BUILD_WRKSRC}/config/Makefile.in
-	@${REINPLACE_CMD} -E \
 		-e 's@(\+)(lablgtk2)@\1site-lib/\2@' \
 		-e 's@(\+)(labl\$$\(GTK\))@\1site-lib/\2@' \
 		-e 's@(OCAMLLIB/)(\$$LABLGTK_NAME)@\1site-lib/\2@' \
+		-e 's@(AC_DEFINE\([^,]*,[^,]*,)\)@\1 desc)@' \
 		${WRKSRC}/config/configure.in \
 		${WRKSRC}/config/Makefile.in
 	@${REINPLACE_CMD} -E \
 		-e 's@(#include <)(lablgtk2/)@\1site-lib/\2@'  \
 		${WRKSRC}/src/gtk2/gui/x11/systraystubs.c
 # update server.met provider
 	@${REINPLACE_CMD} -E \
 		-e 's|http://www.gruk.org/server.met.gz|http://www.jd2k.com/server.met|' \
 		-e 's|http://www.bluetack.co.uk/config/antip2p.txt|http://www.bluetack.co.uk/config/level1.gz|' \
 		${WRKSRC}/src/daemon/common/commonOptions.ml \
 		${WRKSRC}/src/networks/donkey/donkeyServers.ml
-
-pre-configure:
-	@cd ${WRKSRC}/config && ${AUTOCONF}
 
 do-install:
 .if ${PORT_OPTIONS:MCORE}
 	${INSTALL_PROGRAM} ${WRKSRC}/mld_hash ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${STAGEDIR}${PREFIX}/bin/mlnet-real
 	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/mlnet
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey ${STAGEDIR}${EXAMPLESDIR}
 .endif
 .endif
 .if ${PORT_OPTIONS:MGUI}
 	${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${STAGEDIR}${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE}
 	${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui ${STAGEDIR}${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for _file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/distrib/${_file} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
 install-user: extract
 .if !defined(LANGUAGE)
 	@${ECHO_MSG} "Please call as:  make install-user LANGUAGE=<lang>"
 	@${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !"
 .else
 	@${CP} ${WRKSRC}/distrib/i18n/gui_messages.ini.${LANGUAGE}\
 		${HOME}/.mldonkey_gui_messages.ini
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net-p2p/mldonkey/files/patch-Makefile
===================================================================
--- head/net-p2p/mldonkey/files/patch-Makefile	(revision 457384)
+++ head/net-p2p/mldonkey/files/patch-Makefile	(nonexistent)
@@ -1,11 +0,0 @@
---- config/Makefile.in.orig	Tue Apr 26 22:48:10 2005
-+++ config/Makefile.in	Tue Apr 26 22:48:41 2005
-@@ -285,7 +285,7 @@
- all: Makefile config/Makefile.config $(TARGET_TYPE)
- 
- config/configure: config/configure.in
--	cd config; autoconf
-+	cd config; %%AUTOCONF%%
- 
- ifeq ("$(MYCONFIG_ARGS_DEFINED)" , "yes")
- 

Property changes on: head/net-p2p/mldonkey/files/patch-Makefile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property