Date: Sat, 24 Mar 2007 22:42:38 -0800 From: "Beech Rintoul" <beech@alaskaparadise.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: infofarmer@FreeBSD.org Subject: ports/110787: [Maintainer Update] mail/ingo - Upgrade to 1.1.3 Message-ID: <1174804958.7677@stargate.alaskaparadise.com> Resent-Message-ID: <200703250650.l2P6o36W098602@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110787
>Category: ports
>Synopsis: [Maintainer Update] mail/ingo - Upgrade to 1.1.3
>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 06:50:02 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 1.1.3
[Changes]
Fix blacklists and whitelists in the IMAP driver.
>How-To-Repeat:
>Fix:
diff -ruN --exclude=CVS /usr/ports/mail/ingo.orig/Makefile /usr/ports/mail/ingo/Makefile
--- /usr/ports/mail/ingo.orig/Makefile Sat Feb 24 20:31:48 2007
+++ /usr/ports/mail/ingo/Makefile Sat Mar 24 22:38:05 2007
@@ -6,7 +6,7 @@
#
PORTNAME= ingo
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.3
CATEGORIES= mail www
MASTER_SITES= HORDE
DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
@@ -34,8 +34,8 @@
SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= INGODIR=${INGODIR}
-DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \
- docs/RELEASE_NOTES docs/TODO
+PORTDOCS= README CHANGES CREDITS INSTALL \
+ RELEASE_NOTES TODO
CONFFILE= backends.php fields.php prefs.php
SUB_DIRS= config lib locale po scripts templates themes js
@@ -61,25 +61,24 @@
post-patch:
@${FIND} ${WRKSRC} -name "*.orig" -delete
+post-extract:
+ @${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+
pre-configure:
@${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g" \
${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd-ingo.conf
do-install:
- @${MKDIR} ${INGODIR}
-.for REP in ${SUB_DIRS}
- @${CP} -Rp ${WRKSRC}/${REP} ${INGODIR}
-.endfor
- @${CP} -p ${WRKSRC}/*.php ${INGODIR}
-
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}
- @${CHMOD} -R o-rwx ${CONFDIR}
- @${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}
+ @${INSTALL} -d ${INGODIR}/
+ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${INGODIR}/
+ @${CP} -p ${WRKSRC}/*.php ${INGODIR}/
+ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
+ @${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}/
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}/
+ @${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/ingo.orig/distinfo /usr/ports/mail/ingo/distinfo
--- /usr/ports/mail/ingo.orig/distinfo Mon Oct 30 16:31:05 2006
+++ /usr/ports/mail/ingo/distinfo Sat Mar 24 21:57:29 2007
@@ -1,3 +1,3 @@
-MD5 (ingo-h3-1.1.2.tar.gz) = dc9dbfe52df5b922ec852b1267df5130
-SHA256 (ingo-h3-1.1.2.tar.gz) = 94a6514ade16eb527885ccc9e0f92c653795383efb51aca1a8186a9d53866390
-SIZE (ingo-h3-1.1.2.tar.gz) = 1342239
+MD5 (ingo-h3-1.1.3.tar.gz) = 0cd5325966cc29928f80910b8ad93bec
+SHA256 (ingo-h3-1.1.3.tar.gz) = d4a5db3b7a1340be0f18f10df8affc8631cf5345a49862bf89c3a1d20769a846
+SIZE (ingo-h3-1.1.3.tar.gz) = 1356658
diff -ruN --exclude=CVS /usr/ports/mail/ingo.orig/pkg-plist /usr/ports/mail/ingo/pkg-plist
--- /usr/ports/mail/ingo.orig/pkg-plist Mon Oct 30 16:31:05 2006
+++ /usr/ports/mail/ingo/pkg-plist Sat Mar 24 22:20:41 2007
@@ -1,11 +1,3 @@
-%%HORDE_INC%%/httpd-ingo.conf
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
%%INGODIR%%/blacklist.php
%%INGODIR%%/config/.htaccess
%%INGODIR%%/config/backends.php.dist
@@ -36,6 +28,7 @@
%%INGODIR%%/lib/base.php
%%INGODIR%%/lib/version.php
%%INGODIR%%/locale/ca_ES/LC_MESSAGES/ingo.mo
+%%INGODIR%%/locale/ca_ES/help.xml
%%INGODIR%%/locale/cs_CZ/LC_MESSAGES/ingo.mo
%%INGODIR%%/locale/da_DK/LC_MESSAGES/ingo.mo
%%INGODIR%%/locale/de_DE/LC_MESSAGES/ingo.mo
@@ -48,6 +41,7 @@
%%INGODIR%%/locale/fi_FI/LC_MESSAGES/ingo.mo
%%INGODIR%%/locale/fi_FI/help.xml
%%INGODIR%%/locale/fr_FR/LC_MESSAGES/ingo.mo
+%%INGODIR%%/locale/fr_FR/help.xml
%%INGODIR%%/locale/hu_HU/LC_MESSAGES/ingo.mo
%%INGODIR%%/locale/it_IT/LC_MESSAGES/ingo.mo
%%INGODIR%%/locale/ko_KR/LC_MESSAGES/ingo.mo
@@ -127,7 +121,7 @@
%%INGODIR%%/themes/screen.css
%%INGODIR%%/vacation.php
%%INGODIR%%/whitelist.php
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%HORDE_INC%%/httpd-ingo.conf
@dirrm %%INGODIR%%/themes/graphics
@dirrm %%INGODIR%%/themes
@dirrm %%INGODIR%%/templates/whitelist
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1174804958.7677>