5 files changed, 63 insertions, 29 deletions

diff --git a/net-mgmt/lanmap/Makefile b/net-mgmt/lanmap/Makefile
index 7547753b6fd2..5ebfb027e4c2 100644
--- a/net-mgmt/lanmap/Makefile
+++ b/net-mgmt/lanmap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lanmap
 DISTVERSION=	2006-03-07-rev81
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.parseerror.com/lanmap/rev/
 
diff --git a/net-mgmt/lanmap/files/patch-Makefile.in b/net-mgmt/lanmap/files/patch-Makefile.in
index c70ed52a8a5b..0c4fd43b67e5 100644
--- a/net-mgmt/lanmap/files/patch-Makefile.in
+++ b/net-mgmt/lanmap/files/patch-Makefile.in
@@ -1,6 +1,18 @@
 --- ./Makefile.in.orig	2006-03-07 15:44:34.000000000 +0100
-+++ ./Makefile.in	2008-08-21 18:28:55.665610617 +0200
-@@ -21,7 +21,7 @@
++++ ./Makefile.in	2009-01-29 17:49:24.121891519 +0100
+@@ -8,9 +8,10 @@
+ BINARY = lanmap
+ BINDEST = ${prefix}/bin/
+ DATADEST = ${prefix}/share/lanmap/
++TMPDEST ?= /tmp
+ 
+ all:
+-	cd ./src && make LANMAP_DATADIR="$(DATADEST)"
++	cd ./src && make LANMAP_DATADIR="$(DATADEST)" LANMAP_DATATMP="$(TMPDEST)"
+ 
+ install:
+ 	install -m 0755 ./src/$(BINARY) $(BINDEST)
+@@ -21,7 +22,7 @@
  	install -m 0644 ./data/mac_vendor $(DATADEST)data/
  	install -m 0644 -d $(DATADEST)graph
  	install -m 0644 ./graph/lanmap.header $(DATADEST)graph/
diff --git a/net-mgmt/lanmap/files/patch-src__Makefile.in b/net-mgmt/lanmap/files/patch-src__Makefile.in
new file mode 100644
index 000000000000..5a891ab7eec6
--- /dev/null
+++ b/net-mgmt/lanmap/files/patch-src__Makefile.in
@@ -0,0 +1,10 @@
+--- ./src/Makefile.in.orig	2006-03-07 15:44:32.000000000 +0100
++++ ./src/Makefile.in	2009-01-29 17:46:58.458249446 +0100
+@@ -2,7 +2,7 @@
+ 
+ # complation
+-CFLAGS = -W -Wall -Wno-unused -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR)
++CFLAGS = -W -Wall -Wno-unused -DLINUX -DLANMAP_DATADIR=$(LANMAP_DATADIR) -DLANMAP_DATATMP=$(LANMAP_DATATMP)
+ LDFLAGS = -lpcap -lm
+ CFLAGS_DEBUG = -D_DEBUG -ggdb
+ LDFLAGS_DEBUG = -pg
diff --git a/net-mgmt/lanmap/files/patch-src__facts.c b/net-mgmt/lanmap/files/patch-src__facts.c
new file mode 100644
index 000000000000..9aa01bdf02ef
--- /dev/null
+++ b/net-mgmt/lanmap/files/patch-src__facts.c
@@ -0,0 +1,11 @@
+--- ./src/facts.c.orig	2006-03-07 15:44:32.000000000 +0100
++++ ./src/facts.c	2009-01-29 17:46:58.478243916 +0100
+@@ -2563,7 +2563,7 @@
+ #else
+ 		/* assume sh */
+ 		snprintf(cmd, sizeof cmd, "%s -T%s -o %s/tmp.lanmap %s && mv %s/tmp.lanmap %slanmap.%s && rm %s",
+-			Run_Program, Image_Type, xstr(LANMAP_DATADIR), DOT_FILE, xstr(LANMAP_DATADIR), Output_Dir, Image_Type, DOT_FILE);
++			Run_Program, Image_Type, xstr(LANMAP_DATATMP), DOT_FILE, xstr(LANMAP_DATATMP), Output_Dir, Image_Type, DOT_FILE);
+ #endif
+ 		printf("cmd:%s\n",cmd);
+ 		DEBUGF(__FILE__, __LINE__, "cmd: %s", cmd);
diff --git a/net-mgmt/lanmap/pkg-plist b/net-mgmt/lanmap/pkg-plist
index f1c1ee8b3973..5203d4aedda6 100644
--- a/net-mgmt/lanmap/pkg-plist
+++ b/net-mgmt/lanmap/pkg-plist
@@ -1,28 +1,28 @@
 bin/lanmap
-share/lanmap/data/mac_vendor
-share/lanmap/graph/img/bridge.gif
-share/lanmap/graph/img/bridge.png
-share/lanmap/graph/img/bridge.svg
-share/lanmap/graph/img/cloud.gif
-share/lanmap/graph/img/cloud.png
-share/lanmap/graph/img/cloud.svg
-share/lanmap/graph/img/desktop.gif
-share/lanmap/graph/img/desktop.png
-share/lanmap/graph/img/desktop.svg
-share/lanmap/graph/img/printer.gif
-share/lanmap/graph/img/printer.png
-share/lanmap/graph/img/printer.svg
-share/lanmap/graph/img/router.gif
-share/lanmap/graph/img/router.png
-share/lanmap/graph/img/router.svg
-share/lanmap/graph/img/server.gif
-share/lanmap/graph/img/server.png
-share/lanmap/graph/img/server.svg
-share/lanmap/graph/img/switch.gif
-share/lanmap/graph/img/switch.png
-share/lanmap/graph/lanmap.header
-@dirrm share/lanmap/graph/img
-@dirrm share/lanmap/graph
-@dirrm share/lanmap/data/graph
-@dirrm share/lanmap/data
-@dirrm share/lanmap
+%%DATADIR%%/data/mac_vendor
+%%DATADIR%%/graph/img/bridge.gif
+%%DATADIR%%/graph/img/bridge.png
+%%DATADIR%%/graph/img/bridge.svg
+%%DATADIR%%/graph/img/cloud.gif
+%%DATADIR%%/graph/img/cloud.png
+%%DATADIR%%/graph/img/cloud.svg
+%%DATADIR%%/graph/img/desktop.gif
+%%DATADIR%%/graph/img/desktop.png
+%%DATADIR%%/graph/img/desktop.svg
+%%DATADIR%%/graph/img/printer.gif
+%%DATADIR%%/graph/img/printer.png
+%%DATADIR%%/graph/img/printer.svg
+%%DATADIR%%/graph/img/router.gif
+%%DATADIR%%/graph/img/router.png
+%%DATADIR%%/graph/img/router.svg
+%%DATADIR%%/graph/img/server.gif
+%%DATADIR%%/graph/img/server.png
+%%DATADIR%%/graph/img/server.svg
+%%DATADIR%%/graph/img/switch.gif
+%%DATADIR%%/graph/img/switch.png
+%%DATADIR%%/graph/lanmap.header
+@dirrm %%DATADIR%%/graph/img
+@dirrm %%DATADIR%%/graph
+@dirrm %%DATADIR%%/data/graph
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%