3 files changed, 22 insertions, 35 deletions

diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index 8b2e08ceb83b..11ac8b19b71d 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	utf8-string
-PORTVERSION=	0.3.3
+PORTVERSION=	0.3.4
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -27,11 +27,15 @@ PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
 		PORTNAME=${PORTNAME} \
 		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	LICENSE html
 
 CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${CABALDIR} --libsubdir='' --datasubdir=''
 
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+.else
+PLIST_DIRS+=	%%DOCSDIR%%
+PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .endif
 
 do-configure:
@@ -39,7 +43,7 @@ do-configure:
 
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	cd ${WRKSRC} && ${CABALCMD} haddock
 .endif
 
diff --git a/devel/hs-utf8-string/distinfo b/devel/hs-utf8-string/distinfo
index ba275edfc233..85d6c5076db1 100644
--- a/devel/hs-utf8-string/distinfo
+++ b/devel/hs-utf8-string/distinfo
@@ -1,3 +1,3 @@
-MD5 (utf8-string-0.3.3.tar.gz) = f311e85aebccffb272ebf3bd49a28c8f
-SHA256 (utf8-string-0.3.3.tar.gz) = a327daab89cbe9d687f0b612422da0e032f8cb4174abcf058e583a94099b40a5
-SIZE (utf8-string-0.3.3.tar.gz) = 7821
+MD5 (utf8-string-0.3.4.tar.gz) = 72d13d9453cdf721dd95bc18144a120a
+SHA256 (utf8-string-0.3.4.tar.gz) = f97027354f0b88af9bf3638aee0eb3bb72c05ec44f4af4c1abe070597059a5bd
+SIZE (utf8-string-0.3.4.tar.gz) = 8063
diff --git a/devel/hs-utf8-string/pkg-plist b/devel/hs-utf8-string/pkg-plist
index cf55ca674c10..1dc9435721bb 100644
--- a/devel/hs-utf8-string/pkg-plist
+++ b/devel/hs-utf8-string/pkg-plist
@@ -3,36 +3,19 @@
 %%SUBDIR%%/Data/ByteString/Lazy/UTF8.hi
 %%SUBDIR%%/Data/ByteString/UTF8.hi
 %%SUBDIR%%/Data/String/UTF8.hi
-%%SUBDIR%%/HSutf8-string-0.3.3.o
 %%SUBDIR%%/System/IO/UTF8.hi
-%%SUBDIR%%/libHSutf8-string-0.3.3.a
-%%SUBDIR%%/utf8-string-register.sh
-%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/html/Codec-Binary-UTF8-Generic.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Codec-Binary-UTF8-String.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Data-ByteString-Lazy-UTF8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Data-ByteString-UTF8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Data-String-UTF8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/System-IO-UTF8.html
-%%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%%%%DOCSDIR%%/html/utf8-string.haddock
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
-@dirrm %%SUBDIR%%/System/IO
-@dirrm %%SUBDIR%%/System
-@dirrm %%SUBDIR%%/Data/String
-@dirrm %%SUBDIR%%/Data/ByteString/Lazy
-@dirrm %%SUBDIR%%/Data/ByteString
-@dirrm %%SUBDIR%%/Data
-@dirrm %%SUBDIR%%/Codec/Binary/UTF8
-@dirrm %%SUBDIR%%/Codec/Binary
-@dirrm %%SUBDIR%%/Codec
+%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%SUBDIR%%/%%PORTNAME%%-register.sh
+@dirrmtry %%SUBDIR%%/System/IO
+@dirrmtry %%SUBDIR%%/System
+@dirrmtry %%SUBDIR%%/Data/String
+@dirrmtry %%SUBDIR%%/Data/ByteString/Lazy
+@dirrmtry %%SUBDIR%%/Data/ByteString
+@dirrmtry %%SUBDIR%%/Data
+@dirrmtry %%SUBDIR%%/Codec/Binary/UTF8
+@dirrmtry %%SUBDIR%%/Codec/Binary
+@dirrmtry %%SUBDIR%%/Codec
 @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 %%PORTNAME%%