[81923] trunk/dports/net/flow-tools

[jmr at macports.org]

Revision: 81923
          http://trac.macports.org/changeset/81923
Author:   jmr at macports.org
Date:     2011-08-06 08:03:39 -0700 (Sat, 06 Aug 2011)
Log Message:
-----------
flow-tools: fix completely broken attempt to substitute ${prefix} into ftpaths.h

Modified Paths:
--------------
    trunk/dports/net/flow-tools/Portfile
    trunk/dports/net/flow-tools/files/patch-ftpaths.h

Modified: trunk/dports/net/flow-tools/Portfile
===================================================================
--- trunk/dports/net/flow-tools/Portfile	2011-08-06 14:56:48 UTC (rev 81922)
+++ trunk/dports/net/flow-tools/Portfile	2011-08-06 15:03:39 UTC (rev 81923)
@@ -34,7 +34,7 @@
 
 post-patch {
 	reinplace "s|__PREFIX__|${prefix}|g" \
-		${filespath}/patch-ftpaths.h
+		${worksrcpath}/lib/ftpaths.h
 
 	reinplace "s|\$WHERE_MYSQL/lib/mysql|\$WHERE_MYSQL/lib/mysql5|g" \
 		${worksrcpath}/configure

Modified: trunk/dports/net/flow-tools/files/patch-ftpaths.h
===================================================================
--- trunk/dports/net/flow-tools/files/patch-ftpaths.h	2011-08-06 14:56:48 UTC (rev 81922)
+++ trunk/dports/net/flow-tools/files/patch-ftpaths.h	2011-08-06 15:03:39 UTC (rev 81923)
@@ -10,23 +10,23 @@
 -#define FT_PATH_CFG_STAT            "/usr/local/netflow/var/cfg/stat.cfg"
 -#define FT_PATH_CFG_MASK            "/usr/local/netflow/var/cfg/mask.cfg"
 -#define FT_PATH_CFG_XLATE           "/usr/local/netflow/var/cfg/xlate.cfg"
-+#define FT_PATH_CFG_MAP             "/opt/local/etc/flow-tools/map.cfg"
-+#define FT_PATH_CFG_TAG             "/opt/local/etc/flow-tools/tag.cfg"
-+#define FT_PATH_CFG_FILTER          "/opt/local/etc/flow-tools/filter.cfg"
-+#define FT_PATH_CFG_STAT            "/opt/local/etc/flow-tools/stat.cfg"
-+#define FT_PATH_CFG_MASK            "/opt/local/etc/flow-tools/mask.cfg"
-+#define FT_PATH_CFG_XLATE           "/opt/local/etc/flow-tools/xlate.cfg"
++#define FT_PATH_CFG_MAP             "__PREFIX__/etc/flow-tools/map.cfg"
++#define FT_PATH_CFG_TAG             "__PREFIX__/etc/flow-tools/tag.cfg"
++#define FT_PATH_CFG_FILTER          "__PREFIX__/etc/flow-tools/filter.cfg"
++#define FT_PATH_CFG_STAT            "__PREFIX__/etc/flow-tools/stat.cfg"
++#define FT_PATH_CFG_MASK            "__PREFIX__/etc/flow-tools/mask.cfg"
++#define FT_PATH_CFG_XLATE           "__PREFIX__/etc/flow-tools/xlate.cfg"
  
 -#define FT_PATH_SYM_IP_PROT         "/usr/local/netflow/var/sym/ip-prot.sym"
 -#define FT_PATH_SYM_IP_TYPE         "/usr/local/netflow/var/sym/ip-type.sym"
 -#define FT_PATH_SYM_TCP_PORT        "/usr/local/netflow/var/sym/tcp-port.sym"
 -#define FT_PATH_SYM_ASN             "/usr/local/netflow/var/sym/asn.sym"
 -#define FT_PATH_SYM_TAG             "/usr/local/netflow/var/sym/tag.sym"
-+#define FT_PATH_SYM_IP_PROT         "/opt/local/share/flow-tools/ip-prot.sym"
-+#define FT_PATH_SYM_IP_TYPE         "/opt/local/share/flow-tools/ip-type.sym"
-+#define FT_PATH_SYM_TCP_PORT        "/opt/local/share/flow-tools/tcp-port.sym"
-+#define FT_PATH_SYM_ASN             "/opt/local/share/flow-tools/asn.sym"
-+#define FT_PATH_SYM_TAG             "/opt/local/share/flow-tools/tag.sym"
++#define FT_PATH_SYM_IP_PROT         "__PREFIX__/share/flow-tools/ip-prot.sym"
++#define FT_PATH_SYM_IP_TYPE         "__PREFIX__/share/flow-tools/ip-type.sym"
++#define FT_PATH_SYM_TCP_PORT        "__PREFIX__/share/flow-tools/tcp-port.sym"
++#define FT_PATH_SYM_ASN             "__PREFIX__/share/flow-tools/asn.sym"
++#define FT_PATH_SYM_TAG             "__PREFIX__/share/flow-tools/tag.sym"
  
  #endif /* FTPATHS_H */
 --- lib/ftpaths.h.in.orig	Tue Nov 11 08:49:14 2003
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110806/93d608ef/attachment.html>