- Update to 1.11.3 [1]

- When pkg-install is called by pkg_add:
    - respect ${LEAFNODE_SPOOLDIR}
    - set same directory permissions than the port

PR:		ports/82056 [1]
Submitted by:	maintainer [1]

4 files changed, 34 insertions, 38 deletions

diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 1de0a6709336..2c50ce6af848 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	leafnode
-PORTVERSION=	1.11.2
+PORTVERSION=	1.11.3
 CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED:S/$/:sourceforge/} \
 		http://osdn.dl.sourceforge.net/sourceforge/${PORTNAME}/:sourceforge \
@@ -39,7 +39,8 @@ PLIST_SUB=	SPOOLDIR=${LEAFNODE_SPOOLDIR}
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/leafnode \
 		--with-spooldir=${LEAFNODE_SPOOLDIR} --with-ipv6
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-SUB_FILES=	pkg-message
+SUB_FILES=	pkg-message pkg-install
+SUB_LIST=	SPOOLDIR=${LEAFNODE_SPOOLDIR}
 
 MAN1=		leafnode-version.1 newsq.1
 MAN8=		applyfilter.8 checkgroups.8 fetchnews.8 leafnode.8 texpire.8
@@ -51,7 +52,10 @@ DOCS=		ADD-ONS ChangeLog COPYING CREDITS FAQ.txt FAQ.pdf FAQ.html \
 		INSTALL NEWS README ChangeLog.old README-FQDN README-FQDN.html \
 		README-daemontools README.FIRST leafnode.cron.daily \
 		leafnode-SA-2002-01.txt leafnode-SA-2003-01.txt \
-		leafnode-SA-2004-01.txt KNOWNBUGS
+		leafnode-SA-2004-01.txt \
+		leafnode-SA-2005-01.txt \
+		leafnode-SA-2005-02.txt \
+		KNOWNBUGS
 DOCS_DE=	INSTALL_de LIESMICH-daemontools README README_de
 
 .if !defined(NOPORTDOCS)
@@ -78,8 +82,7 @@ post-install:
 	cd ${WRKSRC}/doc_german && \
 	${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/de.ISO8859-1/man1 && \
 	${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/de.ISO8859-1/man8
-	PKG_PREFIX=${PREFIX} SPOOLDIR=${LEAFNODE_SPOOLDIR} \
-		${SH} pkg-install ${PORTNAME} POST-INSTALL
+	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/news/leafnode/distinfo b/news/leafnode/distinfo
index a5f931ded39e..0815444a96fe 100644
--- a/news/leafnode/distinfo
+++ b/news/leafnode/distinfo
@@ -1,2 +1,2 @@
-MD5 (leafnode-1.11.2.rel.tar.bz2) = bb97b9f654f54973e3c90bd11e6d8b24
-SIZE (leafnode-1.11.2.rel.tar.bz2) = 391034
+MD5 (leafnode-1.11.3.rel.tar.bz2) = 3360247f3cebf3c8cc5accf182cd4bcd
+SIZE (leafnode-1.11.3.rel.tar.bz2) = 506217
diff --git a/news/leafnode/files/pkg-install.in b/news/leafnode/files/pkg-install.in
new file mode 100644
index 000000000000..f5518dadf806
--- /dev/null
+++ b/news/leafnode/files/pkg-install.in
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+case "$2" in
+    PRE-INSTALL)
+	;;
+
+    POST-INSTALL)
+	for d in \
+		"" \
+		failed.postings \
+		interesting.groups \
+		leaf.node \
+		message.id \
+		out.going \
+		temp.files; do
+		install -d -o news -g news -m 2775 %%SPOOLDIR%%/$d
+	done
+	;;
+
+    *)
+	echo >&2 "Unknown argument in $0 $@"
+	exit 1
+	;;
+esac
diff --git a/news/leafnode/pkg-install b/news/leafnode/pkg-install
deleted file mode 100644
index 51b5e45e4d48..000000000000
--- a/news/leafnode/pkg-install
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-case $2 in
-PRE-INSTALL)
-	;;
-POST-INSTALL)
-	SPOOLDIR=${SPOOLDIR:=${PKG_PREFIX}/var/spool/leafnode}
-	LOCKFILE=${SPOOLDIR}/leaf.node/lock.file
-	
-	mkdir -p `dirname $LOCKFILE`
-	mkdir -p $SPOOLDIR
-	mkdir -p $SPOOLDIR/failed.postings
-	mkdir -p $SPOOLDIR/leaf.node
-	mkdir -p $SPOOLDIR/message.id
-	mkdir -p $SPOOLDIR/interesting.groups
-	mkdir -p $SPOOLDIR/out.going
-	mkdir -p $SPOOLDIR/temp.files
-	chown news:news `dirname $LOCKFILE`
-	chown news:news $SPOOLDIR
-	chown news:news $SPOOLDIR/failed.postings
-	chown news:news $SPOOLDIR/leaf.node
-	chown news:news $SPOOLDIR/message.id
-	chown news:news $SPOOLDIR/interesting.groups
-	chown news:news $SPOOLDIR/out.going
-	chown news:news $SPOOLDIR/temp.files
-	;;
-*)
-	echo >&2 "Unknown argument in $0 $@"
-	exit 1
-	;;
-esac