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