Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Dec 2017 19:41:07 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r457385 - in head/net-p2p/mldonkey: . files
Message-ID:  <201712271941.vBRJf7bF066478@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Wed Dec 27 19:41:07 2017
New Revision: 457385
URL: https://svnweb.freebsd.org/changeset/ports/457385

Log:
  Convert to USES=autoreconf.

Deleted:
  head/net-p2p/mldonkey/files/patch-Makefile
Modified:
  head/net-p2p/mldonkey/Makefile

Modified: head/net-p2p/mldonkey/Makefile
==============================================================================
--- head/net-p2p/mldonkey/Makefile	Wed Dec 27 19:18:59 2017	(r457384)
+++ head/net-p2p/mldonkey/Makefile	Wed Dec 27 19:41:07 2017	(r457385)
@@ -15,12 +15,12 @@ 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
 
@@ -106,12 +106,10 @@ post-patch:
 		${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 \
@@ -123,9 +121,6 @@ post-patch:
 		-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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712271941.vBRJf7bF066478>