diff options
| -rw-r--r-- | chat/silc-client/Makefile | 18 | ||||
| -rw-r--r-- | chat/silc-client/Makefile.common | 4 | ||||
| -rw-r--r-- | chat/silc-client/PLIST | 10 | ||||
| -rw-r--r-- | chat/silc-client/distinfo | 9 | ||||
| -rw-r--r-- | chat/silc-client/patches/patch-aa | 25 | ||||
| -rw-r--r-- | chat/silc-client/patches/patch-ab | 19 |
6 files changed, 29 insertions, 56 deletions
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile index af50a362414..6bf3125de7d 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2003/07/17 21:26:15 grant Exp $ +# $NetBSD: Makefile,v 1.28 2003/10/16 12:34:50 salo Exp $ # DISTNAME= ${SILC_CLIENT_DISTNAME} -PKGREVISION= 3 CATEGORIES= chat security MASTER_SITES= http://www.silcnet.org/download/client/sources/ \ ftp://ftp.silcnet.org/silc/client/sources/ \ @@ -21,7 +20,6 @@ USE_BUILDLINK2= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES USE_GMAKE= YES -USE_GNU_ICONV= YES USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/irssi/libtool \ ${WRKSRC}/lib/silcmath/mpi/libtool @@ -44,24 +42,27 @@ CONFIGURE_ARGS+= --without-libtoolfix .include "../../mk/bsd.prefs.mk" +BUILD_DEFS+= USE_INET6 SILC_CLIENT_WITH_PERL + # Use native curses library. .if (${OPSYS} == "NetBSD") || (${OPSYS} == "SunOS") CONFIGURE_ARGS+= --with-vcurses .elif (${OPSYS} == "Linux") || (${OPSYS} == "Darwin") CONFIGURE_ARGS+= --with-ncurses +.else +# XXX: Need testing on other operating systems, use safe defaults for now. +CONFIGURE_ARGS+= --with-ncurses .endif -# List it into IPv6-ready packages. -BUILD_DEFS+= USE_INET6 +.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss]) CONFIGURE_ARGS+= --enable-ipv6 +.endif # Optional support for perl scripting. # If you want to disable it, set SILC_CLIENT_WITH_PERL to NO # in your /etc/mk.conf # -SILC_CLIENT_WITH_PERL?= YES - -.if defined(SILC_CLIENT_WITH_PERL) && ${SILC_CLIENT_WITH_PERL} == YES +.if defined(SILC_CLIENT_WITH_PERL) && !empty(SILC_CLIENT_WITH_PERL:M[Yy][Ee][Ss]) CONFIGURE_ARGS+= --with-perl-lib=${PREFIX}/lib/silc/perl5 .include "../../lang/perl5/buildlink2.mk" PLIST_SRC+= ${PKGDIR}/PLIST.perl @@ -87,5 +88,6 @@ post-install: .include "../../converters/libiconv/buildlink2.mk" .include "../../devel/glib/buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/silc-client/Makefile.common b/chat/silc-client/Makefile.common index c5143c09b56..1d32cc22b4a 100644 --- a/chat/silc-client/Makefile.common +++ b/chat/silc-client/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.1 2003/04/27 22:28:29 salo Exp $ +# $NetBSD: Makefile.common,v 1.2 2003/10/16 12:34:50 salo Exp $ # # Distribution specific information. # -SILC_CLIENT_VERSION= 0.9.12 +SILC_CLIENT_VERSION= 0.9.13 SILC_CLIENT_DISTNAME= silc-client-${SILC_CLIENT_VERSION} SILC_CLIENT_EXTRACT_SUFX= .tar.bz2 SILC_CLIENT_DISTFILE= ${SILC_CLIENT_DISTNAME}${SILC_CLIENT_EXTRACT_SUFX} diff --git a/chat/silc-client/PLIST b/chat/silc-client/PLIST index 889c9bf119a..a6323c0b1db 100644 --- a/chat/silc-client/PLIST +++ b/chat/silc-client/PLIST @@ -1,13 +1,13 @@ -@comment $NetBSD: PLIST,v 1.13 2003/04/27 22:28:29 salo Exp $ +@comment $NetBSD: PLIST,v 1.14 2003/10/16 12:34:50 salo Exp $ bin/silc lib/silc/libsilc-1.0.so -lib/silc/libsilc-1.0.so.1 -lib/silc/libsilc-1.0.so.1.0 +lib/silc/libsilc-1.0.so.2 +lib/silc/libsilc-1.0.so.2.0 lib/silc/libsilc.la lib/silc/libsilc.so lib/silc/libsilcclient-1.0.so -lib/silc/libsilcclient-1.0.so.1 -lib/silc/libsilcclient-1.0.so.1.1 +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 diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo index 3ce63626d52..4ae3512c56b 100644 --- a/chat/silc-client/distinfo +++ b/chat/silc-client/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.19 2003/03/17 20:12:18 salo Exp $ +$NetBSD: distinfo,v 1.20 2003/10/16 12:34:50 salo Exp $ -SHA1 (silc-client-0.9.12.tar.bz2) = c7dcf7d256cc14d7cb5d03f74a5aa451b23eb499 -Size (silc-client-0.9.12.tar.bz2) = 1528592 bytes -SHA1 (patch-aa) = ce5547360fd5ca5f730946306d7c8f9d0dfee303 -SHA1 (patch-ab) = 6acd8cb2b7af6c5b57d8c4a0a6a6653ebbcc935a +SHA1 (silc-client-0.9.13.tar.bz2) = 41db34e585cee51aeb03fd5f19442b03b0838ef2 +Size (silc-client-0.9.13.tar.bz2) = 1537966 bytes +SHA1 (patch-aa) = b9ae5da26840b193d3c9484c975af89294fa8049 diff --git a/chat/silc-client/patches/patch-aa b/chat/silc-client/patches/patch-aa index ec9a3924615..7c903c6da24 100644 --- a/chat/silc-client/patches/patch-aa +++ b/chat/silc-client/patches/patch-aa @@ -1,17 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2003/03/17 20:12:19 salo Exp $ +$NetBSD: patch-aa,v 1.11 2003/10/16 12:34:50 salo Exp $ ---- Makefile.in.orig 2003-03-17 19:56:53.000000000 +0100 -+++ Makefile.in 2003-03-17 19:33:20.000000000 +0100 -@@ -216,7 +216,7 @@ - libdir = @libdir@ - libexecdir = @libexecdir@ - localstatedir = @localstatedir@ --mandir = $(DESTDIR)$(mandir) -+mandir = $(DESTDIR)@mandir@ - oldincludedir = @oldincludedir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -@@ -705,6 +705,7 @@ +--- Makefile.in.orig 2003-10-15 19:31:17.000000000 +0200 ++++ Makefile.in 2003-10-16 10:14:25.000000000 +0200 +@@ -706,6 +706,7 @@ -mkdir -p $(docdir) install-dirs-client: install-dirs @@ -19,7 +10,7 @@ $NetBSD: patch-aa,v 1.10 2003/03/17 20:12:19 salo Exp $ -mkdir -p $(helpdir) -mkdir -p $(mandir)/man1 -@@ -716,7 +717,6 @@ +@@ -717,7 +718,6 @@ doc-install: -$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/ -$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/ @@ -27,7 +18,7 @@ $NetBSD: patch-aa,v 1.10 2003/03/17 20:12:19 salo Exp $ -$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/ -$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/ -$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/ -@@ -725,7 +725,7 @@ +@@ -726,7 +726,7 @@ -$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/ doc-install-client: doc-install @@ -36,12 +27,12 @@ $NetBSD: patch-aa,v 1.10 2003/03/17 20:12:19 salo Exp $ -@if test -f $(srcdir)/doc/silc.1 ; then \ $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \ fi -@@ -775,7 +775,7 @@ +@@ -776,7 +776,7 @@ $(sbindir)/silcd -C $(etcdir); \ fi -@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client +@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client - @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server generate-server-key + @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/chat/silc-client/patches/patch-ab b/chat/silc-client/patches/patch-ab deleted file mode 100644 index e47aa6517bd..00000000000 --- a/chat/silc-client/patches/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ab,v 1.9 2003/01/26 14:35:08 salo Exp $ - ---- lib/silccrypt/Makefile.in.orig Wed Jan 8 17:19:42 2003 -+++ lib/silccrypt/Makefile.in Wed Jan 8 23:00:18 2003 -@@ -366,6 +366,14 @@ - .c.obj: - $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` - -+# Workaround a bug in GCC which causes memory exhaustion -+# when compiling sha1 with optimizations on UltraSPARC. -+# -+ifeq (sparc64, $(host_cpu)) -+sha1.lo: -+ $(LTCOMPILE) -O0 -c -o $@ `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c -+ endif -+ - .c.lo: - $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - |