svn commit: r327066 - in head/games/mvdsv: . files

[Alexey Dokuchaev]

Author: danfe
Date: Thu Sep 12 13:53:53 2013
New Revision: 327066
URL: http://svnweb.freebsd.org/changeset/ports/327066

Log:
  - Unbreak the build in GCC-less environments: respect CC, pacify Clang
  - Fix the inner Makefile.BSD to allow -jX builds, remove MAKE_JOBS_UNSAFE
  
  Reported by:	pkg-fallout

Modified:
  head/games/mvdsv/Makefile
  head/games/mvdsv/files/patch-Makefile.BSD

Modified: head/games/mvdsv/Makefile
==============================================================================
--- head/games/mvdsv/Makefile	Thu Sep 12 13:49:32 2013	(r327065)
+++ head/games/mvdsv/Makefile	Thu Sep 12 13:53:53 2013	(r327066)
@@ -17,9 +17,9 @@ USE_ZIP=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	${OPSYS} ${ARCH:C/.*(64)/\1/}
+MAKE_ARGS=	CC="${CC}"
 ALL_TARGET=	${PORTNAME}
 WRKSRC=		${WRKDIR}/mvdsv
-MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
 
@@ -45,6 +45,9 @@ MAKE_ARGS+=	-DNOKQUEUE
 MAKE_ARGS+=	-DWITHOUT_X86_ASM
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,^inline ,,' ${WRKSRC}/source/sv_sys_unix.c
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 

Modified: head/games/mvdsv/files/patch-Makefile.BSD
==============================================================================
--- head/games/mvdsv/files/patch-Makefile.BSD	Thu Sep 12 13:49:32 2013	(r327065)
+++ head/games/mvdsv/files/patch-Makefile.BSD	Thu Sep 12 13:53:53 2013	(r327066)
@@ -18,3 +18,16 @@
  QWDTOOLS_ASM_OBJS = \
  		${SV_DIR}/bothtoolsa.o
  .endif
+@@ -129,10 +129,10 @@
+ #############################################################################
+ 
+ .c.o:
+-		${CC} ${DO_CFLAGS} -c $< -o $*.o
++		${CC} ${DO_CFLAGS} -c $< -o $@
+ 
+ .s.o:
+-		${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $*.o
++		${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $@
+ 		
+ all:	mvdsv qwdtools
+ 		${STRIP} ${STRIP_FLAGS} mvdsv qwdtools