diff options
| -rw-r--r-- | Mk/Uses/autoreconf.mk | 6 | ||||
| -rw-r--r-- | devel/dmake/Makefile | 2 | ||||
| -rw-r--r-- | devel/papilio-loader/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice-4/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice-devel/Makefile | 2 | ||||
| -rw-r--r-- | emulators/open-vm-tools/Makefile | 2 | ||||
| -rw-r--r-- | net/mosh/Makefile | 2 | ||||
| -rw-r--r-- | security/sshpass/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/flock/Makefile | 2 | ||||
| -rw-r--r-- | www/mod_auth_openidc/Makefile | 2 |
10 files changed, 13 insertions, 11 deletions
diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk index 4eedcfdb68fe..e7bcc7717f3f 100644 --- a/Mk/Uses/autoreconf.mk +++ b/Mk/Uses/autoreconf.mk @@ -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 diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile index 4e77f3babe18..07904cff5dab 100644 --- a/devel/dmake/Makefile +++ b/devel/dmake/Makefile @@ -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} diff --git a/devel/papilio-loader/Makefile b/devel/papilio-loader/Makefile index b3b80b23e39e..c8fc4e585264 100644 --- a/devel/papilio-loader/Makefile +++ b/devel/papilio-loader/Makefile @@ -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" diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 82ed48bc8942..02dad6038db1 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -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 diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 0f21376c0384..38f3065ce46f 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -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} diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index 3e618a11616c..0a95daa073e2 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -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 diff --git a/net/mosh/Makefile b/net/mosh/Makefile index 015af8809bf5..6a14672ef0b2 100644 --- a/net/mosh/Makefile +++ b/net/mosh/Makefile @@ -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].* diff --git a/security/sshpass/Makefile b/security/sshpass/Makefile index 79aeefe6c9e5..0ec4f92d7c8d 100644 --- a/security/sshpass/Makefile +++ b/security/sshpass/Makefile @@ -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 \ diff --git a/sysutils/flock/Makefile b/sysutils/flock/Makefile index 43542e98c1a5..b9599c700490 100644 --- a/sysutils/flock/Makefile +++ b/sysutils/flock/Makefile @@ -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 diff --git a/www/mod_auth_openidc/Makefile b/www/mod_auth_openidc/Makefile index 114de6c4d5e7..fa8acf6187ce 100644 --- a/www/mod_auth_openidc/Makefile +++ b/www/mod_auth_openidc/Makefile @@ -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 |