From 3bcdd2d4fe27e2e54ae493bfb6092cc7361ce415 Mon Sep 17 00:00:00 2001 From: salo Date: Sun, 6 Jun 2004 11:47:30 +0000 Subject: PKGREVISION++ - Rework where silc-server is installed, make it consistent with silc-client changes. - Minor cleanups. --- chat/silc-server/DESCR | 1 - chat/silc-server/Makefile | 17 +++++----- chat/silc-server/PLIST | 72 ++++++++++++++++++++--------------------- chat/silc-server/files/motd.txt | 2 +- 4 files changed, 46 insertions(+), 46 deletions(-) (limited to 'chat/silc-server') diff --git a/chat/silc-server/DESCR b/chat/silc-server/DESCR index 9125eef301d..ea7c1a3c57d 100644 --- a/chat/silc-server/DESCR +++ b/chat/silc-server/DESCR @@ -1,4 +1,3 @@ - SILC (Secure Internet Live Conferencing) is a protocol which provides secure conferencing services in the Internet over insecure channel. diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index d878581edf6..35e39d3ecd9 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2004/03/20 05:15:45 snj Exp $ +# $NetBSD: Makefile,v 1.33 2004/06/06 11:47:30 salo Exp $ # DISTNAME= silc-server-0.9.18 +PKGREVISION= 1 CATEGORIES= chat security MASTER_SITES= http://www.silcnet.org/download/server/sources/ \ ftp://ftp.silcnet.org/silc/server/sources/ \ @@ -29,10 +30,9 @@ SILCD_GROUP?= silcd PKG_GROUPS= ${SILCD_GROUP} PKG_USERS= ${SILCD_USER}:${SILCD_GROUP}::SILC\\ Server\\ user -PKG_SYSCONFSUBDIR?= silcd - -EGDIR= ${PREFIX}/share/examples/silcd +PKG_SYSCONFSUBDIR?= ${PKGBASE} +EGDIR= ${PREFIX}/share/examples/${PKGBASE} MAKE_ENV+= examplesdir=${EGDIR} CONF_FILES_MODE= 0600 @@ -53,17 +53,18 @@ RCD_SCRIPT_SRC.silcd= ${FILESDIR}/silcd.generic OWN_DIRS_PERMS+= /var/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700 -CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/silcd -CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/silcd +CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE} +CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/${PKGBASE} CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-silcd-config-file=${PKG_SYSCONFDIR}/silcd.conf -CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/silcd/modules +CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/${PKGBASE}/modules CONFIGURE_ARGS+= --with-logsdir=/var/log/silcd CONFIGURE_ARGS+= --with-silcd-pid-file=/var/run/silcd.pid CONFIGURE_ARGS+= --without-iconv CONFIGURE_ARGS+= --without-libtoolfix -# Avoid an ICE in gcc2 on sparc64 +# XXX: Avoid an ICE in gcc2 on sparc64 +# CONFIGURE_ENV+= F77=${FALSE} BUILD_DEFS+= USE_INET6 diff --git a/chat/silc-server/PLIST b/chat/silc-server/PLIST index 2b1a193b054..d69abbda31d 100644 --- a/chat/silc-server/PLIST +++ b/chat/silc-server/PLIST @@ -1,39 +1,39 @@ -@comment $NetBSD: PLIST,v 1.14 2004/04/23 22:07:52 reed Exp $ -lib/silcd/libsilc-1.0.so.3 -lib/silcd/libsilc-1.0.so.3.0 -lib/silcd/libsilc.la -lib/silcd/libsilc.so -lib/silcd/modules/aes.sim.so -lib/silcd/modules/blowfish.sim.so -lib/silcd/modules/cast.sim.so -lib/silcd/modules/md5.sim.so -lib/silcd/modules/none.sim.so -lib/silcd/modules/rc5.sim.so -lib/silcd/modules/rsa.sim.so -lib/silcd/modules/sha1.sim.so -lib/silcd/modules/twofish.sim.so +@comment $NetBSD: PLIST,v 1.15 2004/06/06 11:47:30 salo Exp $ +lib/silc-server/libsilc-1.0.so.3 +lib/silc-server/libsilc-1.0.so.3.0 +lib/silc-server/libsilc.la +lib/silc-server/libsilc.so +lib/silc-server/modules/aes.sim.so +lib/silc-server/modules/blowfish.sim.so +lib/silc-server/modules/cast.sim.so +lib/silc-server/modules/md5.sim.so +lib/silc-server/modules/none.sim.so +lib/silc-server/modules/rc5.sim.so +lib/silc-server/modules/rsa.sim.so +lib/silc-server/modules/sha1.sim.so +lib/silc-server/modules/twofish.sim.so man/man5/silcd.conf.5 man/man8/silcd.8 sbin/silcd -share/doc/silcd/CHANGES -share/doc/silcd/COPYING -share/doc/silcd/CREDITS -share/doc/silcd/CodingStyle -share/doc/silcd/FAQ -share/doc/silcd/INSTALL -share/doc/silcd/README -share/doc/silcd/TODO -share/examples/silcd/README -share/examples/silcd/cell_backup.conf -share/examples/silcd/cell_router.conf -share/examples/silcd/cell_server1.conf -share/examples/silcd/cell_server2.conf -share/examples/silcd/motd.txt.default -share/examples/silcd/silcalgs.conf.default -share/examples/silcd/silcd.conf.default -share/examples/silcd/silcd.prv -share/examples/silcd/silcd.pub -@dirrm share/examples/silcd -@dirrm share/doc/silcd -@dirrm lib/silcd/modules -@dirrm lib/silcd +share/doc/silc-server/CHANGES +share/doc/silc-server/COPYING +share/doc/silc-server/CREDITS +share/doc/silc-server/CodingStyle +share/doc/silc-server/FAQ +share/doc/silc-server/INSTALL +share/doc/silc-server/README +share/doc/silc-server/TODO +share/examples/silc-server/README +share/examples/silc-server/cell_backup.conf +share/examples/silc-server/cell_router.conf +share/examples/silc-server/cell_server1.conf +share/examples/silc-server/cell_server2.conf +share/examples/silc-server/motd.txt.default +share/examples/silc-server/silcalgs.conf.default +share/examples/silc-server/silcd.conf.default +share/examples/silc-server/silcd.prv +share/examples/silc-server/silcd.pub +@dirrm share/examples/silc-server +@dirrm share/doc/silc-server +@dirrm lib/silc-server/modules +@dirrm lib/silc-server diff --git a/chat/silc-server/files/motd.txt b/chat/silc-server/files/motd.txt index 1dd22c766bf..516492e929c 100644 --- a/chat/silc-server/files/motd.txt +++ b/chat/silc-server/files/motd.txt @@ -18,7 +18,7 @@ - are located in the following ,' ,-----' | \ - directory: `--{__________) \/ - (FL) -- @PREFIX@/share/examples/silcd/ +- @PREFIX@/share/examples/silc-server/ - -------------------------------------------------------------- - For more information about SILC browse to http://silcnet.org -- cgit v1.2.3