From 7a76e004b8ffcde59007b1f3f898ac13c792ae7a Mon Sep 17 00:00:00 2001
From: Norikatsu Shigemura <nork@FreeBSD.org>
Date: Fri, 3 Sep 2004 20:43:04 +0000
Subject: Utilize X_WINDOW_SYSTEM.

---
 x11-toolkits/Xaw3d/Makefile  | 12 ++++++------
 x11-toolkits/Xaw3d/pkg-plist |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'x11-toolkits/Xaw3d')

diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 45d1b4f34eb7..7581a5c34410 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -17,10 +17,10 @@ COMMENT=	A 3-D Athena Widget set that looks like Motif
 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
 USE_IMAKE=	yes
 INSTALLS_SHLIB=	yes
-.if exists(${X11BASE}/bin/XFree86)
-PLIST_SUB=	XAWLINK=""
-.else
-PLIST_SUB=	XAWLINK="@comment "
+
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
+PLIST_FILES=	lib/libXaw3d.so.6
 .endif
 
 post-extract:
@@ -37,9 +37,9 @@ post-configure:
 post-install:
 	${MKDIR} ${PREFIX}/share/doc/Xaw3d
 	${CP} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
-.if exists(${X11BASE}/bin/XFree86)
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
 	${LN} -sf libXaw3d.so.${XAWVER} ${X11BASE}/lib/libXaw3d.so.6
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/Xaw3d/pkg-plist b/x11-toolkits/Xaw3d/pkg-plist
index 1b8b2f885248..334738d56bcb 100644
--- a/x11-toolkits/Xaw3d/pkg-plist
+++ b/x11-toolkits/Xaw3d/pkg-plist
@@ -2,7 +2,6 @@
 lib/libXaw3d.a
 lib/libXaw3d.so
 lib/libXaw3d.so.%%XAWVER%%
-%%XAWLINK%%lib/libXaw3d.so.6
 include/X11/Xaw3d/AllWidgets.h
 include/X11/Xaw3d/AsciiSink.h
 include/X11/Xaw3d/AsciiSinkP.h
-- 
cgit v1.2.3