Changeset 81923

Timestamp:

08/06/11 08:03:39 (4 years ago)

Author:

jmr@…

Message:

flow-tools: fix completely broken attempt to substitute ${prefix} into ftpaths.h

Location:

trunk/dports/net/flow-tools

Files:

• Portfile (modified) (1 diff)
• files/patch-ftpaths.h (modified) (2 diffs)

trunk/dports/net/flow-tools/Portfile

@@ -35 +35 @@
 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" \

trunk/dports/net/flow-tools/files/patch-ftpaths.h

@@ -11 +11 @@
 -#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"
@@ -23 +23 @@
 -#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 */