diff options
-rw-r--r-- | comms/estic/distinfo | 7 | ||||
-rw-r--r-- | comms/estic/patches/patch-ac | 11 | ||||
-rw-r--r-- | comms/estic/patches/patch-au | 13 | ||||
-rw-r--r-- | comms/estic/patches/patch-av | 15 | ||||
-rw-r--r-- | comms/estic/patches/patch-aw | 22 | ||||
-rw-r--r-- | x11/kdebase2/distinfo | 3 | ||||
-rw-r--r-- | x11/kdebase2/patches/patch-ab | 14 |
7 files changed, 79 insertions, 6 deletions
diff --git a/comms/estic/distinfo b/comms/estic/distinfo index eba755bdf1b..3b4d98ddf7a 100644 --- a/comms/estic/distinfo +++ b/comms/estic/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/08/29 22:41:06 jlam Exp $ +$NetBSD: distinfo,v 1.4 2001/10/14 17:19:58 tron Exp $ SHA1 (estic-1.60-sources.zip) = ce66a6d52faaf6adba492bb3f74e49eab608d0c3 Size (estic-1.60-sources.zip) = 892311 bytes @@ -6,7 +6,7 @@ SHA1 (estic-1.61-patch-from-1.60.zip) = b58cf388e2eb60685402a84cc260d88dc7c1820f Size (estic-1.61-patch-from-1.60.zip) = 1017 bytes SHA1 (patch-aa) = d94d170ac16a95f96730d64ca77be18446515fd7 SHA1 (patch-ab) = 1ee3659e221e07796f4581bd191145c8cc6673a1 -SHA1 (patch-ac) = 9fda10375f0b074473c47202c59f4f872b14ae87 +SHA1 (patch-ac) = 2dd445fc1b14bc58d361fed4d6e2366a060b5203 SHA1 (patch-ad) = b7287df75abc237859ee25ce04c5b3df4d338c37 SHA1 (patch-ae) = 29ce3dafba535a26aef00e53da05d51eb09617be SHA1 (patch-af) = 39a39789e8875d901bce07581b544ef8590af4fa @@ -24,3 +24,6 @@ SHA1 (patch-aq) = 7f5a947ae8ed36e3d41d92f639b3419273732335 SHA1 (patch-ar) = 0e4a869f71ebb5e19ad6ae4d38314f68993e31d8 SHA1 (patch-as) = cbbd38095f9e14e6a8290e73a8f8aee083387b8f SHA1 (patch-at) = 87ea33bc400397c5ee9f7aeedf7c8b409dc9dbe7 +SHA1 (patch-au) = 0de3e83ee0fe9881dd68ed2b9ffb7511376da911 +SHA1 (patch-av) = e9239931b98b0ba1444e426df4ae4df7e9aaca7d +SHA1 (patch-aw) = ed428001d0ffc2428a67182a22fa54a726ca103a diff --git a/comms/estic/patches/patch-ac b/comms/estic/patches/patch-ac index d2e3ae53ad2..5355bfad7ad 100644 --- a/comms/estic/patches/patch-ac +++ b/comms/estic/patches/patch-ac @@ -1,8 +1,13 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-ac,v 1.2 2001/10/14 17:19:58 tron Exp $ --- ../spunk/password.cc.orig Thu Nov 7 18:06:48 1996 -+++ ../spunk/password.cc Sat Feb 10 18:38:35 2001 -@@ -529,10 +529,10 @@ ++++ ../spunk/password.cc Sun Oct 14 19:09:32 2001 +@@ -525,14 +525,14 @@ + + + +-static void EntryEditor (PasswordEntry* E, int& Abort, int& Changed) ++void EntryEditor (PasswordEntry* E, int& Abort, int& Changed) // Allow editing of one password entry { // ID's of the menue items diff --git a/comms/estic/patches/patch-au b/comms/estic/patches/patch-au new file mode 100644 index 00000000000..331a7821a31 --- /dev/null +++ b/comms/estic/patches/patch-au @@ -0,0 +1,13 @@ +$NetBSD: patch-au,v 1.1 2001/10/14 17:19:59 tron Exp $ + +--- ../spunk/stream.cc.orig Wed Dec 18 13:09:02 1996 ++++ ../spunk/stream.cc Sun Oct 14 19:12:10 2001 +@@ -347,7 +347,7 @@ + + void Stream::CopyFrom (Stream& S, size_t Count) + { +- static const BufSize = 4096; // Size of copy buffer ++ static const size_t BufSize = 4096; // Size of copy buffer + + + // Check parameter diff --git a/comms/estic/patches/patch-av b/comms/estic/patches/patch-av new file mode 100644 index 00000000000..9ba771a96b3 --- /dev/null +++ b/comms/estic/patches/patch-av @@ -0,0 +1,15 @@ +$NetBSD: patch-av,v 1.1 2001/10/14 17:19:59 tron Exp $ + +--- ../spunk/textstrm.cc.orig Thu Nov 7 18:06:52 1996 ++++ ../spunk/textstrm.cc Sun Oct 14 19:14:11 2001 +@@ -66,8 +66,8 @@ + // LineLen is the estimated length of a line in the file used for + // estimating the size of the buffer. + { +- static const Delta = 100; +- static const BufSize = 4096; ++ static const u32 Delta = 100; ++ static const u32 BufSize = 4096; + + // Estimate the count of lines + if ((Limit = Size / LineLen) < 100) { diff --git a/comms/estic/patches/patch-aw b/comms/estic/patches/patch-aw new file mode 100644 index 00000000000..02dcbc6e906 --- /dev/null +++ b/comms/estic/patches/patch-aw @@ -0,0 +1,22 @@ +$NetBSD: patch-aw,v 1.1 2001/10/14 17:19:59 tron Exp $ + +--- ../spunk/window.cc.orig Sun Jan 26 18:17:38 1997 ++++ ../spunk/window.cc Sun Oct 14 19:15:25 2001 +@@ -1432,7 +1432,7 @@ + // Write a string to the inner window. Note: Attr is an index, not a real + // attribute ! + { +- const BufSize = 256; ++ const int BufSize = 256; + u16 Buf [256]; + + // Check if the given string is empty +@@ -1554,7 +1554,7 @@ + // Write a string to the inner window. Note: Attr is an index, not a real + // attribute ! + { +- const BufSize = 256; ++ const int BufSize = 256; + u16 Buf [BufSize]; + + // If the Y coord is outside the inner window, there is nothing to do diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo index 500a19389bf..049d70b94fa 100644 --- a/x11/kdebase2/distinfo +++ b/x11/kdebase2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2001/09/28 21:19:15 jlam Exp $ +$NetBSD: distinfo,v 1.8 2001/10/14 17:20:00 tron Exp $ SHA1 (kdebase-2.1.1.tar.bz2) = af38d452c957715fa6ae59e99af3e7da2c3369b0 Size (kdebase-2.1.1.tar.bz2) = 9188425 bytes @@ -7,6 +7,7 @@ Size (Daemon.png) = 15725 bytes SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b Size (Daemon.README) = 2191 bytes SHA1 (patch-aa) = b1b0536c3df63efae4ef578ac209a119be1f6a80 +SHA1 (patch-ab) = eb28210220a2973412b65ce61544d69527f04b60 SHA1 (patch-ac) = 535455e9b978c48ac4230b3b9aebec3920674ed9 SHA1 (patch-ad) = a5d2c077a2239b6cfbd56cc8299fa7545f2e4c3e SHA1 (patch-af) = b91246a123ade7fc354308839e1363a4ee513c7f diff --git a/x11/kdebase2/patches/patch-ab b/x11/kdebase2/patches/patch-ab new file mode 100644 index 00000000000..74969ebe7ef --- /dev/null +++ b/x11/kdebase2/patches/patch-ab @@ -0,0 +1,14 @@ +$NetBSD: patch-ab,v 1.3 2001/10/14 17:20:00 tron Exp $ + +--- kdm/Makefile.in.orig Sun Oct 14 17:56:19 2001 ++++ kdm/Makefile.in Sun Oct 14 18:02:24 2001 +@@ -278,6 +278,9 @@ + # Libraries: + LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KRB_RPATH) + LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSLIB) $(LIB_LIBS) $(KERBEROS_LIBS) $(LIBSOCKET) $(LIBCRYPT) $(LIBUCB) $(LIBDL) $(LIBUTIL) $(LIBRESOLV) ++ifeq ($(OPSYS),NetBSD) ++LDADD += -lstdc++ ++endif + + kdm_LDADD = $(LDADD) $(KDM_GREET_LIBS) + |