Repair sysutils/pib, make Aleksandr A. Babaylov the new maintainer.

PR:		ports/22399,ports/24493,ports/44323
Submitted by:	PM Lashley <patl@phoenix.volant.org>,Mark Rowlands <mark.rowlands@minmail.net>,Aleksandr A. Babaylov <babolo@aaz.links.ru>
Approved by:	msmith@FreeBSD.org,Aleksandr A. Babaylov <babolo@aaz.links.ru>

6 files changed, 164 insertions, 6 deletions

diff --git a/ports-mgmt/pib/Makefile b/ports-mgmt/pib/Makefile
index 36736bd66947..780ae05ee8cd 100644
--- a/ports-mgmt/pib/Makefile
+++ b/ports-mgmt/pib/Makefile
@@ -11,9 +11,7 @@ CATEGORIES=	sysutils tk82
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	msmith
 
-MAINTAINER=	msmith@freebsd.org
-
-BROKEN=	"This needs to be updated to work with the newer ports layout"
+MAINTAINER=	.@babolo.ru
 
 BUILD_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
diff --git a/ports-mgmt/pib/files/patch-Makefile b/ports-mgmt/pib/files/patch-Makefile
new file mode 100644
index 000000000000..2d9793630bbc
--- /dev/null
+++ b/ports-mgmt/pib/files/patch-Makefile
@@ -0,0 +1,10 @@
+--- Makefile	Sat Oct 28 12:55:08 2000
++++ Makefile	Mon Oct 21 04:40:15 2002
+@@ -8,7 +8,6 @@
+ X11BASE?=	/usr/X11R6
+ 
+ LIB=		TkSteal
+-INTERNALLIB=	YES		# inhibits unuseful static library
+ SHLIB_MAJOR=	2
+ SHLIB_MINOR=	0
+ NOPROFILE=	yes
diff --git a/ports-mgmt/pib/files/patch-pib b/ports-mgmt/pib/files/patch-pib
new file mode 100644
index 000000000000..d0b9b13f39d8
--- /dev/null
+++ b/ports-mgmt/pib/files/patch-pib
@@ -0,0 +1,71 @@
+--- pib.tcl	Sat Oct 28 13:01:12 2000
++++ pib.tcl	Sat Apr 28 04:05:37 2001
+@@ -309,22 +309,11 @@
+ #
+ proc init_options {} {
+ 
+-    # listboxes
+-    option add *Listbox.background white;
+-    option add *Listbox.selectForeground white;
+-    option add *Listbox.selectBackground darkblue;
+-
+     # scrollbars
+     option add *Scrollbar.width 11;
+ 
+     # textboxes
+-    option add *Text.background white;
+-    option add *Text.selectForeground white;
+-    option add *Text.selectBackground darkblue;
+     option add *Text.font fixed;
+-
+-    # entries
+-    option add *Entry.background white;
+     
+ }
+ 
+@@ -1931,36 +1920,19 @@
+ 	update_pwin df_getdinfo [format "%d/%d ports, %dK/sec" $pports $Status(nports) $rate];
+ 
+ 	# Find the md5 file.
+-	if {[catch {set fh [open "$path/files/md5" "r"]}]} {
++	if {[catch {set fh [open "$path/distinfo" "r"]}]} {
+ 
+-	    # Nope.  Perhaps we're dealing with US ITAR braindamage
+-	    if {[op_elookup USA_RESIDENT]} {
+-		set aname "$path/files.usa/md5";
++	    # Can't find an distinfo file; give up
++	    if {[file isdirectory "$path"]} {
++		if {$Options(warn_no_md5)} {
++		    lappend errs "$pname: '$path/distinfo' not found";
++		}
+ 	    } else {
+-		set aname "$path/files.non_usa/md5";
+-	    }
+-
+-	    # try again with a new name
+-	    if {[catch {set fh [open $aname "r"]}]} {
+-
+-		# Can't find an md5 file; give up
+-		if {[file isdirectory "$path/files"]} {
+-		    if {$Options(warn_no_md5)} {
+-			lappend errs "$pname: '$path/files/md5' not found";
+-		    }
+-		} else {
+-		    if {[file isdirectory $path]} {
+-			if {$Options(warn_no_fdir)} {
+-			    lappend errs "$pname: '$path/files' not found";
+-			}
+-		    } else {
+-			if {$Options(warn_no_port)} {
+-			    lappend errs "$pname: directory missing.";
+-			}
+-		    }
++		if {$Options(warn_no_port)} {
++		    lappend errs "$pname: directory missing.";
+ 		}
+-		continue ;			# if no port info, assume it's not wanted
+ 	    }
++	    continue ;				# if no port info, assume it's not wanted
+ 	}
+ 
+ 	# initialise state for this port
diff --git a/sysutils/pib/Makefile b/sysutils/pib/Makefile
index 36736bd66947..780ae05ee8cd 100644
--- a/sysutils/pib/Makefile
+++ b/sysutils/pib/Makefile
@@ -11,9 +11,7 @@ CATEGORIES=	sysutils tk82
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	msmith
 
-MAINTAINER=	msmith@freebsd.org
-
-BROKEN=	"This needs to be updated to work with the newer ports layout"
+MAINTAINER=	.@babolo.ru
 
 BUILD_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
diff --git a/sysutils/pib/files/patch-Makefile b/sysutils/pib/files/patch-Makefile
new file mode 100644
index 000000000000..2d9793630bbc
--- /dev/null
+++ b/sysutils/pib/files/patch-Makefile
@@ -0,0 +1,10 @@
+--- Makefile	Sat Oct 28 12:55:08 2000
++++ Makefile	Mon Oct 21 04:40:15 2002
+@@ -8,7 +8,6 @@
+ X11BASE?=	/usr/X11R6
+ 
+ LIB=		TkSteal
+-INTERNALLIB=	YES		# inhibits unuseful static library
+ SHLIB_MAJOR=	2
+ SHLIB_MINOR=	0
+ NOPROFILE=	yes
diff --git a/sysutils/pib/files/patch-pib b/sysutils/pib/files/patch-pib
new file mode 100644
index 000000000000..d0b9b13f39d8
--- /dev/null
+++ b/sysutils/pib/files/patch-pib
@@ -0,0 +1,71 @@
+--- pib.tcl	Sat Oct 28 13:01:12 2000
++++ pib.tcl	Sat Apr 28 04:05:37 2001
+@@ -309,22 +309,11 @@
+ #
+ proc init_options {} {
+ 
+-    # listboxes
+-    option add *Listbox.background white;
+-    option add *Listbox.selectForeground white;
+-    option add *Listbox.selectBackground darkblue;
+-
+     # scrollbars
+     option add *Scrollbar.width 11;
+ 
+     # textboxes
+-    option add *Text.background white;
+-    option add *Text.selectForeground white;
+-    option add *Text.selectBackground darkblue;
+     option add *Text.font fixed;
+-
+-    # entries
+-    option add *Entry.background white;
+     
+ }
+ 
+@@ -1931,36 +1920,19 @@
+ 	update_pwin df_getdinfo [format "%d/%d ports, %dK/sec" $pports $Status(nports) $rate];
+ 
+ 	# Find the md5 file.
+-	if {[catch {set fh [open "$path/files/md5" "r"]}]} {
++	if {[catch {set fh [open "$path/distinfo" "r"]}]} {
+ 
+-	    # Nope.  Perhaps we're dealing with US ITAR braindamage
+-	    if {[op_elookup USA_RESIDENT]} {
+-		set aname "$path/files.usa/md5";
++	    # Can't find an distinfo file; give up
++	    if {[file isdirectory "$path"]} {
++		if {$Options(warn_no_md5)} {
++		    lappend errs "$pname: '$path/distinfo' not found";
++		}
+ 	    } else {
+-		set aname "$path/files.non_usa/md5";
+-	    }
+-
+-	    # try again with a new name
+-	    if {[catch {set fh [open $aname "r"]}]} {
+-
+-		# Can't find an md5 file; give up
+-		if {[file isdirectory "$path/files"]} {
+-		    if {$Options(warn_no_md5)} {
+-			lappend errs "$pname: '$path/files/md5' not found";
+-		    }
+-		} else {
+-		    if {[file isdirectory $path]} {
+-			if {$Options(warn_no_fdir)} {
+-			    lappend errs "$pname: '$path/files' not found";
+-			}
+-		    } else {
+-			if {$Options(warn_no_port)} {
+-			    lappend errs "$pname: directory missing.";
+-			}
+-		    }
++		if {$Options(warn_no_port)} {
++		    lappend errs "$pname: directory missing.";
+ 		}
+-		continue ;			# if no port info, assume it's not wanted
+ 	    }
++	    continue ;				# if no port info, assume it's not wanted
+ 	}
+ 
+ 	# initialise state for this port