Sun Sep 23 19:29:11 PDT 2012

Makefile.top                                    |    2 -
 Module_tail_build.mk                            |    3 +
 config_host.mk.in                               |    7 +++
 configure.in                                    |   46 +++++++++++++++++-------
 more_fonts/Makefile                             |    7 +++
 more_fonts/Module_more_fonts.mk                 |   26 +++++++++++++
 more_fonts/Package_conf.mk                      |   14 +++++++
 more_fonts/Package_dejavu.mk                    |   41 +++++++++++++++++++++
 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 ++++++++++++++
 more_fonts/UnpackedTarball_dejavu.mk            |   14 +++++++
 more_fonts/UnpackedTarball_gentium.mk           |   14 +++++++
 more_fonts/UnpackedTarball_liberation.mk        |   14 +++++++
 more_fonts/UnpackedTarball_liberation_narrow.mk |   14 +++++++
 more_fonts/UnpackedTarball_libertineg.mk        |   15 +++++++
 more_fonts/prj/build.lst                        |    7 ---
 more_fonts/prj/d.lst                            |   14 -------
 ooo.lst.in                                      |   10 ++---
 postprocess/prj/build.lst                       |    2 -
 21 files changed, 315 insertions(+), 40 deletions(-)

New commits:
commit 0b963e89a04ce0ec6693b2e54bbedf544c0b5f00
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Sep 23 21:24:39 2012 -0500

    gbuildification of more_fonts
    
    Change-Id: Ifae1342ee0af447cb08a24e0804f6e42ae826a2a

diff --git a/Makefile.top b/Makefile.top
index 990aabb..6cbce02 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -103,6 +103,7 @@ lingucomponent\
 linguistic\
 lotuswordpro\
 mdds\
+more_fonts\
 neon\
 nlpsolver\
 np_sdk\
@@ -227,7 +228,6 @@ libxslt\
 lcms2\
 lpsolve\
 migrationanalysis\
-more_fonts\
 moz\
 mysqlc\
 mysqlcppconn\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index aed96a2..370da00 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -112,6 +112,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     MathMLDTD \
 	mdds \
     Mesa \
+	$(if $(filter MORE_FONTS,$(BUILD_TYPE)),\
+		more_fonts \
+	) \
 	$(if $(filter NEON,$(BUILD_TYPE)),\
 		neon \
 	) \
diff --git a/config_host.mk.in b/config_host.mk.in
index 467d95c..ef87773 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -170,6 +170,11 @@ export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
 export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
 export FLEX=@FLEX@
 export FLUTE_JAR=@FLUTE_JAR@
+export FONT_LINLIBERTINEG_TARBALL=@FONT_LINLIBERTINEG_TARBALL@
+export FONT_LIBERATION_NARROW_TARBALL=@FONT_LIBERATION_NARROW_TARBALL@
+export FONT_LIBERATION_TARBALL=@FONT_LIBERATION_TARBALL@
+export FONT_GENTIUM_TARBALL=@FONT_GENTIUM_TARBALL@
+export FONT_DEJAVU_TARBALL=@FONT_DEJAVU_TARBALL@
 export FONTCONFIG_CFLAGS=@FONTCONFIG_CFLAGS@
 export FONTCONFIG_LIBS=@FONTCONFIG_LIBS@
 export FRAMEWORKSHOME=@FRAMEWORKSHOME@
@@ -603,7 +608,7 @@ export WINDRES=@WINDRES@
 export WINEGCC=@WINEGCC@
 export WITHOUT_AFMS=@WITHOUT_AFMS@
 export WITHOUT_PPDS=@WITHOUT_PPDS@
-export WITH_AGFA_MONOTYPE_FONTS=@WITH_AGFA_MONOTYPE_FONTS@
+#export WITH_AGFA_MONOTYPE_FONTS=@WITH_AGFA_MONOTYPE_FONTS@
 export WITH_BINFILTER=@WITH_BINFILTER@
 export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@
 export WITH_EXTENSION_INTEGRATION=@WITH_EXTENSION_INTEGRATION@
diff --git a/configure.in b/configure.in
index 2e1feec..16b81fc 100644
--- a/configure.in
+++ b/configure.in
@@ -10901,24 +10901,46 @@ if test "$with_fonts" != "no"; then
     AC_MSG_RESULT([yes])
     WITH_FONTS=YES
     BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
+    FONT_DEJAVU_TARBALL="f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip"
+    FONT_GENTIUM_TARBALL="35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
+    FONT_LIBERATION_NARROW_TARBALL="0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz"
+    FONT_LIBERATION_TARBALL="cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz"
+    FONT_LINLIBERTINEG_TARBALL="e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"
 else
     AC_MSG_RESULT([no])
     WITH_FONTS=NO
     SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
-fi
+    FONT_DEJAVU_TARBALL=
+    FONT_GENTIUM_TARBALL=
+    FONT_LIBERATION_NARROW_TARBALL=
+    FONT_LIBERATION_TARBALL=
+    FONT_LINLIBERTINEG_TARBALL=
+fi
+AC_SUBST(FONT_DEJAVU_TARBALL)
+AC_SUBST(FONT_GENTIUM_TARBALL)
+AC_SUBST(FONT_LIBERATION_TARBALL)
+AC_SUBST(FONT_LINLIBERTINEG_TARBALL)
+AC_SUBST(FONT_LIBERATION_NARROW_TARBALL)
 AC_SUBST(WITH_FONTS)
 
-AC_MSG_CHECKING([whether to include Agfa Monotype fonts])
-if test "$with_agfa_monotype_fonts" = "yes"; then
-    AC_MSG_RESULT([yes])
-    WITH_AGFA_MONOTYPE_FONTS=YES
-    SCPDEFS="$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS"
-    BUILD_TYPE="$BUILD_TYPE AGFA_MONOTYPE_FONTS"
-else
-    AC_MSG_RESULT([no])
-    WITH_AGFA_MONOTYPE_FONTS=NO
-fi
-AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
+
+# The agfa monotype fonts options seems broken
+# there is no assocaited entry in ooo.lst
+# so we do not fetch the dependencies
+# there is no tie-up with MORE_FONTS, but in dmake mode
+# without more_fonts that option is meaningless
+# so I suspect it is not really used anymore, commenting out for now
+#AC_MSG_CHECKING([whether to include Agfa Monotype fonts])
+#if test "$with_agfa_monotype_fonts" = "yes"; then
+#    AC_MSG_RESULT([yes])
+#    WITH_AGFA_MONOTYPE_FONTS=YES
+#    SCPDEFS="$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS"
+#    BUILD_TYPE="$BUILD_TYPE AGFA_MONOTYPE_FONTS"
+#else
+#    AC_MSG_RESULT([no])
+#    WITH_AGFA_MONOTYPE_FONTS=NO
+#fi
+#AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
 
 dnl ===================================================================
 dnl Test whether to include ppds
diff --git a/more_fonts/Makefile b/more_fonts/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/more_fonts/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Module_more_fonts.mk b/more_fonts/Module_more_fonts.mk
new file mode 100644
index 0000000..7beb2d5
--- /dev/null
+++ b/more_fonts/Module_more_fonts.mk
@@ -0,0 +1,26 @@
+# -*- 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_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 \
+	UnpackedTarball_dejavu \
+	UnpackedTarball_gentium \
+	UnpackedTarball_liberation \
+	UnpackedTarball_liberation_narrow \
+	UnpackedTarball_libertineg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Package_conf.mk b/more_fonts/Package_conf.mk
new file mode 100644
index 0000000..d5160bf
--- /dev/null
+++ b/more_fonts/Package_conf.mk
@@ -0,0 +1,14 @@
+# -*- 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,more_fonts_inc,$(SRCDIR)/more_fonts/fonts))
+
+$(eval $(call gb_Package_add_file,more_fonts_inc,pck/fc_local.conf,fc_local.conf))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Package_dejavu.mk b/more_fonts/Package_dejavu.mk
new file mode 100644
index 0000000..565442b
--- /dev/null
+++ b/more_fonts/Package_dejavu.mk
@@ -0,0 +1,41 @@
+# -*- 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/ttf)))
+
+$(eval $(call gb_Package_use_unpacked,font_dejavu_inc,font_dejavu))
+
+$(eval $(call gb_Package_add_files,font_dejavu_inc,pck,\
+	DejaVuSans-Bold.ttf \
+	DejaVuSans-BoldOblique.ttf \
+	DejaVuSans-ExtraLight.ttf \
+	DejaVuSans-Oblique.ttf \
+	DejaVuSans.ttf \
+	DejaVuSansCondensed-Bold.ttf \
+	DejaVuSansCondensed-BoldOblique.ttf \
+	DejaVuSansCondensed-Oblique.ttf \
+	DejaVuSansCondensed.ttf \
+	DejaVuSansMono-Bold.ttf \
+	DejaVuSansMono-BoldOblique.ttf \
+	DejaVuSansMono-Oblique.ttf \
+	DejaVuSansMono.ttf \
+	DejaVuSerif-Bold.ttf \
+	DejaVuSerif-BoldItalic.ttf \
+	DejaVuSerif-Italic.ttf \
+	DejaVuSerif.ttf \
+	DejaVuSerifCondensed-Bold.ttf \
+	DejaVuSerifCondensed-BoldItalic.ttf \
+	DejaVuSerifCondensed-Italic.ttf \
+	DejaVuSerifCondensed.ttf \
+))
+
+
+$(eval $(call gb_Package_Package,font_dejavu_lic,$(call gb_UnpackedTarball_get_dir,font_dejavu/)))
+$(eval $(call gb_Package_use_unpacked,font_dejavu_lic,font_dejavu))
+$(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
new file mode 100644
index 0000000..2e9093a
--- /dev/null
+++ b/more_fonts/Package_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_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
new file mode 100644
index 0000000..525736e
--- /dev/null
+++ b/more_fonts/Package_liberation.mk
@@ -0,0 +1,31 @@
+# -*- 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
new file mode 100644
index 0000000..7135589
--- /dev/null
+++ b/more_fonts/Package_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_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
new file mode 100644
index 0000000..644d29f
--- /dev/null
+++ b/more_fonts/Package_libertineg.mk
@@ -0,0 +1,28 @@
+# -*- 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))
+
diff --git a/more_fonts/UnpackedTarball_dejavu.mk b/more_fonts/UnpackedTarball_dejavu.mk
new file mode 100644
index 0000000..d7742df
--- /dev/null
+++ b/more_fonts/UnpackedTarball_dejavu.mk
@@ -0,0 +1,14 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,font_dejavu))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_dejavu,$(FONT_DEJAVU_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/UnpackedTarball_gentium.mk b/more_fonts/UnpackedTarball_gentium.mk
new file mode 100644
index 0000000..0827c0e
--- /dev/null
+++ b/more_fonts/UnpackedTarball_gentium.mk
@@ -0,0 +1,14 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,font_gentium))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_gentium,$(FONT_GENTIUM_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/UnpackedTarball_liberation.mk b/more_fonts/UnpackedTarball_liberation.mk
new file mode 100644
index 0000000..8e428f5
--- /dev/null
+++ b/more_fonts/UnpackedTarball_liberation.mk
@@ -0,0 +1,14 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,font_liberation))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_liberation,$(FONT_LIBERATION_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/UnpackedTarball_liberation_narrow.mk b/more_fonts/UnpackedTarball_liberation_narrow.mk
new file mode 100644
index 0000000..52e6f86
--- /dev/null
+++ b/more_fonts/UnpackedTarball_liberation_narrow.mk
@@ -0,0 +1,14 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,font_liberation_narrow))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_liberation_narrow,$(FONT_LIBERATION_NARROW_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/UnpackedTarball_libertineg.mk b/more_fonts/UnpackedTarball_libertineg.mk
new file mode 100644
index 0000000..51610ba
--- /dev/null
+++ b/more_fonts/UnpackedTarball_libertineg.mk
@@ -0,0 +1,15 @@
+# -*- 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_UnpackedTarball_UnpackedTarball,font_libertineg))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_libertineg,$(FONT_LINLIBERTINEG_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst
index 86d0861..af6aa60 100644
--- a/more_fonts/prj/build.lst
+++ b/more_fonts/prj/build.lst
@@ -1,7 +1,2 @@
 bs	more_fonts	:	solenv NULL
-bs	more_fonts\fonts\ttf_dejavu		nmake	-	all	deja_fonts NULL
-bs	more_fonts\fonts\ttf_liberation	nmake	-	all	libe_fonts NULL
-bs	more_fonts\fonts\ttf_liberation_narrow	nmake	-	all	libe_fonts_narrow NULL
-bs	more_fonts\fonts\ttf_gentium	nmake	-	all	gent_fonts NULL
-bs	more_fonts\fonts\ttf_linlibertineg	nmake	-	all	linl_fonts NULL
-bs	more_fonts\fonts\ttf_amt	nmake	-	all	amt_fonts NULL
+bs	more_fonts\prj		nmake	-	all	more_fonts NULL
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index 9d4a90e..e69de29 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -1,14 +0,0 @@
-mkdir: %COMMON_DEST%\pck
-..\fonts\fc_local.conf	%COMMON_DEST%\pck\fc_local.conf
-# TODO: replace explicit versions by wildcard when the build system learns to handle them
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\ttf\*.ttf	%COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\LICENSE		%COMMON_DEST%\pck\LICENSE_dejavu
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/Liberation*Narrow*.ttf	%COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/License.txt		%COMMON_DEST%\pck\LICENSE_liberation_narrow
-..\%__SRC%\misc\build\liberation-fonts-ttf-2.00.0/Liberation*.ttf	%COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\liberation-fonts-ttf-2.00.0/License.txt		%COMMON_DEST%\pck\LICENSE_liberation
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf		%COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt	%COMMON_DEST%\pck\LICENSE_gentium
-..\%__SRC%\misc\build\LinLibertineG\*.ttf		%COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\LinLibertineG\OFL.txt	%COMMON_DEST%\pck\LICENSE_LinLibertineG
-..\%__SRC%\misc\build\agfa-monotype-fonts\*.ttf	%COMMON_DEST%\pck\*.ttf
diff --git a/more_fonts/prj/dmake b/more_fonts/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/ooo.lst.in b/ooo.lst.in
index a7693f0..dfed3ab 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -14,10 +14,12 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz
-cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz
+ at FONT_LINLIBERTINEG_TARBALL@
+ at FONT_LIBERATION_NARROW_TARBALL@
+ at FONT_LIBERATION_TARBALL@
+ at FONT_GENTIUM_TARBALL@
+ at FONT_DEJAVU_TARBALL@
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
@@ -50,7 +52,6 @@ ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
 dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
 fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
 fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
-f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip
 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2
 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
@@ -89,7 +90,6 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
 @VISIO_TARBALL@
-e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 @CMIS_TARBALL@
 @CDR_TARBALL@
 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 726163c..ad37e0d 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm HELP:helpcontent2 LIBRSVG:librsvg ODK:odk MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
+po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm HELP:helpcontent2 LIBRSVG:librsvg ODK:odk LANGUAGETOOL:languagetool MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
