Remove patch-aa, it's a nop. Remove MAKE_DIRS for an entry that also has

MAKE_DIRS_PERMS. Add user-destdir support.

4 files changed, 9 insertions, 23 deletions

diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index c4034be1460..e708ab100a1 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2011/04/22 13:44:38 obache Exp $
+# $NetBSD: Makefile,v 1.30 2011/11/11 18:58:13 joerg Exp $
 #
 
 DISTNAME=		prelude-lml-0.9.15
@@ -10,6 +10,8 @@ MAINTAINER=		shannonjr@NetBSD.org
 HOMEPAGE=		http://www.prelude-ids.org/
 COMMENT=		Log analyzer monitoring your logfile and received syslog messages
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 PRELUDE_USER?=		_prelude
@@ -39,7 +41,6 @@ PKG_USERS=		${PRELUDE_USER}:${PRELUDE_GROUP}
 
 EGDIR=			${PREFIX}/share/examples/prelude-lml
 REQD_DIRS=		${EGDIR} ${PKG_SYSCONFDIR}/ruleset
-MAKE_DIRS+=		${VARBASE}/prelude-lml
 MAKE_DIRS_PERMS+=	${VARBASE}/prelude-lml	${PRELUDE_USER} ${PRELUDE_GROUP} 0700
 
 PKG_GECOS.${PRELUDE_USER}=	Prelude IDS
@@ -160,8 +161,7 @@ post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o run-prelude-lml run-prelude-lml.c
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/run-prelude-lml ${PREFIX}/sbin/run-prelude-lml
-	${CHOWN} -R ${PRELUDE_USER}:${PRELUDE_GROUP} ${PRELUDE_HOME}
+	${INSTALL_PROGRAM} ${WRKSRC}/run-prelude-lml ${DESTDIR}${PREFIX}/sbin/run-prelude-lml
 
 .include "../../security/libprelude/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/security/prelude-lml/distinfo b/security/prelude-lml/distinfo
index bcf3bc2b6f1..d1b9b0d9ac2 100644
--- a/security/prelude-lml/distinfo
+++ b/security/prelude-lml/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.16 2009/08/23 19:49:28 hasso Exp $
+$NetBSD: distinfo,v 1.17 2011/11/11 18:58:13 joerg Exp $
 
 SHA1 (prelude-lml-0.9.15.tar.gz) = 96f2f0d029dd75ca047bc0839f14418ddc1b5975
 RMD160 (prelude-lml-0.9.15.tar.gz) = 2dffcf6f4470e78fa0cf911c6ad801074ab1e793
 Size (prelude-lml-0.9.15.tar.gz) = 1018513 bytes
-SHA1 (patch-aa) = 9b7fbb9499b8e2abbf67d548292d8393d0e603fc
-SHA1 (patch-ab) = 31b02ae4bf29d6495268f203e512e5a18d6967ff
+SHA1 (patch-ab) = 62ef692dc3e1767de73629a736883c9bc6ef1264
 SHA1 (patch-ac) = 0980dcf3d203ad759997bd3d1efb36ea6722a4af
 SHA1 (patch-ad) = ff6978d5975e4a410a8a9206d0a395ada5b4dbdf
diff --git a/security/prelude-lml/patches/patch-aa b/security/prelude-lml/patches/patch-aa
deleted file mode 100644
index 7b8c7281f10..00000000000
--- a/security/prelude-lml/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2009/08/23 19:49:28 hasso Exp $
-
---- configure.orig	2008-04-24 11:48:16.000000000 -0600
-+++ configure
-@@ -34815,6 +34815,8 @@ do
-   case $ac_option in
-   # Handling of the options.
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    # Avoid regenerating for rechecks on pkgsrc
-+    exit 0
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;
diff --git a/security/prelude-lml/patches/patch-ab b/security/prelude-lml/patches/patch-ab
index 970960e9e50..fc11f7bd98e 100644
--- a/security/prelude-lml/patches/patch-ab
+++ b/security/prelude-lml/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2009/08/23 19:49:28 hasso Exp $
+$NetBSD: patch-ab,v 1.5 2011/11/11 18:58:14 joerg Exp $
 
 --- Makefile.in.orig	2007-08-08 09:48:58.000000000 -0600
 +++ Makefile.in
@@ -29,8 +29,8 @@ $NetBSD: patch-ab,v 1.4 2009/08/23 19:49:28 hasso Exp $
 -        else                                                                                             	\
 -		$(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/;				\
 -        fi
-+	$(BSD_INSTALL_DATA) $(top_srcdir)/prelude-lml.conf @EGDIR@
-+	$(BSD_INSTALL_DATA) $(top_srcdir)/plugins.rules @EGDIR@
++	$(BSD_INSTALL_DATA) $(top_srcdir)/prelude-lml.conf ${DESTDIR}@EGDIR@
++	$(BSD_INSTALL_DATA) $(top_srcdir)/plugins.rules ${DESTDIR}@EGDIR@
  
  uninstall-local:
 -	rm -f $(DESTDIR)$(configdir)/prelude-lml.conf;	\