summaryrefslogtreecommitdiff
path: root/fonts/XFree86-fontserver
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2004-03-28 22:06:15 +0000
committerxtraeme <xtraeme>2004-03-28 22:06:15 +0000
commitfe1a942d69de203821a1cf5e962d3f1383a5ac2d (patch)
tree0a14a167a5e6fa293f4372364539467a1d5018de /fonts/XFree86-fontserver
parent1c7dff731822946d1c16e196ed3d77b7763f9a58 (diff)
downloadpkgsrc-fe1a942d69de203821a1cf5e962d3f1383a5ac2d.tar.gz
Upgrade XFree86 packages to 4.4.0.
To see a full list of changes, please review: http://xfree86.org/4.4.0/RELNOTES.html These packages has been tested under NetBSD 1.6/-current, FreeBSD 4.x/5.x, and GNU/Linux (i386) by Jeremy C. Reed, Michal Pasternak and myself.
Diffstat (limited to 'fonts/XFree86-fontserver')
-rw-r--r--fonts/XFree86-fontserver/Makefile16
-rw-r--r--fonts/XFree86-fontserver/PLIST8
-rw-r--r--fonts/XFree86-fontserver/files/host.def8
3 files changed, 14 insertions, 18 deletions
diff --git a/fonts/XFree86-fontserver/Makefile b/fonts/XFree86-fontserver/Makefile
index 540497b15e3..3517f5ffd98 100644
--- a/fonts/XFree86-fontserver/Makefile
+++ b/fonts/XFree86-fontserver/Makefile
@@ -1,27 +1,25 @@
-# $NetBSD: Makefile,v 1.5 2004/02/02 14:19:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/28 22:06:15 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-fontserver-${XF_VER}
-PKGREVISION= 1
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_XFREE}
-DISTFILES= X430src-1.tgz X430src-2.tgz \
- X430src-3.tgz X430src-4.tgz
+DISTFILES= XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-2.tgz \
+ XFree86-4.4.0-src-3.tgz XFree86-4.4.0-src-4.tgz
MAINTAINER= xfree86@blef.org
HOMEPAGE= http://www.xfree86.org/
COMMENT= XFree86 font server
-USE_IMAKE= yes
-USE_BUILDLINK2= yes
+USE_X11= yes
+USE_BUILDLINK3= yes
DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo
PATCHDIR= ${.CURDIR}/../../x11/XFree86-libs/patches
XBUILD_DIRS= programs/xfs
XINCLUDE_DIRS= lib/xtrans programs/Xserver
-XINSTALL_MAN_DIRS= programs/Xserver programs/xfs
+XINSTALL_MAN_DIRS= programs/xfs
+.include "../../graphics/freetype2/buildlink3.mk"
.include "../../meta-pkgs/XFree86/Makefile.common"
-.include "../../x11/XFree86-libs/buildlink2.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/XFree86-fontserver/PLIST b/fonts/XFree86-fontserver/PLIST
index 5470f5e972a..dc4f1b9182c 100644
--- a/fonts/XFree86-fontserver/PLIST
+++ b/fonts/XFree86-fontserver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/02 14:19:02 xtraeme Exp $
-X11R6/bin/xfs
-X11R6/lib/X11/fs/config
-X11R6/${IMAKE_MAN_DIR}/xfs.${IMAKE_MANNEWSUFFIX}
+@comment $NetBSD: PLIST,v 1.3 2004/03/28 22:06:15 xtraeme Exp $
+${X11ROOT_PREFIX}/bin/xfs
+${X11ROOT_PREFIX}/lib/X11/fs/config
+${X11ROOT_PREFIX}/${MAN_DIR}/xfs.${MAN_SUFFIX}
diff --git a/fonts/XFree86-fontserver/files/host.def b/fonts/XFree86-fontserver/files/host.def
index 20954b3a918..79191e6c035 100644
--- a/fonts/XFree86-fontserver/files/host.def
+++ b/fonts/XFree86-fontserver/files/host.def
@@ -1,8 +1,4 @@
-/*
- * $NetBSD: host.def,v 1.3 2004/02/02 14:19:02 xtraeme Exp $
- *
- * XFree86 packages for pkgsrc system
- */
+/* $NetBSD: host.def,v 1.4 2004/03/28 22:06:15 xtraeme Exp $ */
#define ProjectRoot @PREFIX@
@@ -35,6 +31,8 @@
#define StandardIncludes -I@BLNK@/include
#define BuildHtmlManPages NO
+#define ExtraLoadFlags @LDFLAGS@
+#define LibInstallBuild YES
#define BuildServer YES
#define BuildFontServer YES
#define BuildServersOnly YES