1 files changed, 12 insertions, 29 deletions
diff --git a/x11/hs-X11/pkg-plist b/x11/hs-X11/pkg-plist
index b0679cfa666b..1a35c3b3b685 100644
--- a/x11/hs-X11/pkg-plist
+++ b/x11/hs-X11/pkg-plist
@@ -1,4 +1,11 @@
 %%SUBDIR%%/Graphics/X11.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/AP.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/DEC.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/HP.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/Sun.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/XF86.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/XorgDefault.hi
 %%SUBDIR%%/Graphics/X11/Types.hi
 %%SUBDIR%%/Graphics/X11/Xinerama.hi
 %%SUBDIR%%/Graphics/X11/Xlib.hi
@@ -16,43 +23,19 @@
 %%SUBDIR%%/Graphics/X11/Xlib/Types.hi
 %%SUBDIR%%/Graphics/X11/Xlib/Window.hi
 %%SUBDIR%%/HSX11-%%PORTVERSION%%.o
+%%SUBDIR%%/include/HsAllKeysyms.h
 %%SUBDIR%%/include/HsXlib.h
 %%SUBDIR%%/include/XlibExtras.h
 %%SUBDIR%%/libHSX11-%%PORTVERSION%%.a
 %%SUBDIR%%/%%PORTNAME%%-register.sh
-%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Types.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xinerama.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Atom.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Color.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Context.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Display.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Event.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Extras.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Font.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Image.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Misc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Region.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Screen.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Types.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Window.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11.html
-%%PORTDOCS%%%%DOCSDIR%%/html/X11.haddock
-%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css
-%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
+%%RMLIC%%%%DOCSDIR%%/LICENSE
+%%RMLIC%%@dirrm %%DOCSDIR%%
 @dirrmtry %%SUBDIR%%/include
+@dirrm %%SUBDIR%%/Graphics/X11/ExtraTypes
 @dirrm %%SUBDIR%%/Graphics/X11/Xlib
 @dirrm %%SUBDIR%%/Graphics/X11
 @dirrmtry %%SUBDIR%%/Graphics
 @exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister X11
+@unexec ghc-pkg unregister X11
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old