svn commit: r337698 - head/devel/py-mercurialserver

[William Grzybowski]

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 <bsd.port.pre.mk>
 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 <bsd.port.post.mk>
+.include <bsd.port.mk>

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
-
- at dirrm %%PYTHON_SITELIBDIR%%/mercurialserver
+ at exec /bin/mkdir -p %D/etc/mercurialserver/keys/users
+ at exec /bin/mkdir -p %D/etc/mercurialserver/keys/root
 @dirrmtry hg
 @dirrmtry etc/mercurialserver/remote-hgrc.d
 @dirrmtry etc/mercurialserver/keys/users