Ticket #49501: svn.diffs

File svn.diffs, 3.8 KB (added by chucko58 (Chuck Fry), 9 years ago)

'svn diff' of a fix against r148086

Line 
1Index: configure
2===================================================================
3--- configure   (revision 148086)
4+++ configure   (working copy)
5@@ -675,6 +675,7 @@
6 MPAPPLICATIONSDIR
7 DSTMODE
8 RUNUSR
9+DSTGID
10 DSTGRP
11 DSTUSR
12 MPCONFIGDIR
13@@ -8125,7 +8126,11 @@
14                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSTGRP" >&5
15 $as_echo "$DSTGRP" >&6; }
16 
17+               DSTGID=`id -g`
18+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSTGID" >&5
19+$as_echo "$DSTGID" >&6; }
20 
21+
22                # Set run-user to current user
23                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for macports user" >&5
24 $as_echo_n "checking for macports user... " >&6; }
25Index: doc/base.mtree.in
26===================================================================
27--- doc/base.mtree.in   (revision 148086)
28+++ doc/base.mtree.in   (working copy)
29@@ -3,7 +3,7 @@
30 # MacPorts filesystem hierarchy, for internal use only. Changes to this file will not stick across installations.
31 #
32 
33-/set type=dir uname=@DSTUSR@ gname=@DSTGRP@ mode=@DSTMODE@
34+/set type=dir uname=@DSTUSR@ gid=@DSTGID@ mode=@DSTMODE@
35 .
36     man type=link link=share/man
37     ..
38Index: doc/prefix.mtree.in
39===================================================================
40--- doc/prefix.mtree.in (revision 148086)
41+++ doc/prefix.mtree.in (working copy)
42@@ -3,7 +3,7 @@
43 # MacPorts filesystem hierarchy, for internal use only. Changes to this file will not stick across installations.
44 #
45 
46-/set type=dir uname=@DSTUSR@ gname=@DSTGRP@ mode=@DSTMODE@
47+/set type=dir uname=@DSTUSR@ gid=@DSTGID@ mode=@DSTMODE@
48 .
49     bin
50     ..
51Index: Mk/macports.autoconf.mk.in
52===================================================================
53--- Mk/macports.autoconf.mk.in  (revision 148086)
54+++ Mk/macports.autoconf.mk.in  (working copy)
55@@ -53,6 +53,7 @@
56 DSEDITGROUP            = @DSEDITGROUP@
57 DSTUSR                 = @DSTUSR@
58 DSTGRP                 = @DSTGRP@
59+DSTGID                 = @DSTGID@
60 DSTMODE                        = @DSTMODE@
61 RUNUSR                 = @RUNUSR@
62 
63Index: Mk/macports.tea.mk
64===================================================================
65--- Mk/macports.tea.mk  (revision 148086)
66+++ Mk/macports.tea.mk  (working copy)
67@@ -22,6 +22,6 @@
68 distclean:: clean
69 
70 install:: all
71-       $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
72-       $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
73-       $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
74+       $(INSTALL) -d -o ${DSTUSR} -g "${DSTGRP}" -m ${DSTMODE} ${INSTALLDIR}
75+       $(INSTALL) -o ${DSTUSR} -g "${DSTGRP}" -m 444 ${SHLIB_NAME} ${INSTALLDIR}
76+       $(INSTALL) -o ${DSTUSR} -g "${DSTGRP}" -m 444 pkgIndex.tcl ${INSTALLDIR}
77Index: standard_configure.sh
78===================================================================
79--- standard_configure.sh       (revision 148086)
80+++ standard_configure.sh       (working copy)
81@@ -3,7 +3,10 @@
82 # This is how we run configure when building binary packages (more or less,
83 # minus architecture selection). If you don't want a custom build, this
84 # is probably how you should run it too.
85-env PATH=/usr/bin:/bin:/usr/sbin:/sbin CFLAGS="-pipe -Os" ./configure --enable-readline
86+#env PATH=/usr/bin:/bin:/usr/sbin:/sbin CFLAGS="-pipe -Os" ./configure --enable-readline
87 
88 # If you want to use a different prefix, add this to the above:
89 # --prefix=/some/path --with-applications-dir=/some/path/Applications
90+
91+env PATH=/usr/bin:/bin:/usr/sbin:/sbin CFLAGS="-pipe -Os" ./configure --enable-readline --prefix=/Users/cfry --with-applications-dir=/Users/cfry/Applications --with-no-root-privileges
92+
93Index: aclocal.m4
94===================================================================
95--- aclocal.m4  (revision 148086)
96+++ aclocal.m4  (working copy)
97@@ -640,6 +640,9 @@
98                DSTGRP=`id -gn`
99                AC_MSG_RESULT([$DSTGRP])
100                AC_SUBST(DSTGRP)
101+               DSTGID=`id -g`
102+               AC_MSG_RESULT([$DSTGID])
103+               AC_SUBST(DSTGID)
104 
105                # Set run-user to current user
106                AC_MSG_CHECKING([for macports user])