aboutsummaryrefslogtreecommitdiffstats
path: root/x11-fm/x-files
diff options
context:
space:
mode:
authorsteve <steve@FreeBSD.org>1999-03-09 04:55:39 +0800
committersteve <steve@FreeBSD.org>1999-03-09 04:55:39 +0800
commit18b54c67479a79c0c3800f1974c770240785c3dd (patch)
tree8c1cf5e3b6c2ba32105fb9dac5ffa0834d1ca587 /x11-fm/x-files
parent41f0471dace138ad6c63d72fbe03a2c7031a9a11 (diff)
downloadfreebsd-ports-graphics-18b54c67479a79c0c3800f1974c770240785c3dd.tar.gz
freebsd-ports-graphics-18b54c67479a79c0c3800f1974c770240785c3dd.tar.zst
freebsd-ports-graphics-18b54c67479a79c0c3800f1974c770240785c3dd.zip
Fix the following problems noticed by 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. PR: 10068 Submitted by: maintainer
Diffstat (limited to 'x11-fm/x-files')
-rw-r--r--x11-fm/x-files/Makefile15
-rw-r--r--x11-fm/x-files/files/patch-aa2
-rw-r--r--x11-fm/x-files/scripts/mktclIndex2
3 files changed, 9 insertions, 10 deletions
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index 9f6bb4f5a83..4ec79204194 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -3,7 +3,7 @@
# Date created: 14 April 1998
# Whom: Donald J. Maddox <dmaddox@conterra.com>
#
-# $Id: Makefile,v 1.6 1998/12/02 20:08:57 billf Exp $
+# $Id: Makefile,v 1.7 1999/02/12 08:25:16 flathill Exp $
#
DISTNAME= X-Files-1.43
@@ -11,20 +11,19 @@ PKGNAME= x-files-1.43
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 --git a/x11-fm/x-files/files/patch-aa b/x11-fm/x-files/files/patch-aa
index 2c14261efba..23235b79535 100644
--- a/x11-fm/x-files/files/patch-aa
+++ b/x11-fm/x-files/files/patch-aa
@@ -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 --git a/x11-fm/x-files/scripts/mktclIndex b/x11-fm/x-files/scripts/mktclIndex
index 2d8c4de932d..bb152c81b77 100644
--- a/x11-fm/x-files/scripts/mktclIndex
+++ b/x11-fm/x-files/scripts/mktclIndex
@@ -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