Date: Tue, 8 Mar 2005 13:30:05 GMT From: Michael Nottebrock <michaelnottebrock@gmx.net> To: freebsd-x11@FreeBSD.org Subject: Re: ports/78527: wrong Xaw3D version Message-ID: <200503081330.j28DU5G5097422@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/78527; it has been noted by GNATS.
From: Michael Nottebrock <michaelnottebrock@gmx.net>
To: freebsd-gnats-submit@freebsd.org, rea@rea.mbslab.kiae.ru
Cc:
Subject: Re: ports/78527: wrong Xaw3D version
Date: Tue, 8 Mar 2005 14:22:08 +0100
--Boundary-00=_AcaLCqb4QAIzmTR
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
The xaw3d port is pretty broken atm.
I made a patch some time ago and had it tested successfully by some people on
ports@, but never got around to committing. Please review.
--Boundary-00=_AcaLCqb4QAIzmTR
Content-Type: text/plain;
charset="us-ascii";
name="Xaw3d.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="Xaw3d.diff"
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/Xaw3d/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile 10 Jan 2005 19:12:13 -0000 1.42
+++ Makefile 13 Feb 2005 15:55:24 -0000
@@ -24,7 +24,9 @@
.include <bsd.port.pre.mk>
.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-PLIST_FILES= lib/libXaw3d.so.6
+PLIST_FILES= lib/libXaw3d.so.${XAWVER}
+.elif ${X_WINDOW_SYSTEM:L} == xorg
+PLIST_FILES= lib/libXaw3d.so.${XAWVER}
.endif
post-extract:
@@ -43,7 +45,9 @@
${MKDIR} ${PREFIX}/share/doc/Xaw3d
${CP} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
.if ${X_WINDOW_SYSTEM:L} == xfree86-3
- ${LN} -sf libXaw3d.so.${XAWVER} ${X11BASE}/lib/libXaw3d.so.6
+ ${LN} -sf ${PREFIX}/lib/libXaw3d.so.7 ${PREFIX}/lib/libXaw3d.so.${XAWVER}
+.elif ${X_WINDOW_SYSTEM:L} == xorg
+ ${LN} -sf ${PREFIX}/lib/libXaw3d.so.7 ${PREFIX}/lib/libXaw3d.so.${XAWVER}
.endif
@${CAT} ${PKGMESSAGE}
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/Xaw3d/pkg-plist,v
retrieving revision 1.14
diff -u -r1.14 pkg-plist
--- pkg-plist 3 Sep 2004 20:43:04 -0000 1.14
+++ pkg-plist 13 Feb 2005 15:55:24 -0000
@@ -1,7 +1,7 @@
@comment $FreeBSD: ports/x11-toolkits/Xaw3d/pkg-plist,v 1.14 2004/09/03 20:43:04 nork Exp $
lib/libXaw3d.a
lib/libXaw3d.so
-lib/libXaw3d.so.%%XAWVER%%
+lib/libXaw3d.so.7
include/X11/Xaw3d/AllWidgets.h
include/X11/Xaw3d/AsciiSink.h
include/X11/Xaw3d/AsciiSinkP.h
--Boundary-00=_AcaLCqb4QAIzmTR--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503081330.j28DU5G5097422>