Adapt to tk80.

Suggested by:	Mark Murray

2 files changed, 64 insertions, 5 deletions

diff --git a/audio/xmpeg3/Makefile b/audio/xmpeg3/Makefile
index 3e56ed614bb9..f3b4d32c79c1 100644
--- a/audio/xmpeg3/Makefile
+++ b/audio/xmpeg3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			doconnor@ist.flinders.edu.au
 #
-# $Id: Makefile,v 1.1.1.1 1997/10/29 12:16:52 tg Exp $
+# $Id: Makefile,v 1.2 1997/10/30 00:42:27 asami Exp $
 #
 
 DISTNAME=	xmp3_1.0.0
@@ -15,11 +15,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.ORG
 
 RUN_DEPENDS=	amp:${PORTSDIR}/audio/amp \
-		wish4.2:${PORTSDIR}/x11/tk42
+		wish8.0:${PORTSDIR}/x11/tk80
 
 WRKSRC=		${WRKDIR}/xmpeg3
 NO_BUILD=	yes
 
+post-patch:
+	@/usr/bin/perl -pi -e "s|@@PREFIX@@|${PREFIX}|;" ${WRKSRC}/xmpeg3
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/xmpeg3 ${PREFIX}/bin
 
diff --git a/audio/xmpeg3/files/patch-aa b/audio/xmpeg3/files/patch-aa
index 06f86809b9e8..1b290d64d6c9 100644
--- a/audio/xmpeg3/files/patch-aa
+++ b/audio/xmpeg3/files/patch-aa
@@ -1,7 +1,63 @@
---- xmpeg3.orig	Tue Jul  8 14:16:40 1997
-+++ xmpeg3	Tue Jul  8 14:16:53 1997
+--- xmpeg3.orig	Tue Mar 25 13:21:26 1997
++++ xmpeg3	Thu Oct 30 16:00:48 1997
 @@ -1,3 +1,4 @@
-+#!/usr/local/bin/wish4.2
++#!@@PREFIX@@/bin/wish8.0
  #############################################################################
  # Visual Tcl v1.07 Project
  #
+@@ -12,11 +13,11 @@
+ global Recursif_intelligent; set Recursif_intelligent {0}
+ global artiste; set artiste {}
+ global player_mode; set player_mode {disc}
+-global random::a1; set random::a1 { 1941 1860 1812 1776 1492 1215 1066 12013 }
+-global random::a2; set random::a2 { 1111 2222 3333 4444 5555 6666 7777   827 }
+-global random::a3; set random::a3 { 1111 2222 3333 4444 5555 6666 7777   251 }
+-global random::m1; set random::m1 {8729 43215 8810 53075 59930 23253 16377 62489 11794}
+-global random::m2; set random::m2 {18086 23696 42786 37815 59442 39280 18624 35510 38884}
++global random.a1; set random.a1 { 1941 1860 1812 1776 1492 1215 1066 12013 }
++global random.a2; set random.a2 { 1111 2222 3333 4444 5555 6666 7777   827 }
++global random.a3; set random.a3 { 1111 2222 3333 4444 5555 6666 7777   251 }
++global random.m1; set random.m1 {8729 43215 8810 53075 59930 23253 16377 62489 11794}
++global random.m2; set random.m2 {18086 23696 42786 37815 59442 39280 18624 35510 38884}
+ global termine; set termine {2}
+ global xmpeg3_version; set xmpeg3_version {1.0}
+ global widget; 
+@@ -244,19 +245,19 @@
+ }
+ 
+ proc random {} {
+-global random::m1 random::m2 random::a1 random::a2;
+-    set random::m1 [random::rand16 [set random::a1] [set random::m1]];
+-    set random::m2 [random::rand16 [set random::a2] [set random::m2]];
+-    return [expr (([lindex [set random::m1] 1] << 16) + [lindex [set random::m2] 1]) & 0x7FFFFFFF];
++global random.m1 random.m2 random.a1 random.a2;
++    set random.m1 [random.rand16 [set random.a1] [set random.m1]];
++    set random.m2 [random.rand16 [set random.a2] [set random.m2]];
++    return [expr (([lindex [set random.m1] 1] << 16) + [lindex [set random.m2] 1]) & 0x7FFFFFFF];
+ }
+ 
+-proc random::rand16 {a m} {
++proc random.rand16 {a m} {
+ set n [expr  [lindex $m 0] +  [lindex $a 0] * [lindex $m 1] +  [lindex $a 1] * [lindex $m 2] +  [lindex $a 2] * [lindex $m 3] +  [lindex $a 3] * [lindex $m 4] +  [lindex $a 4] * [lindex $m 5] +  [lindex $a 5] * [lindex $m 6] +  [lindex $a 6] * [lindex $m 7] +  [lindex $a 7] * [lindex $m 8]];
+ 
+     return [concat [expr $n >> 16] [expr $n & 0xFFFF] [lrange $m 1 7]];
+ }
+ 
+-proc random::srand16 {seed} {
++proc random.srand16 {seed} {
+ set n1 [expr $seed & 0xFFFF];
+     set n2 [expr $seed & 0x7FFFFFFF];
+     set n2 [expr 30903 * $n1 + ($n2 >> 16)];
+@@ -305,9 +306,9 @@
+ }
+ 
+ proc srandom {seed} {
+-global random::m1 random::m2;
+-    set random::m1 [random::srand16 $seed];
+-    set random::m2 [random::srand16 [expr 4321+$seed]];
++global random.m1 random.m2;
++    set random.m1 [random.srand16 $seed];
++    set random.m2 [random.srand16 [expr 4321+$seed]];
+     return {};
+ }
+