--- a/open-src/lib/libXaw5/Makefile	Wed Jun 30 14:10:39 2010 -0700
+++ b/open-src/lib/libXaw5/Makefile	Fri Jul 02 21:03:57 2010 -0700
@@ -27,6 +27,10 @@
 
 MODULE_NAME=libXaw5
 
+# pkg(5) name we deliver the files in (override default)
+MODULE_PKGNAME=x11/toolkit/libxaw5
+MODULE_PKGNAME_SET=yes
+
 # No upstream sources, only local sources
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE
@@ -38,7 +42,6 @@
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES= # None
-SUN_PACKAGE=SUNWxwplt
 MODULE_STABILITY=Committed
 
 # No configure script to run
@@ -54,4 +57,7 @@
 # Link with version mapfile
 MODULE_LDFLAGS = -R/usr/lib$(ARCHLIBSUBDIR) -M $(PWD)/mapfile-vers
 
+# Compatibility links from /usr/X11/lib to /usr/lib
+MODULE_X11_LIBCOMPAT_LINKS = libXaw.so.5
+
 include ../Makefile.inc