Upgrade to 0.9.20.

8 files changed, 38 insertions, 42 deletions

diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index a0783343b9de..0f306e64adcc 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	darcs
-PORTVERSION=	0.9.17
+PORTVERSION=	0.9.20
 CATEGORIES=	devel
 MASTER_SITES=	http://www.abridgegame.org/darcs/
 
@@ -16,6 +16,7 @@ COMMENT=	Yet another replacement for CVS, written in Haskell
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
+OPTIONS=	SERVER "install server" off
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -24,10 +25,13 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	darcs darcs.1
+INSTALL_TARGET=	installbin
+
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_SERVER)
 ALL_TARGET+=	darcs_cgi darcs-createrepo
-INSTALL_TARGET=	install installserver
+INSTALL_TARGET+=	installserver
 .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)
 CGIDIR?=	share/apache/cgi-bin
 .else
@@ -37,16 +41,12 @@ PLIST_SUB+=	CGIDIR=${CGIDIR} SERVER=""
 .else
 PLIST_SUB+=	SERVER="@comment "
 .endif
+.if !defined(NOPORTDOCS)
+INSTALL_TARGET+=	installdocs
+.endif
 
 MAN1=	darcs.1
 
-pre-everything::
-.if !defined(WITH_SERVER)
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "To build and install the server define WITH_SERVER."
-	@${ECHO_CMD} ""
-.endif
-
 post-patch:
 .if defined(WITH_SERVER)
 	@${REINPLACE_CMD} -e 's|$$(libexecdir)/cgi-bin|${PREFIX}/${CGIDIR}| ; \
@@ -57,11 +57,9 @@ post-patch:
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e '/$$(datadir)/d' ${WRKSRC}/${MAKEFILE}
 .else
-	@${REINPLACE_CMD} -e '/darcs\.ps/d'  ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's/^\(installdocs:.\)darcs.ps/\1/ ; \
+			s/^\(installbin:\).*/\1/ ; /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>
+.include <bsd.port.post.mk>
diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo
index 6a7f34e52160..9b51f95bde06 100644
--- a/devel/darcs/distinfo
+++ b/devel/darcs/distinfo
@@ -1,2 +1,2 @@
-MD5 (darcs-0.9.17.tar.gz) = e22de763a95f8a9b58c03accbd46fd2a
-SIZE (darcs-0.9.17.tar.gz) = 310044
+MD5 (darcs-0.9.20.tar.gz) = 4d7bd4d35ee5eadb5913fb19cbfea5ab
+SIZE (darcs-0.9.20.tar.gz) = 347268
diff --git a/devel/darcs/pkg-descr b/devel/darcs/pkg-descr
index f4a14bd76aee..6a58dac9cf8b 100644
--- a/devel/darcs/pkg-descr
+++ b/devel/darcs/pkg-descr
@@ -2,6 +2,3 @@ David's Advanced Revision Control System is yet another replacement for CVS. It
 is written in haskell.
 
 WWW: http://www.abridgegame.org/darcs/
-
--- Oliver Braun
-obraun@FreeBSD.org
diff --git a/devel/darcs/pkg-plist b/devel/darcs/pkg-plist
index 96aee355c7fc..ecb3be61b46c 100644
--- a/devel/darcs/pkg-plist
+++ b/devel/darcs/pkg-plist
@@ -1,5 +1,4 @@
 bin/darcs
-bin/convert-repo
 %%SERVER%%%%CGIDIR%%/darcs
 %%SERVER%%sbin/darcs-createrepo
 %%SERVER%%etc/darcs/cgi.conf.sample
@@ -7,6 +6,7 @@ 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/crossref.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/darcs.css
 %%PORTDOCS%%%%DOCSDIR%%/manual/darcs.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/footnode.html
@@ -29,6 +29,8 @@ etc/darcs/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/manual/img20.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/img21.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/img22.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img23.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img24.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/img3.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/img4.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/img5.png
@@ -43,6 +45,7 @@ etc/darcs/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/manual/next_g.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node10.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node11.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node2.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node3.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node4.html
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index a0783343b9de..0f306e64adcc 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	darcs
-PORTVERSION=	0.9.17
+PORTVERSION=	0.9.20
 CATEGORIES=	devel
 MASTER_SITES=	http://www.abridgegame.org/darcs/
 
@@ -16,6 +16,7 @@ COMMENT=	Yet another replacement for CVS, written in Haskell
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
+OPTIONS=	SERVER "install server" off
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -24,10 +25,13 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	darcs darcs.1
+INSTALL_TARGET=	installbin
+
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_SERVER)
 ALL_TARGET+=	darcs_cgi darcs-createrepo
-INSTALL_TARGET=	install installserver
+INSTALL_TARGET+=	installserver
 .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)
 CGIDIR?=	share/apache/cgi-bin
 .else
@@ -37,16 +41,12 @@ PLIST_SUB+=	CGIDIR=${CGIDIR} SERVER=""
 .else
 PLIST_SUB+=	SERVER="@comment "
 .endif
+.if !defined(NOPORTDOCS)
+INSTALL_TARGET+=	installdocs
+.endif
 
 MAN1=	darcs.1
 
-pre-everything::
-.if !defined(WITH_SERVER)
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "To build and install the server define WITH_SERVER."
-	@${ECHO_CMD} ""
-.endif
-
 post-patch:
 .if defined(WITH_SERVER)
 	@${REINPLACE_CMD} -e 's|$$(libexecdir)/cgi-bin|${PREFIX}/${CGIDIR}| ; \
@@ -57,11 +57,9 @@ post-patch:
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e '/$$(datadir)/d' ${WRKSRC}/${MAKEFILE}
 .else
-	@${REINPLACE_CMD} -e '/darcs\.ps/d'  ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's/^\(installdocs:.\)darcs.ps/\1/ ; \
+			s/^\(installbin:\).*/\1/ ; /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>
+.include <bsd.port.post.mk>
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 6a7f34e52160..9b51f95bde06 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,2 +1,2 @@
-MD5 (darcs-0.9.17.tar.gz) = e22de763a95f8a9b58c03accbd46fd2a
-SIZE (darcs-0.9.17.tar.gz) = 310044
+MD5 (darcs-0.9.20.tar.gz) = 4d7bd4d35ee5eadb5913fb19cbfea5ab
+SIZE (darcs-0.9.20.tar.gz) = 347268
diff --git a/devel/hs-darcs/pkg-descr b/devel/hs-darcs/pkg-descr
index f4a14bd76aee..6a58dac9cf8b 100644
--- a/devel/hs-darcs/pkg-descr
+++ b/devel/hs-darcs/pkg-descr
@@ -2,6 +2,3 @@ David's Advanced Revision Control System is yet another replacement for CVS. It
 is written in haskell.
 
 WWW: http://www.abridgegame.org/darcs/
-
--- Oliver Braun
-obraun@FreeBSD.org
diff --git a/devel/hs-darcs/pkg-plist b/devel/hs-darcs/pkg-plist
index 96aee355c7fc..ecb3be61b46c 100644
--- a/devel/hs-darcs/pkg-plist
+++ b/devel/hs-darcs/pkg-plist
@@ -1,5 +1,4 @@
 bin/darcs
-bin/convert-repo
 %%SERVER%%%%CGIDIR%%/darcs
 %%SERVER%%sbin/darcs-createrepo
 %%SERVER%%etc/darcs/cgi.conf.sample
@@ -7,6 +6,7 @@ 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/crossref.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/darcs.css
 %%PORTDOCS%%%%DOCSDIR%%/manual/darcs.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/footnode.html
@@ -29,6 +29,8 @@ etc/darcs/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/manual/img20.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/img21.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/img22.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img23.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/img24.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/img3.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/img4.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/img5.png
@@ -43,6 +45,7 @@ etc/darcs/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/manual/next_g.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node10.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node11.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node2.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node3.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node4.html