From 02240c5375cda17e8473225ba4fd284b26a4260c Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Sat, 31 Jan 2004 16:47:25 +0000
Subject: Simplify XFree86-fontserver doing the following changes:

	o Move manual pages from PLIST.${OPSYS} to PLIST
	o Use IMAKE_* vars for the manual pages.

While here, don't install the html manpage.
---
 fonts/XFree86-fontserver/Makefile       | 5 +++--
 fonts/XFree86-fontserver/PLIST          | 4 ++++
 fonts/XFree86-fontserver/PLIST.FreeBSD  | 2 --
 fonts/XFree86-fontserver/PLIST.NetBSD   | 2 --
 fonts/XFree86-fontserver/PLIST.common   | 4 ----
 fonts/XFree86-fontserver/files/host.def | 4 ++--
 6 files changed, 9 insertions(+), 12 deletions(-)
 create mode 100644 fonts/XFree86-fontserver/PLIST
 delete mode 100644 fonts/XFree86-fontserver/PLIST.FreeBSD
 delete mode 100644 fonts/XFree86-fontserver/PLIST.NetBSD
 delete mode 100644 fonts/XFree86-fontserver/PLIST.common

(limited to 'fonts')

diff --git a/fonts/XFree86-fontserver/Makefile b/fonts/XFree86-fontserver/Makefile
index c3c6464fadd..483d1d29752 100644
--- a/fonts/XFree86-fontserver/Makefile
+++ b/fonts/XFree86-fontserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/29 06:21:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/31 16:47:25 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontserver-${XF_VER}
@@ -11,7 +11,8 @@ MAINTAINER=	xfree86@blef.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	XFree86 font server
 
-USE_BUILDLINK2=		YES
+USE_IMAKE=		yes
+USE_BUILDLINK2=		yes
 DISTINFO_FILE=		${.CURDIR}/../../x11/XFree86-libs/distinfo
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-libs/patches
 
diff --git a/fonts/XFree86-fontserver/PLIST b/fonts/XFree86-fontserver/PLIST
new file mode 100644
index 00000000000..26994bd21f1
--- /dev/null
+++ b/fonts/XFree86-fontserver/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2004/01/31 16:47:25 xtraeme Exp $
+bin/xfs
+lib/X11/fs/config
+${IMAKE_MAN_DIR}/xfs.${IMAKE_MANNEWSUFFIX}
diff --git a/fonts/XFree86-fontserver/PLIST.FreeBSD b/fonts/XFree86-fontserver/PLIST.FreeBSD
deleted file mode 100644
index af3cda63c13..00000000000
--- a/fonts/XFree86-fontserver/PLIST.FreeBSD
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2004/01/24 09:00:36 xtraeme Exp $
-man/man1/xfs.1.gz
diff --git a/fonts/XFree86-fontserver/PLIST.NetBSD b/fonts/XFree86-fontserver/PLIST.NetBSD
deleted file mode 100644
index 48d6fdda6fd..00000000000
--- a/fonts/XFree86-fontserver/PLIST.NetBSD
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2004/01/24 09:00:36 xtraeme Exp $
-man/cat1/xfs.0
diff --git a/fonts/XFree86-fontserver/PLIST.common b/fonts/XFree86-fontserver/PLIST.common
deleted file mode 100644
index 3e157fe6a39..00000000000
--- a/fonts/XFree86-fontserver/PLIST.common
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.1.1.1 2004/01/24 09:00:36 xtraeme Exp $
-bin/xfs
-lib/X11/fs/config
-@dirrm lib/X11/fs
diff --git a/fonts/XFree86-fontserver/files/host.def b/fonts/XFree86-fontserver/files/host.def
index c4547d0b409..c25bf952405 100644
--- a/fonts/XFree86-fontserver/files/host.def
+++ b/fonts/XFree86-fontserver/files/host.def
@@ -1,5 +1,5 @@
 /*
- * $NetBSD: host.def,v 1.1.1.1 2004/01/24 09:00:37 xtraeme Exp $
+ * $NetBSD: host.def,v 1.2 2004/01/31 16:47:25 xtraeme Exp $
  *
  * XFree86 packages for pkgsrc system
  */
@@ -23,7 +23,7 @@
 #define XTrueTypeInstallCConvHeaders NO
 #define SharedLibGLw NO
 #define StandardIncludes -I@BLNK@/include
-#define BuildHtmlManPages YES
+#define BuildHtmlManPages NO
 
 #define BuildServer YES
 #define BuildFontServer YES
-- 
cgit v1.2.3