Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Aug 2004 06:57:38 +0900
From:      Norikatsu Shigemura <nork@FreeBSD.org>
To:        edwin@FreeBSD.org, naddy@FreeBSD.org
Cc:        ports@FreeBSD.org
Subject:   x11-toolkits/Xaw3d
Message-ID:  <20040822065738.35d45172.nork@FreeBSD.org>

next in thread | raw e-mail | index | archive | help
	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
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040822065738.35d45172.nork>