Bug 113643

Comment 1 Edwin Groothuis 2007-06-13 07:00:24 UTC

Responsible Changed
From-To: freebsd-ports-bugs->anholt

Over to maintainer

Good day.

Spotted one more error: git-svn needs perl's Term-ReadKey
package.  The following patch will bring the dependency.

diff -urN ./Makefile ../git/Makefile
--- ./Makefile	Wed Jun 13 14:53:13 2007
+++ ../git/Makefile	Wed Jun 13 16:07:30 2007
@@ -193,6 +194,19 @@
 MAKE_ENV+=	NO_TCLTK=yes
 .endif
 
+.ifdef WITH_GITSVN
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
+.endif
+
+.include <bsd.port.pre.mk>
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "This port has the following tunables:"
+	@${ECHO_MSG} "WITHOUT_GUI:	disables Git GUI programs"
+	@${ECHO_MSG} "WITH_GITSVN:	enables Git <-> SVN interface"
+	@${ECHO_MSG} ""
+
 post-install:
 	-${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
 	${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
@@ -206,4 +220,4 @@
 	${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/vc-git.el \
 		${PREFIX}/lib/xemacs/site-lisp/git/vc-git.el
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Me again.

The third patch: it removed the need in patching Makefile.  GNU
make respects the variables passed in the command line even if
they were initialized inside the Makefile.  And as Git maintainers
told me, it is the preferred way to go.

This patch is a kind of cosmetic.  I am Cc'ing Ed Shouten who did
that patch for the Makefile.  Ed, is that what you meant?

diff -urN ./Makefile ../git/Makefile
--- ./Makefile	Thu Jun 14 16:00:09 2007
+++ ../git/Makefile	Thu Jun 14 16:37:12 2007
@@ -183,15 +183,20 @@
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PYTHON_PATH=${LOCALBASE}/bin/python \
 		PERL_PATH=${PERL}
-MAKE_ARGS+=	prefix="${PREFIX}"
+MAKE_ARGS+=	prefix="${PREFIX}" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="${CC}" \
+		TAR="${TAR}" \
+		INSTALL="${INSTALL}"
 
 .ifndef WITHOUT_GUI
 PLIST_SUB+=	GUI=""
 RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-MAKE_ENV+=	TCL_PATH=tclsh8.4 TCLTK_PATH=wish8.4
+MAKE_ARGS+=	TCL_PATH=tclsh8.4 TCLTK_PATH=wish8.4
 .else
 PLIST_SUB+=	GUI="@comment "
-MAKE_ENV+=	NO_TCLTK=yes
+MAKE_ARGS+=	NO_TCLTK=yes
 .endif
 
 .ifdef WITH_GITSVN
diff -urN ./files/patch-Makefile ../git/files/patch-Makefile
--- ./files/patch-Makefile	Thu Jun 14 16:00:09 2007
+++ ../git/files/patch-Makefile	Thu Jan  1 03:00:00 1970
@@ -1,34 +0,0 @@
---- Makefile	Sun May 20 10:40:55 2007
-+++ Makefile	Sat May 26 20:43:02 2007
-@@ -135,8 +135,8 @@
- 
- # CFLAGS and LDFLAGS are for the users to override from the command line.
- 
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
-+CFLAGS ?= -g -O2 -Wall
-+LDFLAGS ?=
- ALL_CFLAGS = $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
-@@ -172,13 +172,13 @@
- 
- export prefix bindir gitexecdir sharedir template_dir sysconfdir
- 
--CC = gcc
--AR = ar
--TAR = tar
--INSTALL = install
--RPMBUILD = rpmbuild
--TCL_PATH = tclsh
--TCLTK_PATH = wish
-+CC ?= gcc
-+AR ?= ar
-+TAR ?= tar
-+INSTALL ?= install
-+RPMBUILD ?= rpmbuild
-+TCL_PATH ?= tclsh
-+TCLTK_PATH ?= wish
- 
- export TCL_PATH TCLTK_PATH
-

* Eygene Ryabinkin <rea-fbsd@codelabs.ru> wrote:
> Me again.
> 
> The third patch: it removed the need in patching Makefile.  GNU
> make respects the variables passed in the command line even if
> they were initialized inside the Makefile.  And as Git maintainers
> told me, it is the preferred way to go.
> 
> This patch is a kind of cosmetic.  I am Cc'ing Ed Shouten who did
> that patch for the Makefile.  Ed, is that what you meant?


This will suffice as well. I prefer neither way, but keeping the amount
of patches as low as possible is a good thing I think :-)

Yours,
-- 
 Ed Schouten <ed@fxq.nl>
 WWW: http://g-rave.nl/

Ed, good day.

Fri, Jun 15, 2007 at 08:23:43PM +0200, Ed Schouten wrote:
> This will suffice as well. I prefer neither way, but keeping the amount
> of patches as low as possible is a good thing I think :-)

Yes, that was my motivation too.

Thank you!
-- 
Eygene

And me once again.

Yesterday, git 1.5.2.2 was released.  Quick testing showed no
regressions, so I am submitting the patch that upgrades
1.5.2.1 to 1.5.2.2.  It was made against the port with all my
previous patches applied.

Comments are welcome.

diff -urN ./Makefile ../git/Makefile
--- ./Makefile	Sun Jun 17 21:27:01 2007
+++ ../git/Makefile	Sun Jun 17 21:26:52 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.5.2.1
+PORTVERSION=	1.5.2.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 
diff -urN ./distinfo ../git/distinfo
--- ./distinfo	Sun Jun 17 21:26:39 2007
+++ ../git/distinfo	Sun Jun 17 21:30:28 2007
@@ -1,3 +1,3 @@
-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-1.5.2.2.tar.bz2) = 846940654b703ec5c8de4ee388cb4d08
+SHA256 (git-1.5.2.2.tar.bz2) = 9c569ab1096c37e1b7ba3633fda5b36b9ad4305454ce2748bb1da557a3817041
+SIZE (git-1.5.2.2.tar.bz2) = 1190255

Comment 7 Mark Linimon 2007-07-09 15:39:09 UTC

State Changed
From-To: open->closed

A slightly more complete patch is in ports/113541, but thanks for the 
submission.