[46369] trunk/dports/www/ikiwiki

[tommyd at macports.org]

Revision: 46369
          http://trac.macports.org/changeset/46369
Author:   tommyd at macports.org
Date:     2009-02-03 13:00:52 -0800 (Tue, 03 Feb 2009)
Log Message:
-----------
ikiwiki:
- new upstream version (3.03)
- new dependency to p5-rpc-xml to better handle plugins
- extended Makefile patch which now properly copies some non-perl plugins into destroot

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

Modified: trunk/dports/www/ikiwiki/Portfile
===================================================================
--- trunk/dports/www/ikiwiki/Portfile	2009-02-03 20:58:10 UTC (rev 46368)
+++ trunk/dports/www/ikiwiki/Portfile	2009-02-03 21:00:52 UTC (rev 46369)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 PortGroup perl5 1.0
 
-perl5.setup             ikiwiki 3.01
+perl5.setup             ikiwiki 3.03
 name                    ikiwiki
 categories              www perl
 description             A wiki compiler.
@@ -22,9 +22,9 @@
 
 patchfiles              patch-Makefile.PL.diff
 
-checksums               md5 c05ab03698378630436a28b8332093e8 \
-                        sha1 68aa57fa8e60eeb6b6fa8925d1132bb6f2e2c765 \
-                        rmd160 7c4ad97f87f6d5d014892cea554e0ec4d281bef1
+checksums               md5     237b906594b042d2b073a5970019cf06 \
+                        sha1    1f5b1339c1b1a2e2baefd37567e8c71ed538cd62 \
+                        rmd160  2995edcaa4eb41fbf4ae2123c3b8ae6e0a5f9021
 
 depends_build           port:coreutils
 
@@ -49,6 +49,7 @@
                         port:p5-digest-sha1 \
                         port:p5-file-mimeinfo \
                         port:p5-locale-gettext \
+                        port:p5-rpc-xml \
                         port:p5-text-csv \
                         port:p5-text-wikiformat \
                         port:p5-xml-feed
@@ -69,8 +70,9 @@
         ${worksrcpath}/docwiki.setup \
         ${worksrcpath}/mdwn2man \
         ${worksrcpath}/pm_filter \
-        ${worksrcpath}/auto.setup
+        ${worksrcpath}/auto.setup \
+        ${worksrcpath}/auto-blog.setup
     reinplace "s|/etc/ikiwiki/wikilist|${prefix}/etc/ikiwiki/wikilist|g" \
-	${worksrcpath}/ikiwiki-update-wikilist \
-	${worksrcpath}/ikiwiki-mass-rebuild
+    ${worksrcpath}/ikiwiki-update-wikilist \
+    ${worksrcpath}/ikiwiki-mass-rebuild
 }

Modified: trunk/dports/www/ikiwiki/files/patch-Makefile.PL.diff
===================================================================
--- trunk/dports/www/ikiwiki/files/patch-Makefile.PL.diff	2009-02-03 20:58:10 UTC (rev 46368)
+++ trunk/dports/www/ikiwiki/files/patch-Makefile.PL.diff	2009-02-03 21:00:52 UTC (rev 46369)
@@ -1,15 +1,54 @@
---- 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 @@
+--- Makefile.PL.orig	2009-01-28 22:20:14.000000000 +0100
++++ Makefile.PL	2009-02-03 21:42:52.000000000 +0100
+@@ -57,7 +57,7 @@
+ 	for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
+ 		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+ 		for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \
+-			cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir || \
++			cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
+ 			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+ 		done; \
+ 	done
+@@ -71,11 +71,11 @@
+ 	done
  	
+ 	# Install example sites.
+-	for dir in `cd doc/examples; find -type d ! -regex '.*\.svn.*'`; do \
++	for dir in `cd doc/examples; find . -type d ! -regex '.*\.svn.*'`; do \
+ 		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
+ 	done
+-	for file in `cd doc/examples; find -type f ! -regex '.*\.svn.*'`; do \
+-		cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file || \
++	for file in `cd doc/examples; find . -type f ! -regex '.*\.svn.*'`; do \
++		cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \
+ 		install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
+ 	done
+ 
+@@ -87,10 +87,10 @@
+ 	done
+ 	
+ 	install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
+-	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* -name \*.py`; do \
++	for file in `find plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* -name \*.py`; do \
+ 		install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
+ 	done
+-	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \
++	for file in `find plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \
+ 		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
+ 	done
+ 
+@@ -117,10 +117,10 @@
+ 	
  	# 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 -m 0644 auto-blog.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 -m 0644 auto-blog.setup $(DESTDIR)$(PREFIX)/etc/ikiwiki
  }
  }
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090203/ece289b8/attachment.html>