- Update devel/gmake to 4.2.

- deskutils/tomboy, devel/ocaml-deriving-ocsigen: patch Makefile bug.
- games/0ad: disable make jobs when building bundled Spidermonkey.

PR:		209868
Exp-run by:	antoine
Approved by:	portmgr (antoine)

6 files changed, 39 insertions, 12 deletions

diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 59745d4..85bbb6b 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -36,7 +36,7 @@ EVOLUTION_DESC=	Build evolution addin
 # Restrict to stable (even) versions, indicated by the second component.
 PORTSCOUT=	limitw:1,even
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEVOLUTION}
 CONFIGURE_ARGS+=--enable-evolution
@@ -51,5 +51,7 @@ PLIST_SUB+=	EVOLUTION="@comment "
 post-patch:
 	@${REINPLACE_CMD} 's|/bin/bash|/bin/sh|g' \
 		${WRKSRC}/Tomboy/tomboy*.in
+	@${REINPLACE_CMD} 's/(TARGET_NAME$$)/(TARGET_NAME)/' \
+		${WRKSRC}/Tomboy/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 64875cc3..be398b8 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gmake
-PORTVERSION=	4.1
-PORTREVISION=	2
+PORTVERSION=	4.2
 CATEGORIES=	devel
 MASTER_SITES=	GNU/make
 DISTNAME=	make-${PORTVERSION}
@@ -15,10 +14,14 @@ MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	GNU version of 'make' utility
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--program-prefix=g \
+CONFIGURE_ARGS=	--program-prefix=g \
 		--without-guile
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
+# fmake does not like PO_DEPENDS_ON_POT being undefined
+MAKE_ARGS=	PO_DEPENDS_ON_POT=
 
 USES=		cpe makeinfo tar:bzip2
 CPE_VENDOR=	gnu
@@ -31,8 +34,6 @@ NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG} \
 			--with-libintl-prefix=${LOCALBASE}
 NLS_CONFIGURE_ENABLE=	nls
 
-CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
-
 INFO=		make
 
 .include <bsd.port.mk>
diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo
index ab429ab..e074bdd 100644
--- a/devel/gmake/distinfo
+++ b/devel/gmake/distinfo
@@ -1,2 +1,3 @@
-SHA256 (make-4.1.tar.bz2) = 0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5
-SIZE (make-4.1.tar.bz2) = 1327342
+TIMESTAMP = 1464634898
+SHA256 (make-4.2.tar.bz2) = 4e5ce3b62fe5d75ff8db92b7f6df91e476d10c3aceebf1639796dc5bfece655f
+SIZE (make-4.2.tar.bz2) = 1400539
diff --git a/devel/gmake/pkg-descr b/devel/gmake/pkg-descr
index d7f5370..456196b 100644
--- a/devel/gmake/pkg-descr
+++ b/devel/gmake/pkg-descr
@@ -2,4 +2,4 @@ GNU make is a tool that controls the generation of executables and other
 non-source files from source files.  Its purpose is the same as that
 of the utility make(1).
 
-WWW: http://www.gnu.org/software/make/make.html
+WWW: https://www.gnu.org/software/make/
diff --git a/devel/ocaml-deriving-ocsigen/files/patch-syntax-Makefile b/devel/ocaml-deriving-ocsigen/files/patch-syntax-Makefile
new file mode 100644
index 0000000..650ecf4
--- /dev/null
+++ b/devel/ocaml-deriving-ocsigen/files/patch-syntax-Makefile
@@ -0,0 +1,15 @@
+--- syntax/Makefile.orig	2011-12-08 04:46:54 UTC
++++ syntax/Makefile
+@@ -39,9 +39,9 @@ ifneq (${TYPECONV},)
+ MAIN_TC := pa_deriving_tc.ml
+ endif
+ 
+-CLASSES_CMO := $(patsubst %.ml,classes/%.cmo$,${CLASSES})
+-CLASSES_CMX := $(patsubst %.ml,classes/%.cmx$,${CLASSES})
+-CLASSES_DEPS := $(patsubst %.ml,classes/.%.ml.deps$,${CLASSES})
++CLASSES_CMO := $(patsubst %.ml,classes/%.cmo,${CLASSES})
++CLASSES_CMX := $(patsubst %.ml,classes/%.cmx,${CLASSES})
++CLASSES_DEPS := $(patsubst %.ml,classes/.%.ml.deps,${CLASSES})
+ 
+ ${CLASSES_CMO} ${CLASSES_CMX} ${CLASSES_DEPS}: \
+ 	LIBS+=-syntax camlp4o -package camlp4.quotations.o -I classes
diff --git a/games/0ad/files/patch-libraries__source__spidermonkey__build.sh b/games/0ad/files/patch-libraries__source__spidermonkey__build.sh
index fc0133e..99b9be5 100644
--- a/games/0ad/files/patch-libraries__source__spidermonkey__build.sh
+++ b/games/0ad/files/patch-libraries__source__spidermonkey__build.sh
@@ -1,6 +1,14 @@
---- libraries/source/spidermonkey/build.sh.orig	2015-01-24 14:46:52 UTC
+--- libraries/source/spidermonkey/build.sh.orig	2015-09-30 20:28:13 UTC
 +++ libraries/source/spidermonkey/build.sh
-@@ -95,6 +95,14 @@ cd mozjs31/js/src
+@@ -25,7 +25,6 @@ else
+   MAKE=${MAKE:="make"}
+ fi
+ 
+-MAKE_OPTS="${JOBS}"
+ 
+ CONF_OPTS="--enable-shared-js --enable-gcgenerational --disable-tests --without-intl-api" # --enable-trace-logging"
+ 
+@@ -82,6 +81,14 @@ cd js/src
  rm -rf build-debug
  rm -rf build-release