On 2014-11-25, Christian Weisgerber <[email protected]> wrote:
> We can add patches/patch-tests_scripts_features_archives:
Complete diff:
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/gmake/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile 29 Aug 2014 13:24:29 -0000 1.52
+++ Makefile 25 Nov 2014 18:12:38 -0000
@@ -2,9 +2,8 @@
COMMENT= GNU make
-DISTNAME= make-4.0
+DISTNAME= make-4.1
PKGNAME= g${DISTNAME}
-REVISION= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=make/}
EXTRACT_SUFX= .tar.bz2
@@ -24,5 +23,8 @@ CONFIGURE_ARGS= --program-prefix="g" --w
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/config
+
+pre-test:
+ @rm ${WRKSRC}/tests/scripts/features/*.orig
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/gmake/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 30 Oct 2013 23:08:56 -0000 1.7
+++ distinfo 25 Nov 2014 18:12:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (make-4.0.tar.bz2) = 5gaGx6/t5izIyGrTASzwgepIh9r50iPOcRVwOyuy29s=
-SIZE (make-4.0.tar.bz2) = 1341927
+SHA256 (make-4.1.tar.bz2) = C8dhM4llDuaiRVS1JXKicvc1YWT9LEEysLzxMSPk/KU=
+SIZE (make-4.1.tar.bz2) = 1327342
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/gmake/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 30 Oct 2013 23:08:56 -0000 1.2
+++ patches/patch-Makefile_in 25 Nov 2014 18:12:38 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.2 2013/10/30 23:08:56 brad Exp $
---- Makefile.in.orig Wed Oct 9 02:11:52 2013
-+++ Makefile.in Wed Oct 9 18:12:29 2013
-@@ -395,7 +395,7 @@ EXTRA_make_SOURCES = vmsjobs.c remote-stub.c remote-cs
+--- Makefile.in.orig Sun Oct 5 18:25:22 2014
++++ Makefile.in Tue Nov 25 02:42:23 2014
+@@ -462,7 +462,7 @@ EXTRA_make_SOURCES = vmsjobs.c remote-stub.c remote-cs
noinst_HEADERS = commands.h dep.h filedef.h job.h makeint.h rule.h variable.h
\
debug.h getopt.h gettext.h hash.h output.h
-make_LDADD = @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ @LIBINTL@ \
+make_LDADD = @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ @LTLIBINTL@ \
- $(GUILE_LIBS) $(am__append_2)
+ $(GUILE_LIBS) $(am__append_1)
man_MANS = make.1
- AM_CPPFLAGS = $(GLOBINC) $(am__append_3)
+ AM_CPPFLAGS = $(GLOBINC) $(am__append_2)
Index: patches/patch-tests_scripts_features_archives
===================================================================
RCS file: patches/patch-tests_scripts_features_archives
diff -N patches/patch-tests_scripts_features_archives
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_scripts_features_archives 25 Nov 2014 18:12:38
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- tests/scripts/features/archives.orig Sun Oct 5 18:24:51 2014
++++ tests/scripts/features/archives Tue Nov 25 18:40:08 2014
+@@ -83,7 +83,7 @@ run_make_test(q!
+ DIR = artest
+ vpath % $(DIR)
+ default: lib(foo)
+-(%): %.vhd ; @cd $(DIR) && touch $(*F) && $(AR) $(ARFLAGS) $@ $(*F)
>/dev/null 2>&1 && rm $(*F)
++(%): %.vhd ; @cd $(DIR) && echo foo >$(*F) && $(AR) $(ARFLAGS) $@ $(*F)
>/dev/null 2>&1 && rm $(*F)
+ .PHONY: default
+ !,
+ '', "");
--
Christian "naddy" Weisgerber [email protected]
