summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorschmonz <schmonz>2010-10-24 15:45:34 +0000
committerschmonz <schmonz>2010-10-24 15:45:34 +0000
commit5b783fd7deb21a8fe902ee5d3eeff30a34f91dad (patch)
treee8685a99eba7e7dbe63f76b7ed8b57a7fdf3e986 /www
parentf5ace8328264d58ddc5c5e6a1e75ab64c3d6e0ed (diff)
downloadpkgsrc-5b783fd7deb21a8fe902ee5d3eeff30a34f91dad.tar.gz
Update to 3.20101023. From the changelog:
* Fix typo that broke anonymous git push. * Fix web reversion when the srcdir is in a subdir of the git repo.
Diffstat (limited to 'www')
-rw-r--r--www/ikiwiki/Makefile8
-rw-r--r--www/ikiwiki/distinfo8
-rw-r--r--www/ikiwiki/options.mk4
3 files changed, 10 insertions, 10 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index eef4250bae2..3534b2e2ed7 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2010/10/20 02:56:12 schmonz Exp $
+# $NetBSD: Makefile,v 1.66 2010/10/24 15:45:34 schmonz Exp $
#
-DISTNAME= ikiwiki_3.20101019
+DISTNAME= ikiwiki_3.20101023
PKGNAME= ${DISTNAME:S/_/-/}
CATEGORIES= www textproc
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
@@ -47,12 +47,12 @@ REPLACE_PERL+= plugins/externaldemo # XXX not installed
REPLACE_PYTHON+=plugins/proxy.py plugins/pythondemo plugins/rst
SUBST_CLASSES+= sysconfdir
-SUBST_STAGE.sysconfdir= pre-configure
+SUBST_STAGE.sysconfdir= post-patch
SUBST_FILES.sysconfdir= ikiwiki-mass-rebuild ikiwiki-update-wikilist
SUBST_SED.sysconfdir+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
SUBST_CLASSES+= perlpath
-SUBST_STAGE.perlpath= pre-configure
+SUBST_STAGE.perlpath= post-patch
SUBST_FILES.perlpath= IkiWiki/Setup/Standard.pm
SUBST_SED.perlpath+= -e 's,@PERL5@,${PERL5},g'
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index e8240490dff..96f4c5d85cb 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.50 2010/10/20 02:56:13 schmonz Exp $
+$NetBSD: distinfo,v 1.51 2010/10/24 15:45:34 schmonz Exp $
-SHA1 (ikiwiki_3.20101019.tar.gz) = 8c368e49718223db39b3c32a37830fc8800ca82c
-RMD160 (ikiwiki_3.20101019.tar.gz) = 9477b27db5713032e470102f71cb379eda2130dd
-Size (ikiwiki_3.20101019.tar.gz) = 1973737 bytes
+SHA1 (ikiwiki_3.20101023.tar.gz) = 3c2736c80b44f3a34e83c490f8dae47ad7439da7
+RMD160 (ikiwiki_3.20101023.tar.gz) = 45a690561aa991a0b8ec2a2fd4e591b1216152d4
+Size (ikiwiki_3.20101023.tar.gz) = 1976347 bytes
SHA1 (patch-aa) = 06e339584f95ad52842daf7cd0be705e242bdb06
SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903
SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index 7b7fa7bd429..32431264cb6 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2010/10/20 02:56:13 schmonz Exp $
+# $NetBSD: options.mk,v 1.11 2010/10/24 15:45:34 schmonz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki
PKG_SUPPORTED_OPTIONS= cvs ikiwiki-amazon-s3 ikiwiki-search
@@ -58,7 +58,7 @@ post-install:
${PREFIX}/share/doc/${PKGBASE}/w3mmode/ikiwiki.setup
.else
SUBST_CLASSES+= w3m
-SUBST_STAGE.w3m= pre-configure
+SUBST_STAGE.w3m= post-patch
SUBST_FILES.w3m= Makefile.PL
SUBST_SED.w3m+= -e 's,^\(.*install .*W3M_CGI_BIN\),\#\1,'
.endif