cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to git-1.8.2.2

Browse Source 
Fixes for vax by Jeremie Courreges-Anglas (thanks!)

OK sthen@, benoit@ (maintainer)
This commit is contained in:
dcoppa 2013-05-02 10:01:34 +00:00
parent 76199479b7
commit ccd63362cd
7 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
devel/git/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.93 2013/03/13 11:58:14 benoit Exp $
# $OpenBSD: Makefile,v 1.94 2013/05/02 10:01:34 dcoppa Exp $
COMMENT-main = GIT - Tree History Storage Tool
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
V = 1.8.1.3
V = 1.8.2.2
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
@ -53,27 +53,43 @@ LIB_DEPENDS-x11 =
WANTLIB-x11 =
PKG_ARCH-x11 = *
MAKE_FLAGS = prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
sysconfdir=${SYSCONFDIR} mandir=man \
MAKE_FLAGS = V=1 \
gitexecdir=libexec/git \
TCLTK_PATH=${MODTK_BIN} \
TCL_PATH=${MODTCL_BIN}
MAKE_ENV = REGRESS_SHELL=${LOCALBASE}/bin/bash
MAKE_ENV = TEST_TAR=${LOCALBASE}/bin/gtar
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --sysconfdir=${SYSCONFDIR} \
--mandir=${PREFIX}/man \
--with-curl=${LOCALBASE} \
--with-iconv=${LOCALBASE} \
--with-tcltk=${MODTK_BIN} \
--with-python=no
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
DIFF=diff TAR=tar
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mno_shared}
CONFIGURE_ENV += ac_cv_lib_curl_curl_global_init=yes
MAKE_FLAGS += NEEDS_CRYPTO_WITH_SSL=YesPlease \
NEEDS_SSL_WITH_CURL=YesPlease \
NEEDS_LIBINTL_BEFORE_LIBICONV=YesPlease
.endif
USE_GMAKE = Yes
USE_GROFF = Yes
TEST_DEPENDS = archivers/zip \
TEST_DEPENDS = archivers/gtar \
archivers/unzip \
archivers/zip \
devel/cvsps \
devel/subversion,-perl \
shells/bash
devel/subversion,-perl
GITWEB = README INSTALL git-favicon.png git-logo.png \
gitweb.cgi gitweb.css
# Skip tests I have to fix.
SKIP_TESTS = t9502-gitweb-standalone-parse-output.sh
post-extract:
@mkdir -p ${WRKSRC}/doc
@cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${DOC_DISTFILE}
@ -96,8 +112,7 @@ post-install:
${INSTALL_DATA} ${WRKBUILD}/gitweb/README ${PREFIX}/share/gitweb
do-test:
cd ${WRKSRC}/t && rm -f ${SKIP_TESTS}
cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \
HOME=${WRKDIST}/t/trash test
HOME=${WRKDIST}/t test
.include <bsd.port.mk>

8
devel/git/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (git-1.8.1.3.tar.gz) = N1Mkfb/YAqrxyyyRe46HO27RPACasPpffZCzx1kZX/E=
SHA256 (git-manpages-1.8.1.3.tar.gz) = mPYbps9knzx8tipAGUqYb3Vh9kj4GtPZ4OzaZG2QhTk=
SIZE (git-1.8.1.3.tar.gz) = 4302035
SIZE (git-manpages-1.8.1.3.tar.gz) = 528587
SHA256 (git-1.8.2.2.tar.gz) = Ag3jjtowK7bhvkYPdJkhGUgZOzBr6rThpSD/xvcpR5Q=
SHA256 (git-manpages-1.8.2.2.tar.gz) = Io3rU4ZUFXKOvXq/GNiMc9PBZg3toNN5cF1G2xBjZus=
SIZE (git-1.8.2.2.tar.gz) = 4404477
SIZE (git-manpages-1.8.2.2.tar.gz) = 537739

36
devel/git/patches/patch-Makefile
View File

@ -1,33 +1,7 @@
$OpenBSD: patch-Makefile,v 1.37 2013/03/13 11:58:16 benoit Exp $
--- Makefile.orig Fri Feb 8 01:00:07 2013
+++ Makefile Wed Mar 13 10:35:45 2013
@@ -1123,13 +1123,13 @@ ifeq ($(uname_S),FreeBSD)
HAVE_PATHS_H = YesPlease
endif
ifeq ($(uname_S),OpenBSD)
- NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease
USE_ST_TIMESPEC = YesPlease
NEEDS_LIBICONV = YesPlease
- BASIC_CFLAGS += -I/usr/local/include
- BASIC_LDFLAGS += -L/usr/local/lib
+ BASIC_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
+ BASIC_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
HAVE_PATHS_H = YesPlease
+ NO_PYTHON = YesPlease
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -1601,7 +1601,7 @@ endif
EXTLIBS += -lz
ifndef NO_OPENSSL
- OPENSSL_LIBSSL = -lssl
+ OPENSSL_LIBSSL = -lssl -lcrypto
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -2487,13 +2487,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
$OpenBSD: patch-Makefile,v 1.38 2013/05/02 10:01:34 dcoppa Exp $
--- Makefile.orig Tue Apr 30 12:18:10 2013
+++ Makefile Tue Apr 30 12:33:22 2013
@@ -2029,13 +2029,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
$(LIB_FILE): $(LIB_OBJS)
@ -44,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.37 2013/03/13 11:58:16 benoit Exp $
export DEFAULT_EDITOR DEFAULT_PAGER
@@ -2679,7 +2679,7 @@ export TEST_NO_MALLOC_CHECK
@@ -2209,7 +2209,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules

12
devel/git/patches/patch-t_Makefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-t_Makefile,v 1.4 2013/01/25 08:14:59 dcoppa Exp $
--- t/Makefile.orig Mon Jan 14 20:22:04 2013
+++ t/Makefile Wed Jan 23 14:50:21 2013
@@ -7,7 +7,7 @@
-include ../config.mak
#GIT_TEST_OPTS = --verbose --debug
-SHELL_PATH ?= $(SHELL)
+SHELL_PATH = $(REGRESS_SHELL)
PERL_PATH ?= /usr/bin/perl
TAR ?= $(TAR)
RM ?= rm -f

8
devel/git/patches/patch-t_t0000-basic_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-t_t0000-basic_sh,v 1.3 2013/01/25 08:14:59 dcoppa Exp $
--- t/t0000-basic.sh.orig Mon Jan 14 20:22:04 2013
+++ t/t0000-basic.sh Wed Jan 23 14:53:15 2013
@@ -472,7 +472,7 @@ test_expect_success 'update-index D/F conflict' '
$OpenBSD: patch-t_t0000-basic_sh,v 1.4 2013/05/02 10:01:34 dcoppa Exp $
--- t/t0000-basic.sh.orig Sat Apr 27 01:54:17 2013
+++ t/t0000-basic.sh Tue Apr 30 12:16:43 2013
@@ -590,7 +590,7 @@ test_expect_success 'update-index D/F conflict' '
test $numpath0 = 1
'

18
devel/git/patches/patch-t_test-lib_sh Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-t_test-lib_sh,v 1.1 2013/05/02 10:01:34 dcoppa Exp $
Force usage of GNU tar in the test suite: 't5004-archive-corner-cases.sh'
wants it badly.
--- t/test-lib.sh.orig Sat Apr 27 01:54:17 2013
+++ t/test-lib.sh Tue Apr 30 19:14:52 2013
@@ -47,6 +47,10 @@ fi
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
export PERL_PATH SHELL_PATH
+if [ -n "${TEST_TAR}" ]; then
+ export TAR=${TEST_TAR}
+fi
+
# if --tee was passed, write the output not only to the terminal, but
# additionally to the file test-results/$BASENAME.out, too.
case "$GIT_TEST_TEE_STARTED, $* " in

15
devel/git/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.53 2013/01/25 08:14:59 dcoppa Exp $
@comment $OpenBSD: PLIST-main,v 1.54 2013/05/02 10:01:34 dcoppa Exp $
@pkgpath devel/git
@bin bin/git
bin/git-cvsserver
@ -28,6 +28,7 @@ libexec/git/git-bisect
@bin libexec/git/git-bundle
@bin libexec/git/git-cat-file
@bin libexec/git/git-check-attr
@bin libexec/git/git-check-ignore
@bin libexec/git/git-check-ref-format
@bin libexec/git/git-checkout
@bin libexec/git/git-checkout-index
@ -130,7 +131,7 @@ libexec/git/git-relink
@bin libexec/git/git-remote-ftps
@bin libexec/git/git-remote-http
@bin libexec/git/git-remote-https
libexec/git/git-remote-testgit
libexec/git/git-remote-testpy
@bin libexec/git/git-remote-testsvn
libexec/git/git-repack
@bin libexec/git/git-replace
@ -178,11 +179,12 @@ libexec/git/mergetools/
libexec/git/mergetools/araxis
libexec/git/mergetools/bc3
libexec/git/mergetools/codecompare
libexec/git/mergetools/defaults
libexec/git/mergetools/deltawalker
libexec/git/mergetools/diffuse
libexec/git/mergetools/ecmerge
libexec/git/mergetools/emerge
libexec/git/mergetools/gvimdiff
libexec/git/mergetools/gvimdiff2
libexec/git/mergetools/kdiff3
libexec/git/mergetools/kompare
libexec/git/mergetools/meld
@ -190,7 +192,8 @@ libexec/git/mergetools/opendiff
libexec/git/mergetools/p4merge
libexec/git/mergetools/tkdiff
libexec/git/mergetools/tortoisemerge
libexec/git/mergetools/vim
libexec/git/mergetools/vimdiff
libexec/git/mergetools/vimdiff2
libexec/git/mergetools/xxdiff
@man man/man1/git-add.1
@man man/man1/git-am.1
@ -204,6 +207,7 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-bundle.1
@man man/man1/git-cat-file.1
@man man/man1/git-check-attr.1
@man man/man1/git-check-ignore.1
@man man/man1/git-check-ref-format.1
@man man/man1/git-checkout-index.1
@man man/man1/git-checkout.1
@ -292,7 +296,6 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-relink.1
@man man/man1/git-remote-ext.1
@man man/man1/git-remote-fd.1
@man man/man1/git-remote-helpers.1
@man man/man1/git-remote-testgit.1
@man man/man1/git-remote.1
@man man/man1/git-repack.1
@ -338,6 +341,7 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-whatchanged.1
@man man/man1/git-write-tree.1
@man man/man1/git.1
@man man/man1/gitremote-helpers.1
@man man/man1/gitweb.1
@man man/man3p/Git.3p
@man man/man3p/Git::I18N.3p
@ -372,6 +376,7 @@ share/git-core/templates/hooks/post-receive-email.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-push.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