This update has these changes:
o Maintainer (with the previous maintainer's approval) o beep patch (Thanks to nabe@mobile.icc.titech.ac.jp!) o selectable Kon font size at make time. o modification for non-default PREFIX PR: ports/7878 Submitted by: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
This commit is contained in:
Jun Kuriyama
parent
8234e315bd
commit
6c225cc395
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=13400
@ -3,7 +3,7 @@
|
||||
# Date created: 11 Apr 1997
|
||||
# Whom: Makoto Matsushita <matusita@jp.freebsd.org>
|
||||
#
|
||||
# $Id: Makefile,v 1.13 1997/09/19 19:27:45 max Exp $
|
||||
# $Id: Makefile,v 1.14 1998/05/24 03:09:02 steve Exp $
|
||||
#
|
||||
|
||||
DISTNAME= kon2-0.3
|
||||
@ -11,10 +11,13 @@ PKGNAME= ja-kon2-0.3
|
||||
CATEGORIES= japanese
|
||||
# note kon is only in first directory and fonts are only in second directory
|
||||
MASTER_SITES= ftp://ftp.tut.ac.jp/Linux/Packages/Utils/ \
|
||||
ftp://ftp.iij.ad.jp/pub/X/XFree86/XFree86/3.3.1/untarred/xc/fonts/bdf/misc/
|
||||
DISTFILES= kon2-0.3.tar.gz k14.bdf 7x14rk.bdf
|
||||
ftp://ftp.xfree86.org/pub/X/XFree86/XFree86/3.3.2/untarred/xc/fonts/bdf/misc/ \
|
||||
ftp://ftp.iij.ad.jp/pub/X/XFree86/XFree86/3.3.2/untarred/xc/fonts/bdf/misc/
|
||||
DISTFILES= kon2-0.3.tar.gz \
|
||||
k14.bdf 7x14rk.bdf \
|
||||
jiskan16.bdf 8x16rk.bdf
|
||||
|
||||
MAINTAINER= hideyuki@sat.t.u-tokyo.ac.jp
|
||||
MAINTAINER= shige@kuis.kyoto-u.ac.jp
|
||||
|
||||
MAN1= kon.1
|
||||
MANLANG= ja
|
||||
@ -22,11 +25,32 @@ EXTRACT_ONLY= kon2-0.3.tar.gz
|
||||
|
||||
DOCDIR= ${PREFIX}/share/doc/kon2
|
||||
|
||||
.if defined(KONFONT)
|
||||
.if (${KONFONT} == "16dot")
|
||||
KON16FONT=Startup
|
||||
.else if (${KONFONT} == "14dot")
|
||||
KON14FONT=Startup
|
||||
.endif
|
||||
.endif
|
||||
|
||||
pre-fetch:
|
||||
.if !defined(KONFONT)
|
||||
@${ECHO_MSG} "NOTE: You can select default kon font size."
|
||||
@${ECHO_MSG} "by adding \"KONFONT=<Font Size>\" to argument of make."
|
||||
@${ECHO_MSG} "<Font Size> must be \"16dot\" or \"14dot\"."
|
||||
@${ECHO_MSG} "KONFONT defalut value is \"16dot\"."
|
||||
KON16FONT=Startup
|
||||
.endif
|
||||
|
||||
pre-build:
|
||||
${SED} -e 's,%%PREFIX%%,${PREFIX},' \
|
||||
-e 's,%%DISTDIR%%,${DISTDIR},' \
|
||||
${FILESDIR}/dotconfig > ${WRKSRC}/.config
|
||||
@(cd ${WRKSRC}; ${MAKE} -f Makefile.FreeBSD config)
|
||||
@for i in kon.cfg.FreeBSD doc/kon.1; do\
|
||||
${MV} -f ${WRKSRC}/$${i} ${WRKSRC}/$${i}.in ;\
|
||||
${SED} -e "s;@@PREFIX@@;${PREFIX};g" -e "s;@@KON16FONT@@;${KON16FONT};g" -e "s;@@KON14FONT@@;${KON14FONT};g" ${WRKSRC}/$${i}.in > ${WRKSRC}/$${i} ;\
|
||||
done
|
||||
|
||||
post-install:
|
||||
@${INSTALL_MAN} ${WRKSRC}/doc/kon.1 ${PREFIX}/man/ja/man1
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
MD5 (kon2-0.3.tar.gz) = 7219222c6654227acbf9b3aef642e9dd
|
||||
MD5 (k14.bdf) = 839c13a92e3fd47a57b004b72755a464
|
||||
MD5 (7x14rk.bdf) = e1c9f9921bbd68038fed2b4d49d8f59e
|
||||
MD5 (jiskan16.bdf) = 717790ce41c8d7a890abf06b4d946b4a
|
||||
MD5 (8x16rk.bdf) = 251f132adabf9539ed4ec2b37eacc207
|
||||
|
||||
@ -4,7 +4,7 @@ TOPDIR = %%PREFIX%%
|
||||
BINDIR = $(TOPDIR)/bin
|
||||
LIBDIR = $(TOPDIR)/etc
|
||||
MANDIR = $(TOPDIR)/man/ja/man1
|
||||
FONTDIR = $(TOPDIR)/lib/fonts
|
||||
FONTDIR = $(TOPDIR)/share/fonts/bdf
|
||||
CONFIG_NAME = kon.cfg
|
||||
CFLAGS += -DCONFIG_NAME=\"$(LIBDIR)/$(CONFIG_NAME)\"
|
||||
|
||||
|
||||
@ -34,3 +34,37 @@
|
||||
ioctl(0, VT_SETMODE, &vtm);
|
||||
vInfo.graph_mode();
|
||||
if (useHardScroll)
|
||||
@@ -830,21 +830,31 @@
|
||||
|
||||
static int ConfigBeep(const char *confstr)
|
||||
{
|
||||
- beepCount = atoi(confstr) * 10000;
|
||||
#if defined(linux)
|
||||
+ beepCount = atoi(confstr) * 10000;
|
||||
if (beepCount > 0)
|
||||
ioperm(COUNTER_ADDR, 1, TRUE);
|
||||
#endif
|
||||
+#if defined(__FreeBSD__)
|
||||
+ beepCount = atoi(confstr) * 10;
|
||||
+#endif
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
+#define BELL_PITCH 800
|
||||
+
|
||||
void Beep(void)
|
||||
{
|
||||
- if (!con.active || beepCount <= 0) return;
|
||||
#if defined(linux)
|
||||
+ if (!con.active || beepCount <= 0) return;
|
||||
PortOutb(PortInb(COUNTER_ADDR)|3, COUNTER_ADDR);
|
||||
usleep(beepCount);
|
||||
PortOutb(PortInb(COUNTER_ADDR)&0xFC, COUNTER_ADDR);
|
||||
+#endif
|
||||
+#if defined(__FreeBSD__)
|
||||
+ if(beepCount <= 0) return;
|
||||
+ ioctl(fileno(stdout), KDMKTONE, (BELL_PITCH & 0xffff) |
|
||||
+ ((beepCount & 0xffff) << 16));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@ -15,8 +15,8 @@
|
||||
- install -g wheel -o root -m 0644 -c kon.cfg.FreeBSD /usr/local/etc/kon.cfg
|
||||
+ install -g wheel -o root -m 0644 -c kon.cfg.FreeBSD ${LIBDIR}/kon.cfg
|
||||
+ @sh tools/makedir ${FONTDIR}
|
||||
+ @for i in k14.bdf 7x14rk.bdf; do\
|
||||
+ install -c $(DISTDIR)/$$i ${FONTDIR};\
|
||||
+ @for i in k14.bdf 7x14rk.bdf jiskan16.bdf 8x16rk.bdf; do\
|
||||
+ install -c -m 644 -o bin -g bin $(DISTDIR)/$$i ${FONTDIR};\
|
||||
+ gzip -f -9 ${FONTDIR}/$$i;\
|
||||
+ done
|
||||
|
||||
|
||||
@ -1,5 +1,20 @@
|
||||
--- kon.cfg.FreeBSD.orig Fri Jan 24 02:17:34 1997
|
||||
+++ kon.cfg.FreeBSD Fri Apr 11 08:27:07 1997
|
||||
+++ kon.cfg.FreeBSD Wed Sep 2 22:24:15 1998
|
||||
@@ -115,8 +115,11 @@
|
||||
|
||||
# Startup command definition (usually font loading commands are specified)
|
||||
-bdf-zcat:Startup
|
||||
+bdf-zcat16:@@KON16FONT@@
|
||||
- gzip -cd /usr/local/lib/fonts/k14.bdf.gz | /usr/local/bin/fld -t bdf -n
|
||||
- gzip -cd /usr/local/lib/fonts/7x14rk.bdf.gz | /usr/local/bin/fld -t bdf -n
|
||||
+ gzip -cd @@PREFIX@@/share/fonts/bdf/jiskan16.bdf.gz | /usr/local/bin/fld -t bdf -n
|
||||
+ gzip -cd @@PREFIX@@/share/fonts/bdf/8x16rk.bdf.gz | /usr/local/bin/fld -t bdf -n
|
||||
+bdf-zcat14:@@KON14FONT@@
|
||||
+ gzip -cd @@PREFIX@@/share/fonts/bdf/k14.bdf.gz | /usr/local/bin/fld -t bdf -n
|
||||
+ gzip -cd @@PREFIX@@/share/fonts/bdf/7x14rk.bdf.gz | /usr/local/bin/fld -t bdf -n
|
||||
minix:
|
||||
/usr/bin/fld.minix -n /usr/share/fonts/publicfont.ank
|
||||
/usr/bin/fld.minix -n /usr/share/fonts/publicfont.k14
|
||||
@@ -143,13 +143,13 @@
|
||||
# Mouse type definition. Choose one of: Microsoft,
|
||||
# MouseSystems, BusMouse, MMSeries, Logitech, or None.
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
.if n .ta 2.5i
|
||||
.if t .ta 1.8i
|
||||
-/usr/local/lib/kon.cfg 環境設定ファイル
|
||||
+/usr/local/etc/kon.cfg 環境設定ファイル
|
||||
+@@PREFIX@@/etc/kon.cfg 環境設定ファイル
|
||||
.br
|
||||
-/usr/lib/font/* フォントファイル
|
||||
+/usr/local/lib/fonts/* フォントファイル
|
||||
+@@PREFIX@@/share/fonts/bdf/* フォントファイル
|
||||
.SH 【関連項目】
|
||||
swkon(1), fld(1)
|
||||
.SH 【注意事項】
|
||||
|
||||
8
japanese/kon2-16dot/files/patch-ai
Normal file
8
japanese/kon2-16dot/files/patch-ai
Normal file
@ -0,0 +1,8 @@
|
||||
--- doc/CHANGES.orig Fri Jan 23 01:41:23 1998
|
||||
+++ doc/CHANGES Fri Jan 23 01:40:52 1998
|
||||
@@ -128,3 +128,5 @@
|
||||
FreeBSD での kon.cfg, kon のインストール時のパーミッション修正
|
||||
KON2 0.3(97/2/06) manabe@dsl.ics.tut.ac.jp
|
||||
FreeBSD 版 kon.cfg での VGA レジスタ値を Linux でも利用
|
||||
+KON2 0.3(98/1/23) s-nabe@cs.titech.ac.jp
|
||||
+ FreeBSD でのビープがなるようにした
|
||||
5
japanese/kon2-16dot/files/patch-aj
Normal file
5
japanese/kon2-16dot/files/patch-aj
Normal file
@ -0,0 +1,5 @@
|
||||
--- include/version.h.orig Fri Jan 23 01:41:39 1998
|
||||
+++ include/version.h Fri Jan 23 01:36:12 1998
|
||||
@@ -1 +1 @@
|
||||
-#define VERSION "ver.0.3 (01/28)"
|
||||
+#define VERSION "ver.0.3 (1998/01/23)"
|
||||
@ -1,7 +1,11 @@
|
||||
bin/fld
|
||||
bin/kon
|
||||
etc/kon.cfg
|
||||
lib/fonts/7x14rk.bdf.gz
|
||||
lib/fonts/k14.bdf.gz
|
||||
share/fonts/bdf/7x14rk.bdf.gz
|
||||
share/fonts/bdf/k14.bdf.gz
|
||||
share/fonts/bdf/8x16rk.bdf.gz
|
||||
share/fonts/bdf/jiskan16.bdf.gz
|
||||
share/doc/kon2/README
|
||||
share/doc/kon2/README.FreeBSD
|
||||
@dirrm share/doc/kon2
|
||||
@dirrm share/fonts/bdf
|
||||
|
||||
Loading…
Reference in New Issue
Block a user