diff options
author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2003-11-06 02:24:42 +0000 |
---|---|---|
committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2003-11-06 02:24:42 +0000 |
commit | 9a4ad553c6e48047fd2c4efa4a00da88a9e6309c (patch) | |
tree | 31456d3c7c3a6568689f971a580e0f21428af962 | |
parent | I should use ${PATCHDIR} for extra patches not ${FILESDIR} (diff) |
repo-copy sgrep to sgrep2 and upgrade sgrep2 to 1.92a
set CONFLICT in sgrep and sgrep2 Makefile
Notes
Notes:
svn path=/head/; revision=93206
-rw-r--r-- | textproc/Makefile | 1 | ||||
-rw-r--r-- | textproc/sgrep/Makefile | 3 | ||||
-rw-r--r-- | textproc/sgrep2/Makefile | 25 | ||||
-rw-r--r-- | textproc/sgrep2/distinfo | 2 | ||||
-rw-r--r-- | textproc/sgrep2/files/patch-aa | 30 | ||||
-rw-r--r-- | textproc/sgrep2/files/patch-ab | 11 | ||||
-rw-r--r-- | textproc/sgrep2/pkg-descr | 23 | ||||
-rw-r--r-- | textproc/sgrep2/pkg-plist | 3 |
8 files changed, 33 insertions, 65 deletions
diff --git a/textproc/Makefile b/textproc/Makefile index f6fac1d19420..c6ba7dad4f3c 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -441,6 +441,7 @@ SUBDIR += sgmltools SUBDIR += sgmltools-lite SUBDIR += sgrep + SUBDIR += sgrep2 SUBDIR += sk-aspell SUBDIR += smartdoc SUBDIR += smartdoc-devel diff --git a/textproc/sgrep/Makefile b/textproc/sgrep/Makefile index b09cd4233c36..16036e9b8325 100644 --- a/textproc/sgrep/Makefile +++ b/textproc/sgrep/Makefile @@ -7,12 +7,15 @@ PORTNAME= sgrep PORTVERSION= 0.99 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/ MAINTAINER= jkoshy@freebsd.org COMMENT= A `grep' for structured text like SGML and HTML +CONFLICT= sgrep2 + MAN1= sgrep.1 # Override the install target in the supplied makefile diff --git a/textproc/sgrep2/Makefile b/textproc/sgrep2/Makefile index b09cd4233c36..a68d95d2faa8 100644 --- a/textproc/sgrep2/Makefile +++ b/textproc/sgrep2/Makefile @@ -1,24 +1,25 @@ -# New ports collection makefile for: sgrep -# Date created: Apr 29 1998 -# Whom: <koshy@india.hp.com> +# ex:ts=8 +# Ports collection makefile for: sgrep2 +# Date created: Oct 31, 2003 +# Whom: ijliao # # $FreeBSD$ # -PORTNAME= sgrep -PORTVERSION= 0.99 +PORTNAME= sgrep2 +PORTVERSION= 1.92a CATEGORIES= textproc MASTER_SITES= ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/ +DISTNAME= sgrep-${PORTVERSION} -MAINTAINER= jkoshy@freebsd.org +MAINTAINER= ports@FreeBSD.org COMMENT= A `grep' for structured text like SGML and HTML -MAN1= sgrep.1 +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --datadir=${DATADIR} + +CONFLICT= sgrep -# Override the install target in the supplied makefile -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sgrep ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/sgrep.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/sample.sgreprc ${PREFIX}/share/sgreprc +MAN1= sgrep.1 .include <bsd.port.mk> diff --git a/textproc/sgrep2/distinfo b/textproc/sgrep2/distinfo index 67caeb5d7f9f..2fd270d5aeb1 100644 --- a/textproc/sgrep2/distinfo +++ b/textproc/sgrep2/distinfo @@ -1 +1 @@ -MD5 (sgrep-0.99.tar.gz) = af09a90c4f1929bfae4818c8962a8907 +MD5 (sgrep-1.92a.tar.gz) = 99eb1ed515648f653fc7be45e0896378 diff --git a/textproc/sgrep2/files/patch-aa b/textproc/sgrep2/files/patch-aa deleted file mode 100644 index d4e33b33f4dd..000000000000 --- a/textproc/sgrep2/files/patch-aa +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile-- Wed Apr 29 12:08:55 1998 -+++ Makefile Wed Apr 29 12:20:29 1998 -@@ -10,11 +10,11 @@ - # - - # This is where the executable goes --BINDIR = /usr/local/bin/ -+BINDIR = ${PREFIX}/bin - # Where sgrep library files are placed (sgreprc) --LIBDIR = /usr/local/lib -+LIBDIR = ${PREFIX}/share - # Where the manual page goes --MANFILE = /usr/local/man/man1/sgrep.1 -+MANFILE = ${PREFIX}/man/man1/sgrep.1 - # Where the sample rc file goes - RCFILE = $(LIBDIR)/sgreprc - # If you can't install as root you might wan't to use this as rc file -@@ -45,11 +45,7 @@ - clean: - -rm -f $(OBJECTS) - --install: sgrep -- cp sgrep $(BINDIR)/sgrep -- chmod 755 $(BINDIR)/sgrep -- cp sgrep.1 $(MANFILE) -- chmod 644 $(MANFILE) -+install: - - install.rc: sample.sgreprc - cp sample.sgreprc $(RCFILE) diff --git a/textproc/sgrep2/files/patch-ab b/textproc/sgrep2/files/patch-ab deleted file mode 100644 index 25d8e32eaa4d..000000000000 --- a/textproc/sgrep2/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- sgrep.1-- Wed Apr 29 12:26:40 1998 -+++ sgrep.1 Wed Apr 29 12:26:49 1998 -@@ -91,7 +91,7 @@ - \fB$HOME/.sgreprc,\fP - or if it doesn't exist, - from file --\fB/usr/lib/sgreprc, \fP -+\fB/usr/local/share/sgreprc, \fP - and then from the command line. Different behavior - can be specified through command line options. - .Pp diff --git a/textproc/sgrep2/pkg-descr b/textproc/sgrep2/pkg-descr index d017991b0e2c..66346851e5cc 100644 --- a/textproc/sgrep2/pkg-descr +++ b/textproc/sgrep2/pkg-descr @@ -1,13 +1,16 @@ -`sgrep' (structured grep) is a tool for searching text files and -filtering text streams using structural criteria. Complex criteria -can be specified as macros using M4. +sgrep (structured grep) is a tool for searching and indexing text, SGML,XML +and HTML files and filtering text streams using structural criteria. The data +model of sgrep is based on regions, which are nonempty substrings of text. +Regions are typically occurrences of constant strings, SGML-tags, or meaningful +text elements, which are recognizable through some delimiting strings or the +builtin SGML, XML and HTML parser. Regions can be arbitrarily long, arbitrarily +overlapping, and arbitrarily nested. -Sgrep was created by: - - Jani Jaakkola, email:Jani.Jaakkola@helsinki.fi - Pekka Kilpelainen, email: Pekka.Kilpelainen@helsinki.fi +Sgrep is a convenient tool for making queries to almost any kind of text files +with some well kown structure. These include programs, mail folders, news +folders, HTML, SGML, etc... With relatively simple queries you can display mail +messages by their subject or sender, extract titles or links or any regions +from HTML files, function prototypes from C or make complex queries to SGML +files based on the DTD of the file. WWW: http://www.cs.helsinki.fi/u/jjaakkol/sgrep.html - -- Koshy - <jkoshy@acm.org> diff --git a/textproc/sgrep2/pkg-plist b/textproc/sgrep2/pkg-plist index 23474556557d..49ca7c29fb63 100644 --- a/textproc/sgrep2/pkg-plist +++ b/textproc/sgrep2/pkg-plist @@ -1,2 +1,3 @@ bin/sgrep -share/sgreprc +%%DATADIR%%/sample.sgreprc +@dirrm %%DATADIR%% |