Use bmake instead of gmake - this hopefully resolves dependency deadloop

(gettext->expat->gmake->gettext->expat->...) occasionally created by yours
truly.

Reported by:		marcus
Self kick applied to:	sobomax

5 files changed, 64 insertions, 2 deletions

diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index ebb40ecc6bc1..7bd8b9f1cb69 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -15,13 +15,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 
 CONFIGURE_ARGS=	--enable-shared --enable-static
 USE_LIBTOOL=	yes
-USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
 
 SHLIB_MAJOR=	2
 
-MAKE_ARGS=	LIBCURRENT="${SHLIB_MAJOR}"
+MAKE_ENV=	LIBCURRENT="${SHLIB_MAJOR}"
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
 post-install:
diff --git a/textproc/expat2/files/patch-Makefile.in b/textproc/expat2/files/patch-Makefile.in
new file mode 100644
index 000000000000..897a27378c98
--- /dev/null
+++ b/textproc/expat2/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in	2002/05/10 17:17:43	1.1
++++ Makefile.in	2002/05/10 17:18:54
+@@ -108,7 +108,7 @@
+ 	$(SHELL) ./config.status
+ 
+ $(SUBDIRS):
+-	cd $@ && $(MAKE)
++	cd $@ && $(MAKE) all
+ 
+ clean:
+ 	for dir in $(SUBDIRS); do \
diff --git a/textproc/expat2/files/patch-examples::Makefile.in b/textproc/expat2/files/patch-examples::Makefile.in
new file mode 100644
index 000000000000..0247408dd5d7
--- /dev/null
+++ b/textproc/expat2/files/patch-examples::Makefile.in
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- examples/Makefile.in	2002/05/10 17:22:56	1.1
++++ examples/Makefile.in	2002/05/10 17:30:01
+@@ -35,10 +35,10 @@
+ all: elements outline
+ 
+ elements: elements.o
+-	$(CC) -o $@ $< $(LDFLAGS) $(LIBS)
++	$(CC) -o $@ elements.o $(LDFLAGS) $(LIBS)
+ 
+ outline: outline.o
+-	$(CC) -o $@ $< $(LDFLAGS) $(LIBS)
++	$(CC) -o $@ outline.o $(LDFLAGS) $(LIBS)
+ 
+ check:	$(SUBDIRS)
+ 	@echo
diff --git a/textproc/expat2/files/patch-lib::Makefile.in b/textproc/expat2/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..d314a0d8e2f8
--- /dev/null
+++ b/textproc/expat2/files/patch-lib::Makefile.in
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- lib/Makefile.in	2002/05/10 17:34:58	1.1
++++ lib/Makefile.in	2002/05/10 17:35:11
+@@ -83,9 +83,9 @@
+ LIBS = @LIBS@
+ CFLAGS = @CFLAGS@
+ 
+-LIBREVISION = @LIBREVISION@
+-LIBCURRENT  = @LIBCURRENT@
+-LIBAGE      = @LIBAGE@
++LIBREVISION ?= @LIBREVISION@
++LIBCURRENT  ?= @LIBCURRENT@
++LIBAGE      ?= @LIBAGE@
+ 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
diff --git a/textproc/expat2/files/patch-xmlwf::Makefile.in b/textproc/expat2/files/patch-xmlwf::Makefile.in
new file mode 100644
index 000000000000..a76e2ef45fc5
--- /dev/null
+++ b/textproc/expat2/files/patch-xmlwf::Makefile.in
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- xmlwf/Makefile.in	2002/05/10 17:31:29	1.1
++++ xmlwf/Makefile.in	2002/05/10 17:31:48
+@@ -43,6 +43,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ 
++all: xmlwf
+ 
+ xmlwf: $(OBJS)
+ 	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)