OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Dec-2004 10:44:49
Branch: HEAD Handle: 2004122509444900
Modified files:
openpkg-src/flowtools flowtools.patch flowtools.spec
Log:
cleanup filesystem hierarchy to more strictly comply to the OpenPKG
standards
Summary:
Revision Changes Path
1.8 +48 -0 openpkg-src/flowtools/flowtools.patch
1.9 +4 -1 openpkg-src/flowtools/flowtools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 flowtools.patch
--- openpkg-src/flowtools/flowtools.patch 25 Dec 2004 09:32:22 -0000
1.7
+++ openpkg-src/flowtools/flowtools.patch 25 Dec 2004 09:44:49 -0000
1.8
@@ -1,3 +1,51 @@
+Index: flow-tools-0.67/configs/Makefile.in
+--- flow-tools-0.67/configs/Makefile.in.orig 2004-12-25 10:38:17 +0100
++++ flow-tools-0.67/configs/Makefile.in 2004-12-25 10:40:33 +0100
+@@ -117,10 +117,10 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-ftsymdir = $(localstatedir)/sym
++ftsymdir = $(datadir)
+ ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
+
+-ftcfgdir = $(localstatedir)/cfg
++ftcfgdir = $(sysconfdir)
+ ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
+ subdir = configs
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+Index: flow-tools-0.67/lib/ftpaths.h.in
+--- flow-tools-0.67/lib/ftpaths.h.in.orig 2003-11-11 17:49:14 +0100
++++ flow-tools-0.67/lib/ftpaths.h.in 2004-12-25 10:35:31 +0100
+@@ -29,17 +29,17 @@
+ #ifndef FTPATHS_H
+ #define FTPATHS_H
+
+-#define FT_PATH_CFG_MAP "@localstatedir@/cfg/map.cfg"
+-#define FT_PATH_CFG_TAG "@localstatedir@/cfg/tag.cfg"
+-#define FT_PATH_CFG_FILTER "@localstatedir@/cfg/filter.cfg"
+-#define FT_PATH_CFG_STAT "@localstatedir@/cfg/stat.cfg"
+-#define FT_PATH_CFG_MASK "@localstatedir@/cfg/mask.cfg"
+-#define FT_PATH_CFG_XLATE "@localstatedir@/cfg/xlate.cfg"
++#define FT_PATH_CFG_MAP "@sysconfdir@/map.cfg"
++#define FT_PATH_CFG_TAG "@sysconfdir@/tag.cfg"
++#define FT_PATH_CFG_FILTER "@sysconfdir@/filter.cfg"
++#define FT_PATH_CFG_STAT "@sysconfdir@/stat.cfg"
++#define FT_PATH_CFG_MASK "@sysconfdir@/mask.cfg"
++#define FT_PATH_CFG_XLATE "@sysconfdir@/xlate.cfg"
+
+-#define FT_PATH_SYM_IP_PROT "@localstatedir@/sym/ip-prot.sym"
+-#define FT_PATH_SYM_IP_TYPE "@localstatedir@/sym/ip-type.sym"
+-#define FT_PATH_SYM_TCP_PORT "@localstatedir@/sym/tcp-port.sym"
+-#define FT_PATH_SYM_ASN "@localstatedir@/sym/asn.sym"
+-#define FT_PATH_SYM_TAG "@localstatedir@/sym/tag.sym"
++#define FT_PATH_SYM_IP_PROT "@datadir@/ip-prot.sym"
++#define FT_PATH_SYM_IP_TYPE "@datadir@/ip-type.sym"
++#define FT_PATH_SYM_TCP_PORT "@datadir@/tcp-port.sym"
++#define FT_PATH_SYM_ASN "@datadir@/asn.sym"
++#define FT_PATH_SYM_TAG "@datadir@/tag.sym"
+
+ #endif /* FTPATHS_H */
Index: flow-tools-0.67/configure
--- flow-tools-0.67/configure.orig 2003-12-04 07:19:41 +0100
+++ flow-tools-0.67/configure 2004-12-24 21:23:56 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 flowtools.spec
--- openpkg-src/flowtools/flowtools.spec 25 Dec 2004 09:32:22 -0000
1.8
+++ openpkg-src/flowtools/flowtools.spec 25 Dec 2004 09:44:49 -0000
1.9
@@ -140,8 +140,10 @@
--with-pgsql=%{l_prefix} \
%endif
--prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/flowtools \
--includedir=%{l_prefix}/include/flowtools \
- --localstatedir=%{l_prefix}/var/flowtools
+ --localstatedir=%{l_prefix}/var/flowtools \
+ --datadir=%{l_prefix}/share/flowtools
%{l_make} %{l_mflags -O}
) || exit $?
@@ -223,6 +225,7 @@
%{l_files_std} `cat perl-openpkg-files` \
'%not %dir %{l_prefix}/etc/fsl' \
'%config %{l_prefix}/etc/fsl/fsl.flowtools' \
+ '%config %{l_prefix}/etc/flowtools/*.cfg' \
'%dir %attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/flowtools/db' \
'%dir %attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/flowtools'
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
