summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/netsaint-base/MESSAGE9
-rw-r--r--net/netsaint-base/Makefile18
-rw-r--r--net/netsaint-base/Makefile.common6
-rw-r--r--net/netsaint-base/PLIST4
-rw-r--r--net/netsaint-base/files/netsaint-setup.sh10
5 files changed, 18 insertions, 29 deletions
diff --git a/net/netsaint-base/MESSAGE b/net/netsaint-base/MESSAGE
index 574fedcbb82..346c86f7988 100644
--- a/net/netsaint-base/MESSAGE
+++ b/net/netsaint-base/MESSAGE
@@ -1,11 +1,10 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:25 wiz Exp $
+$NetBSD: MESSAGE,v 1.4 2003/05/01 19:14:12 jmmv Exp $
Before using the netsaint-base package for the first time, you need to
-run the ${PREFIX}/etc/netsaint/netsaint-setup.sh script (as root) and
-then set up the configuration files. You can copy the sample
-configuration files from ${PREFIX}/share/examples/netsaint to
-${PREFIX}/etc/netsaint and then edit them accordingly.
+set up the configuration files. These can be copied from
+${PREFIX}/share/examples/netsaint to ${PKG_SYSCONFDIR}
+and then edited accordingly.
The documentation is installed in ${PREFIX}/share/netsaint/docs.
diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile
index e51a14f3c11..3efc2b10dad 100644
--- a/net/netsaint-base/Makefile
+++ b/net/netsaint-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2003/01/28 22:03:54 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/01 19:14:12 jmmv Exp $
#
DISTNAME= netsaint-0.0.7
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 1
+PKGREVISION= 2
MASTER_SITES= http://www.netsaint.org/download/
MAINTAINER= murray@river-styx.org
@@ -17,20 +17,20 @@ USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --with-ping-command='/sbin/ping -n -c %d %s'
-INSTALL_TARGET= install install-config
+OWN_DIRS_PERMS=
+.for dir in /var/log/netsaint /var/log/netsaint/archives \
+ /var/run/netsaint /var/run/netsaint/rw
+OWN_DIRS_PERMS+= ${dir} ${NETSAINT_USER} ${NETSAINT_GROUP} 0755
+.endfor
+.undef dir
-post-configure:
- ${SED} < ${FILESDIR}/netsaint-setup.sh > ${WRKDIR}/netsaint-setup.sh \
- -e 's:@@USER@@:${NETSAINT_USER}:g' \
- -e 's:@@GROUP@@:${NETSAINT_GROUP}:g'
+INSTALL_TARGET= install install-config
post-build:
cd ${WRKDIR}; uudecode ${FILESDIR}/logofullsize.gif.uu
cd ${WRKDIR}; uudecode ${FILESDIR}/sblogo.gif.uu
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/etc/netsaint
- ${INSTALL_SCRIPT} ${WRKDIR}/netsaint-setup.sh ${PREFIX}/etc/netsaint
${INSTALL_DATA} ${WRKDIR}/logofullsize.gif ${PREFIX}/share/netsaint/images
${INSTALL_DATA} ${WRKDIR}/sblogo.gif ${PREFIX}/share/netsaint/images
diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common
index 6d9103284f2..3f557fa2de2 100644
--- a/net/netsaint-base/Makefile.common
+++ b/net/netsaint-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2002/04/15 21:10:27 rh Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/05/01 19:14:12 jmmv Exp $
#
CATEGORIES= net sysutils
@@ -21,7 +21,9 @@ USE_GMAKE= YES
USE_PERL5= YES
-CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/netsaint
+PKG_SYSCONFSUBDIR= netsaint
+
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/netsaint
CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/netsaint
diff --git a/net/netsaint-base/PLIST b/net/netsaint-base/PLIST
index a96860f6736..1165c4f7b63 100644
--- a/net/netsaint-base/PLIST
+++ b/net/netsaint-base/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/14 10:57:11 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/05/01 19:14:12 jmmv Exp $
bin/netsaint
-etc/netsaint/netsaint-setup.sh
libexec/netsaint/cgi-bin/avail.cgi
libexec/netsaint/cgi-bin/cmd.cgi
libexec/netsaint/cgi-bin/config.cgi
@@ -286,4 +285,3 @@ share/netsaint/stylesheets/trends.css
@dirrm share/examples/netsaint
@dirrm libexec/netsaint/cgi-bin
@dirrm libexec/netsaint
-@dirrm etc/netsaint
diff --git a/net/netsaint-base/files/netsaint-setup.sh b/net/netsaint-base/files/netsaint-setup.sh
deleted file mode 100644
index a9165b81161..00000000000
--- a/net/netsaint-base/files/netsaint-setup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-#ident "@(#)$NetBSD: netsaint-setup.sh,v 1.3 2002/04/14 10:57:11 rh Exp $"
-#
-# Run this script as root to create these necessary runtime directories.
-#
-install -m 0755 -o @@USER@@ -g @@GROUP@@ -d /var/log/netsaint
-install -m 0755 -o @@USER@@ -g @@GROUP@@ -d /var/log/netsaint/archives
-install -m 0755 -o @@USER@@ -g @@GROUP@@ -d /var/run/netsaint
-install -m 0775 -o @@USER@@ -g @@GROUP@@ -d /var/run/netsaint/rw