[gentoo-commits] gentoo-x86 commit in net-misc/lanmap/files: lanmap-81-make.patch

2014-10-26 Thread Jeroen Roovers (jer) 
jer 14/10/26 11:07:31

  Modified: lanmap-81-make.patch
  Log:
  Fix bashism in Makefile.in (bug #526906).
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
A792A613)

Revision  ChangesPath
1.2  net-misc/lanmap/files/lanmap-81-make.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/lanmap/files/lanmap-81-make.patch?rev=1.2view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/lanmap/files/lanmap-81-make.patch?rev=1.2content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/lanmap/files/lanmap-81-make.patch?r1=1.1r2=1.2

Index: lanmap-81-make.patch
===
RCS file: /var/cvsroot/gentoo-x86/net-misc/lanmap/files/lanmap-81-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lanmap-81-make.patch18 Jul 2014 17:01:09 -  1.1
+++ lanmap-81-make.patch26 Oct 2014 11:07:31 -  1.2
@@ -1,7 +1,7 @@
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -2,8 +2,8 @@
- # $Id: lanmap-81-make.patch,v 1.1 2014/07/18 17:01:09 jer Exp $
+ # $Id: lanmap-81-make.patch,v 1.2 2014/10/26 11:07:31 jer Exp $
  
  # complation
 -CFLAGS = -W -Wall -Wno-unused -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
@@ -30,7 +30,7 @@
  os_classify: os_classify.c misc.c
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -10,16 +10,16 @@
+@@ -10,18 +10,18 @@
  DATADEST = ${prefix}/share/lanmap/
  
  all:
@@ -48,8 +48,11 @@
 -  install -m 0644 -d $(DATADEST)graph
 +  install -m 0755 -d $(DATADEST)graph
install -m 0644 ./graph/lanmap.header $(DATADEST)graph/
-   for f in ./graph/img/*.{png,gif,svg}; do install -m 0644 $$f 
$(DATADEST)graph/img/; done
+-  for f in ./graph/img/*.{png,gif,svg}; do install -m 0644 $$f 
$(DATADEST)graph/img/; done
++  for f in ./graph/img/*.gif ./graph/img/*.png ./graph/img/*.svg; do 
install -m 0644 $$f $(DATADEST)graph/img/; done

+ uninstall:
+   rm $(BINDEST)$(BINARY)
 @@ -29,11 +29,11 @@
  
  clean:

[gentoo-commits] gentoo-x86 commit in net-misc/lanmap/files: lanmap-81-make.patch makefile.patch

2014-07-18 Thread Jeroen Roovers (jer) 
jer 14/07/18 17:01:09

  Added:lanmap-81-make.patch
  Removed:  makefile.patch
  Log:
  Rename patch. Regenerate configure. Convert sed script into (same) patch. Set 
proper dependencies.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
A792A613)

Revision  ChangesPath
1.1  net-misc/lanmap/files/lanmap-81-make.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/lanmap/files/lanmap-81-make.patch?rev=1.1view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/lanmap/files/lanmap-81-make.patch?rev=1.1content-type=text/plain

Index: lanmap-81-make.patch
===
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -2,8 +2,8 @@
 # $Id: lanmap-81-make.patch,v 1.1 2014/07/18 17:01:09 jer Exp $
 
 # complation
-CFLAGS = -W -Wall -Wno-unused -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
-LDFLAGS = -lpcap -lm
+CFLAGS += -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
+LDFLAGS += -lpcap -lm
 CFLAGS_DEBUG = -D_DEBUG -ggdb
 LDFLAGS_DEBUG = -pg
 BINARY = lanmap
@@ -14,12 +14,12 @@
$(CC) $(OBJS) -o $(BINARY) $(LDFLAGS)
 
 static:
-   make clean
-   make LDFLAGS=$(LDFLAGS) -static all
+   $(MAKE) clean
+   $(MAKE) LDFLAGS=$(LDFLAGS) -static all
 
 debug:
-   make clean
-   make CFLAGS=$(CFLAGS) $(CFLAGS_DEBUG) LDFLAGS=$(LDFLAGS)  all
+   $(MAKE) clean
+   $(MAKE) CFLAGS=$(CFLAGS) $(CFLAGS_DEBUG) LDFLAGS=$(LDFLAGS)  all
 
 # for testing the classify code by itself
 os_classify: os_classify.c misc.c
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,16 +10,16 @@
 DATADEST = ${prefix}/share/lanmap/
 
 all:
-   cd ./src  make LANMAP_DATADIR=$(DATADEST)
+   cd ./src  $(MAKE) LANMAP_DATADIR=$(DATADEST)
 
 install:
-   install -m 0755 ./src/$(BINARY) $(BINDEST)
+   install -m 0755 -D ./src/$(BINARY) $(BINDEST)/$(BINARY)
install -m 0755 -d $(DATADEST)
install -m 0755 -d $(DATADEST)data/
install -m 0755 -d $(DATADEST)data/graph/
install -m 0755 -d $(DATADEST)graph/img/
install -m 0644 ./data/mac_vendor $(DATADEST)data/
-   install -m 0644 -d $(DATADEST)graph
+   install -m 0755 -d $(DATADEST)graph
install -m 0644 ./graph/lanmap.header $(DATADEST)graph/
for f in ./graph/img/*.{png,gif,svg}; do install -m 0644 $$f 
$(DATADEST)graph/img/; done

@@ -29,11 +29,11 @@
 
 clean:
rm -f ./src/$(BINARY)
-   cd ./src  make clean
+   cd ./src  $(MAKE) clean
 
 distclean: clean
rm -f Makefile config.cache config.log config.status config.h
 
 debug:
-   cd ./src  make debug
+   cd ./src  $(MAKE) debug