diff options
author | salo <salo@pkgsrc.org> | 2004-06-06 11:45:06 +0000 |
---|---|---|
committer | salo <salo@pkgsrc.org> | 2004-06-06 11:45:06 +0000 |
commit | 5bd41dd0f9014c76ec290a3b3030230f0660739c (patch) | |
tree | 3bfc52cf5414d19e165ab91b4ac884eb191d76d8 | |
parent | 85ee7fcbfa5f0b7bb35ea66905490efbee76894a (diff) | |
download | pkgsrc-5bd41dd0f9014c76ec290a3b3030230f0660739c.tar.gz |
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.
-rw-r--r-- | chat/silc-client/DESCR | 1 | ||||
-rw-r--r-- | chat/silc-client/Makefile | 35 | ||||
-rw-r--r-- | chat/silc-client/Makefile.common | 6 | ||||
-rw-r--r-- | chat/silc-client/PLIST | 269 | ||||
-rw-r--r-- | chat/silc-client/PLIST.perl | 32 | ||||
-rw-r--r-- | chat/silc-client/distinfo | 4 | ||||
-rw-r--r-- | chat/silc-client/patches/patch-ab | 22 | ||||
-rw-r--r-- | chat/silc-client/patches/patch-ac | 13 |
8 files changed, 207 insertions, 175 deletions
diff --git a/chat/silc-client/DESCR b/chat/silc-client/DESCR index 9125eef301d..ea7c1a3c57d 100644 --- a/chat/silc-client/DESCR +++ b/chat/silc-client/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-client/Makefile b/chat/silc-client/Makefile index 382536b44bd..fcca0be2b65 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -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_GNU_TOOLS+= make 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 @@ CONFIGURE_ARGS+= --enable-ipv6 # 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 @@ PLIST_SRC+= ${PKGDIR}/PLIST 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 --git a/chat/silc-client/Makefile.common b/chat/silc-client/Makefile.common index 7154a6a54ed..a8d090d3462 100644 --- a/chat/silc-client/Makefile.common +++ b/chat/silc-client/Makefile.common @@ -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 @@ SILC_CLIENT_DISTFILE= ${SILC_CLIENT_DISTNAME}${SILC_CLIENT_EXTRACT_SUFX} # 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 --git a/chat/silc-client/PLIST b/chat/silc-client/PLIST index f6e223e67b3..1a0493f037b 100644 --- a/chat/silc-client/PLIST +++ b/chat/silc-client/PLIST @@ -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 +share/silc-client/help/exec +share/silc-client/help/file +share/silc-client/help/format +share/silc-client/help/getkey +share/silc-client/help/help +share/silc-client/help/hilight +share/silc-client/help/ignore +share/silc-client/help/info +share/silc-client/help/invite +share/silc-client/help/invitelist +share/silc-client/help/join +share/silc-client/help/key +share/silc-client/help/kick +share/silc-client/help/kickban +share/silc-client/help/kill +share/silc-client/help/knockout +share/silc-client/help/lastlog +share/silc-client/help/layout +share/silc-client/help/levels +share/silc-client/help/list +share/silc-client/help/listkeys +share/silc-client/help/load +share/silc-client/help/log +share/silc-client/help/me +share/silc-client/help/mmsg +share/silc-client/help/motd +share/silc-client/help/msg +share/silc-client/help/names +share/silc-client/help/nick +share/silc-client/help/notice +share/silc-client/help/oper +share/silc-client/help/part +share/silc-client/help/perlflush +share/silc-client/help/ping +share/silc-client/help/query +share/silc-client/help/quit +share/silc-client/help/reconnect +share/silc-client/help/reload +share/silc-client/help/rmreconns +share/silc-client/help/rmrejoins +share/silc-client/help/save +share/silc-client/help/sconnect +share/silc-client/help/script +share/silc-client/help/scrollback +share/silc-client/help/server +share/silc-client/help/set +share/silc-client/help/shutdown +share/silc-client/help/silcnet +share/silc-client/help/silcoper +share/silc-client/help/smsg +share/silc-client/help/stats +share/silc-client/help/statusbar +share/silc-client/help/toggle +share/silc-client/help/topic +share/silc-client/help/umode +share/silc-client/help/unalias +share/silc-client/help/unignore +share/silc-client/help/unload +share/silc-client/help/unquery +share/silc-client/help/users +share/silc-client/help/version +share/silc-client/help/watch +share/silc-client/help/whois +share/silc-client/help/whowas +share/silc-client/help/window +share/silc-client/irssi-config +share/silc-client/themes/default.theme +@dirrm share/silc-client/themes +@dirrm share/silc-client/help +@dirrm share/silc-client +@dirrm share/examples/silc-client +@dirrm share/doc/silc-client +@dirrm lib/silc-client/modules +@dirrm lib/silc-client diff --git a/chat/silc-client/PLIST.perl b/chat/silc-client/PLIST.perl index 6752c9b54ff..74982a5769e 100644 --- a/chat/silc-client/PLIST.perl +++ b/chat/silc-client/PLIST.perl @@ -1,21 +1,11 @@ -@comment $NetBSD: PLIST.perl,v 1.4 2002/05/03 21:51:56 hubertf Exp $ -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/Irssi.pm -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/Irssi/TextUI.pm -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/Irssi/UI.pm -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/.packlist -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/Irssi.bs -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/Irssi.so -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/TextUI/.packlist -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/TextUI/TextUI.bs -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/TextUI/TextUI.so -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/UI/.packlist -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/UI/UI.bs -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/UI/UI.so -lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/perllocal.pod -@dirrm lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/UI -@dirrm lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi/TextUI -@dirrm lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Irssi -@dirrm lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/auto -@dirrm lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/Irssi -@dirrm lib/silc/perl5/${MACHINE_ARCH}-${LOWER_OPSYS} -@dirrm lib/silc/perl5 +@comment $NetBSD: PLIST.perl,v 1.5 2004/06/06 11:45:06 salo Exp $ +libexec/silc-client/scripts/autoop.pl +libexec/silc-client/scripts/beep.pl +libexec/silc-client/scripts/clones.pl +libexec/silc-client/scripts/dns.pl +libexec/silc-client/scripts/hello.pl +libexec/silc-client/scripts/mail-maildir.pl +libexec/silc-client/scripts/mail.pl +libexec/silc-client/scripts/silc-mime.pl +@dirrm libexec/silc-client/scripts +@dirrm libexec/silc-client diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo index 3311af1090f..5119fdfd058 100644 --- a/chat/silc-client/distinfo +++ b/chat/silc-client/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.25 2004/01/14 17:09:26 salo Exp $ +$NetBSD: distinfo,v 1.26 2004/06/06 11:45:06 salo Exp $ SHA1 (silc-client-1.0.1.tar.bz2) = e53a8f9577282734723fe9ad8eaf5d3bce035048 Size (silc-client-1.0.1.tar.bz2) = 1404404 bytes SHA1 (patch-aa) = b9ae5da26840b193d3c9484c975af89294fa8049 +SHA1 (patch-ab) = fffda0e4c9a9227c1eb8d8646a02ce9ec5cdefef +SHA1 (patch-ac) = 3102941eea03bbd78d361fb0e00bfedb064d93f5 diff --git a/chat/silc-client/patches/patch-ab b/chat/silc-client/patches/patch-ab new file mode 100644 index 00000000000..89112b2eb24 --- /dev/null +++ b/chat/silc-client/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.11 2004/06/06 11:45:06 salo Exp $ + +--- irssi/Makefile.in.orig 2004-01-14 14:29:02.000000000 +0100 ++++ irssi/Makefile.in 2004-06-05 14:36:55.000000000 +0200 +@@ -258,7 +258,7 @@ + target_alias = @target_alias@ + @BUILD_PLUGINS_TRUE@PLUGINS = plugins + @BUILD_SERVERTEST_TRUE@SERVERTEST = servertest +-SUBDIRS = src docs scripts ++SUBDIRS = src docs + + # + # INCLUDE defines +@@ -283,7 +283,7 @@ + #confdir = $(sysconfdir) + confdir = $(silc_etcdir) + conffile = silc.conf +-themedir = $(datadir)/silc/themes ++themedir = $(datadir)/silc-client/themes + theme_DATA = default.theme + noinst_HEADERS = irssi-version.h.in + EXTRA_DIST = \ diff --git a/chat/silc-client/patches/patch-ac b/chat/silc-client/patches/patch-ac new file mode 100644 index 00000000000..09396b54a33 --- /dev/null +++ b/chat/silc-client/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.7 2004/06/06 11:45:06 salo Exp $ + +--- irssi/src/perl/Makefile.in.orig 2004-01-14 14:29:06.000000000 +0100 ++++ irssi/src/perl/Makefile.in 2004-06-05 14:50:35.000000000 +0200 +@@ -265,7 +265,7 @@ + -I$(top_srcdir)/src/fe-common/core \ + -I$(top_srcdir)/src/fe-common/silc \ + $(GLIB_CFLAGS) \ +- -DSCRIPTDIR=\""$(datadir)/silc/scripts"\" \ ++ -DSCRIPTDIR=\""$(prefix)/libexec/silc-client/scripts"\" \ + -DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \ + -DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \ + $(PERL_CFLAGS) |