| 1 |
chainsaw 08/06/30 12:18:54 |
| 2 |
|
| 3 |
Added: snips-1.2-destdir-awareness.patch |
| 4 |
snips-1.2-r1-precache-config |
| 5 |
Removed: snips-1.2-precache-config |
| 6 |
Log: |
| 7 |
Make the build system DESTDIR-aware to de-uglify the ebuild. Patch applied upstream. Eternal glory for a libtool patch that makes the QA warning go away. |
| 8 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc7-00051-g62786b9-dirty x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-analyzer/snips/files/snips-1.2-destdir-awareness.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snips/files/snips-1.2-destdir-awareness.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snips/files/snips-1.2-destdir-awareness.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: snips-1.2-destdir-awareness.patch |
| 17 |
=================================================================== |
| 18 |
diff -uNr snips-1.2.ORIG/etherload/Makefile.mid snips-1.2/etherload/Makefile.mid |
| 19 |
--- snips-1.2.ORIG/etherload/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 20 |
+++ snips-1.2/etherload/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 21 |
@@ -25,10 +25,10 @@ |
| 22 |
make CFLAGS="$(CFLAGS) -DSTANDALONE" $(TARG) |
| 23 |
|
| 24 |
install: $(TARG) |
| 25 |
- $(INSTALL) -c -m 4750 $(TARG) $(BINDIR) |
| 26 |
+ $(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR) |
| 27 |
@if [ `whoami` = "root" ]; then \ |
| 28 |
- chown root $(BINDIR)/$(TARG) ;\ |
| 29 |
- ls -lg $(BINDIR)/$(TARG) ;\ |
| 30 |
+ chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
| 31 |
+ ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
| 32 |
else \ |
| 33 |
echo "";echo "___Installed $(TARG) needs to be root suid___" ;\ |
| 34 |
echo "Do as root manually" ;\ |
| 35 |
diff -uNr snips-1.2.ORIG/Makefile.mid snips-1.2/Makefile.mid |
| 36 |
--- snips-1.2.ORIG/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 37 |
+++ snips-1.2/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 38 |
@@ -66,8 +66,8 @@ |
| 39 |
|
| 40 |
## Ultrix make balked at the tests for directories, hence the second test |
| 41 |
install: installdir lib |
| 42 |
- @[ -d $(ROOTDIR) ] && [ -d $(DATADIR) ] && [ -d $(ETCDIR) ] \ |
| 43 |
- && [ -d $(BINDIR) ] |
| 44 |
+ @[ -d $(DESTDIR)$(ROOTDIR) ] && [ -d $(DESTDIR)$(DATADIR) ] && \ |
| 45 |
+ [ -d $(DESTDIR)$(ETCDIR) ] && [ -d $(DESTDIR)$(BINDIR) ] |
| 46 |
@-(touch SniPpet ; $(INSTALL) -c -m 750 SniPpet /tmp/;) >/dev/null 2>&1 ; |
| 47 |
@(if [ -f /tmp/SniPpet ]; then rm -f SniPpet /tmp/SniPpet; else \ |
| 48 |
echo "YOU HAVE AN INCOMPATIBLE install, use 'myinstall' instead" ;\ |
| 49 |
@@ -82,10 +82,10 @@ |
| 50 |
@echo "" |
| 51 |
@echo "Installing sample config files under $(EXAMPLESDIR)/..." |
| 52 |
@-for i in */*-confg */*.conf *.conf ; do \ |
| 53 |
- $(INSTALL) -m 444 -c $$i $(EXAMPLESDIR)/ ;\ |
| 54 |
+ $(INSTALL) -m 444 -c $$i $(DESTDIR)$(EXAMPLESDIR)/ ;\ |
| 55 |
done |
| 56 |
@if [ ! -f $(ETCDIR)/snips.conf ]; then \ |
| 57 |
- $(INSTALL) -c -m 755 snips.conf $(ETCDIR)/snips.conf ;\ |
| 58 |
+ $(INSTALL) -c -m 755 snips.conf $(DESTDIR)$(ETCDIR)/snips.conf ;\ |
| 59 |
fi |
| 60 |
@echo "" ; echo " NOW su AND DO A make root " |
| 61 |
|
| 62 |
@@ -95,9 +95,9 @@ |
| 63 |
@if [ "`$(WHOAMI)`" = "root" ]; then \ |
| 64 |
echo "Installing the following programs SUID under $(BINDIR)";\ |
| 65 |
echo " multiping etherload trapmon" ;\ |
| 66 |
- $(INSTALL) -m 4711 -c pingmon/multiping/multiping $(BINDIR) ;\ |
| 67 |
- $(INSTALL) -m 4710 -c etherload/etherload $(BINDIR) ;\ |
| 68 |
- $(INSTALL) -m 4710 -c trapmon/trapmon $(BINDIR) ;\ |
| 69 |
+ $(INSTALL) -m 4711 -c pingmon/multiping/multiping $(DESTDIR)$(BINDIR) ;\ |
| 70 |
+ $(INSTALL) -m 4710 -c etherload/etherload $(DESTDIR)$(BINDIR) ;\ |
| 71 |
+ $(INSTALL) -m 4710 -c trapmon/trapmon $(DESTDIR)$(BINDIR) ;\ |
| 72 |
else \ |
| 73 |
echo "PLEASE RUN make root AS root (currently `whoami`)" ;\ |
| 74 |
fi |
| 75 |
diff -uNr snips-1.2.ORIG/Makefile.tail snips-1.2/Makefile.tail |
| 76 |
--- snips-1.2.ORIG/Makefile.tail 2008-06-30 12:42:43.000000000 +0100 |
| 77 |
+++ snips-1.2/Makefile.tail 2008-06-30 12:35:38.000000000 +0100 |
| 78 |
@@ -9,32 +9,32 @@ |
| 79 |
|
| 80 |
## these dirs are listed in Makefile.head |
| 81 |
installdir: |
| 82 |
- @[ -d $(ROOTDIR) ] || mkdir $(ROOTDIR) |
| 83 |
- @[ -d $(BINDIR) ] || mkdir $(BINDIR) |
| 84 |
- @[ -d $(DATADIR) ] || mkdir $(DATADIR) |
| 85 |
- @[ -d $(ETCDIR) ] || mkdir $(ETCDIR) |
| 86 |
- @[ -d $(PIDDIR) ] || mkdir $(PIDDIR) |
| 87 |
- @[ -d $(INITDIR) ] || mkdir $(INITDIR) |
| 88 |
- @[ -d $(MSGSDIR) ] || mkdir $(MSGSDIR) |
| 89 |
- @[ -d $(RRD_DBDIR) ] || mkdir $(RRD_DBDIR) |
| 90 |
- @[ -d $(EXAMPLESDIR) ] || mkdir $(EXAMPLESDIR) |
| 91 |
- @[ -d $(DEVICEHELPDIR) ] || mkdir $(DEVICEHELPDIR) |
| 92 |
- @[ -d $(CGIDIR) ] || mkdir -p $(CGIDIR) |
| 93 |
- @[ -d $(HTMLDIR) ] || mkdir -p $(HTMLDIR) |
| 94 |
- @[ -d $(ROOTDIR)/logs ] || mkdir $(ROOTDIR)/logs |
| 95 |
+ @[ -d $(DESTDIR)$(ROOTDIR) ] || mkdir -p $(DESTDIR)$(ROOTDIR) |
| 96 |
+ @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) |
| 97 |
+ @[ -d $(DESTDIR)$(DATADIR) ] || mkdir -p $(DESTDIR)$(DATADIR) |
| 98 |
+ @[ -d $(DESTDIR)$(ETCDIR) ] || mkdir -p $(DESTDIR)$(ETCDIR) |
| 99 |
+ @[ -d $(DESTDIR)$(PIDDIR) ] || mkdir -p $(DESTDIR)$(PIDDIR) |
| 100 |
+ @[ -d $(DESTDIR)$(INITDIR) ] || mkdir -p $(DESTDIR)$(INITDIR) |
| 101 |
+ @[ -d $(DESTDIR)$(MSGSDIR) ] || mkdir -p $(DESTDIR)$(MSGSDIR) |
| 102 |
+ @[ -d $(DESTDIR)$(RRD_DBDIR) ] || mkdir -p $(DESTDIR)$(RRD_DBDIR) |
| 103 |
+ @[ -d $(DESTDIR)$(EXAMPLESDIR) ] || mkdir -p $(DESTDIR)$(EXAMPLESDIR) |
| 104 |
+ @[ -d $(DESTDIR)$(DEVICEHELPDIR) ] || mkdir -p $(DESTDIR)$(DEVICEHELPDIR) |
| 105 |
+ @[ -d $(DESTDIR)$(CGIDIR) ] || mkdir -p $(DESTDIR)$(CGIDIR) |
| 106 |
+ @[ -d $(DESTDIR)$(HTMLDIR) ] || mkdir -p $(DESTDIR)$(HTMLDIR) |
| 107 |
+ @[ -d $(DESTDIR)$(ROOTDIR)/logs ] || mkdir -p $(DESTDIR)$(ROOTDIR)/logs |
| 108 |
|
| 109 |
init: |
| 110 |
- @if [ ! -z "$(INITFILES)" ] && [ -d "$(INITDIR)" ]; then \ |
| 111 |
+ @if [ ! -z "$(INITFILES)" ] && [ -d "$(DESTDIR)$(INITDIR)" ]; then \ |
| 112 |
for i in $(INITFILES) x ; \ |
| 113 |
do \ |
| 114 |
if [ "$$i" = "x" ]; then \ |
| 115 |
: ;\ |
| 116 |
else \ |
| 117 |
- if [ -f "$(INITDIR)/$$i.init" ]; then \ |
| 118 |
+ if [ -f "$(DESTDIR)$(INITDIR)/$$i.init" ]; then \ |
| 119 |
echo "Not overwriting existing $(INITDIR)/$$i.init";\ |
| 120 |
else \ |
| 121 |
echo "Installing $$i.init under $(INITDIR)/" ;\ |
| 122 |
- ln -s $(BINDIR)/snipsprog.init $(INITDIR)/$$i.init ;\ |
| 123 |
+ ln -s $(DESTDIR)$(BINDIR)/snipsprog.init $(DESTDIR)$(INITDIR)/$$i.init ;\ |
| 124 |
fi \ |
| 125 |
fi \ |
| 126 |
done \ |
| 127 |
diff -uNr snips-1.2.ORIG/man/Makefile.mid snips-1.2/man/Makefile.mid |
| 128 |
--- snips-1.2.ORIG/man/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 129 |
+++ snips-1.2/man/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 130 |
@@ -26,18 +26,18 @@ |
| 131 |
|
| 132 |
install: installdir |
| 133 |
@echo "Installing in 'man'" |
| 134 |
- @- [ -d $(MANDIR) ] || mkdir $(MANDIR) |
| 135 |
+ @- [ -d $(DESTDIR)$(MANDIR) ] || mkdir $(DESTDIR)$(MANDIR) |
| 136 |
# @-for d in $(MANDIR)/man1 $(MANDIR)/man3 $(MANDIR)/man8; do \ |
| 137 |
# [! -d $$d ] && mkdir $$d ;\ |
| 138 |
# done |
| 139 |
@- for m in $(MANPAGES1); do \ |
| 140 |
- $(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 1`$(MANEXT) ;\ |
| 141 |
+ $(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 1`$(MANEXT) ;\ |
| 142 |
done |
| 143 |
@- for m in $(MANPAGES3); do \ |
| 144 |
- $(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 3`$(MANEXT) ;\ |
| 145 |
+ $(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 3`$(MANEXT) ;\ |
| 146 |
done |
| 147 |
@- for m in $(MANPAGES8); do \ |
| 148 |
- $(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 8`$(MANEXT) ;\ |
| 149 |
+ $(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 8`$(MANEXT) ;\ |
| 150 |
done |
| 151 |
|
| 152 |
clean: |
| 153 |
diff -uNr snips-1.2.ORIG/nsmon/Makefile.mid snips-1.2/nsmon/Makefile.mid |
| 154 |
--- snips-1.2.ORIG/nsmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 155 |
+++ snips-1.2/nsmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 156 |
@@ -17,7 +17,7 @@ |
| 157 |
$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
| 158 |
|
| 159 |
install: installdir $(TARG) |
| 160 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
| 161 |
+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
| 162 |
|
| 163 |
## for standalone, need to link with -lresolv or -lbind |
| 164 |
nstest: nsmon.c |
| 165 |
diff -uNr snips-1.2.ORIG/ntpmon/Makefile.mid snips-1.2/ntpmon/Makefile.mid |
| 166 |
--- snips-1.2.ORIG/ntpmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 167 |
+++ snips-1.2/ntpmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 168 |
@@ -17,7 +17,7 @@ |
| 169 |
|
| 170 |
|
| 171 |
install: installdir $(TARG) |
| 172 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
| 173 |
+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
| 174 |
|
| 175 |
clean: |
| 176 |
rm -f $(DIRT) |
| 177 |
diff -uNr snips-1.2.ORIG/perl-monitors/Makefile.mid snips-1.2/perl-monitors/Makefile.mid |
| 178 |
--- snips-1.2.ORIG/perl-monitors/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 179 |
+++ snips-1.2/perl-monitors/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 180 |
@@ -62,32 +62,32 @@ |
| 181 |
# ideally hostmon-osclients/ need not go into the BINDIR, but we are |
| 182 |
# putting it all there for now. |
| 183 |
install: |
| 184 |
- -@[ -d $(BINDIR)/hostmon-osclients ] || mkdir $(BINDIR)/hostmon-osclients |
| 185 |
+ -@[ -d $(DESTDIR)$(BINDIR)/hostmon-osclients ] || mkdir $(DESTDIR)$(BINDIR)/hostmon-osclients |
| 186 |
-@echo "Installing files in $(BINDIR)/hostmon-osclients" ;\ |
| 187 |
for f in hostmon-osclients/* ; do \ |
| 188 |
if [ -f $$f ]; then \ |
| 189 |
- $(INSTALL) -c -m 755 $$f $(BINDIR)/hostmon-osclients/ ;\ |
| 190 |
+ $(INSTALL) -c -m 755 $$f $(DESTDIR)$(BINDIR)/hostmon-osclients/ ;\ |
| 191 |
fi \ |
| 192 |
done |
| 193 |
- -@cd $(BINDIR)/hostmon-osclients ; \ |
| 194 |
+ -@cd $(DESTDIR)$(BINDIR)/hostmon-osclients ; \ |
| 195 |
if [ -f hostmon-client.seds ]; then \ |
| 196 |
$(INSTALL) -c -m 755 hostmon-client.seds hostmon-client ;\ |
| 197 |
rm -f hostmon-client.seds ;\ |
| 198 |
fi |
| 199 |
-@echo "Installing perl monitors under $(BINDIR)" ;\ |
| 200 |
for f in $(PROGS) ; do \ |
| 201 |
- $(INSTALL) -c -m 755 $$f.seds $(BINDIR)/$$f ;\ |
| 202 |
+ $(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(BINDIR)/$$f ;\ |
| 203 |
done |
| 204 |
-@for f in $(CONF) ; do \ |
| 205 |
- if [ ! -f $(ETCDIR)/$$f ]; then \ |
| 206 |
- $(INSTALL) -c -m 644 $$f.seds $(ETCDIR)/$$f ;\ |
| 207 |
+ if [ ! -f $(DESTDIR)$(ETCDIR)/$$f ]; then \ |
| 208 |
+ $(INSTALL) -c -m 644 $$f.seds $(DESTDIR)$(ETCDIR)/$$f ;\ |
| 209 |
fi \ |
| 210 |
done |
| 211 |
- $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpwalk $(BINDIR)/ |
| 212 |
- $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpget $(BINDIR)/ |
| 213 |
- $(INSTALL) -c -m 444 $(CMUSNMP)/mib-v2.txt $(ETCDIR)/ |
| 214 |
- @if [ -f $(ETCDIR)/mibII.txt ]; then \ |
| 215 |
- mv $(ETCDIR)/mibII.txt $(ETCDIR)/mibII.txt.old ;\ |
| 216 |
+ $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpwalk $(DESTDIR)$(BINDIR)/ |
| 217 |
+ $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpget $(DESTDIR)$(BINDIR)/ |
| 218 |
+ $(INSTALL) -c -m 444 $(CMUSNMP)/mib-v2.txt $(DESTDIR)$(ETCDIR)/ |
| 219 |
+ @if [ -f $(DESTDIR)$(ETCDIR)/mibII.txt ]; then \ |
| 220 |
+ mv $(DESTDIR)$(ETCDIR)/mibII.txt $(DESTDIR)$(ETCDIR)/mibII.txt.old ;\ |
| 221 |
fi |
| 222 |
@echo "See $(SRCDIR)/perl-monotors/README for further customizations" |
| 223 |
|
| 224 |
diff -uNr snips-1.2.ORIG/pingmon/Makefile.mid snips-1.2/pingmon/Makefile.mid |
| 225 |
--- snips-1.2.ORIG/pingmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 226 |
+++ snips-1.2/pingmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 227 |
@@ -26,11 +26,11 @@ |
| 228 |
$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
| 229 |
|
| 230 |
install: installdir $(TARG) |
| 231 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ ; |
| 232 |
- @[ -f $(BINDIR)/ippingmon ] && rm -f $(BINDIR)/ippingmon ; \ |
| 233 |
- ln -s $(BINDIR)/$(TARG) $(BINDIR)/ippingmon ;\ |
| 234 |
- [ -f $(BINDIR)/rpcpingmon ] && rm -f $(BINDIR)/rpcpingmon ; \ |
| 235 |
- ln -s $(BINDIR)/$(TARG) $(BINDIR)/rpcpingmon |
| 236 |
+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ ; |
| 237 |
+ @[ -f $(DESTDIR)$(BINDIR)/ippingmon ] && rm -f $(DESTDIR)$(BINDIR)/ippingmon ; \ |
| 238 |
+ ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/ippingmon ;\ |
| 239 |
+ [ -f $(DESTDIR)$(BINDIR)/rpcpingmon ] && rm -f $(DESTDIR)$(BINDIR)/rpcpingmon ; \ |
| 240 |
+ ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/rpcpingmon |
| 241 |
|
| 242 |
clean: |
| 243 |
rm -f $(DIRT) |
| 244 |
diff -uNr snips-1.2.ORIG/pingmon/multiping/Makefile.mid snips-1.2/pingmon/multiping/Makefile.mid |
| 245 |
--- snips-1.2.ORIG/pingmon/multiping/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 246 |
+++ snips-1.2/pingmon/multiping/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 247 |
@@ -14,10 +14,10 @@ |
| 248 |
$(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG) |
| 249 |
|
| 250 |
install: installdir $(TARG) |
| 251 |
- $(INSTALL) -c -m 4711 $(TARG) $(BINDIR)/ |
| 252 |
+ $(INSTALL) -c -m 4711 $(TARG) $(DESTDIR)$(BINDIR)/ |
| 253 |
@if [ `whoami` = "root" ]; then \ |
| 254 |
- chown root $(BINDIR)/$(TARG) ;\ |
| 255 |
- ls -lg $(BINDIR)/$(TARG) ;\ |
| 256 |
+ chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
| 257 |
+ ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
| 258 |
else \ |
| 259 |
echo "";echo "___Installed $(TARG) needs to be root suid___" ;\ |
| 260 |
echo "Do as root manually" ;\ |
| 261 |
diff -uNr snips-1.2.ORIG/pingmon/rpcping/Makefile.mid snips-1.2/pingmon/rpcping/Makefile.mid |
| 262 |
--- snips-1.2.ORIG/pingmon/rpcping/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 263 |
+++ snips-1.2/pingmon/rpcping/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 264 |
@@ -16,7 +16,7 @@ |
| 265 |
$(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG) |
| 266 |
|
| 267 |
install: installdir $(TARG) |
| 268 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
| 269 |
+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
| 270 |
|
| 271 |
clean: |
| 272 |
rm -f $(DIRT) $(TARG) |
| 273 |
diff -uNr snips-1.2.ORIG/portmon/Makefile.mid snips-1.2/portmon/Makefile.mid |
| 274 |
--- snips-1.2.ORIG/portmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 275 |
+++ snips-1.2/portmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 276 |
@@ -15,7 +15,7 @@ |
| 277 |
|
| 278 |
# |
| 279 |
install: installdir $(TARG) |
| 280 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
| 281 |
+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
| 282 |
|
| 283 |
clean: |
| 284 |
rm -f $(DIRT) |
| 285 |
diff -uNr snips-1.2.ORIG/radiusmon/Makefile.mid snips-1.2/radiusmon/Makefile.mid |
| 286 |
--- snips-1.2.ORIG/radiusmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 287 |
+++ snips-1.2/radiusmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 288 |
@@ -17,7 +17,7 @@ |
| 289 |
|
| 290 |
|
| 291 |
install: installdir $(TARG) |
| 292 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
| 293 |
+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
| 294 |
|
| 295 |
test: radiusmon.c md5.c |
| 296 |
$(CC) -c $(CFLAGS) -DDEBUG -DTEST radiusmon.c |
| 297 |
diff -uNr snips-1.2.ORIG/snipslog/Makefile.mid snips-1.2/snipslog/Makefile.mid |
| 298 |
--- snips-1.2.ORIG/snipslog/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 299 |
+++ snips-1.2/snipslog/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 300 |
@@ -21,7 +21,7 @@ |
| 301 |
$(CC) $(CFLAGS) -DTEST -o snipslogtest snipslogtest.c $(LIBS) |
| 302 |
|
| 303 |
install: installdir $(TARG) |
| 304 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
| 305 |
+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
| 306 |
@echo "___Update config file for logging daemon in $(ETCDIR) ___" |
| 307 |
|
| 308 |
clean: |
| 309 |
diff -uNr snips-1.2.ORIG/snipstv/Makefile.mid snips-1.2/snipstv/Makefile.mid |
| 310 |
--- snips-1.2.ORIG/snipstv/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 311 |
+++ snips-1.2/snipstv/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 312 |
@@ -20,9 +20,9 @@ |
| 313 |
$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
| 314 |
|
| 315 |
install: installdir $(TARG) |
| 316 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR) |
| 317 |
- [ -r $(BINDIR)/netconsole ] || ln -s $(BINDIR)/$(TARG) $(BINDIR)/netconsole |
| 318 |
- $(INSTALL) -c -m 0444 snipstv-help $(ETCDIR) |
| 319 |
+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR) |
| 320 |
+ [ -r $(DESTDIR)$(BINDIR)/netconsole ] || ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/netconsole |
| 321 |
+ $(INSTALL) -c -m 0444 snipstv-help $(DESTDIR)$(ETCDIR) |
| 322 |
|
| 323 |
clean: |
| 324 |
rm -f $(DIRT) filter |
| 325 |
diff -uNr snips-1.2.ORIG/snipsweb/Makefile.mid snips-1.2/snipsweb/Makefile.mid |
| 326 |
--- snips-1.2.ORIG/snipsweb/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 327 |
+++ snips-1.2/snipsweb/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 328 |
@@ -32,24 +32,24 @@ |
| 329 |
|
| 330 |
install: installdir |
| 331 |
@for f in $(CGI) ; do \ |
| 332 |
- $(INSTALL) -c -m 755 $$f.seds $(CGIDIR)/$$f ; \ |
| 333 |
+ $(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(CGIDIR)/$$f ; \ |
| 334 |
done |
| 335 |
@for f in $(CONFIG) ; do \ |
| 336 |
- if [ -f $(ETCDIR)/$$f ]; then \ |
| 337 |
+ if [ -f $(DESTDIR)$(ETCDIR)/$$f ]; then \ |
| 338 |
echo "Not overwriting existing $(ETCDIR)/$$f" ;\ |
| 339 |
else \ |
| 340 |
- $(INSTALL) -c -m 755 $$f.seds $(ETCDIR)/$$f ; \ |
| 341 |
+ $(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(ETCDIR)/$$f ; \ |
| 342 |
fi ;\ |
| 343 |
done |
| 344 |
- @[ -f $(DEVICEHELPDIR)/default ] || $(INSTALL) -c -m 644 default $(DEVICEHELPDIR)/ |
| 345 |
+ @[ -f $(DESTDIR)$(DEVICEHELPDIR)/default ] || $(INSTALL) -c -m 644 default $(DESTDIR)$(DEVICEHELPDIR)/ |
| 346 |
@for f in $(HTMLFILES) ; do \ |
| 347 |
- if [ -f $(HTMLDIR)/$$f ]; then \ |
| 348 |
+ if [ -f $(DESTDIR)$(HTMLDIR)/$$f ]; then \ |
| 349 |
echo "Not overwriting existing $(HTMLDIR)/$$f" ;\ |
| 350 |
else \ |
| 351 |
- $(INSTALL) -c -m 644 $$f $(HTMLDIR)/$$f ; \ |
| 352 |
+ $(INSTALL) -c -m 644 $$f $(DESTDIR)$(HTMLDIR)/$$f ; \ |
| 353 |
fi ;\ |
| 354 |
done ;\ |
| 355 |
- cp -r gifs $(HTMLDIR)/gifs |
| 356 |
+ cp -r gifs $(DESTDIR)$(HTMLDIR)/gifs |
| 357 |
@echo "Installed basic web files under " ; \ |
| 358 |
echo " $(HTMLDIR) and $(CGIDIR)" ; \ |
| 359 |
echo "Move into desired web location."; \ |
| 360 |
diff -uNr snips-1.2.ORIG/tksnips/Makefile.mid snips-1.2/tksnips/Makefile.mid |
| 361 |
--- snips-1.2.ORIG/tksnips/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 362 |
+++ snips-1.2/tksnips/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 363 |
@@ -23,7 +23,7 @@ |
| 364 |
cat tkSnips.tix > tkSnips ; |
| 365 |
|
| 366 |
install: installdir $(TARG) |
| 367 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
| 368 |
+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
| 369 |
|
| 370 |
clean: |
| 371 |
rm -f $(DIRT) test |
| 372 |
diff -uNr snips-1.2.ORIG/tpmon/Makefile.mid snips-1.2/tpmon/Makefile.mid |
| 373 |
--- snips-1.2.ORIG/tpmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 374 |
+++ snips-1.2/tpmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 375 |
@@ -20,7 +20,7 @@ |
| 376 |
$(CC) $(CFLAGS) -o tptest tpmon.o tptest.o |
| 377 |
|
| 378 |
install: installdir $(TARG) |
| 379 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
| 380 |
+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
| 381 |
|
| 382 |
clean: |
| 383 |
rm -f $(DIRT) tptest |
| 384 |
diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid |
| 385 |
--- snips-1.2.ORIG/trapmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 386 |
+++ snips-1.2/trapmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
| 387 |
@@ -20,10 +20,10 @@ |
| 388 |
$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
| 389 |
|
| 390 |
install: $(TARG) |
| 391 |
- $(INSTALL) -c -m 4750 $(TARG) $(BINDIR)/ |
| 392 |
+ $(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR)/ |
| 393 |
@if [ `whoami` = "root" ]; then \ |
| 394 |
- chown root $(BINDIR)/$(TARG) ;\ |
| 395 |
- ls -lg $(BINDIR)/$(TARG) ;\ |
| 396 |
+ chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
| 397 |
+ ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
| 398 |
else \ |
| 399 |
echo "";echo "___Installed $(TARG) needs to be root suid___" ;\ |
| 400 |
echo "Do as root manually" ;\ |
| 401 |
diff -uNr snips-1.2.ORIG/utility/Makefile.mid snips-1.2/utility/Makefile.mid |
| 402 |
--- snips-1.2.ORIG/utility/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
| 403 |
+++ snips-1.2/utility/Makefile.mid 2008-06-30 12:42:59.000000000 +0100 |
| 404 |
@@ -59,12 +59,12 @@ |
| 405 |
echo "" |
| 406 |
|
| 407 |
install: all |
| 408 |
- $(INSTALL) -c -m 751 $(CPROGS) $(BINDIR)/ |
| 409 |
+ $(INSTALL) -c -m 751 $(CPROGS) $(DESTDIR)$(BINDIR)/ |
| 410 |
-@ for f in $(SCRIPTS) ; do \ |
| 411 |
- if [ -f $(BINDIR)/$$f ]; then \ |
| 412 |
+ if [ -f $(DESTDIR)$(BINDIR)/$$f ]; then \ |
| 413 |
echo "Not overwriting existing $(BINDIR)/$$f" ;\ |
| 414 |
else \ |
| 415 |
- $(INSTALL) -c -m 751 $$f.seds $(BINDIR)/$$f ;\ |
| 416 |
+ $(INSTALL) -c -m 751 $$f.seds $(DESTDIR)$(BINDIR)/$$f ;\ |
| 417 |
fi ;\ |
| 418 |
done |
| 419 |
|
| 420 |
|
| 421 |
|
| 422 |
|
| 423 |
1.1 net-analyzer/snips/files/snips-1.2-r1-precache-config |
| 424 |
|
| 425 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snips/files/snips-1.2-r1-precache-config?rev=1.1&view=markup |
| 426 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/snips/files/snips-1.2-r1-precache-config?rev=1.1&content-type=text/plain |
| 427 |
|
| 428 |
Index: snips-1.2-r1-precache-config |
| 429 |
=================================================================== |
| 430 |
# These answers are interdependent; do not edit this file! |
| 431 |
package="snips" |
| 432 |
ROOTDIR="/usr/snips" |
| 433 |
MANDIR="/usr/share/man/snips" |
| 434 |
MANEXT="n" |
| 435 |
OPSMAIL="root@localhost" |
| 436 |
ADMINMAIL="root@localhost" |
| 437 |
MAIL="/bin/mail" |
| 438 |
CC="gcc" |
| 439 |
YACC="yacc" |
| 440 |
LIBS="" |
| 441 |
RPCLIB="" |
| 442 |
PSFLAGS="axw" |
| 443 |
PERL="/usr/bin/perl" |
| 444 |
AR="ar r" |
| 445 |
WHOAMI="/usr/bin/whoami" |
| 446 |
RANLIB="ranlib" |
| 447 |
INSTALL="install" |
| 448 |
PING="/bin/ping" |
| 449 |
CURSESLIB="-lncurses" |
| 450 |
RRDCFLAGS="-DRRDTOOL" |
| 451 |
RRDLIBDIR="/usr/lib/" |
| 452 |
RRDLIBS="-L/usr/lib/ -lrrd" |
| 453 |
|
| 454 |
|
| 455 |
|
| 456 |
-- |
| 457 |
gentoo-commits@l.g.o mailing list |
Archives