Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Oct 2013 15:59:56 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329800 - in head/games: mvdsv qwdtools
Message-ID:  <201310081559.r98FxuUY003226@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Tue Oct  8 15:59:56 2013
New Revision: 329800
URL: http://svnweb.freebsd.org/changeset/ports/329800

Log:
  - Remove hardcoded "gcc" in configure script to unbreak on -CURRENT
  - Stagify; drop no longer needed MAKE_ARGS and post-install target
  - Touch pkg-descr and slave port's COMMENT while I'm at them
  
  Reported by:	pkg-fallout

Modified:
  head/games/mvdsv/Makefile
  head/games/mvdsv/pkg-descr
  head/games/qwdtools/Makefile

Modified: head/games/mvdsv/Makefile
==============================================================================
--- head/games/mvdsv/Makefile	Tue Oct  8 15:47:49 2013	(r329799)
+++ head/games/mvdsv/Makefile	Tue Oct  8 15:59:56 2013	(r329800)
@@ -17,7 +17,6 @@ USE_ZIP=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	${OPSYS} ${ARCH:C/.*(64)/\1/}
-MAKE_ARGS=	CC="${CC}"
 ALL_TARGET=	${PORTNAME}
 WRKSRC=		${WRKDIR}/mvdsv
 
@@ -35,7 +34,6 @@ OPTIONS_DEFAULT+=	KQUEUE
 
 KQUEUE_DESC=	Kqueue support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MKQUEUE}
@@ -47,17 +45,10 @@ MAKE_ARGS+=	-DWITHOUT_X86_ASM
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's,gcc,${CC},' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,^inline ,,' ${WRKSRC}/source/sv_sys_unix.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-
-post-install:
-# Checking for presence of ${PKGMESSAGE} explicitly does not work here
-.if exists(${.CURDIR}/pkg-message)
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/games/mvdsv/pkg-descr
==============================================================================
--- head/games/mvdsv/pkg-descr	Tue Oct  8 15:47:49 2013	(r329799)
+++ head/games/mvdsv/pkg-descr	Tue Oct  8 15:59:56 2013	(r329800)
@@ -2,6 +2,6 @@ MVDSV is popular QuakeWorld server with 
 notably, of course, being multi-view demos.  MVD demos are probably the
 biggest step in QuakeWorld since Qizmo release.  MVDSV is also the best
 server to use with KTeams Pro deathmatch mod, and in fact is required
-for latter's full functionality.
+for the latter's full functionality.
 
 WWW: http://mvdsv.qw-dev.net/

Modified: head/games/qwdtools/Makefile
==============================================================================
--- head/games/qwdtools/Makefile	Tue Oct  8 15:47:49 2013	(r329799)
+++ head/games/qwdtools/Makefile	Tue Oct  8 15:59:56 2013	(r329800)
@@ -3,11 +3,10 @@
 
 PORTNAME=	qwdtools
 CATEGORIES=	games converters
-COMMENT=	Converts QuakeWorld demos from QWD format to MVD format
+COMMENT=	Convert QuakeWorld demos from QWD format to MVD format
 DESCR=		${.CURDIR}/pkg-descr
 PKGMESSAGE=	/nonexistent
 
 MASTERDIR=	${.CURDIR}/../mvdsv
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310081559.r98FxuUY003226>