Date: Tue, 17 Mar 2015 22:05:37 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381523 - in head: archivers/dzip devel/luafilesystem devel/luafilesystem/files net/redir net/redir/files sysutils/xacpim sysutils/xacpim/files x11/wmcliphist x11/wmcliphist/files Message-ID: <201503172205.t2HM5bfo041968@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Tue Mar 17 22:05:36 2015 New Revision: 381523 URL: https://svnweb.freebsd.org/changeset/ports/381523 QAT: https://qat.redports.org/buildarchive/r381523/ Log: 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 Modified: head/archivers/dzip/Makefile head/devel/luafilesystem/Makefile head/devel/luafilesystem/files/patch-Makefile head/net/redir/Makefile head/net/redir/files/patch-Makefile head/sysutils/xacpim/Makefile head/sysutils/xacpim/files/patch-Makefile head/x11/wmcliphist/Makefile head/x11/wmcliphist/files/patch-Makefile Modified: head/archivers/dzip/Makefile ============================================================================== --- head/archivers/dzip/Makefile Tue Mar 17 22:01:03 2015 (r381522) +++ head/archivers/dzip/Makefile Tue Mar 17 22:05:36 2015 (r381523) @@ -12,7 +12,7 @@ COMMENT= File compression utility specia 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: Modified: head/devel/luafilesystem/Makefile ============================================================================== --- head/devel/luafilesystem/Makefile Tue Mar 17 22:01:03 2015 (r381522) +++ head/devel/luafilesystem/Makefile Tue Mar 17 22:05:36 2015 (r381523) @@ -12,6 +12,7 @@ COMMENT= Library to access directory str LICENSE= MIT USES?= lua +USES+= gmake USE_GITHUB= yes GH_ACCOUNT= keplerproject Modified: head/devel/luafilesystem/files/patch-Makefile ============================================================================== --- head/devel/luafilesystem/files/patch-Makefile Tue Mar 17 22:01:03 2015 (r381522) +++ head/devel/luafilesystem/files/patch-Makefile Tue Mar 17 22:05:36 2015 (r381523) @@ -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 Modified: head/net/redir/Makefile ============================================================================== --- head/net/redir/Makefile Tue Mar 17 22:01:03 2015 (r381522) +++ head/net/redir/Makefile Tue Mar 17 22:05:36 2015 (r381523) @@ -10,6 +10,7 @@ MASTER_SITES= http://sammy.net/~sammy/ha MAINTAINER= ports@FreeBSD.org COMMENT= TCP connection redirection utility +USES= gmake USE_RC_SUBR= redir PLIST_FILES= bin/redir man/man1/redir.1.gz Modified: head/net/redir/files/patch-Makefile ============================================================================== --- head/net/redir/files/patch-Makefile Tue Mar 17 22:01:03 2015 (r381522) +++ head/net/redir/files/patch-Makefile Tue Mar 17 22:05:36 2015 (r381523) @@ -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} - - - Modified: head/sysutils/xacpim/Makefile ============================================================================== --- head/sysutils/xacpim/Makefile Tue Mar 17 22:01:03 2015 (r381522) +++ head/sysutils/xacpim/Makefile Tue Mar 17 22:05:36 2015 (r381523) @@ -10,6 +10,7 @@ MASTER_SITES= http://shapeshifter.se/pub 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 Modified: head/sysutils/xacpim/files/patch-Makefile ============================================================================== --- head/sysutils/xacpim/files/patch-Makefile Tue Mar 17 22:01:03 2015 (r381522) +++ head/sysutils/xacpim/files/patch-Makefile Tue Mar 17 22:05:36 2015 (r381523) @@ -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 Modified: head/x11/wmcliphist/Makefile ============================================================================== --- head/x11/wmcliphist/Makefile Tue Mar 17 22:01:03 2015 (r381522) +++ head/x11/wmcliphist/Makefile Tue Mar 17 22:05:36 2015 (r381523) @@ -14,7 +14,7 @@ COMMENT= Clipboard history management do SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME} -USES= pkgconfig +USES= gmake pkgconfig USE_GNOME= gtk20 USE_XORG= x11 Modified: head/x11/wmcliphist/files/patch-Makefile ============================================================================== --- head/x11/wmcliphist/files/patch-Makefile Tue Mar 17 22:01:03 2015 (r381522) +++ head/x11/wmcliphist/files/patch-Makefile Tue Mar 17 22:05:36 2015 (r381523) @@ -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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503172205.t2HM5bfo041968>