From owner-svn-ports-all@freebsd.org Thu Dec 22 23:20:55 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 638B8C8DF73; Thu, 22 Dec 2016 23:20:55 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 1A6E41013; Thu, 22 Dec 2016 23:20:55 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBMNKsWD097294; Thu, 22 Dec 2016 23:20:54 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBMNKsrV097292; Thu, 22 Dec 2016 23:20:54 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201612222320.uBMNKsrV097292@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 22 Dec 2016 23:20:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429202 - head/irc/darkbot 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.23 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, 22 Dec 2016 23:20:55 -0000 Author: bapt Date: Thu Dec 22 23:20:53 2016 New Revision: 429202 URL: https://svnweb.freebsd.org/changeset/ports/429202 Log: Use plist and @sample top overwriting users config at each upgrade Added: head/irc/darkbot/pkg-plist (contents, props changed) Modified: head/irc/darkbot/Makefile Modified: head/irc/darkbot/Makefile ============================================================================== --- head/irc/darkbot/Makefile Thu Dec 22 23:14:43 2016 (r429201) +++ head/irc/darkbot/Makefile Thu Dec 22 23:20:53 2016 (r429202) @@ -3,7 +3,7 @@ PORTNAME= darkbot PORTVERSION= 6f6.r6 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= irc MASTER_SITES= http://darkbot.sourceforge.net/archive/unix/ \ @@ -16,7 +16,6 @@ COMMENT= IRC talking bot with a fast alg SUB_FILES= pkg-message PORTDOCS= README -PLIST_FILES= bin/darkbot %%ETCDIR%%/logs/.pkgcreate man/man1/darkbot.1.gz NO_CDROM= no commercial distribution OPTIONS_DEFINE= DOCS @@ -32,18 +31,11 @@ do-install: cd ${WRKSRC}/dat; \ for file in *; do \ ${INSTALL_DATA} $$file ${STAGEDIR}${ETCDIR}/dat/$${file}.dist; \ - ${CP} -np ${ETCDIR}/dat/$${file}.dist ${STAGEDIR}${ETCDIR}/dat/$$file || ${TRUE} ; \ - ${ECHO_CMD} "@unexec cmp -s ${ETCDIR}/dat/$$file \ - ${ETCDIR}/dat/$${file}.dist && \ - rm -f ${ETCDIR}/dat/$$file || true" >> ${TMPPLIST}; \ - ${ECHO_CMD} "${ETCDIR_REL}/dat/$${file}.dist" >> ${TMPPLIST}; \ - ${ECHO_CMD} "@exec cp -np %D/%F %B/$$file || true" >> ${TMPPLIST}; \ done ${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/configure ${ECHO_CMD} 'cd ${ETCDIR} && ${SH} config' >> ${WRKSRC}/configure .for s in config configure AddServer Adduser ${INSTALL_SCRIPT} ${WRKSRC}/$s ${STAGEDIR}${ETCDIR} - ${ECHO_CMD} ${ETCDIR_REL}/$s >> ${TMPPLIST} .endfor do-install-DOCS-on: Added: head/irc/darkbot/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/darkbot/pkg-plist Thu Dec 22 23:20:53 2016 (r429202) @@ -0,0 +1,14 @@ +bin/darkbot +%%ETCDIR%%/AddServer +%%ETCDIR%%/Adduser +%%ETCDIR%%/config +%%ETCDIR%%/configure +@sample %%ETCDIR%%/dat/deop.ini.dist %%ETCDIR%%/dat/deop.ini +@sample %%ETCDIR%%/dat/info2.db.dist %%ETCDIR%%/dat/info2.db +@sample %%ETCDIR%%/dat/perform.ini.dist %%ETCDIR%%/dat/perform.ini +@sample %%ETCDIR%%/dat/permbans.db.dist %%ETCDIR%%/dat/permbans.db +@sample %%ETCDIR%%/dat/random.ini.dist %%ETCDIR%%/dat/random.ini +@sample %%ETCDIR%%/dat/randomstuff.ini.dist %%ETCDIR%%/dat/randomstuff.ini +@sample %%ETCDIR%%/dat/seen.db.dist %%ETCDIR%%/dat/seen.db +%%ETCDIR%%/logs/.pkgcreate +man/man1/darkbot.1.gz