Hi,
since we avoid/ban executable files in CVS, the install-sh scripts in
/usr/xenocara are supposed not to be executable.
An upcoming update of libX11 to 1.4.2 uses automake features that makes it
use ${install_sh_DATA} to install stuff. This fails when install-sh is not
executable.
The patch below makes automake 1.9 generate rules that use ${SHELL} to
spawn install-sh, like it already does in a few places.
Similar patches should be added to automake 1.10 and 1.11
ok?
Index: Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/automake/1.9/Makefile,v
retrieving revision 1.18
diff -u -p -u -r1.18 Makefile
--- Makefile 5 May 2011 12:30:16 -0000 1.18
+++ Makefile 15 May 2011 21:48:38 -0000
@@ -4,7 +4,7 @@ COMMENT= GNU standards-compliant Makefil
VERSION= 1.9
DISTNAME= automake-${VERSION}.6
-REVISION= 6
+REVISION= 7
PKGSPEC = automake->=${VERSION},<1.10
CATEGORIES= devel
Index: patches/patch-lib_am_header-vars_am
===================================================================
RCS file: patches/patch-lib_am_header-vars_am
diff -N patches/patch-lib_am_header-vars_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_am_header-vars_am 15 May 2011 21:48:38 -0000
@@ -0,0 +1,15 @@
+--- lib/am/header-vars.am.orig Sun May 15 23:32:42 2011
++++ lib/am/header-vars.am Sun May 15 23:33:29 2011
+@@ -41,9 +41,9 @@
+
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-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)
+
--
Matthieu Herrb
