pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel Patch up some rather ... odd use of $HOME:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/164018cd5987
branches:  trunk
changeset: 538499:164018cd5987
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Feb 10 19:00:27 2008 +0000

description:
Patch up some rather ... odd use of $HOME:
Instead of setting prefix=$(HOME) and HOME=${PREFIX},
just set prefix=$(PREFIX) directly.

diffstat:

 devel/scmgit-base/distinfo         |   4 ++--
 devel/scmgit-base/patches/patch-aa |  12 +++++++++---
 devel/scmgit/Makefile.common       |   3 +--
 3 files changed, 12 insertions(+), 7 deletions(-)

diffs (64 lines):

diff -r 4ba61125106e -r 164018cd5987 devel/scmgit-base/distinfo
--- a/devel/scmgit-base/distinfo        Sun Feb 10 13:14:42 2008 +0000
+++ b/devel/scmgit-base/distinfo        Sun Feb 10 19:00:27 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2008/02/06 07:53:31 bjs Exp $
+$NetBSD: distinfo,v 1.3 2008/02/10 19:00:27 tnn Exp $
 
 SHA1 (git-1.5.4.tar.gz) = e4114d06231a038e70bd3f3ff0abedd0c94c3e7f
 RMD160 (git-1.5.4.tar.gz) = 7211e87c82b56fc9a94baa83df232b27fbce11fa
 Size (git-1.5.4.tar.gz) = 1894329 bytes
-SHA1 (patch-aa) = 95952036a346a816cbf6d880f89db31b1113e312
+SHA1 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375
 SHA1 (patch-ab) = 746bcea15853cd78b14dc2916f5f02bf67e59751
 SHA1 (patch-ac) = b8b70fabbd2857d5b4962b94d2c852f8d092ef27
 SHA1 (patch-ae) = 502cf80e047155a1302cbdafdd2a82e6077077e1
diff -r 4ba61125106e -r 164018cd5987 devel/scmgit-base/patches/patch-aa
--- a/devel/scmgit-base/patches/patch-aa        Sun Feb 10 13:14:42 2008 +0000
+++ b/devel/scmgit-base/patches/patch-aa        Sun Feb 10 19:00:27 2008 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2008/02/06 07:53:31 bjs Exp $
+$NetBSD: patch-aa,v 1.3 2008/02/10 19:00:27 tnn Exp $
 
 NetBSD 3.0 needs -liconv, too.
 
 AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
 
---- Makefile.orig      2008-02-01 23:09:01.000000000 -0500
+--- Makefile.orig      2008-02-02 05:09:01.000000000 +0100
 +++ Makefile
-@@ -150,8 +150,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+@@ -150,13 +150,11 @@ uname_P := $(shell sh -c 'uname -p 2>/de
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -15,6 +15,12 @@
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
+ 
+-prefix = $(HOME)
++prefix = $(PREFIX)
+ bindir = $(prefix)/bin
+ mandir = $(prefix)/share/man
+ infodir = $(prefix)/share/info
 @@ -192,12 +190,8 @@ GITWEB_SITE_FOOTER =
  
  export prefix bindir gitexecdir sharedir template_dir htmldir sysconfdir
diff -r 4ba61125106e -r 164018cd5987 devel/scmgit/Makefile.common
--- a/devel/scmgit/Makefile.common      Sun Feb 10 13:14:42 2008 +0000
+++ b/devel/scmgit/Makefile.common      Sun Feb 10 19:00:27 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2008/02/06 07:53:31 bjs Exp $
+# $NetBSD: Makefile.common,v 1.5 2008/02/10 19:00:27 tnn Exp $
 #
 # used by devel/scmgit-base/Makefile
 # used by devel/scmgit-docs/Makefile
@@ -21,7 +21,6 @@
 PATCHDIR=      ${.CURDIR}/../scmgit-base/patches
 DISTINFO_FILE= ${.CURDIR}/../scmgit-base/distinfo
 
-MAKE_ENV+=     HOME=${PREFIX:Q}
 USE_TOOLS+=    gmake tar perl sh
 EXTRACT_USING= gtar
 



Home | Main Index | Thread Index | Old Index