From owner-svn-ports-all@FreeBSD.ORG Fri Apr 18 08:09:23 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE45356A; Fri, 18 Apr 2014 08:09:23 +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 AB99811A2; Fri, 18 Apr 2014 08:09:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3I89NGI027806; Fri, 18 Apr 2014 08:09:23 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3I89Nb9027803; Fri, 18 Apr 2014 08:09:23 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404180809.s3I89Nb9027803@svn.freebsd.org> From: Pawel Pekala Date: Fri, 18 Apr 2014 08:09:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351521 - in head/games/sampsvr: . 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: Fri, 18 Apr 2014 08:09:23 -0000 Author: pawel Date: Fri Apr 18 08:09:22 2014 New Revision: 351521 URL: http://svnweb.freebsd.org/changeset/ports/351521 QAT: https://qat.redports.org/buildarchive/r351521/ Log: - Add staging support - Define DOCS option - Use @sample for config file Modified: head/games/sampsvr/Makefile head/games/sampsvr/files/pkg-message.in head/games/sampsvr/pkg-plist Modified: head/games/sampsvr/Makefile ============================================================================== --- head/games/sampsvr/Makefile Fri Apr 18 08:05:14 2014 (r351520) +++ head/games/sampsvr/Makefile Fri Apr 18 08:09:22 2014 (r351521) @@ -3,6 +3,7 @@ PORTNAME= sampsvr PORTVERSION= 0.3c +PORTREVISION= 1 CATEGORIES= games linux MASTER_SITES= http://files.sa-mp.com/ DISTNAME= samp${PORTVERSION:S,.,,}svr @@ -21,44 +22,29 @@ PORTDOCS= LICENSE README PLIST_SUB= SAMPDIR="${SAMPDIR:S,^${PREFIX}/,,}" SUB_FILES= pkg-message SUB_LIST= SAMPDIR="${SAMPDIR}" SAMPBIN=samp03svr -.if !defined(NOPORTDOCS) -SUB_LIST+= NOTEWORK="Read ${DOCSDIR}/README to configure SA-MP Server" -.else -SUB_LIST+= NOTEWORK="" -.endif -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS do-install: - ${MKDIR} ${SAMPDIR} + @${MKDIR} ${STAGEDIR}${SAMPDIR} .for i in announce samp-npc samp03svr ${BRANDELF} -t Linux ${WRKSRC}/${i} - ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${SAMPDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${SAMPDIR} .endfor - ${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && \ ${FIND} . -type d ! -empty -exec \ - ${MKDIR} "${DATADIR}/{}" \; + ${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; .for i in filterscripts gamemodes include npcmodes scriptfiles cd ${WRKSRC} && \ ${FIND} ${i} -type f -exec \ - ${INSTALL_DATA} "{}" "${DATADIR}/{}" \; - ${LN} -sf ${DATADIR}/${i}/ ${SAMPDIR}/${i} + ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/{}" \; + ${LN} -sf ${DATADIR}/${i} ${STAGEDIR}${SAMPDIR}/${i} .endfor -.if !exists(${PREFIX}/etc/${PORTNAME}.cfg) - ${INSTALL_DATA} ${WRKSRC}/server.cfg ${PREFIX}/etc/${PORTNAME}.cfg -.endif - ${INSTALL_DATA} ${WRKSRC}/server.cfg ${PREFIX}/etc/${PORTNAME}.cfg.dist - ${LN} -sf ${PREFIX}/etc/${PORTNAME}.cfg ${SAMPDIR}/server.cfg -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor -.endif - -post-install: - @${CAT} ${PKGMESSAGE} + ${INSTALL_DATA} ${WRKSRC}/server.cfg \ + ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.cfg.sample + ${LN} -sf ${PREFIX}/etc/${PORTNAME}.cfg ${STAGEDIR}${SAMPDIR}/server.cfg + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include +.include Modified: head/games/sampsvr/files/pkg-message.in ============================================================================== --- head/games/sampsvr/files/pkg-message.in Fri Apr 18 08:05:14 2014 (r351520) +++ head/games/sampsvr/files/pkg-message.in Fri Apr 18 08:09:22 2014 (r351521) @@ -1,5 +1,5 @@ *********************************************************************** Edit %%PREFIX%%/etc/sampsvr.cfg before using Your password must be changed from the default password -%%NOTEWORK%% +Read %%DOCSDIR%%/README to configure SA-MP Server *********************************************************************** Modified: head/games/sampsvr/pkg-plist ============================================================================== --- head/games/sampsvr/pkg-plist Fri Apr 18 08:05:14 2014 (r351520) +++ head/games/sampsvr/pkg-plist Fri Apr 18 08:09:22 2014 (r351521) @@ -1,6 +1,4 @@ -@unexec if cmp -s %D/etc/sampsvr.cfg %D/etc/sampsvr.cfg.dist; then rm -f %D/etc/sampsvr.cfg; fi -etc/sampsvr.cfg.dist -@exec [ -f %B/sampsvr.cfg ] || cp %B/%f %B/sampsvr.cfg +@sample etc/sampsvr.cfg.sample %%SAMPDIR%%/announce %%SAMPDIR%%/samp-npc %%SAMPDIR%%/samp03svr