pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/imp The old mail/imp4 package is now mail/imp
details: https://anonhg.NetBSD.org/pkgsrc/rev/b7cbad9fab14
branches: trunk
changeset: 514669:b7cbad9fab14
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Fri Jun 16 09:24:36 2006 +0000
description:
The old mail/imp4 package is now mail/imp
The 3.x tree has been retired from pkgsrc
diffstat:
mail/imp/DESCR | 6 +-
mail/imp/MESSAGE | 18 +-
mail/imp/Makefile | 113 ++++++++-----
mail/imp/PLIST | 356 ++++++++++++++++++++++++++++--------------
mail/imp/distinfo | 8 +-
mail/imp/files/imp.conf.dist | 14 +-
6 files changed, 331 insertions(+), 184 deletions(-)
diffs (truncated from 806 to 300 lines):
diff -r 324c79d6f9de -r b7cbad9fab14 mail/imp/DESCR
--- a/mail/imp/DESCR Fri Jun 16 09:23:22 2006 +0000
+++ b/mail/imp/DESCR Fri Jun 16 09:24:36 2006 +0000
@@ -1,6 +1,4 @@
-IMP is a set of PHP scripts that implement an IMAP based webmail system.
-Assuming you have an account on a server that supports IMAP, you can use
+IMP is a set of PHP scripts that implement an IMAP/POP based webmail system.
+Assuming you have an account on a server that supports IMAP/POP, you can use
an installation of IMP to check your mail from anywhere that you have web
access.
-This is the previous stable branch of IMP. A version of IMP using the
-current stable branch is available as mail/imp4.
diff -r 324c79d6f9de -r b7cbad9fab14 mail/imp/MESSAGE
--- a/mail/imp/MESSAGE Fri Jun 16 09:23:22 2006 +0000
+++ b/mail/imp/MESSAGE Fri Jun 16 09:24:36 2006 +0000
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.6 2003/05/16 00:47:41 mason Exp $
+$NetBSD: MESSAGE,v 1.7 2006/06/16 09:24:36 adrianp Exp $
Please refer to the file:
@@ -7,21 +7,15 @@
on how to setup your IMP installation. You need to at least edit
- ${IMPDIR}/config/conf.php
+ ${PREFIX}/share/horde/config/registry.php
-You will also need to make IMP accessible through your HTTP server. If
+to enable IMP in the horde framework. You will also need to configure IMP
+by using the Horde administrative interface.
+
+Finally you will also need to make IMP accessible through your HTTP server. If
you are running Apache and ap-php, then you can add the following lines
to httpd.conf:
- Include ${PKG_SYSCONFDIR}/horde.conf
Include ${PKG_SYSCONFDIR}/imp.conf
-and then you have to edit
- ${PREFIX}/share/horde/config/registry.php
-to enable IMP in the horde framework.
-
-If you are updating from IMP 2.2.x, use the script
- ${PREFIX}/share/horde/imp/scripts/imp2horde.pl
-to convert the IMP 2.2.x user preference database to the new format.
-
===========================================================================
diff -r 324c79d6f9de -r b7cbad9fab14 mail/imp/Makefile
--- a/mail/imp/Makefile Fri Jun 16 09:23:22 2006 +0000
+++ b/mail/imp/Makefile Fri Jun 16 09:24:36 2006 +0000
@@ -1,75 +1,102 @@
-# $NetBSD: Makefile,v 1.37 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2006/06/16 09:24:36 adrianp Exp $
-DISTNAME= imp-3.2.8
-PKGREVISION= 3
+DISTNAME= imp-h3-${IMPVER}
+PKGNAME= imp-${IMPVER}
+PKGREVISION= 1
CATEGORIES= mail www
-MASTER_SITES= ftp://ftp.horde.org/pub/imp/tarballs/
+MASTER_SITES= http://ftp.horde.org/pub/imp/ \
+ ftp://ftp.horde.org/pub/imp/
-MAINTAINER= bouyer%NetBSD.org@localhost
+MAINTAINER= adrianp%NetBSD.org@localhost
HOMEPAGE= http://www.horde.org/imp/
COMMENT= Internet Messaging Program
-CONFLICTS+= imp-4.*
+CONFLICTS+= imp-3.*
-DEPENDS+= horde>=2.2.4:../../www/horde
-DEPENDS+= ${PHP_PKG_PREFIX}-imap>4.0.0:../../mail/php-imap
+DEPENDS+= horde>=3.0.2:../../www/horde
+DEPENDS+= ${PHP_PKG_PREFIX}-imap>4.3.3:../../mail/php-imap
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail-[0-9]*:../../mail/pear-Mail
+.include "../../mk/bsd.prefs.mk"
+
DOCDIR= ${PREFIX}/share/doc/imp
EGDIR= ${PREFIX}/share/examples/imp
HORDEDIR= ${PREFIX}/share/horde
IMPDIR= ${HORDEDIR}/imp
+IMPVER= 4.1.1
+PAXDIRS= lib locale po scripts templates themes
-MESSAGE_SUBST+= IMPDIR=${IMPDIR}
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+= IMPDIR=${IMPDIR:Q}
+MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
PKG_SYSCONFSUBDIR?= httpd
-CONF_FILES= ${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
-CONF_FILES+= ${IMPDIR}/config/conf.php.dist \
- ${IMPDIR}/config/conf.php
-CONF_FILES+= ${IMPDIR}/config/servers.php.dist \
- ${IMPDIR}/config/servers.php
-CONF_FILES+= ${IMPDIR}/config/filter.txt.dist \
- ${IMPDIR}/config/filter.txt
-CONF_FILES+= ${IMPDIR}/config/header.txt.dist \
- ${IMPDIR}/config/header.txt
-CONF_FILES+= ${IMPDIR}/config/html.php.dist \
- ${IMPDIR}/config/html.php
-CONF_FILES+= ${IMPDIR}/config/menu.php.dist \
- ${IMPDIR}/config/menu.php
-CONF_FILES+= ${IMPDIR}/config/mime_drivers.php.dist \
- ${IMPDIR}/config/mime_drivers.php
-CONF_FILES+= ${IMPDIR}/config/motd.php.dist \
- ${IMPDIR}/config/motd.php
-CONF_FILES+= ${IMPDIR}/config/prefs.php.dist \
- ${IMPDIR}/config/prefs.php
-CONF_FILES+= ${IMPDIR}/config/trailer.txt.dist \
- ${IMPDIR}/config/trailer.txt
+CONF_FILES= ${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
+CONF_FILES+= ${IMPDIR}/config/servers.php.dist \
+ ${IMPDIR}/config/servers.php
+CONF_FILES_PERMS+= ${IMPDIR}/config/conf.xml.dist \
+ ${IMPDIR}/config/conf.xml \
+ ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+= ${IMPDIR}/config/filter.txt.dist \
+ ${IMPDIR}/config/filter.txt \
+ ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+= ${IMPDIR}/config/header.txt.dist \
+ ${IMPDIR}/config/header.txt \
+ ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+= ${IMPDIR}/config/menu.php.dist \
+ ${IMPDIR}/config/menu.php \
+ ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+= ${IMPDIR}/config/mime_drivers.php.dist \
+ ${IMPDIR}/config/mime_drivers.php \
+ ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+= ${IMPDIR}/config/motd.php.dist \
+ ${IMPDIR}/config/motd.php \
+ ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+= ${IMPDIR}/config/prefs.php.dist \
+ ${IMPDIR}/config/prefs.php \
+ ${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+= ${IMPDIR}/config/trailer.txt.dist \
+ ${IMPDIR}/config/trailer.txt \
+ ${APACHE_USER} ${ROOT_GROUP} 0440
+
+SUBST_CLASSES+= files
+SUBST_STAGE.files= post-build
+SUBST_FILES.files= imp.conf.dist
+SUBST_SED.files= -e "s|@IMPDIR@|${IMPDIR}|g"
+SUBST_MESSAGE.files= Fixing configuration files.
+
+.include "options.mk"
do-build:
+ ${CP} ${FILESDIR}/imp.conf.dist ${WRKSRC}/imp.conf.dist
+ ${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
- ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
- ${FIND} ${WRKSRC} -name "*.pl" -print | ${XARGS} ${CHMOD} +x
- ${FIND} ${WRKSRC} -name "*.sh" -print | ${XARGS} ${CHMOD} +x
-
-pre-install:
- ${SED} -e "s|@IMPDIR@|${IMPDIR}|g" \
- ${FILESDIR}/imp.conf.dist > ${WRKDIR}/imp.conf.dist
do-install:
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA_DIR} ${IMPDIR}
- cd ${WRKDIR}; ${INSTALL_DATA} imp.conf.dist ${EGDIR}/imp.conf
- cd ${WRKSRC}; ${INSTALL_DATA} COPYING README docs/* ${DOCDIR}
- cd ${WRKSRC}; ${CP} -R graphics lib locale po scripts templates ${IMPDIR}
${INSTALL_DATA_DIR} ${IMPDIR}/config
- cd ${WRKSRC}/config; ${INSTALL_DATA} * ${IMPDIR}/config
- cd ${WRKSRC}; ${INSTALL_DATA} *.php ${IMPDIR}
+ ${INSTALL_DATA} ${WRKSRC}/imp.conf.dist ${EGDIR}/imp.conf
+ ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCDIR}
+
+. for d in ${PAXDIRS}
+ ${INSTALL_DATA_DIR} ${IMPDIR}/${d}
+. endfor
+
+. for d in ${PAXDIRS}
+ @cd ${WRKSRC}/${d} && ${PAX} -rwpam . ${IMPDIR}/${d}
+. endfor
+
+ ${INSTALL_DATA} ${WRKSRC}/config/*.dist ${IMPDIR}/config
+ ${INSTALL_DATA} ${WRKSRC}/*.php ${IMPDIR}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${IMPDIR}
${FIND} ${IMPDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
${FIND} ${IMPDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+ ${CHOWN} ${APACHE_USER}:${ROOT_GROUP} ${IMPDIR}/config
+ ${CHMOD} 0750 ${IMPDIR}/config
.include "../../lang/php/phpversion.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 324c79d6f9de -r b7cbad9fab14 mail/imp/PLIST
--- a/mail/imp/PLIST Fri Jun 16 09:23:22 2006 +0000
+++ b/mail/imp/PLIST Fri Jun 16 09:24:36 2006 +0000
@@ -1,16 +1,19 @@
-@comment $NetBSD: PLIST,v 1.9 2004/06/26 20:35:48 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/06/16 09:24:36 adrianp Exp $
share/doc/imp/CHANGES
share/doc/imp/COPYING
share/doc/imp/CREDITS
share/doc/imp/INSTALL
share/doc/imp/README
share/doc/imp/RELEASE_NOTES
+share/doc/imp/TODO
+share/doc/imp/UPGRADING
share/examples/imp/imp.conf
+share/horde/imp/acl.php
+share/horde/imp/attachment.php
share/horde/imp/compose.php
-share/horde/imp/config/conf.php.dist
+share/horde/imp/config/conf.xml.dist
share/horde/imp/config/filter.txt.dist
-share/horde/imp/config/header.txt.dist
-share/horde/imp/config/html.php.dist
+share/horde/imp/config/header.php.dist
share/horde/imp/config/menu.php.dist
share/horde/imp/config/mime_drivers.php.dist
share/horde/imp/config/motd.php.dist
@@ -18,86 +21,78 @@
share/horde/imp/config/servers.php.dist
share/horde/imp/config/trailer.txt.dist
share/horde/imp/contacts.php
-share/horde/imp/filters.php
+share/horde/imp/expand.php
+share/horde/imp/fetchmail.php
+share/horde/imp/fetchmailprefs.php
+share/horde/imp/filterprefs.php
share/horde/imp/folders.php
-share/horde/imp/graphics/addressbook-blue.gif
-share/horde/imp/graphics/addressbook-red.gif
-share/horde/imp/graphics/addressbook-yellow.gif
-share/horde/imp/graphics/alternative.gif
-share/horde/imp/graphics/answered.gif
-share/horde/imp/graphics/attachment.gif
-share/horde/imp/graphics/checkbox.gif
-share/horde/imp/graphics/compose.gif
-share/horde/imp/graphics/deleted.gif
-share/horde/imp/graphics/down.gif
-share/horde/imp/graphics/download.gif
-share/horde/imp/graphics/draft.gif
-share/horde/imp/graphics/empty_trash.gif
-share/horde/imp/graphics/expand.gif
-share/horde/imp/graphics/favicon.ico
-share/horde/imp/graphics/fetchmail.gif
-share/horde/imp/graphics/filters.gif
-share/horde/imp/graphics/first-grey.gif
-share/horde/imp/graphics/first.gif
-share/horde/imp/graphics/folders.gif
-share/horde/imp/graphics/folders/collapsed.gif
-share/horde/imp/graphics/folders/empty.gif
-share/horde/imp/graphics/folders/expanded.gif
-share/horde/imp/graphics/folders/folder.gif
-share/horde/imp/graphics/folders/folder_open.gif
-share/horde/imp/graphics/folders/inbox.gif
-share/horde/imp/graphics/folders/mbox.gif
-share/horde/imp/graphics/folders/mbox_marked.gif
-share/horde/imp/graphics/folders/mbox_noselect.gif
-share/horde/imp/graphics/folders/mbox_unmarked.gif
-share/horde/imp/graphics/folders/spacer.gif
-share/horde/imp/graphics/imp.gif
-share/horde/imp/graphics/important.gif
-share/horde/imp/graphics/last-grey.gif
-share/horde/imp/graphics/last.gif
-share/horde/imp/graphics/lhand.gif
-share/horde/imp/graphics/lock.gif
-share/horde/imp/graphics/manage_attachments.gif
-share/horde/imp/graphics/mime/html.gif
-share/horde/imp/graphics/mime/image.gif
-share/horde/imp/graphics/mime/text.gif
-share/horde/imp/graphics/next-grey.gif
-share/horde/imp/graphics/next.gif
-share/horde/imp/graphics/personal.gif
-share/horde/imp/graphics/prev-grey.gif
-share/horde/imp/graphics/prev.gif
-share/horde/imp/graphics/print.gif
-share/horde/imp/graphics/reload.gif
-share/horde/imp/graphics/rhand.gif
-share/horde/imp/graphics/search.gif
-share/horde/imp/graphics/signed.gif
-share/horde/imp/graphics/spellcheck.gif
-share/horde/imp/graphics/thread.gif
-share/horde/imp/graphics/unseen.gif
-share/horde/imp/graphics/up.gif
-share/horde/imp/identities.php
share/horde/imp/index.php
-share/horde/imp/lib/Browser.php
+share/horde/imp/lib/Auth/imp.php
+share/horde/imp/lib/Block/summary.php
+share/horde/imp/lib/Block/tree_folders.php
+share/horde/imp/lib/Compose.php
+share/horde/imp/lib/Crypt/PGP.php
+share/horde/imp/lib/Crypt/SMIME.php
+share/horde/imp/lib/Fetchmail.php
Home |
Main Index |
Thread Index |
Old Index