4 files changed, 87 insertions, 6 deletions

diff --git a/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in b/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in
index f2ecffdce476..a4ba55ad46d4 100644
--- a/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in
+++ b/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in
@@ -1,13 +1,13 @@
---- platforms/unix/npsqueak/npsqueakregister.in.orig	Mon Jan 30 19:47:54 2006
-+++ platforms/unix/npsqueak/npsqueakregister.in	Mon Jan 30 19:48:13 2006
+--- platforms/unix/npsqueak/npsqueakregister.in.orig	Sun Mar 20 05:38:26 2005
++++ platforms/unix/npsqueak/npsqueakregister.in	Fri Oct  6 21:02:25 2006
 @@ -8,8 +8,8 @@
  # Parameters:  -u unregister
  
  NPSQUEAK_SO=@NPSQUEAK_SO@
--BROWSERS="netscape mozilla opera"
--BROWSER_DIRS="/usr/local/lib /usr/lib"
+-BROWSERS="netscape mozilla mozilla-firefox opera MozillaFirefox/lib"
+-BROWSER_DIRS="/usr/local/lib /usr/lib /opt"
 +BROWSERS="netscape mozilla firefox opera seamonkey"
-+BROWSER_DIRS="%%X11BASE%%/lib %%X11BASE%%/share %%LOCALBASE%%/lib /usr/lib"
++BROWSER_DIRS="%%X11BASE%%/lib %%X11BASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib"
+ SYSTEM_BROWSER_DIR="/usr/lib/browser-plugins"
  
  ACTION=register
- 
diff --git a/lang/squeak/files/patch-platforms__unix__config__inisqueak.in b/lang/squeak/files/patch-platforms__unix__config__inisqueak.in
new file mode 100644
index 000000000000..f756bee6026e
--- /dev/null
+++ b/lang/squeak/files/patch-platforms__unix__config__inisqueak.in
@@ -0,0 +1,23 @@
+--- platforms/unix/config/inisqueak.in.org	Mon Feb  6 15:10:05 2006
++++ platforms/unix/config/inisqueak.in	Mon Feb  6 15:10:58 2006
+@@ -99,7 +99,7 @@
+   exit 1
+ }
+ 
+-if ${test} \( -f squeak.image \) -a \( -f squeak.changes \) -a \( -e ${SOURCES} \)
++if ${test} \( -f squeak.image \) -a \( -e ${SOURCES} \)
+ then
+   if ${startup}; then
+     if test ! -x ${SQUEAK}; then
+@@ -200,7 +200,10 @@
+ 
+ install "ln -s"      "${imgdir}/${SOURCES}" " " "${SOURCES}"
+ install "gunzip -dc" "${imgdir}/${IMAGE}"   ">" "squeak.image"
+-install "gunzip -dc" "${imgdir}/${CHANGES}" ">" "squeak.changes"
++# For SqueakPlugin.image which don't have changes file.
++if test -e "${imgdir}/${CHANGES}"; then
++  install "gunzip -dc" "${imgdir}/${CHANGES}" ">" "squeak.changes"
++fi
+ 
+ if ${startup}; then
+   if test ! -x ${SQUEAK}; then
diff --git a/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueak.c b/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueak.c
new file mode 100644
index 000000000000..20eddcbb168b
--- /dev/null
+++ b/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueak.c
@@ -0,0 +1,20 @@
+--- platforms/unix/npsqueak/npsqueak.c.orig	Sun Mar 20 05:38:26 2005
++++ platforms/unix/npsqueak/npsqueak.c	Sat Oct  7 19:56:10 2006
+@@ -177,13 +177,16 @@
+ findFileInPaths(char* result, char *filename, int dirn, char *dirv[PATH_MAX]){
+   int i;
+   char path[PATH_MAX];
++  char gzipedpath[PATH_MAX];
+ 
+   for(i= 0; i < dirn; i++){
+     DPRINT("NP: search \"%s\" in \"%s\" \n",filename,dirv[i]);
+ 
+     strcpy(path, dirv[i]);
+     strcat(path, filename); 
+-    if (access(path, R_OK) == 0){ 
++    strcpy(gzipedpath, path);
++    strcat(gzipedpath, ".gz");
++    if (access(path, R_OK) == 0 || access(gzipedpath, R_OK) == 0){ 
+       DPRINT("NP:  \"%s\" in \"%s\" found\n",filename,dirv[i]);
+       return strcpy(result, path);
+     }
diff --git a/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueakrun.in b/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueakrun.in
new file mode 100644
index 000000000000..0a6058b52ab4
--- /dev/null
+++ b/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueakrun.in
@@ -0,0 +1,38 @@
+--- platforms/unix/npsqueak/npsqueakrun.in.orig	Sun Mar 20 05:38:26 2005
++++ platforms/unix/npsqueak/npsqueakrun.in	Sun Jan  7 16:30:12 2007
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#! %%LOCALBASE%%/bin/bash
+ 
+ # File:        npsqueakrun
+ # Author:      Bert Freudenberg
+@@ -60,12 +60,24 @@
+ ensurefile()
+ {
+     if [ ! -e "${1}" ] ; then
+-	if cp "${2}" "${1}" ; then
+-	    pdebug "Created ${1}"
++	if [ -e "${2}" ] ;then
++	    if cp "${2}" "${1}" ; then
++		pdebug "Created ${1}"
++	    else
++		perror "Could not create ${1}"
++		if [ ! -r "${2}" ] ; then
++		    perror "because ${2} is missing"
++		fi
++	    fi
+ 	else
+-	    perror "Could not create ${1}"
+-	    if [ ! -r "${2}" ] ; then
+-		perror "because ${2} is missing"
++	    if [ -e "${2}.gz" ] ; then
++		gunzip -c "${2}.gz" > "${1}"
++		pdebug "Created ${1} from ${2}.gz"
++	    else
++		perror "Could not create ${1}"
++		if [ ! -r "${2}" ] ; then
++		    perror "because ${2} is missing"
++		fi
+ 	    fi
+ 	fi
+     fi