- Fix run-time linking problems of the dependent ports by installing libtool

  archives (.la) files - switch to USE_LIBTOOL=libtool:15:inc
- Add a patch to avoid overwriting existing configuration files
- Bump PORTREVISION

PR:		ports/93498
Submitted by:	Robin Gruyters (maintainer)

3 files changed, 79 insertions, 9 deletions

diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index cb172eb88b8a..f749f1680e0c 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -5,6 +5,7 @@
 
 PORTNAME=	libprelude
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/
 
@@ -16,7 +17,7 @@ LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls
 USE_GPG=		yes
 SIG_SUFFIX=		.sig
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_AUTOTOOLS=		libtool:15:inc
 INSTALLS_SHLIB=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--localstatedir=/var
diff --git a/security/libprelude/files/patch-Makefile.in b/security/libprelude/files/patch-Makefile.in
index d8fed7d7d917..d3ad9f9322cf 100644
--- a/security/libprelude/files/patch-Makefile.in
+++ b/security/libprelude/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue Jan 10 16:15:30 2006
-+++ Makefile.in	Tue Jan 10 16:15:49 2006
-@@ -308,7 +308,7 @@
+--- Makefile.in.orig	Sat Jan 28 18:06:10 2006
++++ Makefile.in	Mon Jan 30 15:04:06 2006
+@@ -310,7 +310,7 @@
  target_vendor = @target_vendor@
  DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
  ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
@@ -9,3 +9,72 @@
  EXTRA_DIST = HACKING.README LICENSE.README client.conf global.conf idmef-client.conf tls.conf
  bin_SCRIPTS = $(top_builddir)/libprelude-config
  distuninstallcheck_listfiles = find . -type f -print | grep -v 'perl' | grep -v '3pm'
+@@ -832,61 +832,13 @@
+ 	$(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							\
+-		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;														\
+-                echo "********************************************************************************";			\
+-		echo;														\
+-		$(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist;		\
+-        else															\
+-                $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default;				\
+-        fi
+-
+-	@if test -f $(DESTDIR)$(prelude_config_dir)/default/global.conf; then							\
+-		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;														\
+-                echo "********************************************************************************";			\
+-		echo;														\
+-		$(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist;		\
+-        else															\
+-                $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default;				\
+-        fi															
+-
+-	@if test -f $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf; then						\
+-		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;														\
+-                echo "********************************************************************************";			\
+-		echo;														\
+-		$(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist; \
+-        else															\
+-                $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default;			\
+-        fi
+-
+-	@if test -f $(DESTDIR)$(prelude_config_dir)/default/tls.conf; then							\
+-		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;														\
+-                echo "********************************************************************************";			\
+-		echo;														\
+-		$(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist;			\
+-        else															\
+-                $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default;				\
+-	fi
++	$(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist;
++
++	$(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist;
++
++	$(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist;
++
++	$(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist;
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(prelude_config_dir)/default/client.conf
diff --git a/security/libprelude/pkg-plist b/security/libprelude/pkg-plist
index 0a3233b8a573..5864b8bd828b 100644
--- a/security/libprelude/pkg-plist
+++ b/security/libprelude/pkg-plist
@@ -1,10 +1,10 @@
 @comment $FreeBSD$
 bin/libprelude-config
 bin/prelude-adduser
-etc/prelude/default/client.conf
-etc/prelude/default/global.conf
-etc/prelude/default/idmef-client.conf
-etc/prelude/default/tls.conf
+etc/prelude/default/client.conf-dist
+etc/prelude/default/global.conf-dist
+etc/prelude/default/idmef-client.conf-dist
+etc/prelude/default/tls.conf-dist
 include/libprelude/common.h
 include/libprelude/daemonize.h
 include/libprelude/idmef-additional-data.h
@@ -50,7 +50,7 @@ include/libprelude/prelude-thread.h
 include/libprelude/prelude-timer.h
 include/libprelude/prelude.h
 include/libprelude/variable.h
-lib/libprelude.a
+lib/libprelude.la
 lib/libprelude.so
 lib/libprelude.so.6
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm