diff options
Diffstat (limited to 'www/junkbuster')
| -rw-r--r-- | www/junkbuster/Makefile | 5 | ||||
| -rw-r--r-- | www/junkbuster/files/junkbuster.in (renamed from www/junkbuster/files/junkbuster.sh.in) | 31 | ||||
| -rw-r--r-- | www/junkbuster/pkg-plist | 2 |
3 files changed, 3 insertions, 35 deletions
diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile index 24d21bfaa1c3..367616573ebe 100644 --- a/www/junkbuster/Makefile +++ b/www/junkbuster/Makefile @@ -19,7 +19,7 @@ COMMENT= An HTTP proxy server that eliminates ads ALL_TARGET= # yes, an empty target. JDIR= ${PREFIX}/etc/junkbuster MAN1= junkbuster.1 -SUB_FILES= junkbuster.sh pkg-message +SUB_FILES= junkbuster pkg-message USE_RC_SUBR= yes PKGMESSAGE= ${WRKDIR}/pkg-message @@ -44,8 +44,7 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/strust.ini ${JDIR}/trustfile.sample @${INSTALL_MAN} ${WRKSRC}/junkbuster.1 ${PREFIX}/man/man1/ - @${INSTALL_SCRIPT} ${WRKDIR}/junkbuster.sh \ - ${PREFIX}/etc/rc.d/junkbuster.sh + @${INSTALL_SCRIPT} ${WRKDIR}/junkbuster ${PREFIX}/etc/rc.d/ post-install: @${CAT} ${PKGMESSAGE} diff --git a/www/junkbuster/files/junkbuster.sh.in b/www/junkbuster/files/junkbuster.in index bd3a1f6715c1..a610a9d44aa9 100644 --- a/www/junkbuster/files/junkbuster.sh.in +++ b/www/junkbuster/files/junkbuster.in @@ -28,34 +28,3 @@ ijb_start() load_rc_config $name run_rc_command "$1" - -#case $1 in -#start) -# if [ -d %%JDIR%% \ -# -a -x %%PREFIX%%/sbin/junkbuster \ -# -a -f %%JDIR%%/configfile ]; then -# : seems OK -# else -# echo >&2 "$0: missing files!" -# exit 1 -# fi -# cd %%JDIR%% -# su -m nobody -c "%%PREFIX%%/sbin/junkbuster configfile &" \ -# >/dev/null \ -# && echo -n " junkbuster" \ -# || echo " junkbuster FAILED TO START" -# ;; -#stop) -# killall junkbuster && echo -n " junkbuster" -# ;; -#restart) -# $0 stop -# $0 start -# ;; -#*) -# echo "Usage: `basename $0` {start|stop}" >&2 -# exit 64 -# ;; -#esac -# -#exit 0 diff --git a/www/junkbuster/pkg-plist b/www/junkbuster/pkg-plist index f08a15ec8e45..e06bff853f4e 100644 --- a/www/junkbuster/pkg-plist +++ b/www/junkbuster/pkg-plist @@ -5,5 +5,5 @@ etc/junkbuster/cookiefile.sample etc/junkbuster/configfile.sample etc/junkbuster/forwardfile.sample etc/junkbuster/trustfile.sample -etc/rc.d/junkbuster.sh +etc/rc.d/junkbuster @dirrmtry etc/junkbuster |