ports/95300: [PATCH] www/rejik: fixed build failure on i386-4-latest (http://portsmon.freebsd.org/portoverview.py?category=www&portname=rejik)
Elisey O. Savateev
b3k at mail.ru
Tue Apr 4 10:10:31 UTC 2006
>Number: 95300
>Category: ports
>Synopsis: [PATCH] www/rejik: fixed build failure on i386-4-latest (http://portsmon.freebsd.org/portoverview.py?category=www&portname=rejik)
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 04 10:10:17 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:
- Fixed build failure on i386-4-latest (http://portsmon.freebsd.org/portoverview.py?category=www&portname=rejik)
- Fixed overwriting of Update, Update.Fast and dbl_expand files while upgrading (WITH_DBL=yes)
Removed file(s):
- pkg-message
>How-To-Repeat:
>Fix:
--- rejik-3.2.1_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 Fri Mar 31 07:42:43 2006
+++ /usr/home/bio3k/my_proj/ports/rejik/rejik/Makefile Tue Apr 4 09:32:44 2006
@@ -2,18 +2,18 @@
# Date created: 29 October 2005
# Whom: Elisey Savateev <b3k at mail.ru>
#
-# $FreeBSD: ports/www/rejik/Makefile,v 1.3 2006/03/30 08:17:43 novel Exp $
+# $FreeBSD$
#
PORTNAME= rejik
PORTVERSION= 3.2.1
+PORTREVISION= 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 at mail.ru
COMMENT= A squid redirector used for blocking unwanted content
@@ -83,21 +83,30 @@
.if !exists(${EXAMPLESDIR})
@${MKDIR} ${EXAMPLESDIR}
.endif
- @${TAR} -xf ${DISTDIR}/banlists-2.x.x.tgz -C ${EXAMPLESDIR}
+ @${CP} -R ${WRKDIR}/banlists ${EXAMPLESDIR}
.endif
.if defined(WITH_DBL)
- @${TAR} -xf ${DISTDIR}/dbl-2.0.tgz -C ${INSTALL_PATH}
- @${CHOWN} -R ${SQUID_USER}:${SQUID_GROUP} ${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
+ ${WRKDIR}/dbl/Update ${WRKDIR}/dbl/Update.Fast ${WRKDIR}/dbl/dbl_expand
+ @${RM} ${WRKDIR}/dbl/*.bak
+ @${CP} ${WRKDIR}/dbl/Update ${WRKDIR}/dbl/Update.dist
+ @${CP} ${WRKDIR}/dbl/Update.Fast ${WRKDIR}/dbl/Update.Fast.dist
+ @${CP} ${WRKDIR}/dbl/dbl_expand ${WRKDIR}/dbl/dbl_expand.dist
+ @${CP} -Rn ${WRKDIR}/dbl ${INSTALL_PATH}
+ @${CHOWN} -R ${SQUID_USER}:${SQUID_GROUP} ${INSTALL_PATH}/dbl
+ @[ -f ${INSTALL_PATH}/dbl/Update ] || \
+ ${CP} -p ${INSTALL_PATH}/dbl/Update.dist ${INSTALL_PATH}/dbl/Update
+ @[ -f ${INSTALL_PATH}/dbl/Update.Fast ] || \
+ ${CP} -p ${INSTALL_PATH}/dbl/Update.Fast.dist ${INSTALL_PATH}/dbl/Update.Fast
+ @[ -f ${INSTALL_PATH}/dbl/dbl_expand ] || \
+ ${CP} -p ${INSTALL_PATH}/dbl/dbl_expand.dist ${INSTALL_PATH}/dbl/dbl_expand
.endif
.if !defined(WITHOUT_WWW)
.if !exists(${EXAMPLESDIR})
@${MKDIR} ${EXAMPLESDIR}
.endif
- @${TAR} -xf ${DISTDIR}/squid-like-www-en.tgz -C ${EXAMPLESDIR}
+ @${CP} -R ${WRKDIR}/squid-like-www-en ${EXAMPLESDIR}
.endif
@${CAT} ${PKGMESSAGE}
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 Fri Mar 31 07:42:43 2006
+++ /usr/home/bio3k/my_proj/ports/rejik/rejik/pkg-plist Tue Apr 4 09:36:28 2006
@@ -1,13 +1,19 @@
- at comment $FreeBSD: ports/www/rejik/pkg-plist,v 1.3 2006/03/30 08:17:43 novel Exp $
+ at comment $FreeBSD$
%%DBL%%%%INSTALL_DIR%%/dbl/FAST
%%DBL%%%%INSTALL_DIR%%/dbl/FULL
%%DBL%%@dirrmtry %%INSTALL_DIR%%/dbl/NEW
-%%DBL%%%%INSTALL_DIR%%/dbl/Update
-%%DBL%%%%INSTALL_DIR%%/dbl/Update.Fast
-%%DBL%%%%INSTALL_DIR%%/dbl/dbl_expand
+%%DBL%%@unexec if cmp -s %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.dist; then rm -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update; fi
+%%DBL%%%%INSTALL_DIR%%/dbl/Update.dist
+%%DBL%%@exec [ -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update ] || cp -p %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.dist %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update
+%%DBL%%@unexec if cmp -s %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast.dist; then rm -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast; fi
+%%DBL%%%%INSTALL_DIR%%/dbl/Update.Fast.dist
+%%DBL%%@exec [ -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast ] || cp -p %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast.dist %%PREFIX%%/%%INSTALL_DIR%%/dbl/Update.Fast
+%%DBL%%@unexec if cmp -s %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand.dist; then rm -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand; fi
+%%DBL%%%%INSTALL_DIR%%/dbl/dbl_expand.dist
+%%DBL%%@exec [ -f %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand ] || cp -p %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand.dist %%PREFIX%%/%%INSTALL_DIR%%/dbl/dbl_expand
%%DBL%%%%INSTALL_DIR%%/dbl/dbl_stat
%%DBL%%@dirrmtry %%INSTALL_DIR%%/dbl/lists
-%%DBL%%@dirrm %%INSTALL_DIR%%/dbl
+%%DBL%%@dirrmtry %%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
@@ -19,7 +25,7 @@
%%INSTALL_DIR%%/tools/kill-cache
%%INSTALL_DIR%%/tools/set-permissions
@dirrm %%INSTALL_DIR%%/tools
- at dirrm %%INSTALL_DIR%%
+ at dirrmtry %%INSTALL_DIR%%
%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/banners/pcre
%%BAN%%share/examples/%%INSTALL_DIR%%/banlists/banners/urls
%%BAN%%@dirrm share/examples/%%INSTALL_DIR%%/banlists/banners
--- rejik-3.2.1_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list