update ext. projects to use ExternalPackage

Change-Id: Ia66854f21446fff9a04b1708964286c566333ab0

clucene/Module_clucene.mk

@@ -30,8 +30,8 @@ $(eval $(call gb_Module_Module,clucene))
 ifeq ($(SYSTEM_CLUCENE),NO)
 ifneq ($(OS),ANDROID)
 $(eval $(call gb_Module_add_targets,clucene,\
+    ExternalPackage_clucene \
     Library_clucene \
-    Package_source \
 	UnpackedTarball_clucene \
 ))
 endif

libcdr/Package_libcdr.mk → libcdr/ExternalPackage_libcdr.mk

@@ -7,11 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,libcdr_inc,$(call gb_UnpackedTarball_get_dir,cdr/src/lib)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr_inc,cdr))
 
-$(eval $(call gb_Package_use_unpacked,libcdr_inc,cdr))
-
-$(eval $(call gb_Package_add_files,libcdr_inc,inc/external/libcdr,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr_inc,inc/external/libcdr,\
 	libcdr.h \
 	CDRDocument.h \
 	CDRStringVector.h \

libcdr/Module_libcdr.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libcdr))
 ifeq ($(SYSTEM_LIBCDR),NO)
 
 $(eval $(call gb_Module_add_targets,libcdr,\
-	Package_libcdr \
+	ExternalPackage_libcdr \
 	StaticLibrary_cdr \
 	UnpackedTarball_cdr \
 ))

libcmis/Package_libcmis.mk → libcmis/ExternalPackage_libcmis.mk

@@ -7,11 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,libcmis_inc,$(call gb_UnpackedTarball_get_dir,cmis/src/libcmis)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libcmis_inc,cmis))
 
-$(eval $(call gb_Package_use_unpacked,libcmis_inc,cmis))
-
-$(eval $(call gb_Package_add_files,libcmis_inc,inc/external/libcmis,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libcmis_inc,inc/external/libcmis,\
 	allowable-actions.hxx \
 	document.hxx \
 	exception.hxx \

libcmis/Module_libcmis.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libcmis))
 ifeq ($(SYSTEM_LIBCMIS),NO)
 
 $(eval $(call gb_Module_add_targets,libcmis,\
-	Package_libcmis \
+	ExternalPackage_libcmis \
 	StaticLibrary_cmis \
 	UnpackedTarball_cmis \
 ))

libmspub/Package_libmspub.mk → libmspub/ExternalPackage_libmspub.mk

@@ -7,11 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,libmspub_inc,$(call gb_UnpackedTarball_get_dir,mspub/src/lib)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub_inc,mspub))
 
-$(eval $(call gb_Package_use_unpacked,libmspub_inc,mspub))
-
-$(eval $(call gb_Package_add_files,libmspub_inc,inc/external/libmspub,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub_inc,inc/external/libmspub,\
 	libmspub.h \
 	MSPUBDocument.h \
 	MSPUBStringVector.h \

libmspub/Module_libmspub.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libmspub))
 ifeq ($(SYSTEM_LIBMSPUB),NO)
 
 $(eval $(call gb_Module_add_targets,libmspub,\
-	Package_libmspub \
+	ExternalPackage_libmspub \
 	StaticLibrary_mspub \
 	UnpackedTarball_mspub \
 ))

libpng/Package_libpng.mk → libpng/ExternalPackage_libpng.mk

@@ -7,11 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,libpng_inc,$(call gb_UnpackedTarball_get_dir,png)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libpng_inc,png))
 
-$(eval $(call gb_Package_use_unpacked,libpng_inc,png))
-
-$(eval $(call gb_Package_add_files,libpng_inc,inc/external/libpng,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libpng_inc,inc/external/libpng,\
 	png.h \
 	pngconf.h \
 	pnglibconf.h \

libpng/Module_libpng.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libpng))
 ifeq ($(SYSTEM_LIBPNG),NO)
 
 $(eval $(call gb_Module_add_targets,libpng,\
-	Package_libpng \
+	ExternalPackage_libpng \
 	StaticLibrary_png \
 	UnpackedTarball_png \
 ))

libvisio/Package_libvisio.mk → libvisio/ExternalPackage_libvisio.mk

@@ -7,14 +7,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,libvisio_inc,$(call gb_UnpackedTarball_get_dir,visio/src/lib)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libvisio_inc,visio))
 
-$(eval $(call gb_Package_use_unpacked,libvisio_inc,visio))
-
-$(eval $(call gb_Package_add_files,libvisio_inc,inc/external/libvisio,\
-	libvisio.h \
-	VisioDocument.h \
-	VSDStringVector.h \
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libvisio_inc,inc/external/libvisio,\
+	src/lib/libvisio.h \
+	src/lib/VisioDocument.h \
+	src/lib/VSDStringVector.h \
 ))
 
 # vim: set noet sw=4 ts=4:

libvisio/Module_libvisio.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libvisio))
 ifeq ($(SYSTEM_LIBVISIO),NO)
 
 $(eval $(call gb_Module_add_targets,libvisio,\
-	Package_libvisio \
+	ExternalPackage_libvisio \
 	StaticLibrary_visio \
 	UnpackedTarball_visio \
 ))

libwpd/Package_libwpd.mk → libwpd/ExternalPackage_libwpd.mk

@@ -7,11 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,libwpd_inc,$(call gb_UnpackedTarball_get_dir,wpd/src/lib)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd_inc,wpd))
 
-$(eval $(call gb_Package_use_unpacked,libwpd_inc,wpd))
-
-$(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd,\
 	libwpd.h \
 	WPDocument.h \
 	WPXBinaryData.h \
@@ -22,7 +20,7 @@ $(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd,\
 	WPXPropertyListVector.h \
 ))
 
-$(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd-stream,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd-stream,\
 	libwpd-stream.h \
 	WPXStream.h \
 	WPXStreamImplementation.h \

libwpd/Module_libwpd.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libwpd))
 ifeq ($(SYSTEM_LIBWPD),NO)
 
 $(eval $(call gb_Module_add_targets,libwpd,\
-	Package_libwpd \
+	ExternalPackage_libwpd \
 	StaticLibrary_wpd \
 	UnpackedTarball_wpd \
 ))

libwpg/Package_libwpg.mk → libwpg/ExternalPackage_libwpg.mk

@@ -7,11 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,libwpg_inc,$(call gb_UnpackedTarball_get_dir,wpg/src/lib)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwpg_inc,wpg))
 
-$(eval $(call gb_Package_use_unpacked,libwpg_inc,wpg))
-
-$(eval $(call gb_Package_add_files,libwpg_inc,inc/external/libwpg,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpg_inc,inc/external/libwpg,\
 	libwpg.h \
 	WPGPaintInterface.h \
 	WPGraphics.h \

libwpg/Module_libwpg.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libwpg))
 ifeq ($(SYSTEM_LIBWPG),NO)
 
 $(eval $(call gb_Module_add_targets,libwpg,\
-	Package_libwpg \
+	ExternalPackage_libwpg \
 	StaticLibrary_wpg \
 	UnpackedTarball_wpg \
 ))

libwps/Package_libwps.mk → libwps/ExternalPackage_libwps.mk

@@ -7,11 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,libwps_inc,$(call gb_UnpackedTarball_get_dir,wps/src/lib)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwps_inc,wps))
 
-$(eval $(call gb_Package_use_unpacked,libwps_inc,wps))
-
-$(eval $(call gb_Package_add_files,libwps_inc,inc/external/libwps,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libwps_inc,inc/external/libwps,\
 	libwps.h \
 	WPSDocument.h \
 ))

libwps/Module_libwps.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libwps))
 ifeq ($(SYSTEM_LIBWPS),NO)
 
 $(eval $(call gb_Module_add_targets,libwps,\
-	Package_libwps \
+	ExternalPackage_libwps \
 	StaticLibrary_wps \
 	UnpackedTarball_wps \
 ))