4 files changed, 78 insertions, 14 deletions

diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 641484432acd..3bd0c6536834 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 
 PORTNAME=	libprelude
-PORTVERSION=	0.9.12.2
+PORTVERSION=	0.9.13
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 		http://www.prelude-ids.org/download/releases/old/
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index ac65ae9c4778..991cd224ba94 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1,3 +1,3 @@
-MD5 (libprelude-0.9.12.2.tar.gz) = 4636cf21c3e96adbd9463138fb49f401
-SHA256 (libprelude-0.9.12.2.tar.gz) = fa6fbb37cb95d2425eedc471cae0b66fb32b8898da1e64d185249668940ee95d
-SIZE (libprelude-0.9.12.2.tar.gz) = 1847787
+MD5 (libprelude-0.9.13.tar.gz) = 10c356bcd13f9a8ddacddd33eb555aa4
+SHA256 (libprelude-0.9.13.tar.gz) = 1509dd1b01ed2bac8eaadc00879eff07b401b8d7e371bcefef071ee751bf2ed2
+SIZE (libprelude-0.9.13.tar.gz) = 1889947
diff --git a/security/libprelude/files/patch-Makefile.in b/security/libprelude/files/patch-Makefile.in
index d3ad9f9322cf..9abd95397585 100644
--- a/security/libprelude/files/patch-Makefile.in
+++ b/security/libprelude/files/patch-Makefile.in
@@ -1,15 +1,17 @@
---- Makefile.in.orig	Sat Jan 28 18:06:10 2006
-+++ Makefile.in	Mon Jan 30 15:04:06 2006
-@@ -310,7 +310,7 @@
+--- Makefile.in.orig	Tue Feb 20 14:15:56 2007
++++ Makefile.in	Thu Feb 22 13:47:30 2007
+@@ -430,8 +430,8 @@
  target_vendor = @target_vendor@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --without-system-ltdl
  ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
--SUBDIRS = libltdl libmissing m4 src prelude-adduser bindings docs
-+SUBDIRS = libltdl libmissing m4 src prelude-adduser bindings
+-@HAVE_SYSTEM_LIBLTDL_FALSE@SUBDIRS = libmissing m4 src prelude-adduser bindings docs
+-@HAVE_SYSTEM_LIBLTDL_TRUE@SUBDIRS = libltdl libmissing m4 src prelude-adduser bindings docs
++@HAVE_SYSTEM_LIBLTDL_FALSE@SUBDIRS = libmissing m4 src prelude-adduser bindings
++@HAVE_SYSTEM_LIBLTDL_TRUE@SUBDIRS = libltdl libmissing m4 src prelude-adduser bindings
  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 @@
+@@ -953,61 +953,10 @@
  	$(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;
@@ -69,11 +71,8 @@
 -                $(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:
diff --git a/security/libprelude/files/patch-libmissing_Makefile.in b/security/libprelude/files/patch-libmissing_Makefile.in
new file mode 100644
index 000000000000..ba58b13e6994
--- /dev/null
+++ b/security/libprelude/files/patch-libmissing_Makefile.in
@@ -0,0 +1,65 @@
+--- libmissing/Makefile.in.orig	Tue Feb 20 14:15:54 2007
++++ libmissing/Makefile.in	Thu Feb 22 15:27:37 2007
+@@ -447,7 +447,7 @@
+ 	sys/time.h sys/time.h-t time.h time.h-t wchar.h wchar.h-t \
+ 	wctype.h wctype.h-t
+ MOSTLYCLEANDIRS = arpa netinet sys sys
+-CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
++CLEANFILES = configmake.h configmake.h-t ref-add.sed \
+ 	ref-del.sed
+ DISTCLEANFILES = 
+ MAINTAINERCLEANFILES = 
+@@ -465,8 +465,6 @@
+ 	printf-args.c printf-parse.c vasnprintf.c vsnprintf.c
+ libmissing_la_LDFLAGS = $(AM_LDFLAGS)
+ LINK_WARNING_H = $(top_srcdir)/./link-warning.h
+-charset_alias = $(DESTDIR)$(libdir)/charset.alias
+-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+@@ -833,44 +831,6 @@
+ 	} | sed '/""/d' > $@-t
+ 	mv $@-t $@
+ 
+-# We need the following in order to install a simple file in $(libdir)
+-# which is shared with other installed packages. We use a list of referencing
+-# packages so that "make uninstall" will remove the file if and only if it
+-# is not used by another installed package.
+-# On systems with glibc-2.1 or newer, the file is redundant, therefore we
+-# avoid installing it.
+-
+-all-local: charset.alias ref-add.sed ref-del.sed
+-install-exec-local: all-local
+-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
+-	if test -f $(charset_alias); then \
+-	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+-	  rm -f $(charset_tmp) ; \
+-	else \
+-	  if test $(GLIBC21) = no; then \
+-	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+-	    rm -f $(charset_tmp) ; \
+-	  fi ; \
+-	fi
+-
+-uninstall-local: all-local
+-	if test -f $(charset_alias); then \
+-	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+-	  if grep '^# Packages using this file: $$' $(charset_tmp) \
+-	      > /dev/null; then \
+-	    rm -f $(charset_alias); \
+-	  else \
+-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+-	  fi; \
+-	  rm -f $(charset_tmp); \
+-	fi
+-
+-charset.alias: config.charset
+-	rm -f t-$@ $@
+-	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
+-	mv t-$@ $@
+ .sin.sed:
+ 	rm -f t-$@ $@
+ 	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@