On Sun, Jun 24, 2012 at 06:06:30PM -0400, Brad Smith wrote:
> On Sun, Jun 24, 2012 at 05:27:18PM +0200, Matthieu Herrb wrote:
> > Hi,
> >
> > Automake 1.10 used to call various shell scripts (mostly the infamous
> > install-sh one) without an explicit /bin/sh in front of them, which
> > caused Xenocara builds to fail, since no shell script in /usr/xenocara
> > is supposed to have the 'x' bit set (since OpenBSD doesn't want files
> > with the 'x' bit set in the CVS repository for various reasons).
> >
> > This has been fixed somewhere in the automake 1.11 release, so now if
> > I regenerate autotools-produced files in Xenocara with automake 1.11,
> > I see failures like
> >
> > /bin/sh /bin/sh /usr/xenocara/lib/fontconfig/install -d /etc/fonts
> > /var/cache/fontconfig
> > /bin/sh[1]: syntax error: `(' unexpected
> >
> > No ${install_sh} is defined as ${SHELL} /path/to/install-sh
> >
> > So remove the now useless patches. ok ?
>
> These patches also need to be removed for automake 1.10 and 1.12.
Here is an updated diff covering all the appropriate versions.
Index: 1.10/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/automake/1.10/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- 1.10/Makefile 22 Feb 2012 07:43:58 -0000 1.12
+++ 1.10/Makefile 25 Jun 2012 04:16:14 -0000
@@ -4,7 +4,7 @@ COMMENT= GNU standards-compliant Makefil
VERSION= 1.10
DISTNAME= automake-${VERSION}.3
-REVISION= 3
+REVISION= 4
PKGSPEC= automake->=${VERSION},<1.11
CATEGORIES= devel
Index: 1.10/patches/patch-automake_in
===================================================================
RCS file: /home/cvs/ports/devel/automake/1.10/patches/patch-automake_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-automake_in
--- 1.10/patches/patch-automake_in 22 Jul 2010 19:12:22 -0000 1.1.1.1
+++ 1.10/patches/patch-automake_in 25 Jun 2012 04:19:31 -0000
@@ -1,15 +1,6 @@
$OpenBSD: patch-automake_in,v 1.1.1.1 2010/07/22 19:12:22 ajacoutot Exp $
---- automake.in.orig Tue Dec 8 20:36:30 2009
-+++ automake.in Thu Jul 22 06:54:11 2010
-@@ -4055,7 +4055,7 @@ sub handle_configure ($$$@)
- # Use $(install_sh), not $(MKDIR_P) because the latter requires
- # at least one argument, and $(mkinstalldirs) used to work
- # even without arguments (e.g. $(mkinstalldirs) $(conditional_dir)).
-- define_variable ('mkinstalldirs', '$(install_sh) -d', INTERNAL);
-+ define_variable ('mkinstalldirs', '$(SHELL) $(install_sh) -d',
INTERNAL);
- }
-
- reject_var ('CONFIG_HEADER',
+--- automake.in.orig Tue Dec 8 14:36:30 2009
++++ automake.in Mon Jun 25 00:19:06 2012
@@ -4815,6 +4815,7 @@ sub scan_autoconf_traces ($)
_LT_AC_TAGCONFIG => 0,
m4_include => 1,
Index: 1.10/patches/patch-lib_am_header-vars_am
===================================================================
RCS file: 1.10/patches/patch-lib_am_header-vars_am
diff -N 1.10/patches/patch-lib_am_header-vars_am
--- 1.10/patches/patch-lib_am_header-vars_am 18 May 2011 19:38:15 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-lib_am_header-vars_am,v 1.1 2011/05/18 19:38:15 matthieu Exp $
---- lib/am/header-vars.am.orig Tue Dec 8 20:35:33 2009
-+++ lib/am/header-vars.am Mon May 16 08:16:06 2011
-@@ -35,9 +35,9 @@ pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--install_sh_DATA = $(install_sh) -c -m 644
--install_sh_PROGRAM = $(install_sh) -c
--install_sh_SCRIPT = $(install_sh) -c
-+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
-+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
-+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = $(program_transform_name)
-
Index: 1.11/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/automake/1.11/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- 1.11/Makefile 23 Apr 2012 08:01:14 -0000 1.8
+++ 1.11/Makefile 25 Jun 2012 04:17:21 -0000
@@ -4,6 +4,7 @@ COMMENT= GNU standards-compliant Makefil
VERSION= 1.11
DISTNAME= automake-${VERSION}.5
+REVISION= 0
PKGSPEC= automake->=${VERSION},<1.12
CATEGORIES= devel
Index: 1.11/patches/patch-automake_in
===================================================================
RCS file: /home/cvs/ports/devel/automake/1.11/patches/patch-automake_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-automake_in
--- 1.11/patches/patch-automake_in 22 Feb 2012 07:14:20 -0000 1.2
+++ 1.11/patches/patch-automake_in 25 Jun 2012 04:19:58 -0000
@@ -1,15 +1,6 @@
$OpenBSD: patch-automake_in,v 1.2 2012/02/22 07:14:20 ajacoutot Exp $
---- automake.in.orig Wed Feb 1 05:31:13 2012
-+++ automake.in Thu Feb 16 22:24:10 2012
-@@ -4384,7 +4384,7 @@ sub handle_configure ($$$@)
- # Use $(install_sh), not $(MKDIR_P) because the latter requires
- # at least one argument, and $(mkinstalldirs) used to work
- # even without arguments (e.g. $(mkinstalldirs) $(conditional_dir)).
-- define_variable ('mkinstalldirs', '$(install_sh) -d', INTERNAL);
-+ define_variable ('mkinstalldirs', '$(SHELL) $(install_sh) -d',
INTERNAL);
- }
-
- reject_var ('CONFIG_HEADER',
+--- automake.in.orig Fri Apr 13 10:46:00 2012
++++ automake.in Mon Jun 25 00:19:46 2012
@@ -5337,6 +5337,7 @@ sub scan_autoconf_traces ($)
_LT_AC_TAGCONFIG => 0,
m4_include => 1,
Index: 1.11/patches/patch-lib_am_header-vars_am
===================================================================
RCS file: 1.11/patches/patch-lib_am_header-vars_am
diff -N 1.11/patches/patch-lib_am_header-vars_am
--- 1.11/patches/patch-lib_am_header-vars_am 8 Apr 2012 07:12:56 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-lib_am_header-vars_am,v 1.2 2012/04/08 07:12:56 ajacoutot Exp $
---- lib/am/header-vars.am.orig Mon Apr 2 06:09:39 2012
-+++ lib/am/header-vars.am Sat Apr 7 22:15:00 2012
-@@ -63,9 +63,9 @@ pkglibdir = $(libdir)/@PACKAGE@
- pkglibexecdir = $(libexecdir)/@PACKAGE@
-
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--install_sh_DATA = $(install_sh) -c -m 644
--install_sh_PROGRAM = $(install_sh) -c
--install_sh_SCRIPT = $(install_sh) -c
-+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
-+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
-+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = $(program_transform_name)
-
Index: 1.12/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/automake/1.12/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- 1.12/Makefile 7 Jun 2012 12:06:47 -0000 1.1.1.1
+++ 1.12/Makefile 25 Jun 2012 04:41:42 -0000
@@ -4,6 +4,7 @@ COMMENT= GNU standards-compliant Makefil
VERSION= 1.12
DISTNAME= automake-${VERSION}
+REVISION= 0
PKGSPEC= automake->=${VERSION},<1.13
CATEGORIES= devel
Index: 1.12/patches/patch-automake_in
===================================================================
RCS file: /home/cvs/ports/devel/automake/1.12/patches/patch-automake_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-automake_in
--- 1.12/patches/patch-automake_in 7 Jun 2012 12:06:47 -0000 1.1.1.1
+++ 1.12/patches/patch-automake_in 25 Jun 2012 04:42:20 -0000
@@ -1,15 +1,6 @@
$OpenBSD: patch-automake_in,v 1.1.1.1 2012/06/07 12:06:47 jasper Exp $
--- automake.in.orig Sat Apr 21 10:38:05 2012
-+++ automake.in Thu May 24 22:54:00 2012
-@@ -4236,7 +4236,7 @@ sub handle_configure ($$$@)
- # Use $(install_sh), not $(MKDIR_P) because the latter requires
- # at least one argument, and $(mkinstalldirs) used to work
- # even without arguments (e.g. $(mkinstalldirs) $(conditional_dir)).
-- define_variable ('mkinstalldirs', '$(install_sh) -d', INTERNAL);
-+ define_variable ('mkinstalldirs', '$(SHELL) $(install_sh) -d',
INTERNAL);
- }
-
- reject_var ('CONFIG_HEADER',
++++ automake.in Mon Jun 25 00:42:08 2012
@@ -5222,6 +5222,7 @@ sub scan_autoconf_traces ($)
_LT_AC_TAGCONFIG => 0,
m4_include => 1,
Index: 1.12/patches/patch-lib_am_header-vars_am
===================================================================
RCS file: 1.12/patches/patch-lib_am_header-vars_am
diff -N 1.12/patches/patch-lib_am_header-vars_am
--- 1.12/patches/patch-lib_am_header-vars_am 7 Jun 2012 12:06:47 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-lib_am_header-vars_am,v 1.1.1.1 2012/06/07 12:06:47 jasper Exp
$
---- lib/am/header-vars.am.orig Sat Apr 21 10:38:05 2012
-+++ lib/am/header-vars.am Thu May 24 22:54:00 2012
-@@ -62,9 +62,9 @@ pkglibdir = $(libdir)/@PACKAGE@
- pkglibexecdir = $(libexecdir)/@PACKAGE@
-
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--install_sh_DATA = $(install_sh) -c -m 644
--install_sh_PROGRAM = $(install_sh) -c
--install_sh_SCRIPT = $(install_sh) -c
-+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
-+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
-+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = $(program_transform_name)
-
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
