View | Details | Raw Unified | Return to bug 263970 | Differences between
and this patch

Collapse All | Expand All

(-)b/MOVED (+2 lines)
Lines 17149-17151 math/rkward-kde|math/rkward|2022-05-06|Switched to the name used by upstream Link Here
17149
graphics/photoflow||2022-05-06|Unmaintainer upstream, has been broken for months, particularly this issue isn't answered: https://github.com/aferrero2707/PhotoFlow/issues/220
17149
graphics/photoflow||2022-05-06|Unmaintainer upstream, has been broken for months, particularly this issue isn't answered: https://github.com/aferrero2707/PhotoFlow/issues/220
17150
textproc/redisearch16||2022-05-09|Has expired. Use textproc/redisearch or textproc/redisearch20
17150
textproc/redisearch16||2022-05-09|Has expired. Use textproc/redisearch or textproc/redisearch20
17151
devel/git-arc|devel/freebsd-git-devtools|2022-05-13|Renamed because more tools are now included
17151
devel/git-arc|devel/freebsd-git-devtools|2022-05-13|Renamed because more tools are now included
17152
devel/autoconf-wrapper|devel/autoconf-switch|2022-05-14|Autoconf restructuring
17153
devel/autoconf213|devel/autoconf2.13|2022-05-14|Autoconf restructuring
(-)b/Mk/Uses/autoreconf.mk (-4 / +25 lines)
Lines 37-42 Link Here
37
#		gettext-tools is not optional.  If the run dependency on
37
#		gettext-tools is not optional.  If the run dependency on
38
#		gettext is optional this can be specified with
38
#		gettext is optional this can be specified with
39
#		NLS_USES=gettext-runtime.
39
#		NLS_USES=gettext-runtime.
40
# gtkdocize	Provided by textproc/gtk-doc.  Updates gtk-doc related *.m4
41
#		files included with the source code and build scripts such as
42
#		gtk-doc.make.  Run by autoreconf if configure.ac contains
43
#		GTK_DOC_CHECK.  The build dependency can be made optional with
44
#		DOCS option and DOCS_BUILD_DEPENDS+=gtkdocize:textproc/gtk-doc
45
#		if you also remove GTK_DOC_CHECK from configure.ac for instance
46
#		using a post-patch-DOCS-off target with the following command:
47
#		@${REINPLACE_CMD} /^GTK_DOC_CHECK/d ${WRKSRC}/configure.ac
48
#		It is likely that more patching is needed to eliminate or avoid
49
#		use of gtk-doc.
50
# intltoolize	Provided by textproc/intltool.  Updates intltool related *.m4
51
#		files and build scripts included with the source code.  Run by
52
#		autoreconf if configure.ac contains (AC|IT)_PROG_INTLTOOL.  A
53
#		build dependency on textproc/intltool can be added with
54
#		USES+=gnome and USE_GNOME+=intltool.
40
# libtoolize	Provided by devel/libtool.  Updates libtool related *.m4 files
55
# libtoolize	Provided by devel/libtool.  Updates libtool related *.m4 files
41
#		included with the source code and build scripts such as
56
#		included with the source code and build scripts such as
42
#		ltmain.sh.  Run by autoreconf if configure.ac  (or one of the
57
#		ltmain.sh.  Run by autoreconf if configure.ac  (or one of the
Lines 76-89 do-autoreconf: Link Here
76
# Don't modify time stamps if the files already exist
91
# Don't modify time stamps if the files already exist
77
	@test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
92
	@test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
78
.    endfor
93
.    endfor
79
.    if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool}
80
	@(cd ${AUTORECONF_WRKSRC} && \
94
	@(cd ${AUTORECONF_WRKSRC} && \
81
		if test -f configure.ac; then configure=configure.ac; \
95
		if test -f configure.ac; then configure=configure.ac; \
82
		else configure=configure.in; fi && \
96
		else configure=configure.in; fi && \
97
		if ${GREP} -q '^GTK_DOC_CHECK' $${configure}; \
98
		then if ! ${LOCALBASE}/bin/gtkdocize --copy; then \
99
		${ECHO_MSG} '===>  Mk/Uses/autoreconf.mk: Error running gtkdocize'; \
100
		${FALSE}; fi; fi && \
83
		if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \
101
		if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \
84
		then ${LOCALBASE}/bin/intltoolize -f -c; fi)
102
		then if ! ${LOCALBASE}/bin/intltoolize -f -c; then \
85
.    endif
103
		${ECHO_MSG} '===>  Mk/Uses/autoreconf.mk: Error running intltoolize'; \
86
	@(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i)
104
		${FALSE}; fi; fi)
105
	@(cd ${AUTORECONF_WRKSRC} && if ! ${AUTORECONF} -f -i; then \
106
		${ECHO_MSG} '===>  Mk/Uses/autoreconf.mk: Error running ${AUTORECONF}'; \
107
		${FALSE}; fi)
87
.  elif ! ${autoreconf_ARGS:Mbuild}
108
.  elif ! ${autoreconf_ARGS:Mbuild}
88
IGNORE= Incorrect 'USES+=autoreconf:${autoreconf_ARGS}' expecting 'USES+=autoreconf[:build]'
109
IGNORE= Incorrect 'USES+=autoreconf:${autoreconf_ARGS}' expecting 'USES+=autoreconf[:build]'
89
.  endif
110
.  endif
(-)b/databases/jlog/Makefile (-2 / +2 lines)
Lines 10-16 COMMENT= Journaled log library Link Here
10
10
11
LICENSE=	BSD3CLAUSE
11
LICENSE=	BSD3CLAUSE
12
12
13
BUILD_DEPENDS=	autoconf-2.13:devel/autoconf213
13
BUILD_DEPENDS=	autoconf2.13:devel/autoconf2.13
14
14
15
USE_GITHUB=	yes
15
USE_GITHUB=	yes
16
GH_ACCOUNT=	omniti-labs
16
GH_ACCOUNT=	omniti-labs
Lines 31-36 PERL_CONFIGURE_ON= --with-perl-lib=site Link Here
31
PERL_CONFIGURE_WITH=	perl
31
PERL_CONFIGURE_WITH=	perl
32
32
33
pre-configure:
33
pre-configure:
34
	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
34
	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
35
35
36
.include <bsd.port.mk>
36
.include <bsd.port.mk>
(-)b/devel/Makefile (-2 / +2 lines)
Lines 218-225 Link Here
218
    SUBDIR += autobook
218
    SUBDIR += autobook
219
    SUBDIR += autoconf
219
    SUBDIR += autoconf
220
    SUBDIR += autoconf-archive
220
    SUBDIR += autoconf-archive
221
    SUBDIR += autoconf-wrapper
221
    SUBDIR += autoconf-switch
222
    SUBDIR += autoconf213
222
    SUBDIR += autoconf2.13
223
    SUBDIR += autodia
223
    SUBDIR += autodia
224
    SUBDIR += autogen
224
    SUBDIR += autogen
225
    SUBDIR += automake
225
    SUBDIR += automake
(-)b/devel/autoconf-switch/Makefile (+22 lines)
Added Link Here
1
PORTNAME=	autoconf
2
PORTVERSION=	20220511
3
CATEGORIES=	devel
4
MASTER_SITES=	# none
5
PKGNAMESUFFIX=	-switch
6
DISTFILES=	# none
7
8
MAINTAINER=	tijl@FreeBSD.org
9
COMMENT=	Wrapper script to switch between autoconf versions
10
11
LICENSE=	BSD2CLAUSE
12
13
NO_ARCH=	yes
14
NO_BUILD=	yes
15
16
do-install:
17
	${INSTALL_SCRIPT} ${FILESDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
18
.for l in autoheader autom4te autoreconf autoscan autoupdate ifnames
19
	${LN} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${l}
20
.endfor
21
22
.include <bsd.port.mk>
(-)b/devel/autoconf-switch/files/autoconf (+4 lines)
Added Link Here
1
#! /bin/sh
2
${DEFAULT_AUTOCONF:+exec "$0${DEFAULT_AUTOCONF}" "$@"}
3
c=$(ls -d "$0"[0-9]* 2>/dev/null | sort -Vr | head -n1)
4
exec "${c:?$0: not installed}" "$@"
(-)b/devel/autoconf-switch/pkg-descr (+4 lines)
Added Link Here
1
This port installs a wrapper script for each tool included with autoconf.
2
The script will run the version of autoconf specified in the environment
3
variable DEFAULT_AUTOCONF.  If DEFAULT_AUTOCONF is empty or unset it will run
4
the most recent version of autoconf currently installed.
(-)b/devel/autoconf-switch/pkg-plist (+7 lines)
Added Link Here
1
bin/autoconf
2
bin/autoheader
3
bin/autom4te
4
bin/autoreconf
5
bin/autoscan
6
bin/autoupdate
7
bin/ifnames
(-)a/devel/autoconf-wrapper/Makefile (-43 lines)
Removed Link Here
1
PORTNAME?=	autoconf-wrapper
2
PORTVERSION=	20131203
3
CATEGORIES=	devel
4
MASTER_SITES=	# none
5
DISTFILES=	# none
6
7
MAINTAINER=	tijl@FreeBSD.org
8
COMMENT?=	Wrapper script for GNU autoconf
9
10
LICENSE=	BSD2CLAUSE
11
12
CONFLICTS_INSTALL=	autoscan
13
14
WRKSRC=		${WRKDIR}
15
NO_ARCH=	yes
16
NO_BUILD=	YES
17
18
TOOL?=		AUTOCONF
19
WRAPPED_TOOLS?=	autoconf autoheader autom4te autoreconf autoscan \
20
		autoupdate ifnames
21
22
.include <bsd.port.pre.mk>
23
24
TOOLS_CASE!=	${ECHO_CMD} ${WRAPPED_TOOLS} | ${TR} ' ' '|'
25
PLIST_FILES=	bin/${PORTNAME}
26
.for tool in ${WRAPPED_TOOLS}
27
PLIST_FILES+=	bin/${tool}
28
.endfor
29
30
do-configure:
31
	@${SED} \
32
	    -e 's,%%PREFIX%%,${PREFIX},g' \
33
	    -e 's,%%TOOL%%,${TOOL},g' \
34
	    -e 's,%%TOOLS_CASE%%,${TOOLS_CASE},g' \
35
	    <${FILESDIR}/autotools-wrapper.sh >${WRKDIR}/${PORTNAME}.sh
36
37
do-install:
38
	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
39
.for tool in ${WRAPPED_TOOLS}
40
	${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${tool}
41
.endfor
42
43
.include <bsd.port.post.mk>
(-)a/devel/autoconf-wrapper/files/autotools-wrapper.sh (-89 lines)
Removed Link Here
1
#!/bin/sh
2
#-
3
# Copyright (c) 2007 Dag-Erling Smørgrav
4
# All rights reserved.
5
#
6
# Redistribution and use in source and binary forms, with or without
7
# modification, are permitted provided that the following conditions
8
# are met:
9
# 1. Redistributions of source code must retain the above copyright
10
#    notice, this list of conditions and the following disclaimer
11
#    in this position and unchanged.
12
# 2. Redistributions in binary form must reproduce the above copyright
13
#    notice, this list of conditions and the following disclaimer in the
14
#    documentation and/or other materials provided with the distribution.
15
#
16
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
17
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19
# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
20
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26
# SUCH DAMAGE.
27
28
bindir=%%PREFIX%%/bin
29
tool=$(basename $0)
30
31
exec 4<&0
32
33
error() {
34
	echo "$@" 1>&2
35
	exit 1
36
}
37
38
# Verify that the requested tool is one we know about
39
case ${tool} in
40
%%TOOLS_CASE%%)
41
	;;
42
*)
43
	error "${tool}: unknown tool"
44
	;;
45
esac
46
47
if [ -n "${AUTOTOOLS_DEBUG}" -a -n "${%%TOOL%%_VERSION}" ] ; then
48
	echo "Requested ${tool} version ${%%TOOL%%_VERSION}" 1>&2
49
fi
50
51
#
52
# Identify available versions.
53
#
54
# The double sort is necessary to correctly identify 1.10 as newer
55
# than 1.9.
56
#
57
# Note that it is conceivable that version A.BC of the requested tool
58
# is present both as "toolABC" and as "tool-A.BC".  We take no special
59
# measures to handle this case.
60
#
61
/usr/bin/find ${bindir}/ -name "${tool}*[0-9]" | /usr/bin/sed -E \
62
    -e "s@^.*/${tool}-([0-9])\\.([0-9]+)\$@\1 \2 \1.\2@" | \
63
    /usr/bin/sort -n -k1 | /usr/bin/sort -n -s -k2 | {
64
while read maj min suffix ; do
65
	selected_version=$suffix
66
	if [ -n "${%%TOOL%%_VERSION}" -a \
67
	    "x${%%TOOL%%_VERSION}" = x${selected_version} ] ; then
68
		break
69
	fi
70
done
71
72
if [ -z "${selected_version}" ] ; then
73
	error "${tool}: not installed"
74
fi
75
76
if [ -n "${%%TOOL%%_VERSION}" -a \
77
    "x${%%TOOL%%_VERSION}" != x${selected_version} ] ; then
78
	error "${tool}: required version" \
79
	    "${%%TOOL%%_VERSION} not found"
80
fi
81
82
if [ -n "${AUTOTOOLS_DEBUG}" ] ; then
83
	echo "Selecting ${tool} version ${selected_version}" \
84
	    "(${bindir}/${tool}-${selected_version})" 1>&2
85
fi
86
87
exec 0<&4 4<&-
88
exec ${bindir}/${tool}-${selected_version} "$@"
89
}
(-)a/devel/autoconf-wrapper/pkg-descr (-3 lines)
Removed Link Here
1
This port installs a wrapper script for autoconf, with symlinks to the
2
unversioned name of each tool included with autoconf.  This allows the
3
correct version to be selected depending on the user's requirements.
(-)b/devel/autoconf/Makefile (-35 / +62 lines)
Lines 2-57 Link Here
2
2
3
PORTNAME=	autoconf
3
PORTNAME=	autoconf
4
PORTVERSION=	2.69
4
PORTVERSION=	2.69
5
PORTREVISION=	3
5
PORTREVISION=	4
6
CATEGORIES=	devel
6
CATEGORIES=	devel
7
MASTER_SITES=	GNU
7
MASTER_SITES=	GNU
8
8
9
MAINTAINER=	tijl@FreeBSD.org
9
MAINTAINER=	tijl@FreeBSD.org
10
COMMENT=	Automatically configure source code on many Un*x platforms
10
COMMENT=	Generate configure scripts and related files
11
11
12
LICENSE=	GPLv2+ GPLv3+ GFDL AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION
12
LICENSE=	EXCEPTION GFDL GPLv2+ GPLv3+
13
LICENSE_COMB=	multi
13
LICENSE_COMB=	multi
14
LICENSE_NAME_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION=	AUTOCONF CONFIGURE SCRIPT EXCEPTION
14
LICENSE_NAME_EXCEPTION=	AUTOCONF CONFIGURE SCRIPT EXCEPTION
15
LICENSE_FILE_EXCEPTION=	${WRKSRC}/COPYING.EXCEPTION
16
LICENSE_FILE_GFDL=	${WRKSRC}/doc/fdl.texi
15
LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
17
LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
16
LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYINGv3
18
LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYINGv3
17
LICENSE_FILE_GFDL=	${WRKSRC}/doc/fdl.texi
19
LICENSE_PERMS_EXCEPTION=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
18
LICENSE_FILE_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION=	${WRKSRC}/COPYING.EXCEPTION
19
LICENSE_PERMS_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
20
20
21
BUILD_DEPENDS=	gm4:devel/m4 \
21
BUILD_DEPENDS=	gm4:devel/m4
22
		help2man:misc/help2man
22
RUN_DEPENDS=	autoconf-switch>=0:devel/autoconf-switch \
23
RUN_DEPENDS=	gm4:devel/m4 \
23
		gm4:devel/m4
24
		autoconf-wrapper:devel/autoconf-wrapper
25
24
26
BUILD_VERSION=	2.69
25
VERSION=	2.69
27
PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
26
USES=		perl5 tar:xz
28
USES=		gmake makeinfo perl5 tar:xz
29
INFO=		autoconf
30
27
31
GNU_CONFIGURE=	yes
28
GNU_CONFIGURE=	yes
32
CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4 AWK=${AWK} \
29
CONFIGURE_ARGS=	--program-suffix=${VERSION} \
33
		ac_cv_prog_TEST_EMACS=no
30
		--without-lispdir
34
CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION} --without-lispdir
31
CONFIGURE_ENV=	AWK=${AWK} \
35
32
		EMACS=no \
36
GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh missing
33
		M4=${LOCALBASE}/bin/gm4
37
GENERIC_LINKS=	autoconf autoheader autom4te autoreconf autoscan autoupdate \
38
		ifnames
39
34
35
DATADIR=	${PREFIX}/share/autoconf${VERSION}
40
NO_ARCH=	yes
36
NO_ARCH=	yes
41
37
38
PLIST_SUB=	VERSION=${VERSION}
39
40
OPTIONS_DEFINE=	INFO
41
OPTIONS_DEFAULT=INFO
42
43
INFO_USES=	makeinfo
44
INFO_INFO=	autoconf${VERSION}
45
42
post-patch:
46
post-patch:
43
	@(cd ${WRKSRC}/man && \
47
	@${FIND} ${WRKSRC} -name Makefile.in -exec ${REINPLACE_CMD} \
44
		for file in *.[1x]; do \
48
		'/^pkgdatadir =/s/@PACKAGE@/&@VERSION@/' {} +
45
			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2-${BUILD_VERSION},g ; \
49
	@${REINPLACE_CMD} -E \
46
						s,(config\.guess|config\.sub|ifnames),\1-${BUILD_VERSION},g' $$file ; \
50
		-e 's/[^-/]auto(conf|header|reconf|scan|update)/&${VERSION}/g' \
47
		done)
51
		-e 's/config\.guess|config\.sub|ifnames/&${VERSION}/g' \
48
	@(cd ${WRKSRC}/doc && ${RM} *.info)
52
		${WRKSRC}/man/*.1
49
	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
53
# Save timestamps.
50
		's|@PACKAGE@$$|@PACKAGE@-@VERSION@|'
54
	@${LN} ${WRKSRC}/build-aux/config.guess \
51
55
		${WRKSRC}/build-aux/config.guess.orig
52
post-install:
56
	@${LN} ${WRKSRC}/build-aux/config.sub \
53
.for FILE in ${GENERIC_TOOLS}
57
		${WRKSRC}/build-aux/config.sub.orig
54
	${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${STAGEDIR}${PREFIX}/share/autoconf-${BUILD_VERSION}
58
55
.endfor
59
post-patch-INFO-on:
60
	@${REINPLACE_CMD} -E 's/autoconf\.(info|texi)/autoconf${VERSION}.\1/g' \
61
		${WRKSRC}/doc/Makefile.in
62
	@${CP} ${WRKSRC}/doc/autoconf.texi ${WRKSRC}/doc/autoconf${VERSION}.texi
63
	@${REINPLACE_CMD} \
64
		-e 's/autoconf\.info/autoconf${VERSION}.info/' \
65
		-e '/^@direntry/,/^@end/ { \
66
			s/^\*[^-:]*/&${VERSION}/ ; \
67
			s/(autoconf)/(autoconf${VERSION})/ ; \
68
			s/ \{2,9\}/ / ; }' \
69
		${WRKSRC}/doc/autoconf${VERSION}.texi
70
# Restore timestamp in .info file.
71
	@${TOUCH} -r ${WRKSRC}/doc/autoconf.texi.orig \
72
		${WRKSRC}/doc/autoconf${VERSION}.texi
73
74
post-patch-INFO-off:
75
	@${REINPLACE_CMD} '/^INFO_DEPS =/d' ${WRKSRC}/doc/Makefile.in
76
77
post-configure:
78
# Restore timestamps to prevent regeneration of man pages.
79
	@${TOUCH} -r ${WRKSRC}/build-aux/config.guess.orig \
80
		${WRKSRC}/build-aux/config.guess
81
	@${TOUCH} -r ${WRKSRC}/build-aux/config.sub.orig \
82
		${WRKSRC}/build-aux/config.sub
56
83
57
.include <bsd.port.mk>
84
.include <bsd.port.mk>
(-)a/devel/autoconf/files/patch-bin-autoscan.in (-11 lines)
Removed Link Here
1
--- bin/autoscan.in.orig	2012-04-25 02:37:26 UTC
2
+++ bin/autoscan.in
3
@@ -358,7 +358,7 @@ sub scan_sh_file ($)
4
     {
5
       # Strip out comments and variable references.
6
       s/#.*//;
7
-      s/\${[^\}]*}//g;
8
+      s/\$\{[^\}]*}//g;
9
       s/@[^@]*@//g;
10
 
11
       # Tokens in the code.
(-)b/devel/autoconf/files/patch-bin_autoreconf.in (+10 lines)
Added Link Here
1
--- bin/autoreconf.in.orig	2012-04-24 22:00:28 UTC
2
+++ bin/autoreconf.in
3
@@ -692,6 +692,7 @@ parse_args;
4
 
5
 # Autoreconf all the given configure.ac.  Unless `--no-recursive' is passed,
6
 # AC_CONFIG_SUBDIRS will be traversed in &autoreconf_current_directory.
7
+$ENV{'AUTOCONF'} = $autoconf;
8
 $ENV{'AUTOM4TE'} = $autom4te;
9
 for my $directory (@ARGV)
10
   {
(-)b/devel/autoconf/files/patch-bin_autoscan.in (+11 lines)
Added Link Here
1
--- bin/autoscan.in.orig	2012-04-25 02:37:26 UTC
2
+++ bin/autoscan.in
3
@@ -358,7 +358,7 @@ sub scan_sh_file ($)
4
     {
5
       # Strip out comments and variable references.
6
       s/#.*//;
7
-      s/\${[^\}]*}//g;
8
+      s/\$\{[^\}]*}//g;
9
       s/@[^@]*@//g;
10
 
11
       # Tokens in the code.
(-)a/devel/autoconf/files/patch-bison (-53 lines)
Removed Link Here
1
From 42761668c0300afa7f8bf5ba736458a818cd5d15 Mon Sep 17 00:00:00 2001
2
From: Akim Demaille <akim@lrde.epita.fr>
3
Date: Tue, 19 Mar 2013 11:19:17 -0700
4
Subject: AC_PROG_YACC: don't force Bison to warn against its own features
5
6
When invoked with -y/--yacc, Bison warns when its extensions over
7
POSIX Yacc are used.  Yet many packages requiring GNU Bison use
8
Autoconf/Automake's Yacc support, which passes -y to Bison.  It
9
turns out that passing '-o y.tab.c' has exactly the desired
10
effect: generating not only y.tab.c but also y.tab.h with -d and
11
y.output with -v.  See:
12
http://lists.gnu.org/archive/html/bison-patches/2013-02/msg00100.html
13
* lib/autoconf/programs.m4 (AC_PROG_YACC): Use bison -o y.tab.c.
14
* NEWS, doc/autoconf.texi: Document this change.
15
---
16
 NEWS                     | 4 ++++
17
 doc/autoconf.texi        | 2 +-
18
 lib/autoconf/programs.m4 | 4 ++--
19
 3 files changed, 7 insertions(+), 3 deletions(-)
20
21
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
22
index c54c5b3..f895e47 100644
23
--- doc/autoconf.texi
24
+++ doc/autoconf.texi
25
@@ -4222,7 +4222,7 @@ and is cached in the @code{ac_cv_path_SED} variable.
26
 @ovindex YACC
27
 @caindex prog_YACC
28
 If @code{bison} is found, set output variable @code{YACC} to @samp{bison
29
--y}.  Otherwise, if @code{byacc} is found, set @code{YACC} to
30
+-o y.tab.c}.  Otherwise, if @code{byacc} is found, set @code{YACC} to
31
 @samp{byacc}.  Otherwise set @code{YACC} to @samp{yacc}.
32
 The result of this test can be influenced by setting the variable
33
 @code{YACC} or the cache variable @code{ac_cv_prog_YACC}.
34
diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
35
index f7af8b5..2057e78 100644
36
--- lib/autoconf/programs.m4
37
+++ lib/autoconf/programs.m4
38
@@ -892,10 +892,10 @@ AN_PROGRAM([yacc],  [AC_PROG_YACC])
39
 AN_PROGRAM([byacc], [AC_PROG_YACC])
40
 AN_PROGRAM([bison], [AC_PROG_YACC])
41
 AC_DEFUN([AC_PROG_YACC],
42
-[AC_CHECK_PROGS(YACC, 'bison -y' byacc, yacc)dnl
43
+[AC_CHECK_PROGS(YACC, 'bison -o y.tab.c' byacc, yacc)dnl
44
 AC_ARG_VAR(YACC,
45
 [The `Yet Another Compiler Compiler' implementation to use.  Defaults to
46
-the first program found out of: `bison -y', `byacc', `yacc'.])dnl
47
+the first program found out of: `bison -o y.tab.c', `byacc', `yacc'.])dnl
48
 AC_ARG_VAR(YFLAGS,
49
 [The list of arguments that will be passed by default to $YACC.  This script
50
 will default YFLAGS to the empty string to avoid a default value of `-d' given
51
-- 
52
cgit v1.0-41-gc330
53
(-)a/devel/autoconf/files/patch-doc-Makefile.in (-18 lines)
Removed Link Here
1
--- doc/Makefile.in.orig	2012-04-25 02:40:26 UTC
2
+++ doc/Makefile.in
3
@@ -65,13 +65,13 @@ CONFIG_CLEAN_FILES =
4
 CONFIG_CLEAN_VPATH_FILES =
5
 SOURCES =
6
 DIST_SOURCES =
7
-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info
8
+INFO_DEPS = $(srcdir)/autoconf.info
9
 am__TEXINFO_TEX_DIR = $(srcdir)/../build-aux
10
 DVIS = autoconf.dvi standards.dvi
11
 PDFS = autoconf.pdf standards.pdf
12
 PSS = autoconf.ps standards.ps
13
 HTMLS = autoconf.html standards.html
14
-TEXINFOS = autoconf.texi standards.texi
15
+TEXINFOS = autoconf.texi
16
 TEXI2DVI = texi2dvi
17
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
18
 MAKEINFOHTML = $(MAKEINFO) --html
(-)b/devel/autoconf/files/patch-doc_Makefile.in (+11 lines)
Added Link Here
1
--- doc/Makefile.in.orig	2012-04-25 02:40:26 UTC
2
+++ doc/Makefile.in
3
@@ -65,7 +65,7 @@ DIST_SOURCES =
4
 CONFIG_CLEAN_VPATH_FILES =
5
 SOURCES =
6
 DIST_SOURCES =
7
-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info
8
+INFO_DEPS = $(srcdir)/autoconf.info
9
 am__TEXINFO_TEX_DIR = $(srcdir)/../build-aux
10
 DVIS = autoconf.dvi standards.dvi
11
 PDFS = autoconf.pdf standards.pdf
(-)b/devel/autoconf/files/patch-doc_autoconf.texi (-35 / +12 lines)
Lines 1-6 Link Here
1
--- doc/autoconf.texi.orig	2012-04-25 02:14:19 UTC
1
--- doc/autoconf.texi.orig	2012-04-25 02:14:19 UTC
2
+++ doc/autoconf.texi
2
+++ doc/autoconf.texi
3
@@ -15,7 +15,7 @@
3
@@ -5,9 +5,6 @@
4
 @include version.texi
5
 @settitle Autoconf
6
 @setchapternewpage odd
7
-@ifnothtml
8
-@setcontentsaftertitlepage
9
-@end ifnothtml
10
 @finalout
11
 
12
 @c @ovar(ARG)
13
@@ -15,7 +12,7 @@
4
 @c The ARG is an optional argument.  To be used for macro arguments in
14
 @c The ARG is an optional argument.  To be used for macro arguments in
5
 @c their documentation (@defmac).
15
 @c their documentation (@defmac).
6
 @macro ovar{varname}
16
 @macro ovar{varname}
Lines 9-15 Link Here
9
 @end macro
19
 @end macro
10
 
20
 
11
 @c @dvar(ARG, DEFAULT)
21
 @c @dvar(ARG, DEFAULT)
12
@@ -23,7 +23,7 @@
22
@@ -23,7 +20,7 @@
13
 @c The ARG is an optional argument, defaulting to DEFAULT.  To be used
23
 @c The ARG is an optional argument, defaulting to DEFAULT.  To be used
14
 @c for macro arguments in their documentation (@defmac).
24
 @c for macro arguments in their documentation (@defmac).
15
 @macro dvar{varname, default}
25
 @macro dvar{varname, default}
Lines 18-53 Link Here
18
 @end macro
28
 @end macro
19
 
29
 
20
 @c Handling the indexes with Texinfo yields several different problems.
30
 @c Handling the indexes with Texinfo yields several different problems.
21
@@ -217,31 +217,11 @@ entitled ``GNU Free Documentation Licens
22
 
23
 
24
 
25
-@dircategory Software development
26
+@dircategory Programming & development tools
27
 @direntry
28
 * Autoconf: (autoconf).         Create source code configuration scripts.
29
 @end direntry
30
 
31
-@dircategory Individual utilities
32
-@direntry
33
-* autoscan: (autoconf)autoscan Invocation.
34
-                                Semi-automatic @file{configure.ac} writing
35
-* ifnames: (autoconf)ifnames Invocation.        Listing conditionals in source.
36
-* autoconf-invocation: (autoconf)autoconf Invocation.
37
-                                How to create configuration scripts
38
-* autoreconf: (autoconf)autoreconf Invocation.
39
-                                Remaking multiple @command{configure} scripts
40
-* autoheader: (autoconf)autoheader Invocation.
41
-                                How to create configuration templates
42
-* autom4te: (autoconf)autom4te Invocation.
43
-                                The Autoconf executables backbone
44
-* configure: (autoconf)configure Invocation.    Configuring a package.
45
-* autoupdate: (autoconf)autoupdate Invocation.
46
-                                Automatic update of @file{configure.ac}
47
-* config.status: (autoconf)config.status Invocation. Recreating configurations.
48
-* testsuite: (autoconf)testsuite Invocation.    Running an Autotest test suite.
49
-@end direntry
50
-
51
 @titlepage
52
 @title Autoconf
53
 @subtitle Creating Automatic Configuration Scripts
(-)a/devel/autoconf/files/patch-texinfo (-12 lines)
Removed Link Here
1
--- doc/autoconf.texi.orig	2012-04-25 02:14:19 UTC
2
+++ doc/autoconf.texi
3
@@ -5,9 +5,6 @@
4
 @include version.texi
5
 @settitle Autoconf
6
 @setchapternewpage odd
7
-@ifnothtml
8
-@setcontentsaftertitlepage
9
-@end ifnothtml
10
 @finalout
11
 
12
 @c @ovar(ARG)
(-)b/devel/autoconf/pkg-descr (-3 / +3 lines)
Lines 1-9 Link Here
1
Autoconf is an extensible package of m4 macros that produce shell
1
Autoconf is an extensible package of M4 macros that produce shell
2
scripts to automatically configure software source code packages.
2
scripts to automatically configure software source code packages.
3
These scripts can adapt the packages to many kinds of UNIX-like
3
These scripts can adapt the packages to many kinds of UNIX-like
4
systems without manual user intervention.  Autoconf creates a
4
systems without manual user intervention.  Autoconf creates a
5
configuration script for a package from a template file that lists the
5
configuration script for a package from a template file that lists the
6
operating system features that the package can use, in the form of m4
6
operating system features that the package can use, in the form of M4
7
macro calls.
7
macro calls.
8
8
9
WWW: http://www.gnu.org/software/autoconf/
9
WWW: https://www.gnu.org/software/autoconf/
(-)b/devel/autoconf/pkg-plist (-64 / +58 lines)
Lines 1-64 Link Here
1
bin/autoconf-%%BUILD_VERSION%%
1
bin/autoconf%%VERSION%%
2
bin/autoheader-%%BUILD_VERSION%%
2
bin/autoheader%%VERSION%%
3
bin/autom4te-%%BUILD_VERSION%%
3
bin/autom4te%%VERSION%%
4
bin/autoreconf-%%BUILD_VERSION%%
4
bin/autoreconf%%VERSION%%
5
bin/autoscan-%%BUILD_VERSION%%
5
bin/autoscan%%VERSION%%
6
bin/autoupdate-%%BUILD_VERSION%%
6
bin/autoupdate%%VERSION%%
7
bin/ifnames-%%BUILD_VERSION%%
7
bin/ifnames%%VERSION%%
8
man/man1/autoconf-2.69.1.gz
8
man/man1/autoconf%%VERSION%%.1.gz
9
man/man1/autoheader-2.69.1.gz
9
man/man1/autoheader%%VERSION%%.1.gz
10
man/man1/autom4te-2.69.1.gz
10
man/man1/autom4te%%VERSION%%.1.gz
11
man/man1/autoreconf-2.69.1.gz
11
man/man1/autoreconf%%VERSION%%.1.gz
12
man/man1/autoscan-2.69.1.gz
12
man/man1/autoscan%%VERSION%%.1.gz
13
man/man1/autoupdate-2.69.1.gz
13
man/man1/autoupdate%%VERSION%%.1.gz
14
man/man1/config.guess-2.69.1.gz
14
man/man1/config.guess%%VERSION%%.1.gz
15
man/man1/config.sub-2.69.1.gz
15
man/man1/config.sub%%VERSION%%.1.gz
16
man/man1/ifnames-2.69.1.gz
16
man/man1/ifnames%%VERSION%%.1.gz
17
share/autoconf-%%BUILD_VERSION%%/Autom4te/C4che.pm
17
%%DATADIR%%/Autom4te/C4che.pm
18
share/autoconf-%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm
18
%%DATADIR%%/Autom4te/ChannelDefs.pm
19
share/autoconf-%%BUILD_VERSION%%/Autom4te/Channels.pm
19
%%DATADIR%%/Autom4te/Channels.pm
20
share/autoconf-%%BUILD_VERSION%%/Autom4te/Configure_ac.pm
20
%%DATADIR%%/Autom4te/Configure_ac.pm
21
share/autoconf-%%BUILD_VERSION%%/Autom4te/FileUtils.pm
21
%%DATADIR%%/Autom4te/FileUtils.pm
22
share/autoconf-%%BUILD_VERSION%%/Autom4te/General.pm
22
%%DATADIR%%/Autom4te/General.pm
23
share/autoconf-%%BUILD_VERSION%%/Autom4te/Getopt.pm
23
%%DATADIR%%/Autom4te/Getopt.pm
24
share/autoconf-%%BUILD_VERSION%%/Autom4te/Request.pm
24
%%DATADIR%%/Autom4te/Request.pm
25
share/autoconf-%%BUILD_VERSION%%/Autom4te/XFile.pm
25
%%DATADIR%%/Autom4te/XFile.pm
26
share/autoconf-%%BUILD_VERSION%%/INSTALL
26
%%DATADIR%%/INSTALL
27
share/autoconf-%%BUILD_VERSION%%/autoconf/autoconf.m4
27
%%DATADIR%%/autoconf/autoconf.m4
28
share/autoconf-%%BUILD_VERSION%%/autoconf/autoconf.m4f
28
%%DATADIR%%/autoconf/autoconf.m4f
29
share/autoconf-%%BUILD_VERSION%%/autoconf/autoheader.m4
29
%%DATADIR%%/autoconf/autoheader.m4
30
share/autoconf-%%BUILD_VERSION%%/autoconf/autoscan.m4
30
%%DATADIR%%/autoconf/autoscan.m4
31
share/autoconf-%%BUILD_VERSION%%/autoconf/autotest.m4
31
%%DATADIR%%/autoconf/autotest.m4
32
share/autoconf-%%BUILD_VERSION%%/autoconf/autoupdate.m4
32
%%DATADIR%%/autoconf/autoupdate.m4
33
share/autoconf-%%BUILD_VERSION%%/autoconf/c.m4
33
%%DATADIR%%/autoconf/c.m4
34
share/autoconf-%%BUILD_VERSION%%/autoconf/erlang.m4
34
%%DATADIR%%/autoconf/erlang.m4
35
share/autoconf-%%BUILD_VERSION%%/autoconf/fortran.m4
35
%%DATADIR%%/autoconf/fortran.m4
36
share/autoconf-%%BUILD_VERSION%%/autoconf/functions.m4
36
%%DATADIR%%/autoconf/functions.m4
37
share/autoconf-%%BUILD_VERSION%%/autoconf/general.m4
37
%%DATADIR%%/autoconf/general.m4
38
share/autoconf-%%BUILD_VERSION%%/autoconf/go.m4
38
%%DATADIR%%/autoconf/go.m4
39
share/autoconf-%%BUILD_VERSION%%/autoconf/headers.m4
39
%%DATADIR%%/autoconf/headers.m4
40
share/autoconf-%%BUILD_VERSION%%/autoconf/lang.m4
40
%%DATADIR%%/autoconf/lang.m4
41
share/autoconf-%%BUILD_VERSION%%/autoconf/libs.m4
41
%%DATADIR%%/autoconf/libs.m4
42
share/autoconf-%%BUILD_VERSION%%/autoconf/oldnames.m4
42
%%DATADIR%%/autoconf/oldnames.m4
43
share/autoconf-%%BUILD_VERSION%%/autoconf/programs.m4
43
%%DATADIR%%/autoconf/programs.m4
44
share/autoconf-%%BUILD_VERSION%%/autoconf/specific.m4
44
%%DATADIR%%/autoconf/specific.m4
45
share/autoconf-%%BUILD_VERSION%%/autoconf/status.m4
45
%%DATADIR%%/autoconf/status.m4
46
share/autoconf-%%BUILD_VERSION%%/autoconf/types.m4
46
%%DATADIR%%/autoconf/types.m4
47
share/autoconf-%%BUILD_VERSION%%/autom4te.cfg
47
%%DATADIR%%/autom4te.cfg
48
share/autoconf-%%BUILD_VERSION%%/autoscan/autoscan.list
48
%%DATADIR%%/autoscan/autoscan.list
49
share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4
49
%%DATADIR%%/autotest/autotest.m4
50
share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4f
50
%%DATADIR%%/autotest/autotest.m4f
51
share/autoconf-%%BUILD_VERSION%%/autotest/general.m4
51
%%DATADIR%%/autotest/general.m4
52
share/autoconf-%%BUILD_VERSION%%/autotest/specific.m4
52
%%DATADIR%%/autotest/specific.m4
53
share/autoconf-%%BUILD_VERSION%%/config.guess
53
%%DATADIR%%/m4sugar/foreach.m4
54
share/autoconf-%%BUILD_VERSION%%/config.sub
54
%%DATADIR%%/m4sugar/m4sh.m4
55
share/autoconf-%%BUILD_VERSION%%/elisp-comp
55
%%DATADIR%%/m4sugar/m4sh.m4f
56
share/autoconf-%%BUILD_VERSION%%/install-sh
56
%%DATADIR%%/m4sugar/m4sugar.m4
57
share/autoconf-%%BUILD_VERSION%%/m4sugar/foreach.m4
57
%%DATADIR%%/m4sugar/m4sugar.m4f
58
share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4
58
%%DATADIR%%/m4sugar/version.m4
59
share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4f
60
share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4
61
share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
62
share/autoconf-%%BUILD_VERSION%%/m4sugar/version.m4
63
share/autoconf-%%BUILD_VERSION%%/mdate-sh
64
share/autoconf-%%BUILD_VERSION%%/missing
(-)b/devel/autoconf2.13/Makefile (+66 lines)
Added Link Here
1
# Created by: torstenb@FreeBSD.org
2
3
PORTNAME=	autoconf
4
PORTVERSION=	2.13
5
CATEGORIES=	devel
6
MASTER_SITES=	LOCAL/ade/gnu
7
PKGNAMESUFFIX=	${VERSION}
8
DISTNAME=	autoconf-000227 # 2000-02-27 snapshot post 2.13
9
10
MAINTAINER=	tijl@FreeBSD.org
11
COMMENT=	Generate configure scripts and related files
12
13
LICENSE=	GPLv2+
14
LICENSE_FILE=	${WRKSRC}/COPYING
15
16
BUILD_DEPENDS=	gm4:devel/m4
17
RUN_DEPENDS=	autoconf-switch>=0:devel/autoconf-switch \
18
		gm4:devel/m4
19
20
VERSION=	2.13
21
USES=		desthack perl5 tar:bzip2
22
23
GNU_CONFIGURE=	yes
24
CONFIGURE_ARGS=	--program-suffix=${VERSION}
25
CONFIGURE_ENV=	AWK=${AWK} \
26
		M4=${LOCALBASE}/bin/gm4
27
28
STRIP=
29
DATADIR=	${PREFIX}/share/autoconf${VERSION}
30
NO_ARCH=	yes
31
PORTSCOUT=	ignore
32
33
WRKSRC=		${WRKDIR}/autoconf
34
35
PLIST_SUB=	VERSION=${VERSION}
36
37
OPTIONS_DEFINE=	INFO
38
OPTIONS_DEFAULT=INFO
39
40
INFO_USES=	makeinfo
41
INFO_INFO=	autoconf${VERSION}
42
43
post-patch:
44
	@${REINPLACE_CMD} '/^acdatadir =/s/autoconf/&${VERSION}/' \
45
		${WRKSRC}/Makefile.in
46
	@${RM} ${WRKSRC}/standards.texi
47
48
post-patch-INFO-on:
49
	@${REINPLACE_CMD} -E 's/autoconf\.(info|texi)/autoconf${VERSION}.\1/g' \
50
		${WRKSRC}/Makefile.in
51
	@${CP} ${WRKSRC}/autoconf.texi ${WRKSRC}/autoconf${VERSION}.texi
52
	@${REINPLACE_CMD} \
53
		-e 's/autoconf\.info/autoconf${VERSION}.info/' \
54
		-e '/^@direntry/,/^@end/ { \
55
			s/^\*[^-:]*/&${VERSION}/ ; \
56
			s/(autoconf)/(autoconf${VERSION})/ ; \
57
			s/ \{2,9\}/ / ; }' \
58
		${WRKSRC}/autoconf${VERSION}.texi
59
60
post-patch-INFO-off:
61
	@${REINPLACE_CMD} \
62
		-e '/^all:/s/ info//' \
63
		-e '/^install:/s/ install-info//' \
64
		${WRKSRC}/Makefile.in
65
66
.include <bsd.port.mk>
(-)b/devel/autoconf2.13/distinfo (+2 lines)
Added Link Here
1
SHA256 (autoconf-000227.tar.bz2) = 43cf23a479dc7513fde1bfb63471c86bf33ba1956a2cf6e321480da6c350e73c
2
SIZE (autoconf-000227.tar.bz2) = 259210
(-)b/devel/autoconf2.13/files/patch-acspecific.m4 (+11 lines)
Added Link Here
1
--- acspecific.m4.orig	2000-02-27 16:18:10 UTC
2
+++ acspecific.m4
3
@@ -2681,7 +2681,7 @@ else
4
   if AC_TRY_EVAL(ac_link); then
5
     for file in conftest.*; do
6
       case $file in
7
-      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
8
+      *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;;
9
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
10
       esac
11
     done
(-)b/devel/autoconf2.13/files/patch-autoconf.sh (+41 lines)
Added Link Here
1
--- autoconf.sh.orig	2000-02-27 16:18:10 UTC
2
+++ autoconf.sh
3
@@ -45,7 +45,6 @@ esac
4
 esac
5
 
6
 : ${TMPDIR=/tmp}
7
-tmpout=${TMPDIR}/acout.$$
8
 localdir=
9
 show_version=no
10
 
11
@@ -95,9 +94,12 @@ esac
12
   *) echo "$usage" >&2; exit 1 ;;
13
 esac
14
 
15
+tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
16
+tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
17
+
18
 trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
19
 
20
-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
21
+# Always set this, to avoid bogus errors from some rm's.
22
 if test z$infile = z-; then
23
   infile=$tmpin
24
   cat > $infile
25
@@ -118,7 +120,7 @@ case `$M4 --help < /dev/null 2>&1` in
26
 case `$M4 --help < /dev/null 2>&1` in
27
 *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
28
 *traditional*) ;;
29
-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
30
+*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;;
31
 esac
32
 
33
 $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
34
@@ -154,6 +156,6 @@ $AWK '
35
 /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
36
 ' >&4
37
 
38
-rm -f $tmpout
39
+rm -f $tmpin $tmpout
40
 
41
 exit $status
(-)b/devel/autoconf2.13/files/patch-autoconf.texi (+17 lines)
Added Link Here
1
--- autoconf.texi.orig	2000-02-27 16:18:10 UTC
2
+++ autoconf.texi
3
@@ -15,11 +15,10 @@
4
 @end iftex
5
 
6
 @ifinfo
7
-@format
8
-START-INFO-DIR-ENTRY
9
+@dircategory Software development
10
+@direntry
11
 * Autoconf: (autoconf).         Create source code configuration scripts.
12
-END-INFO-DIR-ENTRY
13
-@end format
14
+@end direntry
15
 
16
 Autoconf: Creating Automatic Configuration Scripts, by David MacKenzie.
17
 
(-)b/devel/autoconf2.13/files/patch-autoheader.sh (+11 lines)
Added Link Here
1
--- autoheader.sh.orig	2000-02-27 16:18:10 UTC
2
+++ autoheader.sh
3
@@ -194,7 +194,7 @@ if test -n "$syms"; then
4
   # Some fgrep's have limits on the number of lines that can be in the
5
   # pattern on the command line, so use a temporary file containing the
6
   # pattern.
7
-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
8
+  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
9
    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
10
    cat > $fgrep_tmp <<EOF
11
 $syms
(-)b/devel/autoconf2.13/files/patch-autoupdate.sh (+20 lines)
Added Link Here
1
--- autoupdate.sh.orig	2000-02-27 16:18:10 UTC
2
+++ autoupdate.sh
3
@@ -26,7 +26,7 @@ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=d
4
 Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
5
        [--version] [template-file]" 
6
 
7
-sedtmp=/tmp/acups.$$
8
+sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
9
 # For debugging.
10
 #sedtmp=/tmp/acups
11
 show_version=no
12
@@ -66,7 +66,7 @@ fi
13
 
14
 : ${SIMPLE_BACKUP_SUFFIX='~'}
15
 
16
-tmpout=acupo.$$
17
+tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
18
 trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
19
 case $# in
20
   0) infile=configure.in; out="> $tmpout"
(-)b/devel/autoconf2.13/pkg-descr (+9 lines)
Added Link Here
1
Autoconf is an extensible package of M4 macros that produce shell
2
scripts to automatically configure software source code packages.
3
These scripts can adapt the packages to many kinds of UNIX-like
4
systems without manual user intervention.  Autoconf creates a
5
configuration script for a package from a template file that lists the
6
operating system features that the package can use, in the form of M4
7
macro calls.
8
9
WWW: https://www.gnu.org/software/autoconf/
(-)b/devel/autoconf2.13/pkg-plist (+19 lines)
Added Link Here
1
bin/autoconf%%VERSION%%
2
bin/autoheader%%VERSION%%
3
bin/autoreconf%%VERSION%%
4
bin/autoscan%%VERSION%%
5
bin/autoupdate%%VERSION%%
6
bin/ifnames%%VERSION%%
7
%%DATADIR%%/acconfig.h
8
%%DATADIR%%/acfunctions
9
%%DATADIR%%/acgeneral.m4
10
%%DATADIR%%/acheaders
11
%%DATADIR%%/acidentifiers
12
%%DATADIR%%/acmakevars
13
%%DATADIR%%/acoldnames.m4
14
%%DATADIR%%/acprograms
15
%%DATADIR%%/acspecific.m4
16
%%DATADIR%%/autoconf.m4
17
%%DATADIR%%/autoconf.m4f
18
%%DATADIR%%/autoheader.m4
19
%%DATADIR%%/autoheader.m4f
(-)a/devel/autoconf213/Makefile (-45 lines)
Removed Link Here
1
# Created by: torstenb@FreeBSD.org
2
3
PORTNAME=	autoconf
4
PORTVERSION=	2.13.000227
5
PORTREVISION=	7
6
CATEGORIES=	devel
7
MASTER_SITES=	LOCAL/ade/gnu
8
DISTNAME=	autoconf-000227
9
PKGNAMESUFFIX=	213
10
11
# note: before committing to this port, contact portmgr to arrange for an
12
# experimental ports run.  Untested commits may be backed out at portmgr's
13
# discretion.
14
MAINTAINER=	tijl@FreeBSD.org
15
COMMENT=	Automatically configure source code on many Un*x platforms (legacy 2.13)
16
17
LICENSE=	GPLv2+
18
LICENSE_FILE=	${WRKSRC}/COPYING
19
20
BUILD_DEPENDS=	gm4:devel/m4
21
RUN_DEPENDS=	gm4:devel/m4 \
22
		autoconf-wrapper:devel/autoconf-wrapper
23
24
BUILD_VERSION=	2.13
25
PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
26
USES=		perl5 desthack makeinfo tar:bzip2
27
GNU_CONFIGURE=	yes
28
CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4 AWK=${AWK}
29
CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
30
WRKSRC=		${WRKDIR}/autoconf
31
INFO=		autoconf-${BUILD_VERSION}
32
33
STRIP=		# none
34
35
NO_ARCH=	yes
36
37
post-patch:
38
	@${RM} ${WRKSRC}/*.info* >/dev/null 2>&1 || true
39
40
post-install:
41
	${CHMOD} +x ${STAGEDIR}${PREFIX}/share/autoconf-${BUILD_VERSION}/config.*
42
	${INSTALL_SCRIPT} ${WRKSRC}/install-sh \
43
		${STAGEDIR}${PREFIX}/share/autoconf-${BUILD_VERSION}
44
45
.include <bsd.port.mk>
(-)a/devel/autoconf213/distinfo (-2 lines)
Removed Link Here
1
SHA256 (autoconf-000227.tar.bz2) = 43cf23a479dc7513fde1bfb63471c86bf33ba1956a2cf6e321480da6c350e73c
2
SIZE (autoconf-000227.tar.bz2) = 259210
(-)a/devel/autoconf213/files/patch-Makefile.in (-36 lines)
Removed Link Here
1
--- Makefile.in.orig	Sun Feb 27 08:18:10 2000
2
+++ Makefile.in	Thu Apr  5 02:14:57 2007
3
@@ -51,3 +51,3 @@
4
 datadir = @datadir@
5
-acdatadir = $(datadir)/autoconf
6
+acdatadir = $(datadir)/autoconf-2.13
7
 
8
@@ -70,3 +70,3 @@
9
 	acconfig.h acfunctions acheaders acidentifiers \
10
-	acmakevars acprograms autoconf.info* \
11
+	acmakevars acprograms autoconf-2.13.info* \
12
 	autoconf.sh autoconf.texi install.texi \
13
@@ -108,6 +108,6 @@
14
 
15
-info: autoconf.info @standards_info@ INSTALL
16
+info: autoconf-2.13.info
17
 
18
 # Use --no-split to avoid creating filenames > 14 chars.
19
-autoconf.info: autoconf.texi install.texi
20
+autoconf-2.13.info: autoconf.texi install.texi
21
 	$(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@
22
@@ -154,3 +154,3 @@
23
 	for i in acfunctions acheaders acidentifiers acprograms \
24
-	  acmakevars; do \
25
+	  acmakevars config.guess config.sub; do \
26
 	$(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
27
@@ -161,3 +161,3 @@
28
 install-info: info installdirs
29
-	if test -f autoconf.info; then \
30
+	if test -f autoconf-2.13.info; then \
31
 	  for i in *.info*; do \
32
@@ -176,3 +176,3 @@
33
 	rm -fr $(acdatadir)
34
-	cd $(infodir) && rm -f autoconf.info*
35
+	cd $(infodir) && rm -f autoconf-2.13.info*
36
 	if test -f standards.info || test -f $(srcdir)/standards.info; \
(-)a/devel/autoconf213/files/patch-acspecific.m4 (-11 lines)
Removed Link Here
1
--- acspecific.m4.orig	Sun Aug 13 19:42:57 2000
2
+++ acspecific.m4	Sun Aug 13 19:43:24 2000
3
@@ -2659,7 +2659,7 @@
4
   if AC_TRY_EVAL(ac_link); then
5
     for file in conftest.*; do
6
       case $file in
7
-      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
8
+      *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;;
9
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
10
       esac
11
     done
(-)a/devel/autoconf213/files/patch-autoconf.sh (-26 lines)
Removed Link Here
1
--- autoconf.sh.orig	Tue Jan  5 07:27:53 1999
2
+++ autoconf.sh	Thu May 31 15:56:39 2001
3
@@ -47,3 +47,2 @@
4
 : ${TMPDIR=/tmp}
5
-tmpout=${TMPDIR}/acout.$$
6
 localdir=
7
@@ -97,5 +96,8 @@
8
 
9
+tmpout=`mktemp ${TMPDIR}/acout.XXXXXXXXXX` || exit 1
10
+tmpin=`mktemp ${TMPDIR}/acin.XXXXXXXXXX` || { rm -f $tmpout; exit 1; }
11
+
12
 trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
13
 
14
-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
15
+# Always set this, to avoid bogus errors from some rm's.
16
 if test z$infile = z-; then
17
@@ -120,3 +122,3 @@
18
 *traditional*) ;;
19
-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
20
+*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;;
21
 esac
22
@@ -156,3 +158,3 @@
23
 
24
-rm -f $tmpout
25
+rm -f $tmpin $tmpout
26
 
(-)a/devel/autoconf213/files/patch-autoconf.texi (-24 lines)
Removed Link Here
1
--- autoconf.texi.orig	Sun Feb 27 11:18:10 2000
2
+++ autoconf.texi	Mon Mar 18 21:30:10 2002
3
@@ -1,9 +1,10 @@
4
 \input texinfo @c -*-texinfo-*-
5
 @c %**start of header
6
-@setfilename autoconf.info
7
-@settitle Autoconf
8
+@setfilename autoconf-2.13.info
9
+@settitle Autoconf-2.13
10
 @c For double-sided printing, uncomment:
11
 @c @setchapternewpage odd
12
+@dircategory Programming & development tools
13
 @c %**end of header
14
 
15
 @set EDITION 2.13
16
@@ -17,7 +18,7 @@
17
 @ifinfo
18
 @format
19
 START-INFO-DIR-ENTRY
20
-* Autoconf: (autoconf).         Create source code configuration scripts.
21
+* Autoconf-2.13: (autoconf-2.13).   Create source code configuration scripts.
22
 END-INFO-DIR-ENTRY
23
 @end format
24
 
(-)a/devel/autoconf213/files/patch-autohader.sh (-11 lines)
Removed Link Here
1
--- autoheader.sh.orig	Mon Nov 22 21:50:45 1999
2
+++ autoheader.sh	Mon Nov 22 21:52:02 1999
3
@@ -194,7 +194,7 @@
4
   # Some fgrep's have limits on the number of lines that can be in the
5
   # pattern on the command line, so use a temporary file containing the
6
   # pattern.
7
-  (fgrep_tmp=${TMPDIR-/tmp}/autoh$$
8
+  (fgrep_tmp=`mktemp ${TMPDIR-/tmp}/autoh.XXXXXXXXXX` || exit 1
9
    trap "rm -f $fgrep_tmp; exit 1" 1 2 15
10
    cat > $fgrep_tmp <<EOF
11
 $syms
(-)a/devel/autoconf213/files/patch-autoupdate.sh (-20 lines)
Removed Link Here
1
--- autoupdate.sh.orig	Mon Nov 22 21:52:26 1999
2
+++ autoupdate.sh	Mon Nov 22 21:54:30 1999
3
@@ -26,7 +26,7 @@
4
 Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 
5
        [--version] [template-file]" 
6
 
7
-sedtmp=/tmp/acups.$$
8
+sedtmp=`mktemp ${TMPDIR-/tmp}/acups.XXXXXXXXXX` || exit 1
9
 # For debugging.
10
 #sedtmp=/tmp/acups
11
 show_version=no
12
@@ -66,7 +66,7 @@
13
 
14
 : ${SIMPLE_BACKUP_SUFFIX='~'}
15
 
16
-tmpout=acupo.$$
17
+tmpout=`mktemp acupo.XXXXXXXXXX` || { rm -f $sedtmp; exit 1; }
18
 trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15
19
 case $# in
20
   0) infile=configure.in; out="> $tmpout"
(-)a/devel/autoconf213/pkg-descr (-12 lines)
Removed Link Here
1
This is the legacy 2.13 version of autoconf.  It is explicitly for use with
2
older software packages that are not buildable with the current autoconf.
3
4
Autoconf is an extensible package of m4 macros that produce shell
5
scripts to automatically configure software source code packages.
6
These scripts can adapt the packages to many kinds of UNIX-like
7
systems without manual user intervention.  Autoconf creates a
8
configuration script for a package from a template file that lists the
9
operating system features that the package can use, in the form of m4
10
macro calls.
11
12
WWW: https://www.gnu.org/software/autoconf/autoconf.html
(-)a/devel/autoconf213/pkg-plist (-22 lines)
Removed Link Here
1
bin/autoconf-%%BUILD_VERSION%%
2
bin/autoheader-%%BUILD_VERSION%%
3
bin/autoreconf-%%BUILD_VERSION%%
4
bin/autoscan-%%BUILD_VERSION%%
5
bin/autoupdate-%%BUILD_VERSION%%
6
bin/ifnames-%%BUILD_VERSION%%
7
share/autoconf-%%BUILD_VERSION%%/acconfig.h
8
share/autoconf-%%BUILD_VERSION%%/acfunctions
9
share/autoconf-%%BUILD_VERSION%%/acgeneral.m4
10
share/autoconf-%%BUILD_VERSION%%/acheaders
11
share/autoconf-%%BUILD_VERSION%%/acidentifiers
12
share/autoconf-%%BUILD_VERSION%%/acmakevars
13
share/autoconf-%%BUILD_VERSION%%/acoldnames.m4
14
share/autoconf-%%BUILD_VERSION%%/acprograms
15
share/autoconf-%%BUILD_VERSION%%/acspecific.m4
16
share/autoconf-%%BUILD_VERSION%%/autoconf.m4
17
share/autoconf-%%BUILD_VERSION%%/autoconf.m4f
18
share/autoconf-%%BUILD_VERSION%%/autoheader.m4
19
share/autoconf-%%BUILD_VERSION%%/autoheader.m4f
20
share/autoconf-%%BUILD_VERSION%%/config.guess
21
share/autoconf-%%BUILD_VERSION%%/config.sub
22
share/autoconf-%%BUILD_VERSION%%/install-sh
(-)b/devel/autotools/Makefile (-2 / +2 lines)
Lines 1-14 Link Here
1
# Created by: Ade Lovett <ade@FreeBSD.org>
1
# Created by: Ade Lovett <ade@FreeBSD.org>
2
2
3
PORTNAME=	autotools
3
PORTNAME=	autotools
4
PORTVERSION=	20220311
4
PORTVERSION=	20220506
5
CATEGORIES=	devel
5
CATEGORIES=	devel
6
6
7
MAINTAINER=	tijl@FreeBSD.org
7
MAINTAINER=	tijl@FreeBSD.org
8
COMMENT=	Autotools meta-port
8
COMMENT=	Autotools meta-port
9
9
10
RUN_DEPENDS=	libtoolize:devel/libtool \
10
RUN_DEPENDS=	libtoolize:devel/libtool \
11
		autoconf-2.13:devel/autoconf213 \
11
		autoconf2.13:devel/autoconf2.13 \
12
		autoconf>=2.69:devel/autoconf \
12
		autoconf>=2.69:devel/autoconf \
13
		automake>=1.15:devel/automake
13
		automake>=1.15:devel/automake
14
14
(-)b/graphics/cairo/Makefile (-19 / +9 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	cairo
3
PORTNAME=	cairo
4
DISTVERSION=	1.17.4
4
DISTVERSION=	1.17.4
5
PORTREVISION=	1
5
PORTEPOCH=	3
6
PORTEPOCH=	3
6
CATEGORIES=	graphics
7
CATEGORIES=	graphics
7
MASTER_SITES=	https://cairographics.org/releases/ \
8
MASTER_SITES=	https://cairographics.org/releases/ \
Lines 24-38 LIB_DEPENDS= libfreetype.so:print/freetype2 \ Link Here
24
25
25
PORTSCOUT=	skipv:5c-1.1,5c-1.2,5c-1.5
26
PORTSCOUT=	skipv:5c-1.1,5c-1.2,5c-1.5
26
27
27
USES=		autoreconf cpe gnome libtool pathfix pkgconfig tar:xz xorg
28
USES=		autoreconf cpe gnome libtool pkgconfig tar:xz xorg
28
CPE_VENDOR=	cairographics
29
CPE_VENDOR=	cairographics
29
USE_XORG=	pixman
30
USE_XORG=	pixman
30
USE_LDCONFIG=	yes
31
USE_LDCONFIG=	yes
31
INSTALL_TARGET=	install-strip
32
INSTALL_TARGET=	install-strip
32
33
33
GNU_CONFIGURE=	yes
34
GNU_CONFIGURE=	yes
34
CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
35
CONFIGURE_ARGS=	--disable-directfb \
35
		--disable-directfb \
36
		--disable-gallium \
36
		--disable-gallium \
37
		--disable-wgl \
37
		--disable-wgl \
38
		--enable-tee
38
		--enable-tee
Lines 44-49 OPTIONS_DEFAULT=OPENGL XCB GLIB X11 Link Here
44
OPTIONS_SLAVE=	${ARCH:tu}
44
OPTIONS_SLAVE=	${ARCH:tu}
45
OPTIONS_SUB=	yes
45
OPTIONS_SUB=	yes
46
46
47
DOCS_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
48
DOCS_CONFIGURE_ON=	--with-html-dir=${DOCSDIR}
49
47
X11_USES=	xorg
50
X11_USES=	xorg
48
X11_USE=	xorg=x11,xext,xorgproto,xrender
51
X11_USE=	xorg=x11,xext,xorgproto,xrender
49
X11_CONFIGURE_ENABLE=xlib
52
X11_CONFIGURE_ENABLE=xlib
Lines 75-96 MIPS_CONFIGURE_ENV= cairo_cv_atomic_primitives="libatomic-ops" Link Here
75
78
76
PLIST_SUB+=	LIBVER=2.11704.0
79
PLIST_SUB+=	LIBVER=2.11704.0
77
80
78
post-patch:
79
	@${REINPLACE_CMD} -e '/strings/s/ - / -a /' \
80
		-e '/test/s/==/=/g' \
81
		-e '/LIBS/s/-lrt//' -e '/LIBS/s|-ldld||' \
82
		-e '/LIBS/s|-ldl||' \
83
		${WRKSRC}/configure
84
	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo -lpthread|' \
85
		${WRKSRC}/src/*.pc.in
86
	@${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \
87
		${WRKSRC}/Makefile.in
88
	@${REINPLACE_CMD} -e 's|-ldl||g' \
89
		${WRKSRC}/util/*/Makefile.in \
90
		${WRKSRC}/boilerplate/Makefile.in
91
92
post-patch-DOCS-off:
81
post-patch-DOCS-off:
93
	@${REINPLACE_CMD} -e 's|public||g' \
82
	@${REINPLACE_CMD} '/^SUBDIRS/s/doc//' ${WRKSRC}/Makefile.am
94
		${WRKSRC}/doc/Makefile.in
83
	@${REINPLACE_CMD} -e '/^GTK_DOC_CHECK/d' -e '/doc\/.*Makefile/d' \
84
		${WRKSRC}/configure.ac
95
85
96
.include <bsd.port.mk>
86
.include <bsd.port.mk>
(-)b/graphics/cairo/files/patch-Makefile.am (+10 lines)
Added Link Here
1
--- Makefile.am.orig	2020-11-26 23:20:59 UTC
2
+++ Makefile.am
3
@@ -20,7 +20,6 @@ if CAIRO_HAS_PNG_FUNCTIONS
4
 SUBDIRS = src doc util
5
 # libpng is required for our test programs
6
 if CAIRO_HAS_PNG_FUNCTIONS
7
-SUBDIRS += boilerplate test perf
8
 endif
9
 
10
 doc:
(-)b/graphics/cairo/files/patch-build_configure.ac.system (+17 lines)
Added Link Here
1
--- build/configure.ac.system.orig	2020-11-26 23:20:59 UTC
2
+++ build/configure.ac.system
3
@@ -53,11 +53,11 @@ LIBS="$LIBS $LIBM"
4
 AC_CHECK_LIBM
5
 LIBS="$LIBS $LIBM"
6
 
7
-AC_CHECK_LIB(rt, sched_yield)
8
+AC_CHECK_LIB(c, sched_yield)
9
 
10
 has_shm_open=
11
-AC_CHECK_LIB(rt, shm_open, [
12
-	     SHM_LIBS=-lrt
13
+AC_CHECK_LIB(c, shm_open, [
14
+	     SHM_LIBS=
15
 	     has_shm_open=yes
16
 	     ], [SHM_LIBS=])
17
 AM_CONDITIONAL(HAVE_SHM, test "x$has_shm_open" = "xyes")
(-)b/graphics/cairo/files/patch-configure.ac (+11 lines)
Added Link Here
1
--- configure.ac.orig	2020-11-26 23:20:59 UTC
2
+++ configure.ac
3
@@ -842,7 +842,7 @@ save_LIBS="$LIBS"
4
 AM_CONDITIONAL(BUILD_SPHINX, test "x$have_glib" = "xyes" -a "x$have_windows" = "xno" -a "x$have_png" = "xyes")
5
 
6
 save_LIBS="$LIBS"
7
-AC_CHECK_LIB(rt, shm_open, shm_LIBS="-lrt")
8
+AC_CHECK_LIB(c, shm_open, shm_LIBS="")
9
 AC_SUBST(shm_LIBS)
10
 LIBS="$save_LIBS"
11
 
(-)a/graphics/cairo/files/patch-perf_cairo-perf-micro.c (-10 lines)
Removed Link Here
1
--- perf/cairo-perf-micro.c.orig	2020-11-26 23:20:59 UTC
2
+++ perf/cairo-perf-micro.c
3
@@ -43,6 +43,7 @@
4
 #endif
5
 
6
 #ifdef HAVE_SCHED_H
7
+#define _WITH_CPU_SET_T
8
 #include <sched.h>
9
 #endif
10
 
(-)a/graphics/cairo/files/patch-src_cairo-gl.h (-29 lines)
Removed Link Here
1
--- src/cairo-gl.h.orig	2015-03-10 22:21:07 UTC
2
+++ src/cairo-gl.h
3
@@ -92,7 +92,7 @@ cairo_public void
4
 cairo_gl_device_set_thread_aware (cairo_device_t	*device,
5
 				  cairo_bool_t		 thread_aware);
6
 
7
-#if CAIRO_HAS_GLX_FUNCTIONS
8
+#if defined(CAIRO_HAS_GLX_FUNCTIONS)
9
 #include <GL/glx.h>
10
 
11
 cairo_public cairo_device_t *
12
@@ -110,7 +110,7 @@ cairo_gl_surface_create_for_window (cair
13
 				    int width, int height);
14
 #endif
15
 
16
-#if CAIRO_HAS_WGL_FUNCTIONS
17
+#if defined(CAIRO_HAS_WGL_FUNCTIONS)
18
 #include <windows.h>
19
 
20
 cairo_public cairo_device_t *
21
@@ -126,7 +126,7 @@ cairo_gl_surface_create_for_dc (cairo_de
22
 				int			 height);
23
 #endif
24
 
25
-#if CAIRO_HAS_EGL_FUNCTIONS
26
+#if defined(CAIRO_HAS_EGL_FUNCTIONS)
27
 #include <EGL/egl.h>
28
 
29
 cairo_public cairo_device_t *
(-)a/graphics/cairo/files/patch-src_cairo-xlib-display.c (-14 lines)
Removed Link Here
1
--- src/cairo-xlib-display.c.orig	2015-03-10 22:21:07 UTC
2
+++ src/cairo-xlib-display.c
3
@@ -263,11 +263,7 @@ _cairo_xlib_device_create (Display *dpy)
4
     /* Prior to Render 0.10, there is no protocol support for gradients and
5
      * we call function stubs instead, which would silently consume the drawing.
6
      */
7
-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
8
     display->buggy_gradients = TRUE;
9
-#else
10
-    display->buggy_gradients = FALSE;
11
-#endif
12
     display->buggy_pad_reflect = FALSE;
13
     display->buggy_repeat = FALSE;
14
 
(-)a/graphics/cairo/files/patch-test_Makefile.am (-14 lines)
Removed Link Here
1
https://gitlab.freedesktop.org/cairo/cairo/-/issues/101
2
3
--- test/Makefile.am.orig	2021-05-28 10:52:08 UTC
4
+++ test/Makefile.am
5
@@ -18,7 +18,9 @@ endif
6
 endif
7
 
8
 if CAIRO_HAS_GL_SURFACE
9
+if CAIRO_HAS_GLX_FUNCTIONS
10
 test_sources += $(gl_surface_test_sources)
11
+endif
12
 endif
13
 
14
 if CAIRO_HAS_EGL_FUNCTIONS
(-)a/graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c (-11 lines)
Removed Link Here
1
--- util/cairo-sphinx/sphinx.c.orig	2015-03-10 22:21:07 UTC
2
+++ util/cairo-sphinx/sphinx.c
3
@@ -1337,7 +1337,7 @@ client_shm (const char *shm_path)
4
 
5
     base = mmap (NULL, DATA_SIZE,
6
 		 PROT_READ | PROT_WRITE,
7
-		 MAP_SHARED | MAP_NORESERVE,
8
+		 MAP_SHARED,
9
 		 fd, 0);
10
     close (fd);
11
 
(-)b/lang/spidermonkey78/Makefile (-1 / +1 lines)
Lines 14-20 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
14
14
15
BUILD_DEPENDS=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
15
BUILD_DEPENDS=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
16
		${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
16
		${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
17
		autoconf-2.13:devel/autoconf213 \
17
		autoconf2.13:devel/autoconf2.13 \
18
		rust-cbindgen>=0.8.7:devel/rust-cbindgen
18
		rust-cbindgen>=0.8.7:devel/rust-cbindgen
19
LIB_DEPENDS=	libffi.so:devel/libffi \
19
LIB_DEPENDS=	libffi.so:devel/libffi \
20
		libicudata.so:devel/icu \
20
		libicudata.so:devel/icu \
(-)b/lang/spidermonkey91/Makefile (-2 / +2 lines)
Lines 14-20 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
14
14
15
BUILD_DEPENDS=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
15
BUILD_DEPENDS=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
16
		${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
16
		${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
17
		autoconf-2.13:devel/autoconf213 \
17
		autoconf2.13:devel/autoconf2.13 \
18
		rust-cbindgen>=0.8.7:devel/rust-cbindgen
18
		rust-cbindgen>=0.8.7:devel/rust-cbindgen
19
LIB_DEPENDS=	libffi.so:devel/libffi \
19
LIB_DEPENDS=	libffi.so:devel/libffi \
20
		libicudata.so:devel/icu \
20
		libicudata.so:devel/icu \
Lines 78-84 BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} Link Here
78
.endif
78
.endif
79
79
80
pre-configure:
80
pre-configure:
81
	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
81
	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13)
82
82
83
post-patch:
83
post-patch:
84
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
84
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
(-)b/mail/thunderbird/Makefile (-4 / +4 lines)
Lines 22-28 BUILD_DEPENDS= nspr>=4.32:devel/nspr \ Link Here
22
		libvpx>=1.8.2:multimedia/libvpx \
22
		libvpx>=1.8.2:multimedia/libvpx \
23
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
23
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
24
		v4l_compat>0:multimedia/v4l_compat \
24
		v4l_compat>0:multimedia/v4l_compat \
25
		autoconf-2.13:devel/autoconf213 \
25
		autoconf2.13:devel/autoconf2.13 \
26
		nasm:devel/nasm \
26
		nasm:devel/nasm \
27
		yasm:devel/yasm \
27
		yasm:devel/yasm \
28
		zip:archivers/zip
28
		zip:archivers/zip
Lines 60-68 post-patch: Link Here
60
		${WRKSRC}/comm/mail/app/nsMailApp.cpp
60
		${WRKSRC}/comm/mail/app/nsMailApp.cpp
61
61
62
pre-configure:
62
pre-configure:
63
	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
63
	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
64
	(cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13)
64
	(cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf2.13)
65
	(cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
65
	(cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13)
66
66
67
port-pre-install:
67
port-pre-install:
68
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults
68
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults
(-)b/www/firefox-esr/Makefile (-3 / +3 lines)
Lines 24-30 BUILD_DEPENDS= nspr>=4.32:devel/nspr \ Link Here
24
		libvpx>=1.8.2:multimedia/libvpx \
24
		libvpx>=1.8.2:multimedia/libvpx \
25
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
25
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
26
		v4l_compat>0:multimedia/v4l_compat \
26
		v4l_compat>0:multimedia/v4l_compat \
27
		autoconf-2.13:devel/autoconf213 \
27
		autoconf2.13:devel/autoconf2.13 \
28
		nasm:devel/nasm \
28
		nasm:devel/nasm \
29
		yasm:devel/yasm \
29
		yasm:devel/yasm \
30
		zip:archivers/zip
30
		zip:archivers/zip
Lines 53-60 post-patch: Link Here
53
		${WRKSRC}/browser/app/nsBrowserApp.cpp
53
		${WRKSRC}/browser/app/nsBrowserApp.cpp
54
54
55
pre-configure:
55
pre-configure:
56
	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
56
	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
57
	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
57
	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13)
58
58
59
post-install:
59
post-install:
60
	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/
60
	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/
(-)b/www/firefox/Makefile (-3 / +3 lines)
Lines 22-28 BUILD_DEPENDS= nspr>=4.32:devel/nspr \ Link Here
22
		libvpx>=1.8.2:multimedia/libvpx \
22
		libvpx>=1.8.2:multimedia/libvpx \
23
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
23
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
24
		v4l_compat>0:multimedia/v4l_compat \
24
		v4l_compat>0:multimedia/v4l_compat \
25
		autoconf-2.13:devel/autoconf213 \
25
		autoconf2.13:devel/autoconf2.13 \
26
		nasm:devel/nasm \
26
		nasm:devel/nasm \
27
		yasm:devel/yasm \
27
		yasm:devel/yasm \
28
		zip:archivers/zip
28
		zip:archivers/zip
Lines 64-71 post-patch: Link Here
64
		${WRKSRC}/browser/app/nsBrowserApp.cpp
64
		${WRKSRC}/browser/app/nsBrowserApp.cpp
65
65
66
pre-configure:
66
pre-configure:
67
	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
67
	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
68
	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
68
	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13)
69
69
70
post-install:
70
post-install:
71
	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/
71
	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/

Return to bug 263970