From owner-svn-ports-all@FreeBSD.ORG Thu Apr 17 08:06:07 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B5B6F5C; Thu, 17 Apr 2014 08:06:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E55E17CA; Thu, 17 Apr 2014 08:06:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3H8674g018502; Thu, 17 Apr 2014 08:06:07 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3H866f8018499; Thu, 17 Apr 2014 08:06:06 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201404170806.s3H866f8018499@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 17 Apr 2014 08:06:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351458 - in head/games/qstat: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2014 08:06:07 -0000 Author: danfe Date: Thu Apr 17 08:06:06 2014 New Revision: 351458 URL: http://svnweb.freebsd.org/changeset/ports/351458 QAT: https://qat.redports.org/buildarchive/r351458/ Log: - Correct snprintf(3) usage in the patch - Make use of new @sample keyword in pkg-plist - Hand over to games@ team, cleanup a bit Modified: head/games/qstat/Makefile head/games/qstat/files/patch-config.c head/games/qstat/pkg-plist Modified: head/games/qstat/Makefile ============================================================================== --- head/games/qstat/Makefile Thu Apr 17 07:30:11 2014 (r351457) +++ head/games/qstat/Makefile Thu Apr 17 08:06:06 2014 (r351458) @@ -3,23 +3,24 @@ PORTNAME= qstat PORTVERSION= 2.11 +PORTREVISION= 1 CATEGORIES= games net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER= danfe@FreeBSD.org +MAINTAINER= games@FreeBSD.org COMMENT= Command-line program to query game servers on the net -GNU_CONFIGURE= yes - CONFLICTS_INSTALL= torque-[0-9]* +GNU_CONFIGURE= yes + OPTIONS_DEFINE= DOCS post-extract: - @${MV} ${WRKSRC}/qstat.cfg ${WRKSRC}/qstat.cfg.default + @${MV} ${WRKSRC}/qstat.cfg ${WRKSRC}/qstat.cfg.sample post-patch: - @${REINPLACE_CMD} -e 's|qstat\.cfg|&.default|' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|qstat\.cfg|&.sample|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|' ${WRKSRC}/qstat.c post-install: Modified: head/games/qstat/files/patch-config.c ============================================================================== --- head/games/qstat/files/patch-config.c Thu Apr 17 07:30:11 2014 (r351457) +++ head/games/qstat/files/patch-config.c Thu Apr 17 08:06:06 2014 (r351458) @@ -5,7 +5,7 @@ if ( filename != NULL && filename[0] != '\0') { char path[1024]; - sprintf( path, "%s/%s", filename, HOME_CONFIG_FILE); -+ snprintf( path, (sizeof(path) -1),"%s/%s", var, HOME_CONFIG_FILE); ++ snprintf( path, sizeof(path), "%s/%s", var, HOME_CONFIG_FILE); } /* 1. $QSTAT_CONFIG 2. UNIX: $HOME/.qstatrc WIN: $HOME/qstat.cfg Modified: head/games/qstat/pkg-plist ============================================================================== --- head/games/qstat/pkg-plist Thu Apr 17 07:30:11 2014 (r351457) +++ head/games/qstat/pkg-plist Thu Apr 17 08:06:06 2014 (r351458) @@ -1,7 +1,5 @@ bin/qstat -@unexec if cmp -s %D/etc/qstat.cfg %D/etc/qstat.cfg.default; then rm -f %D/etc/qstat.cfg; fi -etc/qstat.cfg.default -@exec [ -f %B/qstat.cfg ] || cp %B/%f %B/qstat.cfg +@sample etc/qstat.cfg.sample %%PORTDOCS%%%%DOCSDIR%%/qstatdoc.html %%PORTDOCS%%%%DOCSDIR%%/info/UT2003.txt %%PORTDOCS%%%%DOCSDIR%%/info/GhostRecon.txt