1 files changed, 22 insertions, 22 deletions

diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index c38002bd9c05..1a636969db1d 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -18,7 +18,7 @@ ALUT_port=			audio/hs-ALUT
 ansi-terminal_port=		devel/hs-ansi-terminal
 ansi-wl-pprint_port=		devel/hs-ansi-wl-pprint
 arrows_port=			devel/hs-arrows
-binary_port=			devel/hs-binary-ghc
+binary_port=			devel/hs-binary
 bio_port=			science/hs-bio
 brainfuck_port=			lang/hs-brainfuck	# executable
 bytestring-csv_port=		textproc/hs-bytestring-csv
@@ -37,7 +37,7 @@ datetime_port=			devel/hs-datetime
 DeepArrow_port=			devel/hs-DeepArrow
 deepseq_port=			devel/hs-deepseq
 Diff_port=			textproc/hs-Diff
-digest_port=			security/hs-digest-ghc
+digest_port=			security/hs-digest
 dlist_port=			devel/hs-dlist
 erf_port=			math/hs-erf
 fastcgi_port=			www/hs-fastcgi		# lib_depends
@@ -46,16 +46,16 @@ fgl_port=			devel/hs-fgl
 FileManip_port=			devel/hs-FileManip
 ghc-mtl_port=			devel/hs-ghc-mtl
 ghc-paths_port=			devel/hs-ghc-paths
-GLURaw_port=			x11-toolkits/hs-GLURaw-ghc
-GLUT_port=			x11-toolkits/hs-glut-ghc
+GLURaw_port=			x11-toolkits/hs-GLURaw
+GLUT_port=			x11-toolkits/hs-GLUT
 haddock_port=			devel/hs-haddock	# executable
 happy_port=			devel/hs-happy		# executable
 hashed-storage_port=		devel/hs-hashed-storage
 haskeline_port=			devel/hs-haskeline
 haskell-src-exts_port=		devel/hs-haskell-src-exts
-HaXml_port=			textproc/hs-haxml	# executable
-HGL_port=			graphics/hs-HGL-ghc
-highlighting-kate_port=		textproc/hs-highlighting-kate-ghc
+HaXml_port=			textproc/hs-HaXml	# executable
+HGL_port=			graphics/hs-HGL
+highlighting-kate_port=		textproc/hs-highlighting-kate
 hint_port=			devel/hs-hint
 hoogle_port=			devel/hs-hoogle		# executable
 hostname_port=			net/hs-hostname
@@ -66,8 +66,8 @@ HTTP_port=			www/hs-HTTP
 http-server_port=		www/hs-http-server
 hxt_port=			textproc/hs-hxt
 json_port=			converters/hs-json
-language-c_port=		devel/hs-language-c-ghc
-lazysmallcheck_port=		devel/hs-lazysmallcheck-ghc
+language-c_port=		devel/hs-language-c
+lazysmallcheck_port=		devel/hs-lazysmallcheck
 libmpd_port=			audio/hs-libmpd
 libxml_port=			textproc/hs-libxml
 MemoTrie_port=			devel/hs-MemoTrie
@@ -80,13 +80,13 @@ mwc-random_port=		math/hs-mwc-random
 ObjectName_port=		devel/hs-ObjectName
 oeis_port=			www/hs-oeis
 OpenAL_port=			audio/hs-OpenAL
-OpenGL_port=			x11-toolkits/hs-opengl-ghc
-OpenGLRaw_port=			x11-toolkits/hs-OpenGLRaw-ghc
-pandoc_port=			textproc/pandoc		# executable
+OpenGL_port=			x11-toolkits/hs-OpenGL
+OpenGLRaw_port=			x11-toolkits/hs-OpenGLRaw
+pandoc_port=			textproc/hs-pandoc	# executable
 pcap_port=			net/hs-pcap
-pcre-light_port=		devel/hs-pcre-light-ghc	# lib_depends
-polyparse_port=			textproc/hs-polyparse-ghc
-porte_port=			ports-mgmt/porte	# executable
+pcre-light_port=		devel/hs-pcre-light	# lib_depends
+polyparse_port=			textproc/hs-polyparse
+porte_port=			ports-mgmt/hs-porte	# executable
 probability_port=		math/hs-probability
 QuickCheck_port=		devel/hs-QuickCheck
 reactive_port=			devel/hs-reactive
@@ -116,18 +116,18 @@ uniplate_port=			devel/hs-uniplate
 unix-compat_port=		devel/hs-unix-compat
 unlambda_port=			lang/hs-unlambda	# executable
 url_port=			www/hs-url
-utf8-string_port=		devel/hs-utf8-string-ghc
+utf8-string_port=		devel/hs-utf8-string
 utility-ht_port=		devel/hs-utility-ht
 uuagc_port=			devel/hs-uuagc		# executable
 uulib_port=			devel/hs-uulib
 uvector_port=			devel/hs-uvector
 uvector-algorithms_port=	devel/hs-uvector-algorithms
 vector-space_port=		math/hs-vector-space
-X11_port=			x11/hs-x11-ghc		# lib_depends
-X11-xft_port=			x11/hs-x11-xft-ghc
+X11_port=			x11/hs-X11		# lib_depends
+X11-xft_port=			x11/hs-X11-xft
 xml_port=			textproc/hs-xml
-xmobar_port=			x11/xmobar		# executable
-xmonad_port=			x11-wm/xmonad		# executable
-xmonad-contrib_port=		x11-wm/xmonad-contrib
-zip-archive_port=		archivers/hs-zip-archive-ghc
+xmobar_port=			x11/hs-xmobar		# executable
+xmonad_port=			x11-wm/hs-xmonad	# executable
+xmonad-contrib_port=		x11-wm/hs-xmonad-contrib
+zip-archive_port=		archivers/hs-zip-archive
 zlib_port=			archivers/hs-zlib