|
@
まず auto-index を import:
makoto@u 13:16:50/020203(/tmp/temp)> cvs import -m 'auto-index,jeedosaquin initial import' jeedosaquin VENDOR d_2002-02-03
N jeedosaquin/auto-index.cgi
No conflicts created by this import
@
auto-index.cgi の中身を取替えておいて:
makoto@u 13:18:17/020203(/tmp/temp)> rm auto-index.cgi
makoto@u 13:18:32/020203(/tmp/temp)> cp /home/htdocs/www/OHP/OHP.cgi .
makoto@u 13:18:47/020203(/tmp/temp)> mv OHP.cgi auto-index.cgi
makoto@u 13:18:58/020203(/tmp/temp)> ls
auto-index.cgi
@
import -b 1.1.3 .... 枝を作って OHP版 を import:
makoto@u 13:20:11/020203(/tmp/temp)> cvs import -b 1.1.3 -m 'OHP version' jeedosaquin OHP d_2002-02-03-O
C jeedosaquin/auto-index.cgi
1 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jOHP:yesterday -jOHP jeedosaquin
makoto@u 13:20:51/020203(/tmp/temp)>
conflicts
と言われているので、思った通りにならない気もするが (無視)。
(CVS という名前のものを消しておけば良かったのか)
@
幹のはずのものを取出している方では 1.1.1.1 (期待通):
makoto@u 13:22:38/020203(/tmp/cvs)> cvs status -v jeedosaquin/
cvs status: Examining jeedosaquin/
===================================================================
File: auto-index.cgi Status: Up-to-date
Working revision: 1.1.1.1 Sun Feb 3 04:18:17 2002
Repository revision: 1.1.1.1 /a/j/repository-practice/jeedosaquin/auto-index.cgi,v
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
d_2002-02-03-O (revision: 1.1.3.1)
OHP (branch: 1.1.3)
d_2002-02-03 (revision: 1.1.1.1)
VENDOR (branch: 1.1.1)
makoto@u 13:22:46/020203(/tmp/cvs)>
いいのかな。
@
OHP 枝を取出して見ると 1.1.3.1:
makoto@u 13:26:45/020203(/tmp/cvs2)> cvs -d /a/j/repository-practice co -r OHP jeedosaquin
cvs checkout: Updating jeedosaquin
U jeedosaquin/auto-index.cgi
makoto@u 13:26:53/020203(/tmp/cvs2)> cvs status -v
cvs status: Examining jeedosaquin
===================================================================
File: auto-index.cgi Status: Up-to-date
Working revision: 1.1.3.1 Sun Feb 3 04:20:51 2002
Repository revision: 1.1.3.1 /a/j/repository-practice/jeedosaquin/auto-index.cgi,v
Sticky Tag: OHP (branch: 1.1.3)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
d_2002-02-03-O (revision: 1.1.3.1)
OHP (branch: 1.1.3)
d_2002-02-03 (revision: 1.1.1.1)
VENDOR (branch: 1.1.1)
@
変更して見ると 1.1.3.2 (これも期待通):
makoto@u 13:26:58/020203(/tmp/cvs2)> vi jeedosaquin/auto-index.cgi
makoto@u 13:27:20/020203(/tmp/cvs2)> cvs commit -m 'adding comment for OHP branch'
cvs commit: Examining jeedosaquin
Checking in jeedosaquin/auto-index.cgi;
/a/j/repository-practice/jeedosaquin/auto-index.cgi,v <-- auto-index.cgi
new revision: 1.1.3.2; previous revision: 1.1.3.1
done
makoto@u 13:27:37/020203(/tmp/cvs2)> cvs status -v
cvs status: Examining jeedosaquin
===================================================================
File: auto-index.cgi Status: Up-to-date
Working revision: 1.1.3.2 Sun Feb 3 04:27:35 2002
Repository revision: 1.1.3.2 /a/j/repository-practice/jeedosaquin/auto-index.cgi,v
Sticky Tag: OHP (branch: 1.1.3)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
d_2002-02-03-O (revision: 1.1.3.1)
OHP (branch: 1.1.3)
d_2002-02-03 (revision: 1.1.1.1)
VENDOR (branch: 1.1.1)
makoto@u 13:27:38/020203(/tmp/cvs2)>
@
HEAD というのもあるはずなので、取出して変更 1.2 ... is not a branch:
makoto@u 13:40:17/020203(/tmp/head)> cvs -d /a/j/repository-practice co -r HEAD jeedosaquin
cvs checkout: Updating jeedosaquin
U jeedosaquin/auto-index.cgi
makoto@u 13:40:24/020203(/tmp/head)> cvs status -v
cvs status: Examining jeedosaquin
===================================================================
File: auto-index.cgi Status: Up-to-date
Working revision: 1.2 Sun Feb 3 04:25:41 2002
Repository revision: 1.2 /a/j/repository-practice/jeedosaquin/auto-index.cgi,v
Sticky Tag: HEAD (revision: 1.2)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
d_2002-02-03-O (revision: 1.1.3.1)
OHP (branch: 1.1.3)
d_2002-02-03 (revision: 1.1.1.1)
VENDOR (branch: 1.1.1)
makoto@u 13:40:30/020203(/tmp/head)> vi jeedosaquin/auto-index.cgi
makoto@u 13:41:14/020203(/tmp/head)> cvs commit -m 'commit for HEAD'
cvs commit: Examining jeedosaquin
cvs commit: sticky tag `HEAD' for file `jeedosaquin/auto-index.cgi' is not a branch
cvs [commit aborted]: correct above errors first!
makoto@u 13:41:27/020203(/tmp/head)>
@
cvs update -A して見る:
makoto@u 13:52:48/020203(/tmp/head)> cvs update -A
cvs update: in directory .:
cvs [update aborted]: there is no version here; do 'cvs checkout' first
makoto@u 13:52:55/020203(/tmp/head)> ls
jeedosaquin
@
cd jeedosaquin; cvs update -A:
makoto@u 13:53:00/020203(/tmp/head)> cd jeedosaquin/
makoto@u 13:53:04/020203(...head/jeedosaquin)> cvs update -A
cvs update: Updating .
M auto-index.cgi
@
cvs diff:
makoto@u 13:53:06/020203(...head/jeedosaquin)> cvs diff
cvs diff: Diffing .
Index: auto-index.cgi
===================================================================
RCS file: /a/j/repository-practice/jeedosaquin/auto-index.cgi,v
retrieving revision 1.2
diff -r1.2 auto-index.cgi
22a23
> # add comment for HEAD sticky
@
cvs commit:
makoto@u 13:53:37/020203(...head/jeedosaquin)> cvs commit -m 'for head after update -A'
cvs commit: Examining .
Checking in auto-index.cgi;
/a/j/repository-practice/jeedosaquin/auto-index.cgi,v <-- auto-index.cgi
new revision: 1.3; previous revision: 1.2
done
@
1.3 が作られている (期待通):
makoto@u 13:53:50/020203(...head/jeedosaquin)> cvs status -v
cvs status: Examining .
===================================================================
File: auto-index.cgi Status: Up-to-date
Working revision: 1.3 Sun Feb 3 04:53:49 2002
Repository revision: 1.3 /a/j/repository-practice/jeedosaquin/auto-index.cgi,v
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
d_2002-02-03-O (revision: 1.1.3.1)
OHP (branch: 1.1.3)
d_2002-02-03 (revision: 1.1.1.1)
VENDOR (branch: 1.1.1)
makoto@u 13:53:58/020203(...head/jeedosaquin)>
@
cvsweb.cgi:
それよりも /usr/pkgsrc/www/cvsweb/ にあった。
=====================================================
You may wish to customize the following files:
/usr/pkg/etc/httpd/cvsweb.conf
=====================================================
===> Registering installation for cvsweb-1.112
cvsweb-1.112 requires installed package perl-5.6.1nb6
CVSROOT だけを変更したら、いとも簡単に ...
( この URL は夜中や、僕がいない時はお休み
→ いつも動いているもの
cvsweb
を作成 -- 2/05 加筆
)
- 一部で server error が出るような気がするが。
- 中身に jis がある時には、一部変更が必要とのこと。その変更は
に置いてある。(一ヶ所当たらなかったので
手で直す
)
/usr/pkgsrc/japanese/p5-jcode でも make; make install
#2
[Namazu] (~/namazu-dev)> du -sk * |sort -nr
makoto@u 15:21:36/020203(~/namazu-dev)> du -sk * |sort -nr
14930 stable-2-0
7471 head-old
5528 head-mef
5439 namazu-web
2959 head
2758 stable-2-0-mef
524 remove-on-the-way
なんてして見ると 69 秒もかかる。 (ちなみに分類の数は 215 -- 多すぎる)
namazu +newsub: cvs って出来るように項目検索に追加すればいいような気がする。
さて field 定義は誰でも出来るのだろうか。
#4
[NetBSD] (pkgsrc) automake が入っていなかった
makoto@u 15:49:43/020203(...devel/automake)> make
Please unset PKG_PATH before doing pkgsrc works!
*** Error code 1
Stop.
make: stopped in /export/pkgsrc/devel/automake
makoto@u 15:49:45/020203(...devel/automake)> unsetenv PKG_PATH
makoto@u 15:49:51/020203(...devel/automake)> make
===> Validating dependencies for automake-1.4.5nb1
=> Checksum OK for automake-1.4-p5.tar.gz.
===> Extracting for automake-1.4.5nb1
===> Required installed package autoconf>=2.13: autoconf-2.13 found
===> Required installed package perl>=5.0: perl-5.6.1nb6 found
===> Patching for automake-1.4.5nb1
===> Applying NetBSD patches for automake-1.4.5nb1
**************************************
Patch file /export/pkgsrc/devel/automake/patches/patch-ac has been modified
**************************************
Patching failed due to modified patch file(s): patch-ac
*** Error code 1
Stop.
make: stopped in /export/pkgsrc/devel/automake
*** Error code 1
Stop.
make: stopped in /export/pkgsrc/devel/automake
makoto@u 15:49:57/020203(...devel/automake)> ls
CVS DESCR Makefile PLIST distinfo patches work
makoto@u 15:50:15/020203(...devel/automake)> cd ..
makoto@u 15:50:17/020203(...pkgsrc/devel)> mv automake automake-upper
makoto@u 15:50:29/020203(...pkgsrc/devel)> rm -W automake
makoto@u 15:50:37/020203(...pkgsrc/devel)> cd automake
makoto@u 15:50:40/020203(...devel/automake)> make
#5
[Namazu] ./autogen.sh -> ./configure: 533: Syntax error: word unexpected (expecting ")")
makoto@u 15:53:45/020203(~...head/namazu)> ./autogen.sh
**Warning**: I am going to run `configure' with no arguments.
If you wish to pass any to it, please specify them on the
`./autogen.sh' command line.
Generating configure script and Makefiles for Namazu.
Running gettextize...
gettextize: not found
Running libtoolize...
Using `AC_PROG_RANLIB' is rendered obsolete by `AC_PROG_LIBTOOL'
You should add the contents of `/usr/pkg/share/aclocal/libtool.m4' to `aclocal.m4'.
.........
Running autoconf ...
Configuring Namazu.
Running $./configure --enable-maintainer-mode ...
loading cache ./config.cache
./configure: 533: Syntax error: word unexpected (expecting ")")
Now type 'make' to compile Namazu.
makoto@u 15:53:57/020203(~...head/namazu)>
@
上のは gettext が入っていなかったせい。:
Making all in po
make: don't know how to make cat-id-tbl.c. Stop
またこれ ? きょうは急ぐので gmake でしのぐ。
@
undefined reference to `gettext':
gcc -g -O2 -Wall -pedantic -o .libs/namazu form.o namazu.o output.o rcfile.o result.o usage.o namazu-cmd.o ../nmz/.libs/libnmz.so ../lib/libnmzut.a -lm -Wl,--rpath -Wl,/usr/local/lib
output.o: In function `print_page_index':
/amd/nazuha.ki.nu./export/home/makoto/namazu-dev/head/namazu/src/output.c:507: undefined reference to `gettext'
output.o: In function `print_current_range':
@
./autogen.sh --with-included-gettext; gmake:
libintl.h:1: macro or `#include' recursion too deep
gmake[2]: *** [intl-compat.o] エラー 1
gmake[2]: 出ます ディレクトリ `/amd/nazuha.ki.nu./export/home/makoto/namazu-dev/head/namazu/intl'
| |
最近の日記
2024年05月04日
・Trial on 10.99.10
2024年04月29日
・dkim
2024年03月10日
・停電 (瞬電)
2024年03月03日
・the second try on bare-metal
・useradd
2024年02月29日
・opendkim and senmail
|