aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornork <nork@FreeBSD.org>2004-12-24 11:11:00 +0800
committernork <nork@FreeBSD.org>2004-12-24 11:11:00 +0800
commit350b6cb0f2069478f5acc8a5df536dd727445264 (patch)
treec9317fcc383b1671d864fd1d8c7f4e702d148df6
parentbd7a7dcff45d3fc2d64a8034c62ac764b892aceb (diff)
downloadfreebsd-ports-gnome-350b6cb0f2069478f5acc8a5df536dd727445264.tar.gz
freebsd-ports-gnome-350b6cb0f2069478f5acc8a5df536dd727445264.tar.zst
freebsd-ports-gnome-350b6cb0f2069478f5acc8a5df536dd727445264.zip
o Fix open /dev/vga problem on 5.x. [1]
o Fix build on 6-current. o Bump PORTREVISION, accordingly. PR: ports/74881 [1] Submitted by: Yoshiaki Kasahara <kasahara@nc.kyushu-u.ac.jp> [1]
-rw-r--r--japanese/kon2-16dot/Makefile5
-rw-r--r--japanese/kon2-16dot/files/patch-af4
-rw-r--r--japanese/kon2-16dot/files/patch-font::Makefile.FreeBSD10
3 files changed, 16 insertions, 3 deletions
diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile
index 311c4f7db30d..6bbad6cede92 100644
--- a/japanese/kon2-16dot/Makefile
+++ b/japanese/kon2-16dot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kon2
PORTVERSION= 0.3
-PORTREVISION= 2
+PORTREVISION= 3
PKGNAMESUFFIX= -${KONFONT}
CATEGORIES+= japanese # '+=' is for slave ports
# note kon is only in first directory and fonts are only in second directory
@@ -42,6 +42,9 @@ KON14FONT=Startup
@${FALSE}
.endif
+post-extract:
+ @${CP} ${WRKSRC}/doc/kon.1 ${WRKSRC}/src/
+
pre-build:
${SED} -e 's,%%PREFIX%%,${PREFIX},' \
-e 's,%%DISTDIR%%,${DISTDIR},' \
diff --git a/japanese/kon2-16dot/files/patch-af b/japanese/kon2-16dot/files/patch-af
index a30e4c993641..c115d016f6ba 100644
--- a/japanese/kon2-16dot/files/patch-af
+++ b/japanese/kon2-16dot/files/patch-af
@@ -35,7 +35,7 @@
PerrorExit("/dev/console");
}
#elif defined(__FreeBSD__)
-+#if __FreeBSD_version >= 510100
++#if __FreeBSD_version >= 501100
+ cfd = open("/dev/ttyv0", O_WRONLY);
+ if (cfd < 0 && (cfd = open("/dev/ttyv0", O_RDONLY)) < 0) {
+ PerrorExit("/dev/ttyv0");
@@ -54,7 +54,7 @@
if (cfd < 0 && (cfd = open("/dev/console", O_RDONLY)) < 0)
fatal("can't open /dev/console");
#elif defined(__FreeBSD__)
-+#if __FreeBSD_version >= 510100
++#if __FreeBSD_version >= 501100
+ cfd = open("/dev/ttyv0", O_WRONLY);
+ if (cfd < 0 && (cfd = open("/dev/ttyv0", O_RDONLY)) < 0)
+ fatal("can't open /dev/ttyv0");
diff --git a/japanese/kon2-16dot/files/patch-font::Makefile.FreeBSD b/japanese/kon2-16dot/files/patch-font::Makefile.FreeBSD
new file mode 100644
index 000000000000..338d62c6dfac
--- /dev/null
+++ b/japanese/kon2-16dot/files/patch-font::Makefile.FreeBSD
@@ -0,0 +1,10 @@
+--- font/Makefile.FreeBSD.orig Sat Jan 25 19:08:44 1997
++++ font/Makefile.FreeBSD Fri Dec 24 11:46:26 2004
+@@ -11,6 +11,7 @@
+ .endif
+
+ PROG= fld
++NO_MAN= yes
+
+ .if exists(${.OBJDIR}/../lib)
+ LIBOBJ= -L${.OBJDIR}/../lib