Commits

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

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@81923 d073be05-634f-4543-b044-5fe20cf6d1d6
No tags
e8536110b30
master

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

Modified
3 3 @@ -29,17 +29,17 @@
4 4 #ifndef FTPATHS_H
5 5 #define FTPATHS_H
6 6
7 7 -#define FT_PATH_CFG_MAP "/usr/local/netflow/var/cfg/map.cfg"
8 8 -#define FT_PATH_CFG_TAG "/usr/local/netflow/var/cfg/tag.cfg"
9 9 -#define FT_PATH_CFG_FILTER "/usr/local/netflow/var/cfg/filter.cfg"
10 10 -#define FT_PATH_CFG_STAT "/usr/local/netflow/var/cfg/stat.cfg"
11 11 -#define FT_PATH_CFG_MASK "/usr/local/netflow/var/cfg/mask.cfg"
12 12 -#define FT_PATH_CFG_XLATE "/usr/local/netflow/var/cfg/xlate.cfg"
13 -+#define FT_PATH_CFG_MAP "/opt/local/etc/flow-tools/map.cfg"
14 -+#define FT_PATH_CFG_TAG "/opt/local/etc/flow-tools/tag.cfg"
15 -+#define FT_PATH_CFG_FILTER "/opt/local/etc/flow-tools/filter.cfg"
16 -+#define FT_PATH_CFG_STAT "/opt/local/etc/flow-tools/stat.cfg"
17 -+#define FT_PATH_CFG_MASK "/opt/local/etc/flow-tools/mask.cfg"
18 -+#define FT_PATH_CFG_XLATE "/opt/local/etc/flow-tools/xlate.cfg"
13 ++#define FT_PATH_CFG_MAP "__PREFIX__/etc/flow-tools/map.cfg"
14 ++#define FT_PATH_CFG_TAG "__PREFIX__/etc/flow-tools/tag.cfg"
15 ++#define FT_PATH_CFG_FILTER "__PREFIX__/etc/flow-tools/filter.cfg"
16 ++#define FT_PATH_CFG_STAT "__PREFIX__/etc/flow-tools/stat.cfg"
17 ++#define FT_PATH_CFG_MASK "__PREFIX__/etc/flow-tools/mask.cfg"
18 ++#define FT_PATH_CFG_XLATE "__PREFIX__/etc/flow-tools/xlate.cfg"
19 19
20 20 -#define FT_PATH_SYM_IP_PROT "/usr/local/netflow/var/sym/ip-prot.sym"
21 21 -#define FT_PATH_SYM_IP_TYPE "/usr/local/netflow/var/sym/ip-type.sym"
22 22 -#define FT_PATH_SYM_TCP_PORT "/usr/local/netflow/var/sym/tcp-port.sym"
23 23 -#define FT_PATH_SYM_ASN "/usr/local/netflow/var/sym/asn.sym"
24 24 -#define FT_PATH_SYM_TAG "/usr/local/netflow/var/sym/tag.sym"
25 -+#define FT_PATH_SYM_IP_PROT "/opt/local/share/flow-tools/ip-prot.sym"
26 -+#define FT_PATH_SYM_IP_TYPE "/opt/local/share/flow-tools/ip-type.sym"
27 -+#define FT_PATH_SYM_TCP_PORT "/opt/local/share/flow-tools/tcp-port.sym"
28 -+#define FT_PATH_SYM_ASN "/opt/local/share/flow-tools/asn.sym"
29 -+#define FT_PATH_SYM_TAG "/opt/local/share/flow-tools/tag.sym"
25 ++#define FT_PATH_SYM_IP_PROT "__PREFIX__/share/flow-tools/ip-prot.sym"
26 ++#define FT_PATH_SYM_IP_TYPE "__PREFIX__/share/flow-tools/ip-type.sym"
27 ++#define FT_PATH_SYM_TCP_PORT "__PREFIX__/share/flow-tools/tcp-port.sym"
28 ++#define FT_PATH_SYM_ASN "__PREFIX__/share/flow-tools/asn.sym"
29 ++#define FT_PATH_SYM_TAG "__PREFIX__/share/flow-tools/tag.sym"
30 30
31 31 #endif /* FTPATHS_H */
32 32 --- lib/ftpaths.h.in.orig Tue Nov 11 08:49:14 2003
33 33 +++ lib/ftpaths.h.in Wed Jul 7 15:05:45 2004
34 34 @@ -29,17 +29,17 @@
35 35 #ifndef FTPATHS_H
36 36 #define FTPATHS_H
37 37
38 38 -#define FT_PATH_CFG_MAP "@localstatedir@/cfg/map.cfg"
39 39 -#define FT_PATH_CFG_TAG "@localstatedir@/cfg/tag.cfg"

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut