From 2859b60450a30f9445658253cf5ca5dc74b74e4a Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Sun, 25 Dec 2016 22:24:03 +0000 Subject: [PATCH] www/xombrero: unbreak parallel make FreeBSD-specific Makefile had no dependencies for generated include file tooltips.h and for fast machines, build for settings.c happened before completion of its generation. And xombrero.o depends only on javascript.h (via xombrero.h), there is no dependency on tooltips.h. Separate patch, since the first one (patch-freebsd__Makefile) went upstream, so we can have it removed in the next version. This should unbreak builds on 9.x and 10.x, but I'll test this specifically on the build machines and will remove BROKENs after this. Hopefully, others will be able to test this new version as well. If so, drop me e-mail at rea@FreeBSD.org. --- www/xombrero/Makefile | 2 +- www/xombrero/files/patch-freebsd__Makefile.2 | 32 ++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 www/xombrero/files/patch-freebsd__Makefile.2 diff --git a/www/xombrero/Makefile b/www/xombrero/Makefile index 7f180c5f1c98..e79eb609731b 100644 --- a/www/xombrero/Makefile +++ b/www/xombrero/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 1.6.4 CATEGORIES= www MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= rea@FreeBSD.org COMMENT= Minimalists vi-like web browser based on webkit and GTK+ LICENSE= ISCL diff --git a/www/xombrero/files/patch-freebsd__Makefile.2 b/www/xombrero/files/patch-freebsd__Makefile.2 new file mode 100644 index 000000000000..0d8237f5f81c --- /dev/null +++ b/www/xombrero/files/patch-freebsd__Makefile.2 @@ -0,0 +1,32 @@ +--- freebsd/Makefile.old 2016-12-25 23:58:00.917123000 +0300 ++++ freebsd/Makefile 2016-12-25 23:58:00.917136000 +0300 +@@ -20,6 +20,11 @@ + + CC?= cc + ++PARENT_OBJS= \ ++ ../xombrero.o freebsd.o ../marco.o ../about.o ../inspector.o ../whitelist.o \ ++ ../settings.o ../cookie.o ../history.o ../completion.o ../inputfocus.o ../tldlist.o \ ++ ../externaleditor.o ../unix.o ++ + all: ../javascript.h ../tooltip.h xombrero + + ../javascript.h: ../js-merge-helper.pl ../hinting.js ../autoscroll.js +@@ -57,11 +62,13 @@ + + tldlist.o: ../tldlist.o + +-../xombrero.o: ../javascript.h ../tooltip.h ++../settings.o: ../tooltip.h + +-xombrero: ../xombrero.o freebsd.o ../marco.o ../about.o ../inspector.o ../whitelist.o \ +- ../settings.o ../cookie.o ../history.o ../completion.o ../inputfocus.o ../tldlist.o \ +- ../externaleditor.o ../unix.o ++$(PARENT_OBJS): ../xombrero.h ++ ++../xombrero.h: ../javascript.h ++ ++xombrero: freebsd.o $(PARENT_OBJS) + $(CC) $(LDFLAGS) -o $@ ${.ALLSRC} $(LDADD) + + install: all