3 files changed, 31 insertions, 27 deletions

diff --git a/deskutils/sugarcrm/Makefile b/deskutils/sugarcrm/Makefile
index b5e0a19524df..9c1bd7f46728 100644
--- a/deskutils/sugarcrm/Makefile
+++ b/deskutils/sugarcrm/Makefile
@@ -5,14 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	sugarcrm
-PORTVERSION=	4.5.1
+PORTVERSION=	4.5.1b
 CATEGORIES=	deskutils www
-MASTER_SITES=	${SCRM_DISPATCHER}/SugarOS4.5.1Latest/SugarOS4.5.1/:src \
-		${DOC_DISPATCHER}/User_Guides/Sugar_Open_Source_User_Guide_4.5.1/:userdoc \
-		${DOC_DISPATCHER}/Administration_Guides/Sugar_Open_Source_Administration_Guide_4.5.1/:admindoc \
-		${DOC_DISPATCHER}/Installation_Guides/Sugar_Open_Source_Installation_Guide_4.5.1/:installdoc
+MASTER_SITES=	${SCRM_DISPATCHER}/:src \
+		${DOC_DISPATCHER}/:userdoc \
+		${DOC_DISPATCHER}/:admindoc \
+		${DOC_DISPATCHER}/:releasenotesdoc
 DISTFILES=	${USERDOCFILE}:userdoc \
-		${INSTALLDOCFILE}:installdoc \
+		${RELEASENOTESFILE}:releasenotesdoc \
 		${ADMINDOCFILE}:admindoc \
 		${SRCNAME}${EXTRACT_SUFX}:src
 DIST_SUBDIR=	${PORTNAME}
@@ -34,13 +34,13 @@ OPTIONS=	IMAP "Install with IMAP module (For email campaign support)" on
 USE_PHP+=	imap
 .endif
 
-SCRM_DISPATCHER=	http://dl.sugarforge.org/sugarcrm
-DOC_DISPATCHER=		http://www.sugarcrm.com/network/help/OS/4.5.1
+SCRM_DISPATCHER=	http://dl.sugarforge.org/sugarcrm/SugarOS4.5.1Latest/SugarOS4.5.1
+DOC_DISPATCHER=		${SCRM_DISPATCHER}
 
 SRCNAME=	SugarOS-${PORTVERSION}
-USERDOCFILE=	Sugar_OpenSource_UserGuide_4.5.1.pdf
-INSTALLDOCFILE=	OpenSource_InstallationGuide_4.5.1.pdf
-ADMINDOCFILE=	Sugar_OpenSource_AdministrationGuide_4.5.1.pdf
+USERDOCFILE=	Sugar_OpenSource_UserGuide_${PORTVERSION}.pdf
+RELEASENOTESFILE= Sugar_OpenSource_ReleaseNotes_${PORTVERSION}.pdf
+ADMINDOCFILE=	Sugar_OpenSource_AdministrationGuide_${PORTVERSION}.pdf
 
 INSTFILES=	HandleAjaxCall.php SugarSecurity.php TreeData.php \
 		WebToLeadCapture.php acceptDecline.php campaign_tracker.php \
@@ -70,7 +70,7 @@ PLIST_SUB+=	SUGARCRMDIR="${SUGARCRMDIR}" \
 		WWWOWN="${WWWOWN}" \
 		WWWFILES="${WWWFILES}" \
 		USERDOCFILE="${USERDOCFILE}" \
-		INSTALLDOCFILE="${INSTALLDOCFILE}"
+		RELEASENOTESFILE="${RELEASENOTESFILE}"
 
 do-install:
 	@${MKDIR} ${PREFIX}/${SUGARCRMDIR}
@@ -90,8 +90,8 @@ do-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${USERDOCFILE} \
 		${DOCSDIR}/${USERDOCFILE}
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${INSTALLDOCFILE} \
-		${DOCSDIR}/${INSTALLDOCFILE}
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RELEASENOTESFILE} \
+		${DOCSDIR}/${RELEASENOTESFILE}
 .for i in ${INSTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
diff --git a/deskutils/sugarcrm/distinfo b/deskutils/sugarcrm/distinfo
index e37b14750eb3..b99f43d3b074 100644
--- a/deskutils/sugarcrm/distinfo
+++ b/deskutils/sugarcrm/distinfo
@@ -1,12 +1,12 @@
-MD5 (sugarcrm/Sugar_OpenSource_UserGuide_4.5.1.pdf) = 51f9e3b1024aa0e1f32d68dbed08b0b8
-SHA256 (sugarcrm/Sugar_OpenSource_UserGuide_4.5.1.pdf) = 75ed3a7af58f06bdc8223ebfaa4b54b9bd311931f8c9aafaf2e35a79d6b6d36d
-SIZE (sugarcrm/Sugar_OpenSource_UserGuide_4.5.1.pdf) = 2232044
-MD5 (sugarcrm/OpenSource_InstallationGuide_4.5.1.pdf) = 79e84920afd31e6cf8686c0494e4d899
-SHA256 (sugarcrm/OpenSource_InstallationGuide_4.5.1.pdf) = 52c8a6ead090612dc574edb9fd4daa977653f4ce829007dad6e231d6d01daf10
-SIZE (sugarcrm/OpenSource_InstallationGuide_4.5.1.pdf) = 623611
-MD5 (sugarcrm/Sugar_OpenSource_AdministrationGuide_4.5.1.pdf) = 7bdc7f07b544530274b659fa96555603
-SHA256 (sugarcrm/Sugar_OpenSource_AdministrationGuide_4.5.1.pdf) = e6439e0efab7983aeed53d45eb0bfbcbe9eef2be390c8e1eece8604ec9f4ec36
-SIZE (sugarcrm/Sugar_OpenSource_AdministrationGuide_4.5.1.pdf) = 1314490
-MD5 (sugarcrm/SugarOS-4.5.1.zip) = 7b854f97e7084f012fbf44894661859f
-SHA256 (sugarcrm/SugarOS-4.5.1.zip) = 595ff1cc5fd672d88560b045a4503a81b843419261e0bb9117245e13b79708b5
-SIZE (sugarcrm/SugarOS-4.5.1.zip) = 10366024
+MD5 (sugarcrm/Sugar_OpenSource_UserGuide_4.5.1b.pdf) = f97794476f72d0ec0e8aea4a52573717
+SHA256 (sugarcrm/Sugar_OpenSource_UserGuide_4.5.1b.pdf) = 8cb232aecea981cd6d8383acf6b919f046e627ae6d830f0c81ad5e106bf3e3c7
+SIZE (sugarcrm/Sugar_OpenSource_UserGuide_4.5.1b.pdf) = 2361712
+MD5 (sugarcrm/Sugar_OpenSource_ReleaseNotes_4.5.1b.pdf) = 6968013346accc126fd3ae0044d6afa1
+SHA256 (sugarcrm/Sugar_OpenSource_ReleaseNotes_4.5.1b.pdf) = 7bbffba3dc9b0f35daf80211b4f31336eb52850693b3bbf4bf018a288073155f
+SIZE (sugarcrm/Sugar_OpenSource_ReleaseNotes_4.5.1b.pdf) = 232864
+MD5 (sugarcrm/Sugar_OpenSource_AdministrationGuide_4.5.1b.pdf) = 67b9ff212bb982e8644c9a11223fb4c8
+SHA256 (sugarcrm/Sugar_OpenSource_AdministrationGuide_4.5.1b.pdf) = 02e4da222f659d995826f07d69f40a643cdf91767448be6fecf4de985729f060
+SIZE (sugarcrm/Sugar_OpenSource_AdministrationGuide_4.5.1b.pdf) = 1377954
+MD5 (sugarcrm/SugarOS-4.5.1b.zip) = b43ec3e906eac8385874d689cae1574e
+SHA256 (sugarcrm/SugarOS-4.5.1b.zip) = 5711be992bb205478fd8a3eae23414ce5bd8f01edbc9aa0c87fb6104e2c65b0e
+SIZE (sugarcrm/SugarOS-4.5.1b.zip) = 10405588
diff --git a/deskutils/sugarcrm/pkg-plist b/deskutils/sugarcrm/pkg-plist
index be8a0bf16336..3ace7870837f 100644
--- a/deskutils/sugarcrm/pkg-plist
+++ b/deskutils/sugarcrm/pkg-plist
@@ -549,6 +549,7 @@
 %%SUGARCRMDIR%%/include/utils/external_cache.php
 %%SUGARCRMDIR%%/include/utils/user_utils.php
 %%SUGARCRMDIR%%/include/generic/SugarWidgets/SugarWidgetSubPanelConcat.php
+%%SUGARCRMDIR%%/include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignLogEntryButton.php
 %%SUGARCRMDIR%%/include/generic/SugarWidgets/SugarWidgetFielduser_name.php
 %%SUGARCRMDIR%%/include/generic/SugarWidgets/SugarWidgetSubPanelTopSummaryButton.php
 %%SUGARCRMDIR%%/include/generic/SugarWidgets/SugarWidgetSubPanelTopButtonQuickCreate.php
@@ -615,6 +616,7 @@
 %%SUGARCRMDIR%%/include/javascript/yui/assets/blck16_1.gif
 %%SUGARCRMDIR%%/include/javascript/yui/assets/close12_1.gif
 %%SUGARCRMDIR%%/include/javascript/yui/assets/hlp16_1.gif
+%%SUGARCRMDIR%%/include/javascript/yui/assets/rel_interstitial_loading.gif
 %%SUGARCRMDIR%%/include/javascript/yui/assets/reset.css
 %%SUGARCRMDIR%%/include/javascript/yui/assets/info16_1.gif
 %%SUGARCRMDIR%%/include/javascript/yui/ext/data/XMLChildDataModel.js
@@ -2285,6 +2287,7 @@
 %%SUGARCRMDIR%%/modules/Studio/ajax/relatedfiles.php
 %%SUGARCRMDIR%%/modules/Studio/ajax/editcustomfield.php
 %%SUGARCRMDIR%%/modules/Studio/ajax/customfieldview.php
+%%SUGARCRMDIR%%/modules/Studio/language/en_us.Portal.html
 %%SUGARCRMDIR%%/modules/Studio/language/en_us.help.wizard.html
 %%SUGARCRMDIR%%/modules/Studio/language/en_us.lang.php
 %%SUGARCRMDIR%%/modules/Studio/language/en_us.help.index.html
@@ -2377,6 +2380,7 @@
 %%SUGARCRMDIR%%/modules/ACL/install_actions.php
 %%SUGARCRMDIR%%/modules/ACL/vardefs.php
 %%SUGARCRMDIR%%/modules/ACL/Popup.php
+%%SUGARCRMDIR%%/modules/ACL/remove_actions.php
 %%SUGARCRMDIR%%/modules/ACL/test_actions.php
 %%SUGARCRMDIR%%/modules/Emails/Dashlets/MyEmailsDashlet/MyEmailsDashlet.meta.php
 %%SUGARCRMDIR%%/modules/Emails/Dashlets/MyEmailsDashlet/MyEmailsDashlet.php
@@ -7864,5 +7868,5 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE.TXT
 %%PORTDOCS%%%%DOCSDIR%%/%%USERDOCFILE%%
-%%PORTDOCS%%%%DOCSDIR%%/%%INSTALLDOCFILE%%
+%%PORTDOCS%%%%DOCSDIR%%/%%RELEASENOTESFILE%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%