Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Jan 2015 13:29:25 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r377224 - in head/mail/mailman: . files
Message-ID:  <201501171329.t0HDTPGt050523@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Sat Jan 17 13:29:24 2015
New Revision: 377224
URL: https://svnweb.freebsd.org/changeset/ports/377224
QAT: https://qat.redports.org/buildarchive/r377224/

Log:
  Install powerlogo.png in both image locations.
  (Reported by Alex Stangl.)
  
  Take the opportunity to convert powerlogo from GIF to PNG.
  
  Check permissions of mailman/qfiles directory and top-level
  subdirectories from post-install before running check_perms script,
  further to the existing workarounds for pkg/libarchive permissions
  issues.

Added:
  head/mail/mailman/files/powerlogo.png   (contents, props changed)
Deleted:
  head/mail/mailman/files/powerlogo.gif
Modified:
  head/mail/mailman/Makefile
  head/mail/mailman/files/patch-Mailman__htmlformat.py
  head/mail/mailman/files/pkg-install.in
  head/mail/mailman/pkg-plist

Modified: head/mail/mailman/Makefile
==============================================================================
--- head/mail/mailman/Makefile	Sat Jan 17 12:50:56 2015	(r377223)
+++ head/mail/mailman/Makefile	Sat Jan 17 13:29:24 2015	(r377224)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mailman
 DISTVERSION=	2.1.18-1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
@@ -181,8 +181,10 @@ post-install:
 	@${RM} -f ${STAGEDIR}${MAILMANDIR}/Mailman/mm_cfg.pyc
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${IMGDIR}
 	${CP} -p ${STAGEDIR}${MAILMANDIR}/icons/* ${STAGEDIR}${PREFIX}/${IMGDIR}
-	${INSTALL_DATA} ${FILESDIR}/powerlogo.gif \
-	  ${STAGEDIR}${PREFIX}/${IMGDIR}/powerlogo.gif
+	${INSTALL_DATA} ${FILESDIR}/powerlogo.png \
+	  ${STAGEDIR}${PREFIX}/${IMGDIR}/
+	${INSTALL_DATA} ${FILESDIR}/powerlogo.png \
+	  ${STAGEDIR}${MAILMANDIR}/icons/
 .if ${PORT_OPTIONS:MDOCS}
 	${CP} -R ${WRKSRC}/doc/* ${WRKSRC}/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/mail/mailman/files/patch-Mailman__htmlformat.py
==============================================================================
--- head/mail/mailman/files/patch-Mailman__htmlformat.py	Sat Jan 17 12:50:56 2015	(r377223)
+++ head/mail/mailman/files/patch-Mailman__htmlformat.py	Sat Jan 17 13:29:24 2015	(r377224)
@@ -11,7 +11,7 @@
  DELIVERED_BY = 'mailman.jpg'
  PYTHON_POWERED = 'PythonPowered.png'
  GNU_HEAD = 'gnu-head-tiny.jpg'
-+FREEBSD_POWERED = 'powerlogo.gif'
++FREEBSD_POWERED = 'powerlogo.png'
  
  
  def MailmanLogo():

Modified: head/mail/mailman/files/pkg-install.in
==============================================================================
--- head/mail/mailman/files/pkg-install.in	Sat Jan 17 12:50:56 2015	(r377223)
+++ head/mail/mailman/files/pkg-install.in	Sat Jan 17 13:29:24 2015	(r377224)
@@ -32,7 +32,8 @@ POST-INSTALL)
 
   # fix up permissions - this is under investigation; pkg or libarchive
   # goof up the group writable and/or setgid bits
-  /bin/chmod 02770 "%%MAILMANDIR%%/qfiles"
+  /usr/bin/find "%%MAILMANDIR%%/qfiles" -maxdepth 1 -type d -exec \
+    /bin/chmod u+rwx,g+rwsx,o-w "{}" +
   /bin/chmod 02775 "%%MAILMANDIR%%" \
     "%%MAILMANDIR%%/Mailman" \
     "%%MAILMANDIR%%/bin" \

Added: head/mail/mailman/files/powerlogo.png
==============================================================================
Binary file. No diff available.

Modified: head/mail/mailman/pkg-plist
==============================================================================
--- head/mail/mailman/pkg-plist	Sat Jan 17 12:50:56 2015	(r377223)
+++ head/mail/mailman/pkg-plist	Sat Jan 17 13:29:24 2015	(r377224)
@@ -6,7 +6,7 @@
 %%IMGDIR%%/mm-icon-large.ico
 %%IMGDIR%%/mm-icon.ico
 %%IMGDIR%%/mm-icon.png
-%%IMGDIR%%/powerlogo.gif
+%%IMGDIR%%/powerlogo.png
 %%IMGDIR%%/PythonPowered.png
 @group %%MM_GROUPNAME%%
 %%MMDIR%%/Mailman/Archiver/Archiver.py
@@ -393,6 +393,7 @@
 %%MMDIR%%/icons/mm-icon-large.ico
 %%MMDIR%%/icons/mm-icon.ico
 %%MMDIR%%/icons/mm-icon.png
+%%MMDIR%%/icons/powerlogo.png
 %%MMDIR%%/mail/mailman
 %%NLS%%%%MMDIR%%/messages/ar/LC_MESSAGES/mailman.mo
 %%NLS%%%%MMDIR%%/messages/ar/LC_MESSAGES/mailman.po



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501171329.t0HDTPGt050523>