cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.2.5.

Browse Source 
Install textsearch in the right place.
Better patches. Less file shenanigans.
This commit is contained in:
stu 2017-05-05 04:10:48 +00:00
parent 5afe4fffea
commit f3952e2c90
5 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/nagelfar/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2014/08/30 17:16:47 stu Exp $
# $OpenBSD: Makefile,v 1.7 2017/05/05 04:10:48 stu Exp $
COMMENT = syntax analysis tool for Tcl
DISTNAME = nagelfar12
PKGNAME = nagelfar-1.2
DISTNAME = nagelfar125
PKGNAME = nagelfar-1.2.5
CATEGORIES = devel
HOMEPAGE = http://nagelfar.sourceforge.net/
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
@ -25,13 +25,11 @@ NF_PDB_DIR = ${NF_LIB_DIR}/packagedb
TS_SRC_DIR = ${WRKSRC}/lib/textsearch
TS_DOC_DIR = ${PREFIX}/share/doc/textsearch
TS_EXA_DIR = ${PREFIX}/share/examples/textsearch
MOD_DIR = ${DESTDIR}${MODTCL_MODDIR}/${MODTCL_VERSION}
MOD_DIR = ${DESTDIR}${MODTCL_MODDIR}/85
do-configure:
@${MODTCL_TCLSH_ADJ} ${WRKSRC}/nagelfar.tcl
@${SUBST_CMD} ${WRKSRC}/nagelfar.tcl
@${MODTCL_TCLSH_ADJ} ${TS_SRC_DIR}/examples/demo.tcl
@${SUBST_CMD} ${TS_SRC_DIR}/examples/demo.tcl
do-install:
${INSTALL_DATA_DIR} ${NF_LIB_DIR} ${NF_DOC_DIR} ${NF_PDB_DIR}
@ -41,7 +39,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/COPYING ${NF_DOC_DIR}
${INSTALL_DATA} ${WRKSRC}/packagedb/*.tcl ${NF_PDB_DIR}
${INSTALL_DATA_DIR} ${TS_DOC_DIR} ${TS_EXA_DIR} ${MOD_DIR}
${INSTALL_DATA} ${TS_SRC_DIR}/tcl/textsearch.tcl ${MOD_DIR}/textSearch-0.3.tm
${INSTALL_DATA} ${TS_SRC_DIR}/tcl/textsearch.tcl ${MOD_DIR}/textSearch-0.4.tm
${INSTALL_DATA} ${TS_SRC_DIR}/doc/readme.txt ${TS_DOC_DIR}
${INSTALL_SCRIPT} ${TS_SRC_DIR}/examples/demo.tcl ${TS_EXA_DIR}

4
devel/nagelfar/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nagelfar12.tar.gz) = htmC3lYRhZ/5EVftdjpHyuXcIpd+5f2pStor4U6EH7k=
SIZE (nagelfar12.tar.gz) = 110427
SHA256 (nagelfar125.tar.gz) = NG7NcWtzBEHqL/4iRZGmuDWEE8hWUqJCXxtddxyYNu8=
SIZE (nagelfar125.tar.gz) = 121161

9
devel/nagelfar/patches/patch-lib_textsearch_examples_demo_tcl
View File

@ -1,13 +1,14 @@
$OpenBSD: patch-lib_textsearch_examples_demo_tcl,v 1.1.1.1 2012/08/09 04:53:10 stu Exp $
--- lib/textsearch/examples/demo.tcl.orig Sat Sep 22 13:59:17 2007
+++ lib/textsearch/examples/demo.tcl Sun Nov 27 22:22:04 2011
$OpenBSD: patch-lib_textsearch_examples_demo_tcl,v 1.2 2017/05/05 04:10:48 stu Exp $
Index: lib/textsearch/examples/demo.tcl
--- lib/textsearch/examples/demo.tcl.orig
+++ lib/textsearch/examples/demo.tcl
@@ -47,10 +47,7 @@ menu .m.f
menu .m.s
textSearch::searchMenu .m.s
-foreach dir {. tcl ../tcl} {
- if {![catch {set ch [open [file join $dir textsearch.tcl] r]}]} {
+ if {![catch {set ch [open ${PREFIX}/share/doc/textsearch/readme.txt r]}]} {
+ if {![catch {set ch [open [file join [file dirname [::tcl::pkgconfig get libdir,install]] share doc textsearch readme.txt] r]}]} {
$w insert end [read $ch]
close $ch
- break

34
devel/nagelfar/patches/patch-nagelfar_tcl
View File

@ -1,32 +1,34 @@
$OpenBSD: patch-nagelfar_tcl,v 1.2 2014/08/30 17:16:47 stu Exp $
--- nagelfar.tcl.orig Fri Jan 4 17:05:06 2013
+++ nagelfar.tcl Sat Aug 30 03:34:20 2014
@@ -46,15 +46,15 @@ while {[file type $tmplink] == "link"} {
$OpenBSD: patch-nagelfar_tcl,v 1.3 2017/05/05 04:10:48 stu Exp $
Index: nagelfar.tcl
--- nagelfar.tcl.orig
+++ nagelfar.tcl
@@ -50,15 +50,13 @@ while {[file type $tmplink] == "link"} {
unset tmplink
# This makes it possible to customize where files are installed
-set dbDir $thisDir
-set docDir $thisDir/doc
+set dbDir ${PREFIX}/libdata/nagelfar
+set docDir ${PREFIX}/share/doc/nagelfar
+set dbDir [file join [file dirname [::tcl::pkgconfig get libdir,install]] libdata nagelfar]
+set docDir [file join [file dirname [::tcl::pkgconfig get libdir,install]] share doc nagelfar]
set libDir $thisDir/lib
# Search where the script is, to be able to place e.g. ctext there.
if {[info exists ::starkit::topdir]} {
lappend auto_path [file dirname [file normalize $::starkit::topdir]]
} else {
-} else {
- lappend auto_path $libDir
+ #lappend auto_path $libDir
}
set version "Version 1.2.5 2017-01-09"
#----------------------------------------------------------------------
# Nagelfar, a syntax checker for Tcl.
@@ -5768,6 +5768,10 @@ proc PluginSearchPath {} {
lappend dirs [file join $::thisDir .. .. plugins]
lappend dirs [file join $::thisDir .. plugins]
return $dirs
+}
+
+proc PluginSearchPath {} {
@@ -6149,11 +6147,7 @@ proc addOptionsMenu {m} {
#----------------------------------------------------------------------
proc PluginSearchPath {} {
- set dirs [list . ./plugins]
- lappend dirs [file join $::thisDir .. ..]
- lappend dirs [file join $::thisDir .. .. plugins]
- lappend dirs [file join $::thisDir .. plugins]
- return $dirs
+ return [list . ./nagelfar_plugins ~/nagelfar_plugins]
}

12
devel/nagelfar/pkg/PLIST
View File

@ -1,11 +1,19 @@
@comment $OpenBSD: PLIST,v 1.2 2014/08/30 17:16:47 stu Exp $
@comment $OpenBSD: PLIST,v 1.3 2017/05/05 04:10:48 stu Exp $
bin/nagelfar
lib/tcl/modules/${MODTK_VERSION}/textSearch-0.3.tm
lib/tcl/modules/85/textSearch-0.4.tm
libdata/nagelfar/
libdata/nagelfar/packagedb/
libdata/nagelfar/packagedb/fileutildb.tcl
libdata/nagelfar/packagedb/ftpdb.tcl
libdata/nagelfar/packagedb/inifiledb.tcl
libdata/nagelfar/packagedb/makepkg.tcl
libdata/nagelfar/packagedb/makepkg2.tcl
libdata/nagelfar/packagedb/profilerdb.tcl
libdata/nagelfar/packagedb/registrydb.tcl
libdata/nagelfar/packagedb/snitdb.tcl
libdata/nagelfar/packagedb/sqlite3db.tcl
libdata/nagelfar/packagedb/struct_listdb.tcl
libdata/nagelfar/packagedb/textutildb.tcl
libdata/nagelfar/packagedb/tkdnddb.tcl
libdata/nagelfar/packagedb/vfs_mk4db.tcl
libdata/nagelfar/syntaxbuild.tcl