--- a/pkgmaps/prototype.ttf-indic-fonts-core	Wed Jul 28 11:02:33 2010 +0200
+++ b/pkgmaps/prototype.ttf-indic-fonts-core	Wed Jul 28 16:32:08 2010 +0200
@@ -5,32 +5,26 @@
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# file and include the License file at src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 d none share 0755 root sys
 d none share/fonts 0755 root bin
 d none share/fonts/TrueType 0755 root bin
 d none share/fonts/TrueType/indic-fonts-core 0755 root bin
-f none share/fonts/TrueType/indic-fonts-core/lohit_gu.ttf 0444 root bin
-f none share/fonts/TrueType/indic-fonts-core/lohit_hi.ttf 0444 root bin
-f none share/fonts/TrueType/indic-fonts-core/lohit_pa.ttf 0444 root bin
-f none share/fonts/TrueType/indic-fonts-core/lohit_ta.ttf 0444 root bin
 f none share/fonts/TrueType/indic-fonts-core/Malige-b.ttf 0444 root bin
 f none share/fonts/TrueType/indic-fonts-core/Malige-n.ttf 0444 root bin
 f none share/fonts/TrueType/indic-fonts-core/MalOtf.ttf 0444 root bin
@@ -41,23 +35,4 @@
 
 d none share/doc 0755 root other
 d none share/doc/indic-fonts-core 0755 root bin
-d none share/doc/indic-fonts-core/ttf-Bengali-fonts 0755 root bin
-d none share/doc/indic-fonts-core/ttf-Devanagari-fonts 0755 root bin
-d none share/doc/indic-fonts-core/ttf-Gujarati-fonts 0755 root bin
-d none share/doc/indic-fonts-core/ttf-Kannada-fonts 0755 root bin
-d none share/doc/indic-fonts-core/ttf-Malayalam-fonts 0755 root bin
-d none share/doc/indic-fonts-core/ttf-Oriya-fonts 0755 root bin
-d none share/doc/indic-fonts-core/ttf-Punjabi-fonts 0755 root bin
-d none share/doc/indic-fonts-core/ttf-Tamil-fonts 0755 root bin
-d none share/doc/indic-fonts-core/ttf-Telugu-fonts 0755 root bin
-f none share/doc/indic-fonts-core/copyright 0444 root bin
-f none share/doc/indic-fonts-core/ttf-Bengali-fonts/COPYING 0444 root bin
-f none share/doc/indic-fonts-core/ttf-Devanagari-fonts/COPYING 0444 root bin
-f none share/doc/indic-fonts-core/ttf-Gujarati-fonts/COPYING 0444 root bin
-f none share/doc/indic-fonts-core/ttf-Kannada-fonts/gpl.txt 0444 root bin
-f none share/doc/indic-fonts-core/ttf-Malayalam-fonts/COPYING 0444 root bin
-f none share/doc/indic-fonts-core/ttf-Oriya-fonts/licence.txt 0444 root bin
-f none share/doc/indic-fonts-core/ttf-Punjabi-fonts/COPYING 0444 root bin
-f none share/doc/indic-fonts-core/ttf-Tamil-fonts/COPYING 0444 root bin
-f none share/doc/indic-fonts-core/ttf-Telugu-fonts/gpl.txt 0444 root bin
-
+f none share/doc/indic-fonts-core/COPYING.bz2 0444 root bin

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgmaps/prototype.ttf-lohit	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,66 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+d none share 0755 root sys
+d none share/fonts 0755 root bin
+d none share/fonts/TrueType 0755 root bin
+d none share/fonts/TrueType/lohit 0755 root bin
+f none share/fonts/TrueType/lohit/Lohit-Assamese.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Bengali.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Gujarati.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Hindi.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Kannada.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Kashmiri.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Konkani.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Maithili.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Malayalam.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Marathi.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Nepali.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Oriya.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Punjabi.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Sindhi.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Tamil.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/Lohit-Telugu.ttf 0444 root bin
+f none share/fonts/TrueType/lohit/fonts.dir 0444 root bin
+f none share/fonts/TrueType/lohit/fonts.scale 0444 root bin
+
+d none share/doc 0755 root other
+d none share/doc/ttf-lohit 0755 root bin
+f none share/doc/ttf-lohit/COPYING.bz2 0444 root bin
+f none share/doc/ttf-lohit/COPYRIGHT.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Assamese.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Bengali.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Gujarati.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Hindi.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Kannada.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Kashmiri.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Konkani.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Maithili.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Malayalam.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Marathi.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Nepali.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Oriya.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Punjabi.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Sindhi.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Tamil.bz2 0444 root bin
+f none share/doc/ttf-lohit/ChangeLog.Telugu.bz2 0444 root bin

--- a/src/xorg/fonts/Makefile	Wed Jul 28 11:02:33 2010 +0200
+++ b/src/xorg/fonts/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -18,10 +18,7 @@
 #
 # CDDL HEADER END
 #
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 SUBDIRS = \
@@ -34,6 +31,7 @@
 	indic-fonts-core \
 	ipafont \
 	kacst \
+	lohit \
 	mgopen \
 	sil \
 	thai-scalable \

--- a/src/xorg/fonts/Makefile.fonts	Wed Jul 28 11:02:33 2010 +0200
+++ b/src/xorg/fonts/Makefile.fonts	Wed Jul 28 16:32:08 2010 +0200
@@ -18,10 +18,7 @@
 #
 # CDDL HEADER END
 #
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 FONTROOT	= $(FILEROOT)/usr/share/fonts/TrueType
@@ -40,9 +37,11 @@
 $(VER)/.docs_installed: $(VER)/.unpacked $(DOCS:%=$(VER)/%.bz2)
 	$(INSDIR) -m 755 -u root -g bin $(ROOT_DOC_DIR)
 	( cd $(VER); \
-	for f in $(DOCS); do \
-		$(INS) $(ROOT_DOC_DIR) -m 0444 -u root -g bin $$f.bz2; \
-	done; )
+	if [ -n "$(DOCS)" ]; then \
+		for f in "$(DOCS)"; do \
+			$(INS) $(ROOT_DOC_DIR) -m 0444 -u root -g bin $$f.bz2; \
+		done; \
+	fi )
 	touch $@
 
 $(VER)/.installed: $(VER)/.docs_installed $(VER)/.fonts_installed 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/indic-fonts-core/Bangla/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+PROJECT		= MuktiNarrow
+VER 		= $(PROJECT)0.94
+TARBALL		= $(PROJECT)-0.94.tar.bz2
+SOURCE_URL	= http://download.savannah.nongnu.org/releases/freebangfont/$(TARBALL)
+
+FONTS = MuktiNarrow.ttf \
+	MuktiNarrowBold.ttf
+
+include ../Makefile.common

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/indic-fonts-core/Brahmi/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,46 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+PROJECT		= kanotf
+VER 		= $(PROJECT)
+TARBALL		= $(VER).zip
+SOURCE_URL	= http://prdownloads.sourceforge.net/brahmi/$(TARBALL)?download
+WGET_OPT	+= -O $(TARBALL)
+
+FONTS = Malige-b.ttf \
+	Malige-n.ttf
+
+DOCS = 
+
+FONTS_VER	= $(FONTS:%=$(VER)/%)
+
+$(VER)/%.ttf: $(VER)/fonts/%.TTF
+	$(CP) $< $@
+
+$(VER)/fonts/%.TTF: $(VER)/.unpacked
+
+install: $(FONTS_VER) $(VER)/.installed
+
+include ../Makefile.common

--- a/src/xorg/fonts/indic-fonts-core/Makefile	Wed Jul 28 11:02:33 2010 +0200
+++ b/src/xorg/fonts/indic-fonts-core/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -18,48 +18,59 @@
 #
 # CDDL HEADER END
 #
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include $(SRC)/Makefile.master
 
+SUBDIRS = \
+	Bangla \
+	Brahmi \
+	MalayamLinux \
+	Oriya \
+	Vemana
+
+FILES = fonts.dir \
+	fonts.scale
+
+DOCS =	Bangla/MuktiNarrow0.94/COPYING
+
 ROOT_FONT_DIR 	= $(FILEROOT)/usr/share/fonts/TrueType/indic-fonts-core
 ROOT_DOC_DIR 	= $(FILEROOT)/usr/share/doc/indic-fonts-core
 
-FONT_TAR	= indic-fonts-core.tar.bz2
-FONT_DOC_TAR	= indic-fonts-core-doc.tar.bz2
-FONT_SCALE	= #fonts.scale.indic-fonts-core 
-FONT_DIR	= #fonts.dir.indic-fonts-core
-
-SUBDIRS         = 
+all:=		TARGET= all
+install :=	TARGET= install
+clean :=	TARGET= clean
+clobber :=	TARGET= clobber
 
-all:=		TARGET= all
-install:=	TARGET= install
-clean:=		TARGET= clean
-clobber:=	TARGET= clobber
-lint:=		TARGET= lint
+all: $(SUBDIRS)
 
-.KEEP_STATE:
+install: $(SUBDIRS) .files_installed
+
+clean: $(SUBDIRS)
+	$(RM) .*installed *bz2
 
-all: $(FONT_TAR)
+.files_installed: .docs_installed
+	$(INSDIR) -m 755 -u root -g bin $(ROOT_FONT_DIR)
+	( for f in $(FILES); do \
+		$(INS) $(ROOT_FONT_DIR) -m 0444 -u root -g bin $$f; \
+	done; )
+	touch $@
 
-font_install:
-	mkdir -p $(ROOT_FONT_DIR) $(ROOT_DOC_DIR)
-	bzip2 -d -c $(FONT_TAR) | (cd $(ROOT_FONT_DIR) ; tar xpf -)
-	bzip2 -d -c $(FONT_DOC_TAR) | (cd $(ROOT_DOC_DIR) ; tar xpf -)
-	#cp $(FONT_DIR) $(ROOT_FONT_DIR)/fonts.dir
-	#cp $(FONT_SCALE) $(ROOT_FONT_DIR)/fonts.scale
+%.bz2: %
+	$(BZIP2) -c $< > $@
 
-install: all $(SUBDIRS) font_install
-
-clean:
-
-clobber: clean
+.docs_installed: $(DOCS:%=%.bz2)
+	$(INSDIR) -m 755 -u root -g bin $(ROOT_DOC_DIR)
+	( for f in $(DOCS); do \
+		$(INS) $(ROOT_DOC_DIR) -m 0444 -u root -g bin $$f.bz2; \
+	done; )
+	touch $@
 
 $(SUBDIRS): FRC
-	-@cd $@; pwd; $(MAKE) $(TARGET)
+	@cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET)
+
+tarball:
 
 FRC:
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/indic-fonts-core/Makefile.common	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+ROOT_FONT_DIR 	= $(FONTROOT)/indic-fonts-core
+ROOT_DOC_DIR 	= $(FILEROOT)/usr/share/doc/indic-fonts-core
+
+all: $(VER)/.unpacked
+
+install: $(VER)/.installed
+
+include ../../Makefile.fonts
+include $(SRC)/Makefile.targ
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/indic-fonts-core/MalayamLinux/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,58 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+PROJECT:sh	= basename `pwd`
+VER 		= $(PROJECT)
+TARBALL		= MalOtf.ttf
+SOURCE_URL	= http://malayalamlinux.sourceforge.net/downloads/fonts/$(TARBALL)
+
+FONT = MalOtf.ttf
+
+
+ROOT_FONT_DIR 	= $(FILEROOT)/usr/share/fonts/TrueType/indic-fonts-core
+ROOT_DOC_DIR 	= $(FILEROOT)/usr/share/doc/indic-fonts-core
+
+$(VER)/.installed: $(VER)/.unpacked_withdir
+	$(INSDIR) -m 755 -u root -g bin $(ROOT_FONT_DIR)
+	( cd $(VER); $(INS) $(ROOT_FONT_DIR) -m 0444 -u root -g bin $(FONT); )
+	touch $@
+
+all: $(VER)/.unpacked_withdir
+
+install: $(VER)/.installed
+
+clean:
+	$(RM) -r $(VER) $(ORIG_VER)
+
+clobber: clean
+
+include $(SRC)/Makefile.targ
+
+$(VER)/.unpacked_withdir: $(SOURCE_ARCHIVE)
+	-$(RM) -r $(VER)
+	mkdir $(VER)
+	$(CP) $(SOURCE_ARCHIVE) $(VER)/
+	touch $@
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/indic-fonts-core/Oriya/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,57 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+PROJECT		= utkal
+VER 		= $(PROJECT)
+TARBALL		= $(VER)m.ttf.gz
+SOURCE_URL	= http://oriya.sarovar.org/download/$(TARBALL)
+
+FONT = utkal.ttf
+
+
+ROOT_FONT_DIR 	= $(FILEROOT)/usr/share/fonts/TrueType//indic-fonts-core
+ROOT_DOC_DIR 	= $(FILEROOT)/usr/share/doc/indic-fonts-core
+
+$(VER)/.installed: $(VER)/.unpacked_withdir
+	$(INSDIR) -m 755 -u root -g bin $(ROOT_FONT_DIR)
+	( cd $(VER); $(INS) $(ROOT_FONT_DIR) -m 0444 -u root -g bin $(FONT); )
+	touch $@
+
+all: $(VER)/.unpacked_withdir
+
+install: $(VER)/.installed
+
+clean:
+	$(RM) -r $(VER) $(ORIG_VER)
+
+clobber: clean
+
+include $(SRC)/Makefile.targ
+
+$(VER)/.unpacked_withdir: $(SOURCE_ARCHIVE)
+	-$(RM) -r $(VER)
+	mkdir $(VER)
+	/usr/bin/gzip -dc $(SOURCE_ARCHIVE) > $(VER)/$(VER:%=%.ttf)
+	touch $@

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/indic-fonts-core/Vemana/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+PROJECT		= Vemana
+VER 		= $(PROJECT)
+TARBALL		= $(VER)2k-Li.zip
+SOURCE_URL	= http://www.kavya-nandanam.com/$(TARBALL)
+
+FONT = vemana.ttf
+
+
+ROOT_FONT_DIR 	= $(FILEROOT)/usr/share/fonts/TrueType//indic-fonts-core
+ROOT_DOC_DIR 	= $(FILEROOT)/usr/share/doc/indic-fonts-core
+
+$(VER)/$(FONT): $(VER)/.unpacked_withdir
+	cp $(VER)/vemana2000.ttf $@
+
+$(VER)/.installed: $(VER)/$(FONT)
+	$(INSDIR) -m 755 -u root -g bin $(ROOT_FONT_DIR)
+	( cd $(VER); $(INS) $(ROOT_FONT_DIR) -m 0444 -u root -g bin $(FONT); )
+	touch $@
+
+all: $(VER)/.unpacked_withdir
+
+install: $(VER)/.installed
+
+clean:
+	$(RM) -r $(VER) $(ORIG_VER)
+
+clobber: clean
+
+include $(SRC)/Makefile.targ
+
+$(VER)/.unpacked_withdir: $(SOURCE_ARCHIVE)
+	-$(RM) -r $(VER)
+	mkdir $(VER)
+	(cd $(VER) && $(UNPACKARCHIVE) $(SOURCE_ARCHIVE) .)
+	touch $@
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/indic-fonts-core/fonts.dir	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,7 @@
+6
+Malige-b.ttf -microsoft-mallige-bold-r-normal--0-0-0-0-p-0-iso10646-1
+Malige-n.ttf -microsoft-mallige-medium-r-normal--0-0-0-0-p-0-iso10646-1
+MuktiNarrow.ttf -misc-mukti narrow-medium-r-normal--0-0-0-0-p-0-iso10646-1
+MuktiNarrowBold.ttf -misc-mukti narrow-bold-r-normal--0-0-0-0-p-0-iso10646-1
+utkal.ttf -misc-utkal-medium-r-normal--0-0-0-0-p-0-iso10646-1
+vemana.ttf -misc-vemana2000-medium-r-normal--0-0-0-0-p-0-iso10646-1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/indic-fonts-core/fonts.scale	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,7 @@
+6
+Malige-b.ttf -microsoft-mallige-bold-r-normal--0-0-0-0-p-0-iso10646-1
+Malige-n.ttf -microsoft-mallige-medium-r-normal--0-0-0-0-p-0-iso10646-1
+MuktiNarrow.ttf -misc-mukti narrow-medium-r-normal--0-0-0-0-p-0-iso10646-1
+MuktiNarrowBold.ttf -misc-mukti narrow-bold-r-normal--0-0-0-0-p-0-iso10646-1
+utkal.ttf -misc-utkal-medium-r-normal--0-0-0-0-p-0-iso10646-1
+vemana.ttf -misc-vemana2000-medium-r-normal--0-0-0-0-p-0-iso10646-1

Binary file src/xorg/fonts/indic-fonts-core/indic-fonts-core-doc.tar.bz2 has changed

Binary file src/xorg/fonts/indic-fonts-core/indic-fonts-core.tar.bz2 has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,88 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+SUBDIRS = \
+	assamese \
+	bengali \
+	gujarati \
+	hindi \
+	kannada \
+	kashmiri \
+	konkani \
+	maithili \
+	malayalam \
+	marathi \
+	nepali \
+	oriya \
+	punjabi \
+	sindhi \
+	tamil \
+	telugu
+
+FILES = fonts.dir \
+	fonts.scale
+
+DOCS =	assamese/lohit-assamese-ttf-2.4.3/COPYING \
+	assamese/lohit-assamese-ttf-2.4.3/COPYRIGHT
+
+ROOT_FONT_DIR 	= $(FILEROOT)/usr/share/fonts/TrueType/lohit
+ROOT_DOC_DIR 	= $(FILEROOT)/usr/share/doc/ttf-lohit
+
+all:=		TARGET= all
+install :=	TARGET= install
+clean :=	TARGET= clean
+clobber :=	TARGET= clobber
+
+all: $(SUBDIRS)
+
+install: $(SUBDIRS) .files_installed
+
+clean: $(SUBDIRS)
+	$(RM) .*installed *bz2
+
+.files_installed: .docs_installed
+	$(INSDIR) -m 755 -u root -g bin $(ROOT_FONT_DIR)
+	( for f in $(FILES); do \
+		$(INS) $(ROOT_FONT_DIR) -m 0444 -u root -g bin $$f; \
+	done; )
+	touch $@
+
+%.bz2: %
+	$(BZIP2) -c $< > $@
+
+.docs_installed: $(DOCS:%=%.bz2) $(SUBDIRS)
+	$(INSDIR) -m 755 -u root -g bin $(ROOT_DOC_DIR)
+	( for f in $(DOCS); do \
+		$(INS) $(ROOT_DOC_DIR) -m 0444 -u root -g bin $$f.bz2; \
+	done; )
+	touch $@
+
+$(SUBDIRS): FRC
+	@cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET)
+
+tarball:
+
+FRC:
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/Makefile.common	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,47 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+PROJECT		= lohit-$(FNAME)-ttf
+TARBALL		= $(VER).tar.gz
+URL_PRAVINS	= http://pravins.fedorapeople.org/lohit/$(FNAME)/$(TARBALL)
+URL_FEDORA	= https://fedorahosted.org/releases/l/o/lohit/$(TARBALL)
+
+FONTS = Lohit-$(ID).ttf
+DOCS =	ChangeLog.$(ID)
+
+ROOT_FONT_DIR 	= $(FONTROOT)/lohit
+ROOT_DOC_DIR 	= $(FILEROOT)/usr/share/doc/ttf-lohit
+
+all: $(VER)/.unpacked
+
+$(VER)/%.$(ID).bz2: $(VER)/%.$(ID)
+	$(BZIP2) -c $< > $@
+
+$(VER)/%.$(ID): $(VER)/%
+	cp $< $@
+
+install: $(VER)/.installed
+
+include ../../Makefile.fonts
+include $(SRC)/Makefile.targ
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/assamese/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Assamese
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.3
+SOURCE_URL	= $(URL_PRAVINS)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/bengali/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Bengali
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.3
+SOURCE_URL	= $(URL_PRAVINS)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/fonts.dir	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,17 @@
+16
+Lohit-Assamese.ttf -misc-lohit assamese-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Bengali.ttf -misc-lohit bengali-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Gujarati.ttf -misc-lohit gujarati-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Hindi.ttf -misc-lohit hindi-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Kannada.ttf -misc-lohit kannada-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Kashmiri.ttf -misc-lohit kashmiri-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Konkani.ttf -misc-lohit konkani-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Maithili.ttf -misc-lohit maithili-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Malayalam.ttf -misc-lohit malayalam-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Marathi.ttf -misc-lohit marathi-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Nepali.ttf -misc-lohit nepali-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Oriya.ttf -misc-lohit oriya-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Punjabi.ttf -misc-lohit punjabi-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Sindhi.ttf -misc-lohit sindhi-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Tamil.ttf -misc-lohit tamil-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Telugu.ttf -misc-lohit telugu-medium-r-normal--0-0-0-0-p-0-iso10646-1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/fonts.scale	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,17 @@
+16
+Lohit-Assamese.ttf -misc-lohit assamese-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Bengali.ttf -misc-lohit bengali-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Gujarati.ttf -misc-lohit gujarati-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Hindi.ttf -misc-lohit hindi-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Kannada.ttf -misc-lohit kannada-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Kashmiri.ttf -misc-lohit kashmiri-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Konkani.ttf -misc-lohit konkani-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Maithili.ttf -misc-lohit maithili-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Malayalam.ttf -misc-lohit malayalam-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Marathi.ttf -misc-lohit marathi-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Nepali.ttf -misc-lohit nepali-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Oriya.ttf -misc-lohit oriya-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Punjabi.ttf -misc-lohit punjabi-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Sindhi.ttf -misc-lohit sindhi-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Tamil.ttf -misc-lohit tamil-medium-r-normal--0-0-0-0-p-0-iso10646-1
+Lohit-Telugu.ttf -misc-lohit telugu-medium-r-normal--0-0-0-0-p-0-iso10646-1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/gujarati/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Gujarati
+
+WGET_OPT	+= --no-check-certificate
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.4
+SOURCE_URL	= $(URL_FEDORA)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/hindi/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Hindi
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.3
+SOURCE_URL	= $(URL_PRAVINS)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/kannada/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Kannada
+
+WGET_OPT	+= --no-check-certificate
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.5
+SOURCE_URL	= $(URL_FEDORA)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/kashmiri/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Kashmiri
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.3
+SOURCE_URL	= $(URL_PRAVINS)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/konkani/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Konkani
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.3
+SOURCE_URL	= $(URL_PRAVINS)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/maithili/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Maithili
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.3
+SOURCE_URL	= $(URL_PRAVINS)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/malayalam/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Malayalam
+
+WGET_OPT	+= --no-check-certificate
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.4
+SOURCE_URL	= $(URL_FEDORA)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/marathi/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Marathi
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.3
+SOURCE_URL	= $(URL_PRAVINS)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/nepali/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Nepali
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.3
+SOURCE_URL	= $(URL_PRAVINS)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/oriya/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Oriya
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.3
+SOURCE_URL	= $(URL_PRAVINS)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/punjabi/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Punjabi
+
+WGET_OPT	+= --no-check-certificate
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.4
+SOURCE_URL	= $(URL_FEDORA)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/sindhi/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Sindhi
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.3
+SOURCE_URL	= $(URL_PRAVINS)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/tamil/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Tamil
+
+WGET_OPT	+= --no-check-certificate
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.5
+SOURCE_URL	= $(URL_FEDORA)
+
+include ../Makefile.common
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/fonts/lohit/telugu/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+
+ID =	Telugu
+
+WGET_OPT	+= --no-check-certificate
+
+FNAME:sh	= basename `pwd`
+VER 		= $(PROJECT)-2.4.5
+SOURCE_URL	= $(URL_FEDORA)
+
+include ../Makefile.common
+

--- a/src/xorg/fonts/sil/Makefile	Wed Jul 28 11:02:33 2010 +0200
+++ b/src/xorg/fonts/sil/Makefile	Wed Jul 28 16:32:08 2010 +0200
@@ -18,10 +18,7 @@
 #
 # CDDL HEADER END
 #
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include $(SRC)/Makefile.master
@@ -59,7 +56,7 @@
 install: $(SUBDIRS) .files_installed
 
 clean: $(SUBDIRS)
-	$(RM) .*installed
+	$(RM) .*installed *bz2
 
 .files_installed: .docs_installed
 	$(INSDIR) -m 755 -u root -g bin $(ROOT_FONT_DIR)