From owner-freebsd-ports@FreeBSD.ORG Sat Jun 21 00:14:43 2008 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CB68106564A for ; Sat, 21 Jun 2008 00:14:43 +0000 (UTC) (envelope-from tobias.rehbein@web.de) Received: from fmmailgate02.web.de (fmmailgate02.web.de [217.72.192.227]) by mx1.freebsd.org (Postfix) with ESMTP id 44CF98FC17 for ; Sat, 21 Jun 2008 00:14:42 +0000 (UTC) (envelope-from tobias.rehbein@web.de) Received: from smtp08.web.de (fmsmtp08.dlan.cinetic.de [172.20.5.216]) by fmmailgate02.web.de (Postfix) with ESMTP id EBE1BE2970E1 for ; Sat, 21 Jun 2008 02:14:40 +0200 (CEST) Received: from [88.134.75.6] (helo=sushi.pseudo.local) by smtp08.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.109 #226) id 1K9qkW-0004Xq-00 for freebsd-ports@freebsd.org; Sat, 21 Jun 2008 02:14:40 +0200 Received: from sushi.pseudo.local (localhost [127.0.0.1]) by sushi.pseudo.local (8.14.2/8.14.2) with ESMTP id m5L0C4nX079974 for ; Sat, 21 Jun 2008 02:12:04 +0200 (CEST) (envelope-from tobi@sushi.pseudo.local) Received: (from tobi@localhost) by sushi.pseudo.local (8.14.2/8.14.2/Submit) id m5L0C4Ls079973 for freebsd-ports@freebsd.org; Sat, 21 Jun 2008 02:12:04 +0200 (CEST) (envelope-from tobi) Date: Sat, 21 Jun 2008 02:12:04 +0200 From: Tobias Rehbein To: freebsd-ports@freebsd.org Message-ID: <20080621001204.GA75688@sushi.pseudo.local> Mail-Followup-To: freebsd-ports@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Sender: tobias.rehbein@web.de X-Sender: tobias.rehbein@web.de X-Provags-ID: V01U2FsdGVkX18LEXrk+NpdrbGSdCauUiyM6MNzxjZk8sXrgfRo aH+qEVFTxqhg1bJMFMH5zxFLfFw4SMwy1yoX7C3gUF8iFWOnZV FjiCH5ygb+BNO8fczR7g== Subject: Please review: Update of www/nanoblogger X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 00:14:43 -0000 Hi all. If someone is interested please review my update for www/nanoblogger which is a rather big update. This is my first try on ports and so I would appreciate any comments. Portlint keeps warning me I should define DISTFILES earlier, but I don't know how as I don't know the value of DISTFILES without bsd.port.pre.mk. Any hints? Regards Tobias And here is the diff: diff -ruN www/nanoblogger.orig/Makefile www/nanoblogger/Makefile --- www/nanoblogger.orig/Makefile 2008-06-13 23:33:10.000000000 +0000 +++ www/nanoblogger/Makefile 2008-06-20 23:53:47.000000000 +0000 @@ -7,12 +7,12 @@ # PORTNAME= nanoblogger -PORTVERSION= 3.3 -PORTREVISION= 2 +DISTVERSION= 3.4-rc1 CATEGORIES= www MASTER_SITES= SF +MASTER_SITE_SUBDIR= nanoblogger -MAINTAINER= ports@FreeBSD.org +MAINTAINER= tobias.rehbein@web.de COMMENT= Small weblog engine written in Bash for the command line RUN_DEPENDS= bash:${PORTSDIR}/shells/bash @@ -21,12 +21,45 @@ SUB_FILES= pkg-message -post-patch: - @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/nb - @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/plugins/entry/format/markdown.sh - @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/plugins/page/format/markdown.sh +PLIST= ${WRKDIR}/pkg-plist -do-install: +OPTIONS= EXTRA "install extra plugins and language packs" off \ + MARKDOWN "install textproc/markdown as dependency" off + +WRKSRC_EXTRA= ${WRKDIR}/${PORTNAME}-extra-${DISTVERSION} + +.include + +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} +.if defined(WITH_EXTRA) +DISTFILES+= ${PORTNAME}-extra-${DISTVERSION}${EXTRACT_SUFX} +.if !defined(WITHOUT_EXAMPLES) +PLIST_SUB= EXAMPLES="" +.else +PLIST_SUB= EXAMPLES="@comment " +.endif +.endif + +.if defined(WITH_MARKDOWN) +RUN_DEPENDS+= markdown:${PORTSDIR}/textproc/markdown +.endif + +post-patch: .SILENT + ${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/nb + ${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/nb + ${REINPLACE_CMD} -e "s,%%DOCSDIR%%,${DOCSDIR}," ${WRKSRC}/nb + ${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/nb.conf + ${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/plugins/entry/format/markdown.sh + ${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/plugins/page/format/markdown.sh + +pre-install: .SILENT + ${CAT} ${PKGDIR}/pkg-plist > ${WRKDIR}/pkg-plist +.if defined(WITH_EXTRA) + ${CAT} ${PKGDIR}/pkg-plist.extra ${PKGDIR}/pkg-plist.extra.dirrm >> ${WRKDIR}/pkg-plist +.endif + ${CAT} ${PKGDIR}/pkg-plist.dirrm >> ${WRKDIR}/pkg-plist + +do-install: .SILENT ${INSTALL_SCRIPT} ${WRKSRC}/nb ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/nb.conf ${PREFIX}/etc/nb.conf.sample ${MKDIR} ${DATADIR} @@ -36,8 +69,14 @@ ${COPYTREE_SHARE} \* ${DATADIR}/${data} "! -name *.orig ! -name *.bak" ) .endfor ${CP} ${WRKSRC}/welcome-to-nb.txt ${DATADIR} +.if defined(WITH_EXTRA) +.for data in default lang plugins + ( cd ${WRKSRC_EXTRA}/${data} && \ + ${COPYTREE_SHARE} \* ${DATADIR}/${data} "! -name *.orig ! -name *.bak" ) +.endfor +.endif -post-install: +post-install: .SILENT @if [ ! -f ${PREFIX}/etc/nb.conf ]; then \ ${CP} -p ${PREFIX}/etc/nb.conf.sample ${PREFIX}/etc/nb.conf; \ fi @@ -46,7 +85,19 @@ .for doc in COPYING ChangeLog README TODO docs/nanoblogger.html ${INSTALL_MAN} ${WRKSRC}/${doc} ${DOCSDIR} .endfor +.if defined(WITH_EXTRA) +.for doc in ChangeLog README + ${INSTALL_MAN} ${WRKSRC_EXTRA}/${doc} ${DOCSDIR}/${doc}-extra +.endfor +.for doc in nanoblogger_de.html nanoblogger_fr.html + ${INSTALL_MAN} ${WRKSRC_EXTRA}/docs/${doc} ${DOCSDIR} +.endfor +.endif +.endif +.if defined(WITH_EXTRA) && !defined(WITHOUT_EXAMPLES) + ${MKDIR} ${EXAMPLESDIR} + ${INSTALL_MAN} ${WRKSRC_EXTRA}/docs/examples/nanoblogger.bash_completion ${EXAMPLESDIR} .endif @${CAT} ${PKGMESSAGE} -.include +.include diff -ruN www/nanoblogger.orig/distinfo www/nanoblogger/distinfo --- www/nanoblogger.orig/distinfo 2007-01-16 10:47:17.000000000 +0000 +++ www/nanoblogger/distinfo 2008-06-20 22:17:30.000000000 +0000 @@ -1,3 +1,6 @@ -MD5 (nanoblogger-3.3.tar.gz) = c9df242e48be0c9b7fca2443c00fd6dc -SHA256 (nanoblogger-3.3.tar.gz) = b49b25ee18c42dc9cf47fdd456e5dd19033456c64104a0ccba34e318e5daf1a0 -SIZE (nanoblogger-3.3.tar.gz) = 82302 +MD5 (nanoblogger-3.4-rc1.tar.gz) = e6fd8e6445ccc0d9e8686e14f0cce8b8 +SHA256 (nanoblogger-3.4-rc1.tar.gz) = 1d4e097d04d8cc4616ba5a11d0b54ffe0b868236fd18be4618a1b120a8d73046 +SIZE (nanoblogger-3.4-rc1.tar.gz) = 89354 +MD5 (nanoblogger-extra-3.4-rc1.tar.gz) = 35af8539a0ed35153575b4f7a65771ff +SHA256 (nanoblogger-extra-3.4-rc1.tar.gz) = f073c1d8616479f7f44cdb37fc7c08569a0ff18d0607f0df7a8a97b80b5520ef +SIZE (nanoblogger-extra-3.4-rc1.tar.gz) = 61334 diff -ruN www/nanoblogger.orig/files/patch-nb www/nanoblogger/files/patch-nb --- www/nanoblogger.orig/files/patch-nb 2007-01-16 10:47:19.000000000 +0000 +++ www/nanoblogger/files/patch-nb 2008-06-20 22:11:04.000000000 +0000 @@ -1,23 +1,33 @@ ---- nb.orig Sun Jan 14 17:38:03 2007 -+++ nb Sun Jan 14 17:41:26 2007 +--- nb.orig 2008-06-14 05:51:56.000000000 +0200 ++++ nb 2008-06-21 00:10:13.000000000 +0200 @@ -1,4 +1,4 @@ -#! /bin/bash -+#!/usr/bin/env bash ++#! %%PREFIX%%/bin/bash ############################################################ - # NanoBlogger 3.3 Copyright 2006 n1xt3r (Kevin R. Wood) # + # NanoBlogger 3.4 Copyright 2008 n1xt3r (Kevin R. Wood) # ############################################################ -@@ -8,11 +8,11 @@ - VERSION="3.3" +@@ -9,11 +9,11 @@ - # nanoblogger's base install directory. + # -- hardcoded paths -- + # where to expect nanoblogger's base -NB_BASE_DIR=`dirname $0` -+NB_BASE_DIR="%%PREFIX%%/share/nanoblogger" - # documentation ++NB_BASE_DIR="%%DATADIR%%" + # where to expect nanoblogger's documentation -NB_DOC_DIR="$NB_BASE_DIR/docs" -+NB_DOC_DIR="%%PREFIX%%/share/doc/nanoblogger" - # nanoblogger's conf file ++NB_DOC_DIR="%%DOCSDIR%%" + # where to expect nanoblogger's conf file -NB_CFG_DIR="$NB_BASE_DIR" +NB_CFG_DIR="%%PREFIX%%/etc" - - ### hardcoded paths ### - + # nanoblogger's language definitions directory. + NB_LANG_DIR="${NB_BASE_DIR}/lang" + # nanoblogger's module directory. +@@ -710,6 +710,9 @@ + # copy default files and directories + for weblog_dir in "$NB_BASE_DIR"/default/*; do + cp -R "$weblog_dir" "$BLOG_DIR" ++ # set file modes ++ find "$BLOG_DIR" -type d | xargs chmod -R 750 ++ find "$BLOG_DIR" -type f | xargs chmod -R 640 + done + # create some critical empty directories + for weblog_emptydir in "$ARCHIVES_DIR" "$CACHE_DIR" "$PARTS_DIR"; do diff -ruN www/nanoblogger.orig/files/patch-nb.conf www/nanoblogger/files/patch-nb.conf --- www/nanoblogger.orig/files/patch-nb.conf 1970-01-01 00:00:00.000000000 +0000 +++ www/nanoblogger/files/patch-nb.conf 2008-06-20 22:05:00.000000000 +0000 @@ -0,0 +1,11 @@ +--- nb.conf.orig 2008-06-18 19:37:29.000000000 +0000 ++++ nb.conf 2008-06-18 19:42:13.000000000 +0000 +@@ -7,7 +7,7 @@ + NB_LANG="en" + + # Set the default blog directory +-#BLOG_DIR="/var/www/weblog" ++#BLOG_DIR="%%PREFIX%%/www/weblog" + + # --- Blog Templates --- + # diff -ruN www/nanoblogger.orig/files/patch-plugins_entry_format_markdown.sh www/nanoblogger/files/patch-plugins_entry_format_markdown.sh --- www/nanoblogger.orig/files/patch-plugins_entry_format_markdown.sh 1970-01-01 00:00:00.000000000 +0000 +++ www/nanoblogger/files/patch-plugins_entry_format_markdown.sh 2008-06-20 22:08:20.000000000 +0000 @@ -0,0 +1,11 @@ +--- plugins/entry/format/markdown.sh.orig 2008-01-17 06:40:17.000000000 +0100 ++++ plugins/entry/format/markdown.sh 2008-06-21 00:07:26.000000000 +0200 +@@ -2,7 +2,7 @@ + # Markdown is documented and implemented at + # + +-MARKDOWN="/usr/bin/markdown" ++MARKDOWN="%%PREFIX%%/bin/markdown" + MARKDOWN_OPTS="" + + # nb_msg "$plugins_entryfilteraction `basename $nb_plugin` ..." diff -ruN www/nanoblogger.orig/files/patch-plugins_entry_format_markdown_sh www/nanoblogger/files/patch-plugins_entry_format_markdown_sh --- www/nanoblogger.orig/files/patch-plugins_entry_format_markdown_sh 2008-06-13 19:07:32.000000000 +0000 +++ www/nanoblogger/files/patch-plugins_entry_format_markdown_sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- plugins/entry/format/markdown.sh.orig 2005-11-03 08:21:22.000000000 +0100 -+++ plugins/entry/format/markdown.sh 2008-06-12 11:22:45.000000000 +0200 -@@ -2,7 +2,7 @@ - # Markdown is documented and implemented at - # - --MARKDOWN="/usr/bin/markdown" -+MARKDOWN="%%PREFIX%%/bin/markdown" - MARKDOWN_OPTS="" - - # nb_msg "$plugins_textformataction `basename $nb_plugin` ..." diff -ruN www/nanoblogger.orig/files/patch-plugins_page_format_markdown.sh www/nanoblogger/files/patch-plugins_page_format_markdown.sh --- www/nanoblogger.orig/files/patch-plugins_page_format_markdown.sh 1970-01-01 00:00:00.000000000 +0000 +++ www/nanoblogger/files/patch-plugins_page_format_markdown.sh 2008-06-20 22:08:53.000000000 +0000 @@ -0,0 +1,11 @@ +--- plugins/page/format/markdown.sh.orig 2008-01-17 06:40:17.000000000 +0100 ++++ plugins/page/format/markdown.sh 2008-06-21 00:07:39.000000000 +0200 +@@ -2,7 +2,7 @@ + # Markdown is documented and implemented at + # + +-MARKDOWN="/usr/bin/markdown" ++MARKDOWN="%%PREFIX%%/bin/markdown" + MARKDOWN_OPTS="" + + nb_msg "$plugins_entryfilteraction `basename $nb_plugin` ..." diff -ruN www/nanoblogger.orig/files/patch-plugins_page_format_markdown_sh www/nanoblogger/files/patch-plugins_page_format_markdown_sh --- www/nanoblogger.orig/files/patch-plugins_page_format_markdown_sh 2008-06-13 19:07:32.000000000 +0000 +++ www/nanoblogger/files/patch-plugins_page_format_markdown_sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- plugins/page/format/markdown.sh.orig 2005-11-09 23:45:03.000000000 +0100 -+++ plugins/page/format/markdown.sh 2008-06-12 11:23:22.000000000 +0200 -@@ -2,7 +2,7 @@ - # Markdown is documented and implemented at - # - --MARKDOWN="/usr/bin/markdown" -+MARKDOWN="%%PREFIX%%/bin/markdown" - MARKDOWN_OPTS="" - - nb_msg "$plugins_textformataction `basename $nb_plugin` ..." diff -ruN www/nanoblogger.orig/files/pkg-message.in www/nanoblogger/files/pkg-message.in --- www/nanoblogger.orig/files/pkg-message.in 2007-01-16 10:47:19.000000000 +0000 +++ www/nanoblogger/files/pkg-message.in 2008-06-20 22:05:00.000000000 +0000 @@ -1,3 +1,4 @@ +------------------------------------------------------------------------------- POST-INSTALLATION NOTES: Before you can use NanoBlogger, you will have to create a global configuration @@ -21,12 +22,10 @@ SIDE NOTES FOR OLD USERS: As always with new release, don't forget to read the documentation and to -update your weblog configuration file, e.g. ${blog_dir}/blog.conf. In the -same time, pay attention to these particular points: - - The way articles are build has changed: nb {-E|--draft} must be use now. - - The base skeleton has been modified too, you _may_ want to update your - old entries, but that seems not mandatory though. +follow the preferred update path (see %%DOCSDIR%%/README). +In the same time, pay attention to these particular points: + - The commandline interface has changed; read the documentation - Be careful if you have customized your CSS style file: there is a lot of changes in this area, so layout may be very different with this version than you may expected. - +------------------------------------------------------------------------------- diff -ruN www/nanoblogger.orig/pkg-plist www/nanoblogger/pkg-plist --- www/nanoblogger.orig/pkg-plist 2007-01-16 10:47:17.000000000 +0000 +++ www/nanoblogger/pkg-plist 2008-06-20 23:18:06.000000000 +0000 @@ -2,86 +2,78 @@ @unexec if cmp -s %D/etc/nb.conf.sample %D/etc/nb.conf; then rm -f %D/etc/nb.conf; fi etc/nb.conf.sample @exec if [ ! -f %D/etc/nb.conf ] ; then cp -p %D/%F %B/nb.conf; fi -@exec mkdir -p %D/share/nanoblogger/default/parts @exec mkdir -p %D/share/nanoblogger/default/cache @exec mkdir -p %D/share/nanoblogger/default/plugins -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/ChangeLog -%%DOCSDIR%%/README -%%DOCSDIR%%/TODO -%%DOCSDIR%%/nanoblogger.html +@exec mkdir -p %D/share/nanoblogger/plugins/archive/category %%DATADIR%%/default/articles/example.txt -%%DATADIR%%/default/atom.xml %%DATADIR%%/default/blog.conf %%DATADIR%%/default/data/cat_1.db -%%DATADIR%%/default/images/favicon.ico %%DATADIR%%/default/images/feed-icon-14x14.png -%%DATADIR%%/default/index.html -%%DATADIR%%/default/index.xml +%%DATADIR%%/default/images/favicon.ico +%%DATADIR%%/default/styles/feed.css +%%DATADIR%%/default/styles/print.css %%DATADIR%%/default/styles/nb_clean.css %%DATADIR%%/default/styles/nb_default.css -%%DATADIR%%/default/styles/nb_rusted.css -%%DATADIR%%/default/styles/nb_spring.css -%%DATADIR%%/default/styles/nb_steelblue.css -%%DATADIR%%/default/styles/print.css +%%DATADIR%%/default/templates/permalink_entry.htm +%%DATADIR%%/default/templates/makepage.htm %%DATADIR%%/default/templates/category_archive.htm +%%DATADIR%%/default/templates/permalink.htm +%%DATADIR%%/default/templates/main_index.htm %%DATADIR%%/default/templates/category_entry.htm -%%DATADIR%%/default/templates/day_archive.htm -%%DATADIR%%/default/templates/entry.htm %%DATADIR%%/default/templates/entry.metadata +%%DATADIR%%/default/templates/entry.htm %%DATADIR%%/default/templates/file.metadata -%%DATADIR%%/default/templates/main_index.htm -%%DATADIR%%/default/templates/main_links.htm -%%DATADIR%%/default/templates/makepage.htm +%%DATADIR%%/default/templates/day_archive.htm +%%DATADIR%%/default/templates/month_entry.htm +%%DATADIR%%/default/templates/year_archive.htm %%DATADIR%%/default/templates/month_archive.htm -%%DATADIR%%/default/templates/permalink.htm -%%DATADIR%%/default/templates/permalink_entry.htm %%DATADIR%%/default/templates/weblog_status.htm -%%DATADIR%%/default/templates/year_archive.htm +%%DATADIR%%/default/templates/main_links.htm %%DATADIR%%/lang/en/help.txt +%%DATADIR%%/lang/en/templates.lang %%DATADIR%%/lang/en/messages.lang %%DATADIR%%/lang/en/plugins.lang -%%DATADIR%%/lang/en/templates.lang +%%DATADIR%%/lib/archive.sh %%DATADIR%%/lib/config.sh +%%DATADIR%%/lib/database.sh %%DATADIR%%/lib/error.sh -%%DATADIR%%/lib/query.sh %%DATADIR%%/lib/tools.sh %%DATADIR%%/moods/moods.conf %%DATADIR%%/moods/mymood.txt -%%DATADIR%%/moods/smilies/angry.gif -%%DATADIR%%/moods/smilies/cheesy.gif +%%DATADIR%%/moods/smilies/tongue.gif +%%DATADIR%%/moods/smilies/rolleyes.gif +%%DATADIR%%/moods/smilies/wink.gif +%%DATADIR%%/moods/smilies/grin.gif %%DATADIR%%/moods/smilies/cool.gif -%%DATADIR%%/moods/smilies/cry.gif %%DATADIR%%/moods/smilies/embarassed.gif -%%DATADIR%%/moods/smilies/grin.gif -%%DATADIR%%/moods/smilies/huh.gif -%%DATADIR%%/moods/smilies/kiss.gif +%%DATADIR%%/moods/smilies/sad.gif +%%DATADIR%%/moods/smilies/cheesy.gif %%DATADIR%%/moods/smilies/laugh.gif +%%DATADIR%%/moods/smilies/cry.gif +%%DATADIR%%/moods/smilies/kiss.gif +%%DATADIR%%/moods/smilies/smiley.gif %%DATADIR%%/moods/smilies/lipsrsealed.gif -%%DATADIR%%/moods/smilies/rolleyes.gif -%%DATADIR%%/moods/smilies/sad.gif +%%DATADIR%%/moods/smilies/angry.gif +%%DATADIR%%/moods/smilies/huh.gif %%DATADIR%%/moods/smilies/shocked.gif -%%DATADIR%%/moods/smilies/smiley.gif -%%DATADIR%%/moods/smilies/tongue.gif -%%DATADIR%%/moods/smilies/wink.gif -%%DATADIR%%/plugins/archive/day/cal2daytitle.sh +%%DATADIR%%/plugins/archive/month/month_archive.sh +%%DATADIR%%/plugins/archive/year/year_archive.sh %%DATADIR%%/plugins/archive/master_index.sh -%%DATADIR%%/plugins/archive/month/month_calendar.sh -%%DATADIR%%/plugins/archive/year/year_index.sh +%%DATADIR%%/plugins/archive/day/day_archive.sh %%DATADIR%%/plugins/atom.sh %%DATADIR%%/plugins/calendar.sh -%%DATADIR%%/plugins/entry/category_links.sh -%%DATADIR%%/plugins/entry/format/autobr.sh +%%DATADIR%%/plugins/entry/mod/moods.sh +%%DATADIR%%/plugins/entry/mod/base_url.sh %%DATADIR%%/plugins/entry/format/markdown.sh %%DATADIR%%/plugins/entry/format/raw.sh -%%DATADIR%%/plugins/entry/mod/base_url.sh -%%DATADIR%%/plugins/entry/mod/moods.sh +%%DATADIR%%/plugins/entry/format/autobr.sh +%%DATADIR%%/plugins/entry/category_links.sh %%DATADIR%%/plugins/makepage/tidy.sh %%DATADIR%%/plugins/page/feed_links.sh -%%DATADIR%%/plugins/page/format/autobr.sh %%DATADIR%%/plugins/page/format/markdown.sh -%%DATADIR%%/plugins/page/format/moods.sh %%DATADIR%%/plugins/page/format/raw.sh +%%DATADIR%%/plugins/page/format/moods.sh +%%DATADIR%%/plugins/page/format/autobr.sh %%DATADIR%%/plugins/post/clean_parts.off %%DATADIR%%/plugins/recent_entries.sh %%DATADIR%%/plugins/rss2.sh @@ -89,31 +81,8 @@ %%DATADIR%%/plugins/weblog_status.sh %%DATADIR%%/plugins/z001_articles_meta.sh %%DATADIR%%/welcome-to-nb.txt -@dirrm %%DATADIR%%/plugins/post -@dirrm %%DATADIR%%/plugins/page/format -@dirrm %%DATADIR%%/plugins/page -@dirrm %%DATADIR%%/plugins/makepage -@dirrm %%DATADIR%%/plugins/entry/mod -@dirrm %%DATADIR%%/plugins/entry/format -@dirrm %%DATADIR%%/plugins/entry -@dirrm %%DATADIR%%/plugins/archive/year -@dirrm %%DATADIR%%/plugins/archive/month -@dirrm %%DATADIR%%/plugins/archive/day -@dirrm %%DATADIR%%/plugins/archive -@dirrm %%DATADIR%%/plugins -@dirrm %%DATADIR%%/moods/smilies -@dirrm %%DATADIR%%/moods -@dirrm %%DATADIR%%/lib -@dirrm %%DATADIR%%/lang/en -@dirrm %%DATADIR%%/lang -@dirrm %%DATADIR%%/default/templates -@dirrm %%DATADIR%%/default/styles -@dirrm %%DATADIR%%/default/plugins -@dirrm %%DATADIR%%/default/parts -@dirrm %%DATADIR%%/default/images -@dirrm %%DATADIR%%/default/data -@dirrm %%DATADIR%%/default/cache -@dirrm %%DATADIR%%/default/articles -@dirrm %%DATADIR%%/default -@dirrm %%DATADIR%% -@dirrm %%DOCSDIR%% +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/nanoblogger.html diff -ruN www/nanoblogger.orig/pkg-plist.dirrm www/nanoblogger/pkg-plist.dirrm --- www/nanoblogger.orig/pkg-plist.dirrm 1970-01-01 00:00:00.000000000 +0000 +++ www/nanoblogger/pkg-plist.dirrm 2008-06-20 23:18:33.000000000 +0000 @@ -0,0 +1,28 @@ +@dirrm %%DATADIR%%/default/articles +@dirrm %%DATADIR%%/default/cache +@dirrm %%DATADIR%%/default/data +@dirrm %%DATADIR%%/default/images +@dirrm %%DATADIR%%/default/plugins +@dirrm %%DATADIR%%/default/styles +@dirrm %%DATADIR%%/default/templates +@dirrm %%DATADIR%%/default +@dirrm %%DATADIR%%/lang/en +@dirrm %%DATADIR%%/lang +@dirrm %%DATADIR%%/lib +@dirrm %%DATADIR%%/moods/smilies +@dirrm %%DATADIR%%/moods +@dirrm %%DATADIR%%/plugins/archive/month +@dirrm %%DATADIR%%/plugins/archive/year +@dirrm %%DATADIR%%/plugins/archive/category +@dirrm %%DATADIR%%/plugins/archive/day +@dirrm %%DATADIR%%/plugins/archive +@dirrm %%DATADIR%%/plugins/entry/mod +@dirrm %%DATADIR%%/plugins/entry/format +@dirrm %%DATADIR%%/plugins/entry +@dirrm %%DATADIR%%/plugins/makepage +@dirrm %%DATADIR%%/plugins/page/format +@dirrm %%DATADIR%%/plugins/page +@dirrm %%DATADIR%%/plugins/post +@dirrm %%DATADIR%%/plugins +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff -ruN www/nanoblogger.orig/pkg-plist.extra www/nanoblogger/pkg-plist.extra --- www/nanoblogger.orig/pkg-plist.extra 1970-01-01 00:00:00.000000000 +0000 +++ www/nanoblogger/pkg-plist.extra 2008-06-20 23:43:37.000000000 +0000 @@ -0,0 +1,34 @@ +%%DATADIR%%/plugins/entry/format/autopbr.sh +%%DATADIR%%/plugins/entry/z0_excerpt.off +%%DATADIR%%/plugins/001_mymood.off +%%DATADIR%%/plugins/rss.sh +%%DATADIR%%/plugins/page/format/autopbr.sh +%%DATADIR%%/plugins/page/page_links.off +%%DATADIR%%/plugins/file_links.sh +%%DATADIR%%/plugins/archive/master_fullindex.off +%%DATADIR%%/plugins/archive/category/include_listings.sh +%%DATADIR%%/plugins/z001_articles_text.off +%%DATADIR%%/plugins/fortune.sh +%%DATADIR%%/default/templates/category_inc_entry.htm +%%DATADIR%%/default/templates/category_inc_archive.htm +%%DATADIR%%/lang/tr/help.txt +%%DATADIR%%/lang/tr/templates.lang +%%DATADIR%%/lang/tr/messages.lang +%%DATADIR%%/lang/tr/plugins.lang +%%DATADIR%%/lang/de/help.txt +%%DATADIR%%/lang/de/templates.lang +%%DATADIR%%/lang/de/messages.lang +%%DATADIR%%/lang/de/plugins.lang +%%DATADIR%%/lang/es/help.txt +%%DATADIR%%/lang/es/templates.lang +%%DATADIR%%/lang/es/messages.lang +%%DATADIR%%/lang/es/plugins.lang +%%DATADIR%%/lang/fr/help.txt +%%DATADIR%%/lang/fr/templates.lang +%%DATADIR%%/lang/fr/messages.lang +%%DATADIR%%/lang/fr/plugins.lang +%%PORTDOCS%%%%DOCSDIR%%/README-extra +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog-extra +%%PORTDOCS%%%%DOCSDIR%%/nanoblogger_de.html +%%PORTDOCS%%%%DOCSDIR%%/nanoblogger_fr.html +%%EXAMPLES%%%%EXAMPLESDIR%%/nanoblogger.bash_completion diff -ruN www/nanoblogger.orig/pkg-plist.extra.dirrm www/nanoblogger/pkg-plist.extra.dirrm --- www/nanoblogger.orig/pkg-plist.extra.dirrm 1970-01-01 00:00:00.000000000 +0000 +++ www/nanoblogger/pkg-plist.extra.dirrm 2008-06-20 23:46:07.000000000 +0000 @@ -0,0 +1,5 @@ +@dirrm %%DATADIR%%/lang/tr +@dirrm %%DATADIR%%/lang/de +@dirrm %%DATADIR%%/lang/es +@dirrm %%DATADIR%%/lang/fr +%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%