Use gmake instead of using rules that may or may not work depending of the

version of sys.mk
This fixes build on head after r279980

9 files changed, 7 insertions, 23 deletions

diff --git a/archivers/dzip/Makefile b/archivers/dzip/Makefile
index 08fdda82e8ca..9bd2636157be 100644
--- a/archivers/dzip/Makefile
+++ b/archivers/dzip/Makefile
@@ -12,7 +12,7 @@ COMMENT=	File compression utility specializing in Quake demo compression
 
 LICENSE=	ZLIB
 
-USES=		dos2unix zip
+USES=		dos2unix gmake zip
 
 NO_WRKSUBDIR=	yes
 MAKEFILE=	${WRKSRC}/Makefile.linux
@@ -27,7 +27,6 @@ post-extract: .SILENT
 			${WRKSRC}/dzip.h ${WRKSRC}/conmain.c
 	${REINPLACE_CMD} -e '4s,^,#include <machine/endian.h>,' \
 		${WRKSRC}/dzip.h
-	${REINPLACE_CMD} -e 's/) $$(OBJECTS/&:T/' ${MAKEFILE}
 	${REINPLACE_CMD} -e '21d;23d' ${WRKSRC}/dzipcon.h
 
 do-install:
diff --git a/devel/luafilesystem/Makefile b/devel/luafilesystem/Makefile
index debfa71ed239..8889fcec1d81 100644
--- a/devel/luafilesystem/Makefile
+++ b/devel/luafilesystem/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Library to access directory structure and file attributes
 LICENSE=	MIT
 
 USES?=		lua
+USES+=		gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	keplerproject
diff --git a/devel/luafilesystem/files/patch-Makefile b/devel/luafilesystem/files/patch-Makefile
index 68fd9e435ee7..3e1ff5429a0e 100644
--- a/devel/luafilesystem/files/patch-Makefile
+++ b/devel/luafilesystem/files/patch-Makefile
@@ -5,7 +5,7 @@
  
  src/lfs.so: $(OBJS)
 -	MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS)
-+	$(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $T.o
++	$(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS)
  
  test: lib
  	LUA_CPATH=./src/?.so lua tests/test.lua
diff --git a/net/redir/Makefile b/net/redir/Makefile
index a094ec89bfa8..9c878659023a 100644
--- a/net/redir/Makefile
+++ b/net/redir/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES=	http://sammy.net/~sammy/hacks/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TCP connection redirection utility
 
+USES=		gmake
 USE_RC_SUBR=	redir
 
 PLIST_FILES=	bin/redir man/man1/redir.1.gz
diff --git a/net/redir/files/patch-Makefile b/net/redir/files/patch-Makefile
index da1e2f685484..ce69c2c16b74 100644
--- a/net/redir/files/patch-Makefile
+++ b/net/redir/files/patch-Makefile
@@ -23,12 +23,3 @@
  LDFLAGS = -s
  
  # solaris, and others, may also need these libraries to link
-@@ -49,7 +48,7 @@
- 	rm -f $(OBJS) redir core
- 
- redir:		${OBJS}
--	${CC} ${LDFLAGS} -o redir ${OBJS} ${LIBS}
-+	${CC} ${LDFLAGS} -o redir redir.o getopt.o getopt1.o ${LIBS}
- 
- 
- 
diff --git a/sysutils/xacpim/Makefile b/sysutils/xacpim/Makefile
index 5103c6843a36..f246daa0a791 100644
--- a/sysutils/xacpim/Makefile
+++ b/sysutils/xacpim/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES=	http://shapeshifter.se/pub/xacpim/
 MAINTAINER=	henriknj@0xmilk.org
 COMMENT=	Utility to display battery status and temperature on the root-display
 
+USES=		gmake
 USE_XORG=	x11
 PLIST_FILES=	bin/xacpim
 
diff --git a/sysutils/xacpim/files/patch-Makefile b/sysutils/xacpim/files/patch-Makefile
index cc019995d8d1..0b8b98211dcd 100644
--- a/sysutils/xacpim/files/patch-Makefile
+++ b/sysutils/xacpim/files/patch-Makefile
@@ -9,7 +9,7 @@
  
  all::	${OBJS}
 -	${CC} -o xacpim *.o -lX11 -L/usr/X11R6/lib -I/usr/X11R6/include 
-+	${CC} -o xacpim *.o -lX11 -L${LOCALBASE}/lib -I${LOCALBASE}/include 
++	${CC} -o xacpim ${OBJS} -lX11 -L${LOCALBASE}/lib -I${LOCALBASE}/include 
  
  install:: xacpim 
  	strip xacpim 
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index 4fe05c18dabd..029511594413 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Clipboard history management dockapp for Window Maker
 
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USES=		pkgconfig
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20
 USE_XORG=	x11
 
diff --git a/x11/wmcliphist/files/patch-Makefile b/x11/wmcliphist/files/patch-Makefile
index 319e5225db69..a90b03f4e57f 100644
--- a/x11/wmcliphist/files/patch-Makefile
+++ b/x11/wmcliphist/files/patch-Makefile
@@ -21,12 +21,3 @@
  
  OBJECTS = wmcliphist.o clipboard.o gui.o rcconfig.o history.o hotkeys.o utils.o $(DEBUG)
  TARGET = wmcliphist
-@@ -23,7 +23,7 @@ lclint:
- 	lclint $(INCLUDES) +posixlib *.c >lclint.log
- 
- wmcliphist: $(OBJECTS) foodock/foodock.o
--	$(CC) $(LDFLAGS) $(OBJECTS) foodock/foodock.o $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJECTS) foodock.o $(LIBS) -o $@
- 
- wmcliphist.o: wmcliphist.c wmcliphist.h \
- 	icon/ico_60x60_black.xpm icon/ico_60x60_gray.xpm \