diff options
author | joerg <joerg> | 2006-04-12 19:40:51 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-04-12 19:40:51 +0000 |
commit | 55e1706dd1f3a2e7df2c4983c562571872d4b89a (patch) | |
tree | 3cf7122a87c3835133622e9588740060e6933905 /security/libprelude/patches | |
parent | 912a1078a54d96f86736d7f3c7c7856952214501 (diff) | |
download | pkgsrc-55e1706dd1f3a2e7df2c4983c562571872d4b89a.tar.gz |
Use configuration file framework. Bump revision.
Diffstat (limited to 'security/libprelude/patches')
-rw-r--r-- | security/libprelude/patches/patch-ac | 130 |
1 files changed, 55 insertions, 75 deletions
diff --git a/security/libprelude/patches/patch-ac b/security/libprelude/patches/patch-ac index 46d1d5fb241..067c0b25a12 100644 --- a/security/libprelude/patches/patch-ac +++ b/security/libprelude/patches/patch-ac @@ -1,104 +1,84 @@ -$NetBSD: patch-ac,v 1.1.1.1 2006/01/29 15:54:04 shannonjr Exp $ +$NetBSD: patch-ac,v 1.2 2006/04/12 19:40:51 joerg Exp $ ---- Makefile.in.orig 2005-12-13 12:36:41.000000000 -0700 +--- Makefile.in.orig 2006-03-09 13:08:17.000000000 +0000 +++ Makefile.in -@@ -827,71 +827,71 @@ prelude-config.h: $(top_builddir)/config - # Spool directory for report saving is mode +@@ -299,7 +299,7 @@ mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + prelude_adduser_libs = @prelude_adduser_libs@ +-prelude_config_dir = @prelude_config_dir@ ++prelude_config_dir = $(prefix)/share/examples/libprelude + prelude_ident_file = @prelude_ident_file@ + prelude_spool_dir = @prelude_spool_dir@ + program_transform_name = @program_transform_name@ +@@ -833,64 +833,12 @@ prelude-config.h: $(top_builddir)/config install-data-local: -- $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_spool_dir); + $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_spool_dir); - $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir); - $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/default; - $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/profile; - @if test -f $(DESTDIR)$(prelude_config_dir)/default/client.conf; then \ -+ $(INSTALL) -d -m 755 $(prelude_spool_dir); -+ $(INSTALL) -d -m 755 $(prelude_config_dir); -+ $(INSTALL) -d -m 755 $(prelude_config_dir)/default; -+ $(INSTALL) -d -m 755 $(prelude_config_dir)/profile; -+ @if test -f $(prelude_config_dir)/default/client.conf; then \ - echo; \ - echo "********************************************************************************"; \ - echo; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ - echo "$(DESTDIR)$(prelude_config_dir)/default/client.conf already exist..."; \ - echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist"; \ -+ echo "$(prelude_config_dir)/default/client.conf already exist..."; \ -+ echo "Installing default configuration in $(prelude_config_dir)/default/client.conf-dist"; \ - echo; \ - echo "********************************************************************************"; \ - echo; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ - $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist; \ -+ $(INSTALL) -m 644 $(top_srcdir)/client.conf $(prelude_config_dir)/default/client.conf-dist; \ - else \ +- else \ - $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default; \ -+ $(INSTALL) -m 644 $(top_srcdir)/client.conf $(prelude_config_dir)/default; \ - fi - +- fi +- - @if test -f $(DESTDIR)$(prelude_config_dir)/default/global.conf; then \ -+ @if test -f $(prelude_config_dir)/default/global.conf; then \ - echo; \ - echo "********************************************************************************"; \ - echo; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ - echo "$(DESTDIR)$(prelude_config_dir)/default/global.conf already exist..."; \ - echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist"; \ -+ echo "$(prelude_config_dir)/default/global.conf already exist..."; \ -+ echo "Installing default configuration in $(prelude_config_dir)/default/global.conf-dist"; \ - echo; \ - echo "********************************************************************************"; \ - echo; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ - $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist; \ -+ $(INSTALL) -m 644 $(top_srcdir)/global.conf $(prelude_config_dir)/default/global.conf-dist; \ - else \ +- else \ - $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default; \ -+ $(INSTALL) -m 644 $(top_srcdir)/global.conf $(prelude_config_dir)/default; \ - fi - +- fi +- - @if test -f $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf; then \ -+ @if test -f $(prelude_config_dir)/default/idmef-client.conf; then \ - echo; \ - echo "********************************************************************************"; \ - echo; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ - echo "$(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf already exist..."; \ - echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist"; \ -+ echo "$(prelude_config_dir)/default/idmef-client.conf already exist..."; \ -+ echo "Installing default configuration in $(prelude_config_dir)/default/idmef-client.conf-dist"; \ - echo; \ - echo "********************************************************************************"; \ - echo; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ - $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist; \ -+ $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(prelude_config_dir)/default/idmef-client.conf-dist; \ - else \ +- else \ - $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default; \ -+ $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(prelude_config_dir)/default; \ - fi - +- fi +- - @if test -f $(DESTDIR)$(prelude_config_dir)/default/tls.conf; then \ -+ @if test -f $(prelude_config_dir)/default/tls.conf; then \ - echo; \ - echo "********************************************************************************"; \ - echo; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ - echo "$(DESTDIR)$(prelude_config_dir)/default/tls.conf already exist..."; \ - echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist"; \ -+ echo "$(prelude_config_dir)/default/tls.conf already exist..."; \ -+ echo "Installing default configuration in $(prelude_config_dir)/default/tls.conf-dist"; \ - echo; \ - echo "********************************************************************************"; \ - echo; \ +- echo; \ +- echo "********************************************************************************"; \ +- echo; \ - $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist; \ -+ $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(prelude_config_dir)/default/tls.conf-dist; \ - else \ +- else \ - $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default; \ -+ $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(prelude_config_dir)/default; \ - fi +- fi ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prelude_config_dir); ++ $(BSD_INSTALL_DATA) $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir) ++ $(BSD_INSTALL_DATA) $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir) ++ $(BSD_INSTALL_DATA) $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir) ++ $(BSD_INSTALL_DATA) $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir) ++ $(BSD_INSTALL_DATA) $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir) uninstall-local: -- rm -f $(DESTDIR)$(prelude_config_dir)/default/client.conf -- rm -f $(DESTDIR)$(prelude_config_dir)/default/global.conf -- rm -f $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf -- rm -f $(DESTDIR)$(prelude_config_dir)/default/tls.conf -+ rm -f $(prelude_config_dir)/default/client.conf -+ rm -f $(prelude_config_dir)/default/global.conf -+ rm -f $(prelude_config_dir)/default/idmef-client.conf -+ rm -f $(prelude_config_dir)/default/tls.conf - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: + rm -f $(DESTDIR)$(prelude_config_dir)/default/client.conf |