pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/ham/dpbox Implemented changes for this package to use ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/af35e04a8a47
branches: trunk
changeset: 511753:af35e04a8a47
user: wulf <wulf%pkgsrc.org@localhost>
date: Fri Apr 21 02:07:53 2006 +0000
description:
Implemented changes for this package to use the REQD_DIR and CONF_FILES
framework for the installation of the configuration files.
Fixed compile warning message due to implicit casting
diffstat:
ham/dpbox/DEINSTALL | 17 --------
ham/dpbox/Makefile | 57 +++++++++++++++++++++++---
ham/dpbox/PLIST | 4 +-
ham/dpbox/distinfo | 22 +++++++--
ham/dpbox/files/dpbox.ini | 2 +
ham/dpbox/patches/patch-aa | 88 ++++++++++++++++++++++++++++++-----------
ham/dpbox/patches/patch-ag | 57 ++++++++++++++++++++++++--
ham/dpbox/patches/patch-ak | 65 +++++++++++++++++++++++++++++-
ham/dpbox/patches/patch-an | 26 ++++++++++-
ham/dpbox/patches/patch-ao | 26 ++++++++++-
ham/dpbox/patches/patch-aq | 31 ++++++++++++++
ham/dpbox/patches/patch-ar | 63 ++++++++++++++++++++++++++++++
ham/dpbox/patches/patch-as | 13 ++++++
ham/dpbox/patches/patch-at | 56 ++++++++++++++++++++++++++
ham/dpbox/patches/patch-au | 31 ++++++++++++++
ham/dpbox/patches/patch-av | 46 ++++++++++++++++++++++
ham/dpbox/patches/patch-aw | 13 ++++++
ham/dpbox/patches/patch-ax | 24 +++++++++++
ham/dpbox/patches/patch-ay | 96 ++++++++++++++++++++++++++++++++++++++++++++++
ham/dpbox/patches/patch-az | 12 +++++
20 files changed, 676 insertions(+), 73 deletions(-)
diffs (truncated from 960 to 300 lines):
diff -r ea01555b4bbc -r af35e04a8a47 ham/dpbox/DEINSTALL
--- a/ham/dpbox/DEINSTALL Thu Apr 20 23:22:04 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 21:39:47 zuntum Exp $
-#
-
-case "$2" in
- DEINSTALL) cat <<EOF
-
-=============================================================
-Note that the dpbox configuration and BBS server files in
-(@DPBOX_CONF_DIR@/*) and (@DPBOX_SPOOL_DIR@/*) are
-not removed in the deinstallation process.
-
-You should remove those by hand if you no longer need them.
-=============================================================
-
-EOF
- ;;
-esac
diff -r ea01555b4bbc -r af35e04a8a47 ham/dpbox/Makefile
--- a/ham/dpbox/Makefile Thu Apr 20 23:22:04 2006 +0000
+++ b/ham/dpbox/Makefile Fri Apr 21 02:07:53 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:29 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/21 02:07:53 wulf Exp $
#
DISTNAME= dpbox-60000
PKGNAME= dpbox-6.00.00
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= ham
MASTER_SITES= http://home.snafu.de/wahlm/dl8hbs/
@@ -19,12 +19,55 @@
.include "../../mk/bsd.prefs.mk"
-DPBOX_CONF_DIR= ${PREFIX}/share/dpbox/conf
+PKG_SYSCONFDIR.dpbox=${PREFIX}/share/dpbox/conf
+
+DPBOX_CONF_DIR= ${PKG_SYSCONFDIR}
DPBOX_SPOOL_DIR=/var/spool/dpbox
-FILES_SUBST+= DPBOX_CONF_DIR=${DPBOX_CONF_DIR} \
- DPBOX_SPOOL_DIR=${DPBOX_SPOOL_DIR}
-DEINSTALL_SRC= ${PKGDIR}/DEINSTALL
-INSTALL_SRC= # empty
+FILES_SUBST+= DPBOX_CONF_DIR=${DPBOX_CONF_DIR:Q} \
+ DPBOX_SPOOL_DIR=${DPBOX_SPOOL_DIR:Q}
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}/conf
+
+REQD_DIRS= ${PKG_SYSCONFDIR} \
+ ${PKG_SYSCONFDIR}/sf \
+ ${PKG_SYSCONFDIR}/system \
+ ${DPBOX_SPOOL_DIR}/crawler \
+ ${DPBOX_SPOOL_DIR}/fileserv \
+ ${DPBOX_SPOOL_DIR}/fileserv/incoming \
+ ${DPBOX_SPOOL_DIR}/fileserv/temp7pl \
+ ${DPBOX_SPOOL_DIR}/fileserv/newbin \
+ ${DPBOX_SPOOL_DIR}/indexes \
+ ${DPBOX_SPOOL_DIR}/infofiles \
+ ${DPBOX_SPOOL_DIR}/import \
+ ${DPBOX_SPOOL_DIR}/newmail \
+ ${DPBOX_SPOOL_DIR}/privserv \
+ ${DPBOX_SPOOL_DIR}/privserv/temp7pl \
+ ${DPBOX_SPOOL_DIR}/proto \
+ ${DPBOX_SPOOL_DIR}/save \
+ ${DPBOX_SPOOL_DIR}/server \
+ ${DPBOX_SPOOL_DIR}/stat \
+ ${DPBOX_SPOOL_DIR}/stat/extusers
+
+CONF_FILES= ${EGDIR}/dpbox.ini ${PKG_SYSCONFDIR}/dpbox.ini \
+ ${EGDIR}/crawler/stopwords ${DPBOX_SPOOL_DIR}/crawler/stopwords \
+ ${EGDIR}/sf/db0xyz.sf ${PKG_SYSCONFDIR}/sf/db0xyz.sf \
+ ${EGDIR}/system/badwords.box ${PKG_SYSCONFDIR}/system/badwords.box \
+ ${EGDIR}/system/bcast.box ${PKG_SYSCONFDIR}/system/bcast.box \
+ ${EGDIR}/system/beacon.box ${PKG_SYSCONFDIR}/system/beacon.box \
+ ${EGDIR}/system/commands.box ${PKG_SYSCONFDIR}/system/commands.box \
+ ${EGDIR}/system/config.box ${PKG_SYSCONFDIR}/system/config.box \
+ ${EGDIR}/system/convlt.box ${PKG_SYSCONFDIR}/system/convlt.box \
+ ${EGDIR}/system/convtit.box ${PKG_SYSCONFDIR}/system/convtit.box \
+ ${EGDIR}/system/cookies.doc ${PKG_SYSCONFDIR}/system/cookies.doc \
+ ${EGDIR}/system/digimap.stn ${PKG_SYSCONFDIR}/system/digimap.stn \
+ ${EGDIR}/system/prefix.inf ${PKG_SYSCONFDIR}/system/prefix.inf \
+ ${EGDIR}/system/prefix.sub ${PKG_SYSCONFDIR}/system/prefix.sub \
+ ${EGDIR}/system/prvcalls.box ${PKG_SYSCONFDIR}/system/prvcalls.box \
+ ${EGDIR}/system/reject.box ${PKG_SYSCONFDIR}/system/reject.box \
+ ${EGDIR}/system/rubriken.box ${PKG_SYSCONFDIR}/system/rubriken.box \
+ ${EGDIR}/system/tcpip.box ${PKG_SYSCONFDIR}/system/tcpip.box \
+ ${EGDIR}/system/transfer.box ${PKG_SYSCONFDIR}/system/transfer.box \
+ ${EGDIR}/system/unproto.box ${PKG_SYSCONFDIR}/system/unproto.box \
+ ${EGDIR}/system/whotalks.lan ${PKG_SYSCONFDIR}/system/whotalks.box
post-build:
${SED} -e 's#@prefix@#${PREFIX}#g' \
diff -r ea01555b4bbc -r af35e04a8a47 ham/dpbox/PLIST
--- a/ham/dpbox/PLIST Thu Apr 20 23:22:04 2006 +0000
+++ b/ham/dpbox/PLIST Fri Apr 21 02:07:53 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:39:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/21 02:07:53 wulf Exp $
bin/dpgate
bin/dpcodeconv
bin/dpmybbs
@@ -64,6 +64,7 @@
share/dpbox/language/SPC.LAN
share/dpbox/language/SW.LAN
share/examples/dpbox/conf/dpbox.ini
+share/examples/dpbox/conf/crawler/stopwords
share/examples/dpbox/conf/sf/db0xyz.sf
share/examples/dpbox/conf/system/badwords.box
share/examples/dpbox/conf/system/bcast.box
@@ -116,6 +117,7 @@
@dirrm share/dpbox/language
@dirrm share/examples/dpbox/conf/sf
@dirrm share/examples/dpbox/conf/system
+@dirrm share/examples/dpbox/conf/crawler
@dirrm share/examples/dpbox/conf
@dirrm share/examples/dpbox
@dirrm libexec/dpbox
diff -r ea01555b4bbc -r af35e04a8a47 ham/dpbox/distinfo
--- a/ham/dpbox/distinfo Thu Apr 20 23:22:04 2006 +0000
+++ b/ham/dpbox/distinfo Fri Apr 21 02:07:53 2006 +0000
@@ -1,20 +1,30 @@
-$NetBSD: distinfo,v 1.9 2006/01/24 22:27:07 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/04/21 02:07:53 wulf Exp $
SHA1 (dpbox-60000.tar.gz) = 73a55785f499324f57736c7fb3cc0bd1001facd3
RMD160 (dpbox-60000.tar.gz) = 05a14f7601b531fcdd0bc0252d171eed3bfafb7f
Size (dpbox-60000.tar.gz) = 957010 bytes
-SHA1 (patch-aa) = 8235aa600edffd952c1d932c0ee8011ba0896d08
+SHA1 (patch-aa) = d0ed5ba4118f872a04796d74897e62d42d72e284
SHA1 (patch-ab) = abeee7b86844c8937792ef09a938caf232574fb3
SHA1 (patch-ac) = f81ea8e6441bd3bf95d8d60660cf9b407895a070
SHA1 (patch-ad) = 589a69328b5959f81b86739a6e3c32f6d1d71ffe
SHA1 (patch-ae) = 82c22fd343ab353012c822d84d39c8018b285f83
SHA1 (patch-af) = a875f03b78a1afb444fa9301e24b5718f0f285cc
-SHA1 (patch-ag) = d193fc0245b35f1f897886352ad4c3a6ec5cd438
+SHA1 (patch-ag) = 7f0a7fa59aa48a0aaf940558b4de3498fb00dacd
SHA1 (patch-ah) = 6501eb257f10c4907d875a14d134bfb5fe6736f1
SHA1 (patch-ai) = 9d96b644d0b29a6bfc787202d2c42223570b1ee5
-SHA1 (patch-ak) = 387c0f79590f37329439ba5990e165577855a054
+SHA1 (patch-ak) = be90e11c83d474e8c5b25e2510334a0cb145286b
SHA1 (patch-al) = 79b6a63442336b8824763a95512b87f90550aaff
SHA1 (patch-am) = 510dbc978691543bba8da95be33cc3ba3f2c18fe
-SHA1 (patch-an) = 8b01dcb543e179437dcea32d377af8b06a287cbd
-SHA1 (patch-ao) = b83ff4a2158755c3231bba79496501f7268e4403
+SHA1 (patch-an) = 8f385b6bbaeb16dd5f3206262e9bba00b050d451
+SHA1 (patch-ao) = 6a0b4bcfe08346c44a57edbc049e3ebcff8b668f
SHA1 (patch-ap) = f4bdfc134803f280dfebef013d09d291f0a19e6e
+SHA1 (patch-aq) = 550c726ff658cc5b0b2d0ad2cff00545a5281b3d
+SHA1 (patch-ar) = 8fb3d40c39ff2a4ba83ad563c0389a9e01898e9c
+SHA1 (patch-as) = 0cd800c7bef8b8ab216aedd6eec18177cf16a8c7
+SHA1 (patch-at) = 53ae592225a089e33011cb2ee059e2dc28b637cd
+SHA1 (patch-au) = 170dc7507ed637ae39a30235485c64823817f04c
+SHA1 (patch-av) = d8fd927a763cff03f038150950fc4eeb0f171a88
+SHA1 (patch-aw) = 93607d109698386ad819f32841bab1e197632aab
+SHA1 (patch-ax) = 34c9d90538b94a85a7d36d4a27f3de633e92e807
+SHA1 (patch-ay) = f493bbbf11716a48e3b18363a2dcf4a8522094f3
+SHA1 (patch-az) = 4a2c67f63e62308fb7af36f69df030a5e5e79775
diff -r ea01555b4bbc -r af35e04a8a47 ham/dpbox/files/dpbox.ini
--- a/ham/dpbox/files/dpbox.ini Thu Apr 20 23:22:04 2006 +0000
+++ b/ham/dpbox/files/dpbox.ini Fri Apr 21 02:07:53 2006 +0000
@@ -76,3 +76,5 @@
# filename of dpbox-pid-file
# usually, don't change it, except if you plan to start more than one DPBOX...
proc_file dpbox.pid
+@DPBOX_CONF_DIR@
+@DPBOX_SPOOL_DIR@
diff -r ea01555b4bbc -r af35e04a8a47 ham/dpbox/patches/patch-aa
--- a/ham/dpbox/patches/patch-aa Thu Apr 20 23:22:04 2006 +0000
+++ b/ham/dpbox/patches/patch-aa Fri Apr 21 02:07:53 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2003/06/07 15:20:31 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2006/04/21 02:07:54 wulf Exp $
---- Makefile.netbsd.orig 2000-04-27 14:48:57.000000000 +0200
-+++ Makefile.netbsd
+--- Makefile.netbsd.orig 2000-04-27 22:18:57.000000000 +0930
++++ Makefile.netbsd 2006-04-21 10:41:09.000000000 +0930
@@ -1,9 +1,9 @@
###############################################################################
# #
@@ -15,7 +15,7 @@
# Author : Berndt Josef Wulf, VK5ABN #
# #
###############################################################################
-@@ -19,11 +19,12 @@ INSTALL_DATA = ${INSTALL} -m 444
+@@ -19,11 +19,12 @@
INSTALL_CONF = ${INSTALL} -m 440
MKDIR = mkdir -p
LN = ln -sf
@@ -30,7 +30,18 @@
docdir = $(prefix)/share/doc/dpbox
landir = $(prefix)/share/dpbox/language
spooldir = /var/spool/dpbox
-@@ -100,7 +101,8 @@ install: all
+@@ -63,10 +64,6 @@
+
+ OTHER_SRCS = dpputlinks.c dpcodeconv.c dpgate.c crawler.c dpmybbs.c
+
+-SUBDIRS = indexes infofiles newmail import save crawler \
+- fileserv fileserv/incoming fileserv/temp7pl fileserv/newbin \
+- privserv privserv/temp7pl proto server stat stat/extusers
+-
+ all: dpbox crawler cgi toolbox
+
+ tgz:
+@@ -100,7 +97,8 @@
$(INSTALL_PROGRAM) dpputlinks $(bindir)
$(INSTALL_PROGRAM) dpcodeconv $(bindir)
$(INSTALL_PROGRAM) dpmybbs $(bindir)
@@ -40,20 +51,45 @@
$(MKDIR) $(docdir)
$(INSTALL_DATA) ../document/* $(docdir)
-@@ -148,6 +150,9 @@ install: all
- echo "* and manually adjust the configuration files where *"; \
- echo "* necessary. *"; \
- echo "* *"; \
-+ echo "* A number of example configuration files can be found *"; \
-+ echo "* in the ${exampledir} directory. *"; \
-+ echo "* *"; \
- echo "***********************************************************"; \
- else \
- $(MKDIR) $(confdir); \
-@@ -158,24 +163,45 @@ install: all
- $(INSTALL_CONF) ../sf/* $(confdir)/sf; \
- fi
+@@ -123,59 +121,51 @@
+ $(LN) HELP_SYS.DL $(landir)/HELP_SYS.HB
+ $(LN) HELP_SYS.DL $(landir)/HELP_SYS.OE1
+
+- for i in $(SUBDIRS); \
+- do \
+- $(MKDIR) $(spooldir)/$$i; \
+- done;
+-
+ $(MKDIR) $(prefix)/libexec/dpbox
+ $(INSTALL) -m 555 ../run/* $(prefix)/libexec/dpbox
+ $(INSTALL_PROGRAM) crawler $(prefix)/libexec/dpbox
+- $(INSTALL_DATA) ../crawler/stopwords $(spooldir)/crawler
+- @if [ -f ${confdir}/dpbox.ini ]; then \
+- echo "***********************************************************"; \
+- echo "* *"; \
+- echo "* W A R N I N G *"; \
+- echo "* ============= *"; \
+- echo "* *"; \
+- echo "* A previously installed version of DPBOX was dected *"; \
+- echo "* on this system. The installation of the configuration *"; \
+- echo "* files was suspended in order to preserve the *"; \
+- echo "* old configuration. *"; \
+- echo "* *"; \
+- echo "* Please refer to the documentation and CHANGE logfile *"; \
+- echo "* and manually adjust the configuration files where *"; \
+- echo "* necessary. *"; \
+- echo "* *"; \
+- echo "***********************************************************"; \
+- else \
+- $(MKDIR) $(confdir); \
+- $(INSTALL_CONF) ../dpbox.ini $(confdir)/dpbox.ini; \
+- $(MKDIR) $(confdir)/system; \
+- $(INSTALL_CONF) ../system/* $(confdir)/system ; \
+- $(MKDIR) $(confdir)/sf ; \
+- $(INSTALL_CONF) ../sf/* $(confdir)/sf; \
+- fi
+-
- @if [ -e ${cgidir} ]; then \
- echo "installing cgi-scripts"; \
- $(INSTALL) -m 755 ../cgi/cgi/* $(cgidir); \
@@ -72,12 +108,14 @@
- @echo
- @echo Now edit the configuration files in $(confdir) and
- @echo $(confdir)/dpbox.ini!!!
-+ $(MKDIR) $(exampledir); \
-+ $(INSTALL_CONF) ../dpbox.ini $(exampledir)/dpbox.ini; \
-+ $(MKDIR) $(exampledir)/system; \
-+ $(INSTALL_CONF) ../system/* $(exampledir)/system ; \
-+ $(MKDIR) $(exampledir)/sf ; \
-+ $(INSTALL_CONF) ../sf/* $(exampledir)/sf; \
++ $(MKDIR) $(exampledir)
++ $(INSTALL_CONF) ../dpbox.ini $(exampledir)/dpbox.ini
++ $(MKDIR) $(exampledir)/crawler
++ $(INSTALL_DATA) ../crawler/stopwords $(exampledir)/crawler
++ $(MKDIR) $(exampledir)/system
++ $(INSTALL_CONF) ../system/* $(exampledir)/system
++ $(MKDIR) $(exampledir)/sf
++ $(INSTALL_CONF) ../sf/* $(exampledir)/sf
+
+ $(MKDIR) $(cgidir)
+ echo "installing cgi-scripts";
@@ -114,7 +152,7 @@
clean:
$(RM) *.o *~ .*~ *.orig *.bak *.s *.core
-@@ -193,4 +219,3 @@ dep:
+@@ -193,4 +183,3 @@
Home |
Main Index |
Thread Index |
Old Index