From owner-freebsd-ports-bugs Sun Jan 19 14:40:21 2003 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 90C0637B405 for ; Sun, 19 Jan 2003 14:40:08 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99BD043F5F for ; Sun, 19 Jan 2003 14:40:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h0JMe2NS078027 for ; Sun, 19 Jan 2003 14:40:02 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h0JMe25i078026; Sun, 19 Jan 2003 14:40:02 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6790037B401 for ; Sun, 19 Jan 2003 14:38:48 -0800 (PST) Received: from postfix4-2.free.fr (postfix4-2.free.fr [213.228.0.176]) by mx1.FreeBSD.org (Postfix) with ESMTP id 288A543ED8 for ; Sun, 19 Jan 2003 14:38:47 -0800 (PST) (envelope-from thierry@pompo.net) Received: from graf.pompo.net (lyon-2-a7-62-147-108-4.dial.proxad.net [62.147.108.4]) by postfix4-2.free.fr (Postfix) with ESMTP id E52B5C08C for ; Sun, 19 Jan 2003 23:38:38 +0100 (CET) Received: by graf.pompo.net (Postfix, from userid 1001) id 1A259752C; Sun, 19 Jan 2003 23:36:41 +0100 (CET) Message-Id: <20030119223641.1A259752C@graf.pompo.net> Date: Sun, 19 Jan 2003 23:36:41 +0100 (CET) From: Thierry Thomas Reply-To: Thierry Thomas To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/47230: deskutils/mnemo: upgrading Mnemo to 1.1. Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 47230 >Category: ports >Synopsis: deskutils/mnemo: upgrading Mnemo to 1.1. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jan 19 14:40:02 PST 2003 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.7-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Sun Dec 29 12:46:07 CET 2002 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386 >Description: New in this release: - The ability to sort notes into categories - Printing support - New Danish, Lithuanian, Bulgarian, Norwegian, Slovak and Greek translations The full list of changes can be viewed here: . New in this port: - replace perl by reinplace_cmd - back-up the config files for reinstall. >How-To-Repeat: N/A. >Fix: Please apply the following patch: (one new file: pkg-deinstall) diff -urN deskutils/mnemo.orig/Makefile deskutils/mnemo/Makefile --- deskutils/mnemo.orig/Makefile Sat Jan 18 06:34:21 2003 +++ deskutils/mnemo/Makefile Sun Jan 19 10:17:08 2003 @@ -6,23 +6,29 @@ # PORTNAME= mnemo -PORTVERSION= 1.0 +PORTVERSION= 1.1 CATEGORIES= deskutils www -MASTER_SITES= ftp://ftp.horde.org/pub/mnemo/tarballs/%SUBDIR%/ -MASTER_SITE_SUBDIR= . old +MASTER_SITES= ftp://ftp.horde.org/pub/mnemo/ \ + ftp://ftp.au.horde.org/pub/horde/mnemo/ \ + ftp://ftp.es.horde.org/pub/mnemo/ \ + ftp://ftp.it.horde.org/pub/mirror/horde.org/mnemo/ \ + ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/mnemo/ \ + ftp://ftp.pt.horde.org/pub/horde-ftp/mnemo/ MAINTAINER= thierry@pompo.net RUN_DEPENDS= ${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_BUILD= yes +USE_REINPLACE= yes + +REINPLACE_ARGS= -i.beforeMnemo + PLIST_SUB= HORDEDIR=${LHORDEDIR} MNEMODIR=${LMNEMODIR} -USE_PERL5= yes DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL -CONFFILE= conf.php html.php menu.php prefs.php -SUB_DIRS= config graphics lib locale po scripts templates +CONFFILE= conf.php menu.php prefs.php +SUB_DIRS= config graphics lib locale po scripts templates util LHORDEDIR?= www/horde LMNEMODIR?= ${LHORDEDIR}/mnemo @@ -47,11 +53,12 @@ @${CHOWN} -R www:www ${MNEMODIR} @${CHMOD} -R o-rwx ${CONFDIR} @${CP} -p ${FILESDIR}/httpd.conf.mnemo ${HORDE_INC} - @${PERL} -pi -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g" \ + @${REINPLACE_CMD} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g" \ ${HORDE_INC}/httpd.conf.mnemo + @${RM} ${HORDE_INC}/httpd.conf.mnemo.beforeMnemo @${CP} -p ${HORDEDIR}/config/registry.php \ ${HORDEDIR}/config/registry.php.beforeMnemo - @${PERL} -pi -e "s://UNCOMMENTWHENINSTMNEMO::" ${HORDEDIR}/config/registry.php + @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTMNEMO::" ${HORDEDIR}/config/registry.php @${CP} -p ${HORDEDIR}/config/registry.php \ ${HORDEDIR}/config/registry.php.afterMnemo .if !defined(NOPORTDOCS) diff -urN deskutils/mnemo.orig/distinfo deskutils/mnemo/distinfo --- deskutils/mnemo.orig/distinfo Sat Jan 18 06:34:21 2003 +++ deskutils/mnemo/distinfo Sat Jan 18 23:07:12 2003 @@ -1 +1 @@ -MD5 (mnemo-1.0.tar.gz) = 4fb4be095eea041fa7503b14dd03e435 +MD5 (mnemo-1.1.tar.gz) = d442371b0fda93406bcf0ddbe912b137 diff -urN deskutils/mnemo.orig/pkg-deinstall deskutils/mnemo/pkg-deinstall --- deskutils/mnemo.orig/pkg-deinstall Thu Jan 1 01:00:00 1970 +++ deskutils/mnemo/pkg-deinstall Mon Dec 30 21:59:53 2002 @@ -0,0 +1,27 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# Backup Mnemo config files, if needed. + +if [ x$2 != xDEINSTALL ]; then + exit +fi + +if [ -z "${PACKAGE_BUILDING}" ]; then + for cf in `ls ${PKG_PREFIX}/www/horde/mnemo/config/*php`; do + diff -bBqw $cf $cf.dist >/dev/null 2>&1 + case $? in + 0) # original config file, will be deleted by pkg-plist + ;; + 1) # config file has been updated, must be backuped + cp -p $cf $cf.previous + echo "===> Backing-up..." + echo "---> $cf has been saved ***" + echo "---> as $cf.previous ***" + ;; + *) # not found? + ;; + esac + done +fi diff -urN deskutils/mnemo.orig/pkg-plist deskutils/mnemo/pkg-plist --- deskutils/mnemo.orig/pkg-plist Sat Jan 18 06:34:21 2003 +++ deskutils/mnemo/pkg-plist Sat Jan 18 23:44:07 2003 @@ -6,17 +6,18 @@ %%MNEMODIR%%/config/conf.php %%MNEMODIR%%/config/conf.php.dist %%MNEMODIR%%/config/conf.php.dist.orig -%%MNEMODIR%%/config/html.php -%%MNEMODIR%%/config/html.php.dist %%MNEMODIR%%/config/menu.php %%MNEMODIR%%/config/menu.php.dist %%MNEMODIR%%/config/prefs.php %%MNEMODIR%%/config/prefs.php.dist %%MNEMODIR%%/graphics/add.gif %%MNEMODIR%%/graphics/checkbox.gif +%%MNEMODIR%%/graphics/colorpicker.gif +%%MNEMODIR%%/graphics/colorpicker.png %%MNEMODIR%%/graphics/down.gif %%MNEMODIR%%/graphics/list.gif %%MNEMODIR%%/graphics/mnemo.gif +%%MNEMODIR%%/graphics/print.gif %%MNEMODIR%%/graphics/refresh.gif %%MNEMODIR%%/graphics/search.gif %%MNEMODIR%%/graphics/up.gif @@ -29,18 +30,27 @@ %%MNEMODIR%%/lib/constants.php %%MNEMODIR%%/lib/version.php %%MNEMODIR%%/list.php +%%MNEMODIR%%/locale/bg_BG/LC_MESSAGES/mnemo.mo %%MNEMODIR%%/locale/cs_CZ/LC_MESSAGES/mnemo.mo +%%MNEMODIR%%/locale/da_DK/help.xml +%%MNEMODIR%%/locale/da_DK/LC_MESSAGES/mnemo.mo +%%MNEMODIR%%/locale/de_DE/help.xml %%MNEMODIR%%/locale/de_DE/LC_MESSAGES/mnemo.mo +%%MNEMODIR%%/locale/el_GR/LC_MESSAGES/mnemo.mo %%MNEMODIR%%/locale/en_US/help.xml %%MNEMODIR%%/locale/es_ES/LC_MESSAGES/mnemo.mo %%MNEMODIR%%/locale/fi_FI/LC_MESSAGES/mnemo.mo %%MNEMODIR%%/locale/fi_FI/help.xml %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES/mnemo.mo %%MNEMODIR%%/locale/hu_HU/LC_MESSAGES/mnemo.mo +%%MNEMODIR%%/locale/lt_LT/LC_MESSAGES/mnemo.mo +%%MNEMODIR%%/locale/nb_NO/LC_MESSAGES/mnemo.mo %%MNEMODIR%%/locale/nl_NL/LC_MESSAGES/mnemo.mo %%MNEMODIR%%/locale/nn_NO/LC_MESSAGES/mnemo.mo %%MNEMODIR%%/locale/pt_BR/LC_MESSAGES/mnemo.mo %%MNEMODIR%%/locale/pt_PT/LC_MESSAGES/mnemo.mo +%%MNEMODIR%%/locale/sk_SK/LC_MESSAGES/mnemo.mo +%%MNEMODIR%%/locale/sk_SK/help.xml %%MNEMODIR%%/locale/sv_SE/LC_MESSAGES/mnemo.mo %%MNEMODIR%%/locale/zh_CN/LC_MESSAGES/mnemo.mo %%MNEMODIR%%/locale/zh_TW/LC_MESSAGES/mnemo.mo @@ -48,22 +58,29 @@ %%MNEMODIR%%/menu.php %%MNEMODIR%%/po/Makefile %%MNEMODIR%%/po/README +%%MNEMODIR%%/po/bg_BG.po %%MNEMODIR%%/po/cs_CZ.po +%%MNEMODIR%%/po/da_DK.po %%MNEMODIR%%/po/de_DE.po +%%MNEMODIR%%/po/el_GR.po %%MNEMODIR%%/po/es_ES.po +%%MNEMODIR%%/po/extract.pl %%MNEMODIR%%/po/fi_FI.po %%MNEMODIR%%/po/fr_FR.po %%MNEMODIR%%/po/hu_HU.po +%%MNEMODIR%%/po/lt_LT.po +%%MNEMODIR%%/po/mnemo.pot +%%MNEMODIR%%/po/nb_NO.po %%MNEMODIR%%/po/nl_NL.po %%MNEMODIR%%/po/nn_NO.po %%MNEMODIR%%/po/pt_BR.po %%MNEMODIR%%/po/pt_PT.po +%%MNEMODIR%%/po/shtool +%%MNEMODIR%%/po/sk_SK.po %%MNEMODIR%%/po/sv_SE.po +%%MNEMODIR%%/po/xgettext.sh %%MNEMODIR%%/po/zh_CN.po %%MNEMODIR%%/po/zh_TW.po -%%MNEMODIR%%/po/extract.pl -%%MNEMODIR%%/po/shtool -%%MNEMODIR%%/po/xgettext.sh %%MNEMODIR%%/prefs.php %%MNEMODIR%%/scripts/drivers/mnemo_memos.sql %%MNEMODIR%%/search.php @@ -71,6 +88,8 @@ %%MNEMODIR%%/templates/common-header.inc %%MNEMODIR%%/templates/index/css.inc %%MNEMODIR%%/templates/index/notconfigured.inc +%%MNEMODIR%%/templates/javascript/open_print_win.js +%%MNEMODIR%%/templates/javascript/print.js %%MNEMODIR%%/templates/list/actions.inc %%MNEMODIR%%/templates/list/empty.inc %%MNEMODIR%%/templates/list/footer.inc @@ -83,6 +102,7 @@ %%MNEMODIR%%/templates/memo/end.inc %%MNEMODIR%%/templates/memo/memo.inc %%MNEMODIR%%/templates/menu/menu.inc +%%MNEMODIR%%/templates/prefs/category_management.inc %%MNEMODIR%%/templates/search/begin.inc %%MNEMODIR%%/templates/search/end.inc %%MNEMODIR%%/templates/search/search.inc @@ -90,24 +110,35 @@ %%MNEMODIR%%/templates/view/headers.inc %%MNEMODIR%%/templates/view/navbar.inc %%MNEMODIR%%/templates/view/no-memo.inc +%%MNEMODIR%%/util/colorpicker.php %%MNEMODIR%%/view.php @dirrm %%MNEMODIR%%/config @dirrm %%MNEMODIR%%/graphics @dirrm %%MNEMODIR%%/lib/Driver @dirrm %%MNEMODIR%%/lib +@dirrm %%MNEMODIR%%/locale/bg_BG/LC_MESSAGES +@dirrm %%MNEMODIR%%/locale/bg_BG @dirrm %%MNEMODIR%%/locale/cs_CZ/LC_MESSAGES @dirrm %%MNEMODIR%%/locale/cs_CZ +@dirrm %%MNEMODIR%%/locale/da_DK/LC_MESSAGES +@dirrm %%MNEMODIR%%/locale/da_DK @dirrm %%MNEMODIR%%/locale/de_DE/LC_MESSAGES @dirrm %%MNEMODIR%%/locale/de_DE @dirrm %%MNEMODIR%%/locale/en_US +@dirrm %%MNEMODIR%%/locale/el_GR/LC_MESSAGES +@dirrm %%MNEMODIR%%/locale/el_GR @dirrm %%MNEMODIR%%/locale/es_ES/LC_MESSAGES @dirrm %%MNEMODIR%%/locale/es_ES @dirrm %%MNEMODIR%%/locale/fi_FI/LC_MESSAGES @dirrm %%MNEMODIR%%/locale/fi_FI @dirrm %%MNEMODIR%%/locale/fr_FR/LC_MESSAGES @dirrm %%MNEMODIR%%/locale/fr_FR +@dirrm %%MNEMODIR%%/locale/lt_LT/LC_MESSAGES +@dirrm %%MNEMODIR%%/locale/lt_LT @dirrm %%MNEMODIR%%/locale/hu_HU/LC_MESSAGES @dirrm %%MNEMODIR%%/locale/hu_HU +@dirrm %%MNEMODIR%%/locale/nb_NO/LC_MESSAGES +@dirrm %%MNEMODIR%%/locale/nb_NO @dirrm %%MNEMODIR%%/locale/nl_NL/LC_MESSAGES @dirrm %%MNEMODIR%%/locale/nl_NL @dirrm %%MNEMODIR%%/locale/nn_NO/LC_MESSAGES @@ -116,6 +147,8 @@ @dirrm %%MNEMODIR%%/locale/pt_BR @dirrm %%MNEMODIR%%/locale/pt_PT/LC_MESSAGES @dirrm %%MNEMODIR%%/locale/pt_PT +@dirrm %%MNEMODIR%%/locale/sk_SK/LC_MESSAGES +@dirrm %%MNEMODIR%%/locale/sk_SK @dirrm %%MNEMODIR%%/locale/sv_SE/LC_MESSAGES @dirrm %%MNEMODIR%%/locale/sv_SE @dirrm %%MNEMODIR%%/locale/zh_CN/LC_MESSAGES @@ -127,12 +160,15 @@ @dirrm %%MNEMODIR%%/scripts/drivers @dirrm %%MNEMODIR%%/scripts @dirrm %%MNEMODIR%%/templates/index +@dirrm %%MNEMODIR%%/templates/javascript @dirrm %%MNEMODIR%%/templates/list @dirrm %%MNEMODIR%%/templates/memo @dirrm %%MNEMODIR%%/templates/menu +@dirrm %%MNEMODIR%%/templates/prefs @dirrm %%MNEMODIR%%/templates/search @dirrm %%MNEMODIR%%/templates/view @dirrm %%MNEMODIR%%/templates +@dirrm %%MNEMODIR%%/util @dirrm %%MNEMODIR%% etc/horde/httpd.conf.mnemo %%PORTDOCS%%@dirrm share/doc/mnemo >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message