From efd0dd922d2e5cd332f1aee5fdf6810814e7f400 Mon Sep 17 00:00:00 2001
From: ade <ade@FreeBSD.org>
Date: Mon, 11 Apr 2011 19:54:35 +0000
Subject: Update to GNU make 3.82 after numerous -exp runs.

---
 games/grubik/Makefile                        |  5 +++--
 games/lgeneral/files/patch-intl::Makefile.in | 15 +++++++++++++++
 games/pinball/Makefile                       |  5 +++++
 games/xconq/Makefile                         |  5 +++++
 4 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 games/lgeneral/files/patch-intl::Makefile.in

(limited to 'games')

diff --git a/games/grubik/Makefile b/games/grubik/Makefile
index 430ae25196fa..06ae70817c4d 100644
--- a/games/grubik/Makefile
+++ b/games/grubik/Makefile
@@ -18,13 +18,14 @@ COMMENT=	Virtual 3D Rubiks cube for GNUstep
 
 LICENSE=	GPLv2
 
+USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 
 post-patch:
-	${RMDIR} ${WRKSRC}/GRubik.app/ix86/linux-gnu
-	${RMDIR} ${WRKSRC}/GRubik.app/ix86
+	@${RM} -rf ${WRKSRC}/GRubik.app/ix86
+	@${REINPLACE_CMD} -e 's|^//|# //|' ${WRKSRC}/GNUmakefile
 
 .include <bsd.port.mk>
diff --git a/games/lgeneral/files/patch-intl::Makefile.in b/games/lgeneral/files/patch-intl::Makefile.in
new file mode 100644
index 000000000000..69babd49cae5
--- /dev/null
+++ b/games/lgeneral/files/patch-intl::Makefile.in
@@ -0,0 +1,15 @@
+--- intl/Makefile.in.orig	2006-05-29 11:43:09.000000000 -0500
++++ intl/Makefile.in	2011-03-25 14:51:01.000000000 -0500
+@@ -205,12 +205,2 @@
+ 
+-# The dependency for intlh.inst is different in gettext and all other
+-# packages.  Because we cannot you GNU make features we have to solve
+-# the problem while rewriting Makefile.in.
+-@GT_YES@intlh.inst: intlh.inst.in ../config.status
+-@GT_YES@	cd .. \
+-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+-@GT_YES@	  $(SHELL) ./config.status
+-@GT_NO@.PHONY: intlh.inst
+-@GT_NO@intlh.inst:
+-
+ # Tell versions [3.59,3.63) of GNU make not to export all variables.
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index 4279035f4695..02e79bb83365 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -42,6 +42,11 @@ DOCS=		README
 
 .include <bsd.port.pre.mk>
 
+# For gmake>=3.82
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} \
+		${REINPLACE_CMD} -e 's,^dnl,# dnl,'
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 2fa9e20933b3..a3946732153b 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -34,6 +34,11 @@ CONFIGURE_ARGS=	--with-tclconfig=${TCL_LIBDIR} \
 		--with-tkconfig=${TK_LIBDIR} \
 		--enable-alternate-scoresdir=${SCOREDIR}
 
+# Fix for gmake >= 3.82
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} \
+		${REINPLACE_CMD} -e 's/^   */	/'
+
 post-install:
 .for file in xconq imf2x x2imf ximfapp
 	${STRIP_CMD} ${PREFIX}/bin/${file}
-- 
cgit