Bug 461888 - Remove unused PACKAGE_FILE and PACKAGE_VARS and .pkg files, mailnews/ part, r+sr=bienvenu
authorPhil Ringnalda <philringnalda@gmail.com>
Fri, 31 Oct 2008 20:22:44 -0700
changeset 783 114d5b34fc3138f138173fc965bf927416abddd7
parent 782 3dd34f4ecbbefc38909055867cbc1208af02d638
child 784 5c72e416c07c3f8a6eda8bf8ec3fc9f1ca675b55
push idunknown
push userunknown
push dateunknown
bugs461888
Bug 461888 - Remove unused PACKAGE_FILE and PACKAGE_VARS and .pkg files, mailnews/ part, r+sr=bienvenu
mailnews/Makefile.in
mailnews/addrbook/build/Makefile.in
mailnews/addrbook/build/addrbook.pkg
mailnews/base/build/Makefile.in
mailnews/base/build/msgbase.pkg
mailnews/base/util/Makefile.in
mailnews/base/util/msgbaseutil.pkg
mailnews/compose/build/Makefile.in
mailnews/compose/build/msgcompose.pkg
mailnews/db/msgdb/build/Makefile.in
mailnews/db/msgdb/build/msgdb.pkg
mailnews/extensions/bayesian-spam-filter/build/Makefile.in
mailnews/extensions/bayesian-spam-filter/build/bayesian.pkg
mailnews/extensions/dsn/Makefile.in
mailnews/extensions/dsn/dsn.pkg
mailnews/extensions/mailviews/Makefile.in
mailnews/extensions/mailviews/mailviews.pkg
mailnews/extensions/mailviews/resources/content/Makefile.in
mailnews/extensions/mailviews/resources/content/mailviewdef.pkg
mailnews/extensions/mdn/Makefile.in
mailnews/extensions/mdn/build/mdn.pkg
mailnews/extensions/mdn/mdn.pkg
mailnews/extensions/offline-startup/Makefile.in
mailnews/extensions/offline-startup/offline-startup.pkg
mailnews/extensions/palmsync/Makefile.in
mailnews/extensions/palmsync/palmsync.pkg
mailnews/extensions/smime/build/Makefile.in
mailnews/extensions/smime/build/smime.pkg
mailnews/imap/build/Makefile.in
mailnews/imap/build/msgimap.pkg
mailnews/import/Makefile.in
mailnews/import/applemail/src/Makefile.in
mailnews/import/comm4x/src/Makefile.in
mailnews/import/comm4x/src/importcomm4x.pkg
mailnews/import/eudora/src/Makefile.in
mailnews/import/eudora/src/importeudora.pkg
mailnews/import/msgimport.pkg
mailnews/import/oexpress/Makefile.in
mailnews/import/oexpress/importoe.pkg
mailnews/import/outlook/src/Makefile.in
mailnews/import/outlook/src/importoutlook.pkg
mailnews/import/text/src/Makefile.in
mailnews/import/text/src/importtext.pkg
mailnews/local/build/Makefile.in
mailnews/local/build/msglocal.pkg
mailnews/mailnews.pkg
mailnews/mapi/Makefile.in
mailnews/mapi/mapi.pkg
mailnews/mapi/mapiDll/mapidll.pkg
mailnews/mapi/mapihook/build/mapiproxy.pkg
mailnews/mime/build/Makefile.in
mailnews/mime/build/mime.pkg
mailnews/mime/cthandlers/smimestub/Makefile.in
mailnews/mime/cthandlers/smimestub/smimetb.pkg
mailnews/mime/cthandlers/vcard/Makefile.in
mailnews/mime/cthandlers/vcard/vcard.pkg
mailnews/mime/emitters/build/Makefile.in
mailnews/mime/emitters/build/mimeemitter.pkg
mailnews/news/build/Makefile.in
mailnews/news/build/msgnews.pkg
--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@@ -38,17 +38,16 @@
 DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE       = mailnews
-PACKAGE_FILE = mailnews.pkg
 PACKAGE_VARS += \
 		MOZ_MOVEMAIL \
 		MOZ_STATIC_MAIL_BUILD \
 		$(NULL)
 
 DIRS		= base db/msgdb news local mime compose imap addrbook import extensions
 
 ifeq ($(OS_ARCH),WINNT)
--- a/mailnews/addrbook/build/Makefile.in
+++ b/mailnews/addrbook/build/Makefile.in
@@ -46,18 +46,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= addrbook
 LIBRARY_NAME	= addrbook
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsAbModule
 MOZILLA_INTERNAL_API = 1
 
-PACKAGE_FILE = addrbook.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  pref \
 		  mime \
 		  rdf \
 		  msgbase \
 		  msgbaseutil \
deleted file mode 100644
--- a/mailnews/addrbook/build/addrbook.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@@ -49,18 +49,16 @@ LIBRARY_NAME	= msgbase
 RESFILE		= mail.res
 endif
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgBaseModule
 MOZILLA_INTERNAL_API = 1
 
-PACKAGE_FILE = msgbase.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  intl \
 		  locale \
 		  rdf \
 		  content \
 		  dom \
deleted file mode 100644
--- a/mailnews/base/build/msgbase.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/base/util/Makefile.in
+++ b/mailnews/base/util/Makefile.in
@@ -50,18 +50,16 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= msgbsutl
 else
 LIBRARY_NAME	= msgbsutl_s
 endif
 MOZILLA_INTERNAL_API = 1
 
 META_COMPONENT = mail
 
-PACKAGE_FILE = msgbaseutil.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  msgbase \
 		  rdf \
 		  necko \
 		  msgdb \
 		  intl \
 		  mork \
deleted file mode 100644
--- a/mailnews/base/util/msgbaseutil.pkg
+++ /dev/null
@@ -1,4 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/@SHARED_LIBRARY@
-#endif
--- a/mailnews/compose/build/Makefile.in
+++ b/mailnews/compose/build/Makefile.in
@@ -50,18 +50,16 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= msgcompo
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgComposeModule
 ifeq ($(OS_ARCH),WINNT)
 XPIDL_MODULE	= msgcompo
 endif
 MOZILLA_INTERNAL_API = 1
 
-PACKAGE_FILE = msgcompose.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  msgbase \
 		  msgbaseutil \
 		  editor \
 		  necko \
 		  dom \
 		  uriloader \
deleted file mode 100644
--- a/mailnews/compose/build/msgcompose.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/db/msgdb/build/Makefile.in
+++ b/mailnews/db/msgdb/build/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= msgdb
 LIBRARY_NAME	= msgdb
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgDBModule
 MOZILLA_INTERNAL_API = 1
 
-PACKAGE_FILE = msgdb.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  locale \
 		  mork \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
 		  necko \
deleted file mode 100644
--- a/mailnews/db/msgdb/build/msgdb.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
@@ -46,18 +46,16 @@ MODULE		= bayesflt
 LIBRARY_NAME	= bayesflt
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= bayesflt
 IS_COMPONENT	= 1
 MODULE_NAME	= nsBayesianFilterModule
 MOZILLA_INTERNAL_API = 1
 
-PACKAGE_FILE = bayesian.pkg
-
 REQUIRES	= xpcom \
 		  msgbase \
 		  lwbrk \
 		  $(NULL)
 
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS = msgbsutl
 else
deleted file mode 100644
--- a/mailnews/extensions/bayesian-spam-filter/build/bayesian.pkg
+++ /dev/null
@@ -1,2 +0,0 @@
-[xpfe-mailnews]
-dist/bin/components/@SHARED_LIBRARY@
--- a/mailnews/extensions/dsn/Makefile.in
+++ b/mailnews/extensions/dsn/Makefile.in
@@ -39,17 +39,16 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgdsn
-PACKAGE_FILE = dsn.pkg
 
 EXTRA_COMPONENTS =  src/dsn-service.js
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(srcdir)/resources/content/dsn.js $(DIST)/bin/defaults/pref
 
deleted file mode 100644
--- a/mailnews/extensions/dsn/dsn.pkg
+++ /dev/null
@@ -1,5 +0,0 @@
-[xpfe-mailnews]
-dist/bin/components/dsn-service.js
-
-[xpfe-browser]
-dist/bin/defaults/pref/dsn.js
--- a/mailnews/extensions/mailviews/Makefile.in
+++ b/mailnews/extensions/mailviews/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mailview
 
-PACKAGE_FILE = mailviews.pkg
 PACKAGE_VARS += MOZ_STATIC_MAIL_BUILD
 
 DIRS		= public src resources
 
 ifndef MOZ_STATIC_MAIL_BUILD
 DIRS += build
 endif
 
deleted file mode 100644
--- a/mailnews/extensions/mailviews/mailviews.pkg
+++ /dev/null
@@ -1,5 +0,0 @@
-[xpfe-mailnews]
-#if !MOZ_STATIC_MAIL_BUILD
-dist/bin/components/@DLLP@mailview@DLLS@
-#endif
-!xpt dist/bin/components/mailview.xpt
--- a/mailnews/extensions/mailviews/resources/content/Makefile.in
+++ b/mailnews/extensions/mailviews/resources/content/Makefile.in
@@ -38,17 +38,16 @@
 DEPTH = ../../../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE       = mailview
-PACKAGE_FILE = mailviewdef.pkg
 
 EXPORT_DIR	= $(DIST)/bin/defaults/messenger
 EXPORT_L10N_DIR	= $(EXPORT_DIR)/$(AB_CD)
 
 EXPORT_RESOURCE_FILES	= \
 			mailViews.dat \
 			$(NULL)
 
deleted file mode 100644
--- a/mailnews/extensions/mailviews/resources/content/mailviewdef.pkg
+++ /dev/null
@@ -1,5 +0,0 @@
-[xpfe-default-US]
-dist/bin/defaults/messenger/mailViews.dat
-
-[xpfe-locale-US]
-dist/bin/defaults/messenger/US/mailViews.dat
--- a/mailnews/extensions/mdn/Makefile.in
+++ b/mailnews/extensions/mdn/Makefile.in
@@ -38,17 +38,17 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgmdn
-PACKAGE_FILE = mdn.pkg
+
 PACKAGE_VARS = MOZ_STATIC_MAIL_BUILD
 
 DIRS		= src
 
 ifndef MOZ_STATIC_MAIL_BUILD
 DIRS += build
 endif
 
deleted file mode 100644
--- a/mailnews/extensions/mdn/build/mdn.pkg
+++ /dev/null
@@ -1,11 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-dist/bin/components/mdn-service.js
-!xpt dist/bin/components/msgmdn.xpt
-
-[xpfe-browser]
-dist/bin/defaults/pref/mdn.js
deleted file mode 100644
--- a/mailnews/extensions/mdn/mdn.pkg
+++ /dev/null
@@ -1,8 +0,0 @@
-[xpfe-mailnews]
-#if !MOZ_STATIC_MAIL_BUILD
-dist/bin/components/@DLLP@msgmdn@DLLS@
-#endif
-dist/bin/components/mdn-service.js
-
-[xpfe-browser]
-dist/bin/defaults/pref/mdn.js
--- a/mailnews/extensions/offline-startup/Makefile.in
+++ b/mailnews/extensions/offline-startup/Makefile.in
@@ -39,13 +39,12 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= offline-startup
-PACKAGE_FILE = offline-startup.pkg
 
 EXTRA_COMPONENTS = js/offlineStartup.js
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/offline-startup/offline-startup.pkg
+++ /dev/null
@@ -1,2 +0,0 @@
-[xpfe-mailnews]
-dist/bin/components/offlineStartup.js
--- a/mailnews/extensions/palmsync/Makefile.in
+++ b/mailnews/extensions/palmsync/Makefile.in
@@ -60,18 +60,16 @@ XULAPP_DEFINES = \
 	-DINSTALL_EXTENSION_ID=$(INSTALL_EXTENSION_ID) \
 	-DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
 	-DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
 	-DEXTENSION_VERSION=$(MOZILLA_VERSION) \
 	$(NULL)
 
 ifdef PALM_CDK_DIR
 DIRS		+= conduit
-
-PACKAGE_FILE = palmsync.pkg
 else
 libs::
 	@echo " "
 	@echo "PLEASE SET 'PALM_CDK_DIR' ENV VARIABLE to THE DIR WHERE YOU HAVE PALM CDK INSTALLED IF YOU WANT TO BUILD THE CONDUIT"
 	@echo " "
 endif
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/palmsync/palmsync.pkg
+++ /dev/null
@@ -1,9 +0,0 @@
-# this is win32-only, right?
-
-[xpfe-mailnews]
-dist/bin/mozABConduit.dll
-dist/bin/PalmSyncProxy.dll
-dist/bin/PalmSyncInstall.exe
-dist/bin/components/palmsync.dll
-dist/bin/palm.html
-!xpt dist/bin/components/palmsync.xpt
--- a/mailnews/extensions/smime/build/Makefile.in
+++ b/mailnews/extensions/smime/build/Makefile.in
@@ -46,18 +46,16 @@ MODULE		= msgsmime
 LIBRARY_NAME	= msgsmime
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= msgsmime
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgSMIMEModule
 MOZILLA_INTERNAL_API = 1
 
-PACKAGE_FILE = smime.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  mime \
 		  msgcompose \
 		  pipnss \
 		  necko \
 		  intl \
 		  $(NULL)
deleted file mode 100644
--- a/mailnews/extensions/smime/build/smime.pkg
+++ /dev/null
@@ -1,11 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-dist/bin/components/smime-service.js
-!xpt dist/bin/components/msgsmime.xpt
-
-[xpfe-browser]
-dist/bin/defaults/pref/smime.js
--- a/mailnews/imap/build/Makefile.in
+++ b/mailnews/imap/build/Makefile.in
@@ -46,18 +46,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= msgimap
 LIBRARY_NAME	= msgimap
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= IMAP_factory
 MOZILLA_INTERNAL_API = 1
 
-PACKAGE_FILE = msgimap.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  msgbase \
 		  msgbaseutil \
 		  rdf \
 		  rdfutil \
 		  necko \
 		  msgdb \
deleted file mode 100644
--- a/mailnews/imap/build/msgimap.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/import/Makefile.in
+++ b/mailnews/import/Makefile.in
@@ -39,18 +39,16 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= import
 
-PACKAGE_FILE = msgimport.pkg
-
 DIRS		= public src text comm4x
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 DIRS		+= eudora applemail
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 DIRS		+= eudora
--- a/mailnews/import/applemail/src/Makefile.in
+++ b/mailnews/import/applemail/src/Makefile.in
@@ -39,17 +39,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH			= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE				= impapplemail
 LIBRARY_NAME	= applmail_s
 
-PACKAGE_FILE = importapplemail.pkg
 MOZILLA_INTERNAL_API = 1
 
 META_COMPONENT = mail
 REQUIRES	= \
 		xpcom \
 		string \
 		intl \
 		import \
--- a/mailnews/import/comm4x/src/Makefile.in
+++ b/mailnews/import/comm4x/src/Makefile.in
@@ -40,17 +40,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impComm4xMail
 LIBRARY_NAME   = imp4mail_s
 
-PACKAGE_FILE = importcomm4x.pkg
 MOZILLA_INTERNAL_API = 1
 
 META_COMPONENT  = mail
 REQUIRES	= xpcom \
 		  string \
 		  intl \
 		  import \
 		  necko \
deleted file mode 100644
--- a/mailnews/import/comm4x/src/importcomm4x.pkg
+++ /dev/null
@@ -1,7 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/impComm4xMail.xpt
--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@@ -38,17 +38,16 @@
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impEudra
-PACKAGE_FILE = importeudora.pkg
 LIBRARY_NAME   = impEudra_s
 META_COMPONENT	= mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  import \
 		  intl \
deleted file mode 100644
--- a/mailnews/import/eudora/src/importeudora.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
deleted file mode 100644
--- a/mailnews/import/msgimport.pkg
+++ /dev/null
@@ -1,1 +0,0 @@
-!xpt dist/bin/components/import.xpt
--- a/mailnews/import/oexpress/Makefile.in
+++ b/mailnews/import/oexpress/Makefile.in
@@ -38,17 +38,16 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= importOE
-PACKAGE_FILE = importoe.pkg
 LIBRARY_NAME   = importOE_s
 MOZILLA_INTERNAL_API = 1
 META_COMPONENT	= mail
 
 REQUIRES	= xpcom \
 		  string \
 		  import \
 		  addrbook \
deleted file mode 100644
--- a/mailnews/import/oexpress/importoe.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/import/outlook/src/Makefile.in
+++ b/mailnews/import/outlook/src/Makefile.in
@@ -38,17 +38,16 @@
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impOutlk
-PACKAGE_FILE = importoutlook.pkg
 LIBRARY_NAME   = impOutlk_s
 META_COMPONENT	= mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  import \
 		  intl \
deleted file mode 100644
--- a/mailnews/import/outlook/src/importoutlook.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/import/text/src/Makefile.in
+++ b/mailnews/import/text/src/Makefile.in
@@ -38,17 +38,16 @@
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impText
-PACKAGE_FILE = importtext.pkg
 
 LIBRARY_NAME   = imptext_s
 
 META_COMPONENT = mail
 MOZILLA_INTERNAL_API = 1
 
 REQUIRES =	xpcom \
 		string \
deleted file mode 100644
--- a/mailnews/import/text/src/importtext.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/local/build/Makefile.in
+++ b/mailnews/local/build/Makefile.in
@@ -47,18 +47,16 @@ LIBRARY_NAME	= localmail
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME 	= msglocal
 IS_COMPONENT	= 1
 MODULE_NAME	= local_mail_services
 MOZILLA_INTERNAL_API = 1
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
-PACKAGE_FILE = msglocal.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  msgbase \
 		  msgbaseutil \
 		  msgdb \
 		  necko \
 		  txmgr \
 		  rdf \
deleted file mode 100644
--- a/mailnews/local/build/msglocal.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
deleted file mode 100644
--- a/mailnews/mailnews.pkg
+++ /dev/null
@@ -1,28 +0,0 @@
-[xpfe-mailnews]
-dist/bin/chrome/messenger.jar
-!xpt dist/bin/components/mailnews.xpt
-!xpt dist/bin/components/msgnews.xpt
-!xpt dist/bin/components/mime.xpt
-!xpt dist/bin/components/msglocal.xpt
-!xpt dist/bin/components/msgimap.xpt
-!xpt dist/bin/components/msgdb.xpt
-!xpt dist/bin/components/msgbase.xpt
-!xpt dist/bin/components/msgsearch.xpt
-!xpt dist/bin/components/addrbook.xpt
-#if OS_ARCH==WINNT
-!xpt dist/bin/components/msgcompo.xpt
-#else
-!xpt dist/bin/components/msgcompose.xpt
-#endif
-
-#if MOZ_STATIC_MAIL_BUILD
-dist/bin/components/@DLLP@mail@DLLS@
-#endif
-
-#if MOZ_MOVEMAIL
-[xpfe-default-US]
-dist/bin/defaults/isp/movemail.rdf
-
-[xpfe-locale-US]
-dist/bin/defaults/isp/US/movemail.rdf
-#endif
--- a/mailnews/mapi/Makefile.in
+++ b/mailnews/mapi/Makefile.in
@@ -38,13 +38,12 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = msgMapi
-PACKAGE_FILE = mapi.pkg
 
 DIRS	= mapiDll mapihook
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/mapi/mapi.pkg
+++ /dev/null
@@ -1,5 +0,0 @@
-[xpfe-mailnews]
-dist/bin/MapiProxy.dll
-dist/bin/mozMapi32.dll
-dist/bin/components/msgMapi.dll
-!xpt dist/bin/components/mapihook.xpt
deleted file mode 100644
--- a/mailnews/mapi/mapiDll/mapidll.pkg
+++ /dev/null
@@ -1,2 +0,0 @@
-[xpfe-mailnews]
-dist/bin/@SHARED_LIBRARY@
deleted file mode 100644
--- a/mailnews/mapi/mapihook/build/mapiproxy.pkg
+++ /dev/null
@@ -1,2 +0,0 @@
-[xpfe-mailnews]
-dist/bin/@SHARED_LIBRARY@
--- a/mailnews/mime/build/Makefile.in
+++ b/mailnews/mime/build/Makefile.in
@@ -46,18 +46,16 @@ MODULE		= mime
 LIBRARY_NAME	= mime
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= mime_services
 MOZILLA_INTERNAL_API = 1
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
-PACKAGE_FILE = mime.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  msgbase \
 		  pref \
 		  uconv \
 		  $(NULL)
 
deleted file mode 100644
--- a/mailnews/mime/build/mime.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/mime/cthandlers/smimestub/Makefile.in
+++ b/mailnews/mime/cthandlers/smimestub/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= smime
 LIBRARY_NAME	= smimestb
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsSMIMEModule
 MOZILLA_INTERNAL_API = 1
 
-PACKAGE_FILE = smimetb.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  mime \
 		  msgbase \
 		  pref \
 		  necko \
 		  uconv \
 		  intl \
deleted file mode 100644
--- a/mailnews/mime/cthandlers/smimestub/smimetb.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mailnews/mime/cthandlers/vcard/Makefile.in
@@ -50,18 +50,16 @@ LIBRARY_NAME	= vcard
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsVCardModule
 
 else
 LIBRARY_NAME = vcard_s
 endif
 
-PACKAGE_FILE = vcard.pkg
-
 META_COMPONENT = mail
 
 REQUIRES	= xpcom \
 		  string \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
 		  uconv \
deleted file mode 100644
--- a/mailnews/mime/cthandlers/vcard/vcard.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/mime/emitters/build/Makefile.in
+++ b/mailnews/mime/emitters/build/Makefile.in
@@ -47,18 +47,16 @@ LIBRARY_NAME	= mimeemitter
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= emitter
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMimeEmitterModule
 MOZILLA_INTERNAL_API = 1
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
-PACKAGE_FILE = mimeemitter.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  mime \
 		  necko \
 		  intl \
 		  locale \
 		  msgbase \
 		  $(NULL)
deleted file mode 100644
--- a/mailnews/mime/emitters/build/mimeemitter.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/mailnews/news/build/Makefile.in
+++ b/mailnews/news/build/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= msgnews
 LIBRARY_NAME	= msgnews
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgNewsModule
 MOZILLA_INTERNAL_API = 1
 
-PACKAGE_FILE = msgnews.pkg
-
 REQUIRES	= xpcom \
 		  string \
 		  msgbase \
 		  msgbaseutil \
 		  msgdb \
 		  appcomps \
 		  toolkitcomps \
 		  mime \
deleted file mode 100644
--- a/mailnews/news/build/msgnews.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-mailnews]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif