Date: Fri, 30 Jan 2009 12:24:44 +0100 (CET) From: bapt <baptiste.daroussin@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jadawin@FreeBSD.org Subject: ports/131154: [MAINTAINER] net-mgmt/lanmap: fix plist and use /tmp as tmpdir Message-ID: <20090130112444.D717FF198A@wicklow.lan> Resent-Message-ID: <200901301150.n0UBo21E044000@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 131154
>Category: ports
>Synopsis: [MAINTAINER] net-mgmt/lanmap: fix plist and use /tmp as tmpdir
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 30 11:50:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: bapt
>Release: FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD wicklow.lan 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #7: Mon Oct 13 22:58:33 CEST 2008
>Description:
[DESCRIBE CHANGES]
Fix pkg-plist (use %%DATADIR%%)
Path to use /tmp as temporary data repository
Added file(s):
- files/patch-src__Makefile.in
- files/patch-src__facts.c
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- lanmap-2006.03.07.r81.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-mgmt/lanmap/files/patch-Makefile.in /usr/portsdev/ports/net-mgmt/lanmap/files/patch-Makefile.in
--- /usr/ports/net-mgmt/lanmap/files/patch-Makefile.in 2008-08-25 09:26:07.000000000 +0200
+++ /usr/portsdev/ports/net-mgmt/lanmap/files/patch-Makefile.in 2009-01-29 17:49:32.651468000 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/net-mgmt/lanmap/files/patch-src__Makefile.in /usr/portsdev/ports/net-mgmt/lanmap/files/patch-src__Makefile.in
--- /usr/ports/net-mgmt/lanmap/files/patch-src__Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ /usr/portsdev/ports/net-mgmt/lanmap/files/patch-src__Makefile.in 2009-01-29 17:49:32.671463000 +0100
@@ -0,0 +1,11 @@
+--- ./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 @@
+ # $Id$
+
+ # 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 -ruN --exclude=CVS /usr/ports/net-mgmt/lanmap/files/patch-src__facts.c /usr/portsdev/ports/net-mgmt/lanmap/files/patch-src__facts.c
--- /usr/ports/net-mgmt/lanmap/files/patch-src__facts.c 1970-01-01 01:00:00.000000000 +0100
+++ /usr/portsdev/ports/net-mgmt/lanmap/files/patch-src__facts.c 2009-01-29 17:49:32.700453000 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/net-mgmt/lanmap/pkg-plist /usr/portsdev/ports/net-mgmt/lanmap/pkg-plist
--- /usr/ports/net-mgmt/lanmap/pkg-plist 2008-08-25 09:26:07.000000000 +0200
+++ /usr/portsdev/ports/net-mgmt/lanmap/pkg-plist 2009-01-30 12:14:46.581293813 +0100
@@ -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%%
--- lanmap-2006.03.07.r81.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090130112444.D717FF198A>