From 3f276b07ea706918128e9ea7553355a313b71f6b Mon Sep 17 00:00:00 2001 From: uebayasi Date: Thu, 25 Jan 2007 01:11:06 +0000 Subject: o Use CONF_FILES appropriately. o Install kahua-package skelton files into share/kahua/skel. --- www/kahua/Makefile | 6 +++++- www/kahua/PLIST | 24 +++++++++++++++++++++++- www/kahua/distinfo | 8 ++++++-- www/kahua/patches/patch-ab | 44 ++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 76 insertions(+), 6 deletions(-) (limited to 'www/kahua') diff --git a/www/kahua/Makefile b/www/kahua/Makefile index 21344c84cde..c21d1efd37c 100644 --- a/www/kahua/Makefile +++ b/www/kahua/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/01/19 13:45:35 uebayasi Exp $ +# $NetBSD: Makefile,v 1.2 2007/01/25 01:11:06 uebayasi Exp $ DISTNAME= Kahua-1.0.1 PKGNAME= ${DISTNAME:C/Kahua/kahua/} @@ -16,6 +16,10 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFBASEDIR:Q} CONFIGURE_ARGS+=--localstatedir=${DESTDIR:Q}/var +PKG_SYSCONFSUBDIR= kahua +EGDIR= ${PREFIX}/share/examples/kahua +CONF_FILES= ${EGDIR}/kahua.conf ${PKG_SYSCONFDIR}/kahua.conf + USE_TOOLS+= gzip makeinfo INFO_FILES= yes diff --git a/www/kahua/PLIST b/www/kahua/PLIST index 68e7c4373c7..e8ceeb048ad 100644 --- a/www/kahua/PLIST +++ b/www/kahua/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/19 13:45:35 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.2 2007/01/25 01:11:06 uebayasi Exp $ bin/kahua-admin bin/kahua-config bin/kahua-dbutil @@ -52,6 +52,28 @@ lib/kahua/kahua/user.scm lib/kahua/kahua/util.scm lib/kahua/kahua/xml-template.scm libexec/kahua/kahua.cgi +share/kahua/skel/AUTHORS +share/kahua/skel/COPYING +share/kahua/skel/ChangeLog +share/kahua/skel/DIST +share/kahua/skel/DIST_EXCLUDE +share/kahua/skel/INSTALL +share/kahua/skel/MESSAGES +share/kahua/skel/Makefile.in +share/kahua/skel/README +share/kahua/skel/app-servers +share/kahua/skel/configure.ac +share/kahua/skel/install-sh +share/kahua/skel/plugins/proj.scm +share/kahua/skel/proj-start.in +share/kahua/skel/proj-stop.in +share/kahua/skel/proj.conf.in +share/kahua/skel/proj/proj.css +share/kahua/skel/proj/proj.kahua +share/kahua/skel/proj/version.kahua.in +share/kahua/skel/templates/page.xml +share/kahua/skel/test/test.conf.in +share/kahua/skel/test/test.scm.in @dirrm libexec/kahua @dirrm lib/kahua/kahua/test @dirrm lib/kahua/kahua/protocol diff --git a/www/kahua/distinfo b/www/kahua/distinfo index 492b31e5a41..9e16488cc37 100644 --- a/www/kahua/distinfo +++ b/www/kahua/distinfo @@ -1,7 +1,11 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/01/19 13:45:35 uebayasi Exp $ +$NetBSD: distinfo,v 1.2 2007/01/25 01:11:06 uebayasi Exp $ SHA1 (Kahua-1.0.1.tgz) = 0731eca481de7612595cd950d03b7d1baf66c579 RMD160 (Kahua-1.0.1.tgz) = f4ff55bed258486faccbf647344fe719c548a823 Size (Kahua-1.0.1.tgz) = 491246 bytes SHA1 (patch-aa) = 0c0bf9c7795f62b979053019e0a82f12a332f96d -SHA1 (patch-ab) = 0f4a3d0b7e1daf51952d83f89967e0e6230365bc +SHA1 (patch-ab) = 15c7c0af689a1b8468117ba0a5dd2d7c670b406d +SHA1 (patch-ac) = e2f08ec88317278b387735ca5f93b876254a7ad9 +SHA1 (patch-ad) = 930fd30fa4e3a55df9b2dace903e633dfe8eca7e +SHA1 (patch-ae) = 090b3edc8153269666b0ac96179290b69522c05f +SHA1 (patch-af) = e79ad018369c19ffde53bbc300bab1ec5479ee5b diff --git a/www/kahua/patches/patch-ab b/www/kahua/patches/patch-ab index 3adad9c3c45..3c2d73a96eb 100644 --- a/www/kahua/patches/patch-ab +++ b/www/kahua/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2007/01/19 13:45:35 uebayasi Exp $ +$NetBSD: patch-ab,v 1.2 2007/01/25 01:11:06 uebayasi Exp $ --- src/Makefile.in.orig 2006-12-27 23:10:08.000000000 +0900 +++ src/Makefile.in -@@ -32,7 +32,7 @@ INSTALL_TYPE = @INSTALL_TYPE@ +@@ -32,9 +32,11 @@ INSTALL_TYPE = @INSTALL_TYPE@ SCM_INSTALL_DIR = $(libdir) SCRIPT_INSTALL_DIR = $(bindir) KAHUA_STATICDIR = @KAHUA_STATICDIR@ @@ -10,4 +10,44 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/01/19 13:45:35 uebayasi Exp $ +SOCKET_BASE_DIR = $(localstatedir)/tmp/$(package) TMP_BASE_DIR = $(localstatedir)/tmp KAHUA_VERSION = $(shell cat $(top_srcdir)/VERSION) ++EG_DIR = $(datarootdir)/examples/$(package) ++SKEL_DIR = $(datadir)/skel + MAKE_SH_SCRIPT = $(GOSH) $(top_srcdir)/src/make-script.scm "$(GOSH)" "$(libdir)" + +@@ -150,7 +152,7 @@ clean: + rm -rf $(TESTENV_DIR) + + install: all +- $(INSTALL) -m 0755 -d $(sysconfdir) $(libexecdir) ++ $(INSTALL) -m 0755 -d $(sysconfdir) $(libexecdir) $(SKEL_DIR) + $(INSTALL) $(KAHUA_GROUP_OPTION) -m 0775 -d $(localstatedir) + $(INSTALL) $(KAHUA_GROUP_OPTION) -m 0770 -d $(localstatedir)/checkout $(localstatedir)/logs + $(INSTALL) $(KAHUA_USER_OPTION) $(KAHUA_GROUP_OPTION) -m 0770 -d $(SOCKET_BASE_DIR) $(TMP_BASE_DIR) +@@ -159,21 +161,15 @@ install: all + fi + $(INSTALL) -m 0444 -T $(SCM_INSTALL_DIR) -S $(srcdir) $(SCMFILES) + $(INSTALL) -m 0555 -T $(SCRIPT_INSTALL_DIR) $(SH_SCRIPTS) +- @if test ! -f $(sysconfdir)/kahua.conf; then \ +- $(INSTALL) -m 0644 kahua.conf $(sysconfdir)/kahua.conf; \ +- fi ++ $(INSTALL) -m 0644 kahua.conf $(EG_DIR)/kahua.conf + @if test ! -f $(localstatedir)/user.conf; then \ + $(INSTALL) $(KAHUA_GROUP_OPTION) -m 0660 user.conf.sample $(localstatedir)/user.conf; \ + fi +- @if test -d $(sysconfdir)/skel; then \ +- rm -rf $(sysconfdir)/skel.bak; \ +- mv $(sysconfdir)/skel $(sysconfdir)/skel.bak; \ +- fi +- @if test ! -d $(sysconfdir)/skel; then \ +- cp -R ../skel $(sysconfdir)/skel; \ +- mv $(sysconfdir)/skel/TEMPLATE_DIST $(sysconfdir)/skel/DIST; \ +- mv $(sysconfdir)/skel/TEMPLATE_DIST_EXCLUDE $(sysconfdir)/skel/DIST_EXCLUDE; \ ++ @if test -f ../skel/TEMPLATE_DIST; then \ ++ mv ../skel/TEMPLATE_DIST ../skel/DIST; \ ++ mv ../skel/TEMPLATE_DIST_EXCLUDE ../skel/DIST_EXCLUDE; \ + fi ++ cp -R ../skel/* $(SKEL_DIR) + + uninstall: + $(INSTALL) -U $(SCM_INSTALL_DIR) -S $(srcdir) $(SCMFILES) -- cgit v1.2.3