ports/102835: patch submission to upgrade mail/mulberry4

Paul Schmehl pauls at utdallas.edu
Sun Sep 3 21:10:38 UTC 2006


>Number:         102835
>Category:       ports
>Synopsis:       patch submission to upgrade mail/mulberry4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 03 21:10:22 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Paul Schmehl
>Release:        FreeBSD 6.0-RELEASE-p6 i386
>Organization:
University of Texas at Dallas
>Environment:
System: FreeBSD hostname.utdallas.edu 6.0-RELEASE-p6 FreeBSD 6.0-RELEASE-p6 #1: Sat Apr 1 21:39:10 CST 2006 root at utd59514.utdallas.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	This submission patches the mail/mulberry4 port to update it
	to the new, freeware version, 4.0.5.  It includes a new startup
	script which is required to properly source the Resources directory
	because of a bug in the software
>How-To-Repeat:
	
>Fix:

	

--- patch-Makefile begins here ---
--- Makefile.orig	Thu Aug 31 19:19:53 2006
+++ Makefile	Sun Sep  3 15:15:08 2006
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	mulberry
-PORTVERSION=	4.0ba.rh9
-PORTREVISION=	4
+PORTVERSION=	4.0.5
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cyrusoft.com/pub/Mulberry/v${PORTVERSION:S/./_/g}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://www.mulberrymail.com/downloads/Mulberry/v4_0_5/
+DISTNAME=	Mulberry
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	girgen at FreeBSD.org
 COMMENT=	A scalable high-performance GUI internet Mail User Agent
@@ -22,6 +19,9 @@
 USE_LINUX=	yes
 USE_XLIB=	yes
 ONLY_FOR_ARCHS=	i386
+SUB_FILES=	pkg-message mulberry-start
+SUB_LIST=	PORTNAME=${PORTNAME} WRKSRC=${WRKSRC}
+PLIST_SUB=	PORTNAME=${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
@@ -46,15 +46,15 @@
 	${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/Resources/* ${RESOURCESDIR}
 	${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/Plug-ins/Timezones/* ${TZDIR}
 	${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/icons/* ${PIXMAPSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/mulberry-start ${PREFIX}/bin/
 .if !defined(NOPORTDOCS)
-	${INSTALL_DIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/CHANGES* ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Mulberry_License ${DOCSDIR}
 .endif
 
 post-install:
-	@${ECHO} ""
+
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO} ""
 
 .include <bsd.port.post.mk>
--- patch-Makefile ends here ---

--- patch-distinfo begins here ---
--- distinfo.orig	Thu Aug 31 19:23:59 2006
+++ distinfo	Thu Aug 31 19:48:29 2006
@@ -1,3 +1,3 @@
-MD5 (mulberry/mulberry-4.0ba.rh9.tgz) = ee387a8ce89d07492d9f726a8ee95777
-SHA256 (mulberry/mulberry-4.0ba.rh9.tgz) = a2414d3c014baa01dff92a438b54d0c9b405d3b4ed86e552114532790a38f2d9
-SIZE (mulberry/mulberry-4.0ba.rh9.tgz) = 6575411
+MD5 (Mulberry.tgz) = 89f7d234dd037739a0a66bff95055a45
+SHA256 (Mulberry.tgz) = 4db33f7a41e9f0926409abe5e9173fe761473ac98ff091be0b4baa4e8e27581f
+SIZE (Mulberry.tgz) = 6744647
--- patch-distinfo ends here ---

--- patch-pkg-descr begins here ---
--- pkg-descr.orig	Thu Aug 31 19:20:03 2006
+++ pkg-descr	Thu Aug 31 19:21:17 2006
@@ -6,4 +6,4 @@
 POP3 and Local accounts, full disconnected IMAP support, PGP/GPG,
 SSL/STARTTLS, local and SIEVE support for filtering and much more!
 
-WWW: http://www.cyrusoft.com/mulberry/
+WWW: http://www.mulberrymail.com/
--- patch-pkg-descr ends here ---

--- patch-pkg-message begins here ---
--- pkg-message.orig	Thu Aug 31 19:20:18 2006
+++ files/pkg-message.in	Sun Sep  3 15:47:48 2006
@@ -1,11 +1,7 @@
-This is a fully-functional demo. The only differences between this and
-the licensed version are that you get annoying reminder messages with
-some frequency, and the copy will auto-destruct if tampered with or if
-30 days pass.
 
-Please make sure you have read and understood the Mulberry Evaluation
-Copy License, which you can find at:
-http://www.cyrusoft.com/theLicense/evaluationlicence.html
+This is a fully-functional version.  Mulberry is now freeware.
+Support is through the community.  If you need support, you
+can start here - http://www.mulberrymail.com/support.shtml
 
-Mulberry Pricing and Purchasing information is found at
-http://www.cyrusoft.com/mulberry/mulbpurchase.html
+To run Mulberry, launch the mulberry-start script found in
+%%PREFIX%%/bin/.
--- patch-pkg-message ends here ---

--- patch-pkg-plist begins here ---
--- pkg-plist.orig	Thu Aug 31 19:20:27 2006
+++ pkg-plist	Fri Sep  1 17:07:39 2006
@@ -1,37 +1,32 @@
-bin/mulberry
-lib/mulberry/Plug-ins/CRAMMD5Plugin.so
-lib/mulberry/Plug-ins/CommunicatorAdbkIOPlugin.so
-lib/mulberry/Plug-ins/DIGESTMD5Plugin.so
-lib/mulberry/Plug-ins/Eudora4AdbkIOPlugin.so
-lib/mulberry/Plug-ins/EudoraAdbkIOPlugin.so
-lib/mulberry/Plug-ins/GPGPlugin.so
-lib/mulberry/Plug-ins/GSSAPIPlugin.so
-lib/mulberry/Plug-ins/ISpellPlugin.so
-lib/mulberry/Plug-ins/NTLMPlugin.so
-lib/mulberry/Plug-ins/NetscapeAdbkIOPlugin.so
-lib/mulberry/Plug-ins/POPPASSDPlugin.so
-lib/mulberry/Plug-ins/PineAdbkIOPlugin.so
-lib/mulberry/Plug-ins/QuickmailAdbkIOPlugin.so
-lib/mulberry/Plug-ins/SMIMEPlugin.so
-lib/mulberry/Plug-ins/SSLPlugin.so
-lib/mulberry/Plug-ins/URLPASSDPlugin.so
-lib/mulberry/Plug-ins/vCardAdbkIOPlugin.so
-lib/mulberry/Plug-ins/Timezones/vtimezones.ics
-lib/mulberry/Resources/Alerts.xml
-lib/mulberry/Resources/ComponentDescriptions.xml
-lib/mulberry/Resources/DateTimeStrings.xml
-lib/mulberry/Resources/ErrorDialog.xml
-lib/mulberry/Resources/MacOS.xml
-lib/mulberry/Resources/Preferences.xml
-lib/mulberry/Resources/ProtocolErrors.xml
-lib/mulberry/Resources/Status.xml
-lib/mulberry/Resources/Strings.xml
-lib/mulberry/Resources/Toolbars.xml
-lib/mulberry/Resources/UI.xml
- at dirrm lib/mulberry/Plug-ins/Timezones
- at dirrm lib/mulberry/Plug-ins
- at dirrm lib/mulberry/Resources
- at dirrm lib/mulberry
+bin/%%PORTNAME%%
+lib/%%PORTNAME%%/Plug-ins/ASpellPlugin.so
+lib/%%PORTNAME%%/Plug-ins/CRAMMD5Plugin.so
+lib/%%PORTNAME%%/Plug-ins/CommunicatorAdbkIOPlugin.so
+lib/%%PORTNAME%%/Plug-ins/DIGESTMD5Plugin.so
+lib/%%PORTNAME%%/Plug-ins/Eudora4AdbkIOPlugin.so
+lib/%%PORTNAME%%/Plug-ins/EudoraAdbkIOPlugin.so
+lib/%%PORTNAME%%/Plug-ins/GPGPlugin.so
+lib/%%PORTNAME%%/Plug-ins/GSSAPIPlugin.so
+lib/%%PORTNAME%%/Plug-ins/ISpellPlugin.so
+lib/%%PORTNAME%%/Plug-ins/NTLMPlugin.so
+lib/%%PORTNAME%%/Plug-ins/NetscapeAdbkIOPlugin.so
+lib/%%PORTNAME%%/Plug-ins/PineAdbkIOPlugin.so
+lib/%%PORTNAME%%/Plug-ins/QuickmailAdbkIOPlugin.so
+lib/%%PORTNAME%%/Plug-ins/SMIMEPlugin.so
+lib/%%PORTNAME%%/Plug-ins/SSLPlugin.so
+lib/%%PORTNAME%%/Plug-ins/Timezones/vtimezones.ics
+lib/%%PORTNAME%%/Plug-ins/vCardAdbkIOPlugin.so
+lib/%%PORTNAME%%/Resources/Alerts.xml
+lib/%%PORTNAME%%/Resources/ComponentDescriptions.xml
+lib/%%PORTNAME%%/Resources/DateTimeStrings.xml
+lib/%%PORTNAME%%/Resources/ErrorDialog.xml
+lib/%%PORTNAME%%/Resources/MacOS.xml
+lib/%%PORTNAME%%/Resources/Preferences.xml
+lib/%%PORTNAME%%/Resources/ProtocolErrors.xml
+lib/%%PORTNAME%%/Resources/Status.xml
+lib/%%PORTNAME%%/Resources/Strings.xml
+lib/%%PORTNAME%%/Resources/Toolbars.xml
+lib/%%PORTNAME%%/Resources/UI.xml
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-DEV
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-DEV-v3
@@ -39,7 +34,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-v3
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-v4
 %%PORTDOCS%%%%DOCSDIR%%/Mulberry_License
+share/pixmaps/%%PORTNAME%%.png
+share/pixmaps/%%PORTNAME%%.xpm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-share/pixmaps/mulberry.png
-share/pixmaps/mulberry.xpm
+ at dirrm lib/%%PORTNAME%%/Plug-ins/Timezones
+ at dirrm lib/%%PORTNAME%%/Plug-ins
+ at dirrm lib/%%PORTNAME%%/Resources
+ at dirrm lib/%%PORTNAME%%
 @dirrmtry share/pixmaps
--- patch-pkg-plist ends here ---

--- mulberry-start.in begins here ---
# Mulberry-start script 
# Make sure user has sourced the Resources directoyr
# then start mulberry

# Check to see if user is running as root
# and warn and exit if user is root
ID=`id | cut -d'=' -f2 | cut -d'(' -f1`

if [ ${ID} = 0 ]; then
  echo "Do not run this script as root!"
  echo "Run it under your user id."
  exit 1
else
  HOMEDIR=~
fi

if [ ! -d ${HOMEDIR}/.%%PORTNAME%% ]; then
  /bin/mkdir ${HOMEDIR}/.%%PORTNAME%%
fi

if [ ! -d ${HOMEDIR}/.%%PORTNAME%%/Resources ]; then
  /bin/mkdir ${HOMEDIR}/.%%PORTNAME%%/Resources
  ln -s %%PREFIX%%/lib/%%PORTNAME%%/Resources/* ${HOMEDIR}/.%%PORTNAME%%/Resources/
fi

/usr/local/bin/mulberry
--- mulberry-start.in ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list