ports/113541: devel/git: Bump to 1.5.2.1, ditch NOPORTDOCS, download manpages

[Ed Schouten]

>Number:         113541
>Category:       ports
>Synopsis:       devel/git: Bump to 1.5.2.1, ditch NOPORTDOCS, download manpages
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 10 21:30:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Ed Schouten
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD palm.hoeg.nl 6.2-STABLE FreeBSD 6.2-STABLE #0: Fri Apr 20 13:44:49 CEST 2007 root at palm.hoeg.nl:/usr/obj/usr/src/sys/PALM i386
>Description:
When emailing with alexbl@, he told me that Git also ships prebuilt
manpages, which I didn't know before. This means that we can just ditch
NOPORTDOCS, because that switch is usually meant for share/doc/* stuff,
not manpages.

This patch bumps the port to 1.5.2.1 and removes the dependency on
asciidoc and xmlto; we can now just install the manpages from the
git-manpages tarball itself.
>How-To-Repeat:
>Fix:
--- devel/git/Makefile	Mon May 28 01:43:32 2007
+++ devel/git/Makefile	Sun Jun 10 23:20:51 2007
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.5.2
-PORTREVISION=	1
+PORTVERSION=	1.5.2.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	anholt at FreeBSD.org
 COMMENT=	Distributed source code management tool
 
 BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		asciidoc:${PORTSDIR}/textproc/asciidoc \
-		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
-		xmlto:${PORTSDIR}/textproc/xmlto
+		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
 RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		cvsps:${PORTSDIR}/devel/cvsps-devel \
 		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
@@ -25,7 +24,6 @@
 
 CONFLICTS=	cogito-0.1[012] git-4.*
 
-.if !defined(NOPORTDOCS)
 MAN1=		git-add.1 \
 		git-am.1 \
 		git-annotate.1 \
@@ -158,23 +156,16 @@
 		git-whatchanged.1 \
 		git-write-tree.1 \
 		gitk.1
-MAN5=		gitattributes.5
-MAN7=		git.7
-.endif
 MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=		Git.3
+MAN5=		gitattributes.5 gitignore.5
+MAN7=		git.7
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-ALL_TARGET=	all
-INSTALL_TARGET=	install
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	doc
-INSTALL_TARGET+=install-doc
-.endif
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV+=	CURLDIR=${LOCALBASE} \
 		NEEDS_LIBICONV=yes \
@@ -194,6 +185,16 @@
 .endif
 
 post-install:
+.for i in ${MAN1}
+	${INSTALL_MAN} ${WRKDIR}/man1/${i} ${MANPREFIX}/man/man1/
+.endfor
+.for i in ${MAN5}
+	${INSTALL_MAN} ${WRKDIR}/man5/${i} ${MANPREFIX}/man/man5/
+.endfor
+.for i in ${MAN7}
+	${INSTALL_MAN} ${WRKDIR}/man7/${i} ${MANPREFIX}/man/man7/
+.endfor
+
 	-${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
 	${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
 	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
--- devel/git/distinfo	Sun May 27 08:32:25 2007
+++ devel/git/distinfo	Sun Jun 10 22:59:10 2007
@@ -1,3 +1,6 @@
-MD5 (git-1.5.2.tar.bz2) = 79c749b720c29c024d948163fdc47dac
-SHA256 (git-1.5.2.tar.bz2) = 26e30a20a6ee659018a863f743803811535042454f1edad8727b375fefac6ff5
-SIZE (git-1.5.2.tar.bz2) = 1180424
+MD5 (git-1.5.2.1.tar.bz2) = 0a39e786a12974cbe7b14f2fe92dc163
+SHA256 (git-1.5.2.1.tar.bz2) = 4f2710ae146ba387e614f652b0e7e11a4f71090794c49a60791e063f21635b37
+SIZE (git-1.5.2.1.tar.bz2) = 1184392
+MD5 (git-manpages-1.5.2.1.tar.bz2) = e9da37e899167a4f36a71c8fee46e6a0
+SHA256 (git-manpages-1.5.2.1.tar.bz2) = f9e72f4bcb0eaf193d1889c76cea80faf74aed87de0d3739ff1e9291d910a05f
+SIZE (git-manpages-1.5.2.1.tar.bz2) = 139651
>Release-Note:
>Audit-Trail:
>Unformatted: