Tue Oct 30 07:34:25 PDT 2012

extras/ExternalPackage_extra_fonts.mk           |  187 ++++++++++++++++++++++++
 extras/Module_extras.mk                         |    2 
 extras/Package_extra_fonts.mk                   |  187 ------------------------
 more_fonts/ExternalPackage_dejavu.mk            |   38 ++++
 more_fonts/ExternalPackage_gentium.mk           |   25 +++
 more_fonts/ExternalPackage_liberation.mk        |   29 +++
 more_fonts/ExternalPackage_liberation_narrow.mk |   21 ++
 more_fonts/ExternalPackage_libertineg.mk        |   27 +++
 more_fonts/Module_more_fonts.mk                 |   10 -
 more_fonts/Package_dejavu.mk                    |   38 ----
 more_fonts/Package_gentium.mk                   |   25 ---
 more_fonts/Package_liberation.mk                |   31 ---
 more_fonts/Package_liberation_narrow.mk         |   21 --
 more_fonts/Package_libertineg.mk                |   28 ---
 14 files changed, 333 insertions(+), 336 deletions(-)

New commits:
commit 41946925ee87808e31956ee2cf5a92c1e5d3613a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 30 14:26:00 2012 +0100

    more_fonts: convert to ExternalPackage for incremental builds
    
    Change-Id: Id24975e0bc9a28f6c66599c4b58c01471dd2d8ef

diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk
new file mode 100644
index 0000000..c1209ec
--- /dev/null
+++ b/more_fonts/ExternalPackage_dejavu.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,font_dejavu_inc,font_dejavu))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,font_dejavu_inc,pck,\
+	ttf/DejaVuSans-Bold.ttf \
+	ttf/DejaVuSans-BoldOblique.ttf \
+	ttf/DejaVuSans-ExtraLight.ttf \
+	ttf/DejaVuSans-Oblique.ttf \
+	ttf/DejaVuSans.ttf \
+	ttf/DejaVuSansCondensed-Bold.ttf \
+	ttf/DejaVuSansCondensed-BoldOblique.ttf \
+	ttf/DejaVuSansCondensed-Oblique.ttf \
+	ttf/DejaVuSansCondensed.ttf \
+	ttf/DejaVuSansMono-Bold.ttf \
+	ttf/DejaVuSansMono-BoldOblique.ttf \
+	ttf/DejaVuSansMono-Oblique.ttf \
+	ttf/DejaVuSansMono.ttf \
+	ttf/DejaVuSerif-Bold.ttf \
+	ttf/DejaVuSerif-BoldItalic.ttf \
+	ttf/DejaVuSerif-Italic.ttf \
+	ttf/DejaVuSerif.ttf \
+	ttf/DejaVuSerifCondensed-Bold.ttf \
+	ttf/DejaVuSerifCondensed-BoldItalic.ttf \
+	ttf/DejaVuSerifCondensed-Italic.ttf \
+	ttf/DejaVuSerifCondensed.ttf \
+))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_file,font_dejavu_lic,pck/License_dejavu.txt,LICENSE))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_gentium.mk b/more_fonts/ExternalPackage_gentium.mk
new file mode 100644
index 0000000..3992d2b
--- /dev/null
+++ b/more_fonts/ExternalPackage_gentium.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,font_gentium_inc,font_gentium))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,font_gentium_inc,pck,\
+	GenBasB.ttf \
+	GenBasBI.ttf \
+	GenBasI.ttf \
+	GenBasR.ttf \
+	GenBkBasB.ttf \
+	GenBkBasBI.ttf \
+	GenBkBasI.ttf \
+	GenBkBasR.ttf \
+))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_file,font_gentium_inc,pck/License_gentium.txt,OFL.txt))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk
new file mode 100644
index 0000000..a0aae9a
--- /dev/null
+++ b/more_fonts/ExternalPackage_liberation.mk
@@ -0,0 +1,29 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,font_liberation_inc,font_liberation))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_inc,pck,\
+	LiberationMono-Bold.ttf \
+	LiberationMono-BoldItalic.ttf \
+	LiberationMono-Italic.ttf \
+	LiberationMono-Regular.ttf \
+	LiberationSans-Bold.ttf \
+	LiberationSans-BoldItalic.ttf \
+	LiberationSans-Italic.ttf \
+	LiberationSans-Regular.ttf \
+	LiberationSerif-Bold.ttf \
+	LiberationSerif-BoldItalic.ttf \
+	LiberationSerif-Italic.ttf \
+	LiberationSerif-Regular.ttf \
+))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_file,font_liberation_inc,pck/License_liberation.txt,LICENSE))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk
new file mode 100644
index 0000000..2672d75
--- /dev/null
+++ b/more_fonts/ExternalPackage_liberation_narrow.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,font_liberation_narrow_inc,font_liberation_narrow))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_narrow_inc,pck,\
+	LiberationSansNarrow-Bold.ttf \
+	LiberationSansNarrow-BoldItalic.ttf \
+	LiberationSansNarrow-Italic.ttf \
+	LiberationSansNarrow-Regular.ttf \
+))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_file,font_liberation_narrow_inc,pck/License_liberation_narrow.txt,License.txt))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/ExternalPackage_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk
new file mode 100644
index 0000000..f0e8af2
--- /dev/null
+++ b/more_fonts/ExternalPackage_libertineg.mk
@@ -0,0 +1,27 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,font_libertineg_inc,font_libertineg))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,font_libertineg_inc,pck,\
+	LinBiolinum_RB_G.ttf \
+	LinBiolinum_RI_G.ttf \
+	LinBiolinum_R_G.ttf \
+	LinLibertine_DR_G.ttf \
+	LinLibertine_RBI_G.ttf \
+	LinLibertine_RB_G.ttf \
+	LinLibertine_RI_G.ttf \
+	LinLibertine_RZI_G.ttf \
+	LinLibertine_RZ_G.ttf \
+	LinLibertine_R_G.ttf \
+))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_file,font_libertineg_inc,pck/License_libertineg.txt,OFL.txt))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Module_more_fonts.mk b/more_fonts/Module_more_fonts.mk
index 7beb2d5..f054b21 100644
--- a/more_fonts/Module_more_fonts.mk
+++ b/more_fonts/Module_more_fonts.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_Module_Module,more_fonts))
 
 $(eval $(call gb_Module_add_targets,more_fonts,\
 	Package_conf \
-	Package_dejavu \
-	Package_gentium \
-	Package_liberation \
-	Package_liberation_narrow \
-	Package_libertineg \
+	ExternalPackage_dejavu \
+	ExternalPackage_gentium \
+	ExternalPackage_liberation \
+	ExternalPackage_liberation_narrow \
+	ExternalPackage_libertineg \
 	UnpackedTarball_dejavu \
 	UnpackedTarball_gentium \
 	UnpackedTarball_liberation \
diff --git a/more_fonts/Package_dejavu.mk b/more_fonts/Package_dejavu.mk
deleted file mode 100644
index f7dc3b8..0000000
--- a/more_fonts/Package_dejavu.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,font_dejavu_inc,$(call gb_UnpackedTarball_get_dir,font_dejavu)))
-
-$(eval $(call gb_Package_use_unpacked,font_dejavu_inc,font_dejavu))
-
-$(eval $(call gb_Package_add_files,font_dejavu_inc,pck,\
-	ttf/DejaVuSans-Bold.ttf \
-	ttf/DejaVuSans-BoldOblique.ttf \
-	ttf/DejaVuSans-ExtraLight.ttf \
-	ttf/DejaVuSans-Oblique.ttf \
-	ttf/DejaVuSans.ttf \
-	ttf/DejaVuSansCondensed-Bold.ttf \
-	ttf/DejaVuSansCondensed-BoldOblique.ttf \
-	ttf/DejaVuSansCondensed-Oblique.ttf \
-	ttf/DejaVuSansCondensed.ttf \
-	ttf/DejaVuSansMono-Bold.ttf \
-	ttf/DejaVuSansMono-BoldOblique.ttf \
-	ttf/DejaVuSansMono-Oblique.ttf \
-	ttf/DejaVuSansMono.ttf \
-	ttf/DejaVuSerif-Bold.ttf \
-	ttf/DejaVuSerif-BoldItalic.ttf \
-	ttf/DejaVuSerif-Italic.ttf \
-	ttf/DejaVuSerif.ttf \
-	ttf/DejaVuSerifCondensed-Bold.ttf \
-	ttf/DejaVuSerifCondensed-BoldItalic.ttf \
-	ttf/DejaVuSerifCondensed-Italic.ttf \
-	ttf/DejaVuSerifCondensed.ttf \
-))
-
-$(eval $(call gb_Package_add_file,font_dejavu_lic,pck/License_dejavu.txt,LICENSE))
diff --git a/more_fonts/Package_gentium.mk b/more_fonts/Package_gentium.mk
deleted file mode 100644
index 2e9093a..0000000
--- a/more_fonts/Package_gentium.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,font_gentium_inc,$(call gb_UnpackedTarball_get_dir,font_gentium)))
-
-$(eval $(call gb_Package_use_unpacked,font_gentium_inc,font_gentium))
-
-$(eval $(call gb_Package_add_files,font_gentium_inc,pck,\
-	GenBasB.ttf \
-	GenBasBI.ttf \
-	GenBasI.ttf \
-	GenBasR.ttf \
-	GenBkBasB.ttf \
-	GenBkBasBI.ttf \
-	GenBkBasI.ttf \
-	GenBkBasR.ttf \
-))
-
-$(eval $(call gb_Package_add_file,font_gentium_inc,pck/License_gentium.txt,OFL.txt))
diff --git a/more_fonts/Package_liberation.mk b/more_fonts/Package_liberation.mk
deleted file mode 100644
index 525736e..0000000
--- a/more_fonts/Package_liberation.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,font_liberation_inc,$(call gb_UnpackedTarball_get_dir,font_liberation)))
-
-$(eval $(call gb_Package_use_unpacked,font_liberation_inc,font_liberation))
-
-$(eval $(call gb_Package_add_files,font_liberation_inc,pck,\
-	LiberationMono-Bold.ttf \
-	LiberationMono-BoldItalic.ttf \
-	LiberationMono-Italic.ttf \
-	LiberationMono-Regular.ttf \
-	LiberationSans-Bold.ttf \
-	LiberationSans-BoldItalic.ttf \
-	LiberationSans-Italic.ttf \
-	LiberationSans-Regular.ttf \
-	LiberationSerif-Bold.ttf \
-	LiberationSerif-BoldItalic.ttf \
-	LiberationSerif-Italic.ttf \
-	LiberationSerif-Regular.ttf \
-))
-
-$(eval $(call gb_Package_add_file,font_liberation_inc,pck/License_liberation.txt,LICENSE))
-
-# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Package_liberation_narrow.mk b/more_fonts/Package_liberation_narrow.mk
deleted file mode 100644
index 7135589..0000000
--- a/more_fonts/Package_liberation_narrow.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,font_liberation_narrow_inc,$(call gb_UnpackedTarball_get_dir,font_liberation_narrow)))
-
-$(eval $(call gb_Package_use_unpacked,font_liberation_narrow_inc,font_liberation_narrow))
-
-$(eval $(call gb_Package_add_files,font_liberation_narrow_inc,pck,\
-	LiberationSansNarrow-Bold.ttf \
-	LiberationSansNarrow-BoldItalic.ttf \
-	LiberationSansNarrow-Italic.ttf \
-	LiberationSansNarrow-Regular.ttf \
-))
-
-$(eval $(call gb_Package_add_file,font_liberation_narrow_inc,pck/License_liberation_narrow.txt,License.txt))
diff --git a/more_fonts/Package_libertineg.mk b/more_fonts/Package_libertineg.mk
deleted file mode 100644
index 644d29f..0000000
--- a/more_fonts/Package_libertineg.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,font_libertineg_inc,$(call gb_UnpackedTarball_get_dir,font_libertineg)))
-
-$(eval $(call gb_Package_use_unpacked,font_libertineg_inc,font_libertineg))
-
-$(eval $(call gb_Package_add_files,font_libertineg_inc,pck,\
-	LinBiolinum_RB_G.ttf \
-	LinBiolinum_RI_G.ttf \
-	LinBiolinum_R_G.ttf \
-	LinLibertine_DR_G.ttf \
-	LinLibertine_RBI_G.ttf \
-	LinLibertine_RB_G.ttf \
-	LinLibertine_RI_G.ttf \
-	LinLibertine_RZI_G.ttf \
-	LinLibertine_RZ_G.ttf \
-	LinLibertine_R_G.ttf \
-))
-
-$(eval $(call gb_Package_add_file,font_libertineg_inc,pck/License_libertineg.txt,OFL.txt))
-
commit 9148ad0206a407abbbed658da75d5de98ae2945a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 30 13:28:58 2012 +0100

    extras: extra_fonts needs to be a ExternalPackage
    
    ... so everything is re-delivered on an incremental build when unpack
    happens.
    
    Change-Id: I0d6dae6bdbafc94898546146140069d4c67f5c8e

diff --git a/extras/ExternalPackage_extra_fonts.mk b/extras/ExternalPackage_extra_fonts.mk
new file mode 100644
index 0000000..638af35
--- /dev/null
+++ b/extras/ExternalPackage_extra_fonts.mk
@@ -0,0 +1,187 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,extras_extra_fonts,fonts-pack))
+
+$(eval $(call gb_ExternalPackage_use_unpacked,extras_extra_fonts,fonts-pack))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,pck,\
+	decorative/BETSY2.ttf \
+	decorative/Berylibi.ttf \
+	decorative/Beryliub.ttf \
+	decorative/Beryliui.ttf \
+	decorative/Berylium.ttf \
+	decorative/CHOPS___.TTF \
+	decorative/DTPDingbats.ttf \
+	decorative/GenAI102.TTF \
+	decorative/GenAR102.TTF \
+	decorative/GenI102.TTF \
+	decorative/GenR102.TTF \
+	decorative/Justus-Bold.ttf \
+	decorative/Justus-Italic.ttf \
+	decorative/Justus-ItalicOldstyle.ttf \
+	decorative/Justus-Oldstyle.ttf \
+	decorative/Justus-Roman.ttf \
+	decorative/Justus-Versalitas.ttf \
+	decorative/MgOpenCanonicaBold.ttf \
+	decorative/MgOpenCanonicaBoldItalic.ttf \
+	decorative/MgOpenCanonicaItalic.ttf \
+	decorative/MgOpenCanonicaRegular.ttf \
+	decorative/NEUROPOL.ttf \
+	decorative/SAPPM___.ttf \
+	decorative/Tuffy.ttf \
+	decorative/Tuffy_Bold.ttf \
+	decorative/Tuffy_Bold_Italic.ttf \
+	decorative/Tuffy_Italic.ttf \
+	decorative/Verina_Sans_Bold.otf \
+	decorative/Verina_Sans_Bold_Oblique.otf \
+	decorative/Verina_Sans_Mono.otf \
+	decorative/Verina_Sans_Mono_Bold.otf \
+	decorative/Verina_Sans_Mono_Bold_Oblique.otf \
+	decorative/Verina_Sans_Mono_Oblique.otf \
+	decorative/Verina_Sans_Oblique.otf \
+	decorative/Verina_Sans_Roman.otf \
+	decorative/Verina_Serif.otf \
+	decorative/Verina_Serif_Bold.otf \
+	decorative/a010013l.ttf \
+	decorative/a010015l.ttf \
+	decorative/a010033l.ttf \
+	decorative/a010035l.ttf \
+	decorative/airmole.ttf \
+	decorative/airmolea.ttf \
+	decorative/airmoleq.ttf \
+	decorative/airmoles.ttf \
+	decorative/astronbi.ttf \
+	decorative/astronbo.ttf \
+	decorative/astronbv.ttf \
+	decorative/astronbw.ttf \
+	decorative/b018012l.ttf \
+	decorative/b018015l.ttf \
+	decorative/b018032l.ttf \
+	decorative/b018035l.ttf \
+	decorative/baveuse.ttf \
+	decorative/bluebold.ttf \
+	decorative/bluecond.ttf \
+	decorative/bluehigh.ttf \
+	decorative/bluehigl.ttf \
+	decorative/bullpen3.ttf \
+	decorative/bullpen_.ttf \
+	decorative/bullpeni.ttf \
+	decorative/c059013l.ttf \
+	decorative/c059016l.ttf \
+	decorative/c059033l.ttf \
+	decorative/c059036l.ttf \
+	decorative/colourba.ttf \
+	decorative/colourbb.ttf \
+	decorative/counters.ttf \
+	decorative/creditva.ttf \
+	decorative/creditvb.ttf \
+	decorative/creditvi.ttf \
+	decorative/creditvz.ttf \
+	decorative/d050000l.ttf \
+	decorative/edmundis.ttf \
+	decorative/edmunds.ttf \
+	decorative/engeboit.ttf \
+	decorative/engebold.ttf \
+	decorative/engeexbi.ttf \
+	decorative/engeexbo.ttf \
+	decorative/engeexit.ttf \
+	decorative/engeexpa.ttf \
+	decorative/engeital.ttf \
+	decorative/engeregu.ttf \
+	decorative/goodfisb.ttf \
+	decorative/goodfisc.ttf \
+	decorative/goodfish.ttf \
+	decorative/goodfisi.ttf \
+	decorative/guanine_.ttf \
+	decorative/gunplay.ttf \
+	decorative/kirsty__.ttf \
+	decorative/kirsty_b.ttf \
+	decorative/kirsty_i.ttf \
+	decorative/kirstybi.ttf \
+	decorative/kirstyin.ttf \
+	decorative/letstracebasic.ttf \
+	decorative/letstraceruled.ttf \
+	decorative/luximb.ttf \
+	decorative/luximbi.ttf \
+	decorative/luximr.ttf \
+	decorative/luximri.ttf \
+	decorative/luxirb.ttf \
+	decorative/luxirbi.ttf \
+	decorative/luxirr.ttf \
+	decorative/luxirri.ttf \
+	decorative/luxisb.ttf \
+	decorative/luxisbi.ttf \
+	decorative/luxisr.ttf \
+	decorative/luxisri.ttf \
+	decorative/mufferaw.ttf \
+	decorative/n019003l.ttf \
+	decorative/n019004l.ttf \
+	decorative/n019023l.ttf \
+	decorative/n019024l.ttf \
+	decorative/n019043l.ttf \
+	decorative/n019044l.ttf \
+	decorative/n019063l.ttf \
+	decorative/n019064l.ttf \
+	decorative/n021003l.ttf \
+	decorative/n021004l.ttf \
+	decorative/n021023l.ttf \
+	decorative/n021024l.ttf \
+	decorative/n022003l.ttf \
+	decorative/n022004l.ttf \
+	decorative/n022023l.ttf \
+	decorative/n022024l.ttf \
+	decorative/nasaliza.ttf \
+	decorative/numberpi.ttf \
+	decorative/p052003l.ttf \
+	decorative/p052004l.ttf \
+	decorative/p052023l.ttf \
+	decorative/p052024l.ttf \
+	decorative/pricedow.ttf \
+	decorative/pupcat__.ttf \
+	decorative/rina.ttf \
+	decorative/s050000l.ttf \
+	decorative/sandoval.ttf \
+	decorative/screenge.ttf \
+	decorative/steelfib.ttf \
+	decorative/steelfis.ttf \
+	decorative/steelout.ttf \
+	decorative/strenu3d.ttf \
+	decorative/strenuou.ttf \
+	decorative/subpear_.ttf \
+	decorative/teen____.ttf \
+	decorative/teenbdit.ttf \
+	decorative/teenbold.ttf \
+	decorative/teenital.ttf \
+	decorative/teenlita.ttf \
+	decorative/teenlite.ttf \
+	decorative/typoderm.ttf \
+	decorative/vahika_.ttf \
+	decorative/vahikab.ttf \
+	decorative/vahikac.ttf \
+	decorative/vahikai.ttf \
+	decorative/vectroid.ttf \
+	decorative/velvenda.ttf \
+	decorative/velvendc.ttf \
+	decorative/vibroceb.ttf \
+	decorative/vibrocei.ttf \
+	decorative/vibrocen.ttf \
+	decorative/vibrocex.ttf \
+	decorative/wintermu.ttf \
+	decorative/youregoi.ttf \
+	decorative/youregon.ttf \
+	decorative/z003034l.ttf \
+	decorative/zekton__.ttf \
+	decorative/zektonbi.ttf \
+	decorative/zektonbo.ttf \
+	decorative/zektonit.ttf \
+	decorative/zorque.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 50c46e5..eb5a07d 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -50,7 +50,7 @@ endif
 
 ifeq ($(WITH_EXTRA_FONT),YES)
 $(eval $(call gb_Module_add_targets,extras,\
-	Package_extra_fonts \
+	ExternalPackage_extra_fonts \
 	UnpackedTarball_fonts_pack \
 ))
 endif
diff --git a/extras/Package_extra_fonts.mk b/extras/Package_extra_fonts.mk
deleted file mode 100644
index f37d4e7..0000000
--- a/extras/Package_extra_fonts.mk
+++ /dev/null
@@ -1,187 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,extras_extra_fonts,$(call gb_UnpackedTarball_get_dir,fonts-pack)/decorative))
-
-$(eval $(call gb_Package_use_unpacked,extras_extra_fonts,fonts-pack))
-
-$(eval $(call gb_Package_add_files,extras_extra_fonts,pck,\
-	BETSY2.ttf \
-	Berylibi.ttf \
-	Beryliub.ttf \
-	Beryliui.ttf \
-	Berylium.ttf \
-	CHOPS___.TTF \
-	DTPDingbats.ttf \
-	GenAI102.TTF \
-	GenAR102.TTF \
-	GenI102.TTF \
-	GenR102.TTF \
-	Justus-Bold.ttf \
-	Justus-Italic.ttf \
-	Justus-ItalicOldstyle.ttf \
-	Justus-Oldstyle.ttf \
-	Justus-Roman.ttf \
-	Justus-Versalitas.ttf \
-	MgOpenCanonicaBold.ttf \
-	MgOpenCanonicaBoldItalic.ttf \
-	MgOpenCanonicaItalic.ttf \
-	MgOpenCanonicaRegular.ttf \
-	NEUROPOL.ttf \
-	SAPPM___.ttf \
-	Tuffy.ttf \
-	Tuffy_Bold.ttf \
-	Tuffy_Bold_Italic.ttf \
-	Tuffy_Italic.ttf \
-	Verina_Sans_Bold.otf \
-	Verina_Sans_Bold_Oblique.otf \
-	Verina_Sans_Mono.otf \
-	Verina_Sans_Mono_Bold.otf \
-	Verina_Sans_Mono_Bold_Oblique.otf \
-	Verina_Sans_Mono_Oblique.otf \
-	Verina_Sans_Oblique.otf \
-	Verina_Sans_Roman.otf \
-	Verina_Serif.otf \
-	Verina_Serif_Bold.otf \
-	a010013l.ttf \
-	a010015l.ttf \
-	a010033l.ttf \
-	a010035l.ttf \
-	airmole.ttf \
-	airmolea.ttf \
-	airmoleq.ttf \
-	airmoles.ttf \
-	astronbi.ttf \
-	astronbo.ttf \
-	astronbv.ttf \
-	astronbw.ttf \
-	b018012l.ttf \
-	b018015l.ttf \
-	b018032l.ttf \
-	b018035l.ttf \
-	baveuse.ttf \
-	bluebold.ttf \
-	bluecond.ttf \
-	bluehigh.ttf \
-	bluehigl.ttf \
-	bullpen3.ttf \
-	bullpen_.ttf \
-	bullpeni.ttf \
-	c059013l.ttf \
-	c059016l.ttf \
-	c059033l.ttf \
-	c059036l.ttf \
-	colourba.ttf \
-	colourbb.ttf \
-	counters.ttf \
-	creditva.ttf \
-	creditvb.ttf \
-	creditvi.ttf \
-	creditvz.ttf \
-	d050000l.ttf \
-	edmundis.ttf \
-	edmunds.ttf \
-	engeboit.ttf \
-	engebold.ttf \
-	engeexbi.ttf \
-	engeexbo.ttf \
-	engeexit.ttf \
-	engeexpa.ttf \
-	engeital.ttf \
-	engeregu.ttf \
-	goodfisb.ttf \
-	goodfisc.ttf \
-	goodfish.ttf \
-	goodfisi.ttf \
-	guanine_.ttf \
-	gunplay.ttf \
-	kirsty__.ttf \
-	kirsty_b.ttf \
-	kirsty_i.ttf \
-	kirstybi.ttf \
-	kirstyin.ttf \
-	letstracebasic.ttf \
-	letstraceruled.ttf \
-	luximb.ttf \
-	luximbi.ttf \
-	luximr.ttf \
-	luximri.ttf \
-	luxirb.ttf \
-	luxirbi.ttf \
-	luxirr.ttf \
-	luxirri.ttf \
-	luxisb.ttf \
-	luxisbi.ttf \
-	luxisr.ttf \
-	luxisri.ttf \
-	mufferaw.ttf \
-	n019003l.ttf \
-	n019004l.ttf \
-	n019023l.ttf \
-	n019024l.ttf \
-	n019043l.ttf \
-	n019044l.ttf \
-	n019063l.ttf \
-	n019064l.ttf \
-	n021003l.ttf \
-	n021004l.ttf \
-	n021023l.ttf \
-	n021024l.ttf \
-	n022003l.ttf \
-	n022004l.ttf \
-	n022023l.ttf \
-	n022024l.ttf \
-	nasaliza.ttf \
-	numberpi.ttf \
-	p052003l.ttf \
-	p052004l.ttf \
-	p052023l.ttf \
-	p052024l.ttf \
-	pricedow.ttf \
-	pupcat__.ttf \
-	rina.ttf \
-	s050000l.ttf \
-	sandoval.ttf \
-	screenge.ttf \
-	steelfib.ttf \
-	steelfis.ttf \
-	steelout.ttf \
-	strenu3d.ttf \
-	strenuou.ttf \
-	subpear_.ttf \
-	teen____.ttf \
-	teenbdit.ttf \
-	teenbold.ttf \
-	teenital.ttf \
-	teenlita.ttf \
-	teenlite.ttf \
-	typoderm.ttf \
-	vahika_.ttf \
-	vahikab.ttf \
-	vahikac.ttf \
-	vahikai.ttf \
-	vectroid.ttf \
-	velvenda.ttf \
-	velvendc.ttf \
-	vibroceb.ttf \
-	vibrocei.ttf \
-	vibrocen.ttf \
-	vibrocex.ttf \
-	wintermu.ttf \
-	youregoi.ttf \
-	youregon.ttf \
-	z003034l.ttf \
-	zekton__.ttf \
-	zektonbi.ttf \
-	zektonbo.ttf \
-	zektonit.ttf \
-	zorque.ttf \
-))
-
-# vim: set noet sw=4 ts=4:
