Mon Mar 15 09:52:56 2010 UTC ()
Update to 0.47: use the 0.47 distfile and depend on monotone 0.47.


(jmmv)
diff -r1.46 -r1.47 pkgsrc/devel/monotone-server/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/monotone-server/distinfo
cvs diff -r1.46 -r1.47 pkgsrc/devel/monotone-server/Makefile (switch to unified diff)

--- pkgsrc/devel/monotone-server/Makefile 2010/03/12 09:27:17 1.46
+++ pkgsrc/devel/monotone-server/Makefile 2010/03/15 09:52:56 1.47
@@ -1,94 +1,93 @@ @@ -1,94 +1,93 @@
1# $NetBSD: Makefile,v 1.46 2010/03/12 09:27:17 jmmv Exp $ 1# $NetBSD: Makefile,v 1.47 2010/03/15 09:52:56 jmmv Exp $
2# 2#
3 3
4DISTNAME= monotone-0.46 4DISTNAME= monotone-0.47
5PKGNAME= ${DISTNAME:S/-/-server-/} 5PKGNAME= ${DISTNAME:S/-/-server-/}
6PKGREVISION= 2 
7CATEGORIES= devel scm 6CATEGORIES= devel scm
8MASTER_SITES= http://monotone.ca/downloads/0.46/ 7MASTER_SITES= http://monotone.ca/downloads/0.47/
9 8
10MAINTAINER= jmmv@NetBSD.org 9MAINTAINER= jmmv@NetBSD.org
11HOMEPAGE= http://monotone.ca/ 10HOMEPAGE= http://monotone.ca/
12COMMENT= Simplifies the configuration of a dedicated Monotone server 11COMMENT= Simplifies the configuration of a dedicated Monotone server
13 12
14DEPENDS+= digest>=20080510:../../pkgtools/digest 13DEPENDS+= digest>=20080510:../../pkgtools/digest
15DEPENDS+= monotone>=0.46:../../devel/monotone 14DEPENDS+= monotone>=0.47:../../devel/monotone
16 15
17PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
18 17
19LICENSE= 2-clause-bsd 18LICENSE= 2-clause-bsd
20NO_BUILD= yes 19NO_BUILD= yes
21 20
22RCD_SCRIPTS= monotone 21RCD_SCRIPTS= monotone
23 22
24PKG_SYSCONFSUBDIR= monotone-server 23PKG_SYSCONFSUBDIR= monotone-server
25OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/keys \ 24OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/keys \
26 ${MONOTONE_USER} ${MONOTONE_GROUP} 700 25 ${MONOTONE_USER} ${MONOTONE_GROUP} 700
27 26
28EXAMPLEDIR= ${PREFIX}/share/examples/monotone-server 27EXAMPLEDIR= ${PREFIX}/share/examples/monotone-server
29CONF_FILES_PERMS= ${EXAMPLEDIR}/monotonerc \ 28CONF_FILES_PERMS= ${EXAMPLEDIR}/monotonerc \
30 ${PKG_SYSCONFDIR}/monotonerc \ 29 ${PKG_SYSCONFDIR}/monotonerc \
31 ${MONOTONE_USER} ${MONOTONE_GROUP} 600 30 ${MONOTONE_USER} ${MONOTONE_GROUP} 600
32CONF_FILES_PERMS+= ${EXAMPLEDIR}/read-permissions \ 31CONF_FILES_PERMS+= ${EXAMPLEDIR}/read-permissions \
33 ${PKG_SYSCONFDIR}/read-permissions \ 32 ${PKG_SYSCONFDIR}/read-permissions \
34 ${MONOTONE_USER} ${MONOTONE_GROUP} 600 33 ${MONOTONE_USER} ${MONOTONE_GROUP} 600
35CONF_FILES_PERMS+= ${EXAMPLEDIR}/write-permissions \ 34CONF_FILES_PERMS+= ${EXAMPLEDIR}/write-permissions \
36 ${PKG_SYSCONFDIR}/write-permissions \ 35 ${PKG_SYSCONFDIR}/write-permissions \
37 ${MONOTONE_USER} ${MONOTONE_GROUP} 600 36 ${MONOTONE_USER} ${MONOTONE_GROUP} 600
38CONF_FILES_PERMS+= /dev/null ${MONOTONE_LOGFILE} \ 37CONF_FILES_PERMS+= /dev/null ${MONOTONE_LOGFILE} \
39 ${MONOTONE_USER} ${MONOTONE_GROUP} 600 38 ${MONOTONE_USER} ${MONOTONE_GROUP} 600
40 39
41PKG_GROUPS= ${MONOTONE_GROUP} 40PKG_GROUPS= ${MONOTONE_GROUP}
42PKG_USERS= ${MONOTONE_USER}:${MONOTONE_GROUP} 41PKG_USERS= ${MONOTONE_USER}:${MONOTONE_GROUP}
43 42
44PKG_GROUPS_VARS+= MONOTONE_GROUP 43PKG_GROUPS_VARS+= MONOTONE_GROUP
45PKG_USERS_VARS+= MONOTONE_USER 44PKG_USERS_VARS+= MONOTONE_USER
46 45
47.include "../../mk/bsd.prefs.mk" 46.include "../../mk/bsd.prefs.mk"
48 47
49BUILD_DEFS+= RCD_SCRIPTS_DIR VARBASE 48BUILD_DEFS+= RCD_SCRIPTS_DIR VARBASE
50 49
51MONOTONE_HOME= ${VARBASE}/monotone 50MONOTONE_HOME= ${VARBASE}/monotone
52MONOTONE_LOGFILE= ${VARBASE}/log/monotone.log 51MONOTONE_LOGFILE= ${VARBASE}/log/monotone.log
53 52
54PKG_GECOS.${MONOTONE_USER}= Monotone dedicated server 53PKG_GECOS.${MONOTONE_USER}= Monotone dedicated server
55PKG_HOME.${MONOTONE_USER}= ${MONOTONE_HOME} 54PKG_HOME.${MONOTONE_USER}= ${MONOTONE_HOME}
56PKG_SHELL.${MONOTONE_USER}= ${SH} 55PKG_SHELL.${MONOTONE_USER}= ${SH}
57 56
58SUBST_CLASSES+= vars 57SUBST_CLASSES+= vars
59SUBST_STAGE.vars= do-configure 58SUBST_STAGE.vars= do-configure
60SUBST_MESSAGE.vars= Configuring sources. 59SUBST_MESSAGE.vars= Configuring sources.
61SUBST_FILES.vars= ${WRKDIR}/monotone-server.7 60SUBST_FILES.vars= ${WRKDIR}/monotone-server.7
62SUBST_SED.vars+= -e 's|@MONOTONE_HOME@|${MONOTONE_HOME}|g' 61SUBST_SED.vars+= -e 's|@MONOTONE_HOME@|${MONOTONE_HOME}|g'
63SUBST_SED.vars+= -e 's|@MONOTONE_LOGFILE@|${MONOTONE_LOGFILE}|g' 62SUBST_SED.vars+= -e 's|@MONOTONE_LOGFILE@|${MONOTONE_LOGFILE}|g'
64SUBST_SED.vars+= -e 's|@MONOTONE_USER@|${MONOTONE_USER}|g' 63SUBST_SED.vars+= -e 's|@MONOTONE_USER@|${MONOTONE_USER}|g'
65SUBST_SED.vars+= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' 64SUBST_SED.vars+= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
66SUBST_SED.vars+= -e 's|@PREFIX@|${PREFIX}|g' 65SUBST_SED.vars+= -e 's|@PREFIX@|${PREFIX}|g'
67SUBST_SED.vars+= -e 's|@RCD_SCRIPTS_DIR@|${RCD_SCRIPTS_DIR}|g' 66SUBST_SED.vars+= -e 's|@RCD_SCRIPTS_DIR@|${RCD_SCRIPTS_DIR}|g'
68 67
69FILES_SUBST+= DIGEST=${PREFIX:Q}/bin/digest 68FILES_SUBST+= DIGEST=${PREFIX:Q}/bin/digest
70FILES_SUBST+= MONOTONE=${PREFIX:Q}/bin/mtn 69FILES_SUBST+= MONOTONE=${PREFIX:Q}/bin/mtn
71FILES_SUBST+= MONOTONE_GROUP=${MONOTONE_GROUP:Q} 70FILES_SUBST+= MONOTONE_GROUP=${MONOTONE_GROUP:Q}
72FILES_SUBST+= MONOTONE_LOGFILE=${MONOTONE_LOGFILE:Q} 71FILES_SUBST+= MONOTONE_LOGFILE=${MONOTONE_LOGFILE:Q}
73FILES_SUBST+= MONOTONE_USER=${MONOTONE_USER:Q} 72FILES_SUBST+= MONOTONE_USER=${MONOTONE_USER:Q}
74FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} 73FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
75 74
76INSTALLATION_DIRS= ${PKGMANDIR}/man7 75INSTALLATION_DIRS= ${PKGMANDIR}/man7
77 76
78post-extract: 77post-extract:
79.for f in monotone-server.7 read-permissions write-permissions 78.for f in monotone-server.7 read-permissions write-permissions
80 ${CP} ${FILESDIR}/${f} ${WRKDIR} 79 ${CP} ${FILESDIR}/${f} ${WRKDIR}
81.endfor 80.endfor
82 81
83do-install: 82do-install:
84 ${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLEDIR} 83 ${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLEDIR}
85 ${INSTALL_DATA} ${WRKDIR}/monotone-server.7 \ 84 ${INSTALL_DATA} ${WRKDIR}/monotone-server.7 \
86 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/monotone-server.7 85 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/monotone-server.7
87 ${INSTALL_DATA} ${WRKSRC}/contrib/get_passphrase_from_file.lua \ 86 ${INSTALL_DATA} ${WRKSRC}/contrib/get_passphrase_from_file.lua \
88 ${DESTDIR}${EXAMPLEDIR}/monotonerc 87 ${DESTDIR}${EXAMPLEDIR}/monotonerc
89 ${INSTALL_DATA} ${WRKDIR}/read-permissions \ 88 ${INSTALL_DATA} ${WRKDIR}/read-permissions \
90 ${DESTDIR}${EXAMPLEDIR}/read-permissions 89 ${DESTDIR}${EXAMPLEDIR}/read-permissions
91 ${INSTALL_DATA} ${WRKDIR}/write-permissions \ 90 ${INSTALL_DATA} ${WRKDIR}/write-permissions \
92 ${DESTDIR}${EXAMPLEDIR}/write-permissions 91 ${DESTDIR}${EXAMPLEDIR}/write-permissions
93 92
94.include "../../mk/bsd.pkg.mk" 93.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/devel/monotone-server/Attic/distinfo (switch to unified diff)

--- pkgsrc/devel/monotone-server/Attic/distinfo 2010/03/12 09:27:17 1.1
+++ pkgsrc/devel/monotone-server/Attic/distinfo 2010/03/15 09:52:56 1.2
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.1 2010/03/12 09:27:17 jmmv Exp $ 1$NetBSD: distinfo,v 1.2 2010/03/15 09:52:56 jmmv Exp $
2 2
3SHA1 (monotone-0.46.tar.gz) = 2b498c30f91b741e45bc34f8cb5faf135e97976d 3SHA1 (monotone-0.47.tar.gz) = a901c9e1a7dd1138c30483934bbf5f02945c2d2f
4RMD160 (monotone-0.46.tar.gz) = a8f09fc58d09f2144aef3d5f3a333a5cd4555c7b 4RMD160 (monotone-0.47.tar.gz) = 8473366009542ea334ccfabba813f43d0bc89404
5Size (monotone-0.46.tar.gz) = 4568806 bytes 5Size (monotone-0.47.tar.gz) = 4698647 bytes