Split list of internal headers to install into it's own file. Add more.

3 files changed, 116 insertions, 21 deletions

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 87ca14cff44..ab06b4047a6 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2009/08/05 06:10:31 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2009/08/05 15:52:11 tnn Exp $
 #
 
 DISTNAME=	xulrunner-${XULRUNNER_VER}-source
 PKGNAME=	${DISTNAME:S/-source//}
 XULRUNNER_VER=	1.9.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=xulrunner/releases/${XULRUNNER_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
@@ -80,6 +80,7 @@ create-rm-wrapper:
 	  ${WRAPPER_DIR}/bin/rm
 	chmod +x ${WRAPPER_DIR}/bin/rm
 
+.include "includes.mk"
 post-install:
 	# XXX fix the pkg-config files instead
 	rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
@@ -90,24 +91,7 @@ post-install:
 	  ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a
 	cd ${WRKSRC}/dist/include && \
 	  ${INSTALL_DATA} `find js -name "*.h" -print` js/jsproto.tbl \
-	  mozilla-config.h \
-	  commandhandler/nsICommandManager.h \
-	  commandhandler/nsICommandParams.h \
-	  content/nsISelectionController.h \
-	  content/nsISelectionDisplay.h \
-	  docshell/nsIDocShell.h \
-	  dom/nsIDOMNSEvent.h \
-	  fastfind/nsITypeAheadFind.h \
-	  gfx/gfxCore.h \
-	  gfx/nsCoord.h \
-	  gfx/nsMargin.h \
-	  gtkembedmoz/gtkmozembed.h \
-	  gtkembedmoz/gtkmozembed_glue.cpp \
-	  gtkembedmoz/gtkmozembed_internal.h \
-	  layout/nsIPrintProgressParams.h \
-	  webbrwsr/nsIPrintingPromptService.h \
-	  widget/nsIPrintSettings.h \
-	  xpcom/nsMathUtils.h \
+	  ${NS_EXTRA_INCLUDES} \
 	  ${DESTDIR}${PREFIX}/include/xulrunner/unstable
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/devel/xulrunner/PLIST b/devel/xulrunner/PLIST
index de077310730..74b87bae0ed 100644
--- a/devel/xulrunner/PLIST
+++ b/devel/xulrunner/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/08/05 06:10:31 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/08/05 15:52:11 tnn Exp $
 bin/xulrunner
 include/xulrunner/stable/base64.h
 include/xulrunner/stable/blapit.h
@@ -473,6 +473,8 @@ include/xulrunner/unstable/cryptohi.h
 include/xulrunner/unstable/cryptoht.h
 include/xulrunner/unstable/ecl-exp.h
 include/xulrunner/unstable/gfxCore.h
+include/xulrunner/unstable/gfxPoint.h
+include/xulrunner/unstable/gfxTypes.h
 include/xulrunner/unstable/gtkmozembed.h
 include/xulrunner/unstable/gtkmozembed_glue.cpp
 include/xulrunner/unstable/gtkmozembed_internal.h
@@ -534,19 +536,62 @@ include/xulrunner/unstable/keyhi.h
 include/xulrunner/unstable/keyt.h
 include/xulrunner/unstable/keythi.h
 include/xulrunner/unstable/mozilla-config.h
+include/xulrunner/unstable/nsAutoPtr.h
+include/xulrunner/unstable/nsCRT.h
+include/xulrunner/unstable/nsCWebBrowser.h
+include/xulrunner/unstable/nsColor.h
 include/xulrunner/unstable/nsCoord.h
+include/xulrunner/unstable/nsCppSharedAllocator.h
+include/xulrunner/unstable/nsEvent.h
+include/xulrunner/unstable/nsIAppShell.h
+include/xulrunner/unstable/nsIAppStartupNotifier.h
+include/xulrunner/unstable/nsIBaseWindow.h
 include/xulrunner/unstable/nsICommandManager.h
 include/xulrunner/unstable/nsICommandParams.h
+include/xulrunner/unstable/nsIContentViewer.h
+include/xulrunner/unstable/nsIDOMKeyEvent.h
+include/xulrunner/unstable/nsIDOMKeyListener.h
+include/xulrunner/unstable/nsIDOMLocation.h
+include/xulrunner/unstable/nsIDOMMouseListener.h
 include/xulrunner/unstable/nsIDOMNSEvent.h
+include/xulrunner/unstable/nsIDOMUIListener.h
+include/xulrunner/unstable/nsIDOMWindowInternal.h
+include/xulrunner/unstable/nsIDOMXULCommandDispatcher.h
+include/xulrunner/unstable/nsIDeviceContext.h
 include/xulrunner/unstable/nsIDocShell.h
+include/xulrunner/unstable/nsIDocShellTreeItem.h
+include/xulrunner/unstable/nsIDocShellTreeNode.h
+include/xulrunner/unstable/nsIFileStreams.h
+include/xulrunner/unstable/nsIInputStreamChannel.h
+include/xulrunner/unstable/nsIMarkupDocumentViewer.h
+include/xulrunner/unstable/nsIPref.h
+include/xulrunner/unstable/nsIPrintOptions.h
 include/xulrunner/unstable/nsIPrintProgressParams.h
 include/xulrunner/unstable/nsIPrintSettings.h
+include/xulrunner/unstable/nsIPrintSettingsService.h
 include/xulrunner/unstable/nsIPrintingPromptService.h
+include/xulrunner/unstable/nsIRenderingContext.h
+include/xulrunner/unstable/nsIScrollable.h
 include/xulrunner/unstable/nsISelectionController.h
 include/xulrunner/unstable/nsISelectionDisplay.h
+include/xulrunner/unstable/nsIServiceManagerObsolete.h
+include/xulrunner/unstable/nsIStringBundle.h
+include/xulrunner/unstable/nsITextScroll.h
+include/xulrunner/unstable/nsITheme.h
 include/xulrunner/unstable/nsITypeAheadFind.h
+include/xulrunner/unstable/nsIWebNavigation.h
+include/xulrunner/unstable/nsIWidget.h
 include/xulrunner/unstable/nsMargin.h
 include/xulrunner/unstable/nsMathUtils.h
+include/xulrunner/unstable/nsNetCID.h
+include/xulrunner/unstable/nsPIDOMEventTarget.h
+include/xulrunner/unstable/nsPIDOMWindow.h
+include/xulrunner/unstable/nsPoint.h
+include/xulrunner/unstable/nsProfileDirServiceProvider.h
+include/xulrunner/unstable/nsRect.h
+include/xulrunner/unstable/nsSize.h
+include/xulrunner/unstable/nsWeakPtr.h
+include/xulrunner/unstable/nsWidgetsCID.h
 include/xulrunner/unstable/nss.h
 include/xulrunner/unstable/nssb64.h
 include/xulrunner/unstable/nssb64t.h
diff --git a/devel/xulrunner/includes.mk b/devel/xulrunner/includes.mk
new file mode 100644
index 00000000000..52f26d22324
--- /dev/null
+++ b/devel/xulrunner/includes.mk
@@ -0,0 +1,66 @@
+# $NetBSD: includes.mk,v 1.1 2009/08/05 15:52:11 tnn Exp $
+
+NS_EXTRA_INCLUDES=			\
+commandhandler/nsICommandManager.h	\
+commandhandler/nsICommandParams.h	\
+content/nsISelectionController.h	\
+content/nsISelectionDisplay.h		\
+content/nsPIDOMEventTarget.h		\
+docshell/nsIContentViewer.h		\
+docshell/nsIDocShell.h			\
+docshell/nsIDocShellTreeItem.h		\
+docshell/nsIDocShellTreeNode.h		\
+docshell/nsIMarkupDocumentViewer.h	\
+docshell/nsIScrollable.h		\
+docshell/nsITextScroll.h		\
+docshell/nsIWebNavigation.h		\
+dom/nsIDOMKeyEvent.h			\
+dom/nsIDOMKeyListener.h			\
+dom/nsIDOMLocation.h			\
+dom/nsIDOMMouseListener.h		\
+dom/nsIDOMNSEvent.h			\
+dom/nsIDOMUIListener.h			\
+dom/nsIDOMWindowInternal.h		\
+dom/nsIDOMXULCommandDispatcher.h	\
+dom/nsPIDOMWindow.h			\
+embedcomponents/nsIAppStartupNotifier.h	\
+fastfind/nsITypeAheadFind.h		\
+gfx/gfxCore.h				\
+gfx/nsColor.h				\
+gfx/nsCoord.h				\
+gfx/nsIDeviceContext.h			\
+gfx/nsIRenderingContext.h		\
+gfx/nsITheme.h				\
+gfx/nsMargin.h				\
+gfx/nsPoint.h				\
+gfx/nsRect.h				\
+gfx/nsSize.h				\
+gtkembedmoz/gtkmozembed.h		\
+gtkembedmoz/gtkmozembed_glue.cpp	\
+gtkembedmoz/gtkmozembed_internal.h	\
+intl/nsIStringBundle.h			\
+layout/nsIPrintProgressParams.h		\
+mozilla-config.h			\
+necko/nsIFileStreams.h			\
+necko/nsIInputStreamChannel.h		\
+necko/nsNetCID.h			\
+pref/nsIPref.h				\
+profdirserviceprovider/nsProfileDirServiceProvider.h	\
+thebes/gfxPoint.h			\
+thebes/gfxTypes.h			\
+webbrwsr/nsCWebBrowser.h		\
+webbrwsr/nsIPrintingPromptService.h	\
+widget/nsEvent.h			\
+widget/nsIAppShell.h			\
+widget/nsIBaseWindow.h			\
+widget/nsIPrintOptions.h		\
+widget/nsIPrintSettings.h		\
+widget/nsIPrintSettingsService.h	\
+widget/nsIWidget.h			\
+widget/nsWidgetsCID.h			\
+xpcom/nsAutoPtr.h			\
+xpcom/nsCRT.h				\
+xpcom/nsCppSharedAllocator.h		\
+xpcom/nsIServiceManagerObsolete.h	\
+xpcom/nsMathUtils.h			\
+xpcom/nsWeakPtr.h