From owner-freebsd-apache@FreeBSD.ORG Thu Aug 26 11:00:44 2004 Return-Path: Delivered-To: freebsd-apache@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED6DC16A4D2 for ; Thu, 26 Aug 2004 11:00:44 +0000 (GMT) Received: from atlas.informatik.rwth-aachen.de (atlas.informatik.RWTH-Aachen.DE [137.226.194.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id D858C43D2F for ; Thu, 26 Aug 2004 11:00:43 +0000 (GMT) (envelope-from stolz@i2.informatik.rwth-aachen.de) Received: from i2.informatik.rwth-aachen.de (menelaos.informatik.RWTH-Aachen.DE [137.226.194.73]) with ESMTP id i7QB0gkL020141 for ; Thu, 26 Aug 2004 13:00:42 +0200 Received: (from stolz@localhost)i7QB0gDj042254 for apache@freebsd.org; Thu, 26 Aug 2004 13:00:42 +0200 (CEST) (envelope-from stolz) Date: Thu, 26 Aug 2004 13:00:42 +0200 From: Volker Stolz To: apache@freebsd.org Message-ID: <20040826110042.GJ90982@i2.informatik.rwth-aachen.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="9Ek0hoCL9XbhcSqy" Content-Disposition: inline X-PGP-Key: finger vs@foldr.org X-PGP-Id: 0x3FD1B6B5 User-Agent: Mutt/1.5.6i Subject: Improvements to mod_dav [patch] X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Aug 2004 11:00:45 -0000 --9Ek0hoCL9XbhcSqy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Please review: - Remove pkg-plist in favour of PLIST_FILES (oh, yeah, great ;) - Automatically follow instructions in apache.conf.mod_dav to setup the two files req'd for locking to work. Cheers, Volker -- http://www-i2.informatik.rwth-aachen.de/stolz/ *** PGP *** S/MIME L-Attriwutgrammatik --9Ek0hoCL9XbhcSqy Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="mod_dav.diff" Index: Makefile =================================================================== RCS file: /usr/freebsdcvs/cvs-ports/ports/www/mod_dav/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- Makefile 18 Aug 2004 16:21:49 -0000 1.14 +++ Makefile 26 Aug 2004 10:15:05 -0000 @@ -18,6 +18,9 @@ # This port will work with the following version of Apache and anything newer. APACHE_VERSION= 1.3.6 +PKGDEINSTALL= ${PKGINSTALL} +PLIST_FILES= etc/apache/apache.conf.mod_dav libexec/apache/libdav.so + USE_APACHE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ @@ -45,6 +48,9 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/apache.conf.mod_dav ${PREFIX}/etc/apache +.if !defined(PACKAGE_BUILDING) + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.endif @${ECHO_MSG} "*******************************************************" @${ECHO_MSG} "* Please review the mod_dav configuration in the main" @${ECHO_MSG} "* Apache configuration file." Index: pkg-install =================================================================== RCS file: pkg-install diff -N pkg-install --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-install 26 Aug 2004 10:17:06 -0000 @@ -0,0 +1,23 @@ +#!/bin/sh + +USER=www +GROUP=${USER} +CHMOD=/bin/chmod +CHOWN=/usr/sbin/chown +TOUCH=/usr/bin/touch + +case $2 in +POST-INSTALL) + for i in DAVLock.dir DAVLock.pag ; do + ${TOUCH} /var/db/$i + ${CHOWN} ${USER}:${GROUP} /var/db/$i + ${CHMOD} 640 /var/db/$i + done + ;; +POST-DEINSTALL) + for i in DAVLock.dir DAVLock.pag ; do + rm -f /var/db/$i + done + ;; +esac +exit 0 --9Ek0hoCL9XbhcSqy--