Date: Fri, 3 Mar 2006 04:08:31 GMT From: "Elisey O. Savateev" <b3k@mail.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/94042: [PATCH] www/rejik: update to 3.2.1 Message-ID: <200603030408.k2348VnJ003865@www.freebsd.org> Resent-Message-ID: <200603030410.k234A9FI005374@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94042
>Category: ports
>Synopsis: [PATCH] www/rejik: update to 3.2.1
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 03 04:10:09 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Elisey O. Savateev
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
FreeBSD beastie 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #16: Wed Mar 1 17:41:48 YEKT
>Description:
- Update to 3.2.1
- Error pages and banlists now installs in ${EXAMPLESDIR}
- Improved pkg-plist
- Minor cleanups in port Makefile
Removed file(s):
- pkg-message
>How-To-Repeat:
>Fix:
--- rejik-3.2.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/rejik/Makefile /usr/home/bio3k/my_proj/ports/rejik/rejik/Makefile
--- /usr/ports/www/rejik/Makefile Thu Jan 26 09:15:23 2006
+++ /usr/home/bio3k/my_proj/ports/rejik/rejik/Makefile Wed Mar 1 22:34:29 2006
@@ -2,18 +2,16 @@
# Date created: 29 October 2005
# Whom: Elisey Savateev <b3k@mail.ru>
#
-# $FreeBSD: ports/www/rejik/Makefile,v 1.2 2006/01/25 06:13:28 novel Exp $
+# $FreeBSD$
#
PORTNAME= rejik
-PORTVERSION= 3.2.0
-PORTREVISION= 1
+PORTVERSION= 3.2.1
CATEGORIES= www
MASTER_SITES= http://www.rejik.ru/download/ \
http://bio3k.softboard.ru/uploads/arch/
DISTNAME= redirector-${PORTVERSION}
EXTRACT_SUFX= .tgz
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= b3k@mail.ru
@@ -22,21 +20,8 @@
LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
RUN_DEPENDS= squid:${PORTSDIR}/www/squid
-USE_REINPLACE= yes
-WRKSRC= ${WRKDIR}/redirector
-
-# Redifine this if you need
-SQUID_USER?= squid
-SQUID_GROUP?= squid
-WWW_USER?= www
-WWW_GROUP?= www
-WWW_DIR?= www
-WWW_PATH?= ${PREFIX}/${WWW_DIR}
-INSTALL_DIR?= ${PORTNAME}
-INSTALL_PATH?= ${PREFIX}/${INSTALL_DIR}
-
-PLIST_SUB= WWW_DIR=${WWW_DIR} INSTALL_DIR=${INSTALL_DIR}
-SUB_LIST= WWW_DIR=${WWW_DIR} INSTALL_DIR=${INSTALL_DIR} SQUID_USER=${SQUID_USER} SQUID_GROUP=${SQUID_GROUP}
+PLIST_SUB= INSTALL_DIR=${INSTALL_DIR}
+SUB_LIST= INSTALL_PATH=${INSTALL_PATH} SQUID_USER=${SQUID_USER} SQUID_GROUP=${SQUID_GROUP}
SUB_FILES= pkg-message
OPTIONS= BAN "With banlists" on \
@@ -45,6 +30,12 @@
.include <bsd.port.pre.mk>
+# Redifine this if you need
+SQUID_USER?= squid
+SQUID_GROUP?= squid
+INSTALL_DIR?= ${PORTNAME}
+INSTALL_PATH?= ${PREFIX}/${INSTALL_DIR}
+
.if !defined(WITHOUT_BAN)
DISTFILES+= banlists-2.x.x.tgz
PLIST_SUB+= BAN=""
@@ -78,28 +69,34 @@
@${ECHO_MSG} "===> ----------------------------------------------"
post-patch:
- @${REINPLACE_CMD} -e 's|SQUID_USER=nobody|SQUID_USER=${SQUID_USER}|; \
- s|SQUID_GROUP=nogroup|SQUID_GROUP=${SQUID_GROUP}|; \
- s|INSTALL_PATH=/usr/local/rejik3|INSTALL_PATH=${INSTALL_PATH}|' \
+ @${REINPLACE_CMD} -e 's|nobody|${SQUID_USER}|g; s|nogroup|${SQUID_GROUP}|g; \
+ s|/usr/local/rejik3|${INSTALL_PATH}|g' \
${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e 's|/usr/local/rejik3|${INSTALL_PATH}|g' \
+ ${WRKSRC}/vars.h ${WRKSRC}/redirector.conf.dist
post-install:
+ @[ -f ${INSTALL_PATH}/redirector.conf ] || \
+ ${CP} -p ${INSTALL_PATH}/redirector.conf.dist ${INSTALL_PATH}/redirector.conf
.if !defined(WITHOUT_BAN)
- @${TAR} -xzf ${DISTDIR}/banlists-2.x.x.tgz -C ${INSTALL_PATH}
- @${CHOWN} -R ${SQUID_USER}:${SQUID_GROUP} ${INSTALL_PATH}/banlists
+.if !exists(${EXAMPLESDIR})
+ @${MKDIR} ${EXAMPLESDIR}
+.endif
+ @${TAR} -xf ${DISTDIR}/banlists-2.x.x.tgz -C ${EXAMPLESDIR}
.endif
.if defined(WITH_DBL)
- @${TAR} -xzf ${DISTDIR}/dbl-2.0.tgz -C ${INSTALL_PATH}
+ @${TAR} -xf ${DISTDIR}/dbl-2.0.tgz -C ${INSTALL_PATH}
@${CHOWN} -R ${SQUID_USER}:${SQUID_GROUP} ${INSTALL_PATH}/dbl
- @${REINPLACE_CMD} -e 's|$WGET="/usr/bin/wget";|$WGET="${LOCALBASE}/wget";| ; \
- s|$dir="/usr/local/rejik3/dbl";|$dir="${INSTALL_PATH}/dbl";|' \
+ @${REINPLACE_CMD} -e 's|/usr/bin/wget|${LOCALBASE}/bin/wget|g ; \
+ s|/usr/local/rejik3|${INSTALL_PATH}|g' \
${INSTALL_PATH}/dbl/Update ${INSTALL_PATH}/dbl/Update.Fast ${INSTALL_PATH}/dbl/dbl_expand
@${RM} ${INSTALL_PATH}/dbl/*.bak
.endif
.if !defined(WITHOUT_WWW)
- @${TAR} -xzf ${DISTDIR}/squid-like-www-en.tgz -C ${WWW_PATH}
- @${MV} ${WWW_PATH}/squid-like-www-en ${WWW_PATH}/ban
- @${CHOWN} -R ${WWW_USER}:${WWW_GROUP} ${WWW_PATH}/ban
+.if !exists(${EXAMPLESDIR})
+ @${MKDIR} ${EXAMPLESDIR}
+.endif
+ @${TAR} -xf ${DISTDIR}/squid-like-www-en.tgz -C ${EXAMPLESDIR}
.endif
@${CAT} ${PKGMESSAGE}
diff -ruN --exclude=CVS /usr/ports/www/rejik/distinfo /usr/home/bio3k/my_proj/ports/rejik/rejik/distinfo
--- /usr/ports/www/rejik/distinfo Thu Jan 26 09:15:23 2006
+++ /usr/home/bio3k/my_proj/ports/rejik/rejik/distinfo Wed Mar 1 21:39:08 2006
@@ -1,6 +1,6 @@
-MD5 (redirector-3.2.0.tgz) = 0b5a5c013424716ab1869b742eb16530
-SHA256 (redirector-3.2.0.tgz) = 725e6b0d8da86da00699170ebe66234c94f57491920e5fe1dd6458a601d31caa
-SIZE (redirector-3.2.0.tgz) = 43991
+MD5 (redirector-3.2.1.tgz) = 0c0f25c1b92eb1a4a9f151935cf538e5
+SHA256 (redirector-3.2.1.tgz) = dea62aa7248cf58931dbb3606dec051fc6949542c62f9468b6702e8677afd057
+SIZE (redirector-3.2.1.tgz) = 46022
MD5 (banlists-2.x.x.tgz) = a1c7c48f9ae94b2ef35f56a094285c10
SHA256 (banlists-2.x.x.tgz) = 221a40e8db9d19477d6fdece00c9152526a0d2f0c2298504fc99b4378457b09e
SIZE (banlists-2.x.x.tgz) = 116100
diff -ruN --exclude=CVS /usr/ports/www/rejik/files/pkg-message.in /usr/home/bio3k/my_proj/ports/rejik/rejik/files/pkg-message.in
--- /usr/ports/www/rejik/files/pkg-message.in Thu Jan 26 09:15:23 2006
+++ /usr/home/bio3k/my_proj/ports/rejik/rejik/files/pkg-message.in Wed Mar 1 20:53:05 2006
@@ -1,12 +1,10 @@
===============================================================================
1. Make sure that squid runs under user %%SQUID_USER%% and group %%SQUID_GROUP%%.
-2. Copy %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf.dist to
- %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf and edit it.
+2. See %%INSTALL_PATH%%/redirector.conf.dist for default configuration. Edit %%INSTALL_PATH%%/redirector.conf if you need.
3. Add line
- redirect_program %%PREFIX%%/%%INSTALL_DIR%%/redirector %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf
- to squid.conf.
+ redirect_program %%INSTALL_PATH%%/redirector to squid.conf.
4. See http://www.rejik.ru/ for detailed instructions.
===============================================================================
diff -ruN --exclude=CVS /usr/ports/www/rejik/pkg-message /usr/home/bio3k/my_proj/ports/rejik/rejik/pkg-message
--- /usr/ports/www/rejik/pkg-message Tue Nov 29 19:10:23 2005
+++ /usr/home/bio3k/my_proj/ports/rejik/rejik/pkg-message Thu Jan 1 05:00:00 1970
@@ -1,10 +0,0 @@
-1. Make sure that squid runs under user squid and group squid.
-
-2. Copy /usr/local/rejik/redirector.conf.dist to
- /usr/local/rejik/redirector.conf and edit it.
-
-3. Add line
- redirect_program /usr/local/rejik/redirector /usr/local/rejik/redirector.conf
- to squid.conf.
-
-4. See http://www.rejik.ru/ for detailed instructions.
diff -ruN --exclude=CVS /usr/ports/www/rejik/pkg-plist /usr/home/bio3k/my_proj/ports/rejik/rejik/pkg-plist
--- /usr/ports/www/rejik/pkg-plist Thu Jan 26 09:15:23 2006
+++ /usr/home/bio3k/my_proj/ports/rejik/rejik/pkg-plist Wed Mar 1 22:28:54 2006
@@ -1,25 +1,18 @@
-%%BAN%%%%INSTALL_DIR%%/banlists/banners/pcre
-%%BAN%%%%INSTALL_DIR%%/banlists/banners/urls
-%%BAN%%@dirrm %%INSTALL_DIR%%/banlists/banners
-%%BAN%%%%INSTALL_DIR%%/banlists/js/urls
-%%BAN%%@dirrm %%INSTALL_DIR%%/banlists/js
-%%BAN%%%%INSTALL_DIR%%/banlists/mp3/pcre
-%%BAN%%@dirrm %%INSTALL_DIR%%/banlists/mp3
-%%BAN%%%%INSTALL_DIR%%/banlists/porno/urls
-%%BAN%%@dirrm %%INSTALL_DIR%%/banlists/porno
-%%BAN%%@dirrm %%INSTALL_DIR%%/banlists
+@comment $FreeBSD$
%%DBL%%%%INSTALL_DIR%%/dbl/FAST
%%DBL%%%%INSTALL_DIR%%/dbl/FULL
-%%DBL%%@dirrm %%INSTALL_DIR%%/dbl/NEW
+%%DBL%%@dirrmtry %%INSTALL_DIR%%/dbl/NEW
%%DBL%%%%INSTALL_DIR%%/dbl/Update
%%DBL%%%%INSTALL_DIR%%/dbl/Update.Fast
%%DBL%%%%INSTALL_DIR%%/dbl/dbl_expand
%%DBL%%%%INSTALL_DIR%%/dbl/dbl_stat
-%%DBL%%@dirrm %%INSTALL_DIR%%/dbl/lists
+%%DBL%%@dirrmtry %%INSTALL_DIR%%/dbl/lists
%%DBL%%@dirrm %%INSTALL_DIR%%/dbl
%%INSTALL_DIR%%/make-cache
%%INSTALL_DIR%%/redirector
+@unexec if cmp -s %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf.dist; then rm -f %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf; fi
%%INSTALL_DIR%%/redirector.conf.dist
+@exec [ -f %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf ] || cp -p %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf.dist %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf
%%INSTALL_DIR%%/tools/IN.gz
%%INSTALL_DIR%%/tools/benchmark
%%INSTALL_DIR%%/tools/check-redirector
@@ -27,10 +20,21 @@
%%INSTALL_DIR%%/tools/set-permissions
@dirrm %%INSTALL_DIR%%/tools
@dirrm %%INSTALL_DIR%%
-%%WWW%%%%WWW_DIR%%/ban/1x1.gif
-%%WWW%%%%WWW_DIR%%/ban/access_denied.html
-%%WWW%%%%WWW_DIR%%/ban/audio-video.html
-%%WWW%%%%WWW_DIR%%/ban/js.js
-%%WWW%%%%WWW_DIR%%/ban/porno.html
-%%WWW%%%%WWW_DIR%%/ban/spyware.html
-%%WWW%%@dirrm %%WWW_DIR%%/ban
+%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/banners/pcre
+%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/banners/urls
+%%BAN%%@dirrm share/examples/%%INSTALL_DIR%%/banlists/banners
+%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/js/urls
+%%BAN%%@dirrm share/examples/%%INSTALL_DIR%%/banlists/js
+%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/mp3/pcre
+%%BAN%%@dirrm share/examples/%%INSTALL_DIR%%/banlists/mp3
+%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/porno/urls
+%%BAN%%@dirrm share/examples/%%INSTALL_DIR%%/banlists/porno
+%%BAN%%@dirrm share/examples/%%INSTALL_DIR%%/banlists
+%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/1x1.gif
+%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/access_denied.html
+%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/audio-video.html
+%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/js.js
+%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/porno.html
+%%WWW%%share/examples/%%INSTALL_DIR%%/squid-like-www-en/spyware.html
+%%WWW%%@dirrm share/examples/%%INSTALL_DIR%%/squid-like-www-en
+@dirrmtry share/examples/%%INSTALL_DIR%%
--- rejik-3.2.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603030408.k2348VnJ003865>