OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 16-Jan-2003 17:38:48
Branch: HEAD Handle: 2003011616384601
Modified files:
openpkg-src/sgml mkcatalog sgml.spec
openpkg-web news.txt
Log:
fully work off this package
Summary:
Revision Changes Path
1.2 +138 -162 openpkg-src/sgml/mkcatalog
1.24 +4 -3 openpkg-src/sgml/sgml.spec
1.2865 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sgml/mkcatalog
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.2 mkcatalog
--- openpkg-src/sgml/mkcatalog 18 Sep 2001 09:48:33 -0000 1.1.1.1
+++ openpkg-src/sgml/mkcatalog 16 Jan 2003 16:38:47 -0000 1.2
@@ -1,71 +1,64 @@
-#!/bin/sh
+#!@l_prefix@/bin/bash
##
## mkcatalog - script for managing SGML catalog file
## Created: 20001015 Shigeyuki Fukushima <[EMAIL PROTECTED]>.
## Modified: 20001019 Hiroki Sato <[EMAIL PROTECTED]>.
##
-sh_basename ()
-{
+sh_basename () {
l_value=$1
IFS_old=${IFS}; IFS=" /"; set -- ${l_value}; IFS=${IFS_old}
case $# in
- 0) ;;
- *) echo `eval echo \\$$#` ;;
+ 0) ;;
+ *) echo `eval echo \\$$#` ;;
esac
}
-sh_dirname ()
-{
+sh_dirname () {
l_value=$1
IFS_old=${IFS}; IFS=" /"; set -- ${l_value}; IFS=${IFS_old}
- l_dirname=$1; shift;
+ l_dirname=$1
+ shift
while
case $# in
- 0) break ;;
- 1) echo ${l_dirname}; break ;;
- *) ;;
- esac;
+ 0) break ;;
+ 1) echo ${l_dirname}; break ;;
+ *) ;;
+ esac
do
l_dirname="${l_dirname}/$1";
shift;
done
}
-norm_dir ()
-{
+norm_dir () {
[ -d "$1" ] && echo `exec 2>/dev/null; cd $1; echo ${PWD}`
}
-verbose_msg ()
-{
+verbose_msg () {
case ${F_VERBOSE} in
- 1) echo " ===> $*" ;;
- *) ;;
+ 1) echo " ===> $*" ;;
+ *) ;;
esac
}
PREFIX=@l_prefix@
TMPDIR=/tmp
ARGV0=`sh_basename $0`
-
-# default top-level catalog file
CAT_DIR=${PREFIX}/share/sgml
CAT_FILE=catalog
-
F_PRESERVE_OLD=""
F_VERBOSE=""
+
args=`getopt pqvc: $*` ; set -- $args
for i
do
case "$i" in
- -c) CAT_DIR=`sh_dirname $2`;
- CAT_FILE=`sh_basename $2`;
- shift; shift ;;
- -p) F_PRESERVE_OLD=1; shift ;;
- -q) exec 1> /dev/null 2>&1; shift ;;
- -v) F_VERBOSE=1; shift ;;
- --) shift; break ;;
+ -c) CAT_DIR=`sh_dirname $2`; CAT_FILE=`sh_basename $2`; shift; shift ;;
+ -p) F_PRESERVE_OLD=1; shift ;;
+ -q) exec 1>/dev/null 2>&1; shift ;;
+ -v) F_VERBOSE=1; shift ;;
+ --) shift; break ;;
esac
done
@@ -73,56 +66,57 @@
dtd_dir=$2
dtd_catalog=`sh_basename "$3"`
-### option check and normalize ${dtd_dir}
+# option check and normalize ${dtd_dir}
case "${dtd_act}" in
-add|install|delete|deinstall|enable|disable)
- if [ ! -d "${CAT_DIR}" ]; then
- echo "${ARGV0}: top-level catalog dir \"${CAT_DIR}\" not found."
- exit 1
- elif [ ! -n "${dtd_dir}" ]; then
- echo "${ARGV0}: DTD directory is not specified."
- exit 1
- elif [ ! -d "${CAT_DIR}/${dtd_dir}"\
- -a ! -d "${dtd_dir}" ]; then
- echo "${ARGV0}: DTD directory \"${dtd_dir}\" not found."
- exit 1
- elif [ ! -f "${CAT_DIR}/${dtd_dir}/${dtd_catalog:-catalog}"\
- -a ! -f "${dtd_dir}/${dtd_catalog:-catalog}" ]; then
- echo "${ARGV0}: DTD catalog \"${dtd_dir}/${dtd_catalog:-catalog}\" not
found."
- exit 1
- fi
- verbose_msg "top-level catalog dir (specified): ${CAT_DIR}"
- CAT_DIR=`norm_dir ${CAT_DIR}`
- verbose_msg "top-level catalog dir (normalized): ${CAT_DIR}"
- verbose_msg "target catalog dir (specified): ${dtd_dir}"
- dtd_dir=`norm_dir ${CAT_DIR}/${dtd_dir} || norm_dir ${dtd_dir}`
- verbose_msg "target catalog dir (normalized): ${dtd_dir}"
-
- case "${dtd_dir}" in
- ${CAT_DIR}/*) ;;
- *) echo "${ARGV0}: DTD directory \"${dtd_dir}\" is invalid."
- exit 1 ;;
- esac
- ### keep dtd_dir relative
- dtd_dir=${dtd_dir#"${CAT_DIR}/"}
- ;;
-*)
- echo "${ARGV0}: missing options."
- cat <<EOF
-
-Usage:
- ${ARGV0} [-c toplv-catalog-filename] [-pqv]
[install|add|deinstall|delete|enable|disable] dtd-directory-name [catalog-filename].
+ add|install|delete|deinstall|enable|disable)
+ if [ ! -d "${CAT_DIR}" ]; then
+ echo "${ARGV0}: top-level catalog dir \"${CAT_DIR}\" not found."
+ exit 1
+ elif [ ! -n "${dtd_dir}" ]; then
+ echo "${ARGV0}: DTD directory is not specified."
+ exit 1
+ elif [ ! -d "${CAT_DIR}/${dtd_dir}"\
+ -a ! -d "${dtd_dir}" ]; then
+ echo "${ARGV0}: DTD directory \"${dtd_dir}\" not found."
+ exit 1
+ elif [ ! -f "${CAT_DIR}/${dtd_dir}/${dtd_catalog:-catalog}"\
+ -a ! -f "${dtd_dir}/${dtd_catalog:-catalog}" ]; then
+ echo "${ARGV0}: DTD catalog \"${dtd_dir}/${dtd_catalog:-catalog}\" not
found."
+ exit 1
+ fi
+ verbose_msg "top-level catalog dir (specified): ${CAT_DIR}"
+ CAT_DIR=`norm_dir ${CAT_DIR}`
+ verbose_msg "top-level catalog dir (normalized): ${CAT_DIR}"
+ verbose_msg "target catalog dir (specified): ${dtd_dir}"
+ dtd_dir=`norm_dir ${CAT_DIR}/${dtd_dir} || norm_dir ${dtd_dir}`
+ verbose_msg "target catalog dir (normalized): ${dtd_dir}"
+
+ case "${dtd_dir}" in
+ ${CAT_DIR}/*) ;;
+ *) echo "${ARGV0}: DTD directory \"${dtd_dir}\" is invalid."
+ exit 1 ;;
+ esac
+ # keep dtd_dir relative
+ dtd_dir=${dtd_dir#"${CAT_DIR}/"}
+ ;;
+ *)
+ echo "${ARGV0}: missing options."
+ cat <<EOF
+Usage: ${ARGV0} [-c toplv-catalog-filename] [-pqv]
+ [install|add|deinstall|delete|enable|disable]
+ dtd-directory-name [catalog-filename]
-c filename specifies top-level catalog file
- (default: ${PREFIX}/catalog)
- -p preseve old catalog file (as .old)
+ (default: ${PREFIX}/share/sgml/catalog)
+ -p preserve old catalog file (as .old)
-q quiet mode
-v verbose mode (for debug)
ex.) mkcatalog install html/4.0
mkcatalog -c /home/foo/sgml/catalog install html/4.0/my_ext html_catalog
EOF
- exit 1 ;;
+ exit 1
+ ;;
esac
echo "* top-level catalog: ${CAT_DIR}/${CAT_FILE}"
@@ -131,109 +125,96 @@
verbose_msg "target catalog file: ${dtd_catalog:-catalog}"
echo "* attempt to ${dtd_act} catalog in ${dtd_dir}"
+
TMPCAT=/tmp/catalog.$$
-proc_catalog ()
-{
+proc_catalog () {
l_bottom_p=$1 # allow to delete upper catalog?
l_upper=$2 # dirname of upper catalog
l_lower=$3 # dirname of lower catalog
case ${first_p} in
- [Yy][Ee][Ss]) catalog=${dtd_catalog:-"catalog"} ;;
- *) catalog=${CAT_FILE} ;;
+ [Yy][Ee][Ss]) catalog=${dtd_catalog:-"catalog"} ;;
+ *) catalog=${CAT_FILE} ;;
esac
- # l_upper_cat -> relative path from ${CAT_DIR}
- # l_lower_cat -> relative path from l_upper
- l_upper_cat=${l_upper}/${CAT_FILE}
- l_lower_cat=`sh_basename ${l_lower}`/${catalog}
-
- # l_*_abs_* -> absolute path respectively
- l_upper_abs=${CAT_DIR}/${l_upper}
- l_lower_abs=${CAT_DIR}/${l_lower}
- l_upper_abs_cat=${CAT_DIR}/${l_upper}/${CAT_FILE}
- l_lower_abs_cat=${CAT_DIR}/${l_lower}/${catalog}
-
- # for debug
- #echo ${l_bottom_p} ${l_upper_cat} ${l_lower_cat}
+ # l_upper_cat -> relative path from ${CAT_DIR}
+ # l_lower_cat -> relative path from l_upper
+ l_upper_cat="${l_upper}/${CAT_FILE}"
+ l_lower_cat="`sh_basename ${l_lower}`/${catalog}"
+
+ # l_*_abs_* -> absolute path respectively
+ l_upper_abs="${CAT_DIR}/${l_upper}"
+ l_lower_abs="${CAT_DIR}/${l_lower}"
+ l_upper_abs_cat="${CAT_DIR}/${l_upper}/${CAT_FILE}"
+ l_lower_abs_cat="${CAT_DIR}/${l_lower}/${catalog}"
l_cat_line="CATALOG \"${l_lower_cat}\""
l_abs_path_head=`cd ${l_upper_abs}; echo ${PWD}`
- # for debug
- #echo ${l_cat_line}
-
- # first, create temporary catalog from l_upper_cat
- # not including CATALOG line of l_lower_cat (if no catalog,
- # create empty one).
+ # first, create temporary catalog from l_upper_cat
+ # not including CATALOG line of l_lower_cat (if no catalog,
+ # create empty one).
#
- # NOTE: file manipulations require absolute path, but
- # CATALOG line do relative from upper's one.
+ # NOTE: file manipulations require absolute path, but
+ # CATALOG line do relative from upper's one.
#
touch ${l_upper_abs_cat} || exit 1
- grep -v "\( *-- *\)\?CATALOG *\"\(${l_abs_path_head}/\)\?${l_lower_cat}\"\( *--
*\)\?" ${l_upper_abs_cat} > ${TMPCAT}
+ grep -v "\( *-- *\)\?CATALOG *\"\(${l_abs_path_head}/\)\?${l_lower_cat}\"\( *--
*\)\?" \
+ ${l_upper_abs_cat} >${TMPCAT}
- # preserve old catalog as necessary
+ # preserve old catalog as necessary
if [ "x${F_PRESERVE_OLD}" != "x" ]; then
cp ${l_upper_abs_cat} ${l_upper_abs_cat}.old || exit 1
fi
case "${dtd_act}" in
- add|install|enable)
- #
- # if "install or add or enable",
- # create "the tamporary catalog + l_cat_line" and install it.
- #
- echo " - ${dtd_act} ${l_cat_line} line in ${l_upper_cat}"
- echo "${l_cat_line}" >> ${TMPCAT}
- cp ${TMPCAT} ${l_upper_abs_cat} || exit 1
- ;;
- disable)
- #
- # if "disable", install the same above but l_cat_line is
- # commented out.
- #
- case ${first_p} in
- [Yy][Ee][Ss])
+ add|install|enable)
+ # if "install or add or enable",
+ # create "the temporary catalog + l_cat_line" and install it.
echo " - ${dtd_act} ${l_cat_line} line in ${l_upper_cat}"
- echo "-- ${l_cat_line} --" >> ${TMPCAT}
+ echo "${l_cat_line}" >>${TMPCAT}
cp ${TMPCAT} ${l_upper_abs_cat} || exit 1
;;
- *) rm -f ${TMPCAT};
- exit 0;
+ disable)
+ # if "disable", install the same above but l_cat_line is
+ # commented out.
+ case ${first_p} in
+ [Yy][Ee][Ss])
+ echo " - ${dtd_act} ${l_cat_line} line in ${l_upper_cat}"
+ echo "-- ${l_cat_line} --" >>${TMPCAT}
+ cp ${TMPCAT} ${l_upper_abs_cat} || exit 1
+ ;;
+ *) rm -f ${TMPCAT}
+ exit 0
+ ;;
+ esac
;;
- esac
- ;;
- delete|deinstall)
- #
- # if "deinstall or delete" and the temporary catalog is
- # not empty, install the catalog itself (in the case of being
- # empty, delete it). ${l_bottom_p}=YES means that
- # ${l_upper_cat} can be deleted safely, otherwise not.
- #
- case ${l_bottom_p} in
- [Yy][Ee][Ss])
- echo " - ${dtd_act} ${l_cat_line} line from ${l_upper_cat}"
- if [ ! -s ${TMPCAT} ]; then
- echo " - delete empty catalog ${l_upper_cat}"
- rm -f ${l_upper_abs_cat}
- else
- cp ${TMPCAT} ${l_upper_abs_cat} || exit 1
- fi
+ delete|deinstall)
+ # if "deinstall or delete" and the temporary catalog is
+ # not empty, install the catalog itself (in the case of being
+ # empty, delete it). ${l_bottom_p}=YES means that
+ # ${l_upper_cat} can be deleted safely, otherwise not.
+ case ${l_bottom_p} in
+ [Yy][Ee][Ss])
+ echo " - ${dtd_act} ${l_cat_line} line from ${l_upper_cat}"
+ if [ ! -s ${TMPCAT} ]; then
+ echo " - delete empty catalog ${l_upper_cat}"
+ rm -f ${l_upper_abs_cat}
+ else
+ cp ${TMPCAT} ${l_upper_abs_cat} || exit 1
+ fi
+ ;;
+ *) rm -f ${TMPCAT}
+ exit 0
+ ;;
+ esac
;;
- *) rm -f ${TMPCAT};
- exit 0;
- ;;
- esac
- ;;
esac
- #
- # when flag "preserve old" is specified but
- # there is no difference between new file and old one,
- # preservation is silently denied.
- #
+ # when flag "preserve old" is specified but
+ # there is no difference between new file and old one,
+ # preservation is silently denied.
if [ "x${F_PRESERVE_OLD}" != "x" ] && \
cmp -s ${l_upper_abs_cat}.old ${l_upper_abs_cat}; then
rm -f ${l_upper_abs_cat}.old
@@ -241,25 +222,21 @@
rm -f ${TMPCAT}
}
-compose_dir_list ()
-{
+compose_dir_list () {
l_dir=$1
- #
- # Creates dirlist such as the following.
- # input: docbook/4.1/my_extension
- # return: docbook/4.1/my_extension docbook/4.1 docbook
- #
+ # Creates dirlist such as the following.
+ # input: docbook/4.1/my_extension
+ # return: docbook/4.1/my_extension docbook/4.1 docbook
IFS_old=${IFS}; IFS=" /"; set -- ${l_dir}
- l_dir_top=$1;
- shift;
- l_dir_rest=$*;
+ l_dir_top=$1
+ shift
+ l_dir_rest="$*"
IFS=${IFS_old}
l_dir_item=${l_dir_top}
l_dir_list=${l_dir_top}
- for i in ${l_dir_rest}
- do
+ for i in ${l_dir_rest}; do
l_dir_item="${l_dir_item}/${i}"
l_dir_list="${l_dir_item} ${l_dir_list}"
done
@@ -268,24 +245,23 @@
bottom_p=YES
first_p=YES
-
set -- `compose_dir_list ${dtd_dir}` .
verbose_msg "process catalog (relative to top one): $*"
while
case $# in
- 1) break ;;
- *) ;;
- esac;
+ 1) break ;;
+ *) ;;
+ esac
do
lower=$1
upper=$2
proc_catalog "${bottom_p}" "${upper}" "${lower}"
-
first_p=NO
if [ -f ${CAT_DIR}/${upper}/${CAT_FILE} ]; then
bottom_p=NO
fi
- shift;
+ shift
done
-exit 0;
+exit 0
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sgml/sgml.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 sgml.spec
--- openpkg-src/sgml/sgml.spec 3 Jan 2003 10:54:50 -0000 1.23
+++ openpkg-src/sgml/sgml.spec 16 Jan 2003 16:38:47 -0000 1.24
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: SGML
License: PD
-Version: 1.0
-Release: 20020822
+Version: 20030116
+Release: 20030116
# list of sources
Source0: mkcatalog
@@ -42,7 +42,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20020206
-PreReq: OpenPKG, openpkg >= 20020206
+PreReq: OpenPKG, openpkg >= 20020206, bash
AutoReq: no
AutoReqProv: no
@@ -62,6 +62,7 @@
%{l_shtool} install -c -m 644 \
/dev/null $RPM_BUILD_ROOT%{l_prefix}/share/sgml/catalog
%{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_prefix@;%{l_prefix};' \
%{SOURCE mkcatalog} $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2864 -r1.2865 news.txt
--- openpkg-web/news.txt 16 Jan 2003 16:31:55 -0000 1.2864
+++ openpkg-web/news.txt 16 Jan 2003 16:38:46 -0000 1.2865
@@ -1,3 +1,4 @@
+16-Jan-2003: Upgraded package: P<sgml-20030116-20030116>
16-Jan-2003: Upgraded package: P<spambouncer-1.5.20021213-20030116>
16-Jan-2003: Upgraded package: P<stunnel-4.04-20030116>
16-Jan-2003: Upgraded package: P<squid-2.5.1-20030116>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
