aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2007-07-10 04:55:46 +0800
committeranholt <anholt@FreeBSD.org>2007-07-10 04:55:46 +0800
commitaada55c32baf3844d5ddeb89bdb4cdba98d202b7 (patch)
tree810b48f46a487abec10c15c23eff923ca3613a5d
parente8f8168cdd9e2217978ce5ab0421be31ab9790ac (diff)
downloadfreebsd-ports-gnome-aada55c32baf3844d5ddeb89bdb4cdba98d202b7.tar.gz
freebsd-ports-gnome-aada55c32baf3844d5ddeb89bdb4cdba98d202b7.tar.zst
freebsd-ports-gnome-aada55c32baf3844d5ddeb89bdb4cdba98d202b7.zip
git: Update to 1.5.2.1, and use prebuilt manpages instead of asciidoc.
PR: ports/113541 Submitted by: Ed Schouten <ed@fxq.nl>
-rw-r--r--devel/git/Makefile31
-rw-r--r--devel/git/distinfo9
2 files changed, 22 insertions, 18 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 0b7932dd97bf..a5958047c03f 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -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@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 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
CONFLICTS= cogito-0.1[012] git-4.*
-.if !defined(NOPORTDOCS)
MAN1= git-add.1 \
git-am.1 \
git-annotate.1 \
@@ -158,23 +156,16 @@ MAN1= git-add.1 \
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 @@ MAKE_ENV+= NO_TCLTK=yes
.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
diff --git a/devel/git/distinfo b/devel/git/distinfo
index ea0fdc1f4953..7d7eb9ae7ba7 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -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