From c0ffc2300c78fea3272c0703b9a546aad7692a4c Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 13 Mar 2009 22:36:38 +0000 Subject: [PATCH] convert to tk.port.mk to fix pkgspec; add license marker and some PERMIT...=Yes (at some point this was changed to Artistic License). bump. --- misc/tkman/Makefile | 21 +++++++++++++-------- misc/tkman/patches/patch-Makefile | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile index dc54b5de67c..0f8a6d6d24f 100644 --- a/misc/tkman/Makefile +++ b/misc/tkman/Makefile @@ -1,29 +1,34 @@ -# $OpenBSD: Makefile,v 1.19 2007/09/15 23:54:17 merdely Exp $ +# $OpenBSD: Makefile,v 1.20 2009/03/13 22:36:38 sthen Exp $ COMMENT= Tcl/Tk-based manual browser DISTNAME= tkman-2.1 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= misc HOMEPAGE= http://tkman.sourceforge.net/ -PERMIT_PACKAGE_CDROM= no fee +# Artistic License +PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= no fee +PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkman/} -LIB_DEPENDS= tk84:tk-8.4.*:x11/tk/8.4 -RUN_DEPENDS= ::textproc/rman \ +MODULES= x11/tk +MODTCL_VERSION= 8.4 +MODTK_VERSION= 8.4 +RUN_DEPENDS= ${MODTK_RUN_DEPENDS} \ + ::textproc/rman \ ::textproc/glimpse NO_REGRESS= Yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/tkman ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/retkman ${PREFIX}/bin + @${MODTCL_WISH_ADJ} ${WRKSRC}/tkman ${WRKSRC}/retkman + ${INSTALL_SCRIPT} ${WRKSRC}/tkman ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/retkman ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkman ${INSTALL_DATA} ${WRKSRC}/tkman-help.html ${PREFIX}/share/doc/tkman diff --git a/misc/tkman/patches/patch-Makefile b/misc/tkman/patches/patch-Makefile index 33bc3b0ad42..5cb07fb607e 100644 --- a/misc/tkman/patches/patch-Makefile +++ b/misc/tkman/patches/patch-Makefile @@ -1,14 +1,14 @@ -$OpenBSD: patch-Makefile,v 1.2 2003/12/27 23:38:02 jose Exp $ ---- Makefile.orig Thu Jun 22 16:39:42 2000 -+++ Makefile Mon Dec 23 01:33:34 2002 -@@ -26,14 +26,12 @@ mintk = 8.3 +$OpenBSD: patch-Makefile,v 1.3 2009/03/13 22:36:38 sthen Exp $ +--- Makefile.orig Thu Jun 22 23:39:42 2000 ++++ Makefile Fri Mar 13 22:27:07 2009 +@@ -26,14 +26,13 @@ mintk = 8.3 ### you need to localize the paths on these lines #WISH = /usr/sww/tcl-8.3/bin/wish -WISH = /private/share/bin/wish ++WISH = wish #WISH = /private/share/bin/wish8.3 --#WISH = /usr/local/bin/wish8.3 -+WISH = /usr/local/bin/wish8.4 + #WISH = /usr/local/bin/wish8.3 # the executable `tkman' is placed in BINDIR # this should be a directory that's in your bin PATH @@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.2 2003/12/27 23:38:02 jose Exp $ # OPTIONAL -@@ -81,9 +79,9 @@ rfcdir = "" +@@ -81,9 +80,9 @@ rfcdir = "" # will examine for matches if a search in the usual locations fails while searching # for a man pages and displaying its associated binaries (if any). # Use this feature carefully as a large number of directories can slow down startup. @@ -30,7 +30,7 @@ $OpenBSD: patch-Makefile,v 1.2 2003/12/27 23:38:02 jose Exp $ #masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin" -@@ -114,7 +112,7 @@ dpis = "75 100" +@@ -114,7 +113,7 @@ dpis = "75 100" # Lines are cached in .../man/cat@; # that is, the line length is appended to the usual cache directory names #manformat = {groff -te -Tascii -man /tmp/ll -} @@ -39,7 +39,7 @@ $OpenBSD: patch-Makefile,v 1.2 2003/12/27 23:38:02 jose Exp $ # Ultrix users should uncomment the following line (you don't have eqn) #manformat = {tbl | nroff -man } # HP-UX uses a number of macros that groff doesn't define, so use the builtin nroff -@@ -122,7 +120,7 @@ manformat = {groff -te -Tlatin1 -man /tm +@@ -122,7 +121,7 @@ manformat = {groff -te -Tlatin1 -man /tmp/ll -} # space between the .de and the macro name, and groff doesn't like this.) #manformat = {tbl | neqn | nroff -man } # BSD macros (.Sh, .Ss, .PP, ...) need -mandoc @@ -48,7 +48,7 @@ $OpenBSD: patch-Makefile,v 1.2 2003/12/27 23:38:02 jose Exp $ # BSDI #manformat = {tbl | eqn -Tascii | nroff -man } # It's actually legal to leave this empty if all the pages you'll ever -@@ -166,14 +164,14 @@ zlist = {gz z Z} +@@ -166,14 +165,14 @@ zlist = {gz z Z} # pick a printing pipeline for which your platform has all the constituants @@ -65,7 +65,7 @@ $OpenBSD: patch-Makefile,v 1.2 2003/12/27 23:38:02 jose Exp $ # printing string for preformatted pages without [tn]roff source #catprint = lpr #catprint = "lpr -h" -@@ -202,7 +200,7 @@ shortnames = 0 +@@ -202,7 +201,7 @@ shortnames = 0 # the right-topmost menu's Rebuild Database/Glimpse Index menu choice. # BY DEFAULT ON (Boolean scope set to entire file) @@ -74,7 +74,7 @@ $OpenBSD: patch-Makefile,v 1.2 2003/12/27 23:38:02 jose Exp $ # IF YOU DON'T WANT TO BOTHER WITH GLIMPSE, you can disable it here #glimpse = "" # give the full path, if you'd like -@@ -210,6 +208,7 @@ glimpse = "glimpse -W" +@@ -210,6 +209,7 @@ glimpse = "glimpse -W" # variations (refer to the Glimpse manual page) # no characters treated as meta characters: #glimpse = "glimpse -Wk" @@ -82,7 +82,7 @@ $OpenBSD: patch-Makefile,v 1.2 2003/12/27 23:38:02 jose Exp $ # compressed manual pages are handled automatically; don't add -z to above # glimpseindex indexes the manual pages, for each component of one's MANPATH, -@@ -462,7 +461,7 @@ install: tkman retkman +@@ -462,7 +462,7 @@ install: tkman retkman chmod +rx $(BINDIR)/tkman $(CP) retkman $(BINDIR) chmod +rx $(BINDIR)/retkman