Below is an update to swish-e and its perl components.
- Two new APIs were added, so minor library bump
- Patched usage in swish-e.c to reference `swish-e` instead of `swish`
- Patched usege in swish-e.1 to reference `swish-e` instead of `swish`
- Changed Makefile to use "VAR =" instead of "VAR="
- Perl port updated to use new dist file (and removed an uneeded
patch), but its version didn't change.
Lightly tested on i386, macppc & alpha.
ok?
-ME
Index: swish-e//Makefile
===================================================================
RCS file: /cvs/ports/textproc/swish-e/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- swish-e//Makefile 19 Oct 2010 07:54:26 -0000 1.3
+++ swish-e//Makefile 26 Oct 2010 05:44:49 -0000
@@ -1,30 +1,29 @@
# $OpenBSD: Makefile,v 1.3 2010/10/19 07:54:26 espie Exp $
-COMMENT= web/text search engine
+COMMENT = web/text search engine
-DISTNAME= swish-e-2.4.5
-PKGNAME= ${DISTNAME}p0
-SHARED_LIBS= swish-e 2.0
-CATEGORIES= textproc www
+DISTNAME = swish-e-2.4.7
+SHARED_LIBS = swish-e 2.1
+CATEGORIES = textproc www
-HOMEPAGE= http://swish-e.org/
-MASTER_SITES= ${HOMEPAGE}distribution/
+HOMEPAGE = http://swish-e.org/
+MASTER_SITES = ${HOMEPAGE}distribution/
-MAINTAINER= Michael Erdely <[email protected]>
+MAINTAINER = Michael Erdely <[email protected]>
# GPLv2
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
-MODULES= converters/libiconv
-WANTLIB= c m z
+MODULES = converters/libiconv
+WANTLIB = c m z
-LIB_DEPENDS= pcreposix,pcre::devel/pcre \
+LIB_DEPENDS = pcreposix,pcre::devel/pcre \
xml2::textproc/libxml
-RUN_DEPENDS= ::www/p5-URI \
+RUN_DEPENDS = ::www/p5-URI \
::www/p5-libwww \
::www/p5-HTML-Parser \
:p5-HTML-Tagset->=3:www/p5-HTML-Tagset \
@@ -32,9 +31,9 @@ RUN_DEPENDS= ::www/p5-URI \
::www/p5-HTML-FillInForm \
::www/p5-HTML-Template
-USE_LIBTOOL= Yes
-USE_GROFF = Yes
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --with-pcre
+USE_LIBTOOL = Yes
+USE_GROFF = Yes
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS += --with-pcre
.include <bsd.port.mk>
Index: swish-e//distinfo
===================================================================
RCS file: /cvs/ports/textproc/swish-e/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- swish-e//distinfo 11 Sep 2007 20:52:49 -0000 1.1.1.1
+++ swish-e//distinfo 25 Oct 2010 11:27:06 -0000
@@ -1,5 +1,5 @@
-MD5 (swish-e-2.4.5.tar.gz) = /q5cofX0NSGQFWtUoZwBUw==
-RMD160 (swish-e-2.4.5.tar.gz) = uJ2MyNj4UNLd8LUrWDocscDzwbM=
-SHA1 (swish-e-2.4.5.tar.gz) = npNYDvdcNy6yMrwKSUDOdvQah/Y=
-SHA256 (swish-e-2.4.5.tar.gz) = H+lr+hiz5je9M/OjemY39eDP1v87YkQOrBvtPn76lgA=
-SIZE (swish-e-2.4.5.tar.gz) = 1474881
+MD5 (swish-e-2.4.7.tar.gz) = c223plrtSLs+JYfFKDNkLQ==
+RMD160 (swish-e-2.4.7.tar.gz) = rUNuy2lUnPklMbtoGRhEIwm2O4k=
+SHA1 (swish-e-2.4.7.tar.gz) = CXDF+Nyy8SEws4qfx92ZwvLX68s=
+SHA256 (swish-e-2.4.7.tar.gz) = Xd1UH/jss8eK1sp2x55iD0V/rJ99ByGth+n6Iv6ZeWI=
+SIZE (swish-e-2.4.7.tar.gz) = 1523786
Index: swish-e//patches/patch-conf_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/swish-e/patches/patch-conf_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-conf_Makefile_in
--- swish-e//patches/patch-conf_Makefile_in 11 Sep 2007 20:52:49 -0000
1.1.1.1
+++ swish-e//patches/patch-conf_Makefile_in 26 Oct 2010 05:43:19 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-conf_Makefile_in,v 1.1.1.1 2007/09/11 20:52:49 merdely Exp $
---- conf/Makefile.in.orig Sat Apr 14 19:26:45 2007
-+++ conf/Makefile.in Sat Apr 14 19:27:09 2007
-@@ -185,7 +185,7 @@ sbindir = @sbindir@
+--- conf/Makefile.in.orig Sat Apr 4 21:58:27 2009
++++ conf/Makefile.in Tue Oct 26 01:40:11 2010
+@@ -184,7 +184,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
Index: swish-e//patches/patch-filter-bin_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/swish-e/patches/patch-filter-bin_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-filter-bin_Makefile_in
--- swish-e//patches/patch-filter-bin_Makefile_in 11 Sep 2007 20:52:49
-0000 1.1.1.1
+++ swish-e//patches/patch-filter-bin_Makefile_in 26 Oct 2010 05:43:20
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-filter-bin_Makefile_in,v 1.1.1.1 2007/09/11 20:52:49 merdely
Exp $
---- filter-bin/Makefile.in.orig Sat Apr 14 19:28:20 2007
-+++ filter-bin/Makefile.in Sat Apr 14 19:28:47 2007
-@@ -185,7 +185,7 @@ sbindir = @sbindir@
+--- filter-bin/Makefile.in.orig Sat Apr 4 21:58:33 2009
++++ filter-bin/Makefile.in Tue Oct 26 01:40:11 2010
+@@ -184,7 +184,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
Index: swish-e//patches/patch-filters_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/swish-e/patches/patch-filters_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-filters_Makefile_in
--- swish-e//patches/patch-filters_Makefile_in 11 Sep 2007 20:52:49 -0000
1.1.1.1
+++ swish-e//patches/patch-filters_Makefile_in 26 Oct 2010 05:43:19 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-filters_Makefile_in,v 1.1.1.1 2007/09/11 20:52:49 merdely Exp $
---- filters/Makefile.in.orig Sat Apr 14 19:28:59 2007
-+++ filters/Makefile.in Sat Apr 14 19:29:13 2007
-@@ -198,7 +198,7 @@ sharedstatedir = @sharedstatedir@
+--- filters/Makefile.in.orig Sat Apr 4 21:58:34 2009
++++ filters/Makefile.in Tue Oct 26 01:40:11 2010
+@@ -197,7 +197,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = SWISH
Index: swish-e//patches/patch-man_swish-e_1
===================================================================
RCS file: swish-e//patches/patch-man_swish-e_1
diff -N swish-e//patches/patch-man_swish-e_1
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ swish-e//patches/patch-man_swish-e_1 26 Oct 2010 05:43:20 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- man/swish-e.1.orig Tue Oct 26 01:42:39 2010
++++ man/swish-e.1 Tue Oct 26 01:42:59 2010
+@@ -135,14 +135,14 @@ Swish\-e \- A Search Engine
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ .Vb 8
+-\& swish [-e] [-i dir file ... ] [-S system] [-c file] [-f file] [-l] [-v
(num)]
+-\& swish -w word1 word2 ... [-f file1 file2 ...] \e
++\& swish-e [-e] [-i dir file ... ] [-S system] [-c file] [-f file] [-l]
[-v (num)]
++\& swish-e -w word1 word2 ... [-f file1 file2 ...] \e
+ \& [-P phrase_delimiter] [-p prop1 ...] [-s sortprop1 [asc|desc]
...] \e
+ \& [-m num] [-t str] [-d delim] [-H (num)] [-x output_format]
+-\& swish -k (char|*) [-f file1 file2 ...]
+-\& swish -M index1 index2 ... outputfile
+-\& swish -N /path/to/compare/file
+-\& swish -V
++\& swish-e -k (char|*) [-f file1 file2 ...]
++\& swish-e -M index1 index2 ... outputfile
++\& swish-e -N /path/to/compare/file
++\& swish-e -V
+ .Ve
+ .PP
+ See the the \s-1\fISWISH\-RUN\s0\fR\|(1) man page for details on run-time
options.
Index: swish-e//patches/patch-prog-bin_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/swish-e/patches/patch-prog-bin_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-prog-bin_Makefile_in
--- swish-e//patches/patch-prog-bin_Makefile_in 11 Sep 2007 20:52:49 -0000
1.1.1.1
+++ swish-e//patches/patch-prog-bin_Makefile_in 26 Oct 2010 05:43:20 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-prog-bin_Makefile_in,v 1.1.1.1 2007/09/11 20:52:49 merdely Exp
$
---- prog-bin/Makefile.in.orig Sat Apr 14 19:29:29 2007
-+++ prog-bin/Makefile.in Sat Apr 14 19:29:47 2007
-@@ -191,7 +191,7 @@ sharedstatedir = @sharedstatedir@
+--- prog-bin/Makefile.in.orig Sat Apr 4 21:58:35 2009
++++ prog-bin/Makefile.in Tue Oct 26 01:40:11 2010
+@@ -190,7 +190,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
perlmoduledir = $(libexecdir)/perl
Index: swish-e//patches/patch-src_filter_c
===================================================================
RCS file: /cvs/ports/textproc/swish-e/patches/patch-src_filter_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_filter_c
--- swish-e//patches/patch-src_filter_c 11 Sep 2007 20:52:49 -0000 1.1.1.1
+++ swish-e//patches/patch-src_filter_c 26 Oct 2010 05:43:20 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_filter_c,v 1.1.1.1 2007/09/11 20:52:49 merdely Exp $
---- src/filter.c.orig Tue Sep 11 10:07:02 2007
-+++ src/filter.c Tue Sep 11 10:07:13 2007
-@@ -51,7 +51,7 @@ $Id: filter.c,v 1.35 2007/01/05 22:14:10 whmoseley Exp
+--- src/filter.c.orig Sat Apr 4 21:58:32 2009
++++ src/filter.c Tue Oct 26 01:40:11 2010
+@@ -51,7 +51,7 @@ $Id: filter.c 1859 2007-01-05 22:14:10Z whmoseley $
#endif /* HAVE_SYS_WAIT_H */
#endif /* HAVE_WORKING_FORK */
Index: swish-e//patches/patch-src_swish_c
===================================================================
RCS file: swish-e//patches/patch-src_swish_c
diff -N swish-e//patches/patch-src_swish_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ swish-e//patches/patch-src_swish_c 26 Oct 2010 05:43:20 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- src/swish.c.orig Tue Oct 26 01:41:44 2010
++++ src/swish.c Tue Oct 26 01:41:58 2010
+@@ -269,15 +269,15 @@ static void usage()
+ const char *defaultIndexingSystem = "";
+
+ printf(" usage:\n");
+- printf(" swish [-e] [-i dir file ... ] [-S system] [-c file] [-f file]
[-l] [-v (num)]\n");
+- printf(" swish -w word1 word2 ... [-f file1 file2 ...] \\\n");
++ printf(" swish-e [-e] [-i dir file ... ] [-S system] [-c file] [-f
file] [-l] [-v (num)]\n");
++ printf(" swish-e -w word1 word2 ... [-f file1 file2 ...] \\\n");
+ printf(" [-P phrase_delimiter] [-p prop1 ...] [-s sortprop1
[asc|desc] ...] \\\n");
+ printf(" [-m num] [-t str] [-d delim] [-H (num)] [-x
output_format] \\\n");
+ printf(" [-R rank_scheme] [-L prop low high] [-a]\n");
+- printf(" swish -k (char|*) [-f file1 file2 ...]\n");
+- printf(" swish -M index1 index2 ... outputfile\n");
+- printf(" swish -N /path/to/compare/file\n");
+- printf(" swish -V\n");
++ printf(" swish-e -k (char|*) [-f file1 file2 ...]\n");
++ printf(" swish-e -M index1 index2 ... outputfile\n");
++ printf(" swish-e -N /path/to/compare/file\n");
++ printf(" swish-e -V\n");
+ putchar('\n');
+ printf("options: defaults are in brackets\n");
+
Index: swish-e//pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/swish-e/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- swish-e//pkg/PLIST 11 Sep 2007 20:52:49 -0000 1.1.1.1
+++ swish-e//pkg/PLIST 25 Oct 2010 11:40:31 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/09/11 20:52:49 merdely Exp $
%%SHARED%%
bin/swish-config
-bin/swish-e
+...@bin bin/swish-e
bin/swish-filter-test
include/swish-e.h
lib/libswish-e.a
Index: p5-SWISH-API//Makefile
===================================================================
RCS file: /cvs/ports/textproc/p5-SWISH-API/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- p5-SWISH-API//Makefile 19 Oct 2010 07:54:23 -0000 1.4
+++ p5-SWISH-API//Makefile 25 Oct 2010 11:57:20 -0000
@@ -1,28 +1,28 @@
# $OpenBSD: Makefile,v 1.4 2010/10/19 07:54:23 espie Exp $
-COMMENT= Perl interface to the swish-e C library
-SHARED_ONLY= Yes
+COMMENT = Perl interface to the swish-e C library
+#SHARED_ONLY = Yes
-DISTNAME= swish-e-2.4.5
-PKGNAME= p5-SWISH-API-0.04
-REVISION= 1
-CATEGORIES= textproc
-MODULES= cpan
+DISTNAME = swish-e-2.4.7
+PKGNAME = p5-SWISH-API-0.04
+REVISION = 2
+CATEGORIES = textproc
+MODULES = cpan
USE_GROFF = Yes
-MASTER_SITES= http://swish-e.org/distribution/
+MASTER_SITES = http://swish-e.org/distribution/
-MAINTAINER= Michael Erdely <[email protected]>
+MAINTAINER = Michael Erdely <[email protected]>
# Perl
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
-LIB_DEPENDS= swish-e::textproc/swish-e
-WANTLIB+= m z
+LIB_DEPENDS = swish-e::textproc/swish-e
+WANTLIB += m z
-WRKSRC= ${WRKDIST}/perl
+WRKSRC = ${WRKDIST}/perl
.include <bsd.port.mk>
Index: p5-SWISH-API//distinfo
===================================================================
RCS file: /cvs/ports/textproc/p5-SWISH-API/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- p5-SWISH-API//distinfo 11 Sep 2007 20:55:21 -0000 1.1.1.1
+++ p5-SWISH-API//distinfo 25 Oct 2010 11:50:55 -0000
@@ -1,5 +1,5 @@
-MD5 (swish-e-2.4.5.tar.gz) = /q5cofX0NSGQFWtUoZwBUw==
-RMD160 (swish-e-2.4.5.tar.gz) = uJ2MyNj4UNLd8LUrWDocscDzwbM=
-SHA1 (swish-e-2.4.5.tar.gz) = npNYDvdcNy6yMrwKSUDOdvQah/Y=
-SHA256 (swish-e-2.4.5.tar.gz) = H+lr+hiz5je9M/OjemY39eDP1v87YkQOrBvtPn76lgA=
-SIZE (swish-e-2.4.5.tar.gz) = 1474881
+MD5 (swish-e-2.4.7.tar.gz) = c223plrtSLs+JYfFKDNkLQ==
+RMD160 (swish-e-2.4.7.tar.gz) = rUNuy2lUnPklMbtoGRhEIwm2O4k=
+SHA1 (swish-e-2.4.7.tar.gz) = CXDF+Nyy8SEws4qfx92ZwvLX68s=
+SHA256 (swish-e-2.4.7.tar.gz) = Xd1UH/jss8eK1sp2x55iD0V/rJ99ByGth+n6Iv6ZeWI=
+SIZE (swish-e-2.4.7.tar.gz) = 1523786
Index: p5-SWISH-API//patches/patch-perl_Makefile_PL
===================================================================
RCS file: p5-SWISH-API//patches/patch-perl_Makefile_PL
diff -N p5-SWISH-API//patches/patch-perl_Makefile_PL
--- p5-SWISH-API//patches/patch-perl_Makefile_PL 1 Oct 2008 21:49:48
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-perl_Makefile_PL,v 1.1 2008/10/01 21:49:48 merdely Exp $
-
-Fixes build after perl 5.10 update.
-
---- perl/Makefile.PL.orig Wed Oct 1 16:48:37 2008
-+++ perl/Makefile.PL Wed Oct 1 16:49:18 2008
-@@ -80,10 +80,8 @@ Can be either environment variables or passed on comma
-
- EOF
-
--$SIG{__DIE__} = sub {
-- print STDERR "\n ** ERROR: ", @_;
-- print STDERR " Run perl Makefile.PL SWISHHELP for options\n\n";
-- exit 1;
-+END {
-+ print STDERR "Run perl Makefile.PL SWISHHELP for options\n\n" if $?;
- };
-
-
#----------------------------------------------------------------------------------
