- Update to 2.2.0

- Improve PORTDOCS
- Add textproc/latex2html as dependency for the better documentation
generation
- Add a warning message for 6.x users as there might be configure crashes
- Fix pkg-descr

Approved by:	gabor

8 files changed, 62 insertions, 170 deletions

diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index def06117e1aa..06e76063eded 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	darcs
-PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	devel
 MASTER_SITES=	http://darcs.net/
 
@@ -25,7 +24,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		CFLAGS=""
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
-INSTALL_TARGET=	installbin
+INSTALL_TARGET=	install
+PORTDOCS=	manual examples
 
 .include <bsd.port.pre.mk>
 
@@ -43,9 +43,12 @@ PLIST_SUB+=	CGIDIR=${CGIDIR} SERVER=""
 PLIST_SUB+=	SERVER="@comment "
 .endif
 .if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX-base \
+		latex2html:${PORTSDIR}/textproc/latex2html
 ALL_TARGET+=	doc/manual/darcs.ps doc/manual/patch-theory.pdf doc/manual/index.html
-INSTALL_TARGET+=	installdocs
+INSTALL_TARGET+=	install-ps install-pdf install-html install-examples
+.else
+CONFIGURE_ARGS+=	--without-manual
 .endif
 
 MAN1=	darcs.1
@@ -57,6 +60,24 @@ post-patch:
 		${WRKSRC}/${MAKEFILE}
 .endif
 
+pre-configure:
+.if ${OSVERSION} < 700000
+	@${ECHO_MSG}	""
+	@${ECHO_MSG}	"###############################################################################"
+	@${ECHO_MSG}	"                                                                               "
+	@${ECHO_MSG}	"                                A T T E N T I O N                              "
+	@${ECHO_MSG}	"                                                                               "
+	@${ECHO_MSG}	"If you experience problems during the configure process, please add the        "
+	@${ECHO_MSG}    "following lines to your /etc/libmap.conf configuration file:                   "
+	@${ECHO_MSG}    "                                                                               "
+	@${ECHO_MSG}    "libpthread.so.1 libthr.so.1                                                    "
+	@${ECHO_MSG}    "libpthread.so.2 libthr.so.2                                                    "
+	@${ECHO_MSG}    "libkse.so.3 libthr.so.3                                                        "
+	@${ECHO_MSG}    "                                                                               "
+	@${ECHO_MSG}	"###############################################################################"
+	@${ECHO_MSG}	""
+.endif
+
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/darcs
 
diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo
index 5b0575a252aa..e12ede6ee3a8 100644
--- a/devel/darcs/distinfo
+++ b/devel/darcs/distinfo
@@ -1,3 +1,3 @@
-MD5 (darcs-2.0.2.tar.gz) = f216b019dc9fc83cf920f715b1da375c
-SHA256 (darcs-2.0.2.tar.gz) = 164c87bb7e41d1e81c4423432804b634862269291fa495f25e7f67f1b95bf49e
-SIZE (darcs-2.0.2.tar.gz) = 1800653
+MD5 (darcs-2.2.0.tar.gz) = 8f0a5eba5971e7cf324c63664cde59e2
+SHA256 (darcs-2.2.0.tar.gz) = 81633effd983b2d67e2d5eaee32666f1207def8a9af189c5abd6d1a9acab35da
+SIZE (darcs-2.2.0.tar.gz) = 1793273
diff --git a/devel/darcs/pkg-descr b/devel/darcs/pkg-descr
index 83782f2a970f..081165326174 100644
--- a/devel/darcs/pkg-descr
+++ b/devel/darcs/pkg-descr
@@ -1,4 +1,4 @@
-David's Advanced Revision Control System is yet another replacement for CVS. It
-is written in haskell.
+David's Advanced Revision Control System is yet another replacement for
+CVS.  It is written in Haskell.
 
 WWW: http://darcs.net/
diff --git a/devel/darcs/pkg-plist b/devel/darcs/pkg-plist
index 6414940ddcd3..0b240a88fb2d 100644
--- a/devel/darcs/pkg-plist
+++ b/devel/darcs/pkg-plist
@@ -12,83 +12,8 @@ etc/bash_completion.d/darcs
 %%SERVER%%share/darcs/xslt/repos.xslt
 %%SERVER%%share/darcs/xslt/rss.xslt
 %%SERVER%%share/darcs/xslt/styles.css
-%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_new
-%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_old
-%%PORTDOCS%%%%DOCSDIR%%/manual/WARNINGS
-%%PORTDOCS%%%%DOCSDIR%%/manual/contents.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/crossref.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.ps
-%%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/img23.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img24.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img25.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img26.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img27.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img28.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img29.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img3.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img30.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img31.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img32.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img33.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img34.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img35.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img36.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/node11.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/nx_grp_g.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/patch-theory.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/prev.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/prev_g.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/up.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/up_g.png
 @dirrm etc/bash_completion.d
 %%SERVER%%@dirrmtry etc/darcs
 %%SERVER%%@dirrmtry www/cgi-bin
 %%SERVER%%@dirrm share/darcs/xslt
 %%SERVER%%@dirrm share/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 def06117e1aa..06e76063eded 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	darcs
-PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	devel
 MASTER_SITES=	http://darcs.net/
 
@@ -25,7 +24,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		CFLAGS=""
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
-INSTALL_TARGET=	installbin
+INSTALL_TARGET=	install
+PORTDOCS=	manual examples
 
 .include <bsd.port.pre.mk>
 
@@ -43,9 +43,12 @@ PLIST_SUB+=	CGIDIR=${CGIDIR} SERVER=""
 PLIST_SUB+=	SERVER="@comment "
 .endif
 .if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX-base \
+		latex2html:${PORTSDIR}/textproc/latex2html
 ALL_TARGET+=	doc/manual/darcs.ps doc/manual/patch-theory.pdf doc/manual/index.html
-INSTALL_TARGET+=	installdocs
+INSTALL_TARGET+=	install-ps install-pdf install-html install-examples
+.else
+CONFIGURE_ARGS+=	--without-manual
 .endif
 
 MAN1=	darcs.1
@@ -57,6 +60,24 @@ post-patch:
 		${WRKSRC}/${MAKEFILE}
 .endif
 
+pre-configure:
+.if ${OSVERSION} < 700000
+	@${ECHO_MSG}	""
+	@${ECHO_MSG}	"###############################################################################"
+	@${ECHO_MSG}	"                                                                               "
+	@${ECHO_MSG}	"                                A T T E N T I O N                              "
+	@${ECHO_MSG}	"                                                                               "
+	@${ECHO_MSG}	"If you experience problems during the configure process, please add the        "
+	@${ECHO_MSG}    "following lines to your /etc/libmap.conf configuration file:                   "
+	@${ECHO_MSG}    "                                                                               "
+	@${ECHO_MSG}    "libpthread.so.1 libthr.so.1                                                    "
+	@${ECHO_MSG}    "libpthread.so.2 libthr.so.2                                                    "
+	@${ECHO_MSG}    "libkse.so.3 libthr.so.3                                                        "
+	@${ECHO_MSG}    "                                                                               "
+	@${ECHO_MSG}	"###############################################################################"
+	@${ECHO_MSG}	""
+.endif
+
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/darcs
 
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 5b0575a252aa..e12ede6ee3a8 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,3 +1,3 @@
-MD5 (darcs-2.0.2.tar.gz) = f216b019dc9fc83cf920f715b1da375c
-SHA256 (darcs-2.0.2.tar.gz) = 164c87bb7e41d1e81c4423432804b634862269291fa495f25e7f67f1b95bf49e
-SIZE (darcs-2.0.2.tar.gz) = 1800653
+MD5 (darcs-2.2.0.tar.gz) = 8f0a5eba5971e7cf324c63664cde59e2
+SHA256 (darcs-2.2.0.tar.gz) = 81633effd983b2d67e2d5eaee32666f1207def8a9af189c5abd6d1a9acab35da
+SIZE (darcs-2.2.0.tar.gz) = 1793273
diff --git a/devel/hs-darcs/pkg-descr b/devel/hs-darcs/pkg-descr
index 83782f2a970f..081165326174 100644
--- a/devel/hs-darcs/pkg-descr
+++ b/devel/hs-darcs/pkg-descr
@@ -1,4 +1,4 @@
-David's Advanced Revision Control System is yet another replacement for CVS. It
-is written in haskell.
+David's Advanced Revision Control System is yet another replacement for
+CVS.  It is written in Haskell.
 
 WWW: http://darcs.net/
diff --git a/devel/hs-darcs/pkg-plist b/devel/hs-darcs/pkg-plist
index 6414940ddcd3..0b240a88fb2d 100644
--- a/devel/hs-darcs/pkg-plist
+++ b/devel/hs-darcs/pkg-plist
@@ -12,83 +12,8 @@ etc/bash_completion.d/darcs
 %%SERVER%%share/darcs/xslt/repos.xslt
 %%SERVER%%share/darcs/xslt/rss.xslt
 %%SERVER%%share/darcs/xslt/styles.css
-%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_new
-%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_old
-%%PORTDOCS%%%%DOCSDIR%%/manual/WARNINGS
-%%PORTDOCS%%%%DOCSDIR%%/manual/contents.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/crossref.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.ps
-%%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/img23.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img24.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img25.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img26.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img27.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img28.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img29.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img3.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img30.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img31.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img32.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img33.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img34.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img35.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/img36.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/node11.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/nx_grp_g.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/patch-theory.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/prev.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/prev_g.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/up.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/up_g.png
 @dirrm etc/bash_completion.d
 %%SERVER%%@dirrmtry etc/darcs
 %%SERVER%%@dirrmtry www/cgi-bin
 %%SERVER%%@dirrm share/darcs/xslt
 %%SERVER%%@dirrm share/darcs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%