diff options
| -rw-r--r-- | pttbbs/common/sys/Makefile | 12 | ||||
| -rw-r--r-- | pttbbs/common/sys/big5data.tar.bz2 | bin | 0 -> 222165 bytes | |||
| -rw-r--r-- | pttbbs/common/sys/big5data.zip | bin | 315566 -> 0 bytes | |||
| -rw-r--r-- | pttbbs/docs/FAQ | 18 | ||||
| -rw-r--r-- | pttbbs/docs/INSTALL | 4 | ||||
| -rw-r--r-- | pttbbs/include/cmsys.h | 2 | ||||
| -rw-r--r-- | pttbbs/sample/pttbbs.conf | 2 |
7 files changed, 15 insertions, 23 deletions
diff --git a/pttbbs/common/sys/Makefile b/pttbbs/common/sys/Makefile index 0eb22858..b2dc7995 100644 --- a/pttbbs/common/sys/Makefile +++ b/pttbbs/common/sys/Makefile @@ -4,16 +4,20 @@ SRCROOT= ../.. .include "$(SRCROOT)/pttbbs.mk" SRCS:= daemon.c file.c lock.c log.c net.c sort.c string.c time.c \ - crypt.c record.c vector.c telnet.c vbuf.c vtkbd.c utf8.c big5.c + crypt.c record.c vector.c telnet.c vbuf.c vtkbd.c + +.if $(WANTS_CONVERT) != "NO" +SRCS+= utf8.c big5.c +.endif LIB:= cmsys all: .depend -big5.c: big5data.zip big5_gen.py - unzip big5data.zip +big5.c: big5data.tar.bz2 big5_gen.py + tar zxf big5data.tar.bz2 ./big5_gen.py > big5.c - rm -f *.big5.txt + tar ztf big5data.tar.bz2 | xargs rm install: diff --git a/pttbbs/common/sys/big5data.tar.bz2 b/pttbbs/common/sys/big5data.tar.bz2 Binary files differnew file mode 100644 index 00000000..f0d6a427 --- /dev/null +++ b/pttbbs/common/sys/big5data.tar.bz2 diff --git a/pttbbs/common/sys/big5data.zip b/pttbbs/common/sys/big5data.zip Binary files differdeleted file mode 100644 index a885a780..00000000 --- a/pttbbs/common/sys/big5data.zip +++ /dev/null diff --git a/pttbbs/docs/FAQ b/pttbbs/docs/FAQ index a045c9b2..d0ef37ac 100644 --- a/pttbbs/docs/FAQ +++ b/pttbbs/docs/FAQ @@ -9,8 +9,7 @@ $Id$ 6. sendmail.cf要改的地方(參考用) (by DavidYu) 7. /usr/libexec/elf/ld: cannot find -liconv 或 iconv.h: No such file or directory - 8. /usr/libexec/elf/ld: cannot find -lhz - 9. 如何讓用 ssh方式進 bbs不用密碼 + 8. 如何讓用 ssh方式進 bbs不用密碼 ------------------------------------------------------------------------------ 1.PttBBS的討論區，以及如何寄送修改給官方 @@ -147,20 +146,7 @@ Mbbsmail, P=/home/bbs/bin/bbsmail, F=lsSDFMhPu, U=bbs, S=10,R=20/40, 刪除 ------------------------------------------------------------------------------ -8./usr/libexec/elf/ld: cannot find -lhz -Ptt 支援繁體中文轉簡體中文與 UTF-8 的功能 -若您開啟了這個選項 (#define CONVERT) -請安裝 autoconvert - (/usr/ports/chinese/autoconvert in FreeBSD - package libhz0 in Debian/Linux ) - -若不想開啟此選項 請修改 pttbbs.mk (line 10) - PTT_LIBS= -lcrypt -lhz -改成: - PTT_LIBS= -lcrypt - ------------------------------------------------------------------------------- - 9. 如何讓用 ssh方式進 bbs不用密碼 + 8. 如何讓用 ssh方式進 bbs不用密碼 先在 /etc/ssh/sshd_config 中把 #PermitEmptyPasswords no 改成 diff --git a/pttbbs/docs/INSTALL b/pttbbs/docs/INSTALL index 2d4bbc32..14842843 100644 --- a/pttbbs/docs/INSTALL +++ b/pttbbs/docs/INSTALL @@ -48,10 +48,10 @@ $Id$ * 如果您是用 Linux系統, 請先安裝 pmake, 然後將 make alias 成 pmake * * 如果您是用 MacOSX 系統, 請先由 ports 安裝 bmake, 然後將 make alias 成 pmake * - 11.在編譯 pttbbs 之前, 您需要先裝好 libiconv, libhz, pgp + 11.在編譯 pttbbs 之前, 您需要先裝好 libiconv, zip, pgp 如果您使用的是 FreeBSD, 可以直接透過 ports安裝: cd /usr/ports/converters/libiconv; make install - cd /usr/ports/chinese/autoconvert; make install + cd /usr/ports/archivers/autoconvert; make install cd /usr/ports/security/pgp; make install 12. (在 ~bbs/pttbbs 下) 執行 make BBSHOME=/home/bbs all install 13.如果是新架起來的站, 請執行 cd sample; make install diff --git a/pttbbs/include/cmsys.h b/pttbbs/include/cmsys.h index 313dfab0..81783c62 100644 --- a/pttbbs/include/cmsys.h +++ b/pttbbs/include/cmsys.h @@ -294,6 +294,7 @@ extern void telnet_ctx_set_ttype_arg (TelnetCtx *ctx, void *arg); extern ssize_t telnet_process (TelnetCtx *ctx, unsigned char *buf, ssize_t size); +#ifdef CONVERT /* utf8.c */ extern int ucs2utf(uint16_t ucs2, uint8_t *utf8); extern int utf2ucs(uint8_t *utf8, uint16_t *pucs); @@ -302,5 +303,6 @@ extern int utf2ucs(uint8_t *utf8, uint16_t *pucs); extern const uint16_t const b2u_table[]; extern const uint16_t const u2b_table[]; extern const uint8_t const b2u_ambiguous_width[]; +#endif #endif diff --git a/pttbbs/sample/pttbbs.conf b/pttbbs/sample/pttbbs.conf index f34f699d..c6776484 100644 --- a/pttbbs/sample/pttbbs.conf +++ b/pttbbs/sample/pttbbs.conf @@ -166,7 +166,7 @@ 須要加跑 shmctl timed 來提供時間 */ //#define OUTTA_TIMER -/* 若定義, 則開啟正體中文轉 簡體中文/UTF-8 的功能 */ +/* 若定義, 則開啟 Big5 轉 UTF-8 的功能 */ //#define CONVERT /* 若定義, 則在文章列表的時候不同日期會標上不同顏色 */ |