freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update name of autoreconf WRKSRC variable in comment

Browse Source 
- 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)
This commit is contained in:
Alex Kozlov
2018-01-24 09:41:04 +00:00
parent e93b741b40
commit 7fa9c70193
10 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Mk/Uses/autoreconf.mk
View File

@@ -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

2
devel/dmake/Makefile
View File

@@ -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}

2
devel/papilio-loader/Makefile
View File

@@ -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"

2
editors/openoffice-4/Makefile
View File

@@ -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

2
editors/openoffice-devel/Makefile
View File

@@ -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}

2
emulators/open-vm-tools/Makefile
View File

@@ -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

2
net/mosh/Makefile
View File

@@ -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].*

2
security/sshpass/Makefile
View File

@@ -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 \

2
sysutils/flock/Makefile
View File

@@ -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

2
www/mod_auth_openidc/Makefile
View File

@@ -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