On Mon, 29 Aug 2011, Abel Abraham Camarillo Ojeda wrote:
> This patch sets sysconfdir to our default value (/etc/)
> instead of it's previous value (/usr/local/etc).
>
> This makes some utilities (like git config --system -l) work again,
> config files were read from /etc/ some versions ago...
You shouldn't hardcode '/etc' but use ${SYSCONFDIR} instead.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/git/Makefile,v
> retrieving revision 1.80
> diff -u -r1.80 Makefile
> --- Makefile 30 Jul 2011 05:08:05 -0000 1.80
> +++ Makefile 29 Aug 2011 09:06:31 -0000
> @@ -11,7 +11,7 @@
> PKGNAME-x11 = git-x11-${V}
> CATEGORIES = devel
>
> -REVISION = 0
> +REVISION = 1
>
> HOMEPAGE = http://git-scm.com/
>
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
> retrieving revision 1.32
> diff -u -r1.32 patch-Makefile
> --- patches/patch-Makefile 24 Jul 2011 16:29:30 -0000 1.32
> +++ patches/patch-Makefile 29 Aug 2011 09:24:48 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile,v 1.32 2011/07/24 16:29:30 benoit Exp $
> ---- Makefile.orig Mon Jun 27 00:26:13 2011
> -+++ Makefile Sat Jul 16 14:44:47 2011
> -@@ -271,7 +271,7 @@
> +--- Makefile.orig Sun Jun 26 17:26:13 2011
> ++++ Makefile Mon Aug 29 03:46:06 2011
> +@@ -271,7 +271,7 @@ endif
>
> # CFLAGS and LDFLAGS are for the users to override from the command line.
>
> @@ -10,7 +10,7 @@
> LDFLAGS =
> ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
> ALL_LDFLAGS = $(LDFLAGS)
> -@@ -289,12 +289,12 @@
> +@@ -289,16 +289,17 @@ 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.
>
> @@ -26,7 +26,12 @@
> sharedir = $(prefix)/share
> gitwebdir = $(sharedir)/gitweb
> template_dir = share/git-core/templates
> -@@ -307,7 +307,7 @@
> + htmldir = share/doc/git-doc
> ++sysconfdir = /etc
> + ETC_GITCONFIG = $(sysconfdir)/gitconfig
> + ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
> + lib = lib
> +@@ -307,7 +308,7 @@ pathsep = :
>
> export prefix bindir sharedir sysconfdir gitwebdir
>
> @@ -35,7 +40,7 @@
> AR = ar
> RM = rm -f
> DIFF = diff
> -@@ -315,10 +315,10 @@
> +@@ -315,10 +316,10 @@ TAR = tar
> FIND = find
> INSTALL = install
> RPMBUILD = rpmbuild
> @@ -49,7 +54,7 @@
> PTHREAD_CFLAGS =
> GCOV = gcov
>
> -@@ -949,13 +949,14 @@
> +@@ -949,13 +950,14 @@ ifeq ($(uname_S),FreeBSD)
> HAVE_PATHS_H = YesPlease
> endif
> ifeq ($(uname_S),OpenBSD)
> @@ -67,7 +72,7 @@
> endif
> ifeq ($(uname_S),NetBSD)
> ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
> -@@ -1314,7 +1315,7 @@
> +@@ -1314,7 +1316,7 @@ endif
> EXTLIBS += -lz
>
> ifndef NO_OPENSSL
> @@ -76,7 +81,7 @@
> ifdef OPENSSLDIR
> BASIC_CFLAGS += -I$(OPENSSLDIR)/include
> OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib)
> $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
> -@@ -2146,7 +2147,7 @@
> +@@ -2146,7 +2148,7 @@ export NO_SVN_TESTS
>
> ### Testing rules
>
>
> --
> DISCLAIMER: http://goldmark.org/jeff/stupid-disclaimers/
> This message will self-destruct in 3 seconds.
>
>
--
Antoine
