--- a/open-src/app/cmap_compact/Makefile	Wed Jun 30 14:10:39 2010 -0700
+++ b/open-src/app/cmap_compact/Makefile	Fri Jul 02 21:03:57 2010 -0700
@@ -28,6 +28,10 @@
 # Package name used in tarballs
 MODULE_NAME=cmap_compact
 
+# pkg(5) name we deliver the files in (override default)
+MODULE_PKGNAME=x11/utility/colormap-utilities
+MODULE_PKGNAME_SET=yes
+
 # No upstream sources, only local sources
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE
@@ -36,7 +40,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
@@ -47,4 +50,7 @@
 MODULE_BUILD_MAKEFLAGS=$(CONFIG_ENV) PREFIX=$(MODULE_PREFIX)
 MODULE_INSTALL_MAKEFLAGS=$(CONFIG_ENV) PREFIX=$(MODULE_PREFIX)
 
+# Compatibility links from /usr/X11/bin to /usr/bin
+MODULE_X11_BINCOMPAT_LINKS = cmap_compact
+
 include ../Makefile.inc