From owner-svn-ports-all@freebsd.org Wed Jan 24 09:41:06 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E423BEC9F94; Wed, 24 Jan 2018 09:41:05 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 950988058D; Wed, 24 Jan 2018 09:41:05 +0000 (UTC) (envelope-from ak@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9001F1BED6; Wed, 24 Jan 2018 09:41:05 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0O9f5Rt013961; Wed, 24 Jan 2018 09:41:05 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0O9f4OV013951; Wed, 24 Jan 2018 09:41:04 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201801240941.w0O9f4OV013951@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Wed, 24 Jan 2018 09:41:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459824 - in head: Mk/Uses devel/dmake devel/papilio-loader editors/openoffice-4 editors/openoffice-devel emulators/open-vm-tools net/mosh security/sshpass sysutils/flock www/mod_auth_o... X-SVN-Group: ports-head X-SVN-Commit-Author: ak X-SVN-Commit-Paths: in head: Mk/Uses devel/dmake devel/papilio-loader editors/openoffice-4 editors/openoffice-devel emulators/open-vm-tools net/mosh security/sshpass sysutils/flock www/mod_auth_openidc X-SVN-Commit-Revision: 459824 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: Wed, 24 Jan 2018 09:41:06 -0000 Author: ak Date: Wed Jan 24 09:41:04 2018 New Revision: 459824 URL: https://svnweb.freebsd.org/changeset/ports/459824 Log: - Update name of autoreconf WRKSRC variable in comment - Fix a few ports with invalid USES autoreconf arguments - Add check for invalid USES autoreconf arguments Differential Revision: https://reviews.freebsd.org/D14004 Approved by: tijl (autotools maintainer), portmgr (mat) Modified: head/Mk/Uses/autoreconf.mk head/devel/dmake/Makefile head/devel/papilio-loader/Makefile head/editors/openoffice-4/Makefile head/editors/openoffice-devel/Makefile head/emulators/open-vm-tools/Makefile head/net/mosh/Makefile head/security/sshpass/Makefile head/sysutils/flock/Makefile head/www/mod_auth_openidc/Makefile Modified: head/Mk/Uses/autoreconf.mk ============================================================================== --- head/Mk/Uses/autoreconf.mk Wed Jan 24 09:02:07 2018 (r459823) +++ head/Mk/Uses/autoreconf.mk Wed Jan 24 09:41:04 2018 (r459824) @@ -1,6 +1,6 @@ # $FreeBSD$ # -# Run autoreconf in CONFIGURE_WRKSRC to update configure, Makefile.in and +# Run autoreconf in AUTORECONF_WRKSRC to update configure, Makefile.in and # other build scripts. # # Autoreconf encapsulates the following commands. Each command applies to a @@ -72,7 +72,7 @@ AUTORECONF_WRKSRC?= ${WRKSRC} .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK) _INCLUDE_USES_AUTORECONF_POST_MK= yes -.if ! ${autoreconf_ARGS:Mbuild} +.if empty(autoreconf_ARGS) _USES_configure+= 470:do-autoreconf do-autoreconf: .for f in AUTHORS ChangeLog INSTALL NEWS README @@ -87,6 +87,8 @@ do-autoreconf: then ${LOCALBASE}/bin/intltoolize -f -c; fi) .endif @(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i) +.elif ! ${autoreconf_ARGS:Mbuild} +IGNORE= Incorrect 'USES+=autoreconf:${autoreconf_ARGS}' expecting 'USES+=autoreconf[:build]' .endif .endif Modified: head/devel/dmake/Makefile ============================================================================== --- head/devel/dmake/Makefile Wed Jan 24 09:02:07 2018 (r459823) +++ head/devel/dmake/Makefile Wed Jan 24 09:41:04 2018 (r459824) @@ -15,7 +15,7 @@ USE_GITHUB= yes GH_ACCOUNT= mohawk2 GH_TAGNAME= e5588b0 -USES= autoreconf:autoconf +USES= autoreconf GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datarootdir=${DATADIR} Modified: head/devel/papilio-loader/Makefile ============================================================================== --- head/devel/papilio-loader/Makefile Wed Jan 24 09:02:07 2018 (r459823) +++ head/devel/papilio-loader/Makefile Wed Jan 24 09:41:04 2018 (r459824) @@ -19,7 +19,7 @@ GH_PROJECT= Papilio-Loader GH_TAGNAME= dd111c4 WRKSRC_SUBDIR= papilio-prog -USES= autoreconf:autoconf pkgconfig gmake +USES= autoreconf pkgconfig gmake CXXFLAGS+= -std=c++98 GNU_CONFIGURE= yes CONFIGURE_ENV+= libftdi1_CFLAGS="-I ${LOCALBASE}/include/libftdi1" Modified: head/editors/openoffice-4/Makefile ============================================================================== --- head/editors/openoffice-4/Makefile Wed Jan 24 09:02:07 2018 (r459823) +++ head/editors/openoffice-4/Makefile Wed Jan 24 09:41:04 2018 (r459824) @@ -119,7 +119,7 @@ XDGDIR= ${OOPATH}/share/xdg XDGREL= ../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg EXECBASE?= openoffice-${AOOSUFFIX} -USES= autoreconf:autoconf bison compiler:c++11-lib cpe \ +USES= autoreconf bison compiler:c++11-lib cpe \ desktop-file-utils \ gettext-runtime gmake iconv jpeg perl5 pkgconfig python \ shared-mime-info ssl tar:bzip2 Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Wed Jan 24 09:02:07 2018 (r459823) +++ head/editors/openoffice-devel/Makefile Wed Jan 24 09:41:04 2018 (r459824) @@ -131,7 +131,7 @@ XDGDIR= ${OOPATH}/share/xdg XDGREL= ../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg EXECBASE?= openoffice-${AOOSUFFIX} -USES= autoreconf:autoconf bison compiler:c++11-lib cpe \ +USES= autoreconf bison compiler:c++11-lib cpe \ desktop-file-utils \ gettext-runtime gmake iconv jpeg perl5 pkgconfig python \ shared-mime-info ssl tar:${TARTYPE} Modified: head/emulators/open-vm-tools/Makefile ============================================================================== --- head/emulators/open-vm-tools/Makefile Wed Jan 24 09:02:07 2018 (r459823) +++ head/emulators/open-vm-tools/Makefile Wed Jan 24 09:41:04 2018 (r459824) @@ -42,7 +42,7 @@ OPENSSL_CONFIGURE_WITH= ssl WRKSRC_SUBDIR= open-vm-tools GNU_CONFIGURE= yes -USES= autoreconf:-iv fuse gettext-runtime kmod libtool localbase pathfix pkgconfig +USES= autoreconf fuse gettext-runtime kmod libtool localbase pathfix pkgconfig USE_GNOME= glib20 USE_GITHUB= yes Modified: head/net/mosh/Makefile ============================================================================== --- head/net/mosh/Makefile Wed Jan 24 09:02:07 2018 (r459823) +++ head/net/mosh/Makefile Wed Jan 24 09:41:04 2018 (r459824) @@ -23,7 +23,7 @@ CONFIGURE_ARGS= --with-utempter --without-ncurses CONFIGURE_ENV+= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \ TINFO_CFLAGS="-I/usr/include" INSTALL_TARGET= install-strip -USES= autoreconf:autoconf ncurses perl5 pkgconfig ssl +USES= autoreconf ncurses perl5 pkgconfig ssl CONFLICTS_INSTALL= mosh-0.[2-9].* Modified: head/security/sshpass/Makefile ============================================================================== --- head/security/sshpass/Makefile Wed Jan 24 09:02:07 2018 (r459823) +++ head/security/sshpass/Makefile Wed Jan 24 09:41:04 2018 (r459824) @@ -12,7 +12,7 @@ COMMENT= Non-interactive ssh password auth tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= autoreconf:env +USES= autoreconf GNU_CONFIGURE= yes PLIST_FILES= bin/sshpass \ Modified: head/sysutils/flock/Makefile ============================================================================== --- head/sysutils/flock/Makefile Wed Jan 24 09:02:07 2018 (r459823) +++ head/sysutils/flock/Makefile Wed Jan 24 09:41:04 2018 (r459824) @@ -20,7 +20,7 @@ USES= libtool pkgconfig OPTIONS_DEFINE= NLS NLS_CONFIGURE_ENABLE= nls -NLS_USES= autoreconf:autopoint gettext +NLS_USES= autoreconf gettext PLIST_FILES= bin/flock man/man1/flock.1.gz \ etc/bash_completion.d/flock Modified: head/www/mod_auth_openidc/Makefile ============================================================================== --- head/www/mod_auth_openidc/Makefile Wed Jan 24 09:02:07 2018 (r459823) +++ head/www/mod_auth_openidc/Makefile Wed Jan 24 09:41:04 2018 (r459824) @@ -18,7 +18,7 @@ LIB_DEPENDS= libcjose.so:devel/cjose \ libjansson.so:devel/jansson \ libpcre.so:devel/pcre -USES= autoreconf:autoconf cpe gmake libtool pkgconfig ssl +USES= autoreconf cpe gmake libtool pkgconfig ssl USE_APACHE= 22+ USE_GITHUB= yes GH_ACCOUNT= pingidentity