upgrade to 1.47d

PR:		28622
Submitted by:	Paul Marquis <pmarquis@pobox.com>

7 files changed, 22 insertions, 49 deletions

diff --git a/textproc/isearch/Makefile b/textproc/isearch/Makefile
index e68af62892b2..9d87336fb675 100644
--- a/textproc/isearch/Makefile
+++ b/textproc/isearch/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	isearch
-PORTVERSION=	1.14
+PORTVERSION=	1.47d
 CATEGORIES=	textproc databases
-MASTER_SITES=	ftp://ftp.cnidr.org/pub/software/Isearch/
+MASTER_SITES=	http://www.etymon.com/pub/Isearch/
 DISTNAME=	Isearch-${PORTVERSION}
 
 MAINTAINER=	giffunip@asme.org
@@ -20,8 +20,8 @@ post-install:
 	strip ${PREFIX}/bin/Iindex
 	strip ${PREFIX}/bin/Iutil
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/Isearch
-	${INSTALL_MAN} ${WRKSRC}/html/*.html ${PREFIX}/share/doc/Isearch
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/html/*.html ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/isearch/distinfo b/textproc/isearch/distinfo
index 41695902ef15..ac892ee529c6 100644
--- a/textproc/isearch/distinfo
+++ b/textproc/isearch/distinfo
@@ -1 +1 @@
-MD5 (Isearch-1.14.tar.gz) = 66db279449e13602a50715766f250b44
+MD5 (Isearch-1.47d.tar.gz) = 12373e0e54bfc4e195dcaa14554f354b
diff --git a/textproc/isearch/files/patch-aa b/textproc/isearch/files/patch-aa
deleted file mode 100644
index 1cf4cd26e438..000000000000
--- a/textproc/isearch/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Thu Dec  5 22:35:46 1996
-+++ Makefile	Mon Feb 17 10:42:51 1997
-@@ -153,7 +153,7 @@
- 	cp $(BIN_DIR)/Iindex $(INSTALL)/.
- 	cp $(BIN_DIR)/Isearch $(INSTALL)/.
- 	cp $(BIN_DIR)/Iutil $(INSTALL)/.
--	cd $(CGI_DIR); make install
-+#	cd $(CGI_DIR); make install
- 
- srcdist:
- 	make -i distclean;cd ..;tar cvf $(DIST).tar $(DIST);gzip $(DIST).tar
diff --git a/textproc/isearch/files/patch-ab b/textproc/isearch/files/patch-ab
deleted file mode 100644
index 1b3bc147483c..000000000000
--- a/textproc/isearch/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/index.cxx.old	Thu Feb 10 20:39:15 2000
-+++ src/index.cxx	Thu Feb 10 20:39:24 2000
-@@ -530,7 +530,7 @@
- }
- 
- GDT_BOOLEAN INDEX::ValidateInField(const GPTYPE HitGp, const STRING& FieldName,
--			   const PhraseLength) {
-+			   const int PhraseLength) {
-   STRING Fn;
-   Parent->DfdtGetFileName(FieldName, &Fn);
-   PFILE Fp = Parent->ffopen(Fn, "rb");
diff --git a/textproc/isearch/files/patch-ac b/textproc/isearch/files/patch-ac
deleted file mode 100644
index a2470c6c61dd..000000000000
--- a/textproc/isearch/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- doctype/sgmlnorm.cxx.old	Thu Feb 10 20:45:12 2000
-+++ doctype/sgmlnorm.cxx	Thu Feb 10 20:45:23 2000
-@@ -528,7 +528,7 @@
- #ifndef TAG_GROW_SIZE
- #define TAG_GROW_SIZE 128
- #endif
--  const grow_size = TAG_GROW_SIZE;
-+  const int grow_size = TAG_GROW_SIZE;
- #undef TAG_GROW_SIZE
- 
-   // You should allocate character pointers (to tags) as you need them.
diff --git a/textproc/isearch/pkg-descr b/textproc/isearch/pkg-descr
index da2864ccf52b..370f45601b10 100644
--- a/textproc/isearch/pkg-descr
+++ b/textproc/isearch/pkg-descr
@@ -1,6 +1,12 @@
-Isearch is a software system for searching though large amounts of text. 
-The system allows a user to very quickly find out what documents are 
-available that contain certain words. Unlike older search systems, Isearch 
-does not use a list of keywords or an abstract; every word of every 
-document can be checked. This allows greatly improved chances of 
-discovering new information in old collections.
+Isearch is an open source software package for indexing and searching
+text documents.  It supports full text and field based searching,
+relevance ranked results, and Boolean queries, and it can index many
+kinds of documents, including HTML, mail folders, list digests, and
+text with SGML-style mark up.  Additional document types can be added
+as C++ modules.  Isearch also includes CGI tools to provide a web
+interface for searching
+
+WWW: http://www.etymon.com/Isearch/
+
+Paul Marquis
+pmarquis@pobox.com
diff --git a/textproc/isearch/pkg-plist b/textproc/isearch/pkg-plist
index 01c8f2571ffc..0e078fd31725 100644
--- a/textproc/isearch/pkg-plist
+++ b/textproc/isearch/pkg-plist
@@ -1,8 +1,8 @@
 bin/Iindex
 bin/Isearch
 bin/Iutil
-share/doc/Isearch/QuickStart.html
-share/doc/Isearch/IsearchFeatures.html
-share/doc/Isearch/IsearchTutorial.html
-share/doc/Isearch/Isearch-cgi-tutorial.html
-@dirrm share/doc/Isearch
+%%PORTDOCS%%share/doc/isearch/QuickStart.html
+%%PORTDOCS%%share/doc/isearch/IsearchFeatures.html
+%%PORTDOCS%%share/doc/isearch/IsearchTutorial.html
+%%PORTDOCS%%share/doc/isearch/Isearch-cgi-tutorial.html
+%%PORTDOCS%%@dirrm share/doc/isearch