From 0306b5d30412683ea6a76002a04d0eb49da382eb Mon Sep 17 00:00:00 2001
From: recht <recht@pkgsrc.org>
Date: Wed, 11 Aug 2004 15:36:36 +0000
Subject: - pass rpath flags while building the freetype module   fixes my own
 PR pkg/26519 - add missing files to PLIST.common   patch provided by
 Kouichirou Hiratsuka in PR pkg/26611

bump PKGREVISION to 1
---
 x11/xorg-server/Makefile       | 3 ++-
 x11/xorg-server/PLIST.common   | 5 ++++-
 x11/xorg-server/files/host.def | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'x11')

diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index a5af81fc513..c30f74979ab 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/07/30 08:31:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/08/11 15:36:36 recht Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-server-${XORG_VER}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG}
 DISTFILES=		X11R6.7.0-src1.tar.gz X11R6.7.0-src3.tar.gz		
diff --git a/x11/xorg-server/PLIST.common b/x11/xorg-server/PLIST.common
index 9b3f5d8a946..f83cd063bc8 100644
--- a/x11/xorg-server/PLIST.common
+++ b/x11/xorg-server/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1.1.1 2004/07/29 04:52:42 xtraeme Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2004/08/11 15:36:36 recht Exp $
 ${X11ROOT_PREFIX}/bin/X
 ${X11ROOT_PREFIX}/bin/XFree86
 ${X11ROOT_PREFIX}/bin/Xnest
@@ -42,6 +42,7 @@ ${X11ROOT_PREFIX}/lib/X11/Cards
 ${X11ROOT_PREFIX}/lib/X11/Options
 ${X11ROOT_PREFIX}/lib/X11/XF86Config.98
 ${X11ROOT_PREFIX}/lib/X11/XF86Config.eg
+${X11ROOT_PREFIX}/lib/X11/XF86Config.indy
 ${X11ROOT_PREFIX}/lib/X11/app-defaults/XOrgCfg
 ${X11ROOT_PREFIX}/lib/X11/doc/BUILD
 ${X11ROOT_PREFIX}/lib/X11/doc/BugReport
@@ -254,6 +255,7 @@ ${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/i128.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/i740.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/i810.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/imstt.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/js_x.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/kbd.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/keyboard.${KERNMAN_SUFFIX}
@@ -262,6 +264,7 @@ ${X11ROOT_PREFIX}/${KERNMAN_DIR}/microtouch.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/mouse.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/mutouch.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/neomagic.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/newport.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/nsc.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/nv.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/palmax.${KERNMAN_SUFFIX}
diff --git a/x11/xorg-server/files/host.def b/x11/xorg-server/files/host.def
index 7cd100c3e40..626a116e187 100644
--- a/x11/xorg-server/files/host.def
+++ b/x11/xorg-server/files/host.def
@@ -1,4 +1,4 @@
-/* $NetBSD: host.def,v 1.2 2004/07/29 22:54:09 xtraeme Exp $ */
+/* $NetBSD: host.def,v 1.3 2004/08/11 15:36:36 recht Exp $ */
 
 #define ProjectRoot @PREFIX@
 #define BuildHtmlManPages NO
@@ -32,6 +32,8 @@
 
 #define StandardIncludes -I@BLNK@/include
 #define ExtraLoadFlags @LDFLAGS@
+#define PkgRpathFlags @_COMPILER_LD_FLAG@@RPATH_FLAG@
+#define LinkerRuntimeLibraryPathFlag(path) Concat(PkgRpathFlags, path)
 
 #define XTrueTypeInstallCConvHeaders NO
 
-- 
cgit v1.2.3