diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-08-15 01:01:43 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-08-15 01:01:43 +0000 |
| commit | 0524788414f29b02c458de14f74d7870a4bd1e97 (patch) | |
| tree | 7d87d3f49cfbd63b3d5fd3c8bbfb1903bd88f9b5 | |
| parent | 0136c22ffc65f3ced0af50a628ddd4035a2cd7a0 (diff) | |
| download | ports-0524788414f29b02c458de14f74d7870a4bd1e97.tar.gz ports-0524788414f29b02c458de14f74d7870a4bd1e97.zip | |
Notes
| -rw-r--r-- | www/c-icap/Makefile | 13 | ||||
| -rw-r--r-- | www/c-icap/files/c-icap.in | 2 | ||||
| -rw-r--r-- | www/c-icap/pkg-plist | 14 |
3 files changed, 16 insertions, 13 deletions
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index da0dd7e81e71..5248f82848fd 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -7,6 +7,7 @@ PORTNAME= c-icap PORTVERSION= 0.2.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.2.x/ @@ -42,7 +43,8 @@ MAN8= c-icap-client.8 \ c-icap-stretch.8 \ c-icap.8 -CONFIGURE_ARGS+= --enable-static +CONFIGURE_ARGS+= --enable-static \ + --sysconfdir="${PREFIX}/etc/c-icap" .include <bsd.port.options.mk> @@ -112,6 +114,7 @@ SUB_LIST= CICAP_USER=${CICAP_USER} CICAP_GROUP=${CICAP_GROUP} \ post-patch: @${REINPLACE_CMD} \ -e 's|@prefix@/var/log|/var/log/c-icap|g' \ + -e 's|@prefix@/etc/|@sysconfdir@/|g' \ ${WRKSRC}/c-icap.conf.in .if ${PORT_OPTIONS:MPOSIXSEM} @${REINPLACE_CMD} \ @@ -120,10 +123,10 @@ post-patch: .endif post-install: - @[ -f ${PREFIX}/etc/c-icap.conf ] || \ - ${CP} -p ${PREFIX}/etc/c-icap.conf.default ${PREFIX}/etc/c-icap.conf - @[ -f ${PREFIX}/etc/c-icap.magic ] || \ - ${CP} -p ${PREFIX}/etc/c-icap.magic.default ${PREFIX}/etc/c-icap.magic + @${CP} -np ${PREFIX}/etc/c-icap/c-icap.conf.default \ + ${PREFIX}/etc/c-icap/c-icap.conf + @${CP} -np ${PREFIX}/etc/c-icap/c-icap.magic.default \ + ${PREFIX}/etc/c-icap/c-icap.magic @${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL .include <bsd.port.post.mk> diff --git a/www/c-icap/files/c-icap.in b/www/c-icap/files/c-icap.in index 45091b901100..953cc2fc0c79 100644 --- a/www/c-icap/files/c-icap.in +++ b/www/c-icap/files/c-icap.in @@ -28,7 +28,7 @@ stop_postcmd="rm -f $pidfile" # read settings, set default values load_rc_config "$name" : ${c_icap_enable="NO"} -: ${c_icap_conf="%%PREFIX%%/etc/c-icap.conf"} +: ${c_icap_conf="%%PREFIX%%/etc/c-icap/c-icap.conf"} : ${c_icap_pidfile="%%RUN_DIR%%/c-icap.pid"} : ${c_icap_user="%%CICAP_USER%%"} diff --git a/www/c-icap/pkg-plist b/www/c-icap/pkg-plist index d31cceca0417..0a68a95ccf9f 100644 --- a/www/c-icap/pkg-plist +++ b/www/c-icap/pkg-plist @@ -5,13 +5,12 @@ bin/c-icap-config bin/c-icap-libicapapi-config %%BDB%%bin/c-icap-mkbdb bin/c-icap-stretch -@unexec if cmp -s %D/etc/c-icap.conf %D/etc/c-icap.conf.default; then rm -f %D/etc/c-icap.conf; fi -etc/c-icap.conf.default -@exec [ -f %B/c-icap.conf ] || cp -p %%PREFIX%%/%F %B/c-icap.conf -@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 [ ! -f %%RUN_DIR%%/c-icap.pid ] || %D/etc/rc.d/c_icap stop +@unexec if cmp -s %D/etc/c-icap/c-icap.conf %D/etc/c-icap/c-icap.conf.default; then rm -f %D/etc/c-icap/c-icap.conf; fi +etc/c-icap/c-icap.conf.default +@exec [ -f %B/c-icap.conf ] || cp %B/%f %B/c-icap.conf +@unexec if cmp -s %D/etc/c-icap/c-icap.magic %D/etc/c-icap/c-icap.magic.default; then rm -f %D/etc/c-icap/c-icap.magic; fi +etc/c-icap/c-icap.magic.default +@exec [ -f %B/c-icap.magic ] || cp %B/%f %B/c-icap.magic include/c_icap/access.h include/c_icap/acl.h include/c_icap/array.h @@ -69,3 +68,4 @@ lib/c_icap/sys_logger.so lib/libicapapi.la lib/libicapapi.so.2 lib/libicapapi.so +@dirrmtry etc/c-icap |