pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/namazu2 Update namazu2 package to 2.0.14 fixi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/dec7f8d66a9e
branches: trunk
changeset: 485534:dec7f8d66a9e
user: taca <taca%pkgsrc.org@localhost>
date: Wed Dec 15 13:09:58 2004 +0000
description:
Update namazu2 package to 2.0.14 fixing XSS security problem.
* pkgsrc changes:
- simplify Makefile's structure.
- utilize bsd.pkg.install.mk's framework.
* chages:
2004-12-15 Tadamasa Teranishi <yw3t-trns at asahi-net.or.jp>
* Namazu: Version 2.0.14 released.
2004-12-13 Tadamasa Teranishi <yw3t-trns at asahi-net.or.jp>
* doc/{ja, en}/tutorial.html: update.
* NEWS: updated.
2004-12-08 Tadamasa Teranishi <yw3t-trns at asahi-net.or.jp>
* src/form.c: Correction for JVN#904429FE.
* configure.in (Module): AC_INIT(namazu, 2.0.14)
* src/form.c: Fix bug.
* man/{mknmz, namazu}.1: update man.
diffstat:
textproc/namazu2/DEINSTALL | 18 ---------
textproc/namazu2/INSTALL | 58 ------------------------------
textproc/namazu2/MESSAGE | 44 +++++++++++++++++++++++
textproc/namazu2/Makefile | 74 +++++++++++++++++---------------------
textproc/namazu2/PLIST | 13 ++----
textproc/namazu2/distinfo | 18 ++++++--
textproc/namazu2/patches/patch-aa | 21 -----------
textproc/namazu2/patches/patch-ab | 48 +++++++++++--------------
textproc/namazu2/patches/patch-ac | 12 ++++++
textproc/namazu2/patches/patch-ad | 13 ++++++
textproc/namazu2/patches/patch-ae | 14 +++++++
textproc/namazu2/patches/patch-af | 13 ++++++
textproc/namazu2/patches/patch-ag | 32 ++++++++++++++++
textproc/namazu2/patches/patch-ah | 24 ++++++++++++
textproc/namazu2/patches/patch-ai | 13 ++++++
textproc/namazu2/patches/patch-aj | 13 ++++++
textproc/namazu2/patches/patch-ak | 15 +++++++
17 files changed, 265 insertions(+), 178 deletions(-)
diffs (truncated from 572 to 300 lines):
diff -r a0d83f1d9562 -r dec7f8d66a9e textproc/namazu2/DEINSTALL
--- a/textproc/namazu2/DEINSTALL Wed Dec 15 12:18:43 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
-#
-
-case "$2" in
- DEINSTALL) cat <<EOF
-
-=============================================================
-Note that namazu configuration (@CONFDIR@/*), index
-files (@DATADIR@/*) are not removed in the
-de-installation process. You should remove those by hand,
-if you no longer need them.
-=============================================================
-
-EOF
- ;;
-esac
diff -r a0d83f1d9562 -r dec7f8d66a9e textproc/namazu2/INSTALL
--- a/textproc/namazu2/INSTALL Wed Dec 15 12:18:43 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.4 2004/05/06 13:40:21 taca Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-POST-INSTALL)
- cat <<EOF
-
-=============================================================
-1. If you customize namazu configuration, copy
- @EXAMPLEDIR@/share/namazu/namazurc.default and
- @EXAMPLEDIR@/mknmzrc.default to @CONFDIR@,
- and edit them.
-
-2. Since index file format is differnet from namazu 1.X, you need to
- rebuild index files if you upgrade from namazu 1.X.
-
-3. In order to processing Japanese, you need to set "LC_ALL", "LANG"
- or "LC_CTYPE" environment to "ja". Or use --indexing-lang option
- of mknmz.
-
-4. In order to display Japanese message, you need to set "LANGUAGE",
- "LC_ALL", "LC_MESSAGES" or "LANG" environment to "ja".
-
-5. Because of lack of locale support, you need to set "PERL_BADLANG"
- for perl to stop the warning.
-
-6. Special notes for perl 5.8.1 users: Please set environment
- PERL_HASH_SEED as 0.
-
-7. If you want to make index of bellow file type, please install
- appropriate package.
-
- Adobe PDF xpdf
- Adobe PostScript ghostscript
- JustSystem Ichitaro DocCat
- Microsoft Excel xlHtml or DocCat
- Microsoft PowerPoint xlHtml or DocCat
- Microsoft Word wv or DocCat
- Redhat RPM rpm
- TeX source detex
- TeX dvi dvi2tty
-
- For handling non-English language, you might need lv and/or nkf
- package, too.
-
- DocCat is a commercial product from Dehenken Limited.
- See http://www.dehenken.co.jp/products/doccat/doccat.html in detail.
-
-=============================================================
-
-EOF
- ;;
-esac
-exit 0
diff -r a0d83f1d9562 -r dec7f8d66a9e textproc/namazu2/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/namazu2/MESSAGE Wed Dec 15 13:09:58 2004 +0000
@@ -0,0 +1,44 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/12/15 13:09:58 taca Exp $
+
+Here is general notes for namazu2 package by pkgsrc.
+
+1. If you customize namazu configuration, please edit "mknmzrc" file
+ in ${PKG_SYSCONFDIR} directory.
+
+2. if you upgrade from namazu 1.X, you need to rebuild index files
+ since index file format was changed from namazu prior to 2.0.
+
+3. In order to processing Japanese, you need to set "LC_ALL", "LANG"
+ or "LC_CTYPE" environment to "ja". Or use --indexing-lang option
+ of mknmz.
+
+4. In order to display Japanese message, you need to set "LANGUAGE",
+ "LC_ALL", "LC_MESSAGES" or "LANG" environment to "ja".
+
+5. If perl display locale related warnings, you need to set
+ "PERL_BADLANG" environment.
+
+6. Special notes for perl 5.8.1 users: Please set environment
+ PERL_HASH_SEED as 0.
+
+7. If you want to make index of bellow file type, please install
+ appropriate package.
+
+ Adobe PDF xpdf
+ Adobe PostScript ghostscript
+ JustSystem Ichitaro DocCat
+ Microsoft Excel xlHtml or DocCat
+ Microsoft PowerPoint xlHtml or DocCat
+ Microsoft Word wv or DocCat
+ Redhat RPM rpm
+ TeX source detex
+ TeX dvi dvi2tty
+
+ For handling non-English language, you might need lv and/or nkf
+ package, too.
+
+ DocCat is a commercial product from Dehenken Limited.
+ See http://www.dehenken.co.jp/products/doccat/doccat.html in detail.
+
+===========================================================================
diff -r a0d83f1d9562 -r dec7f8d66a9e textproc/namazu2/Makefile
--- a/textproc/namazu2/Makefile Wed Dec 15 12:18:43 2004 +0000
+++ b/textproc/namazu2/Makefile Wed Dec 15 13:09:58 2004 +0000
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:18:20 tv Exp $
+# $NetBSD: Makefile,v 1.15 2004/12/15 13:09:58 taca Exp $
# FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
-DISTNAME= namazu-2.0.13-1
-PKGNAME= namazu-2.0.13
-PKGREVISION= 1
+DISTNAME= namazu-2.0.14
CATEGORIES= japanese textproc www
-MASTER_SITES= ftp://ftp.namazu.org/namazu/stable/ \
- http://www.namazu.org/stable/
+MASTER_SITES= http://www.namazu.org/stable/
MAINTAINER= tech-pkg%NetBSD.org@localhost
HOMEPAGE= http://www.namazu.org/index.html.en
@@ -15,46 +12,43 @@
DEPENDS+= p5-File-MMagic>=1.09:../../misc/p5-File-MMagic
DEPENDS+= p5-Text-Kakasi>=1.04:../../textproc/p5-Text-Kakasi
DEPENDS+= p5-nkf>=1.7:../../converters/p5-nkf
-.if !defined(WITH_CHASEN) || ${WITH_CHASEN} != NO
DEPENDS+= p5-Text-ChaSen>=1.0:../../textproc/p5-Text-ChaSen
-.endif
-
-WRKSRC= ${WRKDIR}/namazu-2.0.13
-CONFIGURE_ARGS+= --localstatedir=${LOCALBASE}/libdata \
- --libexecdir=${LOCALBASE}/libexec/cgi-bin
-.if defined(WITH_CHASEN) && ${WITH_CHASEN} == NO
-CONFIGURE_ARGS+= -without-chasen
-.else
-CONFIGURE_ARGS+= -with-chasen
-.endif
-
-DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
-INSTALL_FILE= ${WRKDIR}/INSTALL
-
-USE_BUILDLINK3= yes
-USE_PKGLOCALEDIR= # defined
-USE_PERL5= # defined
-GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
-LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-TEST_TARGET= check
CONFLICTS+= namazu-[0-9]*
-post-build:
- @for FILE in \
- ${PKGDIR}/DEINSTALL \
- ${PKGDIR}/INSTALL; \
- do \
- ${SED} -e 's|@CONFDIR@|${LOCALBASE}/etc/namazu|g' \
- -e 's|@DATADIR@|${LOCALBASE}/libdata/namazu|g' \
- -e 's|@EXAMPLEDIR@|${LOCALBASE}/share/namazu|g' \
- < $${FILE} > ${WRKDIR}/`basename $${FILE}`; \
- done
+USE_BUILDLINK3= yes
+USE_PKGLOCALEDIR= yes
+USE_PKGINSTALL= yes
+USE_PERL5= run
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+TEST_TARGET= check
+
+CONFIGURE_ARGS+= --localstatedir=${DATADIR} \
+ --libexecdir=${PREFIX}/libexec/cgi-bin \
+ --sysconfdir=${PKG_SYSCONFBASE} \
+ --with-chasen
+
+DATADIR= ${PREFIX}/libdata
+EXAMPLESDIR= ${PREFIX}/share/examples/namazu
+EXAMPLES= mknmzrc namazurc
+
+.include "../../mk/bsd.prefs.mk"
+
+PKG_SYSCONFSUBDIR?= namazu
+.for f in ${EXAMPLES}
+CONF_FILES+= ${EXAMPLESDIR}/namazu/$f ${PKG_SYSCONFDIR}/$f
+.endfor
+MAKE_DIRS+= ${DATADIR}/namazu/index
+OWN_DIRS+= ${PKG_SYSCONFDIR} ${DATADIR}/namazu
post-install:
- @${TEST} -d ${LOCALBASE}/etc/namazu || ${INSTALL_DATA_DIR} ${LOCALBASE}/etc/namazu
- @${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ ${INSTALL_DATA_DIR} ${DATADIR}/namazu
+ ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+.for f in ${EXAMPLES}
+ cd ${WRKSRC}/conf; ${INSTALL_DATA} $f-sample ${EXAMPLESDIR}/$f
+.endfor
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff -r a0d83f1d9562 -r dec7f8d66a9e textproc/namazu2/PLIST
--- a/textproc/namazu2/PLIST Wed Dec 15 12:18:43 2004 +0000
+++ b/textproc/namazu2/PLIST Wed Dec 15 13:09:58 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:55 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/12/15 13:09:58 taca Exp $
bin/adnmz
bin/bnamazu
bin/gcnmz
@@ -12,8 +12,6 @@
bin/nmzmerge
bin/rfnmz
bin/vfnmz
-@exec ${MKDIR} %D/etc/namazu 2>/dev/null|| /usr/bin/true
-@dirrm etc/namazu
include/namazu/codeconv.h
include/namazu/field.h
include/namazu/hlist.h
@@ -32,10 +30,6 @@
include/namazu/wakati.h
@dirrm include/namazu
lib/libnmz.la
-@exec ${MKDIR} %D/libdata/namazu 2>/dev/null|| /usr/bin/true
-@exec ${MKDIR} %D/libdata/namazu/index 2>/dev/null || /usr/bin/true
-@dirrm libdata/namazu/index
-@dirrm libdata/namazu
libexec/cgi-bin/namazu.cgi
man/man1/mknmz.1
man/man1/namazu.1
@@ -68,6 +62,9 @@
share/namazu/etc/TODO
share/namazu/etc/namazu.png
@dirrm share/namazu/etc
+share/examples/namazu/mknmzrc
+share/examples/namazu/namazurc
+@dirrm share/examples/namazu
share/namazu/filter/apachecache.pl
share/namazu/filter/bzip2.pl
share/namazu/filter/compress.pl
@@ -96,8 +93,6 @@
share/namazu/filter/taro7_10.pl
share/namazu/filter/tex.pl
@dirrm share/namazu/filter
-share/namazu/mknmzrc.example
-share/namazu/namazurc.example
share/namazu/pl/codeconv.pl
share/namazu/pl/conf.pl
share/namazu/pl/gettext.pl
diff -r a0d83f1d9562 -r dec7f8d66a9e textproc/namazu2/distinfo
--- a/textproc/namazu2/distinfo Wed Dec 15 12:18:43 2004 +0000
+++ b/textproc/namazu2/distinfo Wed Dec 15 13:09:58 2004 +0000
@@ -1,6 +1,14 @@
-$NetBSD: distinfo,v 1.5 2004/05/06 13:40:21 taca Exp $
+$NetBSD: distinfo,v 1.6 2004/12/15 13:09:58 taca Exp $
-SHA1 (namazu-2.0.13-1.tar.gz) = 1ec8e20e12293fc008371afee98c3165dbe4017e
-Size (namazu-2.0.13-1.tar.gz) = 1046889 bytes
-SHA1 (patch-aa) = 336a7f68842d4a9ca29ce085ccded45fe0b1392f
-SHA1 (patch-ab) = 0643872e5681ca99373a2059e0b520405c62a807
+SHA1 (namazu-2.0.14.tar.gz) = 6515d1a1ed5156ea569aed0b95eb5212b2c24dc3
+Size (namazu-2.0.14.tar.gz) = 1032273 bytes
+SHA1 (patch-ab) = 5052026e67ffb0a235c8a4ba996cb4438bf7b622
+SHA1 (patch-ac) = fcb47a8433f2784f2420835a11a06d8421a25c18
+SHA1 (patch-ad) = 3707beb6136f50512cf3ab4535e978aa198d112e
+SHA1 (patch-ae) = bcd438ddcf06e6356fd04955724b539426018c41
+SHA1 (patch-af) = b9c722b372935cbca017f706c7c7a6372fbfbc69
+SHA1 (patch-ag) = 6de0499048e452a3109106d06e4bd1fdfd537ca7
+SHA1 (patch-ah) = fce8c1489d09225f9c1a402efed55f33956799a7
+SHA1 (patch-ai) = 54c60dbfda316e5777d1234dc32b739f368e3f25
+SHA1 (patch-aj) = 55076b0fbf4eb7a7b67d6214a63b9bcdb02bf2a1
+SHA1 (patch-ak) = 1d2edc78e144f9d0fe127dedc8fa3262a4f0683d
Home |
Main Index |
Thread Index |
Old Index