From owner-svn-ports-all@FreeBSD.ORG Fri Dec 27 10:34:15 2013 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 DA993B7C; Fri, 27 Dec 2013 10:34:14 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C66A613D3; Fri, 27 Dec 2013 10:34:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRAYEob080277; Fri, 27 Dec 2013 10:34:14 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRAYEI3080272; Fri, 27 Dec 2013 10:34:14 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312271034.rBRAYEI3080272@svn.freebsd.org> From: William Grzybowski Date: Fri, 27 Dec 2013 10:34:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337698 - head/devel/py-mercurialserver 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, 27 Dec 2013 10:34:15 -0000 Author: wg Date: Fri Dec 27 10:34:14 2013 New Revision: 337698 URL: http://svnweb.freebsd.org/changeset/ports/337698 Log: devel/py-mercurialserver: support staging and use auto plist Modified: head/devel/py-mercurialserver/Makefile head/devel/py-mercurialserver/pkg-plist Modified: head/devel/py-mercurialserver/Makefile ============================================================================== --- head/devel/py-mercurialserver/Makefile Fri Dec 27 10:30:55 2013 (r337697) +++ head/devel/py-mercurialserver/Makefile Fri Dec 27 10:34:14 2013 (r337698) @@ -24,33 +24,28 @@ HGGROUP= hg USERS= ${HGUSER} GROUPS= ${HGGROUP} -USE_PYTHON= 2.6+ -USE_PYDISTUTILS=YES -PYDISTUTILS_PKGNAME=${SNAME} -PYDISTUTILS_PKGVERSION=${SVERSION} +SUB_FILES= pkg-message +SUB_LIST= PORTNAME=${PORTNAME} \ + HGUSER=${HGUSER} +PKGMESSAGE= ${WRKDIR}/pkg-message + +USE_PYTHON= yes +USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST= yes HGSVCONF_FILES= access.conf \ remote-hgrc.d/access.rc \ remote-hgrc.d/logging.rc -NO_STAGE= yes -.include pre-patch: ${SED} -I .orig -e "s#/etc/mercurial-server/#${PREFIX}/etc/${PORTNAME}/#" ${WRKSRC}/src/init/dot-mercurial-server post-install: - ${MKDIR} ${PREFIX}/etc/${PORTNAME}/remote-hgrc.d - ${MKDIR} ${PREFIX}/etc/${PORTNAME}/keys/users - ${MKDIR} ${PREFIX}/etc/${PORTNAME}/keys/root + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/remote-hgrc.d + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/keys/users + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/keys/root .for i in ${HGSVCONF_FILES} - ${INSTALL_DATA} ${WRKSRC}/src/init/conf/${i} ${PREFIX}/etc/${PORTNAME}/${i} + ${INSTALL_DATA} ${WRKSRC}/src/init/conf/${i} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/${i} .endfor - @${ECHO_MSG} - @${ECHO_MSG} "NOTE: ${PORTNAME} has been patched to use ${PREFIX}/etc/${PORTNAME}" - @${ECHO_MSG} " instead of /etc/mercurial-server" - @${ECHO_MSG} - @${ECHO_MSG} "Now you need to create ${HGUSER} home (if nessacery) and run" - @${ECHO_MSG} " ${PREFIX}/etc/hginit as ${HGUSER} user from home directory" - @${ECHO_MSG} -.include +.include Modified: head/devel/py-mercurialserver/pkg-plist ============================================================================== --- head/devel/py-mercurialserver/pkg-plist Fri Dec 27 10:30:55 2013 (r337697) +++ head/devel/py-mercurialserver/pkg-plist Fri Dec 27 10:34:14 2013 (r337698) @@ -1,35 +1,8 @@ -%%PYTHON_SITELIBDIR%%/mercurialserver/__init__.py -%%PYTHON_SITELIBDIR%%/mercurialserver/__init__.pyc -%%PYTHON_SITELIBDIR%%/mercurialserver/__init__.pyo -%%PYTHON_SITELIBDIR%%/mercurialserver/access.py -%%PYTHON_SITELIBDIR%%/mercurialserver/access.pyc -%%PYTHON_SITELIBDIR%%/mercurialserver/access.pyo -%%PYTHON_SITELIBDIR%%/mercurialserver/changes.py -%%PYTHON_SITELIBDIR%%/mercurialserver/changes.pyc -%%PYTHON_SITELIBDIR%%/mercurialserver/changes.pyo -%%PYTHON_SITELIBDIR%%/mercurialserver/config.py -%%PYTHON_SITELIBDIR%%/mercurialserver/config.pyc -%%PYTHON_SITELIBDIR%%/mercurialserver/config.pyo -%%PYTHON_SITELIBDIR%%/mercurialserver/refreshauth.py -%%PYTHON_SITELIBDIR%%/mercurialserver/refreshauth.pyc -%%PYTHON_SITELIBDIR%%/mercurialserver/refreshauth.pyo -%%PYTHON_SITELIBDIR%%/mercurialserver/ruleset.py -%%PYTHON_SITELIBDIR%%/mercurialserver/ruleset.pyc -%%PYTHON_SITELIBDIR%%/mercurialserver/ruleset.pyo -%%PYTHON_SITELIBDIR%%/mercurialserver/servelog.py -%%PYTHON_SITELIBDIR%%/mercurialserver/servelog.pyc -%%PYTHON_SITELIBDIR%%/mercurialserver/servelog.pyo - -bin/hg-ssh -bin/refresh-auth etc/mercurialserver/access.conf -etc/mercurialserver/dot-mercurial-server -etc/mercurialserver/hgadmin-hgrc -etc/mercurialserver/hginit etc/mercurialserver/remote-hgrc.d/access.rc etc/mercurialserver/remote-hgrc.d/logging.rc - -@dirrm %%PYTHON_SITELIBDIR%%/mercurialserver +@exec /bin/mkdir -p %D/etc/mercurialserver/keys/users +@exec /bin/mkdir -p %D/etc/mercurialserver/keys/root @dirrmtry hg @dirrmtry etc/mercurialserver/remote-hgrc.d @dirrmtry etc/mercurialserver/keys/users