From owner-freebsd-ports@FreeBSD.ORG  Sat Aug 21 21:57:39 2004
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id B746016A4CE; Sat, 21 Aug 2004 21:57:39 +0000 (GMT)
Received: from sakura.ninth-nine.com (sakura.ninth-nine.com [219.127.74.120])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 3BDDD43D1D; Sat, 21 Aug 2004 21:57:39 +0000 (GMT)
	(envelope-from nork@FreeBSD.org)
Received: from nadesico.ninth-nine.com (nadesico.ninth-nine.com
	[219.127.74.122]) by sakura.ninth-nine.com (8.12.11/8.12.11/NinthNine) with
	ESMTP id i7LLvcX4013972; Sun, 22 Aug 2004 06:57:38 +0900 (JST) (envelope-from
	nork@FreeBSD.org)
Date: Sun, 22 Aug 2004 06:57:38 +0900
From: Norikatsu Shigemura <nork@FreeBSD.org>
To: edwin@FreeBSD.org, naddy@FreeBSD.org
Message-Id: <20040822065738.35d45172.nork@FreeBSD.org>
X-Mailer: Sylpheed version 0.9.12-gtk2-20040622 (GTK+ 2.4.7;
	i386-portbld-freebsd6.0)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.5.6
	(sakura.ninth-nine.com [219.127.74.121]); Sun, 22 Aug 2004 06:57:38 +0900
	(JST)
cc: ports@FreeBSD.org
Subject: x11-toolkits/Xaw3d
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Aug 2004 21:57:39 -0000

	I saw x11-toolkits/Xaw3d, and didn't understand why this
	is so.  I read edwin's ports/43235.

# http://www.freebsd.org/cgi/query-pr.cgi?pr=43235

	Supposing my understanding is right, is it easy to be
	as follows patch?  And should I be bump PORTREVISION?

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/Xaw3d/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile	20 Feb 2003 19:20:19 -0000	1.40
+++ Makefile	21 Aug 2004 21:47:10 -0000
@@ -17,10 +17,10 @@
 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-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>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/Xaw3d/pkg-plist,v
retrieving revision 1.13
diff -u -r1.13 pkg-plist
--- pkg-plist	6 Oct 2002 18:44:12 -0000	1.13
+++ pkg-plist	21 Aug 2004 21:46:40 -0000
@@ -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
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -