- Remove (DE)INSTALL scripts; replace them with @sample and friends

- Bump PKGNAME

ok strum@ pvalchev@

www/wwwcount/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2003/10/18 19:45:01 sturm Exp $
+# $OpenBSD: Makefile,v 1.24 2004/11/20 17:59:17 alek Exp $
 
 COMMENT=	"access counter, clock and date for WWW pages"
 
 DISTNAME=	wwwcount2.5
-PKGNAME=	wwwcount-2.5
+PKGNAME=	wwwcount-2.5p0
 CATEGORIES=	www
 MASTER_SITES=	http://wwwcount.yeehaw.net/mirror/$S/ \
 		http://mirror.njit.edu/counter/$S/ \

www/wwwcount/pkg/DEINSTALL

@@ -1,27 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2004/04/13 21:27:02 xsa Exp $
-#
-# wwwcount de-installation
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-COUNT_DIR=/var/www/wwwcount
-COUNT_SCRIPT=/var/www/cgi-bin/Count.cgi
-
-rm -f ${COUNT_SCRIPT}
-if [ ${PKG_DELETE_EXTRA} != Yes -a -d ${COUNT_DIR} ]; then
-	echo
-	echo "+---------------"
-	echo "| To completely deinstall the $1 package you need to perform"
-	echo "| these steps as root:"
-	echo "|"
-	echo "|           rm -rf ${COUNT_DIR}"
-	echo "|           rm -f /var/www/logs/Count.log"
-	echo "|"
-	echo "| Do not do this if you plan on re-installing $1"
-	echo "| at some future time."
-	echo "+---------------"
-	echo
-fi
-
-exit 0

www/wwwcount/pkg/INSTALL

@@ -1,77 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.2 2002/04/26 03:35:34 pvalchev Exp $
-#
-# Pre/post-installation setup of wwwcount
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-DATA_DIR=/var/www/wwwcount/data
-CONFIG_DIR=/var/www/wwwcount/conf
-CONFIG_FILE=${CONFIG_DIR}/count.cfg
-SAMPLE_CONFIG_FILE=${PREFIX}/lib/wwwcount/count.cfg.sample
-COUNT_SCRIPT=${PREFIX}/lib/wwwcount/Count.cgi
-CGI_DIR=/var/www/cgi-bin
-
-# Function: tell the user what s/he needs to do to use the port just installed
-#
-do_notice()
-{
-	echo
-	echo "+---------------"
-	echo "| The existing $1 configuration file,"
-	echo "| ${CONFIG_FILE}, has NOT been changed."
-	echo "| You may want to compare it to the current sample file, "
-	echo "| ${SAMPLE_CONFIG_FILE}, and update"
-	echo "| your configuration as needed."
-	echo "+---------------"
-	echo
-}
-
-# Function: install the wwwcount config file from the sample
-#
-do_install()
-{
-	umask 022
-	[ -d ${DATA_DIR} ] || mkdir -p ${DATA_DIR}
-	[ -d ${CONFIG_DIR} ] || mkdir -p ${CONFIG_DIR}
-	cp ${SAMPLE_CONFIG_FILE} ${CONFIG_FILE}
-	echo
-	echo "+---------------"
-	echo "| The $1 configuration file, ${CONFIG_FILE},"
-	echo "| has been installed.  Please view this file and change"
-	echo "| the configuration to meet your needs."
-	echo "+---------------"
-	echo
-}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-	PRE-INSTALL)
-		: nothing to pre-install for this port
-		;;
-	POST-INSTALL)
-		install -o root -g bin -m 111 ${COUNT_SCRIPT} ${CGI_DIR}
-		if [ -f $CONFIG_FILE ]; then
-			do_notice $1
-		else
-			do_install $1
-		fi
-		;;
-	*)
-		echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-		exit 1
-		;;
-esac
-
-exit 0

www/wwwcount/pkg/PLIST

@@ -1,9 +1,18 @@
-@comment $OpenBSD: PLIST,v 1.10 2004/09/15 18:49:53 espie Exp $
+@comment $OpenBSD: PLIST,v 1.11 2004/11/20 17:59:17 alek Exp $
 bin/extdgts
 bin/mkstrip
 lib/wwwcount/
 lib/wwwcount/Count.cgi
+@group bin
+@mode 111
+@sample /var/www/cgi-bin/Count.cgi
+@mode
+@group
+@sample /var/www/wwwcount/
+@sample /var/www/wwwcount/conf/
+@sample /var/www/wwwcount/data/
 lib/wwwcount/count.cfg.sample
+@sample /var/www/wwwcount/conf/count.cfg
 lib/wwwcount/digits/
 lib/wwwcount/digits/A/
 lib/wwwcount/digits/A/peng.gif
@@ -171,6 +180,5 @@ share/doc/wwwcount/prehtml/test.prehtml
 share/doc/wwwcount/prehtml/toc.prehtml
 share/doc/wwwcount/prehtml/us_mirrors.prehtml
 share/doc/wwwcount/prehtml/whatsnew.prehtml
-@cwd /var/www/logs
-@extra Count.log
-@extraunexec rm -rf /var/www/wwwcount
+@extra /var/www/logs/Count.log
+@extraunexec rm -rf /var/www/wwwcount/data/*