diff options
author | schmonz <schmonz> | 2009-07-24 05:09:02 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2009-07-24 05:09:02 +0000 |
commit | a12a40391d79ae768f079717db2b4cd6582c860b (patch) | |
tree | e5fd1f99589c9c8300fab8d889b4eddf3ed5491e /www/ikiwiki/patches | |
parent | 66061478821412674f873440704ab5b24f1ce7f2 (diff) | |
download | pkgsrc-a12a40391d79ae768f079717db2b4cd6582c860b.tar.gz |
Update to 3.14159. From the changelog:
* svn: Fix rcs_rename to properly scope call to dirname.
* img: Pass the align parameter through to the generated img tag.
* Move OpenID pretty-printing from openid plugin to core (smcv)
pkgsrc changes:
* Add PKG_SYSCONFDIR support.
* Parameterize pkgsrc-configured paths in Makefile.PL so the patch
can go upstream.
* Retire legacy amazon_s3 option.
Diffstat (limited to 'www/ikiwiki/patches')
-rw-r--r-- | www/ikiwiki/patches/patch-aa | 45 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-ac | 17 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-ad | 13 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-ae | 13 |
4 files changed, 64 insertions, 24 deletions
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa index 7eaef83ea86..95469360973 100644 --- a/www/ikiwiki/patches/patch-aa +++ b/www/ikiwiki/patches/patch-aa @@ -1,8 +1,39 @@ -$NetBSD: patch-aa,v 1.8 2009/04/21 16:34:43 schmonz Exp $ +$NetBSD: patch-aa,v 1.9 2009/07/24 05:09:02 schmonz Exp $ ---- Makefile.PL.orig 2009-04-04 17:26:07.000000000 -0400 +--- Makefile.PL.orig 2009-05-27 16:32:36.000000000 -0400 +++ Makefile.PL -@@ -117,10 +117,10 @@ extra_install: +@@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\ + + # Additional configurable path variables. + W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin ++CONFIGDIR?=/etc/ikiwiki ++MANDIR?=$(PREFIX)/share/man + + tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi) + extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi) +@@ -94,14 +96,14 @@ extra_install: + install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ + done + +- install -d $(DESTDIR)$(PREFIX)/share/man/man1 +- install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1 +- install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-makerepo.1 +- install -m 644 ikiwiki-transition.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-transition.1 +- install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1 ++ install -d $(DESTDIR)$(MANDIR)/man1 ++ install -m 644 ikiwiki.man $(DESTDIR)$(MANDIR)/man1/ikiwiki.1 ++ install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-makerepo.1 ++ install -m 644 ikiwiki-transition.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-transition.1 ++ install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-update-wikilist.1 + +- install -d $(DESTDIR)$(PREFIX)/share/man/man8 +- install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8 ++ install -d $(DESTDIR)$(MANDIR)/man8 ++ install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(MANDIR)/man8/ikiwiki-mass-rebuild.8 + + install -d $(DESTDIR)$(PREFIX)/sbin + install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin +@@ -117,10 +119,10 @@ extra_install: # These might fail if a regular user is installing into a home # directory. @@ -10,10 +41,10 @@ $NetBSD: patch-aa,v 1.8 2009/04/21 16:34:43 schmonz Exp $ - -install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki - -install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki - -install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki -+ -install -d $(DESTDIR)$(PREFIX)/share/examples/ikiwiki -+ -install -m 0644 wikilist $(DESTDIR)$(PREFIX)/share/examples/ikiwiki -+ -install -m 0644 auto.setup $(DESTDIR)$(PREFIX)/share/examples/ikiwiki -+ -install -m 0644 auto-blog.setup $(DESTDIR)$(PREFIX)/share/examples/ikiwiki ++ -install -d $(DESTDIR)$(CONFIGDIR) ++ -install -m 0644 wikilist $(DESTDIR)$(CONFIGDIR) ++ -install -m 0644 auto.setup $(DESTDIR)$(CONFIGDIR) ++ -install -m 0644 auto-blog.setup $(DESTDIR)$(CONFIGDIR) } } diff --git a/www/ikiwiki/patches/patch-ac b/www/ikiwiki/patches/patch-ac deleted file mode 100644 index 761657b4372..00000000000 --- a/www/ikiwiki/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2009/07/09 22:15:09 schmonz Exp $ - ---- IkiWiki/Plugin/svn.pm.orig 2009-05-27 16:32:36.000000000 -0400 -+++ IkiWiki/Plugin/svn.pm -@@ -243,10 +243,10 @@ sub rcs_rename ($$) { - - if (-d "$config{srcdir}/.svn") { - # Add parent directory for $dest -- my $parent=dirname($dest); -+ my $parent=IkiWiki::dirname($dest); - if (! -d "$config{srcdir}/$parent/.svn") { - while (! -d "$config{srcdir}/$parent/.svn") { -- $parent=dirname($dest); -+ $parent=IkiWiki::dirname($dest); - } - if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { - warn("svn add $parent failed\n"); diff --git a/www/ikiwiki/patches/patch-ad b/www/ikiwiki/patches/patch-ad new file mode 100644 index 00000000000..72a640ee8ff --- /dev/null +++ b/www/ikiwiki/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2009/07/24 05:09:02 schmonz Exp $ + +--- ikiwiki-mass-rebuild.orig 2009-05-27 16:32:38.000000000 -0400 ++++ ikiwiki-mass-rebuild +@@ -107,7 +107,7 @@ sub processlist { + close $list; + } + +-my $wikilist="/etc/ikiwiki/wikilist"; ++my $wikilist="@PKG_SYSCONFDIR@/wikilist"; + + if (-e $wikilist) { + processlist($wikilist); diff --git a/www/ikiwiki/patches/patch-ae b/www/ikiwiki/patches/patch-ae new file mode 100644 index 00000000000..daa8e16facc --- /dev/null +++ b/www/ikiwiki/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2009/07/24 05:09:02 schmonz Exp $ + +--- ikiwiki-update-wikilist.orig 2009-05-27 16:32:38.000000000 -0400 ++++ ikiwiki-update-wikilist +@@ -12,7 +12,7 @@ if (! defined $username || ! length $use + die "unable to determine user name for UID $REAL_USER_ID\n"; + } + +-my $wikilist="/etc/ikiwiki/wikilist"; ++my $wikilist="@PKG_SYSCONFDIR@/wikilist"; + if (! -e $wikilist) { + die "$wikilist does not exist\n"; + } |