From 1c0fceebcd8db66fa1ee52d811a64e5a73d025ed Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 2 Jan 2006 16:17:09 +0000 Subject: DragonFly support. Add mkfontdir as build tool. --- comms/xtel/Makefile | 3 ++- comms/xtel/distinfo | 10 +++++----- comms/xtel/patches/patch-ab | 14 +++++++------- comms/xtel/patches/patch-ac | 20 +++++++++++--------- comms/xtel/patches/patch-ad | 20 +++++++++++--------- comms/xtel/patches/patch-ae | 21 ++++++++++----------- 6 files changed, 46 insertions(+), 42 deletions(-) (limited to 'comms') diff --git a/comms/xtel/Makefile b/comms/xtel/Makefile index 75497764be4..509c2d93d94 100644 --- a/comms/xtel/Makefile +++ b/comms/xtel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:08 tv Exp $ +# $NetBSD: Makefile,v 1.9 2006/01/02 16:17:09 joerg Exp $ # DISTNAME= xtel-3.3.0 @@ -11,6 +11,7 @@ HOMEPAGE= http://pficheux.free.fr/xtel/ COMMENT= Minitel(r) emulator USE_IMAKE= YES +USE_TOOLS+= mkfontdir .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" diff --git a/comms/xtel/distinfo b/comms/xtel/distinfo index 5043fe689df..b4f0d400423 100644 --- a/comms/xtel/distinfo +++ b/comms/xtel/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 16:05:31 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/01/02 16:17:09 joerg Exp $ SHA1 (xtel-3.3.0.tar.gz) = 7ee5a5afa20bea46e08c346605c53cdd32d69dc9 RMD160 (xtel-3.3.0.tar.gz) = 0ba51e9129b24db33ac96cff23ffc88d3f13b653 Size (xtel-3.3.0.tar.gz) = 309426 bytes SHA1 (patch-aa) = 648ff6a6a1bffd836a28abed1f0da5e781d61d53 -SHA1 (patch-ab) = 28e8c26a36de294e3982a4f4edac53e4780ec2fe -SHA1 (patch-ac) = 24f9725a2636f3719ec53f14c490af47e834b4fa -SHA1 (patch-ad) = 59a8a6e2da9ecc4c954853f8d2edc47723408a4d -SHA1 (patch-ae) = 9532510a0f93b23ad85b84932c53e8644a6dd36a +SHA1 (patch-ab) = 754e2e2cf0931f83d18c737086006e079e6f668d +SHA1 (patch-ac) = 696f513b24a3b4a36e1f49f7fc72a20f1efd57cb +SHA1 (patch-ad) = 95cd5a8c3e421d711f9fd0ad502aa33e92273e0f +SHA1 (patch-ae) = ece76180605a5310044ff06506fd298f3dde3234 SHA1 (patch-af) = c52f5b39da50c350ac3ce929b3f77eafdce4942c SHA1 (patch-ag) = 6addd47ca368ed78011162b0b843124329909fc1 diff --git a/comms/xtel/patches/patch-ab b/comms/xtel/patches/patch-ab index 628ce8a1be8..39e87264b46 100644 --- a/comms/xtel/patches/patch-ab +++ b/comms/xtel/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/01/12 18:34:56 bouyer Exp $ +$NetBSD: patch-ab,v 1.2 2006/01/02 16:17:09 joerg Exp $ ---- Imakefile.orig Mon Feb 12 17:33:01 2001 -+++ Imakefile Sat Jan 12 18:28:55 2002 -@@ -26,7 +26,7 @@ +--- Imakefile.orig 2001-02-12 16:33:01.000000000 +0000 ++++ Imakefile +@@ -26,7 +26,7 @@ NETWORKCFLAGS = -DNO_NETWORK #ifdef NO_TERMIO TERMIOCFLAGS = -DNO_TERMIO #else -#if defined(USE_TERMIOS) || defined(__FreeBSD__) -+#if defined(USE_TERMIOS) || defined(__FreeBSD__) || defined (NetBSDArchitecture) ++#if defined(USE_TERMIOS) || defined(__FreeBSD__) || defined (NetBSDArchitecture) || defined(DragonFlyArchitecture) TERMIOCFLAGS = -DUSE_TERMIOS #endif #endif -@@ -71,7 +71,7 @@ +@@ -71,7 +71,7 @@ SYSLOGCFLAGS= -DUSE_SYSLOG #ifdef NO_TVR TVRCFLAGS= -DNO_TVR #else @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/01/12 18:34:56 bouyer Exp $ #endif #ifdef WINDAUBE -@@ -103,7 +103,7 @@ +@@ -103,7 +103,7 @@ CONF_DEFINES = '-DFICHIER_DEFINITION_LI TELE_DEFINES = '-DXTERM_PATH="$(BINDIR)/xterm"' diff --git a/comms/xtel/patches/patch-ac b/comms/xtel/patches/patch-ac index 16d8d6bf850..1ea9327d773 100644 --- a/comms/xtel/patches/patch-ac +++ b/comms/xtel/patches/patch-ac @@ -1,15 +1,17 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/01/12 18:34:56 bouyer Exp $ +$NetBSD: patch-ac,v 1.2 2006/01/02 16:17:09 joerg Exp $ ---- global.h.orig Sat Jan 12 17:55:27 2002 -+++ global.h Sat Jan 12 17:55:44 2002 -@@ -204,8 +204,10 @@ +--- global.h.orig 2001-02-10 23:58:59.000000000 +0000 ++++ global.h +@@ -203,11 +203,9 @@ char *build_name(); + /* * Variables */ - #ifndef __FreeBSD__ -+#ifndef __NetBSD__ - #ifndef __GLIBC__ +-#ifndef __FreeBSD__ +-#ifndef __GLIBC__ ++#if !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__NetBSD__) && !defined(__GLIBC__) extern char *sys_errlist[]; -+#endif - #endif #endif +-#endif + /* xtel.c */ + #ifdef NO_NETWORK diff --git a/comms/xtel/patches/patch-ad b/comms/xtel/patches/patch-ad index 8a72c331f7c..26419536879 100644 --- a/comms/xtel/patches/patch-ad +++ b/comms/xtel/patches/patch-ad @@ -1,15 +1,17 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/01/12 18:34:56 bouyer Exp $ +$NetBSD: patch-ad,v 1.2 2006/01/02 16:17:09 joerg Exp $ ---- globald.h.orig Sat Jan 12 17:56:25 2002 -+++ globald.h Sat Jan 12 17:56:50 2002 -@@ -34,8 +34,10 @@ +--- globald.h.orig 1999-04-09 08:07:59.000000000 +0000 ++++ globald.h +@@ -33,11 +33,9 @@ typedef char Boolean; + /* * Variables */ - #ifndef __FreeBSD__ -+#ifndef __NetBSD__ - #ifndef __GLIBC__ +-#ifndef __FreeBSD__ +-#ifndef __GLIBC__ ++#if !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__NetBSD__) && !defined(__GLIBC__) extern char *sys_errlist[]; -+#endif - #endif #endif +-#endif + EXTERN struct definition_ligne definition_lignes[MAX_LIGNES]; + EXTERN struct definition_service definition_services[MAX_SERVICES]; diff --git a/comms/xtel/patches/patch-ae b/comms/xtel/patches/patch-ae index 2de56a70524..a65a240cbfe 100644 --- a/comms/xtel/patches/patch-ae +++ b/comms/xtel/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/01/12 18:34:56 bouyer Exp $ +$NetBSD: patch-ae,v 1.2 2006/01/02 16:17:09 joerg Exp $ ---- mdmdetect.c.orig Sat Jan 12 17:57:18 2002 -+++ mdmdetect.c Sat Jan 12 17:59:39 2002 -@@ -37,7 +37,11 @@ +--- mdmdetect.c.orig 2001-02-11 00:02:58.000000000 +0000 ++++ mdmdetect.c +@@ -37,18 +37,20 @@ static char rcsid[] = "$Id: mdmdetect.c, #include #include #include @@ -14,20 +14,19 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/01/12 18:34:56 bouyer Exp $ #ifdef SVR4 #include #endif /* SVR4 */ -@@ -45,10 +49,12 @@ + #define TIMEOUT_READ 5 - #ifndef __FreeBSD__ -+#ifndef __NetBSD__ - #ifndef __GLIBC__ +-#ifndef __FreeBSD__ +-#ifndef __GLIBC__ ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__GLIBC__) extern char *sys_errlist[]; #endif - #endif -+#endif +-#endif extern char *xtel_basename (), *next_token (); static int fdl; -@@ -290,7 +296,11 @@ +@@ -290,7 +292,11 @@ char **av; check_and_lock (cp); sprintf (buf, "/dev/%s", cp); -- cgit v1.2.3