[39849] trunk/dports/www/ikiwiki

[tommyd at macports.org]

Revision: 39849
          http://trac.macports.org/changeset/39849
Author:   tommyd at macports.org
Date:     2008-09-08 14:36:18 -0700 (Mon, 08 Sep 2008)
Log Message:
-----------
* Portfile: updated to new upstream version 2.63
* files/patch-auto.setup.diff: upstream fixed the issue
* files/patch-Makefile.PL.diff: updated patch to work with new version

Modified Paths:
--------------
    trunk/dports/www/ikiwiki/Portfile
    trunk/dports/www/ikiwiki/files/patch-Makefile.PL.diff

Removed Paths:
-------------
    trunk/dports/www/ikiwiki/files/patch-auto.setup.diff

Modified: trunk/dports/www/ikiwiki/Portfile
===================================================================
--- trunk/dports/www/ikiwiki/Portfile	2008-09-08 20:57:16 UTC (rev 39848)
+++ trunk/dports/www/ikiwiki/Portfile	2008-09-08 21:36:18 UTC (rev 39849)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 PortGroup perl5 1.0
 
-perl5.setup             ikiwiki 2.61
+perl5.setup             ikiwiki 2.63
 name                    ikiwiki
 categories              www perl
 description             A wiki compiler.
@@ -20,12 +20,11 @@
 distname                ${name}_${version}
 worksrcdir              ${name}
 
-patchfiles		patch-Makefile.PL.diff \
-			patch-auto.setup.diff
+patchfiles              patch-Makefile.PL.diff
 
-checksums               md5 17e76b7f374b6724172deebdaf35d07e \
-                        sha1 55e1f1c314734920983ddb69a4184632d5b35dda \
-                        rmd160 ca54ad63d71055959a58d2f3405caeb908a19536
+checksums               md5 33eeeab36333deb7a088141f74df21f4 \
+                        sha1 f32d28ca58cb79b3a8463bf22cd79b72f2bb052f \
+                        rmd160 58faa7c63dedce4de1df20610d37da1b461ac0ab
 
 depends_build           port:perl5.8 port:coreutils
 

Modified: trunk/dports/www/ikiwiki/files/patch-Makefile.PL.diff
===================================================================
--- trunk/dports/www/ikiwiki/files/patch-Makefile.PL.diff	2008-09-08 20:57:16 UTC (rev 39848)
+++ trunk/dports/www/ikiwiki/files/patch-Makefile.PL.diff	2008-09-08 21:36:18 UTC (rev 39849)
@@ -1,15 +1,15 @@
---- Makefile.PL.orig	2008-08-21 23:43:32.000000000 +0200
-+++ Makefile.PL	2008-08-21 23:44:03.000000000 +0200
-@@ -48,9 +48,9 @@
- 	$(MAKE) -C po clean
+--- Makefile.PL.orig	2008-09-08 23:27:51.000000000 +0200
++++ Makefile.PL	2008-09-08 23:28:38.000000000 +0200
+@@ -95,9 +95,9 @@
+ 	
+ 	# These might fail if a regular user is installing into a home
+ 	# directory.
+-	-install -d $(DESTDIR)/etc/ikiwiki
+-	-install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
+-	-install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
++	-install -d $(DESTDIR)$(PREFIX)/etc/ikiwiki
++	-install -m 0644 wikilist $(DESTDIR)$(PREFIX)/etc/ikiwiki
++	-install -m 0644 auto.setup $(DESTDIR)$(PREFIX)/etc/ikiwiki
+ }
+ }
  
- extra_install:
--	install -d $(DESTDIR)/etc/ikiwiki
--	install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
--	install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
-+	install -d $(DESTDIR)$(PREFIX)/etc/ikiwiki
-+	install -m 0644 wikilist $(DESTDIR)$(PREFIX)/etc/ikiwiki
-+	install -m 0644 auto.setup $(DESTDIR)$(PREFIX)/etc/ikiwiki
- 
- 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
- 	for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \

Deleted: trunk/dports/www/ikiwiki/files/patch-auto.setup.diff
===================================================================
--- trunk/dports/www/ikiwiki/files/patch-auto.setup.diff	2008-09-08 20:57:16 UTC (rev 39848)
+++ trunk/dports/www/ikiwiki/files/patch-auto.setup.diff	2008-09-08 21:36:18 UTC (rev 39849)
@@ -1,14 +0,0 @@
---- 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/20080908/6f03db70/attachment-0001.html