3 files changed, 31 insertions, 4 deletions

diff --git a/devel/hs-crypto/Makefile b/devel/hs-crypto/Makefile
index f918d6bb51c9..72dcf1446d12 100644
--- a/devel/hs-crypto/Makefile
+++ b/devel/hs-crypto/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	crypto
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/crypto/downloads/
 PKGNAMEPREFIX=	hs-
@@ -28,11 +27,16 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	# empty
 
+GHC_VERSION=	`${LOCALBASE}/bin/ghc --numeric-version`
+PLIST_SUB+=	GHC_VERSION="${GHC_VERSION}"
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
 		${WRKSRC}/Makefile ${WRKSRC}/package.conf
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
 		${WRKSRC}/Makefile ${WRKSRC}/package.conf
+	@${REINPLACE_CMD} -e 's|ghc-pkg|-ghc-pkg|' \
+		${WRKSRC}/Makefile
 
 do-configure:
 	@(cd ${WRKSRC} && ${GMAKE} depend)
@@ -40,8 +44,12 @@ do-configure:
 .if !defined(NOPORTDOCS)
 post-build:
 	@(cd ${WRKSRC} && ${GMAKE} doc)
+.endif
 
 post-install:
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/package.conf ${DATADIR}
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC} && \
 		${INSTALL_DATA} *.html ReadMe.* haddock.css haskell_icon.gif ${DOCSDIR})
diff --git a/devel/hs-crypto/distinfo b/devel/hs-crypto/distinfo
index 3cf9a0652e2d..87fe43946752 100644
--- a/devel/hs-crypto/distinfo
+++ b/devel/hs-crypto/distinfo
@@ -1,2 +1,2 @@
-MD5 (crypto-1.1.2.tar) = 195205a01566659f036d5df929fe7cc4
-SIZE (crypto-1.1.2.tar) = 256000
+MD5 (crypto-1.2.2.tar) = e6498f761ab7634f34cf14c3cedfa821
+SIZE (crypto-1.2.2.tar) = 296960
diff --git a/devel/hs-crypto/pkg-plist b/devel/hs-crypto/pkg-plist
index 8fc015e2c099..34c2fa67c54c 100644
--- a/devel/hs-crypto/pkg-plist
+++ b/devel/hs-crypto/pkg-plist
@@ -1,11 +1,16 @@
 lib/HScrypto.o
 lib/libHScrypto.a
 lib/imports/HScrypto/Codec/ASN1/ASN1.hi
+lib/imports/HScrypto/Codec/Encryption/AES.hi
+lib/imports/HScrypto/Codec/Encryption/AESAux.hi
 lib/imports/HScrypto/Codec/Encryption/Blowfish.hi
 lib/imports/HScrypto/Codec/Encryption/BlowfishAux.hi
 lib/imports/HScrypto/Codec/Encryption/DES.hi
 lib/imports/HScrypto/Codec/Encryption/DESAux.hi
 lib/imports/HScrypto/Codec/Encryption/EMEOAEP.hi
+lib/imports/HScrypto/Codec/Encryption/LargeKey.hi
+lib/imports/HScrypto/Codec/Encryption/MD5.hi
+lib/imports/HScrypto/Codec/Encryption/MD5Aux.hi
 lib/imports/HScrypto/Codec/Encryption/MGF.hi
 lib/imports/HScrypto/Codec/Encryption/Modes.hi
 lib/imports/HScrypto/Codec/Encryption/NumberTheory.hi
@@ -16,11 +21,16 @@ lib/imports/HScrypto/Codec/Encryption/SHA1.hi
 lib/imports/HScrypto/Codec/Encryption/SHA1Aux.hi
 lib/imports/HScrypto/Codec/Encryption/Utils.hi
 %%PORTDOCS%%%%DOCSDIR%%/Codec.ASN1.ASN1.html
+%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.AES.html
+%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.AESAux.html
 %%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.Blowfish.html
 %%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.BlowfishAux.html
 %%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.DES.html
 %%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.DESAux.html
 %%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.EMEOAEP.html
+%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.LargeKey.html
+%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.MD5.html
+%%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.MD5Aux.html
 %%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.MGF.html
 %%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.Modes.html
 %%PORTDOCS%%%%DOCSDIR%%/Codec.Encryption.NumberTheory.html
@@ -42,6 +52,7 @@ lib/imports/HScrypto/Codec/Encryption/Utils.hi
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-G.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-H.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-I.html
+%%PORTDOCS%%%%DOCSDIR%%/doc-index-L.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-M.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-N.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-O.html
@@ -51,13 +62,21 @@ lib/imports/HScrypto/Codec/Encryption/Utils.hi
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-T.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-U.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-index-V.html
+%%PORTDOCS%%%%DOCSDIR%%/doc-index-W.html
+%%PORTDOCS%%%%DOCSDIR%%/doc-index-Z.html
 %%PORTDOCS%%%%DOCSDIR%%/doc-index.html
 %%PORTDOCS%%%%DOCSDIR%%/haddock.css
 %%PORTDOCS%%%%DOCSDIR%%/haskell_icon.gif
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DATADIR%%/package.conf
+@dirrm %%DATADIR%%
 @dirrm lib/imports/HScrypto/Codec/ASN1
 @dirrm lib/imports/HScrypto/Codec/Encryption
 @dirrm lib/imports/HScrypto/Codec
 @dirrm lib/imports/HScrypto
 @dirrm lib/imports
+@exec %D/bin/ghc-pkg -u -g -i %D/share/crypto/package.conf
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg -r crypto
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old