4 files changed, 212 insertions, 19 deletions

diff --git a/net/xsmbrowser/Makefile b/net/xsmbrowser/Makefile
index 6ade07e16779..b0b4f6d217ba 100644
--- a/net/xsmbrowser/Makefile
+++ b/net/xsmbrowser/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	xsmbrowser
-PORTVERSION=	3.2
+PORTVERSION=	3.3.0
 CATEGORIES=	net
-MASTER_SITES=	http://www2.iastate.edu/~chadspen/
+MASTER_SITES=	http://www2.iastate.edu/~chadspen/ \
+		http://www.ibiblio.org/pub/Linux/system/network/samba/
 
 MAINTAINER=	roman@xpert.com
 
 RUN_DEPENDS=	${LOCALBASE}/bin/smbclient:${PORTSDIR}/net/samba \
 		${LOCALBASE}/bin/expectk:${PORTSDIR}/lang/expect
 
-RESTRICTED=	"Commercial software"
-
 do-build:
-	${PERL} -pi -e s!/etc!${PREFIX}/etc!g ${WRKSRC}/${PORTNAME}
-	${PERL} -pi -e 's!"Image Path = pixmaps"!"Image Path = ${PREFIX}/share/${PORTNAME}"!' ${WRKSRC}/${PORTNAME}
+	${PERL} -pi -e s!%%PREFIX%%!${PREFIX}!g ${WRKSRC}/xsmbrowser
 
 do-install:
-	${MKDIR} ${PREFIX}/share/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/* ${PREFIX}/share/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${MKDIR} ${PREFIX}/share/xsmbrowser
+	${MKDIR} ${PREFIX}/etc/xsmbrowser
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/* ${PREFIX}/share/xsmbrowser
+	${INSTALL_SCRIPT} ${WRKSRC}/xsmbrowser ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net/xsmbrowser/distinfo b/net/xsmbrowser/distinfo
index 5d49588a3439..09ea5f0979fd 100644
--- a/net/xsmbrowser/distinfo
+++ b/net/xsmbrowser/distinfo
@@ -1 +1 @@
-MD5 (xsmbrowser-3.2.tar.gz) = 7a46cea56628f16d5dc4d62a82a4b0d2
+MD5 (xsmbrowser-3.3.0.tar.gz) = 3cd232ca08fc5e53e3dd1b3dfb74dd33
diff --git a/net/xsmbrowser/files/patch-aa b/net/xsmbrowser/files/patch-aa
index 75c348d68329..fdaf383889a3 100644
--- a/net/xsmbrowser/files/patch-aa
+++ b/net/xsmbrowser/files/patch-aa
@@ -1,26 +1,219 @@
---- xsmbrowser.orig	Mon Dec  4 11:34:06 2000
-+++ xsmbrowser	Mon Dec  4 11:36:25 2000
-@@ -1,4 +1,4 @@
+--- xsmbrowser.orig	Sat Jan 20 04:09:53 2001
++++ xsmbrowser	Mon Jan 22 12:07:31 2001
+@@ -1,12 +1,12 @@
 -#!/usr/bin/expectk -f
-+#!/usr/local/bin/expectk -f
++#!%%PREFIX%%/bin/expectk -f
  # xSMBrowser - Samba GUI that emulates Network Neighborhood
- # Copyright (c) 2000 Chad Spencer
+ # You are free to modify this code under the GPL License
  
-@@ -6816,7 +6816,7 @@
+ # The following "default_pixmap_dir" specifies where xsmbrowser
+ # looks for the pixmaps the first time it starts ... i.e. this is
+ # only for people making rpm-type packages!
+-set default_pixmaps_dir "pixmaps"
+-# you might change this to /usr/share/pixmaps/xsmbrowser, for example
++set default_pixmaps_dir "%%PREFIX%%/share/xsmbrowser"
++# you might change this to %%PREFIX%%/share/xsmbrowser, for example
+ 
+ proc UserFileExist {} {
+ ##############################################
+@@ -25,7 +25,7 @@
+   set filequeue [file exists "~/.xsmbrowser-queue"]
+   if {$filemain == "0"} {
+     set userfile [open "~/.xsmbrowser-config" w 0600]
+-    puts $userfile "# Values defined in /etc/xsmbrowser-config take first priority."
++    puts $userfile "# Values defined in %%PREFIX%%/etc/xsmbrowser/xsmbrowser-config take first priority."
+     puts $userfile "#"
+     puts $userfile "Timeout = 90"
+     puts $userfile "Image Path = $default_pixmaps_dir"
+@@ -43,7 +43,7 @@
+   }
+   if {$filenets == "0"} {
+     set userfile [open "~/.xsmbrowser-networks" w 0600]
+-    puts $userfile "# Networks in /etc/xsmbrowser-networks are read first."
++    puts $userfile "# Networks in %%PREFIX%%/etc/xsmbrowser/xsmbrowser-networks are read first."
+     puts $userfile "#"
+     puts $userfile ":Samba Config"
+     puts $userfile "Type = broadcast"
+@@ -63,7 +63,7 @@
+   }
+   if {$filefavs == "0"} {
+     set userfile [open "~/.xsmbrowser-favorites" w 0600]
+-    puts $userfile "# Favorites and mounts in /etc/xsmbrowser-favorites are read first."
++    puts $userfile "# Favorites and mounts in %%PREFIX%%/etc/xsmbrowser/xsmbrowser-favorites are read first."
+     puts $userfile "#"
+     puts $userfile ":Your Computer"
+     puts $userfile "Type = ip_only"
+@@ -94,7 +94,7 @@
+   }
+   if {$filecommands == "0"} {
+     set userfile [open "~/.xsmbrowser-commands" w 0600]
+-    puts $userfile "# Commands in /etc/xsmbrowser-commands are read first."
++    puts $userfile "# Commands in %%PREFIX%%/etc/xsmbrowser/xsmbrowser-commands are read first."
+     puts $userfile "#"
+     puts $userfile ":Netscape"
+     puts $userfile "Types = .HTM .HTML .SHTML"
+@@ -1114,6 +1114,9 @@
+   if {[file exists "/etc/smb.conf"] != "0"} {
+     puts "Reading /etc/smb.conf ..."
+     set userfile [open "/etc/smb.conf" r]
++  } elseif {[file exists "/usr/local/etc/smb.conf"] != "0"} {
++    puts "Reading /usr/local/etc/smb.conf ..."
++    set userfile [open "/usr/local/etc/smb.conf" r]
+   } elseif {[file exists "/usr/local/samba/etc/smb.conf"] != "0"} {
+     puts "Reading /usr/local/samba/etc/smb.conf ..."
+     set userfile [open "/usr/local/samba/etc/smb.conf" r]
+@@ -1207,8 +1210,8 @@
+     set global_exist "yes"
+     gets $userfile line
+   } else {
+-    if [file exists /etc/xsmbrowser-config] {
+-      set userfile [open "/etc/xsmbrowser-config" r]
++    if [file exists %%PREFIX%%/etc/xsmbrowser/xsmbrowser-config] {
++      set userfile [open "%%PREFIX%%/etc/xsmbrowser/xsmbrowser-config" r]
+       set global_exist "yes"
+       gets $userfile line
+     }
+@@ -1255,8 +1258,8 @@
+     gets $userfile line
+     set m $file_place(networks_m)
+   } else {
+-    if [file exists /etc/xsmbrowser-networks] {
+-      set userfile [open "/etc/xsmbrowser-networks" r]
++    if [file exists %%PREFIX%%/etc/xsmbrowser/xsmbrowser-networks] {
++      set userfile [open "%%PREFIX%%/etc/xsmbrowser/xsmbrowser-networks" r]
+       set global_exist "yes"
+       gets $userfile line
+     }
+@@ -1328,8 +1331,8 @@
+     set m $file_place(favorites_m)
+     set p $file_place(mount_fav_m)
+   } else {
+-    if [file exists /etc/xsmbrowser-favorites] {
+-      set userfile [open "/etc/xsmbrowser-favorites" r]
++    if [file exists %%PREFIX%%/etc/xsmbrowser/xsmbrowser-favorites] {
++      set userfile [open "%%PREFIX%%/etc/xsmbrowser/xsmbrowser-favorites" r]
+       set global_exist "yes"
+       gets $userfile line
+     }
+@@ -1423,8 +1426,8 @@
+     gets $userfile line
+     set m $file_place(commands_m)
+   } else {
+-    if [file exists /etc/xsmbrowser-commands] {
+-      set userfile [open "/etc/xsmbrowser-commands" r]
++    if [file exists %%PREFIX%%/etc/xsmbrowser/xsmbrowser-commands] {
++      set userfile [open "%%PREFIX%%/etc/xsmbrowser/xsmbrowser-commands" r]
+       set global_exist "yes"
+       gets $userfile line
+     }
+@@ -1475,7 +1478,7 @@
+   global env_name
+   puts "Writing config (.xsmbrowser-*) ..."
+   set userfile [open "~/.xsmbrowser-config" w]
+-  puts $userfile "# Values defined in /etc/xsmbrowser-config take first priority."
++  puts $userfile "# Values defined in %%PREFIX%%/etc/xsmbrowser/xsmbrowser-config take first priority."
+   puts $userfile "#"
+   if {$user_name_default != ""} {
+     puts $userfile "Username = $user_name_default"
+@@ -1493,7 +1496,7 @@
+   puts $userfile "EOF"
+   close $userfile
+   set userfile [open "~/.xsmbrowser-networks" w]
+-  puts $userfile "# Networks in /etc/xsmbrowser-networks are read first."
++  puts $userfile "# Networks in %%PREFIX%%/etc/xsmbrowser/xsmbrowser-networks are read first."
+   puts $userfile "#"
+   if {[array exists networks_m] == 1} {
+     set m [expr 1 + $file_place(networks_m)]
+@@ -1531,7 +1534,7 @@
+   puts $userfile "EOF"
+   close $userfile
+   set userfile [open "~/.xsmbrowser-favorites" w]
+-  puts $userfile "# Favorites and mounts in /etc/xsmbrowser-favorites are read first."
++  puts $userfile "# Favorites and mounts in %%PREFIX%%/etc/xsmbrowser/xsmbrowser-favorites are read first."
+   puts $userfile "#"
+   if {[array exists favorites_m] == 1} {
+     set m [expr 1 + $file_place(favorites_m)]
+@@ -1597,7 +1600,7 @@
+   puts $userfile "EOF"
+   close $userfile
+   set userfile [open "~/.xsmbrowser-commands" w]
+-  puts $userfile "# Commands in /etc/xsmbrowser-commands are read first."
++  puts $userfile "# Commands in %%PREFIX%%/etc/xsmbrowser/xsmbrowser-commands are read first."
+   puts $userfile "#"
+   if {[array exists commands_m] == 1} {
+     set m [expr 1 + $file_place(commands_m)]
+@@ -6717,7 +6720,7 @@
+     $helpwindow.text.area insert end " NOTE: I will not address networking problems with Samba! DO NOT send me\n"
+     $helpwindow.text.area insert end " an email saying \"My network is not working\" or \"Program reports that it\n"
+     $helpwindow.text.area insert end " can\'t find the Master Browser\". These are Samba problems, and you should\n"
+-    $helpwindow.text.area insert end " consult the Samba documentation (usually /usr/doc/samba) or the many\n"
++    $helpwindow.text.area insert end " consult the Samba documentation (usually %%PREFIX%%/share/doc/samba) or the many\n"
+     $helpwindow.text.area insert end " Samba newsgroups to solve your problem. Before you try these, however,\n"
+     $helpwindow.text.area insert end " make sure Samba (smbd and nmbd) is \"running\" on your computer.\n"
+     $helpwindow.text.area insert end "\n"
+@@ -6794,17 +6797,17 @@
+     $helpwindow.text.area insert end " When xSMBrowser is first started, it creates four important files in the\n"
+     $helpwindow.text.area insert end " home directory: \".xsmbrowser-config\", \".xsmbrowser-networks\",\n"
+     $helpwindow.text.area insert end " \".xsmbrowser-favorites\", and \".xsmbrowser-commands\". These files can be\n"
+-    $helpwindow.text.area insert end " made global to all users by placing them in the /etc directory (minus the\n"
+-    $helpwindow.text.area insert end " period, e.g. \"~/.xsmbrowser-config\" --> \"/etc/xsmbrowser-config\"). When\n"
+-    $helpwindow.text.area insert end " xSMBrowser starts, it will read both files in /etc and ~, but definitions\n"
+-    $helpwindow.text.area insert end " in /etc take precedence. To get the most flexibility from this, the\n"
++    $helpwindow.text.area insert end " made global to all users by placing them in the %%PREFIX%%/etc/xsmbrowser directory (minus the\n"
++    $helpwindow.text.area insert end " period, e.g. \"~/.xsmbrowser-config\" --> \"%%PREFIX%%/etc/xsmbrowser/xsmbrowser-config\"). When\n"
++    $helpwindow.text.area insert end " xSMBrowser starts, it will read both files in %%PREFIX%%/etc/xsmbrowser and ~, but definitions\n"
++    $helpwindow.text.area insert end " in %%PREFIX%%/etc/xsmbrowser take precedence. To get the most flexibility from this, the\n"
+     $helpwindow.text.area insert end " following should be carefully read.\n"
+     $helpwindow.text.area insert end "\n"
+     $helpwindow.text.area insert end " a) Config\n"
      $helpwindow.text.area insert end " -------------------------------\n"
      $helpwindow.text.area insert end " The .xsmbrowser-config file contains various setup settings. Looking at\n"
      $helpwindow.text.area insert end " this file, the most important settings are as follows.\n"
 -    $helpwindow.text.area insert end "  Image Path = /usr/share/pixmaps/xsmbrowser\n"
-+    $helpwindow.text.area insert end "  Image Path = /usr/local/share/xsmbrowser\n"
++    $helpwindow.text.area insert end "  Image Path = %%PREFIX%%/share/xsmbrowser\n"
      $helpwindow.text.area insert end "  Smbmount = yes 1\n"
      $helpwindow.text.area insert end "  Execute = kfmclient folder \$MOUNTPOINT\n"
      $helpwindow.text.area insert end "\n"
-@@ -7044,7 +7044,7 @@
+@@ -6814,20 +6817,20 @@
+     $helpwindow.text.area insert end " b) Networks\n"
+     $helpwindow.text.area insert end " -------------------------------\n"
+     $helpwindow.text.area insert end " This is the config file that usually gets the most attention. Networks\n"
+-    $helpwindow.text.area insert end " defined in /etc will appear before user-defined networks in xSMBrowser\'s\n"
+-    $helpwindow.text.area insert end " main screen. Networks can generally be transfered strait over to /etc,\n"
++    $helpwindow.text.area insert end " defined in %%PREFIX%%/etc/xsmbrowser will appear before user-defined networks in xSMBrowser\'s\n"
++    $helpwindow.text.area insert end " main screen. Networks can generally be transfered strait over to %%PREFIX%%/etc/xsmbrowser,\n"
+     $helpwindow.text.area insert end " just make sure to rid of any passwords.\n"
+     $helpwindow.text.area insert end "\n"
+     $helpwindow.text.area insert end " c) Favorites\n"
+     $helpwindow.text.area insert end " -------------------------------\n"
+     $helpwindow.text.area insert end " Favorites can also be defined globally. One could put commonly accessed\n"
+     $helpwindow.text.area insert end " computers here. Again, make sure there are not any passwords still\n"
+-    $helpwindow.text.area insert end " present in /etc/xsmbrowser-favorites after copying it over.\n"
++    $helpwindow.text.area insert end " present in %%PREFIX%%/etc/xsmbrowser/xsmbrowser-favorites after copying it over.\n"
+     $helpwindow.text.area insert end "\n"
+     $helpwindow.text.area insert end " d) Commands\n"
+     $helpwindow.text.area insert end " -------------------------------\n"
+     $helpwindow.text.area insert end " Instead of making users scour for programs, one could enter some of the\n"
+-    $helpwindow.text.area insert end " more common programs in the /etc/xsmbrowser-commands file.\n"
++    $helpwindow.text.area insert end " more common programs in the %%PREFIX%%/etc/xsmbrowser/xsmbrowser-commands file.\n"
+     $helpwindow.text.area insert end "\n"
+     $helpwindow.text.area insert end "\n"
+     $helpwindow.text.area insert end " III. Networking Ideas\n"
+@@ -6861,7 +6864,7 @@
+     $helpwindow.text.area insert end " c) Multiple Networks\n"
+     $helpwindow.text.area insert end " -------------------------------\n"
+     $helpwindow.text.area insert end " Using the above ideas, you could create two or three networks to place in\n"
+-    $helpwindow.text.area insert end " /etc/xsmbrowser-networks. The resulting names might look like the\n"
++    $helpwindow.text.area insert end " %%PREFIX%%/etc/xsmbrowser/xsmbrowser-networks. The resulting names might look like the\n"
+     $helpwindow.text.area insert end " following.\n"
+     $helpwindow.text.area insert end "  * CAS Main Network\n"
+     $helpwindow.text.area insert end "  * CAS Network Backup (1)   <--- uses known master browser\n"
+@@ -7021,7 +7024,7 @@
      $helpwindow.text.area insert end "  a) Image Path\n"
      $helpwindow.text.area insert end "      xSMBrowser now uses pictures and icons throughout the program. For\n"
      $helpwindow.text.area insert end "      it to use the pictures, however, it must know where they are being\n"
 -    $helpwindow.text.area insert end "      stored. By default, they are put into /usr/share/pixmaps/xsmbrowser,\n"
-+    $helpwindow.text.area insert end "      stored. By default, they are put into /usr/local/share/xsmbrowser,\n"
++    $helpwindow.text.area insert end "      stored. By default, they are put into %%PREFIX%%/share/xsmbrowser,\n"
      $helpwindow.text.area insert end "      so try that first if it says Use Geo (use internal geometry).\n"
      $helpwindow.text.area insert end " \n"
      $helpwindow.text.area insert end "  b) Query Timeout\n"
diff --git a/net/xsmbrowser/pkg-plist b/net/xsmbrowser/pkg-plist
index a8f981ca281e..c8e9cc077f5b 100644
--- a/net/xsmbrowser/pkg-plist
+++ b/net/xsmbrowser/pkg-plist
@@ -51,3 +51,4 @@ share/xsmbrowser/xsmbrowser-mini.xpm
 share/xsmbrowser/xsmbrowser.xpm
 share/xsmbrowser/zip.gif
 @dirrm share/xsmbrowser
+@dirrm etc/xsmbrowser