From owner-svn-ports-head@FreeBSD.ORG Fri Apr 11 12:58:56 2014 Return-Path: Delivered-To: svn-ports-head@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 1EF7A156; Fri, 11 Apr 2014 12:58:56 +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 F310B15AD; Fri, 11 Apr 2014 12:58:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3BCwtkR037005; Fri, 11 Apr 2014 12:58:55 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3BCwtR5036999; Fri, 11 Apr 2014 12:58:55 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404111258.s3BCwtR5036999@svn.freebsd.org> From: Pawel Pekala Date: Fri, 11 Apr 2014 12:58:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350940 - in head/games/conquest: . 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2014 12:58:56 -0000 Author: pawel Date: Fri Apr 11 12:58:55 2014 New Revision: 350940 URL: http://svnweb.freebsd.org/changeset/ports/350940 QAT: https://qat.redports.org/buildarchive/r350940/ Log: - Add staging support - Move ownership setting, /var dir creation to pkg-plist - Automatically install/remove sample files - Update pkg-message info, use SUB_FILES for DOCSDIR sub Added: head/games/conquest/files/pkg-message.in - copied, changed from r350904, head/games/conquest/pkg-message Deleted: head/games/conquest/pkg-install head/games/conquest/pkg-message Modified: head/games/conquest/Makefile head/games/conquest/pkg-plist Modified: head/games/conquest/Makefile ============================================================================== --- head/games/conquest/Makefile Fri Apr 11 12:55:47 2014 (r350939) +++ head/games/conquest/Makefile Fri Apr 11 12:58:55 2014 (r350940) @@ -18,41 +18,32 @@ CONFIGURE_ARGS= --sysconfdir=${LOCALBASE --localstatedir=/var/games CFLAGS+= -Wno-return-type GROUPS= ${PORTNAME} -BINGRP= conquest -SHAREGRP= conquest MAKE_JOBS_UNSAFE= yes PORTDOCS= README +SUB_FILES= pkg-message + OPTIONS_DEFINE= DOCS -NO_STAGE= yes post-patch: ${REINPLACE_CMD} "s|^.*@chgrp .(CONQGROUP) conq.*||g; \ s|^.*@chmod 2771 conq.*||g;" ${WRKSRC}/Makefile.in ${REINPLACE_CMD} "s/# include //g" ${WRKSRC}/c_defs.h ${REINPLACE_CMD} "s/-O2 -fPIC//g" ${WRKSRC}/configure -.include - do-install: - ${INSTALL_PROGRAM} -m 2550 ${WRKSRC}/conqai ${PREFIX}/sbin - ${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conqdriv ${PREFIX}/libexec - ${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conqoper ${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/conqstrat ${PREFIX}/sbin - ${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conquest ${PREFIX}/bin - @${MKDIR} ${PREFIX}/etc/conquest - ${INSTALL_DATA} ${WRKSRC}/conqrule \ - ${PREFIX}/etc/conquest/conqrule.sample - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/conqnews.doc ${DATADIR}/conqnews.doc.sample - ${INSTALL_DATA} ${WRKSRC}/conquest.doc ${DATADIR} -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif - @${SH} pkg-install ${PORTNAME} POST-INSTALL - -post-install: - @${CAT} ${PKGMESSAGE} + ${INSTALL_PROGRAM} -m 2550 ${WRKSRC}/conqai ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conqdriv ${STAGEDIR}${PREFIX}/libexec + ${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conqoper ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/conqstrat ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conquest ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/conqrule ${STAGEDIR}${ETCDIR}/conqrule.sample + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/conqnews.doc \ + ${STAGEDIR}${DATADIR}/conqnews.doc.sample + ${INSTALL_DATA} ${WRKSRC}/conquest.doc ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Copied and modified: head/games/conquest/files/pkg-message.in (from r350904, head/games/conquest/pkg-message) ============================================================================== --- head/games/conquest/pkg-message Fri Apr 11 08:25:47 2014 (r350904, copy source) +++ head/games/conquest/files/pkg-message.in Fri Apr 11 12:58:55 2014 (r350940) @@ -1,16 +1,7 @@ -Before Conquest can be run it must be configured. First copy the sample -configuration into place: - -# cp etc/conquest/conqrule.sample etc/conquest/conqrule - -Then you can initialise and enable the game: +Before Conquest can be run it must be configured, you need to +initialise and enable the game: # sbin/conqoper -C # sbin/conqoper -Ie -E -Conqoper is documented in share/doc/conquest/README. - -Also a file for the in-game news must be created. This package includes a -sample news file you can copy into place: - -# cp share/conquest/conqnews.doc.sample share/conquest/conqnews.doc +Conqoper is documented in %%DOCSDIR%%/README. Modified: head/games/conquest/pkg-plist ============================================================================== --- head/games/conquest/pkg-plist Fri Apr 11 12:55:47 2014 (r350939) +++ head/games/conquest/pkg-plist Fri Apr 11 12:58:55 2014 (r350940) @@ -1,10 +1,16 @@ +@group conquest bin/conquest +@unexec if cmp -s %D/etc/conquest/conqrule.sample %D/etc/conquest/conqrule ; then rm -f %D/etc/conquest/conqrule; fi etc/conquest/conqrule.sample +@exec if [ ! -f %D/etc/conquest/conqrule ] ; then cp -p %D/%F %B/conqrule; fi libexec/conqdriv sbin/conqai sbin/conqoper sbin/conqstrat +@unexec if cmp -s %D/%%DATADIR%%/conqnews.doc.sample %D/%%DATADIR%%/conqnews.doc ; then rm -f %D/%%DATADIR%%/conqnews.doc; fi %%DATADIR%%/conqnews.doc.sample +@exec if [ ! -f %D/%%DATADIR%%/conqnews.doc ] ; then cp -p %D/%F %B/conqnews.doc; fi %%DATADIR%%/conquest.doc -@dirrm etc/conquest -@dirrm %%DATADIR%% +@dirrmtry etc/conquest +@dirrmtry %%DATADIR%% +@exec install -d -o root -g conquest -m 770 /var/games/conquest || true