From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 12 09:11:11 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90B2916A4D3 for ; Sat, 12 Jun 2004 09:11:11 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77DFC43D49 for ; Sat, 12 Jun 2004 09:11:11 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i5C9AC7c029375 for ; Sat, 12 Jun 2004 09:10:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i5C9ACMU029374; Sat, 12 Jun 2004 09:10:12 GMT (envelope-from gnats) Resent-Date: Sat, 12 Jun 2004 09:10:12 GMT Resent-Message-Id: <200406120910.i5C9ACMU029374@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Stefan Walter Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F6CA16A4CE for ; Sat, 12 Jun 2004 09:08:45 +0000 (GMT) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.173]) by mx1.FreeBSD.org (Postfix) with ESMTP id EACE243D4C for ; Sat, 12 Jun 2004 09:08:43 +0000 (GMT) (envelope-from sw@gegenunendlich.de) Received: from [212.227.126.162] (helo=mrelayng.kundenserver.de) by moutng.kundenserver.de with esmtp (Exim 3.35 #1) id 1BZ4Ul-0001Jf-00; Sat, 12 Jun 2004 11:08:11 +0200 Received: from [80.142.203.78] (helo=kyuzo.dunkelkammer.void) (TLSv1:EDH-RSA-DES-CBC3-SHA:168) (Exim 3.35 #1) id 1BZ4Ui-0005vi-00; Sat, 12 Jun 2004 11:08:09 +0200 Received: by kyuzo.dunkelkammer.void (Postfix, from userid 1002) id EE73B3E60; Sat, 12 Jun 2004 11:08:05 +0200 (CEST) Message-Id: <20040612090805.EE73B3E60@kyuzo.dunkelkammer.void> Date: Sat, 12 Jun 2004 11:08:05 +0200 (CEST) From: Stefan Walter To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: ports@oven.org Subject: ports/67869: [PATCH] net/xsmbrowser: update to 3.4.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 09:11:11 -0000 >Number: 67869 >Category: ports >Synopsis: [PATCH] net/xsmbrowser: update to 3.4.0 >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: Sat Jun 12 09:10:12 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Stefan Walter >Release: FreeBSD 5.2-CURRENT i386 >Organization: Infinity Approximation Task Force >Environment: System: FreeBSD kyuzo.dunkelkammer.void 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sat Jun 5 15:56:32 CEST >Description: - Update to 3.4.0 Port maintainer (ports@oven.org) is cc'd. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- xsmbrowser-3.4.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/xsmbrowser.old/Makefile /usr/ports/net/xsmbrowser/Makefile --- /usr/ports/net/xsmbrowser.old/Makefile Sat Jun 12 09:56:07 2004 +++ /usr/ports/net/xsmbrowser/Makefile Sat Jun 12 09:57:22 2004 @@ -6,8 +6,7 @@ # PORTNAME= xsmbrowser -PORTVERSION= 3.3.0 -PORTREVISION= 1 +PORTVERSION= 3.4.0 CATEGORIES= net MASTER_SITES= http://www2.iastate.edu/~chadspen/ diff -ruN --exclude=CVS /usr/ports/net/xsmbrowser.old/distinfo /usr/ports/net/xsmbrowser/distinfo --- /usr/ports/net/xsmbrowser.old/distinfo Sat Jun 12 09:56:07 2004 +++ /usr/ports/net/xsmbrowser/distinfo Sat Jun 12 10:01:26 2004 @@ -1,2 +1,2 @@ -MD5 (xsmbrowser-3.3.0.tar.gz) = 3cd232ca08fc5e53e3dd1b3dfb74dd33 -SIZE (xsmbrowser-3.3.0.tar.gz) = 70149 +MD5 (xsmbrowser-3.4.0.tar.gz) = c5f454d1ed848a926a720ad724fcca80 +SIZE (xsmbrowser-3.4.0.tar.gz) = 75593 diff -ruN --exclude=CVS /usr/ports/net/xsmbrowser.old/files/patch-aa /usr/ports/net/xsmbrowser/files/patch-aa --- /usr/ports/net/xsmbrowser.old/files/patch-aa Sat Jun 12 09:56:07 2004 +++ /usr/ports/net/xsmbrowser/files/patch-aa Sat Jun 12 11:01:40 2004 @@ -1,5 +1,5 @@ ---- xsmbrowser.orig Sat Jan 20 04:09:53 2001 -+++ xsmbrowser Mon Jan 22 12:07:31 2001 +--- xsmbrowser.orig Sun May 6 04:56:08 2001 ++++ xsmbrowser Sat Jun 12 10:59:28 2004 @@ -1,12 +1,12 @@ -#!/usr/bin/expectk -f +#!%%PREFIX%%/bin/expectk -f @@ -52,7 +52,7 @@ puts $userfile "#" puts $userfile ":Netscape" puts $userfile "Types = .HTM .HTML .SHTML" -@@ -1114,6 +1114,9 @@ +@@ -1071,6 +1071,9 @@ if {[file exists "/etc/smb.conf"] != "0"} { puts "Reading /etc/smb.conf ..." set userfile [open "/etc/smb.conf" r] @@ -62,7 +62,7 @@ } 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 @@ +@@ -1170,8 +1173,8 @@ set global_exist "yes" gets $userfile line } else { @@ -73,7 +73,7 @@ set global_exist "yes" gets $userfile line } -@@ -1255,8 +1258,8 @@ +@@ -1218,8 +1221,8 @@ gets $userfile line set m $file_place(networks_m) } else { @@ -84,7 +84,7 @@ set global_exist "yes" gets $userfile line } -@@ -1328,8 +1331,8 @@ +@@ -1291,8 +1294,8 @@ set m $file_place(favorites_m) set p $file_place(mount_fav_m) } else { @@ -95,7 +95,7 @@ set global_exist "yes" gets $userfile line } -@@ -1423,8 +1426,8 @@ +@@ -1386,8 +1389,8 @@ gets $userfile line set m $file_place(commands_m) } else { @@ -106,7 +106,7 @@ set global_exist "yes" gets $userfile line } -@@ -1475,7 +1478,7 @@ +@@ -1438,7 +1441,7 @@ global env_name puts "Writing config (.xsmbrowser-*) ..." set userfile [open "~/.xsmbrowser-config" w] @@ -115,7 +115,7 @@ puts $userfile "#" if {$user_name_default != ""} { puts $userfile "Username = $user_name_default" -@@ -1493,7 +1496,7 @@ +@@ -1456,7 +1459,7 @@ puts $userfile "EOF" close $userfile set userfile [open "~/.xsmbrowser-networks" w] @@ -124,7 +124,7 @@ puts $userfile "#" if {[array exists networks_m] == 1} { set m [expr 1 + $file_place(networks_m)] -@@ -1531,7 +1534,7 @@ +@@ -1494,7 +1497,7 @@ puts $userfile "EOF" close $userfile set userfile [open "~/.xsmbrowser-favorites" w] @@ -133,7 +133,7 @@ puts $userfile "#" if {[array exists favorites_m] == 1} { set m [expr 1 + $file_place(favorites_m)] -@@ -1597,7 +1600,7 @@ +@@ -1560,7 +1563,7 @@ puts $userfile "EOF" close $userfile set userfile [open "~/.xsmbrowser-commands" w] @@ -142,78 +142,60 @@ 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 = %%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" -@@ -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 %%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" +@@ -7171,17 +7174,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 = %%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" +@@ -7191,20 +7194,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 "III. Networking Ideas\n" + $helpwindow.text.area insert end "===============================\n" +@@ -7237,7 +7240,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" --- xsmbrowser-3.4.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: