From owner-freebsd-ports Mon Feb 28 2:50: 9 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 3B8FC37B796 for ; Mon, 28 Feb 2000 02:50:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id CAA20971; Mon, 28 Feb 2000 02:50:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from neva.vlink.ru (neva.vlink.ru [195.9.70.8]) by hub.freebsd.org (Postfix) with ESMTP id 108C037B73A for ; Mon, 28 Feb 2000 02:41:47 -0800 (PST) (envelope-from dsh@neva.vlink.ru) Received: by neva.vlink.ru (Postfix, from userid 1000) id A6B757EE59; Mon, 28 Feb 2000 13:41:35 +0300 (MSK) Message-Id: <20000228104135.A6B757EE59@neva.vlink.ru> Date: Mon, 28 Feb 2000 13:41:35 +0300 (MSK) From: dsh@neva.vlink.ru Reply-To: dsh@neva.vlink.ru To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/17041: update of www/jesred port Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 17041 >Category: ports >Synopsis: update of www/jesred port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 28 02:50:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Denis Shaposhnikov >Release: FreeBSD 3.4-STABLE i386 >Organization: >Environment: >Description: Remove depend on www/squid22. >How-To-Repeat: diff -Nru jesred.orig/Makefile jesred/Makefile --- jesred.orig/Makefile Mon Dec 27 05:15:00 1999 +++ jesred/Makefile Mon Feb 28 13:26:16 2000 @@ -13,19 +13,14 @@ MAINTAINER= dsh@vlink.ru -RUN_DEPENDS= squid:${PORTSDIR}/www/squid22 - do-install: - ${INSTALL_PROGRAM} ${COPY} ${WRKSRC}/jesred ${PREFIX}/libexec - ${SED} "s!%%PREFIX%%!${PREFIX}!" < ${WRKSRC}/etc/jesred.conf \ - > ${WRKSRC}/etc/jesred.conf.sample - ${INSTALL_DATA} ${WRKSRC}/etc/jesred.conf.sample ${PREFIX}/etc/squid - ${INSTALL_DATA} ${COPY} ${WRKSRC}/etc/redirect.acl \ - ${PREFIX}/etc/squid/redirect.acl.sample - ${INSTALL_DATA} ${COPY} ${WRKSRC}/etc/redirect.rules \ - ${PREFIX}/etc/squid/redirect.rules.sample - @[ -f ${PREFIX}/etc/squid/jesred.conf ] || \ - ${CP} ${PREFIX}/etc/squid/jesred.conf.sample \ - ${PREFIX}/etc/squid/jesred.conf + ${INSTALL_PROGRAM} ${WRKSRC}/jesred ${PREFIX}/libexec + ${MKDIR} ${PREFIX}/etc/jesred + ${INSTALL_DATA} ${WRKSRC}/etc/jesred.conf \ + ${PREFIX}/etc/jesred/jesred.conf.sample + ${INSTALL_DATA} ${WRKSRC}/etc/redirect.acl \ + ${PREFIX}/etc/jesred/redirect.acl.sample + ${INSTALL_DATA} ${WRKSRC}/etc/redirect.rules \ + ${PREFIX}/etc/jesred/redirect.rules.sample .include diff -Nru jesred.orig/patches/patch-aa jesred/patches/patch-aa --- jesred.orig/patches/patch-aa Mon Dec 27 05:15:00 1999 +++ jesred/patches/patch-aa Mon Feb 28 13:26:16 2000 @@ -1,5 +1,5 @@ --- Makefile.orig Sat Jul 25 07:19:50 1998 -+++ Makefile Mon Nov 8 18:22:45 1999 ++++ Makefile Wed Jan 19 11:53:51 2000 @@ -2,20 +2,20 @@ # HINT: If you want to run the program on an UltraSPARC driven machine, # I recommend to use Sun C-Compiler >= 4.0 or gcc >= 2.8.0 with @@ -31,7 +31,7 @@ # redirect rules are ignored, if there are some. # -# DEFS = -DUSE_ACCEL -+DEFS = -DUSE_ACCEL -DDEFAULT_PATH=\"${PREFIX}/etc/squid\" ++DEFS = -DUSE_ACCEL -DDEFAULT_PATH=\"${PREFIX}/etc/jesred\" # That's it - no further changes should be necessary ;-) # =========================================================================== diff -Nru jesred.orig/patches/patch-ac jesred/patches/patch-ac --- jesred.orig/patches/patch-ac Mon Dec 27 05:15:00 1999 +++ jesred/patches/patch-ac Thu Jan 1 03:00:00 1970 @@ -1,24 +0,0 @@ ---- etc/jesred.conf.orig Sat Aug 15 08:17:54 1998 -+++ etc/jesred.conf Mon Nov 8 18:54:12 1999 -@@ -1,17 +1,17 @@ - # file with IP addresses, for which URL rewriting is [not] allowed --allow = /local/squid/etc/redirect.acl -+allow = %%PREFIX%%/etc/squid/redirect.acl.sample - - # file with rules for URL rewriting --rules = /local/squid/etc/redirect.rules -+rules = %%PREFIX%%/etc/squid/redirect.rules.sample - - # log file for general, error and debug messages (empty value or commenting - # this out disables logging) --redirect_log = /local/squid/logs/redirect.log -+redirect_log = %%PREFIX%%/squid/logs/redirect.log - - # log file for URL rewrites (empty value or commenting this out disables - # logging of URL rewrites) - # Log file format: Timestamp Client/Ident URL RURL NO --rewrite_log = /local/squid/logs/rewrite.log -+rewrite_log = %%PREFIX%%/squid/logs/rewrite.log - - # Debug mode: if set to yes and DEBUG option was compiled in, this enables - # debug logging to redirect_log diff -Nru jesred.orig/pkg/PLIST jesred/pkg/PLIST --- jesred.orig/pkg/PLIST Mon Dec 27 05:15:00 1999 +++ jesred/pkg/PLIST Mon Feb 28 13:26:16 2000 @@ -1,5 +1,5 @@ -etc/squid/jesred.conf.sample -@exec [ -f %B/jesred.conf ] || /bin/cp %B/%f %B/jesred.conf -etc/squid/redirect.acl.sample -etc/squid/redirect.rules.sample +etc/jesred/jesred.conf.sample +etc/jesred/redirect.acl.sample +etc/jesred/redirect.rules.sample libexec/jesred +@dirrm etc/jesred >Fix: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message