From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 5 20:40:18 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A01D616A41C for ; Tue, 5 Jul 2005 20:40:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C0D443D53 for ; Tue, 5 Jul 2005 20:40:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j65KeIJH022045 for ; Tue, 5 Jul 2005 20:40:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j65KeIZM022044; Tue, 5 Jul 2005 20:40:18 GMT (envelope-from gnats) Resent-Date: Tue, 5 Jul 2005 20:40:18 GMT Resent-Message-Id: <200507052040.j65KeIZM022044@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Julien Gabel Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9645D16A41C for ; Tue, 5 Jul 2005 20:39:45 +0000 (GMT) (envelope-from jgabel@thilelli.net) Received: from smtp.thilelli.net (smtp.thilelli.net [213.41.129.161]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE3C543D49 for ; Tue, 5 Jul 2005 20:39:44 +0000 (GMT) (envelope-from jgabel@thilelli.net) Received: from localhost (localhost [127.0.0.1]) by bento.thilelli.net (Postfix) with ESMTP id 8D96573066 for ; Tue, 5 Jul 2005 22:39:42 +0200 (CEST) Received: from bento.thilelli.net ([127.0.0.1]) by localhost (bento.thilelli.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 65893-04-2 for ; Tue, 5 Jul 2005 22:39:37 +0200 (CEST) Received: by bento.thilelli.net (Postfix, from userid 1001) id 964A173062; Tue, 5 Jul 2005 22:39:37 +0200 (CEST) Message-Id: <20050705203937.964A173062@bento.thilelli.net> Date: Tue, 5 Jul 2005 22:39:37 +0200 (CEST) From: Julien Gabel To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/83033: [PATCH] Update of the www/nanoblogger port. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Julien Gabel List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2005 20:40:18 -0000 >Number: 83033 >Category: ports >Synopsis: [PATCH] Update of the www/nanoblogger port. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jul 05 20:40:17 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Julien Gabel >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD bento.thilelli.net 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun Jul 3 19:27:16 CEST 2005 root@bento.thilelli.net:/usr/obj/usr/src/sys/BENTO i386 >Description: Update of the www/nanoblogger port to last release at this date. >How-To-Repeat: Apply the provided patch. >Fix: # cat /tmp/nannoblogger.patch diff -ruN www/nanoblogger.old/Makefile www/nanoblogger/Makefile --- www/nanoblogger.old/Makefile Mon Dec 27 04:39:14 2004 +++ www/nanoblogger/Makefile Tue Jul 5 19:34:04 2005 @@ -7,7 +7,7 @@ # PORTNAME= nanoblogger -PORTVERSION= 3.1 +PORTVERSION= 3.2.3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Small weblog engine for the UNIX command line -RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_REINPLACE= yes NO_BUILD= yes @@ -27,7 +27,7 @@ .endif post-patch: - @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/nb + @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/nb do-install: ${INSTALL_SCRIPT} ${WRKSRC}/nb ${PREFIX}/bin diff -ruN www/nanoblogger.old/distinfo www/nanoblogger/distinfo --- www/nanoblogger.old/distinfo Mon Dec 27 04:39:14 2004 +++ www/nanoblogger/distinfo Tue Jul 5 19:45:10 2005 @@ -1,2 +1,2 @@ -MD5 (nanoblogger-3.1.tar.gz) = 7b8eba52ded4849953c88f1747b97f9d -SIZE (nanoblogger-3.1.tar.gz) = 51293 +MD5 (nanoblogger-3.2.3.tar.gz) = bd9f5f9d48b9b666f7bd03c76d90a724 +SIZE (nanoblogger-3.2.3.tar.gz) = 54672 diff -ruN www/nanoblogger.old/files/patch-nb www/nanoblogger/files/patch-nb --- www/nanoblogger.old/files/patch-nb Fri Nov 12 16:30:57 2004 +++ www/nanoblogger/files/patch-nb Tue Jul 5 19:34:04 2005 @@ -1,26 +1,35 @@ ---- nb.orig Fri Nov 12 23:28:37 2004 -+++ nb Fri Nov 12 23:29:46 2004 +--- nb.orig Tue Jul 5 10:49:45 2005 ++++ nb Tue Jul 5 10:51:56 2005 @@ -1,4 +1,4 @@ -#! /bin/bash -+#! /usr/bin/env bash ++#!/usr/bin/env bash ############################################################ - # NanoBlogger 3.0 Copyright 2004 n1xt3r (Kevin R. Wood) # + # NanoBlogger 3.2.3 Copyright 2005 n1xt3r (Kevin R. Wood) # ############################################################ -@@ -10,7 +10,7 @@ - VERSION="3.0" +@@ -7,7 +7,7 @@ + VERSION="3.2.3" - # nanoblogger's install directory. --BASE_DIR=`dirname $0` -+BASE_DIR='%%PREFIX%%/share/nanoblogger' + # nanoblogger's base install directory. +-NB_BASE_DIR=`dirname $0` ++NB_BASE_DIR="%%PREFIX%%/share/nanoblogger" # create a semi ISO 8601 formatted timestamp for archives # used explicitly, please don't edit unless you know what you're doing. -@@ -985,7 +985,7 @@ - [ $# -gt 1 ] && argument=$2 - bad_argument=$1 - # always load global configs -- . "$BASE_DIR"/nb.conf -+ . %%PREFIX%%/etc/nb.conf - # check for user's .nb.conf in their home directory - [ -f "$HOME/.nb.conf" ] && . "$HOME/.nb.conf" - case "$1" in +@@ -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 www/nanoblogger.old/pkg-descr www/nanoblogger/pkg-descr --- www/nanoblogger.old/pkg-descr Thu Jul 15 10:20:04 2004 +++ www/nanoblogger/pkg-descr Tue Jul 5 19:34:04 2005 @@ -4,21 +4,26 @@ 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 - * category support - * permalinks - * RSS syndication (comes with RSS 1.0 (RDF) format) - * a fully functional web site, using templates and stylesheets for easy - customization (you're looking at it!) + * 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, etc. + * plugins for calendar, recent entries, weblog status, fortunes, etc. * auto-formatting, e.g. line breaks translate to HTML - * parts for extensibility (e.g. news.htm, 2003-06.htm) - * per-weblog configuration via a seperate config file (blog.conf) - * no dependency on any javascript, server-side scripting, or server-side - includes - * no need for MySQL or any other special database (uses flat-file) - * some small effort at shell portability + * support for relative and absolute links + * extensibility through reusability + * global configuration to set defaults (nb.conf) + * per-weblog configuration to override global defaults (blog.conf) + * intelligent build system, only rebuilds relative parts for a modified entry + * simple cache system, for faster content generation + * auto-detection of weblog from current directory + * no dependency on any java-script, server-side scripting, or server-side includes + * no dependency on any special database (uses flat-file) + * multi-platform portability (or at least wherever there's bash and the required commands) -WWW: http://home.columbus.rr.com/n1xt3r/nanoblogger/ +WWW: http://nanoblogger.sourceforge.net/ # cd /usr/ports # patch < /tmp/nannoblogger.patch >Release-Note: >Audit-Trail: >Unformatted: