- Update to Version 3.5.1

- Fixed the build error on i386

PR:		ports/70779
Submitted by:	Gerrit Beine (maintainer)

3 files changed, 21 insertions, 53 deletions

diff --git a/devel/zendstudio/Makefile b/devel/zendstudio/Makefile
index cf673c692cb8..c03267bda7ef 100644
--- a/devel/zendstudio/Makefile
+++ b/devel/zendstudio/Makefile
@@ -6,28 +6,31 @@
 #
 
 PORTNAME=	ZendStudio
-PORTVERSION=	3.5.0
+PORTVERSION=	3.5.1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
-
+MASTER_SITES=	http://www.zend.com/store/products/zend-studio.php
 MAINTAINER=	tux@pinguru.net
 COMMENT=	A PHP IDE
 
+USE_LINUX=	yes
 NO_BUILD=	yes
 RESTRICTED=	"Redistribution is not permitted"
-
-USE_LINUX=	yes
+NO_PACKAGES=	${RESTRICTED}
+NO_CDROM=	${RESTRICTED}
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTFILES})
-ECHO_MSG=	/usr/bin/printf
-IGNORE=		:\nBecause of licensing restrictions, you must fetch the source distribution\nmanually. Please access http://www.zend.com/store/products/zend-studio.php\nwith a web browser and follow the \"Free Evaluation\" link.\nYou have to register for using ZendStudio.\nAfter download the file, place it into ${DISTDIR}\n
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+ECHO_MSG=/usr/bin/printf
+IGNORE= :\n\
+Because of licensing restrictions, you must fetch the distribution manually.\n\
+Please visit ${MASTER_SITES}\n\
+and follow the \"Free Evaluation\" link.\n\
+You have to register for using ZendStudio.\n\
+After downloading the Client-package \"Linux glibc2.1\", place it into ${DISTDIR}.\n
 .endif
 
-dd:
-		@${ECHO} ${DISTNAME}
-
 pre-install:
 	@if [ "`/sbin/mount | ${GREP} ^linprocfs`" = "" ]; \
 		then \
diff --git a/devel/zendstudio/distinfo b/devel/zendstudio/distinfo
index 34d66204cd67..20a4ba5cb8a0 100644
--- a/devel/zendstudio/distinfo
+++ b/devel/zendstudio/distinfo
@@ -1,2 +1,2 @@
-MD5 (ZendStudio-3_5_0.tar.gz) = 8b67307947982484fd1628ef4adddf2f
-SIZE (ZendStudio-3_5_0.tar.gz) = 41063966
+MD5 (ZendStudio-3_5_1.tar.gz) = df3afa3ae95e8ed88e9414dd178ef9d6
+SIZE (ZendStudio-3_5_1.tar.gz) = 41799172
diff --git a/devel/zendstudio/pkg-plist b/devel/zendstudio/pkg-plist
index 7f7a5cccede7..50e7b2a0d50d 100644
--- a/devel/zendstudio/pkg-plist
+++ b/devel/zendstudio/pkg-plist
@@ -609,11 +609,8 @@ Zend/bin/ZDE.lax
 Zend/bin/ZSC
 Zend/bin/ZSC.lax
 Zend/bin/ZendIDE.jar
-Zend/bin/jniwrap-2.2.jar
-Zend/bin/jniwrap.dll
 Zend/bin/jhall.jar
 Zend/bin/sftp.jar
-Zend/bin/jniwrap.lic
 Zend/bin/MRJToolkitStubs.zip
 Zend/bin/cvs
 Zend/bin/ZendCodeAnalyzer
@@ -632,6 +629,7 @@ Zend/bin/examples/debugdemo/white.gif
 Zend/bin/ZendIDE.config
 Zend/bin/phpFunctions.php
 Zend/bin/phpFunctions4.php
+Zend/bin/runStudio_unix.sh
 Zend/bin/php4/php
 Zend/bin/php4/php.ini
 Zend/bin/php4/dummy.php
@@ -642,25 +640,20 @@ Zend/lib/php4/ZendDebuggerLocal.so
 Zend/lib/php5/ZendDebuggerLocal.so
 Zend/README
 Zend/UninstallerData/uninstaller.jar
-Zend/UninstallerData/Uninstall_Zend_Studio_3.5.0_Client
-Zend/UninstallerData/Uninstall_Zend_Studio_3.5.0_Client.lax
+Zend/UninstallerData/Uninstall_Zend_Studio_3.5.1_Client
+Zend/UninstallerData/Uninstall_Zend_Studio_3.5.1_Client.lax
 Zend/UninstallerData/InstallScript.iap_xml
 Zend/UninstallerData/.com.zerog.registry.xml
 Zend/UninstallerData/installvariables.properties
 Zend/help/HTML/Accessing_Files.htm
 Zend/help/HTML/Adding_an_FTP_Root.htm
-Zend/help/HTML/Alphabetical_List_of_Directives.htm
 Zend/help/HTML/Analyzing_Code.htm
 Zend/help/HTML/Analyzing_Profiling_Results.htm
 Zend/help/HTML/Analyzing_Profiling_Results_.htm
 Zend/help/HTML/Assigning_a_New_Value_to_a_Variable.htm
-Zend/help/HTML/Assigning_a_Value_to_a_Watch.htm
 Zend/help/HTML/Bookmarks_(set,_demote,_go).htm
-Zend/help/HTML/Bookmarks_(set,_demote,_go).htm.tmp.htm
 Zend/help/HTML/Call_Trace_Tab.htm
-Zend/help/HTML/Changing_Colors1.htm
 Zend/help/HTML/Clone_View.htm
-Zend/help/HTML/Code_Completion.htm
 Zend/help/HTML/Code_Completion1.htm
 Zend/help/HTML/Code_Introspecting.htm
 Zend/help/HTML/Code_Navigation.htm
@@ -677,22 +670,18 @@ Zend/help/HTML/Configuring_the_KeyMap1.htm
 Zend/help/HTML/Controlling_Program_Flow_.htm
 Zend/help/HTML/Creating_and_Monitoring_Watches.htm
 Zend/help/HTML/Customizing_CVS_Integration.htm
-Zend/help/HTML/Customizing_KeyMaps.htm
 Zend/help/HTML/Customizing_the_Desktop.htm
 Zend/help/HTML/Customizing_the_Desktop1.htm
 Zend/help/HTML/Customizing_the_Desktop2.htm
-Zend/help/HTML/Debug_Toolbar_Y2_.htm
 Zend/help/HTML/Debug_URL.htm
 Zend/help/HTML/Debug_Window.htm
 Zend/help/HTML/Debugging.htm
-Zend/help/HTML/Debugging_Methods.htm
 Zend/help/HTML/Defining_an_other_file_for_the_Filter.htm
 Zend/help/HTML/Editing.htm
 Zend/help/HTML/Editing1.htm
 Zend/help/HTML/Editor.htm
 Zend/help/HTML/Enabling_Disabling_Dialogs.htm
 Zend/help/HTML/Enabling_SFTP.htm
-Zend/help/HTML/Enabling_SFTP.htm.tmp.htm
 Zend/help/HTML/Encoding_Applications.htm
 Zend/help/HTML/File_Manager.htm
 Zend/help/HTML/File_Types_Adding,_Modifying,_Removing1.htm
@@ -701,17 +690,12 @@ Zend/help/HTML/Finding_Matching_Brackets.htm
 Zend/help/HTML/FirstTopic.htm
 Zend/help/HTML/Forward_Backward_Navigation.htm
 Zend/help/HTML/Function_Profiling_View.htm
-Zend/help/HTML/HTML_Code_Completion.htm
 Zend/help/HTML/JAVAHELP.CSS
 Zend/help/HTML/Highlighted_Features_and_Benefits.htm
 Zend/help/HTML/Indenting_Code.htm
 Zend/help/HTML/Inserting_HTML_Tags.htm
-Zend/help/HTML/Inserting_a_Template.htm
 Zend/help/HTML/Inspecting_Files.htm
 Zend/help/HTML/Inspecting_Projects.htm
-Zend/help/HTML/Integrated_Performance_Profiler.htm
-Zend/help/HTML/Introducing_Zend_Studio.htm
-Zend/help/HTML/List_of_Files_View.htm
 Zend/help/HTML/Local_Debugger.htm
 Zend/help/HTML/Main_Screen.htm
 Zend/help/HTML/Managing_a_Project_.htm
@@ -720,17 +704,13 @@ Zend/help/HTML/Monitoring_Program_State_.htm
 Zend/help/HTML/New_in_Version_3.xxx.htm
 Zend/help/HTML/Output_Window.htm
 Zend/help/HTML/Overview.htm
-Zend/help/HTML/Overview1.htm
 Zend/help/HTML/Overview2.htm
-Zend/help/HTML/Overview__Zend_Studio_Workplace_.htm
 Zend/help/HTML/PHP_Code_Completion.htm
 Zend/help/HTML/PHP_Settings.htm
 Zend/help/HTML/Preferences_.htm
 Zend/help/HTML/Profiling.htm
-Zend/help/HTML/Profiling_Methods.htm
 Zend/help/HTML/Quick_Start.htm
 Zend/help/HTML/Remote_Debugging.htm
-Zend/help/HTML/Restoring_Defaults.htm
 Zend/help/HTML/Reviewing_Variables_Assigning_Values_to_Variables.htm
 Zend/help/HTML/Running_Debug_URL.htm
 Zend/help/HTML/Searching_.htm
@@ -745,24 +725,11 @@ Zend/help/HTML/Setting_CVS_Properties1.htm
 Zend/help/HTML/Setting_Debug_Options.htm
 Zend/help/HTML/Setting_Project_Properties.htm
 Zend/help/HTML/Setting_Server_Components_.htm
-Zend/help/HTML/Summary_of_the_Quick_Start.htm
 Zend/help/HTML/Syntax_Highlighting.htm
-Zend/help/HTML/Templates_Adding,_Editing,_Removing.htm
-Zend/help/HTML/Templates_Adding,_Editing,_Removing1.htm
-Zend/help/HTML/The_Call_Trace_Tab.htm
-Zend/help/HTML/The_Files_and_Functions_Tab_(Table_View).htm
 Zend/help/HTML/The_Profiler_Information_Tab.htm
-Zend/help/HTML/The_Profiler_Interface.htm
-Zend/help/HTML/To_Add_Quick_HTML_Tags.htm
-Zend/help/HTML/To_Create_a_New_Project_Definition_File.htm
-Zend/help/HTML/To_Duplicate_the_Editing_Window_(Clone_View).htm
 Zend/help/HTML/To_Enable_Disable_Remote_Debugging.htm
 Zend/help/HTML/Toolbar.htm
 Zend/help/HTML/Using_FTP.htm
-Zend/help/HTML/To_Restore_Default_Settings_for_the_Active_tab.htm
-Zend/help/HTML/To_Restore_a_Customization_Setting_to_the_Default.htm
-Zend/help/HTML/To_run_the_Profiler_.htm
-Zend/help/HTML/To_View_the_Current_PHP_Settings.htm
 Zend/help/HTML/Tracking_the_Stack.htm
 Zend/help/HTML/Usability_Shortcuts_Timesavers.htm
 Zend/help/HTML/Using_Breakpoints.htm
@@ -779,18 +746,15 @@ Zend/help/HTML/Zend_Safeguard_Suite_.htm
 Zend/help/HTML/Zend_Studio_Components.htm
 Zend/help/HTML/Zend_Studio_Server.htm
 Zend/help/HTML/Zend_Studio_Workflow.htm
-Zend/help/HTML/Zend_Studio_Workflow.htm.tmp.htm
 Zend/help/HTML/Zend_Studio_Workplace.htm
-Zend/help/HTML/_Profiling_Toolbars.htm
 Zend/help/HTML/_Profiling_URL.htm
 Zend/help/HTML/Creating_and_Monitoring_Watches_files/CVS_DIFF_Tab.htm
-Zend/help/HTML/Creating_and_Monitoring_Watches_files/Create_and_Monitor_a_Watche.htm
+Zend/help/HTML/Creating_and_Monitoring_Watches_files/HTML_Code_Completion.htm
 Zend/help/HTML/Creating_and_Monitoring_Watches_files/JAVAHELP.CSS
 Zend/help/HTML/Creating_and_Monitoring_Watches_files/Studio_Client_List_of_Topics.htm
 Zend/help/HTML/Creating_and_Monitoring_Watches_files/Templates.htm
 Zend/help/HTML/Creating_and_Monitoring_Watches_files/Using_CVS_DIFF.htm
 Zend/help/HTML/Creating_and_Monitoring_Watches_files/Zend_Studio_Client_Online.htm
-Zend/help/HTML/Creating_and_Monitoring_Watches_files/Zend_Studio_Client_Online_Help.htm
 Zend/help/JAVAHELP.CSS
 Zend/help/indexer.cfg
 Zend/help/indexer.log
@@ -1141,7 +1105,8 @@ Zend/help/JavaHelpSearch/POSITIONS
 Zend/help/JavaHelpSearch/OFFSETS
 Zend/help/JavaHelpSearch/SCHEMA
 Zend/help/JavaHelpSearch/TMAP
-Zend/Zend_Studio_3.5.0_(Client)_InstallLog.xml
+Zend/FullFeatureList.txt
+Zend/Zend_Studio_3.5.1_(Client)_InstallLog.xml
 @dirrm Zend/jre/bin
 @dirrm Zend/jre/lib/applet
 @dirrm Zend/jre/lib/i386/native_threads