pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/silc-client PKGREVISION++
details: https://anonhg.NetBSD.org/pkgsrc/rev/52c3581bb9c2
branches: trunk
changeset: 476300:52c3581bb9c2
user: salo <salo%pkgsrc.org@localhost>
date: Sun Jun 06 11:45:06 2004 +0000
description:
PKGREVISION++
- Rework how and where is silc-client installed (in preparation for
silc-toolkit import).
- Rework PLIST.perl handling, now it works with threaded Perl as well.
- Minor cleanups.
diffstat:
chat/silc-client/DESCR | 1 -
chat/silc-client/Makefile | 35 +++-
chat/silc-client/Makefile.common | 6 +-
chat/silc-client/PLIST | 269 ++++++++++++++++++-------------------
chat/silc-client/PLIST.perl | 32 +--
chat/silc-client/distinfo | 4 +-
chat/silc-client/patches/patch-ab | 22 +++
chat/silc-client/patches/patch-ac | 13 +
8 files changed, 207 insertions(+), 175 deletions(-)
diffs (truncated from 465 to 300 lines):
diff -r b92c6338d6db -r 52c3581bb9c2 chat/silc-client/DESCR
--- a/chat/silc-client/DESCR Sun Jun 06 09:41:50 2004 +0000
+++ b/chat/silc-client/DESCR Sun Jun 06 11:45:06 2004 +0000
@@ -1,4 +1,3 @@
-
SILC (Secure Internet Live Conferencing) is a protocol which provides
secure conferencing services in the Internet over insecure channel.
diff -r b92c6338d6db -r 52c3581bb9c2 chat/silc-client/Makefile
--- a/chat/silc-client/Makefile Sun Jun 06 09:41:50 2004 +0000
+++ b/chat/silc-client/Makefile Sun Jun 06 11:45:06 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2004/02/18 14:40:35 salo Exp $
+# $NetBSD: Makefile,v 1.35 2004/06/06 11:45:06 salo Exp $
#
DISTNAME= ${SILC_CLIENT_DISTNAME}
+PKGREVISION= 1
CATEGORIES= chat security
MASTER_SITES= http://www.silcnet.org/download/client/sources/ \
ftp://ftp.silcnet.org/silc/client/sources/ \
@@ -23,18 +24,18 @@
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= libtool */libtool */*/*/libtool
-PKG_SYSCONFSUBDIR?= silc
+PKG_SYSCONFSUBDIR?= ${PKGBASE}
-MAKE_ENV+= examplesdir=${PREFIX}/share/examples/silc
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+MAKE_ENV+= examplesdir=${EGDIR}
-CONF_FILES+= ${PREFIX}/share/examples/silc/silc.conf.default \
- ${PKG_SYSCONFDIR}/silc.conf
+CONF_FILES+= ${EGDIR}/silc.conf.default ${PKG_SYSCONFDIR}/silc.conf
-CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/silc
-CONFIGURE_ARGS+= --with-helpdir=${PREFIX}/share/silc/help
-CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/silc
+CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE}
+CONFIGURE_ARGS+= --with-helpdir=${PREFIX}/share/${PKGBASE}/help
+CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/${PKGBASE}
CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/silc/modules
+CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/${PKGBASE}/modules
CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_DIR}
CONFIGURE_ARGS+= --with-terminfo
CONFIGURE_ARGS+= --without-libtoolfix
@@ -62,11 +63,12 @@
# in your /etc/mk.conf
.if defined(SILC_CLIENT_WITH_PERL) && !empty(SILC_CLIENT_WITH_PERL:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+= --with-perl-lib=${PREFIX}/lib/silc/perl5
+CONFIGURE_ARGS+= --with-perl-lib=${PREFIX}/lib/${PKGBASE}/perl5
PERL5_REQD+= 5.6.1nb10
.include "../../lang/perl5/buildlink3.mk"
DEPENDS+= p5-File-MMagic>=1.20:../../misc/p5-File-MMagic
PLIST_SRC+= ${PKGDIR}/PLIST.perl
+PLIST_SRC+= ${WRKDIR}/PLIST.perl
.else
CONFIGURE_ARGS+= --with-perl=no
.endif
@@ -86,6 +88,19 @@
post-install:
${INSTALL_DATA} ${WRKSRC}/irssi/config.h ${SILC_CLIENT_CONFIG_H}
${INSTALL_DATA} ${WRKSRC}/irssi/irssi-config ${SILC_CLIENT_CONFIG}
+.if defined(SILC_CLIENT_WITH_PERL) && !empty(SILC_CLIENT_WITH_PERL:M[Yy][Ee][Ss])
+ ${INSTALL_DATA_DIR} ${PREFIX}/libexec/${PKGBASE}/scripts
+ ${INSTALL_DATA} ${WRKSRC}/irssi/scripts/*.pl \
+ ${PREFIX}/libexec/${PKGBASE}/scripts
+# Create PLIST fragment for Perl modules.
+#
+ @cd ${PREFIX} && \
+ ( \
+ ${FIND} lib/${PKGBASE}/perl5 -type f > ${WRKDIR}/PLIST.perl; \
+ ${FIND} lib/${PKGBASE}/perl5 -type d | ${SORT} -r | \
+ ${SED} 's,^,@dirrm ,g' >> ${WRKDIR}/PLIST.perl \
+ )
+.endif
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/glib/buildlink3.mk"
diff -r b92c6338d6db -r 52c3581bb9c2 chat/silc-client/Makefile.common
--- a/chat/silc-client/Makefile.common Sun Jun 06 09:41:50 2004 +0000
+++ b/chat/silc-client/Makefile.common Sun Jun 06 11:45:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2004/01/14 17:09:26 salo Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/06/06 11:45:06 salo Exp $
#
# Distribution specific information.
@@ -11,5 +11,5 @@
# These files are generated during silc-client's build, but are required by
# plugins to compile properly.
#
-SILC_CLIENT_CONFIG= ${PREFIX}/share/silc/irssi-config
-SILC_CLIENT_CONFIG_H= ${PREFIX}/share/silc/config.h
+SILC_CLIENT_CONFIG= ${PREFIX}/share/silc-client/irssi-config
+SILC_CLIENT_CONFIG_H= ${PREFIX}/share/silc-client/config.h
diff -r b92c6338d6db -r 52c3581bb9c2 chat/silc-client/PLIST
--- a/chat/silc-client/PLIST Sun Jun 06 09:41:50 2004 +0000
+++ b/chat/silc-client/PLIST Sun Jun 06 11:45:06 2004 +0000
@@ -1,141 +1,132 @@
-@comment $NetBSD: PLIST,v 1.19 2004/02/05 20:14:05 skrll Exp $
+@comment $NetBSD: PLIST,v 1.20 2004/06/06 11:45:06 salo Exp $
bin/silc
-lib/silc/libsilc-1.0.so.3
-lib/silc/libsilc-1.0.so.3.0
-lib/silc/libsilc.la
-lib/silc/libsilc.so
-lib/silc/libsilcclient-1.0.so.2
-lib/silc/libsilcclient-1.0.so.2.0
-lib/silc/libsilcclient.la
-lib/silc/libsilcclient.so
-lib/silc/modules/aes.sim.so
-lib/silc/modules/blowfish.sim.so
-lib/silc/modules/cast.sim.so
-lib/silc/modules/md5.sim.so
-lib/silc/modules/none.sim.so
-lib/silc/modules/rc5.sim.so
-lib/silc/modules/rsa.sim.so
-lib/silc/modules/sha1.sim.so
-lib/silc/modules/twofish.sim.so
+lib/silc-client/libsilc-1.0.so.3
+lib/silc-client/libsilc-1.0.so.3.0
+lib/silc-client/libsilc.la
+lib/silc-client/libsilc.so
+lib/silc-client/libsilcclient-1.0.so.2
+lib/silc-client/libsilcclient-1.0.so.2.0
+lib/silc-client/libsilcclient.la
+lib/silc-client/libsilcclient.so
+lib/silc-client/modules/aes.sim.so
+lib/silc-client/modules/blowfish.sim.so
+lib/silc-client/modules/cast.sim.so
+lib/silc-client/modules/md5.sim.so
+lib/silc-client/modules/none.sim.so
+lib/silc-client/modules/rc5.sim.so
+lib/silc-client/modules/rsa.sim.so
+lib/silc-client/modules/sha1.sim.so
+lib/silc-client/modules/twofish.sim.so
man/man1/silc.1
-share/doc/silc/CHANGES
-share/doc/silc/COPYING
-share/doc/silc/CREDITS
-share/doc/silc/CodingStyle
-share/doc/silc/FAQ
-share/doc/silc/INSTALL
-share/doc/silc/README
-share/doc/silc/TODO
-share/doc/silc/formats.txt
-share/doc/silc/manual.txt
-share/doc/silc/signals.txt
-share/doc/silc/special_vars.txt
-share/doc/silc/startup-HOWTO.html
-share/examples/silc/silc.conf.default
-share/silc/config.h
-share/silc/help/action
-share/silc/help/admin
-share/silc/help/alias
-share/silc/help/attr
-share/silc/help/away
-share/silc/help/ban
-share/silc/help/beep
-share/silc/help/bind
-share/silc/help/cat
-share/silc/help/cd
-share/silc/help/channel
-share/silc/help/clear
-share/silc/help/close
-share/silc/help/cmode
-share/silc/help/connect
-share/silc/help/cumode
-share/silc/help/cycle
-share/silc/help/date
-share/silc/help/dehilight
-share/silc/help/detach
-share/silc/help/disconnect
-share/silc/help/echo
-share/silc/help/eval
-share/silc/help/exec
-share/silc/help/file
-share/silc/help/format
-share/silc/help/getkey
-share/silc/help/help
-share/silc/help/hilight
-share/silc/help/ignore
-share/silc/help/info
-share/silc/help/invite
-share/silc/help/invitelist
-share/silc/help/join
-share/silc/help/key
-share/silc/help/kick
-share/silc/help/kickban
-share/silc/help/kill
-share/silc/help/knockout
-share/silc/help/lastlog
-share/silc/help/layout
-share/silc/help/levels
-share/silc/help/list
-share/silc/help/listkeys
-share/silc/help/load
-share/silc/help/log
-share/silc/help/me
-share/silc/help/mmsg
-share/silc/help/motd
-share/silc/help/msg
-share/silc/help/names
-share/silc/help/nick
-share/silc/help/notice
-share/silc/help/oper
-share/silc/help/part
-share/silc/help/perlflush
-share/silc/help/ping
-share/silc/help/query
-share/silc/help/quit
-share/silc/help/reconnect
-share/silc/help/reload
-share/silc/help/rmreconns
-share/silc/help/rmrejoins
-share/silc/help/save
-share/silc/help/sconnect
-share/silc/help/script
-share/silc/help/scrollback
-share/silc/help/server
-share/silc/help/set
-share/silc/help/shutdown
-share/silc/help/silcnet
-share/silc/help/silcoper
-share/silc/help/smsg
-share/silc/help/stats
-share/silc/help/statusbar
-share/silc/help/toggle
-share/silc/help/topic
-share/silc/help/umode
-share/silc/help/unalias
-share/silc/help/unignore
-share/silc/help/unload
-share/silc/help/unquery
-share/silc/help/users
-share/silc/help/version
-share/silc/help/watch
-share/silc/help/whois
-share/silc/help/whowas
-share/silc/help/window
-share/silc/irssi-config
-share/silc/scripts/autoop.pl
-share/silc/scripts/beep.pl
-share/silc/scripts/clones.pl
-share/silc/scripts/dns.pl
-share/silc/scripts/hello.pl
-share/silc/scripts/mail-maildir.pl
-share/silc/scripts/mail.pl
-share/silc/scripts/silc-mime.pl
-share/silc/themes/default.theme
-@dirrm share/silc/themes
-@dirrm share/silc/scripts
-@dirrm share/silc/help
-@dirrm share/silc
-@dirrm share/examples/silc
-@dirrm share/doc/silc
-@dirrm lib/silc/modules
-@dirrm lib/silc
+share/doc/silc-client/CHANGES
+share/doc/silc-client/COPYING
+share/doc/silc-client/CREDITS
+share/doc/silc-client/CodingStyle
+share/doc/silc-client/FAQ
+share/doc/silc-client/INSTALL
+share/doc/silc-client/README
+share/doc/silc-client/TODO
+share/doc/silc-client/formats.txt
+share/doc/silc-client/manual.txt
+share/doc/silc-client/signals.txt
+share/doc/silc-client/special_vars.txt
+share/doc/silc-client/startup-HOWTO.html
+share/examples/silc-client/silc.conf.default
+share/silc-client/config.h
+share/silc-client/help/action
+share/silc-client/help/admin
+share/silc-client/help/alias
+share/silc-client/help/attr
+share/silc-client/help/away
+share/silc-client/help/ban
+share/silc-client/help/beep
+share/silc-client/help/bind
+share/silc-client/help/cat
+share/silc-client/help/cd
+share/silc-client/help/channel
+share/silc-client/help/clear
+share/silc-client/help/close
+share/silc-client/help/cmode
+share/silc-client/help/connect
+share/silc-client/help/cumode
+share/silc-client/help/cycle
+share/silc-client/help/date
+share/silc-client/help/dehilight
+share/silc-client/help/detach
+share/silc-client/help/disconnect
+share/silc-client/help/echo
+share/silc-client/help/eval
Home |
Main Index |
Thread Index |
Old Index