* Upgrade to 0.9.11.

* Install portdocs.
* Replaced knob WITH_CGI with WITH_SERVER to follow upstream.

6 files changed, 188 insertions, 68 deletions

diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index e71b13d24f1f..e58317cbbf4f 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	darcs
-PORTVERSION=	0.9.10
+PORTVERSION=	0.9.11
 CATEGORIES=	devel
 MASTER_SITES=	http://www.abridgegame.org/darcs/
 
@@ -17,53 +17,54 @@ BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/" \
+		CFLAGS=""
 USE_GMAKE=	yes
-ALL_TARGET=	darcs darcs.1 darcs-patcher darcs-createrepo
+MAKEFILE=	GNUmakefile
+ALL_TARGET=	darcs darcs.1
 
-GHC_VERSION=	`${LOCALBASE}/bin/ghc --numeric-version`
-
-.if defined(WITH_CGI)
-ALL_TARGET+=	darcs_cgi
+.if defined(WITH_SERVER)
+ALL_TARGET+=	darcs_cgi darcs-patcher darcs-createrepo
+INSTALL_TARGET=	install installserver
 .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)
 CGIDIR?=	share/apache/cgi-bin
 .else
 CGIDIR?=	www/cgi-bin
 .endif
-PLIST_SUB+=	CGIDIR=${CGIDIR}
+PLIST_SUB+=	CGIDIR=${CGIDIR} SERVER=""
 .else
-PLIST_SUB+=	CGIDIR="@comment "
+PLIST_SUB+=	SERVER="@comment "
 .endif
 
 MAN1=	darcs.1
 
 pre-everything::
-.if !defined(WITH_CGI)
+.if !defined(WITH_SERVER)
 	@${ECHO_CMD} ""
-	@${ECHO_CMD} "To build and install the cgi script define WITH_CGI."
+	@${ECHO_CMD} "To build and install the server define WITH_SERVER."
 	@${ECHO_CMD} ""
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|<curl|<${PREFIX}/include/curl|' \
-		${WRKSRC}/hscurl.c
-	@${REINPLACE_CMD} -e \
-		's|/usr/share/doc/darcs/manual/index.html|http://www.abridgegame.org/darcs/|' \
-		${WRKSRC}/man.hs
-
-do-configure:
-	@${ECHO_CMD} PREFIX=${PREFIX} >> ${WRKSRC}/make.inc
-	@${ECHO_CMD} CURL_STUFF = hscurl.c -lcurl -optl-pthread -L${PREFIX}/lib/ \
-		>> ${WRKSRC}/make.inc
-	@${ECHO_CMD} GHCINC=-I${PREFIX}/lib/ghc-${GHC_VERSION}/include >> ${WRKSRC}/make.inc
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/darcs ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/darcs.1 ${MANPREFIX}/man/man1
-	${INSTALL_PROGRAM} ${WRKSRC}/darcs-patcher ${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/darcs-createrepo ${PREFIX}/bin
-.if defined(WITH_CGI)
-	${MKDIR} ${PREFIX}/${CGIDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/darcs_cgi ${PREFIX}/${CGIDIR}/darcs
+	@${REINPLACE_CMD} -e 's|/usr/share/doc/darcs|${DOCSDIR}|' \
+		${WRKSRC}/darcsman.hs
+.if defined(WITH_SERVER)
+	@${REINPLACE_CMD} -e 's|$$(libexecdir)/cgi-bin|${PREFIX}/${CGIDIR}| ; \
+		s|darcs/cgi.conf|cgi.conf.sample|' \
+		${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e '/$$(sysconfdir)\/darcs/d' ${WRKSRC}/${MAKEFILE}
 .endif
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/$$(datadir)/d' ${WRKSRC}/${MAKEFILE}
+.else
+	@${REINPLACE_CMD} -e 's|$$(datadir)/doc|${DOCSDIR}| ; /darcs\.ps/d' \
+		${WRKSRC}/${MAKEFILE}
+.endif
+
+post-configure:
+	@${REINPLACE_CMD} -e 's|\(^CURLFLAGS.*\)|\1 -optl-pthread| \
+		; s|all :.*|all::|' ${WRKSRC}/autoconf.mk
 
 .include <bsd.port.mk>
diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo
index 1aacc4694893..bd5e63e7c1cc 100644
--- a/devel/darcs/distinfo
+++ b/devel/darcs/distinfo
@@ -1 +1 @@
-MD5 (darcs-0.9.10.tar.gz) = 1d88dc1d7dec1dd975d4bd7a684d24b9
+MD5 (darcs-0.9.11.tar.gz) = 7110bb5a62bb9952405afe4e02c938b3
diff --git a/devel/darcs/pkg-plist b/devel/darcs/pkg-plist
index 71a34c596730..bba5d94e7f1d 100644
--- a/devel/darcs/pkg-plist
+++ b/devel/darcs/pkg-plist
@@ -1,4 +1,63 @@
 bin/darcs
-bin/darcs-createrepo
-libexec/darcs-patcher
-%%CGIDIR%%/darcs
+%%SERVER%%%%CGIDIR%%/darcs
+%%SERVER%%sbin/darcs-createrepo
+%%SERVER%%libexec/darcs/darcs-patcher
+%%SERVER%%etc/darcs/cgi.conf.sample
+etc/darcs/bash_completion.d/darcs
+%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_new
+%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_old
+%%PORTDOCS%%%%DOCSDIR%%/manual/contents.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/footnode.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/images.aux
+%%PORTDOCS%%%%DOCSDIR%%/manual/images.log
+%%PORTDOCS%%%%DOCSDIR%%/manual/images.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/images.tex
+%%PORTDOCS%%%%DOCSDIR%%/manual/img1.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img10.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img11.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img12.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img13.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img14.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img15.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img16.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img17.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img18.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img19.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img2.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img20.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img21.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img22.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img3.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img4.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img5.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img6.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img7.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img8.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img9.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/internals.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/labels.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/next.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/next_g.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/node1.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node10.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node2.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node3.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node4.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node5.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node6.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node7.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node8.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/prev.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/prev_g.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/up.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/up_g.png
+@dirrm etc/darcs/bash_completion.d
+@dirrm etc/darcs
+%%SERVER%%@dirrm libexec/darcs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index e71b13d24f1f..e58317cbbf4f 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	darcs
-PORTVERSION=	0.9.10
+PORTVERSION=	0.9.11
 CATEGORIES=	devel
 MASTER_SITES=	http://www.abridgegame.org/darcs/
 
@@ -17,53 +17,54 @@ BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/" \
+		CFLAGS=""
 USE_GMAKE=	yes
-ALL_TARGET=	darcs darcs.1 darcs-patcher darcs-createrepo
+MAKEFILE=	GNUmakefile
+ALL_TARGET=	darcs darcs.1
 
-GHC_VERSION=	`${LOCALBASE}/bin/ghc --numeric-version`
-
-.if defined(WITH_CGI)
-ALL_TARGET+=	darcs_cgi
+.if defined(WITH_SERVER)
+ALL_TARGET+=	darcs_cgi darcs-patcher darcs-createrepo
+INSTALL_TARGET=	install installserver
 .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)
 CGIDIR?=	share/apache/cgi-bin
 .else
 CGIDIR?=	www/cgi-bin
 .endif
-PLIST_SUB+=	CGIDIR=${CGIDIR}
+PLIST_SUB+=	CGIDIR=${CGIDIR} SERVER=""
 .else
-PLIST_SUB+=	CGIDIR="@comment "
+PLIST_SUB+=	SERVER="@comment "
 .endif
 
 MAN1=	darcs.1
 
 pre-everything::
-.if !defined(WITH_CGI)
+.if !defined(WITH_SERVER)
 	@${ECHO_CMD} ""
-	@${ECHO_CMD} "To build and install the cgi script define WITH_CGI."
+	@${ECHO_CMD} "To build and install the server define WITH_SERVER."
 	@${ECHO_CMD} ""
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|<curl|<${PREFIX}/include/curl|' \
-		${WRKSRC}/hscurl.c
-	@${REINPLACE_CMD} -e \
-		's|/usr/share/doc/darcs/manual/index.html|http://www.abridgegame.org/darcs/|' \
-		${WRKSRC}/man.hs
-
-do-configure:
-	@${ECHO_CMD} PREFIX=${PREFIX} >> ${WRKSRC}/make.inc
-	@${ECHO_CMD} CURL_STUFF = hscurl.c -lcurl -optl-pthread -L${PREFIX}/lib/ \
-		>> ${WRKSRC}/make.inc
-	@${ECHO_CMD} GHCINC=-I${PREFIX}/lib/ghc-${GHC_VERSION}/include >> ${WRKSRC}/make.inc
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/darcs ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/darcs.1 ${MANPREFIX}/man/man1
-	${INSTALL_PROGRAM} ${WRKSRC}/darcs-patcher ${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/darcs-createrepo ${PREFIX}/bin
-.if defined(WITH_CGI)
-	${MKDIR} ${PREFIX}/${CGIDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/darcs_cgi ${PREFIX}/${CGIDIR}/darcs
+	@${REINPLACE_CMD} -e 's|/usr/share/doc/darcs|${DOCSDIR}|' \
+		${WRKSRC}/darcsman.hs
+.if defined(WITH_SERVER)
+	@${REINPLACE_CMD} -e 's|$$(libexecdir)/cgi-bin|${PREFIX}/${CGIDIR}| ; \
+		s|darcs/cgi.conf|cgi.conf.sample|' \
+		${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e '/$$(sysconfdir)\/darcs/d' ${WRKSRC}/${MAKEFILE}
 .endif
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/$$(datadir)/d' ${WRKSRC}/${MAKEFILE}
+.else
+	@${REINPLACE_CMD} -e 's|$$(datadir)/doc|${DOCSDIR}| ; /darcs\.ps/d' \
+		${WRKSRC}/${MAKEFILE}
+.endif
+
+post-configure:
+	@${REINPLACE_CMD} -e 's|\(^CURLFLAGS.*\)|\1 -optl-pthread| \
+		; s|all :.*|all::|' ${WRKSRC}/autoconf.mk
 
 .include <bsd.port.mk>
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 1aacc4694893..bd5e63e7c1cc 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1 +1 @@
-MD5 (darcs-0.9.10.tar.gz) = 1d88dc1d7dec1dd975d4bd7a684d24b9
+MD5 (darcs-0.9.11.tar.gz) = 7110bb5a62bb9952405afe4e02c938b3
diff --git a/devel/hs-darcs/pkg-plist b/devel/hs-darcs/pkg-plist
index 71a34c596730..bba5d94e7f1d 100644
--- a/devel/hs-darcs/pkg-plist
+++ b/devel/hs-darcs/pkg-plist
@@ -1,4 +1,63 @@
 bin/darcs
-bin/darcs-createrepo
-libexec/darcs-patcher
-%%CGIDIR%%/darcs
+%%SERVER%%%%CGIDIR%%/darcs
+%%SERVER%%sbin/darcs-createrepo
+%%SERVER%%libexec/darcs/darcs-patcher
+%%SERVER%%etc/darcs/cgi.conf.sample
+etc/darcs/bash_completion.d/darcs
+%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_new
+%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_old
+%%PORTDOCS%%%%DOCSDIR%%/manual/contents.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/footnode.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/images.aux
+%%PORTDOCS%%%%DOCSDIR%%/manual/images.log
+%%PORTDOCS%%%%DOCSDIR%%/manual/images.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/images.tex
+%%PORTDOCS%%%%DOCSDIR%%/manual/img1.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img10.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img11.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img12.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img13.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img14.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img15.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img16.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img17.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img18.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img19.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img2.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img20.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img21.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img22.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img3.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img4.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img5.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img6.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img7.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img8.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img9.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/internals.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/labels.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/next.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/next_g.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/node1.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node10.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node2.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node3.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node4.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node5.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node6.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node7.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node8.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/prev.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/prev_g.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/up.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/up_g.png
+@dirrm etc/darcs/bash_completion.d
+@dirrm etc/darcs
+%%SERVER%%@dirrm libexec/darcs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
+%%PORTDOCS%%@dirrm %%DOCSDIR%%