diff options
| author | novel <novel@FreeBSD.org> | 2006-04-04 18:56:53 +0800 |
|---|---|---|
| committer | novel <novel@FreeBSD.org> | 2006-04-04 18:56:53 +0800 |
| commit | 54eff24e44bd4bf66c1f8baed968d5b4b7fb9cac (patch) | |
| tree | 20f3a8d26417b5f1db7c0430d979c32030f52638 /www | |
| parent | 630a785993ba95376a86e319c4eb675a5bf9dc8b (diff) | |
| download | freebsd-ports-gnome-54eff24e44bd4bf66c1f8baed968d5b4b7fb9cac.tar.gz freebsd-ports-gnome-54eff24e44bd4bf66c1f8baed968d5b4b7fb9cac.tar.zst freebsd-ports-gnome-54eff24e44bd4bf66c1f8baed968d5b4b7fb9cac.zip | |
- Fix build failure on 4.x [1]
- Fix overwriting of Update, Update.Fast and dbl_expand files while
upgrading (with WITH_DBL=yes)
PR: 95300
Submitted by: Elisey O. Savateev (maintainer)
Reported by: pointyhat via kris [1]
Diffstat (limited to 'www')
| -rw-r--r-- | www/rejik/Makefile | 23 | ||||
| -rw-r--r-- | www/rejik/pkg-plist | 16 |
2 files changed, 27 insertions, 12 deletions
diff --git a/www/rejik/Makefile b/www/rejik/Makefile index 1f6f34d70be8..969bd8521186 100644 --- a/www/rejik/Makefile +++ b/www/rejik/Makefile @@ -7,13 +7,13 @@ 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@mail.ru COMMENT= A squid redirector used for blocking unwanted content @@ -83,21 +83,30 @@ post-install: .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 --git a/www/rejik/pkg-plist b/www/rejik/pkg-plist index 496c5b98f6fd..bd060e2c575f 100644 --- a/www/rejik/pkg-plist +++ b/www/rejik/pkg-plist @@ -2,12 +2,18 @@ %%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 -@dirrm %%INSTALL_DIR%% +@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 |