--- a/open-src/app/mkfontscale/Makefile	Wed Jun 30 14:10:39 2010 -0700
+++ b/open-src/app/mkfontscale/Makefile	Fri Jul 02 21:03:57 2010 -0700
@@ -28,6 +28,10 @@
 # Package name used in tarballs
 MODULE_NAME=mkfontscale
 
+# pkg(5) name we deliver the files in (override default)
+MODULE_PKGNAME=x11/font-utilities
+MODULE_PKGNAME_SET=yes
+
 # Version number (used in path names)
 MODULE_VERSION=1.0.7
 
@@ -38,9 +42,12 @@
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
 
+# ARC cases that covered this module
+# LSARC/2008/009 X11R7 font server and utilities
+MODULE_ARC_CASES = LSARC/2008/009
+
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=*.man
-SUN_PACKAGE=SUNWxwfsw
 MODULE_STABILITY=Uncommitted
 
 # Additional configure script options
@@ -49,4 +56,7 @@
 # Need to link with libfontenc in server private directory
 MODULE_LDFLAGS= -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
 
+# Compatibility links from /usr/X11/bin to /usr/bin
+MODULE_X11_BINCOMPAT_LINKS = mkfontscale
+
 include ../Makefile.inc