Index: head/databases/redis/Makefile =================================================================== --- head/databases/redis/Makefile (revision 248011) +++ head/databases/redis/Makefile (revision 248012) @@ -1,58 +1,65 @@ # New ports collection makefile for: redis # Date created: 03 Jul 2009 # Whom: Sergey Skvortsov # # $FreeBSD$ # PORTNAME= redis -PORTVERSION= 1.02 +PORTVERSION= 1.2.0 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE -MAINTAINER= skv@FreeBSD.org +MAINTAINER= osa@FreeBSD.org COMMENT= A persistent key-value database with built-in net interface LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - CFLAGS+= -I${LOCALBASE}/include +USE_GMAKE= yes USE_RC_SUBR= redis.sh BIN_FILES= redis-server redis-benchmark redis-cli PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message REDIS_USER?= redis REDIS_UID?= 535 REDIS_GROUP?= redis REDIS_GID?= 535 REDIS_DBDIR?= /var/db/redis REDIS_RUNDIR?= /var/run/redis REDIS_LOGDIR?= /var/log/redis SUB_FILES= pkg-message pkg-install SUB_LIST+= PORTNAME="${PORTNAME}" \ REDIS_USER="${REDIS_USER}" \ REDIS_UID="${REDIS_UID}" \ REDIS_GROUP="${REDIS_GROUP}" \ REDIS_GID="${REDIS_GID}" \ REDIS_LOGDIR="${REDIS_LOGDIR}" \ REDIS_DBDIR="${REDIS_DBDIR}" \ REDIS_RUNDIR="${REDIS_RUNDIR}" + +PATTERN= '10d;13s|$$$$(ARCH) ||' +.if !defined(WITH_DEBUG) +PATTERN:= ${PATTERN:S/'$/;14s|^|\#|'/} +.endif + +post-patch: + ${REINPLACE_CMD} ${PATTERN} ${WRKSRC}/Makefile post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf do-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/!} ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Property changes on: head/databases/redis/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/databases/redis/distinfo =================================================================== --- head/databases/redis/distinfo (revision 248011) +++ head/databases/redis/distinfo (revision 248012) @@ -1,3 +1,3 @@ -MD5 (redis-1.02.tar.gz) = 5396e2d8b67f451ab4702ce7655533ae -SHA256 (redis-1.02.tar.gz) = aa1fe425568e19bcf89db9a48df68a42732134c29978e27c6e9c05008a73321e -SIZE (redis-1.02.tar.gz) = 202973 +MD5 (redis-1.2.0.tar.gz) = e33cb95cfa5c4f7086eea57e1e490d28 +SHA256 (redis-1.2.0.tar.gz) = 88fdc5433de3a0c77895b6b5f86d69b7a8a8575d042af68ba1cb24c996faa9bf +SIZE (redis-1.2.0.tar.gz) = 202685 Property changes on: head/databases/redis/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/databases/redis/files/patch-redis.conf =================================================================== --- head/databases/redis/files/patch-redis.conf (revision 248011) +++ head/databases/redis/files/patch-redis.conf (revision 248012) @@ -1,34 +1,34 @@ ---- redis.conf -+++ redis.conf +--- redis.conf.orig 2009-12-27 11:54:09.000000000 +0300 ++++ redis.conf 2009-12-27 11:56:16.000000000 +0300 @@ -2,11 +2,11 @@ # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. -daemonize no +daemonize yes # When run as a daemon, Redis write a pid file in /var/run/redis.pid by default. # You can specify a custom pid file location here. -pidfile /var/run/redis.pid +pidfile %%REDIS_RUNDIR%%/redis.pid # Accept connections on the specified port, default is 6379 port 6379 -@@ -39,7 +39,7 @@ - - # For default save/load DB in/from the working directory - # Note that you must specify a directory not a file name. --dir ./ -+dir %%REDIS_DBDIR%%/ - - # Set server verbosity to 'debug' - # it can be one of: -@@ -51,7 +51,7 @@ +@@ -29,7 +29,7 @@ # Specify the log file name. Also 'stdout' can be used to force # the demon to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null -logfile stdout +logfile %%REDIS_LOGDIR%%/redis.log # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where +@@ -64,7 +64,7 @@ + + # For default save/load DB in/from the working directory + # Note that you must specify a directory not a file name. +-dir ./ ++dir %%REDIS_DBDIR%%/ + + ################################# REPLICATION ################################# + Property changes on: head/databases/redis/files/patch-redis.conf ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/databases/redis-devel/Makefile =================================================================== --- head/databases/redis-devel/Makefile (revision 248011) +++ head/databases/redis-devel/Makefile (revision 248012) @@ -1,58 +1,65 @@ # New ports collection makefile for: redis # Date created: 03 Jul 2009 # Whom: Sergey Skvortsov # # $FreeBSD$ # PORTNAME= redis -PORTVERSION= 1.02 +PORTVERSION= 1.2.0 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE -MAINTAINER= skv@FreeBSD.org +MAINTAINER= osa@FreeBSD.org COMMENT= A persistent key-value database with built-in net interface LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - CFLAGS+= -I${LOCALBASE}/include +USE_GMAKE= yes USE_RC_SUBR= redis.sh BIN_FILES= redis-server redis-benchmark redis-cli PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message REDIS_USER?= redis REDIS_UID?= 535 REDIS_GROUP?= redis REDIS_GID?= 535 REDIS_DBDIR?= /var/db/redis REDIS_RUNDIR?= /var/run/redis REDIS_LOGDIR?= /var/log/redis SUB_FILES= pkg-message pkg-install SUB_LIST+= PORTNAME="${PORTNAME}" \ REDIS_USER="${REDIS_USER}" \ REDIS_UID="${REDIS_UID}" \ REDIS_GROUP="${REDIS_GROUP}" \ REDIS_GID="${REDIS_GID}" \ REDIS_LOGDIR="${REDIS_LOGDIR}" \ REDIS_DBDIR="${REDIS_DBDIR}" \ REDIS_RUNDIR="${REDIS_RUNDIR}" + +PATTERN= '10d;13s|$$$$(ARCH) ||' +.if !defined(WITH_DEBUG) +PATTERN:= ${PATTERN:S/'$/;14s|^|\#|'/} +.endif + +post-patch: + ${REINPLACE_CMD} ${PATTERN} ${WRKSRC}/Makefile post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf do-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/!} ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Property changes on: head/databases/redis-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/databases/redis-devel/distinfo =================================================================== --- head/databases/redis-devel/distinfo (revision 248011) +++ head/databases/redis-devel/distinfo (revision 248012) @@ -1,3 +1,3 @@ -MD5 (redis-1.02.tar.gz) = 5396e2d8b67f451ab4702ce7655533ae -SHA256 (redis-1.02.tar.gz) = aa1fe425568e19bcf89db9a48df68a42732134c29978e27c6e9c05008a73321e -SIZE (redis-1.02.tar.gz) = 202973 +MD5 (redis-1.2.0.tar.gz) = e33cb95cfa5c4f7086eea57e1e490d28 +SHA256 (redis-1.2.0.tar.gz) = 88fdc5433de3a0c77895b6b5f86d69b7a8a8575d042af68ba1cb24c996faa9bf +SIZE (redis-1.2.0.tar.gz) = 202685 Property changes on: head/databases/redis-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/databases/redis-devel/files/patch-redis.conf =================================================================== --- head/databases/redis-devel/files/patch-redis.conf (revision 248011) +++ head/databases/redis-devel/files/patch-redis.conf (revision 248012) @@ -1,34 +1,34 @@ ---- redis.conf -+++ redis.conf +--- redis.conf.orig 2009-12-27 11:54:09.000000000 +0300 ++++ redis.conf 2009-12-27 11:56:16.000000000 +0300 @@ -2,11 +2,11 @@ # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. -daemonize no +daemonize yes # When run as a daemon, Redis write a pid file in /var/run/redis.pid by default. # You can specify a custom pid file location here. -pidfile /var/run/redis.pid +pidfile %%REDIS_RUNDIR%%/redis.pid # Accept connections on the specified port, default is 6379 port 6379 -@@ -39,7 +39,7 @@ - - # For default save/load DB in/from the working directory - # Note that you must specify a directory not a file name. --dir ./ -+dir %%REDIS_DBDIR%%/ - - # Set server verbosity to 'debug' - # it can be one of: -@@ -51,7 +51,7 @@ +@@ -29,7 +29,7 @@ # Specify the log file name. Also 'stdout' can be used to force # the demon to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null -logfile stdout +logfile %%REDIS_LOGDIR%%/redis.log # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where +@@ -64,7 +64,7 @@ + + # For default save/load DB in/from the working directory + # Note that you must specify a directory not a file name. +-dir ./ ++dir %%REDIS_DBDIR%%/ + + ################################# REPLICATION ################################# + Property changes on: head/databases/redis-devel/files/patch-redis.conf ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/databases/redis1/Makefile =================================================================== --- head/databases/redis1/Makefile (revision 248011) +++ head/databases/redis1/Makefile (revision 248012) @@ -1,58 +1,65 @@ # New ports collection makefile for: redis # Date created: 03 Jul 2009 # Whom: Sergey Skvortsov # # $FreeBSD$ # PORTNAME= redis -PORTVERSION= 1.02 +PORTVERSION= 1.2.0 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE -MAINTAINER= skv@FreeBSD.org +MAINTAINER= osa@FreeBSD.org COMMENT= A persistent key-value database with built-in net interface LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - CFLAGS+= -I${LOCALBASE}/include +USE_GMAKE= yes USE_RC_SUBR= redis.sh BIN_FILES= redis-server redis-benchmark redis-cli PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message REDIS_USER?= redis REDIS_UID?= 535 REDIS_GROUP?= redis REDIS_GID?= 535 REDIS_DBDIR?= /var/db/redis REDIS_RUNDIR?= /var/run/redis REDIS_LOGDIR?= /var/log/redis SUB_FILES= pkg-message pkg-install SUB_LIST+= PORTNAME="${PORTNAME}" \ REDIS_USER="${REDIS_USER}" \ REDIS_UID="${REDIS_UID}" \ REDIS_GROUP="${REDIS_GROUP}" \ REDIS_GID="${REDIS_GID}" \ REDIS_LOGDIR="${REDIS_LOGDIR}" \ REDIS_DBDIR="${REDIS_DBDIR}" \ REDIS_RUNDIR="${REDIS_RUNDIR}" + +PATTERN= '10d;13s|$$$$(ARCH) ||' +.if !defined(WITH_DEBUG) +PATTERN:= ${PATTERN:S/'$/;14s|^|\#|'/} +.endif + +post-patch: + ${REINPLACE_CMD} ${PATTERN} ${WRKSRC}/Makefile post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf do-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/!} ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Property changes on: head/databases/redis1/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/databases/redis1/distinfo =================================================================== --- head/databases/redis1/distinfo (revision 248011) +++ head/databases/redis1/distinfo (revision 248012) @@ -1,3 +1,3 @@ -MD5 (redis-1.02.tar.gz) = 5396e2d8b67f451ab4702ce7655533ae -SHA256 (redis-1.02.tar.gz) = aa1fe425568e19bcf89db9a48df68a42732134c29978e27c6e9c05008a73321e -SIZE (redis-1.02.tar.gz) = 202973 +MD5 (redis-1.2.0.tar.gz) = e33cb95cfa5c4f7086eea57e1e490d28 +SHA256 (redis-1.2.0.tar.gz) = 88fdc5433de3a0c77895b6b5f86d69b7a8a8575d042af68ba1cb24c996faa9bf +SIZE (redis-1.2.0.tar.gz) = 202685 Property changes on: head/databases/redis1/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/databases/redis1/files/patch-redis.conf =================================================================== --- head/databases/redis1/files/patch-redis.conf (revision 248011) +++ head/databases/redis1/files/patch-redis.conf (revision 248012) @@ -1,34 +1,34 @@ ---- redis.conf -+++ redis.conf +--- redis.conf.orig 2009-12-27 11:54:09.000000000 +0300 ++++ redis.conf 2009-12-27 11:56:16.000000000 +0300 @@ -2,11 +2,11 @@ # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. -daemonize no +daemonize yes # When run as a daemon, Redis write a pid file in /var/run/redis.pid by default. # You can specify a custom pid file location here. -pidfile /var/run/redis.pid +pidfile %%REDIS_RUNDIR%%/redis.pid # Accept connections on the specified port, default is 6379 port 6379 -@@ -39,7 +39,7 @@ - - # For default save/load DB in/from the working directory - # Note that you must specify a directory not a file name. --dir ./ -+dir %%REDIS_DBDIR%%/ - - # Set server verbosity to 'debug' - # it can be one of: -@@ -51,7 +51,7 @@ +@@ -29,7 +29,7 @@ # Specify the log file name. Also 'stdout' can be used to force # the demon to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null -logfile stdout +logfile %%REDIS_LOGDIR%%/redis.log # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where +@@ -64,7 +64,7 @@ + + # For default save/load DB in/from the working directory + # Note that you must specify a directory not a file name. +-dir ./ ++dir %%REDIS_DBDIR%%/ + + ################################# REPLICATION ################################# + Property changes on: head/databases/redis1/files/patch-redis.conf ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/databases/redis2/Makefile =================================================================== --- head/databases/redis2/Makefile (revision 248011) +++ head/databases/redis2/Makefile (revision 248012) @@ -1,58 +1,65 @@ # New ports collection makefile for: redis # Date created: 03 Jul 2009 # Whom: Sergey Skvortsov # # $FreeBSD$ # PORTNAME= redis -PORTVERSION= 1.02 +PORTVERSION= 1.2.0 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE -MAINTAINER= skv@FreeBSD.org +MAINTAINER= osa@FreeBSD.org COMMENT= A persistent key-value database with built-in net interface LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - CFLAGS+= -I${LOCALBASE}/include +USE_GMAKE= yes USE_RC_SUBR= redis.sh BIN_FILES= redis-server redis-benchmark redis-cli PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKDIR}/pkg-message REDIS_USER?= redis REDIS_UID?= 535 REDIS_GROUP?= redis REDIS_GID?= 535 REDIS_DBDIR?= /var/db/redis REDIS_RUNDIR?= /var/run/redis REDIS_LOGDIR?= /var/log/redis SUB_FILES= pkg-message pkg-install SUB_LIST+= PORTNAME="${PORTNAME}" \ REDIS_USER="${REDIS_USER}" \ REDIS_UID="${REDIS_UID}" \ REDIS_GROUP="${REDIS_GROUP}" \ REDIS_GID="${REDIS_GID}" \ REDIS_LOGDIR="${REDIS_LOGDIR}" \ REDIS_DBDIR="${REDIS_DBDIR}" \ REDIS_RUNDIR="${REDIS_RUNDIR}" + +PATTERN= '10d;13s|$$$$(ARCH) ||' +.if !defined(WITH_DEBUG) +PATTERN:= ${PATTERN:S/'$/;14s|^|\#|'/} +.endif + +post-patch: + ${REINPLACE_CMD} ${PATTERN} ${WRKSRC}/Makefile post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf do-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/!} ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Property changes on: head/databases/redis2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/databases/redis2/distinfo =================================================================== --- head/databases/redis2/distinfo (revision 248011) +++ head/databases/redis2/distinfo (revision 248012) @@ -1,3 +1,3 @@ -MD5 (redis-1.02.tar.gz) = 5396e2d8b67f451ab4702ce7655533ae -SHA256 (redis-1.02.tar.gz) = aa1fe425568e19bcf89db9a48df68a42732134c29978e27c6e9c05008a73321e -SIZE (redis-1.02.tar.gz) = 202973 +MD5 (redis-1.2.0.tar.gz) = e33cb95cfa5c4f7086eea57e1e490d28 +SHA256 (redis-1.2.0.tar.gz) = 88fdc5433de3a0c77895b6b5f86d69b7a8a8575d042af68ba1cb24c996faa9bf +SIZE (redis-1.2.0.tar.gz) = 202685 Property changes on: head/databases/redis2/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/databases/redis2/files/patch-redis.conf =================================================================== --- head/databases/redis2/files/patch-redis.conf (revision 248011) +++ head/databases/redis2/files/patch-redis.conf (revision 248012) @@ -1,34 +1,34 @@ ---- redis.conf -+++ redis.conf +--- redis.conf.orig 2009-12-27 11:54:09.000000000 +0300 ++++ redis.conf 2009-12-27 11:56:16.000000000 +0300 @@ -2,11 +2,11 @@ # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. -daemonize no +daemonize yes # When run as a daemon, Redis write a pid file in /var/run/redis.pid by default. # You can specify a custom pid file location here. -pidfile /var/run/redis.pid +pidfile %%REDIS_RUNDIR%%/redis.pid # Accept connections on the specified port, default is 6379 port 6379 -@@ -39,7 +39,7 @@ - - # For default save/load DB in/from the working directory - # Note that you must specify a directory not a file name. --dir ./ -+dir %%REDIS_DBDIR%%/ - - # Set server verbosity to 'debug' - # it can be one of: -@@ -51,7 +51,7 @@ +@@ -29,7 +29,7 @@ # Specify the log file name. Also 'stdout' can be used to force # the demon to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null -logfile stdout +logfile %%REDIS_LOGDIR%%/redis.log # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where +@@ -64,7 +64,7 @@ + + # For default save/load DB in/from the working directory + # Note that you must specify a directory not a file name. +-dir ./ ++dir %%REDIS_DBDIR%%/ + + ################################# REPLICATION ################################# + Property changes on: head/databases/redis2/files/patch-redis.conf ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property