From owner-svn-ports-all@freebsd.org Sat Dec 30 15:21:02 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A42BFE8A5AB; Sat, 30 Dec 2017 15:21:02 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6EB967FE5B; Sat, 30 Dec 2017 15:21:02 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBUFL18U084092; Sat, 30 Dec 2017 15:21:01 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBUFL1mk084091; Sat, 30 Dec 2017 15:21:01 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201712301521.vBUFL1mk084091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sat, 30 Dec 2017 15:21:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457601 - head/net-p2p/mldonkey X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: head/net-p2p/mldonkey X-SVN-Commit-Revision: 457601 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Dec 2017 15:21:02 -0000 Author: tijl Date: Sat Dec 30 15:21:01 2017 New Revision: 457601 URL: https://svnweb.freebsd.org/changeset/ports/457601 Log: - Patch configure instead of configure.in so we can avoid USES=autoreconf. An obscure macro is used in configure.in that autoreconf cannot find anywhere (ACX_CHECK_CXX_FLAGS). - Disable a test for libcharset from converters/libiconv, so the code will use nl_langinfo from libc instead. - Remove unneeded CONFIGURE_ENV, CPPFLAGS and LDFLAGS. Reported by: antoine Modified: head/net-p2p/mldonkey/Makefile Modified: head/net-p2p/mldonkey/Makefile ============================================================================== --- head/net-p2p/mldonkey/Makefile Sat Dec 30 13:55:23 2017 (r457600) +++ head/net-p2p/mldonkey/Makefile Sat Dec 30 15:21:01 2017 (r457601) @@ -3,7 +3,7 @@ PORTNAME= mldonkey PORTVERSION= 3.1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= net-p2p MASTER_SITES= SF @@ -13,25 +13,17 @@ COMMENT?= OCAML client for multiple peer-to-peer netwo LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/Copying.txt -BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ax_pthread.m4:devel/autoconf-archive - CONFLICTS= mldonkey{-{core,gui},}-devel-[0-9]* -USES= autoreconf iconv tar:bzip2 gmake +USES= gmake iconv tar:bzip2 USE_OCAML= yes USE_OCAML_CAMLP4=yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= ac_cv_lib_charset_locale_charset=no 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 ### @@ -107,12 +99,11 @@ post-patch: -e "s|%%SH%%|${SH}|" \ ${FILESDIR}/wrapper.sh > \ ${WRKDIR}/wrapper.sh - @${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 \ + @${REINPLACE_CMD} \ + -e 's|$$OCAMLLIB/$$LABLGTK_NAME|$$OCAMLLIB/site-lib/$$LABLGTK_NAME|' \ + ${WRKSRC}/config/configure + @${REINPLACE_CMD} \ + -e 's|+labl|+site-lib/labl|' \ ${WRKSRC}/config/Makefile.in @${REINPLACE_CMD} -E \ -e 's@(#include <)(lablgtk2/)@\1site-lib/\2@' \