diff options
-rw-r--r-- | misc/tkman/Makefile | 11 | ||||
-rw-r--r-- | misc/tkman/files/patch-ab | 22 |
2 files changed, 17 insertions, 16 deletions
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile index 262bc5f09231..6fb53f9755e6 100644 --- a/misc/tkman/Makefile +++ b/misc/tkman/Makefile @@ -14,12 +14,13 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A Tcl/Tk based manual browser -LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -RUN_DEPENDS= rman:${PORTSDIR}/textproc/rman \ - glimpse:${PORTSDIR}/textproc/glimpse +RUN_DEPENDS= glimpse:${PORTSDIR}/textproc/glimpse \ + rman:${PORTSDIR}/textproc/rman +USE_TK= yes USE_GMAKE= yes -MAKE_ARGS= WISH="${PREFIX}/bin/wish8.4" \ +USE_DOS2UNIX= yes +MAKE_ARGS= WISH="${WISH}" \ texinfodir="${PREFIX}/${INFO_PATH}" \ gzgrep="\"/usr/bin/zgrep -E\"" \ mastermen="\"/usr/share/man ${PREFIX}/man ${LOCALBASE}/man\"" \ @@ -28,7 +29,7 @@ MAKE_ARGS= WISH="${PREFIX}/bin/wish8.4" \ manprint="{groff -mandoc -Tps -te -l}" post-patch: - @${REINPLACE_CMD} -e "s;/usr/local/bin/wish;${PREFIX}/bin/wish8.4;" \ + @${REINPLACE_CMD} -e 's|/usr/local/bin/wish|${WISH}|' \ ${WRKSRC}/contrib/tkmanclient do-install: diff --git a/misc/tkman/files/patch-ab b/misc/tkman/files/patch-ab index 1e88eee37ee7..9595c9ccc428 100644 --- a/misc/tkman/files/patch-ab +++ b/misc/tkman/files/patch-ab @@ -1,14 +1,14 @@ --- tkmandesc.tcl.orig Wed Apr 2 01:31:38 2003 +++ tkmandesc.tcl Sun Oct 19 11:09:54 2003 @@ -224,8 +224,9 @@ - set mani(manTitleList) $man(manTitleList)
-
- if {![info exists env(MANPATH)] || [string trim $env(MANPATH)] eq ""} {
-- puts stderr "You must set a MANPATH environment variable,\nwhich is a colon-separated list of directories in which\nto find man pages, for example /usr/man:/usr/share/man.\n(See the help page for an explanation of why\nalternatives to the MANPATH are a bad thing.)"
-- exit 1
-+# puts stderr "You must set a MANPATH environment variable,\nwhich is a colon-separated list of directories in which\nto find man pages, for example /usr/man:/usr/share/man.\n(See the help page for an explanation of why\nalternatives to the MANPATH are a bad thing.)"
-+# exit 1
-+ set env(MANPATH) [join $manx(mastermen) ":"]
- }
- set manx(MANPATH0) $env(MANPATH)
-
+ set mani(manTitleList) $man(manTitleList) + + if {![info exists env(MANPATH)] || [string trim $env(MANPATH)] eq ""} { +- puts stderr "You must set a MANPATH environment variable,\nwhich is a colon-separated list of directories in which\nto find man pages, for example /usr/man:/usr/share/man.\n(See the help page for an explanation of why\nalternatives to the MANPATH are a bad thing.)" +- exit 1 ++# puts stderr "You must set a MANPATH environment variable,\nwhich is a colon-separated list of directories in which\nto find man pages, for example /usr/man:/usr/share/man.\n(See the help page for an explanation of why\nalternatives to the MANPATH are a bad thing.)" ++# exit 1 ++ set env(MANPATH) [join $manx(mastermen) ":"] + } + set manx(MANPATH0) $env(MANPATH) + |