From myself@conterra.com  Sat Feb 13 13:21:54 1999
Received: from hawaii.conterra.com (hawaii.conterra.com [209.12.164.32])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id NAA18936
          for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Feb 1999 13:21:50 -0800 (PST)
          (envelope-from myself@conterra.com)
Received: from dmaddox.conterra.com (dmaddox.conterra.com [209.12.169.48])
	by hawaii.conterra.com (8.8.8/8.8.7) with ESMTP id QAA19410
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Feb 1999 16:21:48 -0500 (EST)
Received: (from myself@localhost)
	by dmaddox.conterra.com (8.9.3/8.9.1) id QAA16309;
	Sat, 13 Feb 1999 16:21:49 -0500 (EST)
	(envelope-from myself)
Message-Id: <199902132121.QAA16309@dmaddox.conterra.com>
Date: Sat, 13 Feb 1999 16:21:49 -0500 (EST)
From: dmaddox@conterra.com
Reply-To: dmaddox@conterra.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: Several Fixes for X-Files Port
X-Send-Pr-Version: 3.2

>Number:         10068
>Category:       ports
>Synopsis:       Fixes for several problems in X-Files port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 13 13:30:01 PST 1999
>Closed-Date:    Mon Mar 8 12:53:17 PST 1999
>Last-Modified:  Mon Mar  8 12:55:47 PST 1999
>Originator:     Donald J. Maddox
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:

>Description:

	There are several problems with the current X-Files port (of
which I am the maintainer):

1)  The port contains hard-coded paths and does not properly respect
${PREFIX}/${X11BASE}.

2)  The port is marked broken if $DISPLAY is not set.

3)  My email address is wrong in the MAINTAINER line.

The patch below attempts to fix these problems.

>How-To-Repeat:

>Fix:

diff -r -u x-files.old/Makefile x-files/Makefile
--- x-files.old/Makefile	Fri Feb 12 03:25:16 1999
+++ x-files/Makefile	Sat Feb 13 16:06:29 1999
@@ -8,23 +8,21 @@
 
 DISTNAME=       X-Files-1.43
 PKGNAME=	x-files-1.43
-CATEGORIES=	x11-fm tk80
+CATEGORIES=	x11-fm tcl80
 MASTER_SITES=   http://java.inf.tu-dresden.de/X-Files/data/
 
-MAINTAINER=     dmaddox@scsn.net
+MAINTAINER=     dmaddox@conterra.com
 
-BUILD_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
-
-.if !defined(DISPLAY)
-BROKEN=		requires DISPLAY to install
-.endif
+BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80
 
 WRKSRC=		${WRKDIR}/X-Files
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
 
 pre-install:
-	@wish8.0 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
+	@tclsh8.0 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
+	@sed s#@X11BASE@#${X11BASE}# <${WRKSRC}/X-Files.tcl >${WRKSRC}/tmpfile
+	@mv ${WRKSRC}/tmpfile ${WRKSRC}/X-Files.tcl
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/X-Files
diff -r -u x-files.old/patches/patch-aa x-files/patches/patch-aa
--- x-files.old/patches/patch-aa	Wed Apr 29 19:46:03 1998
+++ x-files/patches/patch-aa	Sat Feb 13 16:06:00 1999
@@ -5,7 +5,7 @@
 +# The main file for the X-Files
 +# The next line is executed by /bin/sh, but not Tcl \
 +exec wish8.0 $0 ${1+"$@"}
-+set xf(xf_home) "/usr/X11R6/lib/X11/X-Files/"
++set xf(xf_home) "@X11BASE@/lib/X11/X-Files/"
  proc MAIN {argc argv} {
  global xf xf_image env menu tk_version
  
diff -r -u x-files.old/scripts/mktclIndex x-files/scripts/mktclIndex
--- x-files.old/scripts/mktclIndex	Wed Apr 29 19:46:03 1998
+++ x-files/scripts/mktclIndex	Sat Feb 13 16:10:09 1999
@@ -1,3 +1,3 @@
-#!/usr/local/bin/wish8.0
+#!tclsh8.0
 auto_mkindex $argv be.tcl ee.tcl re.tcl vfs.tcl xf_sel.tcl
 exit
>Release-Note:
>Audit-Trail:

From: "Donald J . Maddox" <dmaddox@conterra.com>
To: FreeBSD-gnats-submit@FreeBSD.ORG
Cc:  
Subject: Re: ports/10068: Several Fixes for X-Files Port
Date: Sat, 13 Feb 1999 17:01:00 -0500

 I accidently removed the dependancy on tk80 in this original
 patch :-/  Please use this patch instead:
 
 
 diff -r -u x-files.old/Makefile x-files/Makefile
 --- x-files.old/Makefile	Fri Feb 12 03:25:16 1999
 +++ x-files/Makefile	Sat Feb 13 16:30:00 1999
 @@ -11,20 +11,19 @@
  CATEGORIES=	x11-fm tk80
  MASTER_SITES=   http://java.inf.tu-dresden.de/X-Files/data/
  
 -MAINTAINER=     dmaddox@scsn.net
 +MAINTAINER=     dmaddox@conterra.com
  
 -BUILD_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
 -
 -.if !defined(DISPLAY)
 -BROKEN=		requires DISPLAY to install
 -.endif
 +BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80
 +RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
  
  WRKSRC=		${WRKDIR}/X-Files
  NO_BUILD=	yes
  USE_X_PREFIX=	yes
  
  pre-install:
 -	@wish8.0 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
 +	@tclsh8.0 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
 +	@sed s#@X11BASE@#${X11BASE}# <${WRKSRC}/X-Files.tcl >${WRKSRC}/tmpfile
 +	@mv ${WRKSRC}/tmpfile ${WRKSRC}/X-Files.tcl
  
  do-install:
  	@${MKDIR} ${PREFIX}/lib/X11/X-Files
 diff -r -u x-files.old/patches/patch-aa x-files/patches/patch-aa
 --- x-files.old/patches/patch-aa	Wed Apr 29 19:46:03 1998
 +++ x-files/patches/patch-aa	Sat Feb 13 16:06:00 1999
 @@ -5,7 +5,7 @@
  +# The main file for the X-Files
  +# The next line is executed by /bin/sh, but not Tcl \
  +exec wish8.0 $0 ${1+"$@"}
 -+set xf(xf_home) "/usr/X11R6/lib/X11/X-Files/"
 ++set xf(xf_home) "@X11BASE@/lib/X11/X-Files/"
   proc MAIN {argc argv} {
   global xf xf_image env menu tk_version
   
 diff -r -u x-files.old/scripts/mktclIndex x-files/scripts/mktclIndex
 --- x-files.old/scripts/mktclIndex	Wed Apr 29 19:46:03 1998
 +++ x-files/scripts/mktclIndex	Sat Feb 13 16:10:09 1999
 @@ -1,3 +1,3 @@
 -#!/usr/local/bin/wish8.0
 +#!tclsh8.0
  auto_mkindex $argv be.tcl ee.tcl re.tcl vfs.tcl xf_sel.tcl
  exit
 
 
 On Sat, Feb 13, 1999 at 04:21:49PM -0500, dmaddox@conterra.com wrote:
 > 
 > >Number:         10068
 > >Category:       ports
 > >Synopsis:       Fixes for several problems in X-Files port
 > >Confidential:   no
 > >Severity:       non-critical
 > >Priority:       low
 > >Responsible:    freebsd-ports
 > >State:          open
 > >Quarter:        
 > >Keywords:       
 > >Date-Required:
 > >Class:          change-request
 > >Submitter-Id:   current-users
 > >Arrival-Date:   Sat Feb 13 13:30:01 PST 1999
 > >Closed-Date:
 > >Last-Modified:
 > >Originator:     Donald J. Maddox
 > >Release:        FreeBSD 4.0-CURRENT i386
 > >Organization:
 > >Environment:
 > 
 > >Description:
 > 
 > 	There are several problems with the current X-Files port (of
 > which I am the maintainer):
 > 
 > 1)  The port contains hard-coded paths and does not properly respect
 > ${PREFIX}/${X11BASE}.
 > 
 > 2)  The port is marked broken if $DISPLAY is not set.
 > 
 > 3)  My email address is wrong in the MAINTAINER line.
 > 
 > The patch below attempts to fix these problems.
 > 
 > >How-To-Repeat:
 > 
 > >Fix:
 > 
 > diff -r -u x-files.old/Makefile x-files/Makefile
 > --- x-files.old/Makefile	Fri Feb 12 03:25:16 1999
 > +++ x-files/Makefile	Sat Feb 13 16:06:29 1999
 > @@ -8,23 +8,21 @@
 >  
 >  DISTNAME=       X-Files-1.43
 >  PKGNAME=	x-files-1.43
 > -CATEGORIES=	x11-fm tk80
 > +CATEGORIES=	x11-fm tcl80
 >  MASTER_SITES=   http://java.inf.tu-dresden.de/X-Files/data/
 >  
 > -MAINTAINER=     dmaddox@scsn.net
 > +MAINTAINER=     dmaddox@conterra.com
 >  
 > -BUILD_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
 > -
 > -.if !defined(DISPLAY)
 > -BROKEN=		requires DISPLAY to install
 > -.endif
 > +BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80
 >  
 >  WRKSRC=		${WRKDIR}/X-Files
 >  NO_BUILD=	yes
 >  USE_X_PREFIX=	yes
 >  
 >  pre-install:
 > -	@wish8.0 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
 > +	@tclsh8.0 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
 > +	@sed s#@X11BASE@#${X11BASE}# <${WRKSRC}/X-Files.tcl >${WRKSRC}/tmpfile
 > +	@mv ${WRKSRC}/tmpfile ${WRKSRC}/X-Files.tcl
 >  
 >  do-install:
 >  	@${MKDIR} ${PREFIX}/lib/X11/X-Files
 > diff -r -u x-files.old/patches/patch-aa x-files/patches/patch-aa
 > --- x-files.old/patches/patch-aa	Wed Apr 29 19:46:03 1998
 > +++ x-files/patches/patch-aa	Sat Feb 13 16:06:00 1999
 > @@ -5,7 +5,7 @@
 >  +# The main file for the X-Files
 >  +# The next line is executed by /bin/sh, but not Tcl \
 >  +exec wish8.0 $0 ${1+"$@"}
 > -+set xf(xf_home) "/usr/X11R6/lib/X11/X-Files/"
 > ++set xf(xf_home) "@X11BASE@/lib/X11/X-Files/"
 >   proc MAIN {argc argv} {
 >   global xf xf_image env menu tk_version
 >   
 > diff -r -u x-files.old/scripts/mktclIndex x-files/scripts/mktclIndex
 > --- x-files.old/scripts/mktclIndex	Wed Apr 29 19:46:03 1998
 > +++ x-files/scripts/mktclIndex	Sat Feb 13 16:10:09 1999
 > @@ -1,3 +1,3 @@
 > -#!/usr/local/bin/wish8.0
 > +#!tclsh8.0
 >  auto_mkindex $argv be.tcl ee.tcl re.tcl vfs.tcl xf_sel.tcl
 >  exit
 > >Release-Note:
 > >Audit-Trail:
 > >Unformatted:
 > 
 > To Unsubscribe: send mail to majordomo@FreeBSD.org
 > with "unsubscribe freebsd-ports" in the body of the message
 > 
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Mon Mar 8 12:53:17 PST 1999 
State-Changed-Why:  
Committed, thanks! 
>Unformatted:
