--- a/open-src/font/google-droid/Makefile	Fri Nov 20 18:16:20 2009 -0800
+++ b/open-src/font/google-droid/Makefile	Mon Nov 23 11:58:12 2009 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident	"@(#)Makefile	1.2	09/10/13 SMI"
+# ident	"@(#)Makefile	1.3	09/11/23 SMI"
 #
 
 # Package name used in tarballs
@@ -55,28 +55,12 @@
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=		# None
 
-# No configure script to run
-CONFIGURE_TARGETS=
-CONFIGURE_TARGETS_SET=yes
-
-# What to build
-BUILD_TARGETS=$(SOURCE_DIR)/fonts.scale
-BUILD_TARGETS_SET=yes
-
-# What to install
-INSTALL_TARGETS=install_droid
-INSTALL_TARGETS_SET=yes
-
 # License file
 LICENSE_FILE=NOTICE
 LICENSE_FILE_SET=yes
 
-### Include common rulesets
-include ../Makefile.inc
-
-### Rules specific to this directory:
-
-DROID_FONT_FILES= \
+TTF_FONT_FILES = \
+    $(LICENSE_FILE)		\
     DroidSans.ttf		\
     DroidSans-Bold.ttf		\
     DroidSerif-Regular.ttf	\
@@ -86,17 +70,8 @@
     DroidSansMono.ttf		\
     DroidSansFallback.ttf
 
-$(SOURCE_DIR)/fonts.scale: $(UNPACK_TARGET)
-	(cd $(SOURCE_DIR) && $(MKFONTSCALE) . )
-
-FONT_DEST_DIR=$(PROTODIR)$(X11_FONT_DIR)/TrueType/google-droid
+TTF_SUBDIR=google-droid
+TTF_SUBDIR_SET=yes
 
-install_droid:: $(BUILD_TARGETS)
-	-rm -rf $(FONT_DEST_DIR)
-	mkdir -p $(FONT_DEST_DIR)
-	( cd $(SOURCE_DIR) ; cp -p $(DROID_FONT_FILES) $(FONT_DEST_DIR)/ )
-	$(MKFONTSCALE) $(FONT_DEST_DIR)
-	$(MKFONTDIR) $(FONT_DEST_DIR)
-
-
-
+### Include common rulesets
+include ../Makefile.ttf