diff options
| author | sem <sem@FreeBSD.org> | 2006-03-31 00:11:03 +0800 |
|---|---|---|
| committer | sem <sem@FreeBSD.org> | 2006-03-31 00:11:03 +0800 |
| commit | 86a481f0d4ec04e4845da023702a2ba404a77c41 (patch) | |
| tree | 37b03e0c6ceef69ea51c6fe7068bb09ef528edfc /www | |
| parent | f25ad53600071896fda74adaa077667358aae2b9 (diff) | |
| download | freebsd-ports-gnome-86a481f0d4ec04e4845da023702a2ba404a77c41.tar.gz freebsd-ports-gnome-86a481f0d4ec04e4845da023702a2ba404a77c41.tar.zst freebsd-ports-gnome-86a481f0d4ec04e4845da023702a2ba404a77c41.zip | |
- Fix bugs in pkg-install and bug in pkg-plist [1]
- Add one more MASTER_SITE
PR: ports/95061
Submitted by: maintainer
Pointy hat to: sem (me) [1]
Diffstat (limited to 'www')
| -rw-r--r-- | www/c-icap/Makefile | 4 | ||||
| -rw-r--r-- | www/c-icap/files/patch-c-icap.conf.default.in | 25 | ||||
| -rw-r--r-- | www/c-icap/files/pkg-install.in | 4 | ||||
| -rw-r--r-- | www/c-icap/pkg-plist | 7 |
4 files changed, 15 insertions, 25 deletions
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index 2e18f7d8b2e0..9d724258a0a4 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -7,8 +7,10 @@ PORTNAME= c-icap PORTVERSION= 220505 +PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ + http://bio3k.softboard.ru/uploads/arch/ MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= c_icap-${PORTVERSION} diff --git a/www/c-icap/files/patch-c-icap.conf.default.in b/www/c-icap/files/patch-c-icap.conf.default.in index ebcaa824970d..bcebdabcde8f 100644 --- a/www/c-icap/files/patch-c-icap.conf.default.in +++ b/www/c-icap/files/patch-c-icap.conf.default.in @@ -1,26 +1,13 @@ ---- c-icap.conf.default.in.bak Fri Feb 3 10:18:30 2006 -+++ c-icap.conf.default.in Fri Feb 3 10:20:15 2006 -@@ -3,7 +3,7 @@ - # - - --PidFile /var/run/c-icap.pid -+PidFile @prefix@/var/run/c-icap.pid - Timeout 300 - KeepAlive On - MaxKeepAliveRequests 100 -@@ -25,11 +25,11 @@ - #ServerAdmin you@your.address # Not implemented yet - #ServerName localhost:1344 # Not implemented yet - --TmpDir /var/tmp -+TmpDir @prefix@/var/tmp +--- c-icap.conf.default.in.bak Wed Mar 29 08:24:29 2006 ++++ c-icap.conf.default.in Wed Mar 29 08:25:58 2006 +@@ -28,8 +28,8 @@ + TmpDir /var/tmp MaxMemObject 131072 -ServerLog @prefix@/var/log/server.log -AccessLog @prefix@/var/log/access.log -+ServerLog @prefix@/var/log/c_icap/server.log -+AccessLog @prefix@/var/log/c_icap/access.log ++ServerLog /var/log/c_icap/server.log ++AccessLog /var/log/c_icap/access.log #DebugLevel 3 ModulesDir @prefix@/lib/c_icap diff --git a/www/c-icap/files/pkg-install.in b/www/c-icap/files/pkg-install.in index b64313cf80c6..3c4dc5980f44 100644 --- a/www/c-icap/files/pkg-install.in +++ b/www/c-icap/files/pkg-install.in @@ -4,8 +4,7 @@ CICAP_USER=cicap CICAP_GROUP=cicap -LOG_PATH=/var/log -TMP_PATH=/var/tmp +LOG_PATH=/var/log/c_icap if [ "$2" = "PRE-INSTALL" ]; then if ! pw groupshow "$CICAP_USER" 2>/dev/null 1>&2; then @@ -29,6 +28,7 @@ if [ "$2" = "PRE-INSTALL" ]; then fi fi elif [ "$2" = "POST-INSTALL" ]; then + [ -d "$LOG_PATH" ] || mkdir -p "$LOG_PATH" || exit 1 touch "$LOG_PATH/access.log" "$LOG_PATH/server.log" || exit 1 chown -R "$CICAP_USER:$CICAP_GROUP" "$LOG_PATH" || exit 1 fi diff --git a/www/c-icap/pkg-plist b/www/c-icap/pkg-plist index 910f189bed92..592a1e5bde3f 100644 --- a/www/c-icap/pkg-plist +++ b/www/c-icap/pkg-plist @@ -8,7 +8,7 @@ etc/c-icap.conf.default @unexec if cmp -s %D/etc/c-icap.magic %D/etc/c-icap.magic.default; then rm -f %D/etc/c-icap.magic; fi etc/c-icap.magic.default @exec [ -f %B/c-icap.magic ] || cp -p %%PREFIX%%/%F %B/c-icap.magic -@unexec %D/etc/rc.d/c_icap.sh stop; fi +@unexec if [ -f /var/run/c-icap.pid ]; then %D/etc/rc.d/c_icap stop; fi include/c_icap/access.h include/c_icap/body.h include/c_icap/c-icap.h @@ -49,5 +49,6 @@ lib/libicapapi.la lib/libicapapi.so.0 lib/libicapapi.so @cwd / -var/log/access.log -var/log/server.log +var/log/c_icap/access.log +var/log/c_icap/server.log +@dirrm var/log/c_icap |