diff options
author | kristerw <kristerw@pkgsrc.org> | 2004-06-27 18:30:54 +0000 |
---|---|---|
committer | kristerw <kristerw@pkgsrc.org> | 2004-06-27 18:30:54 +0000 |
commit | b5093449dcbf593e07271f3d688baa8cab2caa0c (patch) | |
tree | ed4af19dcf3fd80feca207e9db1b20d1263be80c /www | |
parent | fbdf8134fd5c0f79a70979d78488c3151371fc0f (diff) | |
download | pkgsrc-b5093449dcbf593e07271f3d688baa8cab2caa0c.tar.gz |
Make sure the directories exists before trying to install in them.
Solves PR 25426.
Add dependency on PERL5 so that the configure script does the right
thing, since this package use the path in places that cannot be
patched by REPLACE_PERL (and bin/swish-filter-test need perl to
run anyway).
Bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r-- | www/swish-e/Makefile | 5 | ||||
-rw-r--r-- | www/swish-e/distinfo | 4 | ||||
-rw-r--r-- | www/swish-e/patches/patch-aa | 13 | ||||
-rw-r--r-- | www/swish-e/patches/patch-ab | 13 |
4 files changed, 32 insertions, 3 deletions
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile index acce7905523..a0e7edc1379 100644 --- a/www/swish-e/Makefile +++ b/www/swish-e/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2004/04/19 04:53:58 snj Exp $ +# $NetBSD: Makefile,v 1.18 2004/06/27 18:30:54 kristerw Exp $ # FreeBSD Id: ports/www/swish-e/Makefile,v 1.3 1999/08/31 02:43:18 peter Exp DISTNAME= swish-e-2.4.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www textproc MASTER_SITES= http://swish-e.org/Download/ @@ -13,6 +13,7 @@ COMMENT= Simple web indexing for humans - enhanced USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes +USE_PERL5= yes CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} diff --git a/www/swish-e/distinfo b/www/swish-e/distinfo index 8d1ed4bacd0..ad4d2d9fbcc 100644 --- a/www/swish-e/distinfo +++ b/www/swish-e/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.3 2004/01/22 15:17:07 xtraeme Exp $ +$NetBSD: distinfo,v 1.4 2004/06/27 18:30:54 kristerw Exp $ SHA1 (swish-e-2.4.1.tar.gz) = fef447bb13a29f3758baeba09bceace8ca3529f2 Size (swish-e-2.4.1.tar.gz) = 1491631 bytes +SHA1 (patch-aa) = 17e175792d0d6bc40a1fd23fc7fba32a023bc8e0 +SHA1 (patch-ab) = d8bf46d4b54e0becfbf909e080b69a4c3104d24f diff --git a/www/swish-e/patches/patch-aa b/www/swish-e/patches/patch-aa new file mode 100644 index 00000000000..14bea567617 --- /dev/null +++ b/www/swish-e/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.4 2004/06/27 18:30:54 kristerw Exp $ + +--- filters/SWISH/Makefile.in.orig 2003-12-18 06:49:40.000000000 +0100 ++++ filters/SWISH/Makefile.in 2004-06-27 19:47:52.000000000 +0200 +@@ -189,7 +189,7 @@ + nobase_perlmoduleSCRIPT_INSTALL = $(install_sh_SCRIPT) + install-nobase_perlmoduleSCRIPTS: $(nobase_perlmodule_SCRIPTS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(perlmoduledir) ++ $(mkinstalldirs) $(DESTDIR)$(perlmoduledir)/Filters + @list='$(nobase_perlmodule_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ diff --git a/www/swish-e/patches/patch-ab b/www/swish-e/patches/patch-ab new file mode 100644 index 00000000000..52b16868815 --- /dev/null +++ b/www/swish-e/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.6 2004/06/27 18:30:54 kristerw Exp $ + +--- conf/Makefile.in.orig 2004-06-27 19:53:09.000000000 +0200 ++++ conf/Makefile.in 2004-06-27 19:55:25.000000000 +0200 +@@ -202,7 +202,7 @@ + nobase_exampleDATA_INSTALL = $(install_sh_DATA) + install-nobase_exampleDATA: $(nobase_example_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(exampledir) ++ $(mkinstalldirs) $(DESTDIR)$(exampledir)/stopwords + @list='$(nobase_example_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="$$p"; \ |