Remove the ^M's in all the files, install a startup script,

and give a brief instruction on how to proceed to get this to work.

PR:		14805
Submitted by:	Mikhail Teterin <mi@aldan.algebra.com>

4 files changed, 29 insertions, 10 deletions

diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index e8f5497bb6d0..d7db03d90691 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -13,7 +13,6 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ian@broken.net
 
-USE_GMAKE=	yes
 ALL_TARGET=	# yes, an empty target.
 
 # You need to delete the old distfile if you are upgrading, as the tar ball
@@ -23,16 +22,27 @@ ALL_TARGET=	# yes, an empty target.
 
 MAN1=		junkbuster.1
 
-# We have to do the install ourselves...
+JDIR=		${PREFIX}/etc/junkbuster
+
+post-patch:
+	@${PERL} -pi -e 's:\r::' ${WRKSRC}/*
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/$(DISTNAME)/junkbuster ${PREFIX}/bin/junkbuster
+	${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${PREFIX}/bin/junkbuster
 	${MKDIR} -m 755 ${PREFIX}/etc/junkbuster
-	${INSTALL_DATA} ${WRKDIR}/$(DISTNAME)/junkbstr.ini ${PREFIX}/etc/junkbuster/configfile.sample
-	${INSTALL_DATA} ${WRKDIR}/$(DISTNAME)/sblock.ini ${PREFIX}/etc/junkbuster/blockfile.sample
-	${INSTALL_DATA} ${WRKDIR}/$(DISTNAME)/saclfile.ini ${PREFIX}/etc/junkbuster/aclfile.sample
-	${INSTALL_DATA} ${WRKDIR}/$(DISTNAME)/scookie.ini ${PREFIX}/etc/junkbuster/cookiefile.sample
-	${INSTALL_DATA} ${WRKDIR}/$(DISTNAME)/sforward.ini ${PREFIX}/etc/junkbuster/forwardfile.sample
-	${INSTALL_DATA} ${WRKDIR}/$(DISTNAME)/strust.ini ${PREFIX}/etc/junkbuster/trustfile.sample
-	$(INSTALL_MAN) $(WRKDIR)/$(DISTNAME)/junkbuster.1 $(PREFIX)/man/man1/
+	${INSTALL_DATA} ${WRKSRC}/junkbstr.ini ${PREFIX}/etc/junkbuster/configfile.sample
+	${INSTALL_DATA} ${WRKSRC}/sblock.ini ${PREFIX}/etc/junkbuster/blockfile.sample
+	${INSTALL_DATA} ${WRKSRC}/saclfile.ini ${PREFIX}/etc/junkbuster/aclfile.sample
+	${INSTALL_DATA} ${WRKSRC}/scookie.ini ${PREFIX}/etc/junkbuster/cookiefile.sample
+	${INSTALL_DATA} ${WRKSRC}/sforward.ini ${PREFIX}/etc/junkbuster/forwardfile.sample
+	${INSTALL_DATA} ${WRKSRC}/strust.ini ${PREFIX}/etc/junkbuster/trustfile.sample
+	$(INSTALL_MAN) ${WRKSRC}/junkbuster.1 $(PREFIX)/man/man1/
+# Create the startup script.  JB will run as user nobody.
+	@${SED} -e 's%JDIR%${JDIR}%g' -e 's%PREFIX%${PREFIX}%g' \
+	    < ${FILESDIR}/junkbuster.sh.in > ${PREFIX}/etc/rc.d/junkbuster.sh
+	${CHMOD} 755 ${PREFIX}/etc/rc.d/junkbuster.sh
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/junkbuster/files/junkbuster.sh.in b/www/junkbuster/files/junkbuster.sh.in
new file mode 100644
index 000000000000..b4176bce54ce
--- /dev/null
+++ b/www/junkbuster/files/junkbuster.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+test -d JDIR -a -x PREFIX/bin/junkbuster -a -f JDIR/configfile || exit 1
+cd JDIR
+su -m nobody -c "PREFIX/bin/junkbuster configfile &"
+echo -n " junkbuster"
diff --git a/www/junkbuster/pkg-message b/www/junkbuster/pkg-message
new file mode 100644
index 000000000000..7daab941caed
--- /dev/null
+++ b/www/junkbuster/pkg-message
@@ -0,0 +1,3 @@
+Please,  review the  samples of  the configuration  files (somewhere  in
+/usr/local/etc/junkbuster/*.sample)  and create  your own  config files.
+Read the junkbuster man-page (man junkbuster) for even more information.
diff --git a/www/junkbuster/pkg-plist b/www/junkbuster/pkg-plist
index 0ae185b84978..8c46b342f93d 100644
--- a/www/junkbuster/pkg-plist
+++ b/www/junkbuster/pkg-plist
@@ -5,4 +5,5 @@ etc/junkbuster/cookiefile.sample
 etc/junkbuster/configfile.sample
 etc/junkbuster/forwardfile.sample
 etc/junkbuster/trustfile.sample
+etc/rc.d/junkbuster.sh
 @dirrm etc/junkbuster