diff -r abfa40ff15ef -r f43507b5737d open-src/driver/xf86-video-sis/Makefile
--- a/open-src/driver/xf86-video-sis/Makefile	Fri Aug 08 16:28:28 2008 -0700
+++ b/open-src/driver/xf86-video-sis/Makefile	Fri Aug 08 16:27:37 2008 -0700
@@ -30,31 +30,31 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.8	08/03/19
+# @(#)Makefile	1.9	08/08/08
 #
 
 # Package name used in tarballs
-DRIVER_NAME=xf86-video-sis
+MODULE_NAME=xf86-video-sis
 
 # Version number (used in path names)
-DRIVER_VERS=0.9.4
+MODULE_VERSION=0.9.4
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
-SUNTOUCH_MAN_FLAGS= \
- -a '{Architecture, x86} {Availability, SUNWxorg-graphics-ddx} {Interface Stability, Volatile}'
+SUN_PACKAGE=SUNWxorg-graphics-ddx
+MODULE_STABILITY=Volatile
 
 # Extra flags to pass to configure
-DRIVER_CONFIG_OPTS=--disable-dri
+MODULE_CONFIG_OPTS=--disable-dri
 
 # Libraries/modules to link with
-DRIVER_ADD_LIBS= \
-	-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
+MODULE_LD_OPTIONS= \
+	-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
 	-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-	-R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
+	-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
 	-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	-lexa -lfb -lint10 -lshadowfb -lvbe -lvgahw -lxaa -lm