[Midnightbsd-cvs] mports: devel/git: Update git to 1.6.0.2 (for ctriv) add gitweb along

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Oct 16 15:34:36 EDT 2008


Log Message:
-----------
Update git to 1.6.0.2 (for ctriv) add gitweb along with it.

Modified Files:
--------------
    mports/devel/git:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/devel/git/files:
        git_daemon.in (r1.1 -> r1.2)
        patch-Makefile (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/git/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/git/pkg-plist -L devel/git/pkg-plist -u -r1.1 -r1.2
--- devel/git/pkg-plist
+++ devel/git/pkg-plist
@@ -1,146 +1,148 @@
 bin/git
-bin/git-add
-bin/git-add--interactive
-bin/git-am
-bin/git-annotate
-bin/git-apply
-bin/git-archimport
-bin/git-archive
-bin/git-bisect
-bin/git-blame
-bin/git-branch
-bin/git-bundle
-bin/git-cat-file
-bin/git-check-attr
-bin/git-check-ref-format
-bin/git-checkout
-bin/git-checkout-index
-bin/git-cherry
-bin/git-cherry-pick
-%%GUI%%bin/git-citool
-bin/git-clean
-bin/git-clone
-bin/git-commit
-bin/git-commit-tree
-bin/git-config
-bin/git-count-objects
-bin/git-cvsexportcommit
-bin/git-cvsimport
-bin/git-cvsserver
-bin/git-daemon
-bin/git-describe
-bin/git-diff
-bin/git-diff-files
-bin/git-diff-index
-bin/git-diff-tree
-bin/git-fast-export
-bin/git-fast-import
-bin/git-fetch
-bin/git-fetch--tool
-bin/git-fetch-pack
-bin/git-filter-branch
-bin/git-fmt-merge-msg
-bin/git-for-each-ref
-bin/git-format-patch
-bin/git-fsck
-bin/git-fsck-objects
-bin/git-gc
-bin/git-get-tar-commit-id
-bin/git-grep
-%%GUI%%bin/git-gui
-bin/git-hash-object
-bin/git-http-fetch
-bin/git-http-push
-bin/git-imap-send
-bin/git-index-pack
-bin/git-init
-bin/git-init-db
-bin/git-instaweb
-bin/git-log
-bin/git-lost-found
-bin/git-ls-files
-bin/git-ls-remote
-bin/git-ls-tree
-bin/git-mailinfo
-bin/git-mailsplit
-bin/git-merge
-bin/git-merge-base
-bin/git-merge-file
-bin/git-merge-index
-bin/git-merge-octopus
-bin/git-merge-one-file
-bin/git-merge-ours
-bin/git-merge-recursive
-bin/git-merge-resolve
-bin/git-merge-stupid
-bin/git-merge-subtree
-bin/git-merge-tree
-bin/git-mergetool
-bin/git-mktag
-bin/git-mktree
-bin/git-mv
-bin/git-name-rev
 bin/git-p4
 bin/git-p4import
-bin/git-pack-objects
-bin/git-pack-redundant
-bin/git-pack-refs
-bin/git-parse-remote
-bin/git-patch-id
-bin/git-peek-remote
-bin/git-prune
-bin/git-prune-packed
-bin/git-pull
-bin/git-push
-bin/git-quiltimport
-bin/git-read-tree
-bin/git-rebase
-bin/git-rebase--interactive
+bin/git-upload-pack
 bin/git-receive-pack
-bin/git-reflog
-bin/git-relink
-bin/git-remote
-bin/git-repack
-bin/git-repo-config
-bin/git-request-pull
-bin/git-rerere
-bin/git-reset
-bin/git-rev-list
-bin/git-rev-parse
-bin/git-revert
-bin/git-rm
-bin/git-send-email
-bin/git-send-pack
-bin/git-sh-setup
-bin/git-shell
+bin/git-upload-archive
+libexec/git-core/git-add
+libexec/git-core/git-add--interactive
+libexec/git-core/git-am
+libexec/git-core/git-annotate
+libexec/git-core/git-apply
+libexec/git-core/git-archimport
+libexec/git-core/git-archive
+libexec/git-core/git-bisect
+libexec/git-core/git-blame
+libexec/git-core/git-branch
+libexec/git-core/git-bundle
+libexec/git-core/git-cat-file
+libexec/git-core/git-check-attr
+libexec/git-core/git-check-ref-format
+libexec/git-core/git-checkout
+libexec/git-core/git-checkout-index
+libexec/git-core/git-cherry
+libexec/git-core/git-cherry-pick
+%%GUI%%libexec/git-core/git-citool
+libexec/git-core/git-clean
+libexec/git-core/git-clone
+libexec/git-core/git-commit
+libexec/git-core/git-commit-tree
+libexec/git-core/git-config
+libexec/git-core/git-count-objects
+libexec/git-core/git-cvsexportcommit
+libexec/git-core/git-cvsimport
+libexec/git-core/git-cvsserver
+libexec/git-core/git-daemon
+libexec/git-core/git-describe
+libexec/git-core/git-diff
+libexec/git-core/git-diff-files
+libexec/git-core/git-diff-index
+libexec/git-core/git-diff-tree
+libexec/git-core/git-fast-export
+libexec/git-core/git-fast-import
+libexec/git-core/git-fetch
+libexec/git-core/git-fetch--tool
+libexec/git-core/git-fetch-pack
+libexec/git-core/git-filter-branch
+libexec/git-core/git-fmt-merge-msg
+libexec/git-core/git-for-each-ref
+libexec/git-core/git-format-patch
+libexec/git-core/git-fsck
+libexec/git-core/git-fsck-objects
+libexec/git-core/git-gc
+libexec/git-core/git-get-tar-commit-id
+libexec/git-core/git-grep
+%%GUI%%libexec/git-core/git-gui
+libexec/git-core/git-hash-object
+libexec/git-core/git-http-fetch
+libexec/git-core/git-http-push
+libexec/git-core/git-imap-send
+libexec/git-core/git-index-pack
+libexec/git-core/git-init
+libexec/git-core/git-init-db
+libexec/git-core/git-instaweb
+libexec/git-core/git-log
+libexec/git-core/git-lost-found
+libexec/git-core/git-ls-files
+libexec/git-core/git-ls-remote
+libexec/git-core/git-ls-tree
+libexec/git-core/git-mailinfo
+libexec/git-core/git-mailsplit
+libexec/git-core/git-merge
+libexec/git-core/git-merge-base
+libexec/git-core/git-merge-file
+libexec/git-core/git-merge-index
+libexec/git-core/git-merge-octopus
+libexec/git-core/git-merge-one-file
+libexec/git-core/git-merge-ours
+libexec/git-core/git-merge-recursive
+libexec/git-core/git-merge-resolve
+libexec/git-core/git-merge-subtree
+libexec/git-core/git-merge-tree
+libexec/git-core/git-mergetool
+libexec/git-core/git-mktag
+libexec/git-core/git-mktree
+libexec/git-core/git-mv
+libexec/git-core/git-name-rev
+libexec/git-core/git-pack-objects
+libexec/git-core/git-pack-redundant
+libexec/git-core/git-pack-refs
+libexec/git-core/git-parse-remote
+libexec/git-core/git-patch-id
+libexec/git-core/git-peek-remote
+libexec/git-core/git-prune
+libexec/git-core/git-prune-packed
+libexec/git-core/git-pull
+libexec/git-core/git-push
+libexec/git-core/git-quiltimport
+libexec/git-core/git-read-tree
+libexec/git-core/git-rebase
+libexec/git-core/git-rebase--interactive
+libexec/git-core/git-receive-pack
+libexec/git-core/git-reflog
+libexec/git-core/git-relink
+libexec/git-core/git-remote
+libexec/git-core/git-repack
+libexec/git-core/git-repo-config
+libexec/git-core/git-request-pull
+libexec/git-core/git-rerere
+libexec/git-core/git-reset
+libexec/git-core/git-rev-list
+libexec/git-core/git-rev-parse
+libexec/git-core/git-revert
+libexec/git-core/git-rm
+libexec/git-core/git-send-email
+libexec/git-core/git-send-pack
+libexec/git-core/git-sh-setup
+libexec/git-core/git-shell
 @exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
 @unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
-bin/git-shortlog
-bin/git-show
-bin/git-show-branch
-bin/git-show-index
-bin/git-show-ref
-bin/git-stash
-bin/git-status
-bin/git-stripspace
-bin/git-submodule
-bin/git-svn
-bin/git-symbolic-ref
-bin/git-tag
-bin/git-tar-tree
-bin/git-unpack-file
-bin/git-unpack-objects
-bin/git-update-index
-bin/git-update-ref
-bin/git-update-server-info
-bin/git-upload-archive
-bin/git-upload-pack
-bin/git-var
-bin/git-verify-pack
-bin/git-verify-tag
-bin/git-web--browse
-bin/git-whatchanged
-bin/git-write-tree
+libexec/git-core/git-shortlog
+libexec/git-core/git-show
+libexec/git-core/git-show-branch
+libexec/git-core/git-show-index
+libexec/git-core/git-show-ref
+libexec/git-core/git-stash
+libexec/git-core/git-status
+libexec/git-core/git-stripspace
+libexec/git-core/git-submodule
+libexec/git-core/git-svn
+libexec/git-core/git-symbolic-ref
+libexec/git-core/git-tag
+libexec/git-core/git-tar-tree
+libexec/git-core/git-unpack-file
+libexec/git-core/git-unpack-objects
+libexec/git-core/git-update-index
+libexec/git-core/git-update-ref
+libexec/git-core/git-update-server-info
+libexec/git-core/git-upload-archive
+libexec/git-core/git-upload-pack
+libexec/git-core/git-var
+libexec/git-core/git-verify-pack
+libexec/git-core/git-verify-tag
+libexec/git-core/git-web--browse
+libexec/git-core/git-whatchanged
+libexec/git-core/git-write-tree
 %%GUI%%bin/gitk
 %%SITE_PERL%%/Git.pm
 lib/xemacs/site-lisp/git/git.el
@@ -148,16 +150,16 @@
 share/emacs/site-lisp/git/git.el
 share/emacs/site-lisp/git/vc-git.el
 share/git-core/templates/description
-share/git-core/templates/hooks/applypatch-msg
-share/git-core/templates/hooks/commit-msg
-share/git-core/templates/hooks/post-commit
-share/git-core/templates/hooks/post-receive
-share/git-core/templates/hooks/post-update
-share/git-core/templates/hooks/pre-applypatch
-share/git-core/templates/hooks/pre-commit
-share/git-core/templates/hooks/pre-rebase
-share/git-core/templates/hooks/prepare-commit-msg
-share/git-core/templates/hooks/update
+share/git-core/templates/hooks/applypatch-msg.sample
+share/git-core/templates/hooks/commit-msg.sample
+share/git-core/templates/hooks/post-commit.sample
+share/git-core/templates/hooks/post-receive.sample
+share/git-core/templates/hooks/post-update.sample
+share/git-core/templates/hooks/pre-applypatch.sample
+share/git-core/templates/hooks/pre-commit.sample
+share/git-core/templates/hooks/pre-rebase.sample
+share/git-core/templates/hooks/prepare-commit-msg.sample
+share/git-core/templates/hooks/update.sample
 share/git-core/templates/info/exclude
 %%GUI%%share/git-gui/lib/tclIndex
 %%GUI%%share/git-gui/lib/about.tcl
@@ -201,23 +203,32 @@
 %%GUI%%share/git-gui/lib/msgs/ru.msg
 %%GUI%%share/git-gui/lib/msgs/sv.msg
 %%GUI%%share/git-gui/lib/msgs/zh_cn.msg
+%%GUI%%share/gitk/lib/msgs/es.msg
 %%GUI%%share/gitk/lib/msgs/de.msg
 %%GUI%%share/gitk/lib/msgs/it.msg
+%%GUI%%share/gitk/lib/msgs/sv.msg
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-logo.png
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.css
+%%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb
+%%GITWEB%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
 @dirrm lib/xemacs/site-lisp/git
 @dirrmtry lib/xemacs/site-lisp
 @dirrmtry lib/xemacs
 @dirrm share/emacs/site-lisp/git
- at dirrmtry share/emacs/site-lisp
- at dirrmtry share/emacs
 %%GUI%%@dirrm share/gitk/lib/msgs
 %%GUI%%@dirrm share/gitk/lib
 %%GUI%%@dirrm share/gitk
 %%GUI%%@dirrm share/git-gui/lib/msgs
 %%GUI%%@dirrm share/git-gui/lib
 %%GUI%%@dirrm share/git-gui
+ at dirrm libexec/git-core
 @dirrm share/git-core/templates/branches
- at dirrm share/git-core/templates/hooks
+ at dirrmtry share/git-core/templates/hooks
 @dirrm share/git-core/templates/info
- at dirrm share/git-core/templates
+ at dirrmtry share/git-core/templates
 @dirrm share/git-core
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/git/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/git/Makefile -L devel/git/Makefile -u -r1.1 -r1.2
--- devel/git/Makefile
+++ devel/git/Makefile
@@ -3,14 +3,16 @@
 # Whom:					Eric Anholt
 #
 # $MidnightBSD$
-# $FreeBSD: ports/devel/git/Makefile,v 1.28 2008/04/21 22:00:14 anholt Exp $
-#
+# $FreeBSD: ports/devel/git/Makefile,v 1.37 2008/09/23 02:42:22 wxs Exp $
 
 PORTNAME=	git
-PORTVERSION=	1.5.5
+PORTVERSION=	1.6.0.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}.sign
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -20,8 +22,9 @@
 BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		${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
+		cvsps:${PORTSDIR}/devel/cvsps \
+		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
+		${SITE_PERL}/Net/SMTP/SSL.pm:${PORTSDIR}/mail/p5-Net-SMTP-SSL
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 CONFLICTS=	cogito-0.1[012] git-4.*
@@ -156,10 +159,11 @@
 		git-write-tree.1
 MAN3=		Git.3
 MAN5=		gitattributes.5 \
-		gitcli.5 \
 		gitignore.5 \
 		gitmodules.5
-MAN7=		git.7
+
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
@@ -169,7 +173,6 @@
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV+=	CURLDIR=${LOCALBASE} \
 		NEEDS_LIBICONV=yes \
-		LDFLAGS="-L${LOCALBASE}/lib" \
 		PYTHON_PATH=${LOCALBASE}/bin/python \
 		PERL_PATH=${PERL} \
 		LIBMD_SHA1=yes
@@ -180,11 +183,12 @@
 SHELLS=		/etc/shells
 
 OPTIONS=	GUI "Enable building of GUI tools" on \
-		SVN "Enable required dependencies for SVN tools" off
+		SVN "Enable required dependencies for SVN tools" off \
+		GITWEB "Install gitweb" off
 
 .include <bsd.port.pre.mk>
 
-.ifndef WITHOUT_GUI
+.ifndef (WITHOUT_GUI)
 MAN1+=		git-citool.1 \
 		git-gui.1 \
 		gitk.1
@@ -196,13 +200,21 @@
 MAKE_ENV+=	NO_TCLTK=yes
 .endif
 
-.ifdef WITH_SVN
+.ifdef (WITH_SVN)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
+		${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/p5-subversion \
 		svn:${PORTSDIR}/devel/subversion
 .endif
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|OPENSSLDIR|OPENSSLBASE|g' ${WRKSRC}/Makefile
+.ifdef (WITH_GITWEB)
+PLIST_SUB+=	GITWEB=""
+.else
+PLIST_SUB+=	GITWEB="@comment "
+.endif
+
+verify: checksum
+	gpg --verify ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}.sign \
+		${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man/man3|man/man3|' ${WRKSRC}/perl/Makefile.PL
@@ -239,6 +251,16 @@
 		${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/fast-import/git-p4 \
 		${PREFIX}/bin/
+.ifdef (WITH_GITWEB)
+	@${ECHO_MSG} "===> Installing gitweb files"
+	${MKDIR} ${EXAMPLESDIR}/gitweb
+	${INSTALL_DATA} ${WRKSRC}/gitweb/INSTALL ${EXAMPLESDIR}/gitweb/
+	${INSTALL_DATA} ${WRKSRC}/gitweb/README ${EXAMPLESDIR}/gitweb/
+	${INSTALL_DATA} ${WRKSRC}/gitweb/git-favicon.png ${EXAMPLESDIR}/gitweb/
+	${INSTALL_DATA} ${WRKSRC}/gitweb/git-logo.png ${EXAMPLESDIR}/gitweb/
+	${INSTALL_DATA} ${WRKSRC}/gitweb/gitweb.css ${EXAMPLESDIR}/gitweb/
+	${INSTALL_SCRIPT} ${WRKSRC}/gitweb/gitweb.cgi ${EXAMPLESDIR}/gitweb/
+.endif
 
 	@${ECHO_MSG} "===> Updating ${SHELLS}"
 	@${CP} ${SHELLS} ${SHELLS}.bak
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/git/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/git/distinfo -L devel/git/distinfo -u -r1.1 -r1.2
--- devel/git/distinfo
+++ devel/git/distinfo
@@ -1,6 +1,9 @@
-MD5 (git-1.5.5.tar.bz2) = 09f15f0b0e330986d930746abf6962f4
-SHA256 (git-1.5.5.tar.bz2) = 27483890c598450d7d1b4583e40dd8ec6c8def08c7cec94b20eb7336bb83e65e
-SIZE (git-1.5.5.tar.bz2) = 1673736
-MD5 (git-manpages-1.5.5.tar.bz2) = 62a82276856add1d2b310d1e0b5ad5db
-SHA256 (git-manpages-1.5.5.tar.bz2) = cc7f16b72a228cafd6bcc41ea09fdc67f4c5d50a0bf4521b80d8ea75127bb802
-SIZE (git-manpages-1.5.5.tar.bz2) = 162609
+MD5 (git-1.6.0.2.tar.bz2) = 1e4d9bfc1cb0abf165d4de93b5172324
+SHA256 (git-1.6.0.2.tar.bz2) = a332fbcb1c9cf8b1dc224135d5b14e99da4720fc8b082e595b4f20eaf640dad8
+SIZE (git-1.6.0.2.tar.bz2) = 1865485
+MD5 (git-manpages-1.6.0.2.tar.bz2) = 30bd29d96b4576ef8b7b48ad791f613e
+SHA256 (git-manpages-1.6.0.2.tar.bz2) = 198472533f9c8abe124ce93fda5639e07b6ee73e67d02d393648b20dd79476c7
+SIZE (git-manpages-1.6.0.2.tar.bz2) = 222534
+MD5 (git-1.6.0.2.tar.bz2.sign) = 4b8166895f67a159070a7b6f3c82d036
+SHA256 (git-1.6.0.2.tar.bz2.sign) = d644c056aadc169448ca76dc9e4e64fac6aa80cd50cec185ed71dff37479431d
+SIZE (git-1.6.0.2.tar.bz2.sign) = 248
Index: git_daemon.in
===================================================================
RCS file: /home/cvs/mports/devel/git/files/git_daemon.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/git/files/git_daemon.in -L devel/git/files/git_daemon.in -u -r1.1 -r1.2
--- devel/git/files/git_daemon.in
+++ devel/git/files/git_daemon.in
@@ -1,7 +1,6 @@
 #! /bin/sh
 #
-# $MidnightBSD$
-# $FreeBSD: ports/devel/git/files/git_daemon.in,v 1.1 2008/01/17 10:25:04 flz Exp $
+# $FreeBSD: ports/devel/git/files/git_daemon.in,v 1.2 2008/08/27 22:05:12 wxs Exp $
 #
 
 # PROVIDE: git_daemon
@@ -24,7 +23,7 @@
 : ${git_daemon_directory:=%%PREFIX%%/git}
 : ${git_daemon_flags:="--syslog"}
 
-command="%%PREFIX%%/bin/git-daemon"
+command="%%PREFIX%%/libexec/git-core/git-daemon"
 command_args="${git_daemon_directory} &"
 
 run_rc_command "$1"
Index: patch-Makefile
===================================================================
RCS file: /home/cvs/mports/devel/git/files/patch-Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/git/files/patch-Makefile -L devel/git/files/patch-Makefile -u -r1.1 -r1.2
--- devel/git/files/patch-Makefile
+++ devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2007-09-19 22:02:17.000000000 +0400
-+++ Makefile	2007-09-21 22:13:25.000000000 +0400
-@@ -135,8 +135,8 @@
+--- ./Makefile.orig	2008-08-24 19:41:58.000000000 -0400
++++ ./Makefile	2008-09-18 13:32:34.000000000 -0400
+@@ -164,8 +164,8 @@
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -11,9 +11,20 @@
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -173,15 +173,15 @@
+@@ -182,8 +182,8 @@
  
- export prefix bindir gitexecdir sharedir template_dir sysconfdir
+ prefix = $(HOME)
+ bindir = $(prefix)/bin
+-mandir = $(prefix)/share/man
+-infodir = $(prefix)/share/info
++mandir = $(prefix)/man
++infodir = $(prefix)/info
+ gitexecdir = $(prefix)/libexec/git-core
+ sharedir = $(prefix)/share
+ template_dir = $(sharedir)/git-core/templates
+@@ -217,15 +217,15 @@
+ 
+ export prefix bindir sharedir htmldir sysconfdir
  
 -CC = gcc
 -AR = ar
@@ -36,3 +47,16 @@
  
  export TCL_PATH TCLTK_PATH
  
+@@ -827,9 +827,9 @@
+ endif
+ ifndef NO_OPENSSL
+ 	OPENSSL_LIBSSL = -lssl
+-	ifdef OPENSSLDIR
+-		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
+-		OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
++	ifdef OPENSSLBASE 
++		BASIC_CFLAGS += -I$(OPENSSLBASE)/include
++		OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib)
+ 	else
+ 		OPENSSL_LINK =
+ 	endif


More information about the Midnightbsd-cvs mailing list