fdo#63197: convert fontunxafm

Change-Id: Ib382319a4916b711c820c06ba57928ca11d0b804
Reviewed-on: https://gerrit.libreoffice.org/3648Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>

afms/Zip_fontunxafm.mk → afms/ExternalPackage_fontunxafm.mk

@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,fontunxafm,$(call gb_UnpackedTarball_get_dir,afms)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,afms_fontunxafm,afms))
 
-$(eval $(call gb_Zip_add_dependencies,fontunxafm,\
-	$(call gb_UnpackedTarball_get_target,afms) \
-))
+$(eval $(call gb_ExternalPackage_set_outdir,afms_fontunxafm,$(INSTDIR)))
 
-$(eval $(call gb_Zip_add_files,fontunxafm,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,afms_fontunxafm,share/psprint/fontmetric,\
 	Courier-Bold.afm \
 	Courier-BoldOblique.afm \
 	Courier-Oblique.afm \

afms/Module_afms.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,afms))
 
 $(eval $(call gb_Module_add_targets,afms,\
 	UnpackedTarball_afms \
-	Zip_fontunxafm \
+	ExternalPackage_fontunxafm \
 ))
 
 # vim: set noet sw=4 ts=4:

scp2/source/ooo/file_extra_ooo.scp

@@ -208,10 +208,10 @@ End
 
 #ifndef WITHOUT_AFMS
 File gid_File_Extra_Fontunxafm
-    Dir = gid_Dir_Psprint_Fontmetric;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "fontunxafm.zip";
+    Styles = (FILELIST);
+    Name = "afms_fontunxafm.filelist";
 End
 #endif