Index: pkg-deinstall
===================================================================
RCS file: pkg-deinstall
diff -N pkg-deinstall
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg-deinstall	20 Jun 2002 01:48:20 -0000
@@ -0,0 +1,107 @@
+#!/bin/sh
+#
+#	$FreeBSD$
+#
+# Created by: hetzels@westbend.net
+
+PKG_USER=${PKG_USER:=www}
+PKG_GROUP=${PKG_GROUP:=www}
+
+PKG_PREFIX=${PKG_PREFIX}
+HOST_NAME=`/bin/hostname`
+
+AP_CGI=${PKG_PREFIX}/www/cgi-bin
+AP_CONF=${PKG_PREFIX}/etc/apache
+AP_DATA=${PKG_PREFIX}/www/data
+AP_SHARE=${PKG_PREFIX}/share/doc/apache
+
+IMAGES_DIR=${AP_SHARE}/manual/images
+IMAGES_VTI=${AP_DATA}/images/_vti_cnf
+
+remove_user()
+{
+	if [ ! -x /usr/sbin/pw ]; then
+		echo "*** Unable to remove the Apache user and group (${PKG_USER}/${PKG_GROUP})"
+		exit 69
+	fi
+
+	if pw usershow ${PKG_USER} -q > /dev/null; then
+		olduid=`pw show user ${PKG_USER} 2> /dev/null | cut -d: -f3`
+		oldgid=`pw show group ${PKG_GROUP} 2> /dev/null | cut -d: -f3`
+		if [ ${olduid} -ne 80 ]; then
+			echo "To delete Apache user permanently, use 'pw userdel ${PKG_USER}'"
+		fi
+		if [ ${oldgid} -ne 80 ]; then
+			echo "To delete Apache group permanently, use 'pw groupdel ${PKG_GROUP}'"
+		fi
+	fi
+}
+
+remove_file()
+{
+	local source_dir=$1
+	local target_dir=$2
+	local file=$3
+	local ret=1
+
+	if [ -f ${target_dir}/${file} ]; then
+	    if cmp -s ${source_dir}/${file} ${target_dir}/${file} ; then
+		rm -f ${target_dir}/${file}
+		ret=0
+	    fi
+	fi
+
+	return ${ret}
+}
+
+remove_apache_doc_root ()
+{
+    if [ -d ${AP_CGI} ]; then
+	for file in `ls ${AP_CGI}.default`
+	{
+	    remove_file ${AP_CGI}.default ${AP_CGI} ${file}
+	}
+    fi
+
+    if [ -d ${AP_DATA} ]; then
+	if [ -d ${AP_DATA}/images ] ; then
+	    for file in apache_pb.gif fplogo.gif powerlogo.gif
+	    {
+		if remove_file ${IMAGES_DIR} ${AP_DATA}/images ${file}; then
+		    if [ -d ${IMAGES_VTI} -a -f ${IMAGES_VTI}/${file} ] ; then
+			rm ${IMAGES_VTI}/${file}
+		    fi
+		fi
+	    }
+	    if [ -d ${IMAGES_VTI} ]; then
+		rmdir ${IMAGES_VTI}
+	    fi
+	fi
+
+	remove_file ${AP_SHARE} ${AP_DATA} index.html.en
+    fi
+}
+
+remove_httpd_conf ()
+{
+    if [ -f ${AP_CONF}/httpd.conf ] ; then
+	/bin/cat ${AP_CONF}/httpd.conf.default | \
+	    /usr/bin/sed -e 's;@@HOSTNAME@@;'${HOST_NAME}';' \
+	    > ${AP_CONF}/httpd.conf.tmp
+	if cmp -s ${AP_CONF}/httpd.conf ${AP_CONF}/httpd.conf.tmp ; then
+		rm -f ${AP_CONF}/httpd.conf
+	fi
+	rm ${AP_CONF}/httpd.conf.tmp
+    fi
+}
+
+case $2 in
+    DEINSTALL)
+	remove_apache_doc_root
+	remove_httpd_conf
+	;;
+    POST-DEINSTALL)
+	remove_user
+	;;
+
+esac
Index: pkg-install
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/pkg-install,v
retrieving revision 1.6
diff -u -r1.6 pkg-install
--- pkg-install	28 Dec 2001 00:39:45 -0000	1.6
+++ pkg-install	20 Jun 2002 00:41:57 -0000
@@ -134,10 +134,10 @@
 	create_user
 	;;
     POST-INSTALL)
+	create_apache_doc_root
+	fix_httpd_conf
 	# If we are not in batch mode
-        if [ "${PKG_BATCH}" = "NO" ]; then
-	    create_apache_doc_root
-	    fix_httpd_conf
+	if [ "${PKG_BATCH}" = "NO" ]; then
 	    ${FPINSTALL}
 	    fix_frontpage_cnf
 	    comment_files
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/apache13-fp/pkg-plist,v
retrieving revision 1.21
diff -u -r1.21 pkg-plist
--- pkg-plist	19 Jun 2002 20:53:27 -0000	1.21
+++ pkg-plist	20 Jun 2002 01:31:20 -0000
@@ -1,3 +1,4 @@
+bin/checkgid
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -645,7 +646,10 @@
 @dirrm share/doc/apache/manual/vhosts
 @dirrm share/doc/apache/manual
 @dirrm share/doc/apache
+@dirrm www/cgi-bin
 @dirrm www/cgi-bin.default
+@dirrm www/data/images
+@dirrm www/data
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
-