Attachment #104315 for bug #144474




#

PORTNAME=	nanoblogger
PORTVERSION=	3.4.2
CATEGORIES=	www
MASTER_SITES=	http://nanoblogger.sourceforge.net/downloads/

MAINTAINER=	tobias.rehbein@web.de
COMMENT=	Small weblog engine written in Bash for the command line

	@${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}
.for data in default lang lib moods plugins
	@${MKDIR} ${DATADIR}/${data} && \
		( cd ${WRKSRC}/${data} && \
			${COPYTREE_SHARE} \* ${DATADIR}/${data} "! -name *.orig" )
.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}
.for doc in COPYING ChangeLog README TODO copyright
	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
.endfor
	@${MKDIR} ${DOCSDIR}/html
	@${INSTALL_DATA} ${WRKSRC}/docs/nanoblogger.html ${DOCSDIR}/html
.endif
	@${CAT} ${PKGMESSAGE}


Lines 1-3 Link Here

(-)www/nanoblogger/distinfo (-3 / +3 lines)
1	MD5 (nanoblogger-3.4.tar.gz) = 6162a3637ab22e98ac4267e0db687fe1	1	MD5 (nanoblogger-3.4.2.tar.gz) = 9de66534776d557c4611cabbdedcaaff
2	SHA256 (nanoblogger-3.4.tar.gz) = 29c42b3d5e356fb17ca08693279f16e966aeecf430d1a1cab8601c130b3a5a02	2	SHA256 (nanoblogger-3.4.2.tar.gz) = 8631802db56c3e2c01df94f60aa30e7b1500c1a76112741a740d9eaf3bd32044
3	SIZE (nanoblogger-3.4.tar.gz) = 95517	3	SIZE (nanoblogger-3.4.2.tar.gz) = 86877




--- ./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.2 Copyright 2010 n1xt3r (Kevin R. Wood) #
 ############################################################
@@ -11,11 +11,11 @@
 
 # -- hardcoded paths --
 # where to expect nanoblogger's base
-NB_BASE_DIR=`dirname $0`
+NB_BASE_DIR="%%DATADIR%%"
 # where to expect nanoblogger's documentation
-NB_DOC_DIR="$NB_BASE_DIR/docs"
+NB_DOC_DIR="%%DOCSDIR%%"

 # nanoblogger's language definitions directory.
 NB_LANG_DIR="${NB_BASE_DIR}/lang"
 # nanoblogger's module directory.
@@ -875,6 +875,9 @@
 			for weblog_dir in "$NB_BASE_DIR"/default/*; do
 				cp -R "$weblog_dir" "$BLOG_DIR"
 			done

Lines 1-5 Link Here

(-)www/nanoblogger/files/patch-nb.conf (-2 / +2 lines)
1	--- ./nb.conf.orig 2007-02-19 00:55:08.000000000 +0100	1	--- ./nb.conf.orig 2010-02-15 02:14:23.000000000 +0100
2	+++ ./nb.conf 2009-06-22 09:31:59.000000000 +0200	2	+++ ./nb.conf 2010-03-01 22:10:36.000000000 +0100
3	@@ -7,7 +7,7 @@	3	@@ -7,7 +7,7 @@
4	NB_LANG="en"	4	NB_LANG="en"
5		5




--- ./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




--- ./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"

Line 0 Link Here

(-)www/nanoblogger/files/patch-plugins__entry__format__markdown.sh (+11 lines)
	1	--- ./plugins/entry/format/markdown.sh.orig 2010-02-14 21:42:17.000000000 +0100
	2	+++ ./plugins/entry/format/markdown.sh 2010-03-01 22:10:36.000000000 +0100
	3	@@ -5,7 +5,7 @@
	4	: ${MARKDOWN_CMD:=markdown}
	5	: ${MARKDOWN_OPTS:= }
	6
	7	-nb_eval "$MARKDOWN_CMD" && MARKDOWN_INPATH=true
	8	+nb_eval "$MARKDOWN_CMD -v" && MARKDOWN_INPATH=true
	9
	10	if [ "$MARKDOWN_INPATH" = "true" ]; then
	11	# nb_msg "$plugins_entryfilteraction `basename $nb_plugin` ..."




--- ./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
 

Line 0 Link Here

(-)www/nanoblogger/files/patch-plugins__page__format__markdown.sh (+11 lines)
	1	--- ./plugins/page/format/markdown.sh.orig 2009-08-10 02:01:37.000000000 +0200
	2	+++ ./plugins/page/format/markdown.sh 2010-03-01 22:10:36.000000000 +0100
	3	@@ -5,7 +5,7 @@
	4	: ${MARKDOWN_CMD:=markdown}
	5	: ${MARKDOWN_OPTS:= }
	6
	7	-nb_eval "$MARKDOWN_CMD" && MARKDOWN_INPATH=true
	8	+nb_eval "$MARKDOWN_CMD -v" && MARKDOWN_INPATH=true
	9
	10	if [ "$MARKDOWN_INPATH" = "true" ]; then
	11	nb_msg "$plugins_entryfilteraction `basename $nb_plugin` ..."

Lines 4-9 Link Here

(-)www/nanoblogger/pkg-plist (-15 / +18 lines)
4	@exec if [ ! -f %D/etc/nb.conf ] ; then cp -p %D/%F %B/nb.conf; fi	4	@exec if [ ! -f %D/etc/nb.conf ] ; then cp -p %D/%F %B/nb.conf; fi
5	@exec mkdir -p %D/share/nanoblogger/default/cache	5	@exec mkdir -p %D/share/nanoblogger/default/cache
6	@exec mkdir -p %D/share/nanoblogger/default/plugins	6	@exec mkdir -p %D/share/nanoblogger/default/plugins
		7	@exec mkdir -p %D/share/nanoblogger/plugins/entry/mod
		8	@exec mkdir -p %D/share/nanoblogger/plugins/page/mod
7	%%DATADIR%%/default/articles/example.txt	9	%%DATADIR%%/default/articles/example.txt
8	%%DATADIR%%/default/blog.conf	10	%%DATADIR%%/default/blog.conf
9	%%DATADIR%%/default/data/cat_1.db	11	%%DATADIR%%/default/data/cat_1.db
Lines 13-18 Link Here
13	%%DATADIR%%/default/styles/nb_clean.css	15	%%DATADIR%%/default/styles/nb_clean.css
14	%%DATADIR%%/default/styles/nb_default.css	16	%%DATADIR%%/default/styles/nb_default.css
15	%%DATADIR%%/default/styles/print.css	17	%%DATADIR%%/default/styles/print.css
		18	%%DATADIR%%/default/templates/archive_index.htm
16	%%DATADIR%%/default/templates/category_archive.htm	19	%%DATADIR%%/default/templates/category_archive.htm
17	%%DATADIR%%/default/templates/category_entry.htm	20	%%DATADIR%%/default/templates/category_entry.htm
18	%%DATADIR%%/default/templates/day_archive.htm	21	%%DATADIR%%/default/templates/day_archive.htm
Lines 62-68 Link Here
62	%%DATADIR%%/plugins/atom.sh	65	%%DATADIR%%/plugins/atom.sh
63	%%DATADIR%%/plugins/calendar.sh	66	%%DATADIR%%/plugins/calendar.sh
64	%%DATADIR%%/plugins/entry/category_links.sh	67	%%DATADIR%%/plugins/entry/category_links.sh
65	%%DATADIR%%/plugins/entry/format/autobr.sh	68	%%DATADIR%%/plugins/entry/format/autotag-br.sh
66	%%DATADIR%%/plugins/entry/format/markdown.sh	69	%%DATADIR%%/plugins/entry/format/markdown.sh
67	%%DATADIR%%/plugins/entry/format/raw.sh	70	%%DATADIR%%/plugins/entry/format/raw.sh
68	%%DATADIR%%/plugins/makepage/tidy.sh	71	%%DATADIR%%/plugins/makepage/tidy.sh
Lines 90-119 Link Here
90	@dirrm %%DATADIR%%/default/cache	93	@dirrm %%DATADIR%%/default/cache
91	@dirrm %%DATADIR%%/default/data	94	@dirrm %%DATADIR%%/default/data
92	@dirrm %%DATADIR%%/default/images	95	@dirrm %%DATADIR%%/default/images
93	@dirrmtry %%DATADIR%%/default/plugins	96	@dirrm %%DATADIR%%/default/plugins
94	@dirrm %%DATADIR%%/default/styles	97	@dirrmtry %%DATADIR%%/default/styles
95	@dirrm %%DATADIR%%/default/templates	98	@dirrmtry %%DATADIR%%/default/templates
96	@dirrm %%DATADIR%%/default	99	@dirrmtry %%DATADIR%%/default
97	@dirrm %%DATADIR%%/lang/en	100	@dirrm %%DATADIR%%/lang/en
98	@dirrm %%DATADIR%%/lang	101	@dirrmtry %%DATADIR%%/lang
99	@dirrm %%DATADIR%%/lib	102	@dirrm %%DATADIR%%/lib
100	@dirrm %%DATADIR%%/moods/smilies	103	@dirrm %%DATADIR%%/moods/smilies
101	@dirrm %%DATADIR%%/moods	104	@dirrm %%DATADIR%%/moods
102	@dirrmtry %%DATADIR%%/plugins/archive/category	105	@dirrmtry %%DATADIR%%/plugins/archive/category
103	@dirrmtry %%DATADIR%%/plugins/archive/day	106	@dirrm %%DATADIR%%/plugins/archive/day
104	@dirrmtry %%DATADIR%%/plugins/archive/month	107	@dirrm %%DATADIR%%/plugins/archive/month
105	@dirrmtry %%DATADIR%%/plugins/archive/year	108	@dirrm %%DATADIR%%/plugins/archive/year
106	@dirrmtry %%DATADIR%%/plugins/archive	109	@dirrmtry %%DATADIR%%/plugins/archive
107	@dirrmtry %%DATADIR%%/plugins/entry/format	110	@dirrmtry %%DATADIR%%/plugins/entry/format
108	@dirrmtry %%DATADIR%%/plugins/entry/mod	111	@dirrm %%DATADIR%%/plugins/entry/mod
109	@dirrmtry %%DATADIR%%/plugins/entry	112	@dirrmtry %%DATADIR%%/plugins/entry
110	@dirrm %%DATADIR%%/plugins/makepage	113	@dirrm %%DATADIR%%/plugins/makepage
111	@dirrm %%DATADIR%%/plugins/page/format	114	@dirrmtry %%DATADIR%%/plugins/page/format
112	@dirrmtry %%DATADIR%%/plugins/page/mod	115	@dirrm %%DATADIR%%/plugins/page/mod
113	@dirrmtry %%DATADIR%%/plugins/page	116	@dirrmtry %%DATADIR%%/plugins/page
114	@dirrm %%DATADIR%%/plugins/post	117	@dirrm %%DATADIR%%/plugins/post
115	@dirrm %%DATADIR%%/plugins/shortcode	118	@dirrmtry %%DATADIR%%/plugins/shortcode
116	@dirrm %%DATADIR%%/plugins	119	@dirrmtry %%DATADIR%%/plugins
117	@dirrm %%DATADIR%%/	120	@dirrmtry %%DATADIR%%/
118	%%PORTDOCS%%@dirrm %%DOCSDIR%%/html	121	%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
119	%%PORTDOCS%%@dirrm %%DOCSDIR%%/	122	%%PORTDOCS%%@dirrm %%DOCSDIR%%/

Return to bug 144474

Lines 7-15 Link Here

(-)www/nanoblogger/Makefile (-11 / +11 lines)
7	#	7	#
8		8
9	PORTNAME= nanoblogger	9	PORTNAME= nanoblogger
10	PORTVERSION= 3.4	10	PORTVERSION= 3.4.2
11	CATEGORIES= www	11	CATEGORIES= www
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}	12	MASTER_SITES= http://nanoblogger.sourceforge.net/downloads/
13		13
14	MAINTAINER= tobias.rehbein@web.de	14	MAINTAINER= tobias.rehbein@web.de
15	COMMENT= Small weblog engine written in Bash for the command line	15	COMMENT= Small weblog engine written in Bash for the command line
Lines 27-53 Link Here
27	@${REINPLACE_CMD} -e "s,%%DOCSDIR%%,${DOCSDIR},g" ${WRKSRC}/nb	27	@${REINPLACE_CMD} -e "s,%%DOCSDIR%%,${DOCSDIR},g" ${WRKSRC}/nb
28		28
29	do-install:	29	do-install:
30	${INSTALL_SCRIPT} ${WRKSRC}/nb ${PREFIX}/bin	30	@${INSTALL_SCRIPT} ${WRKSRC}/nb ${PREFIX}/bin
31	${INSTALL_DATA} ${WRKSRC}/nb.conf ${PREFIX}/etc/nb.conf.sample	31	@${INSTALL_DATA} ${WRKSRC}/nb.conf ${PREFIX}/etc/nb.conf.sample
32	${MKDIR} ${DATADIR}	32	@${MKDIR} ${DATADIR}
33	.for data in default lang lib moods plugins	33	.for data in default lang lib moods plugins
34	${MKDIR} ${DATADIR}/${data} && \	34	@${MKDIR} ${DATADIR}/${data} && \
35	( cd ${WRKSRC}/${data} && \	35	( cd ${WRKSRC}/${data} && \
36	${COPYTREE_SHARE} \* ${DATADIR}/${data} "! -name *.orig" )	36	${COPYTREE_SHARE} \* ${DATADIR}/${data} "! -name *.orig" )
37	.endfor	37	.endfor
38	${CP} ${WRKSRC}/welcome-to-nb.txt ${DATADIR}	38	@${CP} ${WRKSRC}/welcome-to-nb.txt ${DATADIR}
39		39
40	post-install:	40	post-install:
41	@if [ ! -f ${PREFIX}/etc/nb.conf ]; then \	41	@if [ ! -f ${PREFIX}/etc/nb.conf ]; then \
42	${CP} -p ${PREFIX}/etc/nb.conf.sample ${PREFIX}/etc/nb.conf; \	42	${CP} -p ${PREFIX}/etc/nb.conf.sample ${PREFIX}/etc/nb.conf; \
43	fi	43	fi
44	.if !defined(NOPORTDOCS)	44	.if !defined(NOPORTDOCS)
45	${MKDIR} ${DOCSDIR}	45	@${MKDIR} ${DOCSDIR}
46	.for doc in COPYING ChangeLog README TODO copyright	46	.for doc in COPYING ChangeLog README TODO copyright
47	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}	47	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
48	.endfor	48	.endfor
49	${MKDIR} ${DOCSDIR}/html	49	@${MKDIR} ${DOCSDIR}/html
50	${INSTALL_DATA} ${WRKSRC}/docs/nanoblogger.html ${DOCSDIR}/html	50	@${INSTALL_DATA} ${WRKSRC}/docs/nanoblogger.html ${DOCSDIR}/html
51	.endif	51	.endif
52	@${CAT} ${PKGMESSAGE}	52	@${CAT} ${PKGMESSAGE}
53		53

Lines 1-17 Link Here

(-)www/nanoblogger/files/patch-nb (-6 / +6 lines)
1	--- ./nb.orig 2009-04-26 03:55:07.000000000 +0200	1	--- ./nb.orig 2010-02-15 22:01:53.000000000 +0100
2	+++ ./nb 2009-06-22 09:31:59.000000000 +0200	2	+++ ./nb 2010-03-01 22:12:55.000000000 +0100
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#! /bin/bash	4	-#! /bin/bash
5	+#! %%LOCALBASE%%/bin/bash	5	+#! %%LOCALBASE%%/bin/bash
6	############################################################	6	############################################################
7	# NanoBlogger 3.4 Copyright 2009 n1xt3r (Kevin R. Wood) #	7	# NanoBlogger 3.4.2 Copyright 2010 n1xt3r (Kevin R. Wood) #
8	############################################################	8	############################################################
9	@@ -9,11 +9,11 @@	9	@@ -11,11 +11,11 @@
10		10
11	# -- hardcoded paths --	11	# -- hardcoded paths --
12	# where to expect nanoblogger's base	12	# where to expect nanoblogger's base
13	-NB_BASE_DIR=`dirname $0`	13	-NB_BASE_DIR=`dirname $0`
14	+NB_BASE_DIR=%%DATADIR%%	14	+NB_BASE_DIR="%%DATADIR%%"
15	# where to expect nanoblogger's documentation	15	# where to expect nanoblogger's documentation
16	-NB_DOC_DIR="$NB_BASE_DIR/docs"	16	-NB_DOC_DIR="$NB_BASE_DIR/docs"
17	+NB_DOC_DIR="%%DOCSDIR%%"	17	+NB_DOC_DIR="%%DOCSDIR%%"
Lines 21-27 Link Here
21	# nanoblogger's language definitions directory.	21	# nanoblogger's language definitions directory.
22	NB_LANG_DIR="${NB_BASE_DIR}/lang"	22	NB_LANG_DIR="${NB_BASE_DIR}/lang"
23	# nanoblogger's module directory.	23	# nanoblogger's module directory.
24	@@ -863,6 +863,9 @@	24	@@ -875,6 +875,9 @@
25	for weblog_dir in "$NB_BASE_DIR"/default/*; do	25	for weblog_dir in "$NB_BASE_DIR"/default/*; do
26	cp -R "$weblog_dir" "$BLOG_DIR"	26	cp -R "$weblog_dir" "$BLOG_DIR"
27	done	27	done

Lines 1-20 Link Here

(-)www/nanoblogger/files/patch-plugins__archive__master_index.sh (-20 lines)
1	--- ./plugins/archive/master_index.sh.orig 2008-05-27 06:37:33.000000000 +0200
2	+++ ./plugins/archive/master_index.sh 2009-06-22 09:31:59.000000000 +0200
3	@@ -65,7 +65,7 @@
4	cat_total=${#db_categories[*]}
5	if [ "$cat_total" -gt 0 ]; then
6	# make NB_CategoryLinks placeholder
7	- NB_BrowseCategoryLinks=$(
8	+ NB_BrowseCategoryLinks=`
9	cat <<-EOF
10	<a id="category"></a>
11	<strong>$template_browsecat</strong>
12	@@ -73,7 +73,7 @@
13	$NB_ArchiveCategoryLinks
14	</div>
15	<br />
16	- EOF)
17	+ EOF`
18	fi
19
20	# make NB_ArchiveLinks placeholder

Lines 1-35 Link Here

(-)www/nanoblogger/files/patch-plugins__archive__year__year_archive.sh (-35 lines)
1	--- ./plugins/archive/year/year_archive.sh.orig 2008-07-15 20:11:53.000000000 +0200
2	+++ ./plugins/archive/year/year_archive.sh 2009-06-22 09:33:11.000000000 +0200
3	@@ -50,7 +50,7 @@
4	set_baseurl "../../"
5
6	ARCHENTRY_LIST=${DB_RESULTS[*]}
7	- NB_ArchiveEntryLinks=$(
8	+ NB_ArchiveEntryLinks=`
9	for entry in ${ARCHENTRY_LIST[*]}; do
10	NB_EntryID=$x_id${entrylink_var//[\/]/-}
11	set_entrylink "$entry"
12	@@ -66,12 +66,12 @@
13	# Command to help filter order of categories
14	: ${CATLINKS_FILTERCMD:=sort}
15	>"$SCRATCH_FILE".cat_links
16	- entry_wcatids=`grep "$entry" "$NB_DATA_DIR/master.$NB_DBTYPE"`
17	+ entry_wcatids=$(grep "$entry" "$NB_DATA_DIR/master.$NB_DBTYPE")
18	entry_catids=${entry_wcatids##*\>}
19	[ "$entry_wcatids" = "$entry_catids" ] &&
20	entry_catids=
21	for entry_catnum in ${entry_catids//\,/ }; do
22	- cat_title=`nb_print "$NB_DATA_DIR"/cat_"$entry_catnum.$NB_DBTYPE" 1`
23	+ cat_title=$(nb_print "$NB_DATA_DIR"/cat_"$entry_catnum.$NB_DBTYPE" 1)
24	set_catlink cat_"$entry_catnum.$NB_DBTYPE"
25	cat_index="$category_link"
26	# following must fit on single line
27	@@ -92,7 +92,7 @@
28	- <a href="${ARCHIVES_PATH}$NB_EntryPermalink">$NB_ArchiveEntryTitle</a>
29	$([ ! -z "$NB_EntryCategories" ] && echo "- $NB_EntryCategories")<br />
30	EOF
31	- done; month=)
32	+ done; month=`
33
34	# create links for monthly archives
35	[ -z "$CAL_CMD" ] && CAL_CMD="cal"

Lines 1-52 Link Here

(-)www/nanoblogger/files/patch-plugins__page__feed_links.sh (-52 lines)
1	--- ./plugins/page/feed_links.sh.orig 2007-02-05 00:12:00.000000000 +0100
2	+++ ./plugins/page/feed_links.sh 2009-06-22 09:31:59.000000000 +0200
3	@@ -16,14 +16,14 @@
4	NB_AtomLink="${BASE_URL}atom.$NB_SYND_FILETYPE"
5	NB_AtomTitle="Atom $NB_AtomVer"
6	fi
7	- NB_AtomAltLink=$(
8	+ NB_AtomAltLink=`
9	cat <<-EOF
10	<link rel="alternate" type="application/atom+xml"
11	title="$NB_AtomTitle"
12	href="$NB_AtomLink"
13	/>
14	EOF
15	- )
16	+ `
17	fi
18
19	# RSS 2.0
20	@@ -36,14 +36,14 @@
21	NB_RSS2Link="${BASE_URL}rss.$NB_SYND_FILETYPE"
22	NB_RSS2Title="RSS $NB_RSS2Ver"
23	fi
24	- NB_RSS2AltLink=$(
25	+ NB_RSS2AltLink=`
26	cat <<-EOF
27	<link rel="alternate" type="application/rss+xml"
28	title="$NB_RSS2Title"
29	href="$NB_RSS2Link"
30	/>
31	EOF
32	- )
33	+ `
34	fi
35
36	# RSS 1.0
37	@@ -56,13 +56,13 @@
38	NB_RSSLink="${BASE_URL}index.$NB_SYND_FILETYPE"
39	NB_RSSTitle="RSS $NB_RSSVer"
40	fi
41	- NB_RSSAltLink=$(
42	+ NB_RSSAltLink=`
43	cat <<-EOF
44	<link rel="alternate" type="application/rss+xml"
45	title="$NB_RSSTitle"
46	href="$NB_RSSLink"
47	/>
48	EOF
49	- )
50	+ `
51	fi
52