From baptiste.daroussin@gmail.com  Fri Jan 30 11:45:15 2009
Return-Path: <baptiste.daroussin@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DBBFF106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Jan 2009 11:45:15 +0000 (UTC)
	(envelope-from baptiste.daroussin@gmail.com)
Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.157])
	by mx1.freebsd.org (Postfix) with ESMTP id 579338FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Jan 2009 11:45:15 +0000 (UTC)
	(envelope-from baptiste.daroussin@gmail.com)
Received: by fg-out-1718.google.com with SMTP id 13so331697fge.8
        for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Jan 2009 03:45:14 -0800 (PST)
Received: by 10.223.116.77 with SMTP id l13mr920771faq.106.1233314686830;
        Fri, 30 Jan 2009 03:24:46 -0800 (PST)
Received: from wicklow.lan (stc92-3-82-245-249-89.fbx.proxad.net [82.245.249.89])
        by mx.google.com with ESMTPS id p17sm710594fka.10.2009.01.30.03.24.46
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Fri, 30 Jan 2009 03:24:46 -0800 (PST)
Received: by wicklow.lan (Postfix, from userid 0)
	id D717FF198A; Fri, 30 Jan 2009 12:24:44 +0100 (CET)
Message-Id: <20090130112444.D717FF198A@wicklow.lan>
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: [MAINTAINER] net-mgmt/lanmap: fix plist and use /tmp as tmpdir
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         131154
>Category:       ports
>Synopsis:       [MAINTAINER] net-mgmt/lanmap: fix plist and use /tmp as tmpdir
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jadawin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 30 11:50:02 UTC 2009
>Closed-Date:    Mon Feb 02 09:50:48 UTC 2009
>Last-Modified:  Mon Feb  2 10:00:10 UTC 2009
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->jadawin 
Responsible-Changed-By: jadawin 
Responsible-Changed-When: Fri Jan 30 12:47:20 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131154 
State-Changed-From-To: open->closed 
State-Changed-By: jadawin 
State-Changed-When: Mon Feb 2 09:50:47 UTC 2009 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131154 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/131154: commit references a PR
Date: Mon,  2 Feb 2009 09:50:40 +0000 (UTC)

 jadawin     2009-02-02 09:50:21 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/lanmap      Makefile pkg-plist 
     net-mgmt/lanmap/files patch-Makefile.in 
   Added files:
     net-mgmt/lanmap/files patch-src__Makefile.in 
                           patch-src__facts.c 
   Log:
   - Fix pkg-plist
   - Add new patches
   - Bump PORTREVISION
   
   PR:             ports/131154
   Submitted by:   bapt <baptiste.daroussin _AT_ gmail.com> (maintainer)
   
   Revision  Changes    Path
   1.2       +1 -0      ports/net-mgmt/lanmap/Makefile
   1.2       +14 -2     ports/net-mgmt/lanmap/files/patch-Makefile.in
   1.1       +10 -0     ports/net-mgmt/lanmap/files/patch-src__Makefile.in (new)
   1.1       +11 -0     ports/net-mgmt/lanmap/files/patch-src__facts.c (new)
   1.2       +27 -27    ports/net-mgmt/lanmap/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
