Comment out GNU sedism used to generate RPM spec file (noticed by

spz), and un-modify SUBST targets mistakenly committed in previous.
Should fix build where GNU sed wasn't available, and otherwise result
in no change to the binary package.

4 files changed, 17 insertions, 8 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index c5dfdea0610..0e22e8f374f 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/11/16 22:51:14 schmonz Exp $
+# $NetBSD: Makefile,v 1.40 2009/11/23 02:36:39 schmonz Exp $
 #
 
 DISTNAME=	ikiwiki_3.20091113
@@ -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 48f2c4ec379..fb07328eebb 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2009/11/16 22:51:14 schmonz Exp $
+$NetBSD: distinfo,v 1.27 2009/11/23 02:36:39 schmonz Exp $
 
 SHA1 (ikiwiki_3.20091113.tar.gz) = daaef9d99fa6504bf3b54dac73d62dd73122b1e8
 RMD160 (ikiwiki_3.20091113.tar.gz) = a2550867fe2aa6588fce0ab0190190ad51bba7ef
 Size (ikiwiki_3.20091113.tar.gz) = 1474045 bytes
-SHA1 (patch-aa) = 476b04ac233cd78f15a1a26506c529d41a8f8140
+SHA1 (patch-aa) = b64322fe609b8a9c8286f68e5b1bf81f3993914e
 SHA1 (patch-ab) = bbec6e7a4e6772d995a0b084a3875b83950eb194
 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
 SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index 29bcbe63aa6..5fc7ee850b5 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2009/11/16 22:51:14 schmonz Exp $
+# $NetBSD: options.mk,v 1.8 2009/11/23 02:36:39 schmonz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ikiwiki
 PKG_SUPPORTED_OPTIONS=		cvs ikiwiki-amazon-s3 ikiwiki-search
@@ -59,7 +59,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
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa
index 72245df6467..f17d6a8300c 100644
--- a/www/ikiwiki/patches/patch-aa
+++ b/www/ikiwiki/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.14 2009/11/16 22:51:14 schmonz Exp $
+$NetBSD: patch-aa,v 1.15 2009/11/23 02:36:39 schmonz Exp $
 
 --- Makefile.PL.orig	2009-11-13 15:06:57.000000000 -0500
 +++ Makefile.PL
@@ -11,6 +11,15 @@ $NetBSD: patch-aa,v 1.14 2009/11/16 22:51:14 schmonz Exp $
  
  tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
  extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
+@@ -44,7 +46,7 @@ extra_build: ikiwiki.out ikiwiki.setup d
+ 	./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
+ 	./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
+ 	$(MAKE) -C po
+-	sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
++	#sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
+ 	rm -f ikiwiki.spec.bkp
+ 	
+ docwiki: ikiwiki.out
 @@ -60,7 +62,7 @@ underlay_install:
  	for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
  		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \