Date: Sat, 24 Mar 2007 19:46:38 -0800 From: "Beech Rintoul" <beech@alaskaparadise.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: infofarmer@FreeBSD.org Subject: ports/110783: [Maintainer Update] mail/imp - Update to 4.1.4 Message-ID: <1174794398.20603@stargate.alaskaparadise.com> Resent-Message-ID: <200703250350.l2P3o22e073508@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110783
>Category: ports
>Synopsis: [Maintainer Update] mail/imp - Update to 4.1.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 25 03:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Beech Rintoul
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
Alaska Paradise
>Environment:
System: FreeBSD 7.0-CURRENT #111: Sat Mar 24 08:52:58 AKDT 2007
root@stargate.alaskaparadise.com:/usr/obj/usr/src/sys/STARGATE
>Description:
Update to 4.1.4
Fix - PORTDOCS
Fix - pkg-plist
>How-To-Repeat:
>Fix:
diff -ruN --exclude=CVS /usr/ports/mail/imp.orig/Makefile /usr/ports/mail/imp/Makefile
--- /usr/ports/mail/imp.orig/Makefile Wed Mar 21 12:28:58 2007
+++ /usr/ports/mail/imp/Makefile Sat Mar 24 19:17:12 2007
@@ -6,8 +6,8 @@
#
PORTNAME= imp
-PORTVERSION= 4.1.3
-PORTREVISION= 2
+PORTVERSION= 4.1.4
+PORTREVISION=
CATEGORIES= mail www
MASTER_SITES= HORDE
DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
@@ -103,8 +103,8 @@
USE_GETTEXT= yes
REINPLACE_ARGS= -i.beforeIMP
-DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \
- docs/RELEASE_NOTES docs/TODO docs/UPGRADING
+PORTDOCS= COPYING README CHANGES CREDITS INSTALL \
+ RELEASE_NOTES TODO UPGRADING
CONFFILE= filter.txt header.php menu.php mime_drivers.php motd.php \
prefs.php servers.php trailer.txt
SUB_DIRS= config js lib locale po scripts templates themes
@@ -166,6 +166,10 @@
@${ECHO_MSG} ""
.endif
+post-extract:
+ @${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+ @${MV} ${WRKSRC}/COPYING ${WRKSRC}/docs/
+
pre-configure:
@${REINPLACE_CMD} -e "s:/usr/local:${LOCALBASE}:" ${WRKSRC}/config/conf.xml
.if !defined(WITHOUT_ASPELL)
@@ -217,21 +221,16 @@
.endif
do-install:
- @${MKDIR} ${IMPDIR}
-.for REP in ${SUB_DIRS}
- @${CP} -Rp ${WRKSRC}/${REP} ${IMPDIR}
-.endfor
- @${CP} -p ${WRKSRC}/*.php ${IMPDIR}
-
- @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}
- @${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC}
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR}
- @${CHMOD} -R o-rwx ${CONFDIR}
+ @${INSTALL} -d ${IMPDIR}/
+ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${IMPDIR}/
+ @${CP} -p ${WRKSRC}/*.php ${IMPDIR}/
+ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
+ @${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC}/
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR}/
+ @${CHMOD} -R o-rwx ${CONFDIR}/
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
+ @${INSTALL} -d ${DOCSDIR}/
+ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
diff -ruN --exclude=CVS /usr/ports/mail/imp.orig/distinfo /usr/ports/mail/imp/distinfo
--- /usr/ports/mail/imp.orig/distinfo Thu Aug 17 18:57:58 2006
+++ /usr/ports/mail/imp/distinfo Sat Mar 24 18:19:11 2007
@@ -1,3 +1,3 @@
-MD5 (imp-h3-4.1.3.tar.gz) = 91fb63a44805bdff178c39c9bd1c73c5
-SHA256 (imp-h3-4.1.3.tar.gz) = e1c9f9230243dc4bde7fc6c4f6279c24ba354b26f8a10ffe4aa771817ce784dc
-SIZE (imp-h3-4.1.3.tar.gz) = 4178089
+MD5 (imp-h3-4.1.4.tar.gz) = dd2fd1c5a2a4b9fae75dd1bc5751f25d
+SHA256 (imp-h3-4.1.4.tar.gz) = 8d06d87dbf681d74280b14f79dac9d09aa7fdba0f98d4895148bff6059fddd1a
+SIZE (imp-h3-4.1.4.tar.gz) = 4204260
diff -ruN --exclude=CVS /usr/ports/mail/imp.orig/pkg-plist /usr/ports/mail/imp/pkg-plist
--- /usr/ports/mail/imp.orig/pkg-plist Thu May 11 17:56:10 2006
+++ /usr/ports/mail/imp/pkg-plist Sat Mar 24 19:13:13 2007
@@ -1,11 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
%%IMPDIR%%/acl.php
%%IMPDIR%%/attachment.php
%%IMPDIR%%/compose.php
@@ -18,6 +10,7 @@
%%IMPDIR%%/config/motd.php.dist
%%IMPDIR%%/config/prefs.php.dist
%%IMPDIR%%/config/servers.php.dist
+%%IMPDIR%%/config/servers.php
%%IMPDIR%%/config/trailer.txt.dist
%%IMPDIR%%/contacts.php
%%IMPDIR%%/expand.php
@@ -359,7 +352,6 @@
%%IMPDIR%%/themes/sun/screen.css
%%IMPDIR%%/thread.php
%%IMPDIR%%/view.php
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%HORDE_INC%%httpd-imp.conf
@dirrm %%IMPDIR%%/themes/sun
@dirrm %%IMPDIR%%/themes/simplex
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1174794398.20603>