ports/65757: [MAINTAINER] news/leafnode: move news spool to /var/spool/leafnode

[Matthias Andree]

>Number:         65757
>Category:       ports
>Synopsis:       [MAINTAINER] news/leafnode: move news spool to /var/spool/leafnode
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 19 03:40:18 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Andree
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD merlin.emma.line.org 5.2-CURRENT FreeBSD 5.2-CURRENT #22: Fri Mar 26 04:34:07 CET 2004
>Description:
Use /var/spool/leafnode as the default spooldir.
(but pick up previous spooldir locations when installing the port).

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- leafnode-1.9.52_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/news/leafnode/Makefile /root/ports/news/leafnode/Makefile
--- /usr/ports/news/leafnode/Makefile	Thu Apr 15 05:12:08 2004
+++ /root/ports/news/leafnode/Makefile	Mon Apr 19 12:30:59 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	leafnode
 PORTVERSION=	1.9.52
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED:S/$/:sourceforge/} \
 		http://osdn.dl.sourceforge.net/sourceforge/${PORTNAME}/:sourceforge \
@@ -23,16 +24,20 @@
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
-.if exists(/var/spool/news) && !defined(PACKAGE_BUILDING)
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+
+.if exists(/var/spool/news/leaf.node) && !defined(PACKAGE_BUILDING)
 LEAFNODE_SPOOLDIR?=/var/spool/news
+.elif exists(${LOCALBASE}/var/spool/leafnode/leaf.node) && !defined(PACKAGE_BUILDING)
+LEAFNODE_SPOOLDIR?=${LOCALBASE}/var/spool/leafnode
 .endif
-LEAFNODE_SPOOLDIR?=${PREFIX}/var/spool/leafnode
+LEAFNODE_SPOOLDIR?=/var/spool/leafnode
 PLIST_SUB=	SPOOLDIR=${LEAFNODE_SPOOLDIR}
 
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX}/etc/leafnode \
-		--with-lockfile=${LEAFNODE_SPOOLDIR}/leaf.node/lock.file \
 		--with-spooldir=${LEAFNODE_SPOOLDIR} --with-ipv6
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ARGS=
@@ -75,4 +80,4 @@
 		${SH} pkg-install ${PORTNAME} POST-INSTALL
 	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- leafnode-1.9.52_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: