svn commit: r331706 - head/mail/squirrelmail

[Adam Weinberger]

Author: adamw
Date: Sat Oct 26 15:47:53 2013
New Revision: 331706
URL: http://svnweb.freebsd.org/changeset/ports/331706

Log:
  Update to 2013/10/26
  
  In particular:
  
  	* Add new spacer image and allow its use for unsafe images instead of
  	  the sec_remove_* image -- brings HTML emails into the modern age
  	  (much more viewable)

Modified:
  head/mail/squirrelmail/Makefile
  head/mail/squirrelmail/distinfo
  head/mail/squirrelmail/pkg-plist

Modified: head/mail/squirrelmail/Makefile
==============================================================================
--- head/mail/squirrelmail/Makefile	Sat Oct 26 15:42:28 2013	(r331705)
+++ head/mail/squirrelmail/Makefile	Sat Oct 26 15:47:53 2013	(r331706)
@@ -2,17 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	squirrelmail
-PORTVERSION=	20131020
-PORTREVISION=	2
+PORTVERSION=	20131026
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	adamw
+MASTER_SITE_SUBDIR=	adamw/squirrelmail
 DISTNAME=	${PORTNAME}-${PORTVERSION}_0200-SVN.stable
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	adamw at FreeBSD.org
 COMMENT=	A webmail system which accesses mail over IMAP
 
+LICENSE=	GPLv2
+
 # This snapshot tarball contains php 5.4 and 5.5 compatibility
 # patches, but the only guaranteed compatibility is with php 5.3.
 # If you encounter problems, downgrade to php 5.3.
@@ -28,7 +29,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}.stable/${
 OPTIONS_DEFINE=	DATABASE LDAP
 DATABASE_DESC=	PEAR database support (must also install a driver)
 
-# if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/${PORTNAME}
+# if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/squirrelmail
 SQUIRRELDIR?=	${WWWDIR}
 
 SMUSER?=	${WWWOWN}
@@ -40,7 +41,7 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 			SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \
 
 SUB_FILES=	pkg-message
-SUB_LIST=	SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP} 
+SUB_LIST=	SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP}
 
 CONFLICTS=	squirreloutlook-[0-9]*
 
@@ -93,19 +94,19 @@ pre-install:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${FILESDIR}/111.clean-squirrelmail ${STAGEDIR}${PREFIX}/etc/periodic/daily
-	${MKDIR} ${STAGEDIR}${SQUIRRELDIR}
+	@${MKDIR} ${STAGEDIR}${SQUIRRELDIR}
 	${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${SQUIRRELDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/configure ${STAGEDIR}${SQUIRRELDIR}
-.for DIR in attach class config data functions help images include locale plugins po src themes
-	cd ${WRKSRC} && ${FIND} ${DIR} | ${CPIO} -pdmu --quiet ${STAGEDIR}${SQUIRRELDIR}
-.endfor
+	cd ${WRKSRC} && \
+		${FIND} attach class config data functions help images include locale plugins po src themes \
+		| ${CPIO} -pdmu --quiet ${STAGEDIR}${SQUIRRELDIR}
 	${CHOWN} ${SMUSER}:${SMGROUP} ${STAGEDIR}${SQUIRRELDIR}/data ${STAGEDIR}${SQUIRRELDIR}/attach
 	${CHMOD} 730 ${STAGEDIR}${SQUIRRELDIR}/attach
 	${CHMOD} 750 ${STAGEDIR}${SQUIRRELDIR}/data
 
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${FIND} . | ${CPIO} -pdmu --quiet ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/mail/squirrelmail/distinfo
==============================================================================
--- head/mail/squirrelmail/distinfo	Sat Oct 26 15:42:28 2013	(r331705)
+++ head/mail/squirrelmail/distinfo	Sat Oct 26 15:47:53 2013	(r331706)
@@ -1,2 +1,2 @@
-SHA256 (squirrelmail/squirrelmail-20131020_0200-SVN.stable.tar.bz2) = bec67ca3b0dd6f5435fa9fd7fe0cfe0f6662abfefce7589ebb484f0dc9ac5a60
-SIZE (squirrelmail/squirrelmail-20131020_0200-SVN.stable.tar.bz2) = 541979
+SHA256 (squirrelmail/squirrelmail-20131026_0200-SVN.stable.tar.bz2) = 2f4da122cb6ac133464c8b14d55944ae05a3adcfa1aff8fe914dac22dbf58a27
+SIZE (squirrelmail/squirrelmail-20131026_0200-SVN.stable.tar.bz2) = 544703

Modified: head/mail/squirrelmail/pkg-plist
==============================================================================
--- head/mail/squirrelmail/pkg-plist	Sat Oct 26 15:42:28 2013	(r331705)
+++ head/mail/squirrelmail/pkg-plist	Sat Oct 26 15:47:53 2013	(r331706)
@@ -138,6 +138,7 @@ etc/periodic/daily/111.clean-squirrelmai
 %%SQUIRRELDIR%%/images/senti.png
 %%SQUIRRELDIR%%/images/sm_logo.png
 %%SQUIRRELDIR%%/images/sort_none.png
+%%SQUIRRELDIR%%/images/spacer.png
 %%SQUIRRELDIR%%/images/up_pointer.png
 %%SQUIRRELDIR%%/include/.htaccess
 %%SQUIRRELDIR%%/include/index.php