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

Clean git/patches/patch-Makefile by using MAKE_FLAGS instead of MAKE_ENV

Browse Source 
when overriding variables defined in git's Makefile. (REGRESS_SHELL remains
in MAKE_ENV as it's used by child make processes which don't pass the flags
across).  Regen PLIST while there & typo fix in comment.  ok benoit@
This commit is contained in:
sthen 2013-01-09 09:46:54 +00:00
parent a854bd3ef6
commit dc92ea6191
6 changed files with 21 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/git/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.87 2013/01/01 18:35:42 dcoppa Exp $
# $OpenBSD: Makefile,v 1.88 2013/01/09 09:46:54 sthen Exp $
COMMENT-main = GIT - Tree History Storage Tool
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
V = 1.8.0.3
REVISION = 0
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
@ -56,11 +57,12 @@ LIB_DEPENDS-x11 =
WANTLIB-x11 =
PKG_ARCH-x11 = *
MAKE_ENV = prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
sysconfdir=${SYSCONFDIR} \
MAKE_FLAGS = prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
sysconfdir=${SYSCONFDIR} mandir=man \
gitexecdir=libexec/git \
TCLTK_PATH=${MODTK_BIN} \
TCL_PATH=${MODTCL_BIN} \
REGRESS_SHELL=${LOCALBASE}/bin/bash
TCL_PATH=${MODTCL_BIN}
MAKE_ENV = REGRESS_SHELL=${LOCALBASE}/bin/bash
USE_GMAKE = Yes
USE_GROFF = Yes
@ -73,7 +75,7 @@ REGRESS_DEPENDS = archivers/zip \
GITWEB = README INSTALL git-favicon.png git-logo.png \
gitweb.cgi gitweb.css
# Skipt tests I have to fix.
# Skip tests I have to fix.
SKIP_TESTS = t9502-gitweb-standalone-parse-output.sh
post-extract:

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

@ -1,51 +1,6 @@
$OpenBSD: patch-Makefile,v 1.33 2012/11/30 21:16:30 pascal Exp $
--- Makefile.orig Sun Oct 21 23:32:15 2012
+++ Makefile Sat Nov 24 01:36:41 2012
@@ -341,7 +341,7 @@ endif
# CFLAGS and LDFLAGS are for the users to override from the command line.
-CFLAGS = -g -O2 -Wall
+CFLAGS ?= -g -O2 -Wall
LDFLAGS =
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
@@ -359,12 +359,12 @@ STRIP ?= strip
# runtime figures out where they are based on the path to the executable.
# This can help installing the suite in a relocatable way.
-prefix = $(HOME)
+#prefix = $(HOME)
bindir_relative = bin
bindir = $(prefix)/$(bindir_relative)
-mandir = share/man
+mandir = man
infodir = share/info
-gitexecdir = libexec/git-core
+gitexecdir = libexec/git
mergetoolsdir = $(gitexecdir)/mergetools
sharedir = $(prefix)/share
gitwebdir = $(sharedir)/gitweb
@@ -379,7 +379,7 @@ pathsep = :
export prefix bindir sharedir sysconfdir gitwebdir localedir
-CC = cc
+CC ?= cc
AR = ar
RM = rm -f
DIFF = diff
@@ -387,8 +387,8 @@ TAR = tar
FIND = find
INSTALL = install
RPMBUILD = rpmbuild
-TCL_PATH = tclsh
-TCLTK_PATH = wish
+TCL_PATH ?= tclsh
+TCLTK_PATH ?= wish
XGETTEXT = xgettext
MSGFMT = msgfmt
PTHREAD_LIBS = -lpthread
$OpenBSD: patch-Makefile,v 1.34 2013/01/09 09:46:54 sthen Exp $
--- Makefile.orig Fri Dec 28 00:32:43 2012
+++ Makefile Wed Jan 9 01:47:02 2013
@@ -1114,13 +1114,13 @@ ifeq ($(uname_S),FreeBSD)
HAVE_PATHS_H = YesPlease
endif

6
devel/git/patches/patch-gitweb_gitweb_perl
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-gitweb_gitweb_perl,v 1.20 2013/01/01 18:35:42 dcoppa Exp $
$OpenBSD: patch-gitweb_gitweb_perl,v 1.21 2013/01/09 09:46:54 sthen Exp $
This prevents the following error: '-T and -B not implemented on filehandles'
--- gitweb/gitweb.perl.orig Fri Dec 28 01:32:43 2012
+++ gitweb/gitweb.perl Sun Dec 30 13:43:13 2012
--- gitweb/gitweb.perl.orig Fri Dec 28 00:32:43 2012
+++ gitweb/gitweb.perl Wed Jan 9 01:47:02 2013
@@ -6892,7 +6892,7 @@ sub git_blob_plain {
$expires = "+1d";
}

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

@ -1,6 +1,6 @@
$OpenBSD: patch-t_Makefile,v 1.2 2010/10/07 09:42:23 bernd Exp $
--- t/Makefile.orig Sun Sep 19 01:43:54 2010
+++ t/Makefile Tue Sep 21 14:45:48 2010
$OpenBSD: patch-t_Makefile,v 1.3 2013/01/09 09:46:54 sthen Exp $
--- t/Makefile.orig Fri Dec 28 00:32:43 2012
+++ t/Makefile Wed Jan 9 01:47:31 2013
@@ -7,7 +7,7 @@
-include ../config.mak

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

@ -1,6 +1,6 @@
$OpenBSD: patch-t_t0000-basic_sh,v 1.1 2012/11/30 21:16:30 pascal Exp $
--- t/t0000-basic.sh.orig Sat Nov 24 01:42:30 2012
+++ t/t0000-basic.sh Sat Nov 24 01:42:40 2012
$OpenBSD: patch-t_t0000-basic_sh,v 1.2 2013/01/09 09:46:54 sthen Exp $
--- t/t0000-basic.sh.orig Fri Dec 28 00:32:43 2012
+++ t/t0000-basic.sh Wed Jan 9 01:47:02 2013
@@ -440,7 +440,7 @@ test_expect_success 'update-index D/F conflict' '
test $numpath0 = 1
'

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.51 2012/11/30 21:16:30 pascal Exp $
@comment $OpenBSD: PLIST-main,v 1.52 2013/01/09 09:46:54 sthen Exp $
@pkgpath devel/git
@bin bin/git
bin/git-cvsserver
@ -358,8 +358,6 @@ libexec/git/mergetools/xxdiff
@man man/man7/gittutorial.7
@man man/man7/gitworkflows.7
share/doc/pkg-readmes/${FULLPKGNAME}
share/emacs/
share/emacs/site-lisp/
share/emacs/site-lisp/git-blame.el
share/emacs/site-lisp/git.el
share/git-core/
@ -386,31 +384,16 @@ share/gitweb/static/git-favicon.png
share/gitweb/static/git-logo.png
share/gitweb/static/gitweb.css
share/gitweb/static/gitweb.js
share/locale/
share/locale/da/
share/locale/da/LC_MESSAGES/
share/locale/da/LC_MESSAGES/git.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/git.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/git.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/git.mo
share/locale/nl/
share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/git.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/git.mo
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/git.mo
share/locale/vi/
share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/git.mo
share/locale/zh_CN/
share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_CN/LC_MESSAGES/git.mo