Revision: 39486
http://trac.macosforge.org/projects/macports/changeset/39486
Author: tommyd at macports.org
Date: 2008-08-21 16:11:22 -0700 (Thu, 21 Aug 2008)
Log Message:
-----------
* ikiwiki: added another patch which fixes a problem with a system call to `hostname` (author expected the -f option to be available everywhere); fixed a problem with the anticipated location of the wikilist file in two installed scripts
Modified Paths:
--------------
trunk/dports/www/ikiwiki/Portfile
Added Paths:
-----------
trunk/dports/www/ikiwiki/files/patch-auto.setup.diff
Modified: trunk/dports/www/ikiwiki/Portfile
===================================================================
--- trunk/dports/www/ikiwiki/Portfile 2008-08-21 22:44:32 UTC (rev 39485)
+++ trunk/dports/www/ikiwiki/Portfile 2008-08-21 23:11:22 UTC (rev 39486)
@@ -20,8 +20,8 @@
distname ${name}_${version}
worksrcdir ${name}
-# some files do not install cleanly in ${prefix}
-patchfiles patch-Makefile.PL.diff
+patchfiles patch-Makefile.PL.diff \
+ patch-auto.setup.diff
checksums md5 17e76b7f374b6724172deebdaf35d07e \
sha1 55e1f1c314734920983ddb69a4184632d5b35dda \
@@ -70,4 +70,7 @@
${worksrcpath}/mdwn2man \
${worksrcpath}/pm_filter \
${worksrcpath}/auto.setup
+ reinplace "s|/etc/ikiwiki/wikilist|${prefix}/etc/ikiwiki/wikilist|g" \
+ ${worksrcpath}/ikiwiki-update-wikilist \
+ ${worksrcpath}/ikiwiki-mass-rebuild
}
Added: trunk/dports/www/ikiwiki/files/patch-auto.setup.diff
===================================================================
--- trunk/dports/www/ikiwiki/files/patch-auto.setup.diff (rev 0)
+++ trunk/dports/www/ikiwiki/files/patch-auto.setup.diff 2008-08-21 23:11:22 UTC (rev 39486)
@@ -0,0 +1,14 @@
+--- auto.setup.orig 2008-08-22 00:52:56.000000000 +0200
++++ auto.setup 2008-08-22 00:55:31.000000000 +0200
+@@ -18,7 +18,10 @@
+ "What revision control system to use?", "git");
+ our $admin=IkiWiki::Setup::Automator::ask(
+ "What wiki user (or openid) will be wiki admin?", $ENV{USER});
+-our $hostname=`hostname -f`; chomp $hostname;
++
++# some systems, like Darwin (OSX), don't have the --fqdn option,
++# we're just falling back to the simple hostname in this case
++our $hostname=`hostname -f 2>/dev/null || hostname`; chomp $hostname;
+
+ IkiWiki::Setup::Automator->import(
+ wikiname => $wikiname,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080821/cb5fa2f1/attachment.html