On Sun, May 15, 2011 at 06:55:34PM -0400, Brad wrote:
> On 15/05/11 5:55 PM, Matthieu Herrb wrote:
> >Similar patches should be added to automake 1.10 and 1.11
> >
> >ok?
>
> No, do as you said above first.
What do you mean? submit the patches for automake 1.10 and 1.11
at the same time? It's the same patch duplicated 3 times.
Here is a full diff that do the 3 versions.
Index: 1.10/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/automake/1.10/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- 1.10/Makefile 26 Nov 2010 14:17:17 -0000 1.7
+++ 1.10/Makefile 16 May 2011 06:22:51 -0000
@@ -4,7 +4,7 @@ COMMENT= GNU standards-compliant Makefil
VERSION= 1.10
DISTNAME= automake-${VERSION}.3
-REVISION = 0
+REVISION = 1
PKGSPEC = automake->=${VERSION},<1.11
CATEGORIES= devel
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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 1.10/patches/patch-lib_am_header-vars_am 16 May 2011 06:22:51 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- 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: /cvs/OpenBSD/ports/devel/automake/1.11/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 Makefile
--- 1.11/Makefile 5 May 2011 18:55:34 -0000 1.1.1.1
+++ 1.11/Makefile 16 May 2011 06:22:51 -0000
@@ -4,6 +4,7 @@ COMMENT= GNU standards-compliant Makefil
VERSION= 1.11
DISTNAME= automake-${VERSION}.1
+REVISION= 0
PKGSPEC = automake->=${VERSION},<1.12
CATEGORIES= devel
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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 1.11/patches/patch-lib_am_header-vars_am 16 May 2011 06:22:51 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- lib/am/header-vars.am.orig Tue Dec 8 19:02:32 2009
++++ lib/am/header-vars.am Mon May 16 08:18:03 2011
+@@ -34,9 +34,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.9/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/automake/1.9/Makefile,v
retrieving revision 1.18
diff -u -p -u -r1.18 Makefile
--- 1.9/Makefile 5 May 2011 12:30:16 -0000 1.18
+++ 1.9/Makefile 16 May 2011 06:22:51 -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: 1.9/patches/patch-lib_am_header-vars_am
===================================================================
RCS file: 1.9/patches/patch-lib_am_header-vars_am
diff -N 1.9/patches/patch-lib_am_header-vars_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 1.9/patches/patch-lib_am_header-vars_am 16 May 2011 06:22:51 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- 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
