From owner-svn-ports-head@freebsd.org Fri Oct 23 16:51:44 2015 Return-Path: Delivered-To: svn-ports-head@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 4EABCA1C96B; Fri, 23 Oct 2015 16:51:44 +0000 (UTC) (envelope-from amdmi3@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 F24486B9; Fri, 23 Oct 2015 16:51:43 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9NGpg7d041152; Fri, 23 Oct 2015 16:51:42 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9NGpggZ041150; Fri, 23 Oct 2015 16:51:42 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510231651.t9NGpggZ041150@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 23 Oct 2015 16:51:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400037 - in head/irc/ircd-ratbox: . 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.20 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, 23 Oct 2015 16:51:44 -0000 Author: amdmi3 Date: Fri Oct 23 16:51:42 2015 New Revision: 400037 URL: https://svnweb.freebsd.org/changeset/ports/400037 Log: - Move owner/permission to plist, fixing installation from non-root and simplifying the port PR: 203564 Submitted by: amdmi3 Approved by: maintainer timeout (moggie@elasticmind.net, 2 weeks) Deleted: head/irc/ircd-ratbox/files/pkg-install.in Modified: head/irc/ircd-ratbox/Makefile head/irc/ircd-ratbox/pkg-plist Modified: head/irc/ircd-ratbox/Makefile ============================================================================== --- head/irc/ircd-ratbox/Makefile Fri Oct 23 16:49:38 2015 (r400036) +++ head/irc/ircd-ratbox/Makefile Fri Oct 23 16:51:42 2015 (r400037) @@ -3,7 +3,7 @@ PORTNAME= ircd-ratbox PORTVERSION= 3.0.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= irc ipv6 MASTER_SITES= http://www.ratbox.org/download/ \ http://www.ratbox.org/download/old/ @@ -17,7 +17,6 @@ CONFLICTS= ircd-ratbox-devel-[0-9]* char USES= cpe libtool tar:bzip2 CPE_VENDOR= ratbox -#MAN8= ircd.8 USE_RC_SUBR= ircd-ratbox USE_SQLITE= 3 USE_LDCONFIG= ${PREFIX}/lib/ircd-ratbox @@ -30,7 +29,7 @@ GROUPS= ${USERS} LOGDIR?= /var/log/${PORTNAME} RUNDIR?= /var/run/${PORTNAME} DBDIR?= /var/db/${PORTNAME} -SUB_FILES= pkg-message pkg-install +SUB_FILES= pkg-message PLIST_SUB= LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} SUB_LIST= LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} @@ -226,6 +225,10 @@ pre-install: post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${RUNDIR} + ${MKDIR} ${STAGEDIR}${DBDIR} + ${MKDIR} ${STAGEDIR}${LOGDIR} + cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} Modified: head/irc/ircd-ratbox/pkg-plist ============================================================================== --- head/irc/ircd-ratbox/pkg-plist Fri Oct 23 16:49:38 2015 (r400036) +++ head/irc/ircd-ratbox/pkg-plist Fri Oct 23 16:51:42 2015 (r400037) @@ -227,6 +227,10 @@ lib/ircd-ratbox/modules/m_quit.so lib/ircd-ratbox/modules/m_server.so lib/ircd-ratbox/modules/m_squit.so etc/ircd-ratbox/genssl.sh -@sample etc/ircd-ratbox/ircd-efnet.conf.sample -@sample etc/ircd-ratbox/ircd.conf.sample -@sample etc/ircd-ratbox/ircd.motd.sample +@sample(,ircd,640) etc/ircd-ratbox/ircd-efnet.conf.sample +@sample(,ircd,640) etc/ircd-ratbox/ircd.conf.sample +@sample(,ircd,640) etc/ircd-ratbox/ircd.motd.sample +@dir(,ircd,750) etc/ircd-ratbox +@dir(ircd,ircd,750) %%RUNDIR%% +@dir(ircd,ircd,750) %%LOGDIR%% +@dir(ircd,ircd,750) %%DBDIR%%