Attachment 104315 Details for Bug 144474 – nanoblogger-3.4.2.diff

[patch] nanoblogger-3.4.2.diff

nanoblogger-3.4.2.diff (text/plain), 12.87 KB, created by Tobias Rehbein on 2010-03-04 19:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Rehbein

Created: 2010-03-04 19:10:00 UTC

Size: 12.87 KB

patch

obsolete

>Files /usr/ports/www/nanoblogger/.Makefile.swp and www/nanoblogger/.Makefile.swp differ
>diff -ruN /usr/ports/www/nanoblogger/Makefile www/nanoblogger/Makefile
>--- /usr/ports/www/nanoblogger/Makefile	2009-08-30 17:56:06.000000000 +0200
>+++ www/nanoblogger/Makefile	2010-02-18 20:02:34.000000000 +0100
>@@ -7,9 +7,9 @@
> #
> 
> PORTNAME=	nanoblogger
>-PORTVERSION=	3.4
>+PORTVERSION=	3.4.2
> CATEGORIES=	www
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
>+MASTER_SITES=	http://nanoblogger.sourceforge.net/downloads/
> 
> MAINTAINER=	tobias.rehbein@web.de
> COMMENT=	Small weblog engine written in Bash for the command line
>@@ -27,27 +27,27 @@
> 	@${REINPLACE_CMD} -e "s,%%DOCSDIR%%,${DOCSDIR},g" ${WRKSRC}/nb
> 
> do-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/nb ${PREFIX}/bin
>-	${INSTALL_DATA} ${WRKSRC}/nb.conf ${PREFIX}/etc/nb.conf.sample
>-	${MKDIR} ${DATADIR}
>+	@${INSTALL_SCRIPT} ${WRKSRC}/nb ${PREFIX}/bin
>+	@${INSTALL_DATA} ${WRKSRC}/nb.conf ${PREFIX}/etc/nb.conf.sample
>+	@${MKDIR} ${DATADIR}
> .for data in default lang lib moods plugins
>-	${MKDIR} ${DATADIR}/${data} && \
>+	@${MKDIR} ${DATADIR}/${data} && \
> 		( cd ${WRKSRC}/${data} && \
> 			${COPYTREE_SHARE} \* ${DATADIR}/${data} "! -name *.orig" )
> .endfor
>-	${CP} ${WRKSRC}/welcome-to-nb.txt ${DATADIR}
>+	@${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}
>+	@${MKDIR} ${DOCSDIR}
> .for doc in COPYING ChangeLog README TODO copyright
>-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
> .endfor
>-	${MKDIR} ${DOCSDIR}/html
>-	${INSTALL_DATA} ${WRKSRC}/docs/nanoblogger.html ${DOCSDIR}/html
>+	@${MKDIR} ${DOCSDIR}/html
>+	@${INSTALL_DATA} ${WRKSRC}/docs/nanoblogger.html ${DOCSDIR}/html
> .endif
> 	@${CAT} ${PKGMESSAGE}
> 
>diff -ruN /usr/ports/www/nanoblogger/distinfo www/nanoblogger/distinfo
>--- /usr/ports/www/nanoblogger/distinfo	2009-08-04 11:13:40.000000000 +0200
>+++ www/nanoblogger/distinfo	2010-02-16 16:33:19.000000000 +0100
>@@ -1,3 +1,3 @@
>-MD5 (nanoblogger-3.4.tar.gz) = 6162a3637ab22e98ac4267e0db687fe1
>-SHA256 (nanoblogger-3.4.tar.gz) = 29c42b3d5e356fb17ca08693279f16e966aeecf430d1a1cab8601c130b3a5a02
>-SIZE (nanoblogger-3.4.tar.gz) = 95517
>+MD5 (nanoblogger-3.4.2.tar.gz) = 9de66534776d557c4611cabbdedcaaff
>+SHA256 (nanoblogger-3.4.2.tar.gz) = 8631802db56c3e2c01df94f60aa30e7b1500c1a76112741a740d9eaf3bd32044
>+SIZE (nanoblogger-3.4.2.tar.gz) = 86877
>diff -ruN /usr/ports/www/nanoblogger/files/patch-nb www/nanoblogger/files/patch-nb
>--- /usr/ports/www/nanoblogger/files/patch-nb	2009-08-04 11:13:40.000000000 +0200
>+++ www/nanoblogger/files/patch-nb	2010-03-01 22:13:02.000000000 +0100
>@@ -1,17 +1,17 @@
>---- ./nb.orig	2009-04-26 03:55:07.000000000 +0200
>-+++ ./nb	2009-06-22 09:31:59.000000000 +0200
>+--- ./nb.orig	2010-02-15 22:01:53.000000000 +0100
>++++ ./nb	2010-03-01 22:12:55.000000000 +0100
> @@ -1,4 +1,4 @@
> -#! /bin/bash
> +#! %%LOCALBASE%%/bin/bash
>  ############################################################
>- #  NanoBlogger 3.4 Copyright 2009 n1xt3r (Kevin R. Wood)   #
>+ #  NanoBlogger 3.4.2 Copyright 2010 n1xt3r (Kevin R. Wood) #
>  ############################################################
>-@@ -9,11 +9,11 @@
>+@@ -11,11 +11,11 @@
>  
>  # -- hardcoded paths --
>  # where to expect nanoblogger's base
> -NB_BASE_DIR=`dirname $0`
>-+NB_BASE_DIR=%%DATADIR%%
>++NB_BASE_DIR="%%DATADIR%%"
>  # where to expect nanoblogger's documentation
> -NB_DOC_DIR="$NB_BASE_DIR/docs"
> +NB_DOC_DIR="%%DOCSDIR%%"
>@@ -21,7 +21,7 @@
>  # nanoblogger's language definitions directory.
>  NB_LANG_DIR="${NB_BASE_DIR}/lang"
>  # nanoblogger's module directory.
>-@@ -863,6 +863,9 @@
>+@@ -875,6 +875,9 @@
>  			for weblog_dir in "$NB_BASE_DIR"/default/*; do
>  				cp -R "$weblog_dir" "$BLOG_DIR"
>  			done
>diff -ruN /usr/ports/www/nanoblogger/files/patch-nb.conf www/nanoblogger/files/patch-nb.conf
>--- /usr/ports/www/nanoblogger/files/patch-nb.conf	2009-07-08 01:49:47.000000000 +0200
>+++ www/nanoblogger/files/patch-nb.conf	2010-03-01 22:13:02.000000000 +0100
>@@ -1,5 +1,5 @@
>---- ./nb.conf.orig	2007-02-19 00:55:08.000000000 +0100
>-+++ ./nb.conf	2009-06-22 09:31:59.000000000 +0200
>+--- ./nb.conf.orig	2010-02-15 02:14:23.000000000 +0100
>++++ ./nb.conf	2010-03-01 22:10:36.000000000 +0100
> @@ -7,7 +7,7 @@
>  NB_LANG="en"
>  
>diff -ruN /usr/ports/www/nanoblogger/files/patch-plugins__archive__master_index.sh www/nanoblogger/files/patch-plugins__archive__master_index.sh
>--- /usr/ports/www/nanoblogger/files/patch-plugins__archive__master_index.sh	2009-07-08 01:49:47.000000000 +0200
>+++ www/nanoblogger/files/patch-plugins__archive__master_index.sh	1970-01-01 01:00:00.000000000 +0100
>@@ -1,20 +0,0 @@
>---- ./plugins/archive/master_index.sh.orig	2008-05-27 06:37:33.000000000 +0200
>-+++ ./plugins/archive/master_index.sh	2009-06-22 09:31:59.000000000 +0200
>-@@ -65,7 +65,7 @@
>- 	cat_total=${#db_categories[*]}
>- 	if [ "$cat_total" -gt 0 ]; then
>- 		# make NB_CategoryLinks placeholder
>--		NB_BrowseCategoryLinks=$(
>-+		NB_BrowseCategoryLinks=`
>- 		cat <<-EOF
>- 			<a id="category"></a>
>- 			<strong>$template_browsecat</strong>
>-@@ -73,7 +73,7 @@
>- 				$NB_ArchiveCategoryLinks
>- 			</div>
>- 			<br />
>--		EOF)
>-+		EOF`
>- 	fi
>- 
>- 	# make NB_ArchiveLinks placeholder
>diff -ruN /usr/ports/www/nanoblogger/files/patch-plugins__archive__year__year_archive.sh www/nanoblogger/files/patch-plugins__archive__year__year_archive.sh
>--- /usr/ports/www/nanoblogger/files/patch-plugins__archive__year__year_archive.sh	2009-07-08 01:49:47.000000000 +0200
>+++ www/nanoblogger/files/patch-plugins__archive__year__year_archive.sh	1970-01-01 01:00:00.000000000 +0100
>@@ -1,35 +0,0 @@
>---- ./plugins/archive/year/year_archive.sh.orig	2008-07-15 20:11:53.000000000 +0200
>-+++ ./plugins/archive/year/year_archive.sh	2009-06-22 09:33:11.000000000 +0200
>-@@ -50,7 +50,7 @@
>- 		set_baseurl "../../"
>- 
>- 		ARCHENTRY_LIST=${DB_RESULTS[*]}
>--		NB_ArchiveEntryLinks=$(
>-+		NB_ArchiveEntryLinks=`
>- 		for entry in ${ARCHENTRY_LIST[*]}; do
>- 			NB_EntryID=$x_id${entrylink_var//[\/]/-}
>- 			set_entrylink "$entry"
>-@@ -66,12 +66,12 @@
>- 				# Command to help filter order of categories
>- 				: ${CATLINKS_FILTERCMD:=sort}
>- 				>"$SCRATCH_FILE".cat_links
>--				entry_wcatids=`grep "$entry" "$NB_DATA_DIR/master.$NB_DBTYPE"`
>-+				entry_wcatids=$(grep "$entry" "$NB_DATA_DIR/master.$NB_DBTYPE")
>- 				entry_catids=${entry_wcatids##*\>}
>- 				[ "$entry_wcatids" = "$entry_catids" ] &&
>- 					entry_catids=
>- 				for entry_catnum in ${entry_catids//\,/ }; do
>--					cat_title=`nb_print "$NB_DATA_DIR"/cat_"$entry_catnum.$NB_DBTYPE" 1`
>-+					cat_title=$(nb_print "$NB_DATA_DIR"/cat_"$entry_catnum.$NB_DBTYPE" 1)
>- 					set_catlink cat_"$entry_catnum.$NB_DBTYPE"
>- 					cat_index="$category_link"
>- 					# following must fit on single line
>-@@ -92,7 +92,7 @@
>- 				- <a href="${ARCHIVES_PATH}$NB_EntryPermalink">$NB_ArchiveEntryTitle</a>
>- 				$([ ! -z "$NB_EntryCategories" ] && echo "- $NB_EntryCategories")<br />
>- 			EOF
>--		done; month=)
>-+		done; month=`
>- 
>- 		# create links for monthly archives
>- 		[ -z "$CAL_CMD" ] && CAL_CMD="cal"
>diff -ruN /usr/ports/www/nanoblogger/files/patch-plugins__entry__format__markdown.sh www/nanoblogger/files/patch-plugins__entry__format__markdown.sh
>--- /usr/ports/www/nanoblogger/files/patch-plugins__entry__format__markdown.sh	1970-01-01 01:00:00.000000000 +0100
>+++ www/nanoblogger/files/patch-plugins__entry__format__markdown.sh	2010-03-01 22:13:02.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- ./plugins/entry/format/markdown.sh.orig	2010-02-14 21:42:17.000000000 +0100
>++++ ./plugins/entry/format/markdown.sh	2010-03-01 22:10:36.000000000 +0100
>+@@ -5,7 +5,7 @@
>+ : ${MARKDOWN_CMD:=markdown}
>+ : ${MARKDOWN_OPTS:= }
>+ 
>+-nb_eval "$MARKDOWN_CMD" && MARKDOWN_INPATH=true
>++nb_eval "$MARKDOWN_CMD -v" && MARKDOWN_INPATH=true
>+ 	
>+ if [ "$MARKDOWN_INPATH" = "true" ]; then
>+ 	# nb_msg "$plugins_entryfilteraction `basename $nb_plugin` ..."
>diff -ruN /usr/ports/www/nanoblogger/files/patch-plugins__page__feed_links.sh www/nanoblogger/files/patch-plugins__page__feed_links.sh
>--- /usr/ports/www/nanoblogger/files/patch-plugins__page__feed_links.sh	2009-07-08 01:49:47.000000000 +0200
>+++ www/nanoblogger/files/patch-plugins__page__feed_links.sh	1970-01-01 01:00:00.000000000 +0100
>@@ -1,52 +0,0 @@
>---- ./plugins/page/feed_links.sh.orig	2007-02-05 00:12:00.000000000 +0100
>-+++ ./plugins/page/feed_links.sh	2009-06-22 09:31:59.000000000 +0200
>-@@ -16,14 +16,14 @@
>- 		NB_AtomLink="${BASE_URL}atom.$NB_SYND_FILETYPE"
>- 		NB_AtomTitle="Atom $NB_AtomVer"
>- 	fi
>--	NB_AtomAltLink=$(
>-+	NB_AtomAltLink=`
>- 	cat <<-EOF
>- 		<link rel="alternate" type="application/atom+xml"
>- 			title="$NB_AtomTitle"
>- 			href="$NB_AtomLink"
>- 		/>
>- 	EOF
>--	)
>-+	`
>- fi
>- 
>- # RSS 2.0
>-@@ -36,14 +36,14 @@
>- 		NB_RSS2Link="${BASE_URL}rss.$NB_SYND_FILETYPE"
>- 		NB_RSS2Title="RSS $NB_RSS2Ver"
>- 	fi
>--	NB_RSS2AltLink=$(
>-+	NB_RSS2AltLink=`
>- 	cat <<-EOF
>- 		<link rel="alternate" type="application/rss+xml"
>- 			title="$NB_RSS2Title"
>- 			href="$NB_RSS2Link"
>- 		/>
>- 	EOF
>--	)
>-+	`
>- fi
>- 
>- # RSS 1.0
>-@@ -56,13 +56,13 @@
>- 		NB_RSSLink="${BASE_URL}index.$NB_SYND_FILETYPE"
>- 		NB_RSSTitle="RSS $NB_RSSVer"
>- 	fi
>--	NB_RSSAltLink=$(
>-+	NB_RSSAltLink=`
>- 	cat <<-EOF
>- 		<link rel="alternate" type="application/rss+xml"
>- 			title="$NB_RSSTitle"
>- 			href="$NB_RSSLink"
>- 		/>
>- 	EOF
>--	)
>-+	`
>- fi
>- 
>diff -ruN /usr/ports/www/nanoblogger/files/patch-plugins__page__format__markdown.sh www/nanoblogger/files/patch-plugins__page__format__markdown.sh
>--- /usr/ports/www/nanoblogger/files/patch-plugins__page__format__markdown.sh	1970-01-01 01:00:00.000000000 +0100
>+++ www/nanoblogger/files/patch-plugins__page__format__markdown.sh	2010-03-01 22:13:02.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- ./plugins/page/format/markdown.sh.orig	2009-08-10 02:01:37.000000000 +0200
>++++ ./plugins/page/format/markdown.sh	2010-03-01 22:10:36.000000000 +0100
>+@@ -5,7 +5,7 @@
>+ : ${MARKDOWN_CMD:=markdown}
>+ : ${MARKDOWN_OPTS:= }
>+ 
>+-nb_eval "$MARKDOWN_CMD" && MARKDOWN_INPATH=true
>++nb_eval "$MARKDOWN_CMD -v" && MARKDOWN_INPATH=true
>+ 
>+ if [ "$MARKDOWN_INPATH" = "true" ]; then
>+ 	nb_msg "$plugins_entryfilteraction `basename $nb_plugin` ..."
>diff -ruN /usr/ports/www/nanoblogger/pkg-plist www/nanoblogger/pkg-plist
>--- /usr/ports/www/nanoblogger/pkg-plist	2009-08-04 11:13:41.000000000 +0200
>+++ www/nanoblogger/pkg-plist	2010-02-25 18:57:40.000000000 +0100
>@@ -4,6 +4,8 @@
> @exec if [ ! -f %D/etc/nb.conf ] ; then cp -p %D/%F %B/nb.conf; fi
> @exec mkdir -p %D/share/nanoblogger/default/cache
> @exec mkdir -p %D/share/nanoblogger/default/plugins
>+@exec mkdir -p %D/share/nanoblogger/plugins/entry/mod
>+@exec mkdir -p %D/share/nanoblogger/plugins/page/mod
> %%DATADIR%%/default/articles/example.txt
> %%DATADIR%%/default/blog.conf
> %%DATADIR%%/default/data/cat_1.db
>@@ -13,6 +15,7 @@
> %%DATADIR%%/default/styles/nb_clean.css
> %%DATADIR%%/default/styles/nb_default.css
> %%DATADIR%%/default/styles/print.css
>+%%DATADIR%%/default/templates/archive_index.htm
> %%DATADIR%%/default/templates/category_archive.htm
> %%DATADIR%%/default/templates/category_entry.htm
> %%DATADIR%%/default/templates/day_archive.htm
>@@ -62,7 +65,7 @@
> %%DATADIR%%/plugins/atom.sh
> %%DATADIR%%/plugins/calendar.sh
> %%DATADIR%%/plugins/entry/category_links.sh
>-%%DATADIR%%/plugins/entry/format/autobr.sh
>+%%DATADIR%%/plugins/entry/format/autotag-br.sh
> %%DATADIR%%/plugins/entry/format/markdown.sh
> %%DATADIR%%/plugins/entry/format/raw.sh
> %%DATADIR%%/plugins/makepage/tidy.sh
>@@ -90,30 +93,30 @@
> @dirrm %%DATADIR%%/default/cache
> @dirrm %%DATADIR%%/default/data
> @dirrm %%DATADIR%%/default/images
>-@dirrmtry %%DATADIR%%/default/plugins
>-@dirrm %%DATADIR%%/default/styles
>-@dirrm %%DATADIR%%/default/templates
>-@dirrm %%DATADIR%%/default
>+@dirrm %%DATADIR%%/default/plugins
>+@dirrmtry %%DATADIR%%/default/styles
>+@dirrmtry %%DATADIR%%/default/templates
>+@dirrmtry %%DATADIR%%/default
> @dirrm %%DATADIR%%/lang/en
>-@dirrm %%DATADIR%%/lang
>+@dirrmtry %%DATADIR%%/lang
> @dirrm %%DATADIR%%/lib
> @dirrm %%DATADIR%%/moods/smilies
> @dirrm %%DATADIR%%/moods
> @dirrmtry %%DATADIR%%/plugins/archive/category
>-@dirrmtry %%DATADIR%%/plugins/archive/day
>-@dirrmtry %%DATADIR%%/plugins/archive/month
>-@dirrmtry %%DATADIR%%/plugins/archive/year
>+@dirrm %%DATADIR%%/plugins/archive/day
>+@dirrm %%DATADIR%%/plugins/archive/month
>+@dirrm %%DATADIR%%/plugins/archive/year
> @dirrmtry %%DATADIR%%/plugins/archive
> @dirrmtry %%DATADIR%%/plugins/entry/format
>-@dirrmtry %%DATADIR%%/plugins/entry/mod
>+@dirrm %%DATADIR%%/plugins/entry/mod
> @dirrmtry %%DATADIR%%/plugins/entry
> @dirrm %%DATADIR%%/plugins/makepage
>-@dirrm %%DATADIR%%/plugins/page/format
>-@dirrmtry %%DATADIR%%/plugins/page/mod
>+@dirrmtry %%DATADIR%%/plugins/page/format
>+@dirrm %%DATADIR%%/plugins/page/mod
> @dirrmtry %%DATADIR%%/plugins/page
> @dirrm %%DATADIR%%/plugins/post
>-@dirrm %%DATADIR%%/plugins/shortcode
>-@dirrm %%DATADIR%%/plugins
>-@dirrm %%DATADIR%%/
>+@dirrmtry %%DATADIR%%/plugins/shortcode
>+@dirrmtry %%DATADIR%%/plugins
>+@dirrmtry %%DATADIR%%/
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/

Actions: View | Diff

Attachments on bug 144474: 104315 | 104316