From 270565bda9c1c1357aa37a9b565f3bdabfe97159 Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Thu, 12 Dec 2002 13:42:24 +0000 Subject: Fix fetch and update version for www/swish-e Implicit approval by portmgr@ because the original distfiles weren't available on the master_site. PR: ports/45952 Submitted by: Mark Linimon --- www/swish-e/Makefile | 49 ++++++++++++++++++++++++++++++++++++++-------- www/swish-e/distinfo | 2 +- www/swish-e/files/patch-aa | 38 ----------------------------------- www/swish-e/files/patch-ab | 21 -------------------- www/swish-e/pkg-plist | 42 ++++++++++++++++++++++++++++++++++----- 5 files changed, 79 insertions(+), 73 deletions(-) delete mode 100644 www/swish-e/files/patch-aa delete mode 100644 www/swish-e/files/patch-ab diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile index 48cf23d871e1..c56203c82f9a 100644 --- a/www/swish-e/Makefile +++ b/www/swish-e/Makefile @@ -6,22 +6,55 @@ # PORTNAME= swish-e -PORTVERSION= 1.3.2 +PORTVERSION= 2.2.2 CATEGORIES= www textproc MASTER_SITES= http://swish-e.org/Download/ -DISTNAME= swish-efiles.1.3.2 MAINTAINER= doconnor@gsoft.com.au -WRKSRC= ${WRKDIR}/src USE_GMAKE= yes +GNU_CONFIGURE= yes + +LIB_DEPENDS= xml.2:${PORTSDIR}/textproc/libxml2 do-install: - $(INSTALL_PROGRAM) ${WRKSRC}/swish-e ${PREFIX}/bin + $(INSTALL_PROGRAM) ${WRKSRC}/src/swish-e ${PREFIX}/bin $(MKDIR) -p $(PREFIX)/share/examples/swish-e - $(INSTALL_DATA) ${WRKSRC}/user.config ${PREFIX}/share/examples/swish-e - $(INSTALL_DATA) ${WRKSRC}/test.html ${PREFIX}/share/examples/swish-e - $(INSTALL_DATA) ${WRKSRC}/swishspider ${PREFIX}/share/examples/swish-e - $(INSTALL_DATA) ${WRKSRC}/README-SWISH-E ${PREFIX}/share/examples/swish-e + $(INSTALL_DATA) ${WRKSRC}/README ${PREFIX}/share/examples/swish-e + $(INSTALL_DATA) ${WRKSRC}/conf/example1.config ${PREFIX}/share/examples/swish-e + $(INSTALL_DATA) ${WRKSRC}/conf/example2.config ${PREFIX}/share/examples/swish-e + $(INSTALL_DATA) ${WRKSRC}/conf/example3.config ${PREFIX}/share/examples/swish-e + $(INSTALL_DATA) ${WRKSRC}/conf/example4.config ${PREFIX}/share/examples/swish-e + $(INSTALL_DATA) ${WRKSRC}/conf/example5.config ${PREFIX}/share/examples/swish-e + $(INSTALL_DATA) ${WRKSRC}/conf/example6.config ${PREFIX}/share/examples/swish-e + $(INSTALL_DATA) ${WRKSRC}/conf/example7.config ${PREFIX}/share/examples/swish-e + $(INSTALL_DATA) ${WRKSRC}/conf/example8.config ${PREFIX}/share/examples/swish-e + $(INSTALL_DATA) ${WRKSRC}/conf/example9.pl ${PREFIX}/share/examples/swish-e + $(MKDIR) -p $(PREFIX)/share/examples/swish-e/stopwords + $(INSTALL_DATA) ${WRKSRC}/conf/stopwords/dutch.txt ${PREFIX}/share/examples/swish-e/stopwords + $(INSTALL_DATA) ${WRKSRC}/conf/stopwords/english.txt ${PREFIX}/share/examples/swish-e/stopwords + $(INSTALL_DATA) ${WRKSRC}/conf/stopwords/german.txt ${PREFIX}/share/examples/swish-e/stopwords + $(INSTALL_DATA) ${WRKSRC}/conf/stopwords/spanish.txt ${PREFIX}/share/examples/swish-e/stopwords + $(MKDIR) -p $(PREFIX)/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/CHANGES.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/INSTALL.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/README.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/SWISH-3.0.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/SWISH-BUGS.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/SWISH-CONFIG.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/SWISH-FAQ.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/SWISH-LIBRARY.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/SWISH-PERL.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/SWISH-RUN.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/SWISH-SEARCH.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/index.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/index_long.html ${PREFIX}/share/doc/swish-e + $(INSTALL_DATA) ${WRKSRC}/html/style.css ${PREFIX}/share/doc/swish-e + $(MKDIR) -p $(PREFIX)/share/doc/swish-e/images + $(INSTALL_DATA) ${WRKSRC}/html/images/dotrule1.gif ${PREFIX}/share/doc/swish-e/images + $(INSTALL_DATA) ${WRKSRC}/html/images/swish.gif ${PREFIX}/share/doc/swish-e/images + $(INSTALL_DATA) ${WRKSRC}/html/images/swish2.gif ${PREFIX}/share/doc/swish-e/images + $(INSTALL_DATA) ${WRKSRC}/html/images/swish2b.gif ${PREFIX}/share/doc/swish-e/images + $(INSTALL_DATA) ${WRKSRC}/html/images/swishbanner1.gif ${PREFIX}/share/doc/swish-e/images .include diff --git a/www/swish-e/distinfo b/www/swish-e/distinfo index b4f2e7c8ab2a..90db98af367d 100644 --- a/www/swish-e/distinfo +++ b/www/swish-e/distinfo @@ -1 +1 @@ -MD5 (swish-efiles.1.3.2.tar.gz) = d718824165a4af150a47b072889a0f16 +MD5 (swish-e-2.2.2.tar.gz) = 5a3ba1f5d980da2c2eb8059ae1cd7095 diff --git a/www/swish-e/files/patch-aa b/www/swish-e/files/patch-aa deleted file mode 100644 index 0d59a382d762..000000000000 --- a/www/swish-e/files/patch-aa +++ /dev/null @@ -1,38 +0,0 @@ ---- fs.c.old Fri Nov 27 13:30:13 1998 -+++ fs.c Fri Nov 27 13:32:19 1998 -@@ -539,23 +539,28 @@ - int ishtml(filename) - char *filename; - { -- char *c, suffix[MAXSUFFIXLEN]; -+ char *c, *d; - -+ d = (char *) strrchr(filename, '/'); - c = (char *) strrchr(filename, '.'); - -+ /* make sure the . is part of the filename */ -+ if (d != NULL && c < d) { -+ return 0; -+ } -+ - if (c == NULL) - return 0; -- strcpy(suffix, c + 1); -- if (suffix[0] == '\0') -+ if (c++ == '\0') - return 0; - -- if (!strncmp(suffix, "htm", 3)) -+ if (!strncmp(c, "htm", 3)) - return 1; -- else if (!strncmp(suffix, "HTM", 3)) -+ else if (!strncmp(c, "HTM", 3)) - return 1; -- else if (!strncmp(suffix, "shtml", 5)) -+ else if (!strncmp(c, "shtml", 5)) - return 1; -- else if (!strncmp(suffix, "SHTML", 5)) -+ else if (!strncmp(c, "SHTML", 5)) - return 1; - return 0; - } diff --git a/www/swish-e/files/patch-ab b/www/swish-e/files/patch-ab deleted file mode 100644 index 6dc0223b7a5c..000000000000 --- a/www/swish-e/files/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -*** Makefile.orig Mon May 3 12:23:45 1999 ---- Makefile Mon May 3 12:24:04 1999 -*************** -*** 8,15 **** - #CC= /opt/SUNWspro/bin/cc - #CC= /usr/ccs/bin/ucbcc - #CC = /vol/moby/moby_a/gnu/sun4_sunos5.1/bin/gcc -! CC = /usr/local/bin/gcc -! #CC = gcc - - #CFLAGS = -Xa - CFLAGS= -O2 ---- 8,15 ---- - #CC= /opt/SUNWspro/bin/cc - #CC= /usr/ccs/bin/ucbcc - #CC = /vol/moby/moby_a/gnu/sun4_sunos5.1/bin/gcc -! #CC = /usr/local/bin/gcc -! CC = gcc - - #CFLAGS = -Xa - CFLAGS= -O2 diff --git a/www/swish-e/pkg-plist b/www/swish-e/pkg-plist index 996c9a863385..dfecc9678630 100644 --- a/www/swish-e/pkg-plist +++ b/www/swish-e/pkg-plist @@ -1,6 +1,38 @@ -share/examples/swish-e/user.config -share/examples/swish-e/test.html -share/examples/swish-e/swishspider -share/examples/swish-e/README-SWISH-E -bin/swish-e +share/doc/swish-e/CHANGES.html +share/doc/swish-e/INSTALL.html +share/doc/swish-e/README.html +share/doc/swish-e/SWISH-3.0.html +share/doc/swish-e/SWISH-BUGS.html +share/doc/swish-e/SWISH-CONFIG.html +share/doc/swish-e/SWISH-FAQ.html +share/doc/swish-e/SWISH-LIBRARY.html +share/doc/swish-e/SWISH-PERL.html +share/doc/swish-e/SWISH-RUN.html +share/doc/swish-e/SWISH-SEARCH.html +share/doc/swish-e/index.html +share/doc/swish-e/index_long.html +share/doc/swish-e/style.css +share/doc/swish-e/images/dotrule1.gif +share/doc/swish-e/images/swish.gif +share/doc/swish-e/images/swish2.gif +share/doc/swish-e/images/swish2b.gif +share/doc/swish-e/images/swishbanner1.gif +@dirrm share/doc/swish-e/images +@dirrm share/doc/swish-e +share/examples/swish-e/README +share/examples/swish-e/example1.config +share/examples/swish-e/example2.config +share/examples/swish-e/example3.config +share/examples/swish-e/example4.config +share/examples/swish-e/example5.config +share/examples/swish-e/example6.config +share/examples/swish-e/example7.config +share/examples/swish-e/example8.config +share/examples/swish-e/example9.pl +share/examples/swish-e/stopwords/dutch.txt +share/examples/swish-e/stopwords/english.txt +share/examples/swish-e/stopwords/german.txt +share/examples/swish-e/stopwords/spanish.txt +@dirrm share/examples/swish-e/stopwords @dirrm share/examples/swish-e +bin/swish-e -- cgit v1.2.3