Mon Jun 28 09:29:40 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.60 -r1.61 pkgsrc/mail/mailman/Makefile
diff -r1.17 -r1.18 pkgsrc/mail/mailman/distinfo
diff -r1.5 -r1.6 pkgsrc/mail/mailman/patches/patch-aa
cvs diff -r1.60 -r1.61 pkgsrc/mail/mailman/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mailman/Makefile 2010/02/10 19:17:40 1.60
+++ pkgsrc/mail/mailman/Makefile 2010/06/28 09:29:40 1.61
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: Makefile,v 1.60 2010/02/10 19:17:40 joerg Exp $ 1# $NetBSD: Makefile,v 1.61 2010/06/28 09:29:40 joerg Exp $
2 2
3DISTNAME= mailman-2.1.12 3DISTNAME= mailman-2.1.12
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= mail www 5CATEGORIES= mail www
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mailman/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mailman/}
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.list.org/ 10HOMEPAGE= http://www.list.org/
11COMMENT= The GNU Mailing List Manager 11COMMENT= The GNU Mailing List Manager
12 12
 13PKG_DESTDIR_SUPPORT= destdir
 14
13.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
14 16
15PKG_SYSCONFSUBDIR?= httpd 17PKG_SYSCONFSUBDIR?= httpd
16MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 18MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
17MESSAGE_SUBST+= DOCDIR=${DOCDIR} 19MESSAGE_SUBST+= DOCDIR=${DOCDIR}
18 20
19GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
20GNU_CONFIGURE_PREFIX= ${EXECDIR} 22GNU_CONFIGURE_PREFIX= ${EXECDIR}
21 23
22MAKE_FLAGS+= DIRSETGID=${TRUE:Q} 24MAKE_FLAGS+= DIRSETGID=${TRUE:Q}
23EXECDIR= ${PREFIX}/lib/mailman 25EXECDIR= ${PREFIX}/lib/mailman
24MAILMAN_DATADIR?= ${VARBASE}/db/mailman 26MAILMAN_DATADIR?= ${VARBASE}/db/mailman
25EGDIR= ${PREFIX}/share/examples/mailman 27EGDIR= ${PREFIX}/share/examples/mailman
@@ -29,26 +31,27 @@ MAILMAN_GROUP?= mailman @@ -29,26 +31,27 @@ MAILMAN_GROUP?= mailman
29MAILMAN_CGIGROUP?= ${APACHE_GROUP} 31MAILMAN_CGIGROUP?= ${APACHE_GROUP}
30MAILMAN_MAILGROUP?= daemon # group sendmail runs under; 32MAILMAN_MAILGROUP?= daemon # group sendmail runs under;
31 # use 'nobody' for postfix 33 # use 'nobody' for postfix
32MAILMAN_CGIEXT?= .cgi 34MAILMAN_CGIEXT?= .cgi
33 35
34MESSAGE_SUBST+= EXECDIR=${EXECDIR} 36MESSAGE_SUBST+= EXECDIR=${EXECDIR}
35MESSAGE_SUBST+= MAILMAN_USER=${MAILMAN_USER} 37MESSAGE_SUBST+= MAILMAN_USER=${MAILMAN_USER}
36PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} 38PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
37PLIST_SUBST+= MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//} 39PLIST_SUBST+= MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//}
38 40
39PKG_GROUPS_VARS+= MAILMAN_GROUP MAILMAN_CGIGROUP MAILMAN_MAILGROUP 41PKG_GROUPS_VARS+= MAILMAN_GROUP MAILMAN_CGIGROUP MAILMAN_MAILGROUP
40PKG_USERS_VARS+= MAILMAN_USER 42PKG_USERS_VARS+= MAILMAN_USER
41 43
 44USERGROUP_PHASE= pre-install
42PKG_GROUPS= ${MAILMAN_GROUP} 45PKG_GROUPS= ${MAILMAN_GROUP}
43PKG_USERS= ${MAILMAN_USER}:${MAILMAN_GROUP} 46PKG_USERS= ${MAILMAN_USER}:${MAILMAN_GROUP}
44 47
45PKG_GECOS.${MAILMAN_USER}= Mailman user 48PKG_GECOS.${MAILMAN_USER}= Mailman user
46PKG_SHELL.${MAILMAN_USER}= ${SH} 49PKG_SHELL.${MAILMAN_USER}= ${SH}
47 50
48REQD_DIRS_PERMS+= ${EXECDIR} root ${MAILMAN_GROUP} 775 51REQD_DIRS_PERMS+= ${EXECDIR} root ${MAILMAN_GROUP} 775
49OWN_DIRS_PERMS+= ${MAILMAN_DATADIR} ${MAILMAN_USER} ${MAILMAN_GROUP} 775 52OWN_DIRS_PERMS+= ${MAILMAN_DATADIR} ${MAILMAN_USER} ${MAILMAN_GROUP} 775
50MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/archives ${MAILMAN_USER} ${MAILMAN_GROUP} 775 53MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/archives ${MAILMAN_USER} ${MAILMAN_GROUP} 775
51MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/archives/public ${MAILMAN_USER} ${MAILMAN_GROUP} 775 54MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/archives/public ${MAILMAN_USER} ${MAILMAN_GROUP} 775
52MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/archives/private ${MAILMAN_USER} ${MAILMAN_GROUP} 771 55MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/archives/private ${MAILMAN_USER} ${MAILMAN_GROUP} 771
53MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/data ${MAILMAN_USER} ${MAILMAN_GROUP} 775 56MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/data ${MAILMAN_USER} ${MAILMAN_GROUP} 775
54MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/lists ${MAILMAN_USER} ${MAILMAN_GROUP} 775 57MAKE_DIRS_PERMS+= ${MAILMAN_DATADIR}/lists ${MAILMAN_USER} ${MAILMAN_GROUP} 775
@@ -98,34 +101,34 @@ SUBST_STAGE.paths= post-patch @@ -98,34 +101,34 @@ SUBST_STAGE.paths= post-patch
98 101
99# mailman depends a lot on it and will bitch if changed. 102# mailman depends a lot on it and will bitch if changed.
100CHECK_PERMS= no 103CHECK_PERMS= no
101 104
102REPLACE_PYTHON+= cron/senddigests 105REPLACE_PYTHON+= cron/senddigests
103 106
104post-extract: 107post-extract:
105 ${CP} ${FILESDIR}/mailman.conf.dist ${WRKDIR}/mailman.conf.dist 108 ${CP} ${FILESDIR}/mailman.conf.dist ${WRKDIR}/mailman.conf.dist
106 109
107post-patch: 110post-patch:
108 ${RM} -f ${WRKSRC}/[A-Z]*.orig 111 ${RM} -f ${WRKSRC}/[A-Z]*.orig
109 112
110pre-install: 113pre-install:
111 ${INSTALL} -d -o ${MAILMAN_USER} -g ${MAILMAN_GROUP} -m 775 ${EXECDIR} 114 ${INSTALL} -d -o ${MAILMAN_USER} -g ${MAILMAN_GROUP} -m 775 ${DESTDIR}${EXECDIR}
112 ${INSTALL_DATA_DIR} ${DOCDIR} 115 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
113 ${INSTALL_DATA_DIR} ${EXECDIR}/support 116 ${INSTALL_DATA_DIR} ${DESTDIR}${EXECDIR}/support
114 117
115post-install: 118post-install:
116 cd ${WRKSRC} && for i in [A-IN-U]*; do \ 119 cd ${WRKSRC} && for i in [A-IN-U]*; do \
117 ${INSTALL_DATA} $$i ${DOCDIR}/; \ 120 ${INSTALL_DATA} $$i ${DESTDIR}${DOCDIR}/; \
118 done 121 done
119 cd ${WRKSRC}/doc && for i in \ 122 cd ${WRKSRC}/doc && for i in \
120 mailman-*.ps mailman-*.pdf mailman-*.txt; do \ 123 mailman-*.ps mailman-*.pdf mailman-*.txt; do \
121 ${INSTALL_DATA} $$i ${DOCDIR}/; \ 124 ${INSTALL_DATA} $$i ${DESTDIR}${DOCDIR}/; \
122 done 125 done
123 ${INSTALL_DATA_DIR} ${EGDIR} 126 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
124 ${INSTALL_DATA} ${WRKDIR}/mailman.conf.dist ${EGDIR}/mailman.conf 127 ${INSTALL_DATA} ${WRKDIR}/mailman.conf.dist ${DESTDIR}${EGDIR}/mailman.conf
125 ${CHOWN} -R root:${MAILMAN_GROUP} ${EXECDIR} 128 ${CHOWN} -R root:${MAILMAN_GROUP} ${DESTDIR}${EXECDIR}
126 ${CHMOD} -R g+w ${EXECDIR} 129 ${CHMOD} -R g+w ${DESTDIR}${EXECDIR}
127 ${CHMOD} g+s ${EXECDIR}/cgi-bin/* 130 ${CHMOD} g+s ${DESTDIR}${EXECDIR}/cgi-bin/*
128 ${PY_COMPILE_ALL} ${PREFIX}/lib/mailman/bin ${PREFIX}/lib/mailman/cron ${PREFIX}/lib/mailman/scripts 131 ${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/lib/mailman/bin ${DESTDIR}${PREFIX}/lib/mailman/cron ${DESTDIR}${PREFIX}/lib/mailman/scripts
129 132
130.include "../../lang/python/application.mk" 133.include "../../lang/python/application.mk"
131.include "../../mk/bsd.pkg.mk" 134.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/mail/mailman/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mailman/distinfo 2009/06/03 06:55:07 1.17
+++ pkgsrc/mail/mailman/distinfo 2010/06/28 09:29:40 1.18
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.17 2009/06/03 06:55:07 adam Exp $ 1$NetBSD: distinfo,v 1.18 2010/06/28 09:29:40 joerg Exp $
2 2
3SHA1 (mailman-2.1.12.tgz) = 6d6281f7ce322e271f0259321f4d8931ff46e6ae 3SHA1 (mailman-2.1.12.tgz) = 6d6281f7ce322e271f0259321f4d8931ff46e6ae
4RMD160 (mailman-2.1.12.tgz) = 94d8d132bb37180bf4c02ccd2a5fb3862ce13b94 4RMD160 (mailman-2.1.12.tgz) = 94d8d132bb37180bf4c02ccd2a5fb3862ce13b94
5Size (mailman-2.1.12.tgz) = 8010027 bytes 5Size (mailman-2.1.12.tgz) = 8010027 bytes
6SHA1 (patch-aa) = 77235e964da9d2b0c2725cd7d47c247b0356a45d 6SHA1 (patch-aa) = 3f32d6de2e05c638b6915d64bbc7a70e12ce4470
7SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f 7SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f
8SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30 8SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30
9SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2 9SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2
10SHA1 (patch-af) = 985a619a055151d998cefd0c1b7280a0d55f889e 10SHA1 (patch-af) = 985a619a055151d998cefd0c1b7280a0d55f889e
11SHA1 (patch-ag) = 5fda86a90ef17a08c304ae89f0934812601d5dfc 11SHA1 (patch-ag) = 5fda86a90ef17a08c304ae89f0934812601d5dfc
12SHA1 (patch-ah) = c7cde35f787c003ace550a98d8d5e166ba2d48dc 12SHA1 (patch-ah) = c7cde35f787c003ace550a98d8d5e166ba2d48dc
cvs diff -r1.5 -r1.6 pkgsrc/mail/mailman/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/mailman/patches/patch-aa 2009/06/03 06:58:55 1.5
+++ pkgsrc/mail/mailman/patches/patch-aa 2010/06/28 09:29:40 1.6
@@ -1,21 +1,31 @@ @@ -1,21 +1,31 @@
1$NetBSD: patch-aa,v 1.5 2009/06/03 06:58:55 adam Exp $ 1$NetBSD: patch-aa,v 1.6 2010/06/28 09:29:40 joerg Exp $
2 2
3--- misc/Makefile.in.orig 2009-02-23 22:23:35.000000000 +0100 3--- misc/Makefile.in.orig 2009-02-23 21:23:35.000000000 +0000
4+++ misc/Makefile.in 4+++ misc/Makefile.in
5@@ -41,7 +41,7 @@ DEFS= @DEFS@ 5@@ -41,7 +41,7 @@ DEFS= @DEFS@
6 OPT= @OPT@ 6 OPT= @OPT@
7 CFLAGS= $(OPT) $(DEFS) 7 CFLAGS= $(OPT) $(DEFS)
8 PACKAGEDIR= $(prefix)/Mailman 8 PACKAGEDIR= $(prefix)/Mailman
9-DATADIR= $(var_prefix)/data 9-DATADIR= $(var_prefix)/data
10+DATADIR= $(prefix)/support 10+DATADIR= $(prefix)/support
11 ICONDIR= $(prefix)/icons 11 ICONDIR= $(prefix)/icons
12 SCRIPTSDIR= $(prefix)/scripts 12 SCRIPTSDIR= $(prefix)/scripts
13  13
14@@ -99,6 +99,7 @@ install-packages: 14@@ -91,14 +91,15 @@ install-other:
 15 $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(DATADIR)
 16
 17 install-packages:
 18- if [ -z "$(EMAILPKG)" -a -d $(PYTHONLIBDIR)/email ] ; \
 19+ if [ -z "$(DESTDIR)$(EMAILPKG)" -a -d $(DESTDIR)$(PYTHONLIBDIR)/email ] ; \
 20 then \
 21- rm -rf $(PYTHONLIBDIR)/email* ; \
 22+ rm -rf $(DESTDIR)$(PYTHONLIBDIR)/email* ; \
 23 fi
 24 for p in $(PACKAGES); \
15 do \ 25 do \
16 gunzip -c $(srcdir)/$$p.tar.gz | (cd $(PKGDIR) ; tar xf -); \ 26 gunzip -c $(srcdir)/$$p.tar.gz | (cd $(PKGDIR) ; tar xf -); \
17 (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \ 27 (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
18+ rm -rf $(PKGDIR)/$$p; \ 28+ rm -rf $(PKGDIR)/$$p; \
19 done 29 done
20  30
21 finish: 31 finish: