1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

Update to 20140717.

Upstream changes include:
	- Add ability to search the FROM header for a given address
	- Resumed drafts now use the correct identity
	- Lighten folder refresh - let browser cache images and whatnot
	- Make sure sender and subject are never blank
	- Make sure folder list refresh gets non-empty response
	- Remove senseless restrictions on abook nicknames

Port changes include:
	squirrelmail:
		- Improve installed permissions on all SM files
		- Introduce a pkg-help instead of a pre-everything message
		- Given the lack of pear-DB (old-style) drivers in the ports
		  tree, it may be time to retire the DATABASE option altogether?
	squirrelmail-translations:
		- Depend on squirrelmail by identical PORTVERSION to
		  prevent strings from being used with a different squirrelmail
		  revision
This commit is contained in:
Adam Weinberger 2014-07-18 00:43:30 +00:00
parent 6392965c18
commit ec519e160e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=362167
6 changed files with 29 additions and 38 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= squirrelmail-translations
PORTVERSION= 20140420
PORTVERSION= 20140717
CATEGORIES= mail www
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= adamw/squirrelmail
@ -14,7 +14,7 @@ COMMENT= NLS translations for Squirrelmail (mail/squirrelmail)
LICENSE= GPLv2
RUN_DEPENDS= ${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
RUN_DEPENDS= squirrelmail=${PORTVERSION}:${PORTSDIR}/mail/squirrelmail
USES= tar:bzip2 gettext
WRKSRC= ${WRKDIR}/squirrelmail.locales
@ -29,8 +29,6 @@ do-build:
do-install:
@${MKDIR} ${STAGEDIR}${SQUIRRELDIR}
.for DIR in help images locale
(cd ${WRKSRC} && ${COPYTREE_SHARE} ${DIR} ${STAGEDIR}${SQUIRRELDIR})
.endfor
(cd ${WRKSRC} && ${COPYTREE_SHARE} "help images locale" ${STAGEDIR}${SQUIRRELDIR})
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (squirrelmail/squirrelmail-20140420_0200-SVN.locales.tar.bz2) = fc851a791907e6d7e3bc2fde94a655014545e9471ec81fc87b85f06f3934a906
SIZE (squirrelmail/squirrelmail-20140420_0200-SVN.locales.tar.bz2) = 5254092
SHA256 (squirrelmail/squirrelmail-20140717_0200-SVN.locales.tar.bz2) = 5c6c254e4865a52fd8606229932f1c1aab9ac5f6efc450327035fa689fb7c27b
SIZE (squirrelmail/squirrelmail-20140717_0200-SVN.locales.tar.bz2) = 5253895

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= squirrelmail
PORTVERSION= 20140420
PORTVERSION= 20140717
CATEGORIES= mail www
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= adamw/squirrelmail
@ -49,15 +49,6 @@ CONFLICTS= squirreloutlook-[0-9]*
DATABASE_RUN_DEPENDS= ${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
LDAP_USE= PHP=ldap
.include <bsd.port.options.mk>
pre-everything::
.if ${PORT_OPTIONS:MDATABASE}
@${ECHO_CMD} "Note that the PEAR database framework still requires you to install a"
@${ECHO_CMD} "database-specific PEAR driver, e.g. MySQL."
@${ECHO_CMD}
.endif
post-patch:
@${REINPLACE_CMD} -e 's|ispell|${LOCALBASE}/bin/ispell|g' \
${WRKSRC}/plugins/squirrelspell/sqspell_config.php
@ -67,19 +58,20 @@ post-patch:
${WRKSRC}/config/conf.pl ${WRKSRC}/config/config_default.php ${WRKSRC}/doc/INSTALL
do-build:
# Rearrange the documentation
@${MV} ${WRKSRC}/themes/README.themes ${WRKSRC}/doc/
@cd ${WRKSRC} ; for f in `${FIND} plugins -name "README*" -or \
-name INSTALL -or -name CHANGES -or -name HISTORY`; \
# Rearrange the documentation
@${MV} ${WRKSRC}/themes/README.themes ${WRKSRC}/doc
@(cd ${WRKSRC} && \
for f in `${FIND} -E plugins -regex \
'.*(README.*|INSTALL|HISTORY)'`; \
do \
${MKDIR} doc/`dirname $$f` ; \
${MV} $$f doc/`dirname $$f` ; \
done; \
${MV} doc/plugins/squirrelspell/doc/README doc/plugins/squirrelspell ; \
${RM} -rf doc/plugins/squirrelspell/doc ; \
${MV} plugins/squirrelspell/doc/* doc/plugins/squirrelspell ; \
${RM} -f doc/plugins/squirrelspell/index.php ; \
${RM} -rf plugins/squirrelspell/doc
${MKDIR} doc/`dirname $$f`; \
${MV} $$f doc/`dirname $$f`; \
done)
@${MV} ${WRKSRC}/doc/plugins/squirrelspell/doc/README ${WRKSRC}/doc/plugins/squirrelspell
@${RM} -rf ${WRKSRC}/doc/plugins/squirrelspell/doc
@${MV} ${WRKSRC}/plugins/squirrelspell/doc/* ${WRKSRC}/doc/plugins/squirrelspell
@${RM} -f ${WRKSRC}/doc/plugins/squirrelspell/index.php
@${RM} -rf ${WRKSRC}/plugins/squirrelspell/doc
@${ECHO} "left_refresh=300" >> ${WRKSRC}/data/default_pref
@${MV} ${WRKSRC}/config/config_local.php ${WRKSRC}/config/config_local.php.sample
@ -87,10 +79,6 @@ do-build:
@${MKDIR} ${WRKSRC}/attach
@${CP} -p ${WRKSRC}/data/.htaccess ${WRKSRC}/attach/.htaccess
pre-install:
@${FIND} ${WRKSRC} -name '*.orig' -delete
@${FIND} ${WRKSRC} -name '*.bak' -delete
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
${INSTALL_SCRIPT} ${FILESDIR}/111.clean-squirrelmail ${STAGEDIR}${PREFIX}/etc/periodic/daily
@ -98,8 +86,8 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${SQUIRRELDIR}
${INSTALL_SCRIPT} ${WRKSRC}/configure ${STAGEDIR}${SQUIRRELDIR}
(cd ${WRKSRC} && \
${FIND} attach class config data functions help images include locale plugins po scripts src themes \
| ${CPIO} -pdmu --quiet ${STAGEDIR}${SQUIRRELDIR})
${COPYTREE_SHARE} "attach class config data functions help images include locale plugins po scripts src themes" \
${STAGEDIR}${SQUIRRELDIR})
@${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})

View File

@ -1,2 +1,2 @@
SHA256 (squirrelmail/squirrelmail-20140420_0200-SVN.stable.tar.bz2) = 1651f177a43aab7d07dbb1982adaf178000cb0ee6d208bfccd126bbb01415db9
SIZE (squirrelmail/squirrelmail-20140420_0200-SVN.stable.tar.bz2) = 552142
SHA256 (squirrelmail/squirrelmail-20140717_0200-SVN.stable.tar.bz2) = d7d42a6714a2e42a517b179b904e1860dbc5bf8ba1fc4c3923b0830002d1ef7f
SIZE (squirrelmail/squirrelmail-20140717_0200-SVN.stable.tar.bz2) = 552821

View File

@ -0,0 +1,5 @@
If you enable the PEAR database framework option, you still need to install a
database-specific PEAR driver.
SquirrelMail is only compatible with old-style pear-DB drivers, not the newer
MDB2 drivers.

View File

@ -502,9 +502,9 @@ etc/periodic/daily/111.clean-squirrelmail
@group %%SMGROUP%%
@mode 0750
@dirrm %%SQUIRRELDIR%%/data
@mode
@group
@owner
@mode 0755
@dirrmtry %%SQUIRRELDIR%%/config
@dirrm %%SQUIRRELDIR%%/class/mime
@dirrm %%SQUIRRELDIR%%/class/helper