pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/majordomo bring up the package to current pkgsrc ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4685c4a87fbd
branches: trunk
changeset: 581918:4685c4a87fbd
user: spz <spz%pkgsrc.org@localhost>
date: Fri Oct 29 21:51:21 2010 +0000
description:
bring up the package to current pkgsrc standards, especially DESTDIR
and paths being used.
MAJORDOMO_HOMEDIR moves from /home/majordom to $VARBASE/majordomo, unless
overridden by the package builder
MAJORDOMO_CF is now ${PREFIX}/etc/majordomo/majordomo.cf
diffstat:
mail/majordomo/MESSAGE | 40 ++++++-----
mail/majordomo/Makefile | 89 ++++++++++++++++--------
mail/majordomo/distinfo | 6 +-
mail/majordomo/patches/patch-aa | 140 ++++++++++++++++++++++++++++------------
mail/majordomo/patches/patch-aj | 14 ++--
5 files changed, 188 insertions(+), 101 deletions(-)
diffs (truncated from 561 to 300 lines):
diff -r 4e8ef1121e2e -r 4685c4a87fbd mail/majordomo/MESSAGE
--- a/mail/majordomo/MESSAGE Fri Oct 29 19:36:40 2010 +0000
+++ b/mail/majordomo/MESSAGE Fri Oct 29 21:51:21 2010 +0000
@@ -1,39 +1,44 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/06/16 16:43:37 jlam Exp $
+$NetBSD: MESSAGE,v 1.5 2010/10/29 21:51:21 spz Exp $
Before you can use Majordomo, you will need to complete a few steps
manually:
- - install majordomo.cf in ${HOME}/${MAJORDOMO_USER}.
- Look in ${PREFIX}/share/examples/majordomo for an example and
+ - configure ${MAJORDOMO_CF}.
be sure to change instances of ${HOSTNAME} as appropriate.
- - create lists in ${HOME}/${MAJORDOMO_USER}.
+ - create lists in ${HOME}
Look in ${PREFIX}/share/doc/majordomo for information and see
the files and directories for an example list (example-l) in
${PREFIX}/share/examples/majordomo. Pay attention to the
permissions on the files and directories.
- - add a .forward file in ${HOME}/${MAJORDOMO_USER} (or an
+ - add a .forward file in ${HOME} (or an
appropriate alias) so administrative mail to
${MAJORDOMO_USER} gets redirected properly.
- - install majordomo aliases for sendmail.
- For example, create /etc/aliases.majordomo following the
+ - install majordomo aliases for your mail server software.
+ For example, create ${PREFIX}/etc/majordomo/aliases following the
example in ${PREFIX}/share/examples/majordomo and add it to
- your sendmail configuration. This can be done by adding a
- line similar to the following to /etc/sendmail.cf :
+ your mailer configuration.
+
+ For sendmail, add a line similar to the following to
+ /etc/sendmail.cf :
- OA/etc/aliases.majordomo (for 8.6.x Sendmail),
+ OA${PREFIX}/etc/majordomo/aliases (for 8.6.x Sendmail),
- O AliasFile=/etc/aliases,/etc/aliases.majordomo (for 8.7.x and up),
+ O AliasFile=/etc/mail/aliases,${PREFIX}/etc/majordomo/aliases
+ (for 8.7.x and up),
or a line similar to the following to your m4 macros file:
- define(`ALIAS_FILE',`/etc/aliases,/etc/aliases.majordomo')
+ define(`ALIAS_FILE',`/etc/mail/aliases,${PREFIX}/etc/majordomo/aliases')
- - if the group for ${MAJORDOMO_USER} (${MAJORDOMO_GROUP}) is not
- daemon, add ${MAJORDOMO_USER} as a trusted user for sendmail.
+ For postfix, add eg hash:${PREFIX}/etc/majordomo/aliases
+ to the alias_maps and alias_database parameters in main.cf
+
+ - for sendmail, if the group for ${MAJORDOMO_USER} (${MAJORDOMO_GROUP}) is not
+ daemon, add ${MAJORDOMO_USER} as a trusted user for your mailer.
This can be done by adding a line similar to the following
in /etc/sendmail.cf:
@@ -43,12 +48,11 @@
define(`confTRUSTED_USERS', ${MAJORDOMO_USER})dnl
- - be sure to run `newaliases' to create the sendmail database,
- and be sure that sendmail knows about any changes to
- /etc/sendmail.cf (e.g., reboot or restart sendmail)
+ - be sure to run `newaliases' to create the aliases database,
+ and be sure that your mailer has reloaded its config
- add entries in /etc/newsyslog.conf to rotate the log in
- ${HOME}/${MAJORDOMO_USER}/Log if necessary.
+ ${HOME}/Log if necessary.
Enjoy Majordomo!
===========================================================================
diff -r 4e8ef1121e2e -r 4685c4a87fbd mail/majordomo/Makefile
--- a/mail/majordomo/Makefile Fri Oct 29 19:36:40 2010 +0000
+++ b/mail/majordomo/Makefile Fri Oct 29 21:51:21 2010 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2010/10/16 10:30:56 spz Exp $
+# $NetBSD: Makefile,v 1.35 2010/10/29 21:51:21 spz Exp $
DISTNAME= majordomo-1.94.5
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= mail
MASTER_SITES= ftp://ftp.sgi.com/other/majordomo/1.94.5/ \
ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
@@ -10,13 +10,17 @@
MAINTAINER= spz%NetBSD.org@localhost
HOMEPAGE= http://www.greatcircle.com/majordomo/
COMMENT= The Majordomo mailing list manager
+
LICENSE= majordomo-license
-RESTRICTED= No distribution of modified binary packages to the general public
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
+PKG_DESTDIR_SUPPORT= destdir
+MAKE_JOBS_SAFE= NO
-CONFLICTS+= bounce-*
+RESTRICTED= No distribution of modified binary packages to the general public
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+
+CONFLICTS+= bounce-[0-9]*
USE_TOOLS+= perl:run
@@ -24,15 +28,26 @@
INSTALL_TARGET= install install-wrapper
MAKE_FILE= Makefile.netbsd
-MAJORDOMO_TMPDIR?= /var/tmp
-MAJORDOMO_HOMEDIR?= /home
+.include "../../mk/bsd.prefs.mk"
+
+MAJORDOMO_TMPDIR?= ${VARBASE}/majordomo/tmp
+MAJORDOMO_HOMEDIR?= ${VARBASE}/majordomo
+MAJORDOMO_CF?= ${PREFIX}/etc/majordomo/majordomo.cf
MAJORDOMO_USER?= majordom
MAJORDOMO_GROUP?= majordom
+PKG_GECOS.${MAJORDOMO_USER}= Majordomo Mailinglist Manager
+PKG_HOME.${MAJORDOMO_USER}= ${MAJORDOMO_HOMEDIR}
+
PKG_GROUPS_VARS+= MAJORDOMO_GROUP
PKG_USERS_VARS+= MAJORDOMO_USER
+PKG_SYSCONFDIR.majordomo= ${PREFIX}/etc/majordomo
+CONF_FILES+= ${EXAMPLEDIR}/aliases.majordomo ${PKG_SYSCONFDIR.majordomo}/aliases
+CONF_FILES+= ${EXAMPLEDIR}/majordomo.cf ${PKG_SYSCONFDIR.majordomo}/majordomo.cf
+
MESSAGE_SUBST+= HOME=${MAJORDOMO_HOMEDIR} \
+ MAJORDOMO_CF=${MAJORDOMO_CF} \
MAJORDOMO_USER=${MAJORDOMO_USER} \
MAJORDOMO_GROUP=${MAJORDOMO_GROUP}
@@ -41,29 +56,35 @@
DOCDOCFILES= FAQ README.sequencer list-owner-info \
majordomo-faq.html majordomo.lisa6.ps majordomo.ora
-EXDIR= ${PREFIX}/share/examples/majordomo
+EXAMPLEDIR= ${PREFIX}/share/examples/majordomo
EXDIRS= archives archives/example-l digests \
digests/example-l-digest lists
EXFILES= example-l.passwd example-l.info
EXLISTS= example-l example-l-digest
BUILD_DEFS+= MAJORDOMO_TMPDIR
+BUILD_DEFS+= MAJORDOMO_HOMEDIR
+BUILD_DEFS+= MAJORDOMO_CF
+BUILD_DEFS+= VARBASE
USERGROUP_PHASE= configure
PKG_GROUPS= ${MAJORDOMO_GROUP}
PKG_USERS= ${MAJORDOMO_USER}:${MAJORDOMO_GROUP}
-OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER} \
+OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR} \
${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/archives \
+OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/archives \
${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/digests \
+OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/digests \
${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/lists \
+OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/lists \
+ ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
+OWN_DIRS_PERMS+= ${MAJORDOMO_TMPDIR} \
${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
CONFIGURE_SED= -e "s|@PREFIX@|${PREFIX}|g" \
-e "s|@PERL@|${PERL5}|g" \
-e "s|@HOME@|${MAJORDOMO_HOMEDIR}|g" \
+ -e "s|@MAJORDOMO_CF@|${MAJORDOMO_CF}|g" \
-e "s|@MAJORDOMO_USER@|${MAJORDOMO_USER}|g" \
-e "s|@UID@|${PKG_UID.${MAJORDOMO_USER}}|g" \
-e "s|@GID@|${PKG_GID.${MAJORDOMO_GROUP}}|g" \
@@ -71,10 +92,15 @@
MESSAGE_SED= -e 's|$${PREFIX}|${PREFIX}|g' \
-e 's|$${HOME}|${HOME}|g' \
+ -e 's|$${MAJORDOMO_CF}|${MAJORDOMO_CF}|g' \
-e 's|$${MAJORDOMO_USER}|${MAJORDOMO_USER}|g' \
- -e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g' \
+ -e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g'
-INSTALLATION_DIRS= ${PKGMANDIR}/man8
+INSTALLATION_DIRS+= ${PKG_SYSCONFDIR.majordomo}
+INSTALLATION_DIRS+= ${PREFIX}/bin
+INSTALLATION_DIRS+= ${PREFIX}/libexec/majordomo
+INSTALLATION_DIRS+= ${PKGMANDIR}/man1
+INSTALLATION_DIRS+= ${PKGMANDIR}/man8
do-configure:
${SED} ${CONFIGURE_SED} ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.netbsd
@@ -85,45 +111,46 @@
> ${WRKSRC}/aliases.majordomo
${SED} -e 's|$${PREFIX}|${PREFIX}|g' \
-e 's|$${HOME}|${HOME}|g' \
+ -e 's|$${MAJORDOMO_CF}|${MAJORDOMO_CF}|g' \
-e 's|$${MAJORDOMO_USER}|${MAJORDOMO_USER}|g' \
-e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g' \
${PKGDIR}/MESSAGE > ${WRKSRC}/post-install-notes
post-install:
- ${LN} -sf archive2.pl ${PREFIX}/libexec/majordomo/archive
- ${INSTALL_DATA_DIR} ${DOCDIR}
+ ${LN} -sf archive2.pl ${DESTDIR}${PREFIX}/libexec/majordomo/archive
+ ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
.for file in ${DOCFILES}
- @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR}/${file}
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${DOCDIR}/${file}
.endfor
.for file in ${DOCDOCFILES}
- ${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${DOCDIR}/${file}
+ ${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${DESTDIR}${DOCDIR}/${file}
.endfor
- ${INSTALL_DATA} ${WRKSRC}/post-install-notes ${DOCDIR}/post-install-notes
- ${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR}
+ ${INSTALL_DATA} ${WRKSRC}/post-install-notes ${DESTDIR}${DOCDIR}/post-install-notes
+ ${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${DESTDIR}${EXAMPLEDIR}
.for dir in ${EXDIRS}
- ${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR}/${dir}
+ ${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${DESTDIR}${EXAMPLEDIR}/${dir}
.endfor
${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- ${WRKSRC}/aliases.majordomo ${EXDIR}/aliases.majordomo
+ ${WRKSRC}/aliases.majordomo ${DESTDIR}${EXAMPLEDIR}/aliases.majordomo
${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- ${FILESDIR}/keep_me ${EXDIR}/archives/example-l/.keep_me
+ ${FILESDIR}/keep_me ${DESTDIR}${EXAMPLEDIR}/archives/example-l/.keep_me
${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- ${FILESDIR}/keep_me ${EXDIR}/digests/example-l-digest/.keep_me
+ ${FILESDIR}/keep_me ${DESTDIR}${EXAMPLEDIR}/digests/example-l-digest/.keep_me
.for file in ${EXFILES}
${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- ${FILESDIR}/${file} ${EXDIR}/lists/${file}
+ ${FILESDIR}/${file} ${DESTDIR}${EXAMPLEDIR}/lists/${file}
.endfor
.for file in ${EXLISTS}
${INSTALL} -m 664 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- /dev/null ${EXDIR}/lists/${file}
+ /dev/null ${DESTDIR}${EXAMPLEDIR}/lists/${file}
.endfor
- ${LN} -sf example-l.info ${EXDIR}/lists/example-l-digest.info
- ${LN} -sf example-l.passwd ${EXDIR}/lists/example-l-digest.passwd
+ ${LN} -sf example-l.info ${DESTDIR}${EXAMPLEDIR}/lists/example-l-digest.info
+ ${LN} -sf example-l.passwd ${DESTDIR}${EXAMPLEDIR}/lists/example-l-digest.passwd
${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
- ${WRKSRC}/majordomo.cf ${EXDIR}/majordomo.cf
+ ${WRKSRC}/majordomo.cf ${DESTDIR}${EXAMPLEDIR}/majordomo.cf
# verify installation; requires interaction
test: install
- ${PREFIX}/libexec/majordomo/wrapper config-test
+ ${DESTDIR}${PREFIX}/libexec/majordomo/wrapper config-test
.include "../../mk/bsd.pkg.mk"
diff -r 4e8ef1121e2e -r 4685c4a87fbd mail/majordomo/distinfo
--- a/mail/majordomo/distinfo Fri Oct 29 19:36:40 2010 +0000
+++ b/mail/majordomo/distinfo Fri Oct 29 21:51:21 2010 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2010/10/16 10:30:56 spz Exp $
+$NetBSD: distinfo,v 1.8 2010/10/29 21:51:21 spz Exp $
SHA1 (majordomo-1.94.5.tgz) = 44b18c7b9133f2cd992f6e718551d613d9d45c00
RMD160 (majordomo-1.94.5.tgz) = 7f6b48fb5cc5b23948133658b055588d0d6608c4
Size (majordomo-1.94.5.tgz) = 312244 bytes
-SHA1 (patch-aa) = 6cc6cd49eb6413489fb782a3bcac70baac99fa7f
+SHA1 (patch-aa) = 532bfe02d535231da689d1d5968a5247d624f005
SHA1 (patch-ab) = 68bdbd77029ebd8f113c492e50e60aa7efb35de9
SHA1 (patch-ac) = bea997e785b2656b1660a11efce759a56a700ab2
SHA1 (patch-ad) = 65370547240539128a405484e98c7ed15a869464
@@ -12,7 +12,7 @@
SHA1 (patch-ag) = b469a639270d369732e75e6ae4df7f559e9c436e
SHA1 (patch-ah) = 666b52100cb50a948c145da0ba83c197386cbd1e
SHA1 (patch-ai) = 771c487d1a3392bf3b523330b8d60fd9a190c58b
-SHA1 (patch-aj) = 6d4fe712af39cb986c24d0227f86aacb6d048870
+SHA1 (patch-aj) = 2185ba182561ca3e003fa0879e696092c3b237fd
SHA1 (patch-ak) = 401da2e552ff92ef35a60e45d6b8994dfd091b49
SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76
SHA1 (patch-am) = cb557337c586c39f86b1c8f8fe265c7db022491c
diff -r 4e8ef1121e2e -r 4685c4a87fbd mail/majordomo/patches/patch-aa
--- a/mail/majordomo/patches/patch-aa Fri Oct 29 19:36:40 2010 +0000
+++ b/mail/majordomo/patches/patch-aa Fri Oct 29 21:51:21 2010 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2006/06/16 17:11:25 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2010/10/29 21:51:22 spz Exp $
---- Makefile.orig Wed Aug 27 16:56:21 1997
-+++ Makefile Tue Mar 27 12:41:29 2001
+--- Makefile.orig 2000-01-18 14:01:17.000000000 +0000
++++ Makefile
@@ -13,27 +13,29 @@
Home |
Main Index |
Thread Index |
Old Index