Update to 0.6.2.

Submitted by:	Martin Klaffenboeck <martin.klaffenboeck@gmx.at> (partially)

7 files changed, 129 insertions, 119 deletions

diff --git a/net/gnomba/Makefile b/net/gnomba/Makefile
index 0813384..c3e81c4 100644
--- a/net/gnomba/Makefile
+++ b/net/gnomba/Makefile
@@ -6,20 +6,21 @@
 #
 
 PORTNAME=	gnomba
-PORTVERSION=	0.5.1
+PORTVERSION=	0.6.2
 CATEGORIES=	net gnome
-MASTER_SITES=	http://gnomba.darkcorner.net/tars/ \
-		ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gnomba
 
 MAINTAINER=	demon@FreeBSD.org
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
+USE_GNOMELIBS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+MAN1=		gnomba.1
+
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/net/gnomba/distinfo b/net/gnomba/distinfo
index 34b1723..55f2dc9 100644
--- a/net/gnomba/distinfo
+++ b/net/gnomba/distinfo
@@ -1 +1 @@
-MD5 (gnomba-0.5.1.tar.gz) = baa092428f796eb7fb93e8e6a1d2eb13
+MD5 (gnomba-0.6.2.tar.gz) = 698c40d2755c5b0d467e4de2f2119c0c
diff --git a/net/gnomba/files/patch-ab b/net/gnomba/files/patch-ab
index 6ab1eea..1f11707 100644
--- a/net/gnomba/files/patch-ab
+++ b/net/gnomba/files/patch-ab
@@ -1,5 +1,5 @@
---- properties.c.orig	Sat Mar 25 22:15:19 2000
-+++ properties.c	Sat Mar 25 22:15:42 2000
+--- src/properties.c.orig	Sat Mar 25 22:15:19 2000
++++ src/properties.c	Sat Mar 25 22:15:42 2000
 @@ -158,19 +158,19 @@
    /* set net font property */
    if (strcmp(TNetFont, NetFont)) {
@@ -23,125 +23,62 @@
      gtk_ctree_node_set_cell_style(GTK_CTREE(tree), GTK_CTREE_NODE(node), 2, nodeStyle);
    }
  }
---- smbwrap.c.orig	Sat Mar 25 22:15:23 2000
-+++ smbwrap.c	Sat Mar 25 22:16:26 2000
-@@ -269,17 +269,17 @@
- 
-       /* set net font */
-       nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
--      nodeStyle->font = gdk_font_load(NetFont);
-+      nodeStyle->font = gdk_fontset_load(NetFont);
-       gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 0, nodeStyle);
+--- src/smbwrap.c.orig	Sun Jun 16 13:10:26 2002
++++ src/smbwrap.c	Sun Jun 16 13:12:44 2002
+@@ -246,17 +246,17 @@
+ 			
+ 		/* set net font */
+ 		nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
+-		nodeStyle->font = gdk_font_load(NetFont);
++		nodeStyle->font = gdk_fontset_load(NetFont);
+ 		gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 0, nodeStyle);
  
-       /* set comment font */
-       nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
--      nodeStyle->font = gdk_font_load(CommentFont);
-+      nodeStyle->font = gdk_fontset_load(CommentFont);
-       gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 1, nodeStyle);
+ 		/* set comment font */
+ 		nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
+-		nodeStyle->font = gdk_font_load(CommentFont);
++		nodeStyle->font = gdk_fontset_load(CommentFont);
+ 		gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 1, nodeStyle);
  
-       /* set mount font */
-       nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
--      nodeStyle->font = gdk_font_load(MountFont);
-+      nodeStyle->font = gdk_fontset_load(MountFont);
-       gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 2, nodeStyle);
+ 		/* set mount font */
+ 		nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
+-		nodeStyle->font = gdk_font_load(MountFont);
++		nodeStyle->font = gdk_fontset_load(MountFont);
+ 		gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 2, nodeStyle);
  
-       mn = copyMN(tmp);
-@@ -694,17 +694,17 @@
+ 		mn = copyMN(currnode);
+@@ -629,17 +629,17 @@
  
  	/* set net font */
- 	nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--	nodeStyle->font = gdk_font_load( NetFont ); 
-+	nodeStyle->font = gdk_fontset_load( NetFont ); 
- 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 0, nodeStyle );
+ 	nodeStyle1 = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
+-	nodeStyle1->font = gdk_font_load( NetFont ); 
++	nodeStyle1->font = gdk_fontset_load( NetFont ); 
+ 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 0, nodeStyle1 );
  
  	/* set comment font */
- 	nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--	nodeStyle->font = gdk_font_load( CommentFont ); 
-+	nodeStyle->font = gdk_fontset_load( CommentFont ); 
- 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 1, nodeStyle ); 
+ 	nodeStyle2 = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
+-	nodeStyle2->font = gdk_font_load( CommentFont ); 
++	nodeStyle2->font = gdk_fontset_load( CommentFont ); 
+ 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 1, nodeStyle2 ); 
  
  	/* set mount font */
- 	nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--	nodeStyle->font = gdk_font_load( MountFont ); 
-+	nodeStyle->font = gdk_fontset_load( MountFont ); 
- 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 2, nodeStyle ); 
+ 	nodeStyle3 = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
+-	nodeStyle3->font = gdk_font_load( MountFont ); 
++	nodeStyle3->font = gdk_fontset_load( MountFont ); 
+ 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 2, nodeStyle3 ); 
  	
  	
-@@ -728,17 +728,17 @@
-       
- 			/* set net font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( NetFont ); 
-+			nodeStyle->font = gdk_fontset_load( NetFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 0, nodeStyle );
- 			
- 			/* set comment font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( CommentFont ); 
-+			nodeStyle->font = gdk_fontset_load( CommentFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 1, nodeStyle ); 
- 		
- 			/* set mount font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( MountFont ); 
-+			nodeStyle->font = gdk_fontset_load( MountFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 2, nodeStyle ); 
- 			 
- 			
-@@ -758,17 +758,17 @@
- 			
- 			/* set net font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( NetFont ); 
-+			nodeStyle->font = gdk_fontset_load( NetFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(subtree), 0, nodeStyle );
- 			
- 			/* set comment font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( CommentFont ); 
-+			nodeStyle->font = gdk_fontset_load( CommentFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(subtree), 1, nodeStyle ); 
- 		
- 			/* set mount font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( MountFont ); 
-+			nodeStyle->font = gdk_fontset_load( MountFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(subtree), 2, nodeStyle ); 
- 			 
-      
-@@ -787,17 +787,17 @@
-       
- 			/* set net font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( NetFont ); 
-+			nodeStyle->font = gdk_fontset_load( NetFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 0, nodeStyle );
- 			
- 			/* set comment font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( CommentFont ); 
-+			nodeStyle->font = gdk_fontset_load( CommentFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 1, nodeStyle ); 
- 		
- 			/* set mount font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( MountFont ); 
-+			nodeStyle->font = gdk_fontset_load( MountFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 2, nodeStyle ); 
- 			 
- 			
---- gnomba.c.orig	Sat Mar 25 22:22:34 2000
-+++ gnomba.c	Sat Mar 25 22:23:28 2000
-@@ -143,9 +143,9 @@
-   DefaultCommand = gnome_config_get_string("Options/DefaultCommand=gmc");
-   SilentlyCreateMountPoint = gnome_config_get_int ("Options/SilentlyCreateMountPoint=0");
-   DontRemoveCreatedMount = gnome_config_get_int ("Options/DontRemoveCreatedMount=0");
--  NetFont = gnome_config_get_string("Options/NetFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1"); 
+--- src/gnomba.c.orig	Sun Jun 16 13:09:45 2002
++++ src/gnomba.c	Sun Jun 16 13:10:08 2002
+@@ -133,9 +133,9 @@
+ 	DefaultCommand = gnome_config_get_string("Options/DefaultCommand=gmc");
+ 	SilentlyCreateMountPoint = gnome_config_get_int ("Options/SilentlyCreateMountPoint=0");
+ 	DontRemoveCreatedMount = gnome_config_get_int ("Options/DontRemoveCreatedMount=0");
+-	NetFont = gnome_config_get_string("Options/NetFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1"); 
 -	CommentFont = gnome_config_get_string("Options/CommentFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1"); 
--  MountFont = gnome_config_get_string("Options/MountFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1"); 
-+  NetFont = gnome_config_get_string("Options/NetFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*"); 
+-	MountFont = gnome_config_get_string("Options/MountFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1"); 
++	NetFont = gnome_config_get_string("Options/NetFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*"); 
 +	CommentFont = gnome_config_get_string("Options/CommentFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*"); 
-+  MountFont = gnome_config_get_string("Options/MountFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*"); 
- 																								 
++	MountFont = gnome_config_get_string("Options/MountFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*"); 
  	gnome_config_pop_prefix();
  
+ 	/*create the containers*/
diff --git a/net/gnomba/files/patch-samba-Makefile b/net/gnomba/files/patch-samba-Makefile
new file mode 100644
index 0000000..f8414d9
--- /dev/null
+++ b/net/gnomba/files/patch-samba-Makefile
@@ -0,0 +1,21 @@
+--- samba/Makefile.orig	Sun Jun 16 13:32:01 2002
++++ samba/Makefile	Sun Jun 16 13:34:56 2002
+@@ -1,13 +1,13 @@
+ #this should default to something and then be set by configure switches
+-prefix=/usr/local/samba
++prefix=${LOCALBASE}
+ exec_prefix=${prefix}
+-LIBDIR = ${exec_prefix}/lib
++LIBDIR = ${exec_prefix}/etc
+ LMHOSTSFILE = $(LIBDIR)/lmhosts
+ CODEPAGEDIR = $(LIBDIR)/codepages
+-SMBRUN = $(BINDIR)/smbrun
++SMBRUN = $(prefix)/bin/smbrun
+ DRIVERFILE = $(LIBDIR)/printers.def
+-SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
+-PASSWD_PROGRAM = /bin/passwd
++SMB_PASSWD_FILE = $(prefix)/bin/smbpasswd
++PASSWD_PROGRAM = /usr/bin/passwd
+ 
+ 
+ LIB_OBJ = lib/charcnv.o lib/charset.o lib/debug.o \
diff --git a/net/gnomba/files/patch-samba-include-config.h b/net/gnomba/files/patch-samba-include-config.h
new file mode 100644
index 0000000..51401ef
--- /dev/null
+++ b/net/gnomba/files/patch-samba-include-config.h
@@ -0,0 +1,51 @@
+--- samba/include/config.h.orig	Fri Jun 14 00:44:17 2002
++++ samba/include/config.h	Fri Jun 14 00:42:22 2002
+@@ -106,7 +106,7 @@
+ /* #undef FTRUNCATE_NEEDS_ROOT */
+ /* #undef HAVE_TRAPDOOR_UID */
+ /* #undef HAVE_ROOT */
+-/* #undef HAVE_UNION_SEMUN */
++#define HAVE_UNION_SEMUN 1
+ #define HAVE_GETTIMEOFDAY_TZ 1
+ /* #undef HAVE_SOCK_SIN_LEN */
+ /* #undef STAT_READ_FILSYS */
+@@ -745,7 +745,7 @@
+ #define HAVE_SECURITY_PAM_APPL_H 1
+ 
+ /* Define if you have the <shadow.h> header file.  */
+-#define HAVE_SHADOW_H 1
++#undef HAVE_SHADOW_H 
+ 
+ /* Define if you have the <stdarg.h> header file.  */
+ #define HAVE_STDARG_H 1
+@@ -760,7 +760,7 @@
+ #define HAVE_STRINGS_H 1
+ 
+ /* Define if you have the <stropts.h> header file.  */
+-#define HAVE_STROPTS_H 1
++#undef HAVE_STROPTS_H
+ 
+ /* Define if you have the <sys/acl.h> header file.  */
+ /* #undef HAVE_SYS_ACL_H */
+@@ -829,10 +829,10 @@
+ /* #undef HAVE_SYS_SOCKIO_H */
+ 
+ /* Define if you have the <sys/statfs.h> header file.  */
+-#define HAVE_SYS_STATFS_H 1
++#undef HAVE_SYS_STATFS_H 
+ 
+ /* Define if you have the <sys/statvfs.h> header file.  */
+-#define HAVE_SYS_STATVFS_H 1
++#undef HAVE_SYS_STATVFS_H
+ 
+ /* Define if you have the <sys/syscall.h> header file.  */
+ #define HAVE_SYS_SYSCALL_H 1
+@@ -847,7 +847,7 @@
+ #define HAVE_SYS_UNISTD_H 1
+ 
+ /* Define if you have the <sys/vfs.h> header file.  */
+-#define HAVE_SYS_VFS_H 1
++#undef HAVE_SYS_VFS_H
+ 
+ /* Define if you have the <sys/wait.h> header file.  */
+ #define HAVE_SYS_WAIT_H 1
diff --git a/net/gnomba/pkg-descr b/net/gnomba/pkg-descr
index cf35a67..8800636 100644
--- a/net/gnomba/pkg-descr
+++ b/net/gnomba/pkg-descr
@@ -4,8 +4,7 @@ with smb.  The workgroups, machines and share are shown in a tree-view.
 For each machine you can then view the list of shares, and mount, unmount
 or browse them. 
 
-WWW:  http://gnomba.darkcorner.net/
-
+WWW:  http://gnomba.sourceforge.net/
 
 Dmitry Sivachenko,
 dima@Chg.RU
diff --git a/net/gnomba/pkg-plist b/net/gnomba/pkg-plist
index bc68876..7a916d1 100644
--- a/net/gnomba/pkg-plist
+++ b/net/gnomba/pkg-plist
@@ -1,8 +1,9 @@
 bin/gnomba
+share/gnome/apps/Internet/gnomba.desktop
+share/gnome/pixmaps/gnome-gnomba.png
 share/locale/fr/LC_MESSAGES/gnomba.mo
+share/locale/ja/LC_MESSAGES/gnomba.mo
 share/locale/ko/LC_MESSAGES/gnomba.mo
 share/locale/pl/LC_MESSAGES/gnomba.mo
 share/locale/ru/LC_MESSAGES/gnomba.mo
 share/locale/wa/LC_MESSAGES/gnomba.mo
-share/gnome/apps/Internet/gnomba.desktop
-share/gnome/pixmaps/gnome-gnomba.png