From 7558a6d8aa56f38908c613882db44a009d33ae37 Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 25 Jul 2007 03:08:10 +0000 Subject: more triage --- ...-_archive_browsing_via_a_calendar_frontend.mdwn | 10 +++ ...location_for_man_pages_and_w3m_cgi_wrapper.mdwn | 92 ++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 doc/patchqueue/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn (limited to 'doc/patchqueue') diff --git a/doc/patchqueue/calendar_--_archive_browsing_via_a_calendar_frontend.mdwn b/doc/patchqueue/calendar_--_archive_browsing_via_a_calendar_frontend.mdwn index fe0dba1aa..f3a8b2f78 100644 --- a/doc/patchqueue/calendar_--_archive_browsing_via_a_calendar_frontend.mdwn +++ b/doc/patchqueue/calendar_--_archive_browsing_via_a_calendar_frontend.mdwn @@ -1,3 +1,13 @@ +I am serving notice that I am starting work on a calendar plugin inspired by Blosxom's calendar plugin. The current plan is to create a plugin that looks through all the source files matching a certain pagespec, and optionally spit out a month view for the specified month (default to current), or spit out a year view for a given year (defaulting to the current year), of a list of year with posts in them. The output would be a table, with the same CSS directives that the Blosxom plugin used to use (so that I can just reuse my css file). The links would be created to a $config{archivedir}/$year or $config{archivedir}/$year-$month file, which can just have + + \[[inline pages="blog/* and !*/Discussion and creation_year($year) and creation_month($month)" rss="no" atom="no" show="0"]] + +or some thing to generate a archive of postings. + +Roland Mas suggested a separate cron job to generate these archive indices automatically, but that is another thread. + +ManojSrivastava + This plugin is inspired by the calendar plugin for Blosxom, but derivesno code from it. This plugin is essentially a fancy front end to archives of previous pages, usually used for blogs. It can produce a calendar for a given month, or a list of months for a given year. To invoke the calendar, just use the preprocessor directive: \[[calendar ]] diff --git a/doc/patchqueue/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn b/doc/patchqueue/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn new file mode 100644 index 000000000..1efa5361f --- /dev/null +++ b/doc/patchqueue/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn @@ -0,0 +1,92 @@ +Hi, + +some operating systems use PREFIX/man instead of PREFIX/share/man as the base +directory for man pages and PREFIX/libexec/ instead of PREFIX/lib/ for files +like CGI programs. +At the moment the location of the installed man pages and the w3m cgi wrapper +is hard-coded in Makefile.PL. +The patch below makes it possible to install those files to alternative directories +while the default stays as it is now. + +> It should be possible to use the existing MakeMaker variables such as +> INSTALLMAN1DIR (though MakeMaker lacks one for man8). I'd prefer not +> adding new variables where MakeMaker already has them. --[[Joey]] + +
+
+  - Introduce two variables, IKI_MANDIR and IKI_W3MCGIDIR, to be set from
+    the command line. This enables locations for man pages and the w3m
+    cgi wrapper other than the hard-coded defaults in Makefile.PL.
+
+--- Makefile.PL.orig    2007-05-20 03:03:58.000000000 +0200
++++ Makefile.PL
+@@ -3,9 +3,32 @@ use warnings;
+ use strict;
+ use ExtUtils::MakeMaker;
+ 
++my %params = ( 'IKI_MANDIR' => '$(PREFIX)/share/man',
++               'IKI_W3MCGIDIR' => '$(PREFIX)/lib/w3m/cgi-bin'
++             );
++
++@ARGV = grep {
++  my ($key, $value) = split(/=/, $_, 2);
++  if ( exists $params{$key} ) {
++    $params{$key} = $value;
++    print "Using $params{$key} for $key.\n";
++    0
++  } else {
++    1
++  }
++} @ARGV;
++
++
+ # Add a few more targets.
+ sub MY::postamble {
+-q{
++  package MY;
++
++  my $scriptvars = <<"EOSCRIPTVARS";
++IKI_MANDIR = $params{'IKI_MANDIR'}
++IKI_W3MCGIDIR = $params{'IKI_W3MCGIDIR'}
++EOSCRIPTVARS
++
++  my $script = q{
+ all:: extra_build
+ clean:: extra_clean
+ install:: extra_install
+@@ -56,23 +79,24 @@ extra_install:
+                done; \
+        done
+ 
+-       install -d $(DESTDIR)$(PREFIX)/share/man/man1
+-       install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
++       install -d $(DESTDIR)$(IKI_MANDIR)/man1
++       install -m 644 ikiwiki.man $(DESTDIR)$(IKI_MANDIR)/man1/ikiwiki.1
+        
+-       install -d $(DESTDIR)$(PREFIX)/share/man/man8
+-       install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/ma
+n8/ikiwiki-mass-rebuild.8
++       install -d $(DESTDIR)$(IKI_MANDIR)/man8
++       install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(IKI_MANDIR)/man8/iki
+wiki-mass-rebuild.8
+        
+        install -d $(DESTDIR)$(PREFIX)/sbin
+        install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
+ 
+-       install -d $(DESTDIR)$(PREFIX)/lib/w3m/cgi-bin
+-       install ikiwiki-w3m.cgi $(DESTDIR)$(PREFIX)/lib/w3m/cgi-bin
++       install -d $(DESTDIR)$(IKI_W3MCGIDIR)
++       install ikiwiki-w3m.cgi $(DESTDIR)$(IKI_W3MCGIDIR)
+ 
+        install -d $(DESTDIR)$(PREFIX)/bin
+        install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
+ 
+        $(MAKE) -C po install PREFIX=$(PREFIX)
+-}
++};
++  return $scriptvars.$script;
+ }
+ 
+ WriteMakefile(
+
+
-- cgit v1.2.3