aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/hs-HTTP/Makefile63
-rw-r--r--www/hs-HTTP/pkg-plist54
-rw-r--r--www/hs-cgi/Makefile61
-rw-r--r--www/hs-cgi/pkg-plist34
-rw-r--r--www/hs-fastcgi/Makefile68
-rw-r--r--www/hs-fastcgi/pkg-plist18
-rw-r--r--www/hs-http-server/Makefile88
-rw-r--r--www/hs-http-server/pkg-plist30
-rw-r--r--www/hs-oeis/Makefile69
-rw-r--r--www/hs-oeis/pkg-plist18
-rw-r--r--www/hs-scgi/Makefile63
-rw-r--r--www/hs-scgi/pkg-plist18
-rw-r--r--www/hs-url/Makefile65
-rw-r--r--www/hs-url/pkg-plist18
14 files changed, 116 insertions, 551 deletions
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index 4d3b4e81c971..7fda427bfe80 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -8,68 +8,9 @@
PORTNAME= HTTP
PORTVERSION= 4000.0.9
CATEGORIES= www haskell
-MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX= hs-
MAINTAINER= jacula@gmail.com
-COMMENT= A library for client-side HTTP
-
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
-
-GHC_VERSION= 6.10.4
-HTTP_VERSION= ${PORTVERSION}
-
-GHC_CMD= ${LOCALBASE}/bin/ghc
-SETUP_CMD= ./setup
-
-DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
-HTTP_LIBDIR_REL= lib/${DISTNAME}
-
-PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
- HTTP_VERSION=${HTTP_VERSION} \
- HTTP_LIBDIR_REL=${HTTP_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+= NOPORTDOCS=""
-.else
-PLIST_SUB+= NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION= 1.15
-HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS= *
-.endif
-
-.SILENT:
-
-do-configure:
- cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
- && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
- cd ${WRKSRC} && ${SETUP_CMD} build \
- && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
- cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
- --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
- cd ${WRKSRC} && ${SETUP_CMD} install \
- && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HTTP_LIBDIR_REL}/register.sh
-
-post-install:
- ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+COMMENT= A Haskell library for client-side HTTP
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-HTTP/pkg-plist b/www/hs-HTTP/pkg-plist
index fe861f62c9f6..e633e1521133 100644
--- a/www/hs-HTTP/pkg-plist
+++ b/www/hs-HTTP/pkg-plist
@@ -1,32 +1,32 @@
@comment $FreeBSD$
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHTTP-%%HTTP_VERSION%%.o
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/Browser.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/BufferType.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Auth.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Base.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Base64.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Cookie.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/HandleStream.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Headers.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/MD5.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/MD5Aux.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Proxy.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Stream.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Utils.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/Stream.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/StreamDebugger.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/StreamSocket.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/TCP.hi
-%%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHTTP-%%HTTP_VERSION%%.a
-%%HTTP_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/Browser.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/BufferType.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Auth.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Base.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Base64.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Cookie.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/HandleStream.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Headers.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/MD5.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/MD5Aux.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Proxy.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Stream.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Utils.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/Stream.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/StreamDebugger.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/StreamSocket.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/TCP.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP
-@dirrm %%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
-@dirrm %%HTTP_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%HTTP_LIBDIR_REL%%
-@exec /bin/sh %D/%%HTTP_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister HTTP
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index ad10393c0675..7d04eae7dd35 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -8,68 +8,11 @@
PORTNAME= cgi
PORTVERSION= 3001.1.7.1
CATEGORIES= www haskell
-MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX= hs-
MAINTAINER= jacula@gmail.com
COMMENT= A Haskell library for writing CGI programs
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
-
-GHC_VERSION= 6.10.4
-CGI_VERSION= ${PORTVERSION}
-
-GHC_CMD= ${LOCALBASE}/bin/ghc
-SETUP_CMD= ./setup
-
-DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
-CGI_LIBDIR_REL= lib/${DISTNAME}
-
-PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
- CGI_VERSION=${CGI_VERSION} \
- CGI_LIBDIR_REL=${CGI_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+= NOPORTDOCS=""
-.else
-PLIST_SUB+= NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION= 1.15
-HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS= *
-.endif
-
-.SILENT:
-
-do-configure:
- cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
- && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
- cd ${WRKSRC} && ${SETUP_CMD} build \
- && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
- cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
- --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
- cd ${WRKSRC} && ${SETUP_CMD} install \
- && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${CGI_LIBDIR_REL}/register.sh
-
-post-install:
- ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+CABAL_SETUP= Setup.hs
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-cgi/pkg-plist b/www/hs-cgi/pkg-plist
index 37b44e0ce9fe..0a290293de8e 100644
--- a/www/hs-cgi/pkg-plist
+++ b/www/hs-cgi/pkg-plist
@@ -1,22 +1,22 @@
@comment $FreeBSD$
-%%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HScgi-%%CGI_VERSION%%.o
-%%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI.hi
-%%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Accept.hi
-%%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Compat.hi
-%%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Cookie.hi
-%%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Header.hi
-%%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Monad.hi
-%%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Multipart.hi
-%%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Protocol.hi
-%%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHScgi-%%CGI_VERSION%%.a
-%%CGI_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Accept.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Compat.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Cookie.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Header.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Monad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Multipart.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI/Protocol.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI
-@dirrm %%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
-@dirrm %%CGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%CGI_LIBDIR_REL%%
-@exec /bin/sh %D/%%CGI_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/CGI
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister cgi
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 3488367490bc..29651de4b486 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -8,76 +8,12 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.2
CATEGORIES= www haskell
-MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX= hs-
MAINTAINER= jacula@gmail.com
COMMENT= A Haskell library for writing FastCGI programs
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-cgi>=3000.0.0:${PORTSDIR}/www/hs-cgi
-RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-cgi>=3000.0.0:${PORTSDIR}/www/hs-cgi
+USE_HACKAGE= cgi>=3000.0.0
LIB_DEPENDS= fcgi.0:${PORTSDIR}/www/fcgi
-GHC_VERSION= 6.10.4
-FASTCGI_VERSION= ${PORTVERSION}
-
-GHC_CMD= ${LOCALBASE}/bin/ghc
-SETUP_CMD= ./setup
-
-LDFLAGS+= -L${LOCALBASE}/lib
-CPPFLAGS+= -I${LOCALBASE}/include
-
-DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
-FASTCGI_LIBDIR_REL= lib/${DISTNAME}
-
-PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
- FASTCGI_VERSION=${FASTCGI_VERSION} \
- FASTCGI_LIBDIR_REL=${FASTCGI_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+= NOPORTDOCS=""
-.else
-PLIST_SUB+= NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION= 1.15
-HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS= *
-.endif
-
-.SILENT:
-
-do-configure:
- cd ${WRKSRC} && ${SETENV} LDFLAGS="${LDFLAGS}" CPPFLAGS=" ${CPPFLAGS}" ./${CONFIGURE_SCRIPT} \
- && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
- && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} \
- --extra-include-dirs=${LOCALBASE}/include \
- --extra-lib-dirs=${LOCALBASE}/lib
-
-do-build:
- cd ${WRKSRC} && ${SETUP_CMD} build \
- && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
- cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
- --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
- cd ${WRKSRC} && ${SETUP_CMD} install \
- && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${FASTCGI_LIBDIR_REL}/register.sh
-
-post-install:
- ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
-
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-fastcgi/pkg-plist b/www/hs-fastcgi/pkg-plist
index 51cd08a8fbbd..0da51a56d321 100644
--- a/www/hs-fastcgi/pkg-plist
+++ b/www/hs-fastcgi/pkg-plist
@@ -1,14 +1,14 @@
@comment $FreeBSD$
-%%FASTCGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSfastcgi-%%FASTCGI_VERSION%%.o
-%%FASTCGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/FastCGI.hi
-%%FASTCGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSfastcgi-%%FASTCGI_VERSION%%.a
-%%FASTCGI_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/FastCGI.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%FASTCGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
-@dirrm %%FASTCGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%FASTCGI_LIBDIR_REL%%
-@exec /bin/sh %D/%%FASTCGI_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister fastcgi
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index f9dd1ba2812a..35375916b905 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -8,93 +8,21 @@
PORTNAME= http-server
PORTVERSION= 1
CATEGORIES= www haskell
-MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX= hs-
MAINTAINER= jacula@gmail.com
-COMMENT= A library fro writing Haskell web servers
+COMMENT= A library for writing Haskell web servers
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-url>=2:${PORTSDIR}/www/hs-url \
- hs-HTTP>=4000.0.7:${PORTSDIR}/www/hs-HTTP \
- hs-utf8-string-ghc>=0.3.4:${PORTSDIR}/devel/hs-utf8-string-ghc \
- hs-mime>=0.3:${PORTSDIR}/mail/hs-mime
-RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-url>=2:${PORTSDIR}/www/hs-url \
- hs-HTTP>=4000.0.7:${PORTSDIR}/www/hs-HTTP \
- hs-utf8-string-ghc>=0.3.4:${PORTSDIR}/devel/hs-utf8-string-ghc \
- hs-mime>=0.3:${PORTSDIR}/mail/hs-mime
+CABAL_SETUP= Setup.hs
+USE_HACKAGE= HTTP>=4000.0.7 mime>=0.3 url>=2 utf8-string>=0.3.4
-GHC_VERSION= 6.10.4
-HTTPSERVER_VERSION= ${PORTVERSION}
-
-GHC_CMD= ${LOCALBASE}/bin/ghc
-SETUP_CMD= ./setup
-
-EXAMPLESDIR= ${PREFIX}/share/examples/${DISTNAME}
-PORTEXAMPLES= *
-
-DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
-HTTPSERVER_LIBDIR_REL= lib/${DISTNAME}
-
-PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
- HTTPSERVER_VERSION=${HTTPSERVER_VERSION} \
- HTTPSERVER_LIBDIR_REL=${HTTPSERVER_LIBDIR_REL}
+PORTEXAMPLES= *
+INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \
+ ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
.if !defined(NOPORTEXAMPLES)
SUB_FILES= pkg-message
+SHOW_PKGMSG= yes
.endif
-.if defined(NOPORTDOCS)
-PLIST_SUB+= NOPORTDOCS=""
-.else
-PLIST_SUB+= NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION= 1.15
-HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS= *
-.endif
-
-.SILENT:
-
-do-configure:
- cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
- && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
- cd ${WRKSRC} && ${SETUP_CMD} build \
- && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
- cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
- --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
- cd ${WRKSRC} && ${SETUP_CMD} install \
- && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HTTPSERVER_LIBDIR_REL}/register.sh
-.if !defined(NOPORTEXAMPLES)
- ${MKDIR} ${EXAMPLESDIR} && cd ${WRKSRC}/example && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
-.endif
-
-post-install:
- ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
-.if !defined(NOPORTEXAMPLES)
- @${ECHO_MSG} -e "\a"
- @${ECHO_MSG} "================================================================="
- @${CAT} "${PKGMESSAGE}"
- @${ECHO_MSG} "================================================================="
- @${ECHO_MSG}
-.endif
-
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-server/pkg-plist b/www/hs-http-server/pkg-plist
index 6cf4782e9bfb..dbb52486544d 100644
--- a/www/hs-http-server/pkg-plist
+++ b/www/hs-http-server/pkg-plist
@@ -1,20 +1,20 @@
@comment $FreeBSD$
-%%HTTPSERVER_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShttp-server-%%HTTPSERVER_VERSION%%.o
-%%HTTPSERVER_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server.hi
-%%HTTPSERVER_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server/HtmlForm.hi
-%%HTTPSERVER_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server/Logger.hi
-%%HTTPSERVER_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server/Response.hi
-%%HTTPSERVER_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server/Utils.hi
-%%HTTPSERVER_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShttp-server-%%HTTPSERVER_VERSION%%.a
-%%HTTPSERVER_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server/HtmlForm.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server/Logger.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server/Response.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server/Utils.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%HTTPSERVER_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server
-@dirrm %%HTTPSERVER_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP
-@dirrm %%HTTPSERVER_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
-@dirrm %%HTTPSERVER_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%HTTPSERVER_LIBDIR_REL%%
-@exec /bin/sh %D/%%HTTPSERVER_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP/Server
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/HTTP
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister http-server
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index c9114a779b10..761983207ad9 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -8,78 +8,13 @@
PORTNAME= oeis
PORTVERSION= 0.2.2
CATEGORIES= www haskell
-MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX= hs-
MAINTAINER= jacula@gmail.com
COMMENT= A Haskell interface to the Online Encyclopedia of Integer Sequences
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-HTTP>=4000.0.2:${PORTSDIR}/www/hs-HTTP
-RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-HTTP>=4000.0.2:${PORTSDIR}/www/hs-HTTP
+USE_HACKAGE= HTTP>=4000.0.2
-GHC_VERSION= 6.10.4
-OEIS_VERSION= ${PORTVERSION}
-
-GHC_CMD= ${LOCALBASE}/bin/ghc
-SETUP_CMD= ./setup
-
-DATADIR= ${PREFIX}/share/${DISTNAME}
PORTDATA= *
-DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
-OEIS_LIBDIR_REL= lib/${DISTNAME}
-
-PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
- OEIS_VERSION=${OEIS_VERSION} \
- OEIS_LIBDIR_REL=${OEIS_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+= NOPORTDOCS=""
-.else
-PLIST_SUB+= NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION= 1.15
-HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS= *
-.endif
-
-.SILENT:
-
-do-configure:
- cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal
-.if !defined(NOPORTDATA)
- cd ${WRKSRC} && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-.else
- cd ${WRKSRC} && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} \
- --datadir='' --datasubdir='' --docdir='${DOCSDIR}'
-.endif
-
-do-build:
- cd ${WRKSRC} && ${SETUP_CMD} build \
- && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
- cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
- --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
- cd ${WRKSRC} && ${SETUP_CMD} install \
- && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${OEIS_LIBDIR_REL}/register.sh
-
-post-install:
- ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
-
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-oeis/pkg-plist b/www/hs-oeis/pkg-plist
index 5c380d4a86e6..608196b2a48a 100644
--- a/www/hs-oeis/pkg-plist
+++ b/www/hs-oeis/pkg-plist
@@ -1,14 +1,14 @@
@comment $FreeBSD$
-%%OEIS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSoeis-%%OEIS_VERSION%%.o
-%%OEIS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Math/OEIS.hi
-%%OEIS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSoeis-%%OEIS_VERSION%%.a
-%%OEIS_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Math/OEIS.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%OEIS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Math
-@dirrm %%OEIS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%OEIS_LIBDIR_REL%%
-@exec /bin/sh %D/%%OEIS_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Math
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister oeis
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile
index 1613c1c34d75..8ba7ce02bc9a 100644
--- a/www/hs-scgi/Makefile
+++ b/www/hs-scgi/Makefile
@@ -8,70 +8,11 @@
PORTNAME= scgi
PORTVERSION= 0.3.1
CATEGORIES= www haskell
-MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX= hs-
MAINTAINER= jacula@gmail.com
COMMENT= A Haskell library for writing SCGI programs
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-cgi>=3000.0.0:${PORTSDIR}/www/hs-cgi
-RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-cgi>=3000.0.0:${PORTSDIR}/www/hs-cgi
-
-GHC_VERSION= 6.10.4
-SCGI_VERSION= ${PORTVERSION}
-
-GHC_CMD= ${LOCALBASE}/bin/ghc
-SETUP_CMD= ./setup
-
-DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
-SCGI_LIBDIR_REL= lib/${DISTNAME}
-
-PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
- SCGI_VERSION=${SCGI_VERSION} \
- SCGI_LIBDIR_REL=${SCGI_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+= NOPORTDOCS=""
-.else
-PLIST_SUB+= NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION= 1.15
-HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS= *
-.endif
-
-.SILENT:
-
-do-configure:
- cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
- && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
- cd ${WRKSRC} && ${SETUP_CMD} build \
- && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
- cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
- --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
- cd ${WRKSRC} && ${SETUP_CMD} install \
- && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${SCGI_LIBDIR_REL}/register.sh
-
-post-install:
- ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+USE_HACKAGE= cgi
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-scgi/pkg-plist b/www/hs-scgi/pkg-plist
index ec8e865a60dd..f613cc0e5c42 100644
--- a/www/hs-scgi/pkg-plist
+++ b/www/hs-scgi/pkg-plist
@@ -1,14 +1,14 @@
@comment $FreeBSD$
-%%SCGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSscgi-%%SCGI_VERSION%%.o
-%%SCGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/SCGI.hi
-%%SCGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSscgi-%%SCGI_VERSION%%.a
-%%SCGI_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/SCGI.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
%%NOPORTDOCS%%%%DOCSDIR%%/COPYING
%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%SCGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
-@dirrm %%SCGI_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%SCGI_LIBDIR_REL%%
-@exec /bin/sh %D/%%SCGI_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister scgi
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index 5f43a58e30e6..428e53d92a5a 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -8,71 +8,12 @@
PORTNAME= url
PORTVERSION= 2.1
CATEGORIES= www haskell
-MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX= hs-
MAINTAINER= jacula@gmail.com
COMMENT= A Haskell library for working with URLs
-BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-utf8-string-ghc>=0.3.4:${PORTSDIR}/devel/hs-utf8-string-ghc
-
-RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \
- hs-utf8-string-ghc>=0.3.4:${PORTSDIR}/devel/hs-utf8-string-ghc
-
-GHC_VERSION= 6.10.4
-HSURL_VERSION= ${PORTVERSION}
-
-GHC_CMD= ${LOCALBASE}/bin/ghc
-SETUP_CMD= ./setup
-
-DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
-HSURL_LIBDIR_REL= lib/${DISTNAME}
-
-PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
- HSURL_VERSION=${HSURL_VERSION} \
- HSURL_LIBDIR_REL=${HSURL_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+= NOPORTDOCS=""
-.else
-PLIST_SUB+= NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION= 1.15
-HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS= *
-.endif
-
-.SILENT:
-
-do-configure:
- cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
- && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
- cd ${WRKSRC} && ${SETUP_CMD} build \
- && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
- cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
- --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
- cd ${WRKSRC} && ${SETUP_CMD} install \
- && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSURL_LIBDIR_REL}/register.sh
-
-post-install:
- ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+CABAL_SETUP= Setup.hs
+USE_HACKAGE= utf8-string>=0.3.4
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-url/pkg-plist b/www/hs-url/pkg-plist
index a0b02ef6d782..3c88b703fa94 100644
--- a/www/hs-url/pkg-plist
+++ b/www/hs-url/pkg-plist
@@ -1,14 +1,14 @@
@comment $FreeBSD$
-%%HSURL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSurl-%%HSURL_VERSION%%.o
-%%HSURL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/URL.hi
-%%HSURL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSurl-%%HSURL_VERSION%%.a
-%%HSURL_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/URL.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%HSURL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
-@dirrm %%HSURL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%HSURL_LIBDIR_REL%%
-@exec /bin/sh %D/%%HSURL_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister url
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old