Update of /cvsroot/fink/experimental/jessealama/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24604
Modified Files:
ikiwiki.info ikiwiki.patch
Log Message:
Fix hardcoded references to /etc, etc.
Don't suid %p/bin/ikiwiki-update-wikilist.
And add some documentation to ikiwiki-update-wikilist. Note that on
fink we're not going to suid this script. Kindly suggest sudo.
Index: ikiwiki.patch
===================================================================
RCS file: /cvsroot/fink/experimental/jessealama/finkinfo/ikiwiki.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ikiwiki.patch 22 Feb 2010 02:25:11 -0000 1.1
+++ ikiwiki.patch 22 Feb 2010 13:52:23 -0000 1.2
@@ -16,3 +16,120 @@
}
}
+diff -Naur --exclude='*~' ikiwiki/doc/ikiwiki-mass-rebuild.mdwn
ikiwiki.fink/doc/ikiwiki-mass-rebuild.mdwn
+--- ikiwiki/doc/ikiwiki-mass-rebuild.mdwn 2010-01-10 05:02:39.000000000
+0100
++++ ikiwiki.fink/doc/ikiwiki-mass-rebuild.mdwn 2010-02-22 13:39:43.000000000
+0100
+@@ -10,14 +10,14 @@
+
+ `ikiwiki-mass-rebuild` can be used to force a rebuild of all the wikis
+ on a system. You will need to list the setup files for the wikis it should
+-build in the file `/etc/ikiwiki/wikilist`, which has the format:
++build in the file `...@prefix@/etc/ikiwiki/wikilist`, which has the format:
+
+ user /path/to/ikiwiki.setup
+
+ It's also possible to let a user list setup files in `~user/.ikiwiki/wikilist`
+ in their home directory. To do so, list only the user's name, without a
+ setup file. The format of `~/.ikiwiki/wikilist` is the same as
+-`/etc/ikiwiki/wikilist`.
+...@prefix@/etc/ikiwiki/wikilist`.
+
+ # OPTIONS
+
+diff -Naur --exclude='*~' ikiwiki/doc/ikiwiki-update-wikilist.mdwn
ikiwiki.fink/doc/ikiwiki-update-wikilist.mdwn
+--- ikiwiki/doc/ikiwiki-update-wikilist.mdwn 2010-01-10 05:02:39.000000000
+0100
++++ ikiwiki.fink/doc/ikiwiki-update-wikilist.mdwn 2010-02-22
13:59:55.000000000 +0100
+@@ -1,6 +1,6 @@
+ # NAME
+
+-ikiwiki-update-wikilist - add or remove user from /etc/ikiwiki/wikilist
++ikiwiki-update-wikilist - add or remove user from
@PREFIX@/etc/ikiwiki/wikilist
+
+ # SYNOPSIS
+
+@@ -10,12 +10,12 @@
+
+ `ikiwiki-update-wikilist` is designed to be made suid root, but is not
installed
+ suid by default. If made suid, it allows users to add or remove their names
+-from the `/etc/ikiwiki/wikilist` file.
++from the `...@prefix@/etc/ikiwiki/wikilist` file.
+
+ By default, the user's name will be added.
+ The `-r` switch causes the user's name to be removed.
+
+-If your name is in `/etc/ikiwiki/wikilist`, the [[ikiwiki-mass-rebuild]](8)
++If your name is in `...@prefix@/etc/ikiwiki/wikilist`, the
[[ikiwiki-mass-rebuild]](8)
+ command will look for a ~/.ikiwiki/wikilist file, and rebuild the wikis listed
+ in that file.
+
+@@ -23,8 +23,17 @@
+
+ None.
+
++# FINK NOTES
++
++Your fink installation adheres to the default described above: this
++script is not installed suid. To modify
+...@prefix@/etc/ikiwiki/wikilist`, execute this script with `sudo`, or
++(also described above) maintain your own `wikilist` under your home
++directory.
++
+ # AUTHOR
+
+ Joey Hess <j...@ikiwiki.info>
+
+ Warning: this page is automatically made into ikiwiki-update-wikilist's man
page, edit with care
++
+diff -Naur --exclude='*~' ikiwiki/doc/setup.mdwn ikiwiki.fink/doc/setup.mdwn
+--- ikiwiki/doc/setup.mdwn 2010-01-10 05:02:39.000000000 +0100
++++ ikiwiki.fink/doc/setup.mdwn 2010-02-22 13:40:29.000000000 +0100
+@@ -16,11 +16,11 @@
+ [[by_hand|byhand]].
+ """]]
+
+- % ikiwiki -setup /etc/ikiwiki/auto.setup
++ % ikiwiki -setup @PREFIX@/etc/ikiwiki/auto.setup
+
+ Or, set up a blog with ikiwiki, run this command instead.
+
+- % ikiwiki -setup /etc/ikiwiki/auto-blog.setup
++ % ikiwiki -setup @PREFIX@/etc/ikiwiki/auto-blog.setup
+
+ Either way, it will ask you a couple of questions.
+
+diff -Naur --exclude='*~' ikiwiki/doc/wikitemplates.mdwn
ikiwiki.fink/doc/wikitemplates.mdwn
+--- ikiwiki/doc/wikitemplates.mdwn 2010-01-10 05:02:39.000000000 +0100
++++ ikiwiki.fink/doc/wikitemplates.mdwn 2010-02-22 13:41:22.000000000
+0100
+@@ -5,7 +5,7 @@
+ The aim is to keep almost all html out of ikiwiki and in the templates.
+
+ It ships with some basic templates which can be customised. These are
+-located in /usr/share/ikiwiki/templates by default.
++located in @PREFIX@/share/ikiwiki/templates by default.
+
+ * `page.tmpl` - Used for displaying all regular wiki pages.
+ * `misc.tmpl` - Generic template used for any page that doesn't
+diff -Naur --exclude='*~' ikiwiki/ikiwiki-mass-rebuild
ikiwiki.fink/ikiwiki-mass-rebuild
+--- ikiwiki/ikiwiki-mass-rebuild 2010-01-10 05:02:39.000000000 +0100
++++ ikiwiki.fink/ikiwiki-mass-rebuild 2010-02-22 13:11:34.000000000 +0100
+@@ -107,7 +107,7 @@
+ close $list;
+ }
+
+-my $wikilist="/etc/ikiwiki/wikilist";
++my $wikilist="@PREFIX@/etc/ikiwiki/wikilist";
+
+ if (-e $wikilist) {
+ processlist($wikilist);
+diff -Naur --exclude='*~' ikiwiki/ikiwiki-update-wikilist
ikiwiki.fink/ikiwiki-update-wikilist
+--- ikiwiki/ikiwiki-update-wikilist 2010-01-10 05:02:39.000000000 +0100
++++ ikiwiki.fink/ikiwiki-update-wikilist 2010-02-22 13:28:58.000000000
+0100
+@@ -12,7 +12,7 @@
+ die "unable to determine user name for UID $REAL_USER_ID\n";
+ }
+
+-my $wikilist="/etc/ikiwiki/wikilist";
++my $wikilist="@PREFIX@/etc/ikiwiki/wikilist";
+ if (! -e $wikilist) {
+ die "$wikilist does not exist\n";
+ }
Index: ikiwiki.info
===================================================================
RCS file: /cvsroot/fink/experimental/jessealama/finkinfo/ikiwiki.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ikiwiki.info 22 Feb 2010 02:25:11 -0000 1.1
+++ ikiwiki.info 22 Feb 2010 13:52:23 -0000 1.2
@@ -1,3 +1,4 @@
+Info3: <<
Package: ikiwiki
Description: Wiki compiler
Version: 3.20100122
@@ -5,26 +6,39 @@
Type: perl
BuildDepends: fink (>= 0.24.12)
Depends: <<
- xml-simple-pm5100,
+ perl5100-core,
text-markdown-pm5100,
- date-parse-pm5100,
- html-template-pm5100,
html-scrubber-pm5100,
+ html-template-pm5100,
+ uri-pm5100,
+ xml-simple-pm5100,
+ date-parse-pm5100,
cgi-formbuilder-pm5100,
cgi-session-pm5100,
mail-sendmail-pm5100,
- html-parser-pm5100,
- uri-pm5100,
+ cgi-pm5100,
data-dumper-pm5100,
- openid-consumer-pm5100,
- html-tree-pm5100,
- file-readbackwards-pm5100,
bzr-py25 | bzr-py26 | git | mercurial-py25 | mercurial-py26 | svn
<<
+Suggests: <<
+ digest-sha1,
+ locale-gettext-pm5100,
+ crypt-ssleay-pm5100,
+ text-csv-pp-pm5100,
+ text-wikiformat-pm5100,
+ term-readline-gnupm100,
+ file-readbackwards-pm5100,
+ html-tree-pm5100,
+ openid-consumer-pm5100,
+ file-mimeinfo-pm5100,
+<<
Source: mirror:debian:pool/main/i/ikiwiki/%n_%v.tar.gz
SourceDirectory: %n
PatchFile: %n.patch
-PatchFile-MD5: a1188bd7ad492ee595157e155c127a3b
+PatchFile-MD5: f896cd36f18941845068982d72dc5677
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+<<
Source-MD5: ce2d76ef8be65aa4c3fa2c14da0e12d6
DocFiles: CHANGELOG NEWS
DescDetail: <<
@@ -38,3 +52,9 @@
License: GPL
Maintainer: Jesse Alama <jesse.al...@gmail.com>
Homepage: http://ikiwiki.info/
+DescPort: <<
+Why require perl 5.10.0? Because, according to upstream, 5.8 is
+reported to not work.
+<<
+
+<<
\ No newline at end of file
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
