24 files changed, 8 insertions, 4 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 671a3399f926..9169f9e82ebb 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -223,7 +223,8 @@
     SUBDIR += hat
     SUBDIR += hmake
     SUBDIR += hp48cc
-    SUBDIR += hpl
+    SUBDIR += hs-hpl
+    SUBDIR += hs-popenhs
     SUBDIR += hypersrc
     SUBDIR += i386-rtems-binutils
     SUBDIR += i386-rtems-chill
@@ -599,7 +600,6 @@
     SUBDIR += pkgconfig
     SUBDIR += ply
     SUBDIR += pmake
-    SUBDIR += popenhs
     SUBDIR += popt
     SUBDIR += portcheckout
     SUBDIR += portlint
diff --git a/devel/hpl/Makefile b/devel/hs-hpl/Makefile
index e004f3c65109..6bc24eb5478e 100644
--- a/devel/hpl/Makefile
+++ b/devel/hs-hpl/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.3.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cse.unsw.edu.au/~chak/haskell/ports/
 DISTNAME=	ports-${PORTVERSION}
+PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	obraun@FreeBSD.org
 
diff --git a/devel/hpl/distinfo b/devel/hs-hpl/distinfo
index 033a70bc6cb2..033a70bc6cb2 100644
--- a/devel/hpl/distinfo
+++ b/devel/hs-hpl/distinfo
diff --git a/devel/hpl/pkg-comment b/devel/hs-hpl/pkg-comment
index dfeeb9448dc3..dfeeb9448dc3 100644
--- a/devel/hpl/pkg-comment
+++ b/devel/hs-hpl/pkg-comment
diff --git a/devel/hpl/pkg-descr b/devel/hs-hpl/pkg-descr
index bf94d7800af1..bf94d7800af1 100644
--- a/devel/hpl/pkg-descr
+++ b/devel/hs-hpl/pkg-descr
diff --git a/devel/hpl/pkg-plist b/devel/hs-hpl/pkg-plist
index 2758f316c498..2758f316c498 100644
--- a/devel/hpl/pkg-plist
+++ b/devel/hs-hpl/pkg-plist
diff --git a/devel/popenhs/Makefile b/devel/hs-popenhs/Makefile
index e203f6737107..08656748fa24 100644
--- a/devel/popenhs/Makefile
+++ b/devel/hs-popenhs/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	popenhs
 PORTVERSION=	1.00.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.01.246.ne.jp/~juhp/haskell/popenhs/
+PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	obraun@FreeBSD.org
 
diff --git a/devel/popenhs/distinfo b/devel/hs-popenhs/distinfo
index 286ca546e317..286ca546e317 100644
--- a/devel/popenhs/distinfo
+++ b/devel/hs-popenhs/distinfo
diff --git a/devel/popenhs/pkg-comment b/devel/hs-popenhs/pkg-comment
index 0a191a2b841a..0a191a2b841a 100644
--- a/devel/popenhs/pkg-comment
+++ b/devel/hs-popenhs/pkg-comment
diff --git a/devel/popenhs/pkg-descr b/devel/hs-popenhs/pkg-descr
index e34a62a5f85b..e34a62a5f85b 100644
--- a/devel/popenhs/pkg-descr
+++ b/devel/hs-popenhs/pkg-descr
diff --git a/devel/popenhs/pkg-plist b/devel/hs-popenhs/pkg-plist
index 557221f043f2..557221f043f2 100644
--- a/devel/popenhs/pkg-plist
+++ b/devel/hs-popenhs/pkg-plist
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 09ab7dbef084..09a70c9da34e 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -22,7 +22,6 @@
     SUBDIR += flvw
     SUBDIR += fox
     SUBDIR += fox-xunicode
-    SUBDIR += frantk
     SUBDIR += gail
     SUBDIR += gal
     SUBDIR += gdl
@@ -32,7 +31,6 @@
     SUBDIR += gnustep-gui
     SUBDIR += gnustep-xgps
     SUBDIR += gob
-    SUBDIR += gtk+hs
     SUBDIR += gtk--
     SUBDIR += gtk-Mac2-theme
     SUBDIR += gtk-engines
@@ -57,6 +55,8 @@
     SUBDIR += gtoolkit
     SUBDIR += guile-gnome
     SUBDIR += guile-gtk
+    SUBDIR += hs-frantk
+    SUBDIR += hs-gtk+hs
     SUBDIR += icegradient
     SUBDIR += itk
     SUBDIR += iv
diff --git a/x11-toolkits/frantk/Makefile b/x11-toolkits/hs-frantk/Makefile
index bcd59c2f6100..ace53b32c59f 100644
--- a/x11-toolkits/frantk/Makefile
+++ b/x11-toolkits/hs-frantk/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.dcs.gla.ac.uk/~meurig/FranTk/
 DISTNAME=	FranTk${PORTVERSION:S/./_/}
+PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	obraun@FreeBSD.org
 
diff --git a/x11-toolkits/frantk/distinfo b/x11-toolkits/hs-frantk/distinfo
index 5f6b53661d9c..5f6b53661d9c 100644
--- a/x11-toolkits/frantk/distinfo
+++ b/x11-toolkits/hs-frantk/distinfo
diff --git a/x11-toolkits/frantk/files/patch-src::Makefile b/x11-toolkits/hs-frantk/files/patch-src::Makefile
index fc2e8f639978..fc2e8f639978 100644
--- a/x11-toolkits/frantk/files/patch-src::Makefile
+++ b/x11-toolkits/hs-frantk/files/patch-src::Makefile
diff --git a/x11-toolkits/frantk/pkg-comment b/x11-toolkits/hs-frantk/pkg-comment
index ea5b2dd015c1..ea5b2dd015c1 100644
--- a/x11-toolkits/frantk/pkg-comment
+++ b/x11-toolkits/hs-frantk/pkg-comment
diff --git a/x11-toolkits/frantk/pkg-descr b/x11-toolkits/hs-frantk/pkg-descr
index 20df43126e19..20df43126e19 100644
--- a/x11-toolkits/frantk/pkg-descr
+++ b/x11-toolkits/hs-frantk/pkg-descr
diff --git a/x11-toolkits/frantk/pkg-message b/x11-toolkits/hs-frantk/pkg-message
index b5c6ec65e36c..b5c6ec65e36c 100644
--- a/x11-toolkits/frantk/pkg-message
+++ b/x11-toolkits/hs-frantk/pkg-message
diff --git a/x11-toolkits/frantk/pkg-plist b/x11-toolkits/hs-frantk/pkg-plist
index 1529b22506c2..1529b22506c2 100644
--- a/x11-toolkits/frantk/pkg-plist
+++ b/x11-toolkits/hs-frantk/pkg-plist
diff --git a/x11-toolkits/gtk+hs/Makefile b/x11-toolkits/hs-gtk+hs/Makefile
index 8a8c39fc3cf0..a3a552ce3c94 100644
--- a/x11-toolkits/gtk+hs/Makefile
+++ b/x11-toolkits/hs-gtk+hs/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	gtk+hs
 PORTVERSION=	0.11.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.cse.unsw.edu.au/~chak/haskell/gtk/
+PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	obraun@FreeBSD.org
 
diff --git a/x11-toolkits/gtk+hs/distinfo b/x11-toolkits/hs-gtk+hs/distinfo
index 90f7566d8316..90f7566d8316 100644
--- a/x11-toolkits/gtk+hs/distinfo
+++ b/x11-toolkits/hs-gtk+hs/distinfo
diff --git a/x11-toolkits/gtk+hs/pkg-comment b/x11-toolkits/hs-gtk+hs/pkg-comment
index 96ad5a2c2e13..96ad5a2c2e13 100644
--- a/x11-toolkits/gtk+hs/pkg-comment
+++ b/x11-toolkits/hs-gtk+hs/pkg-comment
diff --git a/x11-toolkits/gtk+hs/pkg-descr b/x11-toolkits/hs-gtk+hs/pkg-descr
index 3938dc80a365..3938dc80a365 100644
--- a/x11-toolkits/gtk+hs/pkg-descr
+++ b/x11-toolkits/hs-gtk+hs/pkg-descr
diff --git a/x11-toolkits/gtk+hs/pkg-plist b/x11-toolkits/hs-gtk+hs/pkg-plist
index 36e78e6a246e..36e78e6a246e 100644
--- a/x11-toolkits/gtk+hs/pkg-plist
+++ b/x11-toolkits/hs-gtk+hs/pkg-plist