diff options
| -rw-r--r-- | www/ikiwiki/Makefile | 18 | ||||
| -rw-r--r-- | www/ikiwiki/PLIST | 8 | ||||
| -rw-r--r-- | www/ikiwiki/distinfo | 9 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-aa | 17 |
4 files changed, 40 insertions, 12 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 57d290a011d..313e1da54b9 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2008/08/01 18:41:08 schmonz Exp $ +# $NetBSD: Makefile,v 1.18 2008/09/04 15:34:30 schmonz Exp $ # -DISTNAME= ikiwiki_2.56 +DISTNAME= ikiwiki_2.62.1 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} @@ -72,8 +72,8 @@ USE_TOOLS+= gmake perl:run xgettext REPLACE_PERL+= IkiWiki.pm ikiwiki-w3m.cgi mdwn2man pm_filter REPLACE_PERL+= ikiwiki.in ikiwiki-mass-rebuild ikiwiki-update-wikilist REPLACE_PERL+= ikiwiki-transition -REPLACE_PERL+= t/*.t IkiWiki/*.pm IkiWiki/*/*.pm -REPLACE_PERL+= doc/ikiwiki.setup doc/w3mmode/ikiwiki.setup +REPLACE_PERL+= t/*.t IkiWiki/*.pm IkiWiki/*/*.pm* +REPLACE_PERL+= auto.setup doc/w3mmode/ikiwiki.setup #REPLACE_PERL+= plugins/externaldemo # not installed anymore # not installed anymore @@ -87,9 +87,15 @@ SUBST_STAGE.makefile= post-patch SUBST_FILES.makefile= Makefile.PL SUBST_SED.makefile+= -e 's,share/man/man,${PKGMANDIR}/man,g' +PKG_SYSCONFSUBDIR= ${PKGBASE} +EGDIR= $(PREFIX)/share/examples/${PKGBASE} +CONF_FILES+= ${EGDIR}/auto.setup ${PKG_SYSCONFDIR}/auto.setup +CONF_FILES+= ${EGDIR}/wikilist ${PKG_SYSCONFDIR}/wikilist + +pre-configure: + find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f + post-install: - ${INSTALL_DATA} ${WRKSRC}/html/ikiwiki.setup \ - ${PREFIX}/share/doc/ikiwiki/ .if !empty(PKG_OPTIONS:Mw3m) ${INSTALL_DATA} ${WRKSRC}/html/w3mmode.html \ ${PREFIX}/share/doc/ikiwiki/ diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index 681f000ec5d..27398ba6177 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2008/08/01 18:41:08 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/09/04 15:34:30 schmonz Exp $ bin/ikiwiki bin/ikiwiki-makerepo bin/ikiwiki-transition @@ -10,14 +10,16 @@ man/man1/ikiwiki-update-wikilist.1 man/man1/ikiwiki.1 man/man8/ikiwiki-mass-rebuild.8 sbin/ikiwiki-mass-rebuild -share/doc/ikiwiki/ikiwiki.setup ${PLIST.w3m}share/doc/ikiwiki/w3mmode.html ${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup +share/examples/ikiwiki/auto.setup +share/examples/ikiwiki/wikilist share/ikiwiki/basewiki/blog.mdwn share/ikiwiki/basewiki/favicon.ico share/ikiwiki/basewiki/helponformatting.mdwn share/ikiwiki/basewiki/ikiwiki.mdwn share/ikiwiki/basewiki/ikiwiki/blog.mdwn +share/ikiwiki/basewiki/ikiwiki/directive.mdwn share/ikiwiki/basewiki/ikiwiki/formatting.mdwn share/ikiwiki/basewiki/ikiwiki/markdown.mdwn share/ikiwiki/basewiki/ikiwiki/openid.mdwn @@ -44,6 +46,7 @@ share/ikiwiki/basewiki/templates/note.mdwn share/ikiwiki/basewiki/templates/popup.mdwn share/ikiwiki/basewiki/wikiicons/diff.png share/ikiwiki/basewiki/wikiicons/openidlogin-bg.gif +share/ikiwiki/basewiki/wikiicons/search-bg.gif share/ikiwiki/basewiki/wikilink.mdwn share/ikiwiki/smiley/smileys.mdwn share/ikiwiki/smiley/smileys/alert.png @@ -117,6 +120,7 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo @dirrm share/ikiwiki/basewiki/ikiwiki @dirrm share/ikiwiki/basewiki @dirrm share/ikiwiki +@dirrm share/examples/ikiwiki ${PLIST.w3m}@dirrm share/doc/ikiwiki/w3mmode @dirrm share/doc/ikiwiki ${PLIST.w3m}@dirrm libexec/w3m/cgi-bin diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index ab1953114a7..e495c9031ba 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.8 2008/08/01 18:41:08 schmonz Exp $ +$NetBSD: distinfo,v 1.9 2008/09/04 15:34:30 schmonz Exp $ -SHA1 (ikiwiki_2.56.tar.gz) = f5c12c096cc069eee109a620c729c728d41a6d92 -RMD160 (ikiwiki_2.56.tar.gz) = 1fc42fd17d99cc60d62e0360c42c3742db8d1295 -Size (ikiwiki_2.56.tar.gz) = 897974 bytes +SHA1 (ikiwiki_2.62.1.tar.gz) = a03976b0828bdf2c864116cdd9d850b5212234d8 +RMD160 (ikiwiki_2.62.1.tar.gz) = fa9dd64d7308c659e172cd2b1470936d6439e8bb +Size (ikiwiki_2.62.1.tar.gz) = 949723 bytes +SHA1 (patch-aa) = 50987d0a55426b79c88dfa0cb5b30ad370e942a5 diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa new file mode 100644 index 00000000000..2c9821dd9b4 --- /dev/null +++ b/www/ikiwiki/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.6 2008/09/04 15:34:30 schmonz Exp $ + +--- Makefile.PL.orig 2008-08-27 15:25:08.000000000 -0400 ++++ Makefile.PL +@@ -50,9 +50,9 @@ extra_clean: + $(MAKE) -C po clean + + 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)/share/examples/ikiwiki ++ install -m 0644 wikilist $(DESTDIR)$(PREFIX)/share/examples/ikiwiki ++ install -m 0644 auto.setup $(DESTDIR)$(PREFIX)/share/examples/ikiwiki + + install -d $(DESTDIR)$(PREFIX)/share/ikiwiki + for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \ |