From 4bce42ca2984236cbd2168dccb194881245dec8c Mon Sep 17 00:00:00 2001 From: rtr Date: Mon, 21 Mar 2005 01:26:02 +0000 Subject: [PATCH] + build and install the libxtt.a module + remove obsolete xtt modules --- x11/Xserver/Xfont/Makefile | 4 ++-- x11/Xserver/Xfont/xtt/ARABIC/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ARMSCII8/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/BIG5/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/BIG5HKSCS/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/DOSENCODING/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/GB2312/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/GBK/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/GEORGIAN/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_1/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_10/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_11/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_14/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_15/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_2/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_3/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_4/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_5/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_6/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_7/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_8/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/ISO8859_9/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/JISX0201/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/JISX0208/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/JISX0212/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/KOI8/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/KSC5601/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/KSCJOHAB/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/MULEENCODING/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/Makefile | 21 ++++++--------------- x11/Xserver/Xfont/xtt/Makefile.xtt | 21 --------------------- x11/Xserver/Xfont/xtt/TCVN/Makefile | 15 --------------- x11/Xserver/Xfont/xtt/VISCII/Makefile | 15 --------------- 33 files changed, 8 insertions(+), 488 deletions(-) delete mode 100644 x11/Xserver/Xfont/xtt/ARABIC/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ARMSCII8/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/BIG5/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/BIG5HKSCS/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/DOSENCODING/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/GB2312/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/GBK/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/GEORGIAN/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_1/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_10/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_11/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_14/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_15/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_2/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_3/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_4/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_5/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_6/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_7/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_8/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/ISO8859_9/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/JISX0201/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/JISX0208/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/JISX0212/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/KOI8/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/KSC5601/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/KSCJOHAB/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/MULEENCODING/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/Makefile.xtt delete mode 100644 x11/Xserver/Xfont/xtt/TCVN/Makefile delete mode 100644 x11/Xserver/Xfont/xtt/VISCII/Makefile diff --git a/x11/Xserver/Xfont/Makefile b/x11/Xserver/Xfont/Makefile index 3cfb452f7a28..60d1e286478c 100644 --- a/x11/Xserver/Xfont/Makefile +++ b/x11/Xserver/Xfont/Makefile @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.5 2005/03/19 21:41:58 christos Exp $ +# $NetBSD: Makefile,v 1.6 2005/03/21 01:26:02 rtr Exp $ -SUBDIR=bitmap freetype type1 speedo +SUBDIR=bitmap freetype type1 speedo xtt .include diff --git a/x11/Xserver/Xfont/xtt/ARABIC/Makefile b/x11/Xserver/Xfont/xtt/ARABIC/Makefile deleted file mode 100644 index 117bc7144786..000000000000 --- a/x11/Xserver/Xfont/xtt/ARABIC/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ARABIC - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ARABIC -SRCS= main.c MULEARABICtoUCS2.c CP1256toUCS2.c XATERMtoUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ARMSCII8/Makefile b/x11/Xserver/Xfont/xtt/ARMSCII8/Makefile deleted file mode 100644 index 07b89ca9183e..000000000000 --- a/x11/Xserver/Xfont/xtt/ARMSCII8/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ARMSCII8 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ARMSCII8 -SRCS= main.c ARMSCII8toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/BIG5/Makefile b/x11/Xserver/Xfont/xtt/BIG5/Makefile deleted file mode 100644 index 8541f4c06dff..000000000000 --- a/x11/Xserver/Xfont/xtt/BIG5/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= BIG5 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/BIG5 -SRCS= main.c BIG5toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/BIG5HKSCS/Makefile b/x11/Xserver/Xfont/xtt/BIG5HKSCS/Makefile deleted file mode 100644 index 2d9301efaf6d..000000000000 --- a/x11/Xserver/Xfont/xtt/BIG5HKSCS/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= BIG5HKSCS - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/BIG5HKSCS -SRCS= main.c BIG5HKSCStoUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/DOSENCODING/Makefile b/x11/Xserver/Xfont/xtt/DOSENCODING/Makefile deleted file mode 100644 index c40128794640..000000000000 --- a/x11/Xserver/Xfont/xtt/DOSENCODING/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= DOSENCODING - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/DOSENCODING -SRCS= main.c DOSENCODINGtoUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/GB2312/Makefile b/x11/Xserver/Xfont/xtt/GB2312/Makefile deleted file mode 100644 index 34674d00b4cc..000000000000 --- a/x11/Xserver/Xfont/xtt/GB2312/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= GB2312 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/GB2312 -SRCS= main.c GB2312toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/GBK/Makefile b/x11/Xserver/Xfont/xtt/GBK/Makefile deleted file mode 100644 index b8e165aac22b..000000000000 --- a/x11/Xserver/Xfont/xtt/GBK/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= GBK - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/GBK -SRCS= main.c GBKtoUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/GEORGIAN/Makefile b/x11/Xserver/Xfont/xtt/GEORGIAN/Makefile deleted file mode 100644 index 8cc01b1db10c..000000000000 --- a/x11/Xserver/Xfont/xtt/GEORGIAN/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= GEORGIAN - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/GEORGIAN -SRCS= main.c GEORGIANtoUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_1/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_1/Makefile deleted file mode 100644 index 2e5ca30025d3..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_1/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_1 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.1 -SRCS= main.c ISO8859_1toAROMAN.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_10/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_10/Makefile deleted file mode 100644 index f063b7b86514..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_10/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_10 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.10 -SRCS= main.c ISO8859_10toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_11/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_11/Makefile deleted file mode 100644 index ddc24a59f26e..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_11/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_11 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.11 -SRCS= main.c ISO8859_11toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_14/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_14/Makefile deleted file mode 100644 index 42aa378de4e5..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_14/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_14 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.14 -SRCS= main.c ISO8859_14toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_15/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_15/Makefile deleted file mode 100644 index 43e0a9069df3..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_15/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_15 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.15 -SRCS= main.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_2/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_2/Makefile deleted file mode 100644 index fe9bb8ba31aa..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_2/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_2 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.2 -SRCS= main.c ISO8859_2toUCS2.c ISO8859_2toACNTRO.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_3/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_3/Makefile deleted file mode 100644 index 4cc6bfb4472c..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_3/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_3 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.3 -SRCS= main.c ISO8859_3toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_4/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_4/Makefile deleted file mode 100644 index 6928c6794ec2..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_4/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_4 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.4 -SRCS= main.c ISO8859_4toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_5/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_5/Makefile deleted file mode 100644 index d493b3b8b552..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_5/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_5 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.5 -SRCS= main.c ISO8859_5toUCS2.c ISO8859_5toACYRIL.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_6/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_6/Makefile deleted file mode 100644 index 64a6b968edba..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_6/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_6 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.6 -SRCS= main.c ISO8859_6toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_7/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_7/Makefile deleted file mode 100644 index f620484ca3c0..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_7/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_7 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.7 -SRCS= main.c ISO8859_7toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_8/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_8/Makefile deleted file mode 100644 index 7a5296bd83ef..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_8/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_8 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.8 -SRCS= main.c ISO8859_8toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/ISO8859_9/Makefile b/x11/Xserver/Xfont/xtt/ISO8859_9/Makefile deleted file mode 100644 index 7b8c896743b3..000000000000 --- a/x11/Xserver/Xfont/xtt/ISO8859_9/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= ISO8859_9 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/ISO8859.9 -SRCS= main.c ISO8859_9toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/JISX0201/Makefile b/x11/Xserver/Xfont/xtt/JISX0201/Makefile deleted file mode 100644 index 9b944e1d7c54..000000000000 --- a/x11/Xserver/Xfont/xtt/JISX0201/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= JISX0201 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/JISX0201 -SRCS= main.c JISX0201toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/JISX0208/Makefile b/x11/Xserver/Xfont/xtt/JISX0208/Makefile deleted file mode 100644 index f45d032a0626..000000000000 --- a/x11/Xserver/Xfont/xtt/JISX0208/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= JISX0208 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/JISX0208 -SRCS= main.c JISX0208toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/JISX0212/Makefile b/x11/Xserver/Xfont/xtt/JISX0212/Makefile deleted file mode 100644 index 6f058a23839e..000000000000 --- a/x11/Xserver/Xfont/xtt/JISX0212/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:09 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= JISX0212 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/JISX0212 -SRCS= main.c JISX0212toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/KOI8/Makefile b/x11/Xserver/Xfont/xtt/KOI8/Makefile deleted file mode 100644 index af8a630af2eb..000000000000 --- a/x11/Xserver/Xfont/xtt/KOI8/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:10 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= KOI8 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/KOI8 -SRCS= main.c KOI8_RtoUCS2.c KOI8_UNItoUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/KSC5601/Makefile b/x11/Xserver/Xfont/xtt/KSC5601/Makefile deleted file mode 100644 index 807d8ac1b6ee..000000000000 --- a/x11/Xserver/Xfont/xtt/KSC5601/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:10 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= KSC5601 - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/KSC5601 -SRCS= main.c KSC5601toUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/KSCJOHAB/Makefile b/x11/Xserver/Xfont/xtt/KSCJOHAB/Makefile deleted file mode 100644 index f3eefed63d6c..000000000000 --- a/x11/Xserver/Xfont/xtt/KSCJOHAB/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:10 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= KSCJOHAB - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/KSCJOHAB -SRCS= main.c KSCJOHABtoUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/MULEENCODING/Makefile b/x11/Xserver/Xfont/xtt/MULEENCODING/Makefile deleted file mode 100644 index 07bf1d16d389..000000000000 --- a/x11/Xserver/Xfont/xtt/MULEENCODING/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:10 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= MULEENCODING - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/MULEENCODING -SRCS= main.c MULELAOtoUCS2.c ASCIILAOtoUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/Makefile b/x11/Xserver/Xfont/xtt/Makefile index 1be2111d8843..a03ce589b765 100644 --- a/x11/Xserver/Xfont/xtt/Makefile +++ b/x11/Xserver/Xfont/xtt/Makefile @@ -1,18 +1,17 @@ -# $NetBSD: Makefile,v 1.4 2004/03/16 17:40:54 matt Exp $ +# $NetBSD: Makefile,v 1.5 2005/03/21 01:26:02 rtr Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules/fonts .include "../../Makefile.serverlib" LIB= xtt -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType -.PATH: ${X11SRCDIR.xc}/extras/FreeType/lib/arch/unix -.PATH: ${X11SRCDIR.xc}/extras/FreeType/lib/extend -.PATH: ${X11SRCDIR.xc}/lib/font/X-TrueType/module # XXX we are building module only version -SRCS= xttprop.c xttfuncs.c xttcconv.c xttcap.c xttmisc.c xttblit.c \ - freetype.c ftxcmap.c ftxsbit.c xttmodule.c +.PATH: ${X11SRCDIR.xc}/lib/font/FreeType +SRCS= xttcap.c + +.PATH: ${X11SRCDIR.xc}/lib/font/FreeType/module +SRCS+= xttmodule.c CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts/codeconv \ -I${X11SRCDIR.xc}/lib/font/X-TrueType \ @@ -43,11 +42,3 @@ libinstall:: .endif .include - -SUBDIR= ARABIC BIG5HKSCS GBK ISO8859_10 ISO8859_15 ISO8859_4 ISO8859_7 \ - JISX0201 KOI8 MULEENCODING VISCII ARMSCII8 DOSENCODING GEORGIAN \ - ISO8859_11 ISO8859_2 ISO8859_5 ISO8859_8 JISX0208 KSC5601 BIG5 \ - GB2312 ISO8859_1 ISO8859_14 ISO8859_3 ISO8859_6 ISO8859_9 \ - JISX0212 KSCJOHAB TCVN - -.include diff --git a/x11/Xserver/Xfont/xtt/Makefile.xtt b/x11/Xserver/Xfont/xtt/Makefile.xtt deleted file mode 100644 index 3e1bfe9d9fef..000000000000 --- a/x11/Xserver/Xfont/xtt/Makefile.xtt +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: Makefile.xtt,v 1.2 2004/03/16 17:40:54 matt Exp $ - -CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts/codeconv \ - -I${X11SRCDIR.xc}/extras/FreeType/lib \ - -I${X11SRCDIR.xc}/extras/FreeType/lib/extend \ - -I${X11SRCDIR.xc}/programs/Xserver/include \ - -I${X11SRCDIR.xc}/lib/font/include \ - -I${X11SRCDIR.xc}/include \ - -I${XSERVERINCDIR} - -.include - -.if !empty(X11FLAGS.LOADABLE) -CPPFLAGS+= -DFONTMODULE -DMODNAME=${LIB} -LIBDIR= ${XMODULEDIR} -.else -libinstall:: -.endif - -.include - diff --git a/x11/Xserver/Xfont/xtt/TCVN/Makefile b/x11/Xserver/Xfont/xtt/TCVN/Makefile deleted file mode 100644 index d1402a113d76..000000000000 --- a/x11/Xserver/Xfont/xtt/TCVN/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:10 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= TCVN - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/TCVN -SRCS= main.c TCVNtoUCS2.c - -.include "../Makefile.xtt" - diff --git a/x11/Xserver/Xfont/xtt/VISCII/Makefile b/x11/Xserver/Xfont/xtt/VISCII/Makefile deleted file mode 100644 index d8a801fc5ca7..000000000000 --- a/x11/Xserver/Xfont/xtt/VISCII/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2004/03/03 08:38:10 rtr Exp $ - -XMODULEDIR= ${X11USRLIBDIR}/modules/codeconv - -.include "../../../Makefile.serverlib" - -.include - -LIB= VISCII - -.PATH: ${X11SRCDIR.xc}/extras/X-TrueType/VISCII -SRCS= main.c VISCIItoUCS2.c - -.include "../Makefile.xtt" -