Attachment 74658 Details for Bug 107963 – nanoblogger.patch

[patch] nanoblogger.patch

nanoblogger.patch (text/plain), 12.14 KB, created by Julien Gabel on 2007-01-15 20:30:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julien Gabel

Created: 2007-01-15 20:30:19 UTC

Size: 12.14 KB

patch

obsolete

>diff -ruN nanoblogger.orig/Makefile nanoblogger/Makefile
>--- nanoblogger.orig/Makefile	Sun May 14 05:05:39 2006
>+++ nanoblogger/Makefile	Mon Jan 15 20:23:31 2007
>@@ -3,17 +3,17 @@
> # Date created:			Jul 15, 2004
> # Whom:				ijliao
> #
>-# $FreeBSD: ports/www/nanoblogger/Makefile,v 1.7 2006/05/13 04:41:16 edwin Exp $
>+# $FreeBSD: ports/www/nanoblogger/Makefile,v 1.6 2005/09/15 21:24:17 pav Exp $
> #
> 
> PORTNAME=	nanoblogger
>-PORTVERSION=	3.2.3
>+PORTVERSION=	3.3
> CATEGORIES=	www
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
> 
>-MAINTAINER=	jpeg@thilelli.net
>-COMMENT=	Small weblog engine for the UNIX command line
>+MAINTAINER=	julien.gabel@thilelli.net
>+COMMENT=	Small weblog engine written in Bash for the command line
> 
> RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
> 
>@@ -28,14 +28,20 @@
> 	${INSTALL_SCRIPT} ${WRKSRC}/nb ${PREFIX}/bin
> 	${INSTALL_DATA} ${WRKSRC}/nb.conf ${PREFIX}/etc/nb.conf.sample
> 	${MKDIR} ${DATADIR}
>-.for dir in default moods plugins
>-	${CP} -R ${WRKSRC}/${dir} ${DATADIR}
>+.for data in default lang lib moods plugins
>+	${CP} -R ${WRKSRC}/${data} ${DATADIR}
> .endfor
>+	${CP} ${WRKSRC}/welcome-to-nb.txt ${DATADIR}
> 
> post-install:
>+	@if [ ! -f ${PREFIX}/etc/nb.conf ]; then \
>+		${CP} -p ${PREFIX}/etc/nb.conf.sample ${PREFIX}/etc/nb.conf; \
>+	fi
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${DOCSDIR}
>-	${INSTALL_MAN} ${WRKSRC}/docs/nanoblogger.html ${DOCSDIR}
>+.for doc in COPYING ChangeLog README TODO docs/nanoblogger.html
>+	${INSTALL_MAN} ${WRKSRC}/${doc} ${DOCSDIR}
>+.endfor
> .endif
> 	@${CAT} ${PKGMESSAGE}
> 
>diff -ruN nanoblogger.orig/distinfo nanoblogger/distinfo
>--- nanoblogger.orig/distinfo	Tue Jan 24 04:13:34 2006
>+++ nanoblogger/distinfo	Sun Jan 14 16:40:09 2007
>@@ -1,3 +1,3 @@
>-MD5 (nanoblogger-3.2.3.tar.gz) = bd9f5f9d48b9b666f7bd03c76d90a724
>-SHA256 (nanoblogger-3.2.3.tar.gz) = 9b1d51060e9f0f8db7119546c8dbb915c0dd214ed970844705d8738616c9029b
>-SIZE (nanoblogger-3.2.3.tar.gz) = 54672
>+MD5 (nanoblogger-3.3.tar.gz) = c9df242e48be0c9b7fca2443c00fd6dc
>+SHA256 (nanoblogger-3.3.tar.gz) = b49b25ee18c42dc9cf47fdd456e5dd19033456c64104a0ccba34e318e5daf1a0
>+SIZE (nanoblogger-3.3.tar.gz) = 82302
>diff -ruN nanoblogger.orig/files/patch-nb nanoblogger/files/patch-nb
>--- nanoblogger.orig/files/patch-nb	Wed Jul  6 22:58:51 2005
>+++ nanoblogger/files/patch-nb	Sun Jan 14 17:41:44 2007
>@@ -1,35 +1,23 @@
>---- nb.orig	Tue Jul  5 10:49:45 2005
>-+++ nb	Tue Jul  5 10:51:56 2005
>+--- nb.orig	Sun Jan 14 17:38:03 2007
>++++ nb	Sun Jan 14 17:41:26 2007
> @@ -1,4 +1,4 @@
> -#! /bin/bash
> +#!/usr/bin/env bash
>  ############################################################
>- #  NanoBlogger 3.2.3 Copyright 2005 n1xt3r (Kevin R. Wood)   #
>+ #  NanoBlogger 3.3 Copyright 2006 n1xt3r (Kevin R. Wood)   #
>  ############################################################
>-@@ -7,7 +7,7 @@
>- VERSION="3.2.3"
>+@@ -8,11 +8,11 @@
>+ VERSION="3.3"
>  
>  # nanoblogger's base install directory.
> -NB_BASE_DIR=`dirname $0`
> +NB_BASE_DIR="%%PREFIX%%/share/nanoblogger"
>+ # documentation
>+-NB_DOC_DIR="$NB_BASE_DIR/docs"
>++NB_DOC_DIR="%%PREFIX%%/share/doc/nanoblogger"
>+ # nanoblogger's conf file
>+-NB_CFG_DIR="$NB_BASE_DIR"
>++NB_CFG_DIR="%%PREFIX%%/etc"
>+ 
>+ ### hardcoded paths ###
>  
>- # create a semi ISO 8601 formatted timestamp for archives
>- # used explicitly, please don't edit unless you know what you're doing.
>-@@ -67,7 +67,7 @@
>- # set deprecated BASE_DIR for temporary compatibility
>- BASE_DIR="$NB_BASE_DIR"
>- # always load global configs
>--[ -f "$NB_BASE_DIR/nb.conf" ] && . "$NB_BASE_DIR/nb.conf"
>-+[ -f "%%PREFIX%%/etc/nb.conf" ] && . "%%PREFIX%%/etc/nb.conf"
>- # check for user's .nb.conf in their home directory
>- [ -f "$HOME/.nb.conf" ] && . "$HOME/.nb.conf"
>- # allow user specified weblog directories 
>-@@ -1070,7 +1070,7 @@
>- 	nb_msg "copying default weblog files ..."
>- 	# copy default files and directories
>- 	cp "$NB_BASE_DIR"/default/*.* "$BLOG_DIR"
>--	for weblog_dir in "$NB_BASE_DIR"/default/*/; do
>-+	for weblog_dir in "$NB_BASE_DIR"/default/*; do
>- 		cp -R "$weblog_dir" "$BLOG_DIR"
>- 	done
>- 	# create some critical empty directories
>diff -ruN nanoblogger.orig/files/pkg-message.in nanoblogger/files/pkg-message.in
>--- nanoblogger.orig/files/pkg-message.in	Thu Sep 15 23:24:17 2005
>+++ nanoblogger/files/pkg-message.in	Mon Jan 15 20:25:48 2007
>@@ -1,10 +1,32 @@
> POST-INSTALLATION NOTES:
> 
>-Before you can use NanoBlogger, you will have to create a global configuration file
>-to set defaults information and paths to template files.
>+Before you can use NanoBlogger, you will have to create a global configuration
>+file to set default information and paths to template files.
> 
> A sample configuration file has been installed in:
>  %%PREFIX%%/etc/nb.conf.sample
> 
>-Since there are already some sensible default settings, you can begin with:
>- cp %%PREFIX%%/etc/nb.conf.sample %%PREFIX%%/etc/nb.conf
>+If no global configuration file is already present, it has been installed as:
>+ %%PREFIX%%/etc/nb.conf
>+
>+Otherwise, since there are already some sensible default settings, you can
>+overwrite it and begin with a fresh one:
>+ # cp %%PREFIX%%/etc/nb.conf.sample %%PREFIX%%/etc/nb.conf
>+
>+The provided documentation and the preferred upgrade path (in the README
>+file) can be found in the additional documentation directory:
>+  %%DOCSDIR%%/*
>+
>+
>+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.
>+ - 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 nanoblogger.orig/pkg-descr nanoblogger/pkg-descr
>--- nanoblogger.orig/pkg-descr	Thu Sep 15 23:24:17 2005
>+++ nanoblogger/pkg-descr	Sun Jan 14 16:42:31 2007
>@@ -1,24 +1,24 @@
>-NanoBlogger is a small weblog engine written in Bash for the command line. It
>-uses common UNIX tools such as cat, grep and sed.
>+NanoBlogger is a small weblog engine written in Bash for the command
>+line.  It uses common UNIX tools such as cat, grep, and sed to create
>+static HTML content.
> 
> Features include:
>-    * intuitive commandline interface
>-    * support for multiple weblogs
>-    * support for multiple categories
>-    * easy editing and management of entries
>-    * archiving by category, entry, and month
>-    * pagination
>-    * permanent links
>-    * RSS syndication (comes with RSS 1.0 and 2.0 formats)
>-    * Atom syndication (comes with 0.3 format)
>-    * templates and CSS style sheets for full control of appearance
>-    * placeholders for easy template manipulation
>-    * plugins for calendar, recent entries, weblog status, fortunes, etc.
>-    * auto-formatting, e.g. line breaks translate to HTML
>-    * support for relative and absolute links
>-    * [...]
>+ * intuitive commandline interface
>+ * highly configurable and script-able :)
>+ * easy drafting, editing, and management of entries
>+ * archiving by category, year, month, day, and entry
>+ * pagination
>+ * permanent and navigational links
>+ * templates and CSS style sheets for full control over layout
>+ * placeholders for easy template manipulation
>+ * support for multiple weblogs
>+ * support for multiple categories
>+ * support for relative and absolute links
>+ * support for date manipulation of entries
>+ * Atom syndication (comes with 1.0 format)
>+ * RSS syndication (comes with RSS 1.0 and 2.0 formats)
>+ * plugins for calendar, recent entries, weblog status, etc.
>+ * plugins for text formatting (e.g. line breaks translate to HTML)
>+ * [...]
> 
> WWW: http://nanoblogger.sourceforge.net/
>-
>-- Julien Gabel
>-jpeg@thilelli.net
>diff -ruN nanoblogger.orig/pkg-plist nanoblogger/pkg-plist
>--- nanoblogger.orig/pkg-plist	Thu Sep 15 23:24:17 2005
>+++ nanoblogger/pkg-plist	Mon Jan 15 20:13:00 2007
>@@ -1,21 +1,34 @@
> bin/nb
> 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
>-%%DATADIR%%/default/articles/example.html
> %%DATADIR%%/default/articles/example.txt
> %%DATADIR%%/default/atom.xml
> %%DATADIR%%/default/blog.conf
>-%%DATADIR%%/default/data/2005-06-02T20_48_35.txt
> %%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/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/category_archive.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/file.metadata
> %%DATADIR%%/default/templates/main_index.htm
> %%DATADIR%%/default/templates/main_links.htm
> %%DATADIR%%/default/templates/makepage.htm
>@@ -23,6 +36,15 @@
> %%DATADIR%%/default/templates/permalink.htm
> %%DATADIR%%/default/templates/permalink_entry.htm
> %%DATADIR%%/default/templates/weblog_status.htm
>+%%DATADIR%%/default/templates/year_archive.htm
>+%%DATADIR%%/lang/en/help.txt
>+%%DATADIR%%/lang/en/messages.lang
>+%%DATADIR%%/lang/en/plugins.lang
>+%%DATADIR%%/lang/en/templates.lang
>+%%DATADIR%%/lib/config.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
>@@ -41,38 +63,56 @@
> %%DATADIR%%/moods/smilies/smiley.gif
> %%DATADIR%%/moods/smilies/tongue.gif
> %%DATADIR%%/moods/smilies/wink.gif
>-%%DATADIR%%/plugins/01_mymood.off
>+%%DATADIR%%/plugins/archive/day/cal2daytitle.sh
> %%DATADIR%%/plugins/archive/master_index.sh
> %%DATADIR%%/plugins/archive/month/month_calendar.sh
>+%%DATADIR%%/plugins/archive/year/year_index.sh
> %%DATADIR%%/plugins/atom.sh
> %%DATADIR%%/plugins/calendar.sh
> %%DATADIR%%/plugins/entry/category_links.sh
>-%%DATADIR%%/plugins/entry/mod/auto_break.sh
>+%%DATADIR%%/plugins/entry/format/autobr.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/fortune.sh
> %%DATADIR%%/plugins/makepage/tidy.sh
> %%DATADIR%%/plugins/page/feed_links.sh
>-%%DATADIR%%/plugins/page/page_links.off
>+%%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/post/clean_parts.off
> %%DATADIR%%/plugins/recent_entries.sh
>-%%DATADIR%%/plugins/rss.sh
> %%DATADIR%%/plugins/rss2.sh
> %%DATADIR%%/plugins/weblog_links.sh
> %%DATADIR%%/plugins/weblog_status.sh
>-%%DATADIR%%/plugins/zyx_articles.sh
>+%%DATADIR%%/plugins/z001_articles_meta.sh
>+%%DATADIR%%/welcome-to-nb.txt
>+@unexec if cmp -s %D/etc/nb.conf.sample %D/etc/nb.conf; then rm -f %D/etc/nb.conf; fi
>+@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%%

Actions: View | Diff

Attachments on bug 107963: 74658