Date: Sat, 12 Apr 2014 13:47:54 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351092 - in head/games/mtaserver: . files Message-ID: <201404121347.s3CDlsu5059924@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Sat Apr 12 13:47:54 2014 New Revision: 351092 URL: http://svnweb.freebsd.org/changeset/ports/351092 QAT: https://qat.redports.org/buildarchive/r351092/ Log: - Add staging support - Simplify file substitutions by using ETCDIR, DATADIR - Define DOCS option - Use @sample for config file Modified: head/games/mtaserver/Makefile head/games/mtaserver/files/mtad.in head/games/mtaserver/files/pkg-message.in head/games/mtaserver/pkg-plist Modified: head/games/mtaserver/Makefile ============================================================================== --- head/games/mtaserver/Makefile Sat Apr 12 13:13:52 2014 (r351091) +++ head/games/mtaserver/Makefile Sat Apr 12 13:47:54 2014 (r351092) @@ -3,7 +3,7 @@ PORTNAME= ${MTANAME:L} PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games linux MASTER_SITES= http://files.gonnaplay.com/201/:main \ http://www.trancevibez.com/mta/:both \ @@ -20,44 +20,26 @@ NO_WRKSUBDIR= yes USE_RC_SUBR= mtad MTANAME= MTAServer -MTADIR= ${PREFIX}/lib/${PORTNAME} PORTDOCS= CHANGELOG LICENSE README -PLIST_SUB= MTADIR=${MTADIR:S,^${PREFIX}/,,} MTADIRE=${PORTNAME} SUB_FILES= pkg-message -SUB_LIST= MTADIR=${MTADIR} MTADIRE=${PORTNAME} -.if !defined(NOPORTDOCS) -SUB_LIST+= NOTEWORK="Read ${DOCSDIR}/README for details" -.else -SUB_LIST+= NOTEWORK="" -.endif -NO_STAGE= yes -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= DOCS post-extract: @${MV} ${WRKSRC}/${MTANAME} ${WRKSRC}/${PORTNAME} @${CHMOD} 600 ${WRKSRC}/${PORTNAME}.conf post-patch: - @${REINPLACE_CMD} "s|banned.lst|${PREFIX}/etc/${PORTNAME}/banned.lst|" ${WRKSRC}/${PORTNAME}.conf + @${REINPLACE_CMD} "s|banned.lst|${ETCDIR}/&|" ${WRKSRC}/${PORTNAME}.conf do-install: - ${MKDIR} ${MTADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${BRANDELF} -t Linux ${WRKSRC}/${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${MTADIR} - ${MKDIR} ${PREFIX}/etc/${PORTNAME} -.if !exists(${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf) - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME} -.endif - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf.dist -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf \ + ${STAGEDIR}/${ETCDIR}/${PORTNAME}.conf.sample + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -post-install: - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/mtaserver/files/mtad.in ============================================================================== --- head/games/mtaserver/files/mtad.in Sat Apr 12 13:13:52 2014 (r351091) +++ head/games/mtaserver/files/mtad.in Sat Apr 12 13:47:54 2014 (r351092) @@ -18,11 +18,11 @@ rcvar=mtad_enable load_rc_config $name : ${mtad_enable="NO"} -: ${mtad_chdir="%%MTADIR%%"} -: ${mtad_config="%%PREFIX%%/etc/%%MTADIRE%%/mtaserver.conf"} +: ${mtad_chdir="%%DATADIR%%"} +: ${mtad_config="%%ETCDIR%%/mtaserver.conf"} : ${mtad_logfile="/var/log/mtaserver.log"} -command="%%MTADIR%%/mtaserver" +command="%%DATADIR%%/mtaserver" command_args="-b -c ${mtad_config} -l ${mtad_logfile} 2>&1 > /dev/null &" required_files=${mtad_config} start_precmd="mtad_prestart" Modified: head/games/mtaserver/files/pkg-message.in ============================================================================== --- head/games/mtaserver/files/pkg-message.in Sat Apr 12 13:13:52 2014 (r351091) +++ head/games/mtaserver/files/pkg-message.in Sat Apr 12 13:47:54 2014 (r351092) @@ -1,4 +1,4 @@ *********************************************************************** -Edit %%PREFIX%%/etc/%%MTADIRE%%/mtaserver.conf before using -%%NOTEWORK%% +Edit %%ETCDIR%%/mtaserver.conf before using +Read %%DOCSDIR%%/README for details *********************************************************************** Modified: head/games/mtaserver/pkg-plist ============================================================================== --- head/games/mtaserver/pkg-plist Sat Apr 12 13:13:52 2014 (r351091) +++ head/games/mtaserver/pkg-plist Sat Apr 12 13:47:54 2014 (r351092) @@ -1,6 +1,4 @@ -@unexec if cmp -s %D/etc/%%MTADIRE%%/mtaserver.conf %D/etc/%%MTADIRE%%/mtaserver.conf.dist; then rm -f %D/etc/%%MTADIRE%%/mtaserver.conf; fi -%%MTADIR%%/mtaserver -etc/%%MTADIRE%%/mtaserver.conf.dist -@exec [ -f %B/mtaserver.conf ] || cp %B/%f %B/mtaserver.conf -@dirrmtry %%MTADIR%% -@dirrmtry etc/%%MTADIRE%% +%%DATADIR%%/mtaserver +@sample %%ETCDIR%%/mtaserver.conf.sample +@dirrmtry %%DATADIR%% +@dirrmtry %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404121347.s3CDlsu5059924>