pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/mailman DESTDIR support



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e35aaccf8814
branches:  trunk
changeset: 577026:e35aaccf8814
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jun 28 09:29:40 2010 +0000

description:
DESTDIR support

diffstat:

 mail/mailman/Makefile         |  27 +++++++++++++++------------
 mail/mailman/distinfo         |   4 ++--
 mail/mailman/patches/patch-aa |  16 +++++++++++++---
 3 files changed, 30 insertions(+), 17 deletions(-)

diffs (108 lines):

diff -r bd91ea9f00e3 -r e35aaccf8814 mail/mailman/Makefile
--- a/mail/mailman/Makefile     Mon Jun 28 09:09:54 2010 +0000
+++ b/mail/mailman/Makefile     Mon Jun 28 09:29:40 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2010/02/10 19:17:40 joerg Exp $
+# $NetBSD: Makefile,v 1.61 2010/06/28 09:29:40 joerg Exp $
 
 DISTNAME=      mailman-2.1.12
 PKGREVISION=   1
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.list.org/
 COMMENT=       The GNU Mailing List Manager
 
+PKG_DESTDIR_SUPPORT=   destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 PKG_SYSCONFSUBDIR?=    httpd
@@ -39,6 +41,7 @@
 PKG_GROUPS_VARS+=      MAILMAN_GROUP MAILMAN_CGIGROUP MAILMAN_MAILGROUP
 PKG_USERS_VARS+=       MAILMAN_USER
 
+USERGROUP_PHASE=       pre-install
 PKG_GROUPS=            ${MAILMAN_GROUP}
 PKG_USERS=             ${MAILMAN_USER}:${MAILMAN_GROUP}
 
@@ -108,24 +111,24 @@
        ${RM} -f ${WRKSRC}/[A-Z]*.orig
 
 pre-install:
-       ${INSTALL} -d -o ${MAILMAN_USER} -g ${MAILMAN_GROUP} -m 775 ${EXECDIR}
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA_DIR} ${EXECDIR}/support
+       ${INSTALL} -d -o ${MAILMAN_USER} -g ${MAILMAN_GROUP} -m 775 ${DESTDIR}${EXECDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EXECDIR}/support
 
 post-install:
        cd ${WRKSRC} && for i in [A-IN-U]*; do \
-               ${INSTALL_DATA} $$i ${DOCDIR}/; \
+               ${INSTALL_DATA} $$i ${DESTDIR}${DOCDIR}/; \
        done
        cd ${WRKSRC}/doc && for i in \
            mailman-*.ps mailman-*.pdf mailman-*.txt; do \
-               ${INSTALL_DATA} $$i ${DOCDIR}/; \
+               ${INSTALL_DATA} $$i ${DESTDIR}${DOCDIR}/; \
        done
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKDIR}/mailman.conf.dist ${EGDIR}/mailman.conf
-       ${CHOWN} -R root:${MAILMAN_GROUP} ${EXECDIR}
-       ${CHMOD} -R g+w ${EXECDIR}
-       ${CHMOD} g+s ${EXECDIR}/cgi-bin/*
-       ${PY_COMPILE_ALL} ${PREFIX}/lib/mailman/bin ${PREFIX}/lib/mailman/cron ${PREFIX}/lib/mailman/scripts
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${WRKDIR}/mailman.conf.dist ${DESTDIR}${EGDIR}/mailman.conf
+       ${CHOWN} -R root:${MAILMAN_GROUP} ${DESTDIR}${EXECDIR}
+       ${CHMOD} -R g+w ${DESTDIR}${EXECDIR}
+       ${CHMOD} g+s ${DESTDIR}${EXECDIR}/cgi-bin/*
+       ${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/lib/mailman/bin ${DESTDIR}${PREFIX}/lib/mailman/cron ${DESTDIR}${PREFIX}/lib/mailman/scripts
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r bd91ea9f00e3 -r e35aaccf8814 mail/mailman/distinfo
--- a/mail/mailman/distinfo     Mon Jun 28 09:09:54 2010 +0000
+++ b/mail/mailman/distinfo     Mon Jun 28 09:29:40 2010 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2009/06/03 06:55:07 adam Exp $
+$NetBSD: distinfo,v 1.18 2010/06/28 09:29:40 joerg Exp $
 
 SHA1 (mailman-2.1.12.tgz) = 6d6281f7ce322e271f0259321f4d8931ff46e6ae
 RMD160 (mailman-2.1.12.tgz) = 94d8d132bb37180bf4c02ccd2a5fb3862ce13b94
 Size (mailman-2.1.12.tgz) = 8010027 bytes
-SHA1 (patch-aa) = 77235e964da9d2b0c2725cd7d47c247b0356a45d
+SHA1 (patch-aa) = 3f32d6de2e05c638b6915d64bbc7a70e12ce4470
 SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f
 SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30
 SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2
diff -r bd91ea9f00e3 -r e35aaccf8814 mail/mailman/patches/patch-aa
--- a/mail/mailman/patches/patch-aa     Mon Jun 28 09:09:54 2010 +0000
+++ b/mail/mailman/patches/patch-aa     Mon Jun 28 09:29:40 2010 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2009/06/03 06:58:55 adam Exp $
+$NetBSD: patch-aa,v 1.6 2010/06/28 09:29:40 joerg Exp $
 
---- misc/Makefile.in.orig      2009-02-23 22:23:35.000000000 +0100
+--- misc/Makefile.in.orig      2009-02-23 21:23:35.000000000 +0000
 +++ misc/Makefile.in
 @@ -41,7 +41,7 @@ DEFS=        @DEFS@
  OPT=          @OPT@
@@ -11,7 +11,17 @@
  ICONDIR=      $(prefix)/icons
  SCRIPTSDIR=   $(prefix)/scripts
  
-@@ -99,6 +99,7 @@ install-packages:
+@@ -91,14 +91,15 @@ install-other:
+       $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(DATADIR)
+ 
+ install-packages:
+-      if [ -z "$(EMAILPKG)" -a -d $(PYTHONLIBDIR)/email ] ; \
++      if [ -z "$(DESTDIR)$(EMAILPKG)" -a -d $(DESTDIR)$(PYTHONLIBDIR)/email ] ; \
+       then \
+-          rm -rf $(PYTHONLIBDIR)/email* ; \
++          rm -rf $(DESTDIR)$(PYTHONLIBDIR)/email* ; \
+       fi
+       for p in $(PACKAGES); \
        do \
            gunzip -c $(srcdir)/$$p.tar.gz | (cd $(PKGDIR) ; tar xf -); \
            (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \



Home | Main Index | Thread Index | Old Index