Skip to content
Browse files

Merge changes in the main trunk into the buildlink2 branch for those

packages that have been converted to USE_BUILDLINK2.
  • Loading branch information...
1 parent 7dba68e commit 17d46e25e5f8b06ce598896d85f88aa8cd128202 jlam committed
Showing with 1,994 additions and 997 deletions.
  1. +6 −7 archivers/liblzo/Makefile
  2. +3 −3 archivers/liblzo/distinfo
  3. +1 −1 audio/vorbis-tools/DESCR
  4. +10 −14 audio/vorbis-tools/Makefile
  5. +3 −5 audio/vorbis-tools/distinfo
  6. +0 −30 audio/vorbis-tools/patches/patch-aa
  7. +0 −28 audio/vorbis-tools/patches/patch-ab
  8. +4 −21 chat/gaim/Makefile
  9. +33 −0 chat/gaim/Makefile.common
  10. +1 −51 chat/gaim/PLIST
  11. +52 −0 chat/gaim/PLIST.common
  12. +5 −4 chat/gaim/distinfo
  13. +4 −4 chat/gaim/patches/patch-aa
  14. +94 −0 chat/gaim/patches/patch-ab
  15. +8 −15 databases/postgresql-server/MESSAGE
  16. +8 −1 databases/postgresql-server/Makefile
  17. +3 −3 databases/postgresql-server/files/pgsql.sh
  18. +10 −1 devel/gmake/Makefile
  19. +3 −3 devel/gmp/Makefile
  20. +5 −5 devel/gmp/PLIST
  21. +2 −2 devel/gmp/buildlink.mk
  22. +7 −4 devel/gmp/distinfo
  23. +0 −33 devel/gmp/patches/patch-aa
  24. +25 −0 devel/gmp/patches/patch-ga
  25. +33 −0 devel/gmp/patches/patch-gb
  26. +27 −0 devel/gmp/patches/patch-gc
  27. +30 −0 devel/gmp/patches/patch-gd
  28. +2 −2 devel/p5-BSD-Resource/Makefile
  29. +3 −3 devel/p5-BSD-Resource/distinfo
  30. +2 −2 emulators/suse_base/PLIST
  31. +14 −12 graphics/ns-flash/Makefile
  32. +3 −6 graphics/ns-flash/distinfo
  33. +1 −0 net/gnet/distinfo
  34. +4 −2 net/gtk-gnutella/Makefile
  35. +7 −1 net/gtk-gnutella/PLIST
  36. +3 −3 net/gtk-gnutella/distinfo
  37. +7 −1 net/jwhois/PLIST
  38. +3 −2 net/lftp/Makefile
  39. +4 −1 net/lftp/PLIST
  40. +4 −3 net/nap/Makefile
  41. +1 −0 net/netsaint-base/distinfo
  42. +9 −62 net/samba/Makefile
  43. +64 −0 net/samba/Makefile.common
  44. +1 −9 net/samba/PLIST
  45. +4 −1 net/samba/distinfo
  46. +15 −0 net/samba/patches/patch-aa
  47. +62 −0 net/samba/patches/patch-ab
  48. +31 −0 net/samba/patches/patch-ad
  49. +1 −3 net/samba20/Makefile
  50. +3 −2 net/vtun/Makefile
  51. +3 −3 net/vtun/distinfo
  52. +2 −2 net/wget/Makefile
  53. +3 −2 net/zebra/Makefile
  54. +5 −1 net/zebra/PLIST
  55. +22 −9 net/zebra/distinfo
  56. +6 −12 net/zebra/patches/patch-aa
  57. +6 −12 net/zebra/patches/patch-ab
  58. +6 −12 net/zebra/patches/patch-ac
  59. +6 −12 net/zebra/patches/patch-ad
  60. +6 −12 net/zebra/patches/patch-ae
  61. +6 −12 net/zebra/patches/patch-af
  62. +11 −0 net/zebra/patches/patch-ba
  63. +13 −0 net/zebra/patches/patch-bb
  64. +12 −0 net/zebra/patches/patch-bc
  65. +49 −0 net/zebra/patches/patch-bd
  66. +22 −0 net/zebra/patches/patch-ca
  67. +30 −0 net/zebra/patches/patch-cc
  68. +16 −0 net/zebra/patches/patch-cd
  69. +10 −0 net/zebra/patches/patch-ce
  70. +25 −0 net/zebra/patches/patch-cf
  71. +23 −0 net/zebra/patches/patch-cg
  72. +37 −0 net/zebra/patches/patch-ch
  73. +33 −0 net/zebra/patches/patch-ci
  74. +10 −0 net/zebra/patches/patch-cj
  75. +2 −1 print/gimp-print-lib/distinfo
  76. +13 −0 print/gimp-print-lib/patches/patch-ac
  77. +3 −3 print/tcl-pdflib/PLIST
  78. +2 −2 print/xpdf/Makefile
  79. +2 −1 security/gnupg/Makefile
  80. +2 −2 security/gnupg/PLIST
  81. +3 −1 security/gnupg/distinfo
  82. +20 −0 security/gnupg/patches/patch-ad
  83. +20 −0 security/gnupg/patches/patch-ae
  84. +14 −35 security/pam-smbpass/Makefile
  85. +0 −6 security/pam-smbpass/distinfo
  86. +0 −13 security/pam-smbpass/patches/patch-aa
  87. +0 −31 security/pam-smbpass/patches/patch-ab
  88. +5 −3 security/racoon/Makefile
  89. +2 −3 security/zebedee/Makefile
  90. +2 −2 shells/zsh/Makefile
  91. +35 −1 shells/zsh/PLIST
  92. +5 −3 shells/zsh/distinfo
  93. +13 −0 shells/zsh/patches/patch-ac
  94. +13 −0 shells/zsh/patches/patch-ad
  95. +5 −1 sysutils/amanda-common/Makefile.common
  96. +2 −2 sysutils/gentoo/Makefile
  97. +2 −1 sysutils/gentoo/PLIST
  98. +3 −3 sysutils/gentoo/distinfo
  99. +34 −0 sysutils/gkrellm/buildlink.mk
  100. +25 −2 sysutils/grub/Makefile
  101. +5 −1 sysutils/grub/PLIST
  102. +4 −2 sysutils/grun/Makefile
  103. +1 −1 sysutils/ups-nut-cgi/DESCR
  104. +3 −4 sysutils/ups-nut-cgi/Makefile
  105. +6 −6 sysutils/ups-nut-cgi/distinfo
  106. +5 −8 sysutils/ups-nut-cgi/patches/patch-aa
  107. +10 −10 sysutils/ups-nut-cgi/patches/patch-ad
  108. +20 −20 sysutils/ups-nut-cgi/patches/patch-ae
  109. +5 −1 sysutils/ups-nut/MESSAGE
  110. +10 −9 sysutils/ups-nut/Makefile
  111. +30 −28 sysutils/ups-nut/PLIST
  112. +5 −4 sysutils/ups-nut/distinfo
  113. +6 −5 sysutils/ups-nut/patches/patch-aa
  114. +18 −0 sysutils/ups-nut/patches/patch-ac
  115. +2 −3 sysutils/xps/Makefile
  116. +5 −2 textproc/ispell-base/Makefile
  117. +9 −1 textproc/ispell-base/distinfo
  118. +13 −0 textproc/ispell-base/patches/patch-al
  119. +13 −0 textproc/ispell-base/patches/patch-am
  120. +13 −0 textproc/ispell-base/patches/patch-an
  121. +13 −0 textproc/ispell-base/patches/patch-ao
  122. +13 −0 textproc/ispell-base/patches/patch-ap
  123. +13 −0 textproc/ispell-base/patches/patch-aq
  124. +0 −5 textproc/t1utils/DESCR
  125. +0 −15 textproc/t1utils/Makefile
  126. +0 −13 textproc/t1utils/PLIST
  127. +0 −4 textproc/t1utils/distinfo
  128. +2 −2 textproc/texi2html/Makefile
  129. +2 −2 time/plan/PLIST
  130. +2 −1 wm/fluxbox/distinfo
  131. +46 −0 wm/fluxbox/patches/patch-ab
  132. +2 −2 wm/icewm/Makefile
  133. +2 −5 wm/icewm/Makefile.common
  134. +4 −1 wm/icewm/PLIST
  135. +4 −4 wm/icewm/distinfo
  136. +5 −5 wm/icewm/patches/patch-ae
  137. +2 −2 wm/wmx/PLIST
  138. +2 −2 www/Mosaic/Makefile
  139. +2 −2 www/Mosaic/PLIST
  140. +4 −2 www/amaya/distinfo
  141. +12 −4 www/amaya/patches/patch-aa
  142. +15 −0 www/amaya/patches/patch-ae
  143. +13 −0 www/amaya/patches/patch-af
  144. +2 −2 www/ap-dav/Makefile
  145. +13 −12 www/ap-perl/Makefile
  146. +5 −4 www/ap-ssl/Makefile
  147. +3 −3 www/ap-ssl/distinfo
  148. +16 −18 www/apache2/Makefile
  149. +10 −2 www/apache2/files/apache.sh
  150. +33 −10 www/apache6/Makefile
  151. +6 −2 www/apache6/PLIST
  152. +6 −3 www/apache6/files/apache.sh
  153. +3 −3 www/apache6/files/config.layout
  154. +1 −1 www/bozohttpd/DESCR
  155. +6 −4 www/bozohttpd/Makefile
  156. +4 −6 www/bozohttpd/distinfo
  157. +0 −12 www/bozohttpd/patches/patch-aa
  158. +13 −4 www/bozohttpd/patches/patch-ab
  159. +0 −21 www/bozohttpd/patches/patch-ae
  160. +4 −1 www/communicator/MESSAGE
  161. +2 −2 www/communicator/PLIST.post
  162. +2 −1 www/curl/distinfo
  163. +20 −0 www/curl/patches/patch-ab
  164. +37 −12 www/cvsweb/Makefile
  165. +20 −2 www/cvsweb/PLIST
  166. +5 −4 www/cvsweb/distinfo
  167. +13 −5 www/cvsweb/patches/patch-aa
  168. +12 −0 www/cvsweb/patches/patch-ab
  169. +2 −3 www/dillo/Makefile
  170. +3 −3 www/dillo/distinfo
  171. +1 −1 www/elinks/distinfo
  172. +7 −6 www/kannel/Makefile
  173. +11 −7 www/kannel/PLIST
  174. +5 −6 www/kannel/distinfo
  175. +4 −4 www/kannel/patches/patch-aa
  176. +5 −14 www/kannel/patches/patch-ab
  177. +0 −13 www/kannel/patches/patch-ac
  178. +3 −3 www/links-gui/Makefile
  179. +3 −3 www/links-gui/distinfo
  180. +3 −3 www/links/Makefile
  181. +2 −2 www/links/Makefile.common
  182. +3 −3 www/links/distinfo
  183. +2 −1 www/lynx-current/distinfo
  184. +23 −0 www/lynx-current/patches/patch-ab
  185. +6 −5 www/lynx/Makefile
  186. +4 −1 www/lynx/distinfo
  187. +23 −0 www/lynx/patches/patch-ab
  188. +4 −4 www/opera6/Makefile
  189. +3 −3 www/opera6/distinfo
  190. +2 −2 www/sitecopy/Makefile
  191. +2 −1 www/sitecopy/PLIST
  192. +5 −4 www/sitecopy/distinfo
  193. +9 −11 www/sitecopy/patches/patch-aa
  194. +14 −0 www/sitecopy/patches/patch-ab
  195. +4 −5 www/w3m/Makefile.common
  196. +5 −5 www/wdg-validate/Makefile
  197. +7 −7 www/wdg-validate/distinfo
  198. +2 −2 x11/aterm/Makefile
  199. +2 −1 x11/aterm/distinfo
  200. +25 −0 x11/aterm/patches/patch-ae
  201. +1 −1 x11/ttmkfdir/Makefile
  202. +1 −1 x11/ttmkfdir/PLIST
  203. +1 −1 x11/ttmkfdir/patches/patch-aa
  204. +1 −1 x11/ttmkfdir/patches/patch-ab
  205. +2 −2 x11/xpmroot/Makefile
  206. +3 −3 x11/xpmroot/distinfo
View
13 archivers/liblzo/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.8.2.2 2002/06/21 23:04:46 jlam Exp $
+# $NetBSD: Makefile,v 1.8.2.3 2002/08/25 21:19:46 jlam Exp $
#
-VERS= 1.07
+VERS= 1.08
DISTNAME= lzo-${VERS}
PKGNAME= liblzo-${VERS}
CATEGORIES= archivers
-MASTER_SITES= http://wildsau.idv.uni-linz.ac.at/mfx/lzo-download/ \
- ftp://wildsau.idv.uni-linz.ac.at/pub/mfx/lzo/ \
+MASTER_SITES= http://www.oberhumer.com/opensource/lzo/download/ \
${MASTER_SITE_SUNSITE:=libs/compression/} \
ftp://ftp.elf.stuba.sk/pub/pc/pack/
MAINTAINER= rh@netbsd.org
-HOMEPAGE= http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
+HOMEPAGE= http://www.oberhumer.com/opensource/lzo/
COMMENT= Portable lossless data compression library written in ANSI C
USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
-LTCONFIG_OVERRIDE= ${WRKSRC}/acconfig/ltconfig
+USE_LIBTOOL= yes
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
# Don't spuriously detect zlib, as it's not needed for the library.
CONFIGURE_ENV+= ac_cv_lib_z_gzputs=no
View
6 archivers/liblzo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/10/22 01:13:11 mjl Exp $
+$NetBSD: distinfo,v 1.3.2.1 2002/08/25 21:19:47 jlam Exp $
-SHA1 (lzo-1.07.tar.gz) = b47208b1aa0e734adecd396d7ab123a5e20e5808
-Size (lzo-1.07.tar.gz) = 333763 bytes
+SHA1 (lzo-1.08.tar.gz) = ad1b458cf9d5d49153665d2adc25bd6129028221
+Size (lzo-1.08.tar.gz) = 426692 bytes
View
2 audio/vorbis-tools/DESCR
@@ -7,4 +7,4 @@ systems.
* ogg123 plays Ogg Vorbis files or URLs streamed via HTTP
* vorbiscomment can list or set comments in an .ogg file
-This package is vorbis-tools 1.0 rc3
+This package is vorbis-tools 1.0
View
24 audio/vorbis-tools/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13.2.2 2002/06/21 23:04:59 jlam Exp $
+# $NetBSD: Makefile,v 1.13.2.3 2002/08/25 21:19:49 jlam Exp $
-DISTNAME= vorbis-tools-1.0rc3
-PKGNAME= vorbis-tools-1.0.0.7
-PKGREVISION= 1
+DISTNAME= vorbis-tools-1.0
+PKGNAME= vorbis-tools-1.0.0.8
CATEGORIES= audio
-MASTER_SITES= http://www.vorbis.com/files/rc3/unix/
+MASTER_SITES= http://www.vorbis.com/files/1.0/unix/
MAINTAINER= lukem@netbsd.org
HOMEPAGE= http://www.vorbis.com/
@@ -20,21 +19,18 @@ CONFLICTS= vorbis-[0-9]*
USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-#CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_DIR} \
-# --with-vorbis-prefix=${BUILDLINK_DIR} \
-# --with-ao-prefix=${BUILDLINK_DIR}
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \
+ --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
+ --with-ao-prefix=${BUILDLINK_PREFIX.libao}
PLIST_SUBST+= DISTNAME="${DISTNAME}"
-# vorbis-tools needs a working pthreads implementation, and pth is proven
-# to work.
-#
-USE_PTHREAD= native pth
+PTHREAD_OPTS+= require
.include "../../audio/libao/buildlink2.mk"
.include "../../audio/libogg/buildlink2.mk"
.include "../../audio/libvorbis/buildlink2.mk"
-
.include "../../mk/pthread.buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
View
8 audio/vorbis-tools/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/03/19 07:48:43 lukem Exp $
+$NetBSD: distinfo,v 1.6.2.1 2002/08/25 21:19:50 jlam Exp $
-SHA1 (vorbis-tools-1.0rc3.tar.gz) = e5c08f24eb143f0790b37b4cf49a4905a37c6e44
-Size (vorbis-tools-1.0rc3.tar.gz) = 259239 bytes
-SHA1 (patch-aa) = 065dc2c262d0dcab0f97f3c56b018be0a3966db2
-SHA1 (patch-ab) = d22ceee8f01a4c7748adab69acb95575dbe4940a
+SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d
+Size (vorbis-tools-1.0.tar.gz) = 425404 bytes
View
30 audio/vorbis-tools/patches/patch-aa
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/03/19 07:48:44 lukem Exp $
-
---- ogg123/buffer.c.orig Thu Dec 20 11:24:53 2001
-+++ ogg123/buffer.c
-@@ -85,12 +85,6 @@
- buf_t *buf = (buf_t *)arg;
-
- DEBUG("Enter buffer_thread_cleanup");
--
-- /* Cleanup thread data structures */
-- pthread_mutex_unlock(&buf->mutex);
-- pthread_mutex_destroy(&buf->mutex);
-- pthread_cond_destroy(&buf->playback_cond);
-- pthread_cond_destroy(&buf->write_cond);
- }
-
-
-@@ -430,6 +424,12 @@
- void buffer_destroy (buf_t *buf)
- {
- DEBUG("buffer_destroy");
-+
-+ /* Cleanup pthread variables */
-+ pthread_mutex_destroy(&buf->mutex);
-+ pthread_cond_destroy(&buf->write_cond);
-+ pthread_cond_destroy(&buf->playback_cond);
-+
- free(buf);
- }
-
View
28 audio/vorbis-tools/patches/patch-ab
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/03/19 07:48:45 lukem Exp $
-
---- ogg123/buffer.c.orig Tue Mar 19 18:02:36 2002
-+++ ogg123/buffer.c
-@@ -232,7 +232,7 @@
- /* No need to lock mutex here because the other thread will
- NEVER reduce the number of bytes stored in the buffer */
- DEBUG("Sending %d bytes to the audio device", write_amount);
-- buf->write_func(buf->buffer + buf->start, write_amount,
-+ write_amount = buf->write_func(buf->buffer + buf->start, write_amount,
- /* Only set EOS if this is the last chunk */
- write_amount == buf->curfill ? buf->eos : 0,
- buf->write_arg);
-
---- ogg123/callbacks.c.orig Thu Dec 27 01:22:26 2001
-+++ ogg123/callbacks.c
-@@ -30,7 +30,11 @@
- audio_play_arg_t *play_arg = (audio_play_arg_t *) arg;
- int ret;
-
-+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-+
- ret = audio_devices_write(play_arg->devices, ptr, nbytes);
-+
-+ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-
- return ret ? nbytes : 0;
- }
View
25 chat/gaim/Makefile
@@ -1,33 +1,16 @@
-# $NetBSD: Makefile,v 1.16.2.3 2002/06/23 18:40:37 jlam Exp $
+# $NetBSD: Makefile,v 1.16.2.4 2002/08/25 21:19:52 jlam Exp $
#
-DISTNAME= gaim-0.58
-CATEGORIES= chat x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/} \
- ftp://ftp.marko.net/pub/gaim/
+.include "Makefile.common"
-MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://gaim.sourceforge.net/
-COMMENT= GTK+-based client for AOL's Instant Messenger chat system
+CONFLICTS+= gaim-gnome-[0-9]*
USE_BUILDLINK2= YES
-USE_GMAKE= YES
-USE_X11BASE= YES
-USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --disable-artsc
CONFIGURE_ARGS+= --disable-gnome
-CONFIGURE_ARGS+= --disable-nas
CONFIGURE_ARGS+= --disable-panel
-CONFIGURE_ARGS+= --disable-perl
-CONFIGURE_ARGS+= --disable-screensaver
-CONFIGURE_ARGS+= --enable-esd
-CONFIGURE_ARGS+= --enable-perl
-CONFIGURE_ARGS+= --enable-pixbuf
+PLIST_SRC+= ${.CURDIR}/../gaim/PLIST
.include "../../audio/esound/buildlink2.mk"
.include "../../graphics/gdk-pixbuf/buildlink2.mk"
View
33 chat/gaim/Makefile.common
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile.common,v 1.1.4.2 2002/08/25 21:19:53 jlam Exp $
+#
+
+DISTNAME= gaim-0.59
+CATEGORIES= chat x11
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/} \
+ ftp://ftp.marko.net/pub/gaim/
+
+MAINTAINER= rafal@netbsd.org
+HOMEPAGE= http://gaim.sourceforge.net/
+COMMENT= GTK+-based client for AOL's Instant Messenger chat system
+
+DISTINFO_FILE= ${.CURDIR}/../gaim/distinfo
+FILESDIR= ${.CURDIR}/../gaim/files
+PATCHDIR= ${.CURDIR}/../gaim/patches
+PKGDIR= ${.CURDIR}/../gaim
+PLIST_SRC= ${.CURDIR}/../gaim/PLIST.common
+
+USE_GMAKE= YES
+USE_X11BASE= YES
+
+USE_LIBTOOL= YES
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+
+GNU_CONFIGURE= YES
+CONFIGURE_ARGS+= --disable-artsc
+CONFIGURE_ARGS+= --disable-nas
+CONFIGURE_ARGS+= --disable-perl
+CONFIGURE_ARGS+= --disable-screensaver
+
+CONFIGURE_ARGS+= --enable-esd
+CONFIGURE_ARGS+= --enable-perl
+CONFIGURE_ARGS+= --enable-pixbuf
View
52 chat/gaim/PLIST
@@ -1,52 +1,2 @@
-@comment $NetBSD: PLIST,v 1.6.2.1 2002/06/23 18:40:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6.2.2 2002/08/25 21:19:54 jlam Exp $
bin/gaim
-lib/gaim/autorecon.so
-lib/gaim/chatlist.so
-lib/gaim/iconaway.so
-lib/gaim/libgg.a
-lib/gaim/libgg.la
-lib/gaim/libgg.so
-lib/gaim/libicq.a
-lib/gaim/libicq.la
-lib/gaim/libicq.so
-lib/gaim/libirc.a
-lib/gaim/libirc.la
-lib/gaim/libirc.so
-lib/gaim/libjabber.a
-lib/gaim/libjabber.la
-lib/gaim/libjabber.so
-lib/gaim/libmsn.a
-lib/gaim/libmsn.la
-lib/gaim/libmsn.so
-lib/gaim/libnapster.a
-lib/gaim/libnapster.la
-lib/gaim/libnapster.so
-lib/gaim/libyahoo.a
-lib/gaim/libyahoo.la
-lib/gaim/libyahoo.so
-lib/gaim/libzephyr.a
-lib/gaim/libzephyr.la
-lib/gaim/libzephyr.so
-lib/gaim/notify.so
-lib/gaim/spellchk.so
-man/man1/gaim.1
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
-share/gnome/apps/Internet/gaim.desktop
-share/pixmaps/gaim.xpm
-@unexec ${RMDIR} -p %D/share/gnome/apps/Internet 2>/dev/null || ${TRUE}
-@dirrm lib/gaim
View
52 chat/gaim/PLIST.common
@@ -0,0 +1,52 @@
+@comment $NetBSD: PLIST.common,v 1.1.4.2 2002/08/25 21:19:55 jlam Exp $
+lib/gaim/autorecon.so
+lib/gaim/chatlist.so
+lib/gaim/iconaway.so
+lib/gaim/libgg.a
+lib/gaim/libgg.la
+lib/gaim/libgg.so
+lib/gaim/libicq.a
+lib/gaim/libicq.la
+lib/gaim/libicq.so
+lib/gaim/libirc.a
+lib/gaim/libirc.la
+lib/gaim/libirc.so
+lib/gaim/libjabber.a
+lib/gaim/libjabber.la
+lib/gaim/libjabber.so
+lib/gaim/libmsn.a
+lib/gaim/libmsn.la
+lib/gaim/libmsn.so
+lib/gaim/libnapster.a
+lib/gaim/libnapster.la
+lib/gaim/libnapster.so
+lib/gaim/libyahoo.a
+lib/gaim/libyahoo.la
+lib/gaim/libyahoo.so
+lib/gaim/libzephyr.a
+lib/gaim/libzephyr.la
+lib/gaim/libzephyr.so
+lib/gaim/notify.so
+lib/gaim/spellchk.so
+man/man1/gaim.1
+share/gnome/apps/Internet/gaim.desktop
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
+share/pixmaps/gaim.xpm
+@dirrm lib/gaim
View
9 chat/gaim/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9.2.1 2002/06/23 18:40:38 jlam Exp $
+$NetBSD: distinfo,v 1.9.2.2 2002/08/25 21:19:56 jlam Exp $
-SHA1 (gaim-0.58.tar.gz) = 5fd319a8de5f13efd646d7fe2d66ec6e9fb09eec
-Size (gaim-0.58.tar.gz) = 1928057 bytes
-SHA1 (patch-aa) = d4ad7522469c6f73c5497635f32acbabae9b89b9
+SHA1 (gaim-0.59.tar.gz) = 0a74bc3b48810291adf9725966efc4a6de28fa3f
+Size (gaim-0.59.tar.gz) = 2047105 bytes
+SHA1 (patch-aa) = f56e9e5ee36db05adc1ba34294cf088a335117fe
+SHA1 (patch-ab) = c15b6d79f8129eee9298f0aae6d0ca4e39983655
View
8 chat/gaim/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4.2.1 2002/06/23 18:40:39 jlam Exp $
+$NetBSD: patch-aa,v 1.4.2.2 2002/08/25 21:19:56 jlam Exp $
---- configure.orig Tue May 14 04:40:41 2002
+--- configure.orig Tue Jun 25 06:23:07 2002
+++ configure
-@@ -10792,8 +10792,6 @@
+@@ -7762,8 +7762,6 @@
fi
- rm -f conftest.$ac_objext conftest.$ac_ext
+ rm -f conftest*
-CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)"
-
View
94 chat/gaim/patches/patch-ab
@@ -0,0 +1,94 @@
+$NetBSD: patch-ab,v 1.1.4.2 2002/08/25 21:19:58 jlam Exp $
+
+--- src/perl.c.orig Fri May 31 05:13:02 2002
++++ src/perl.c Fri Jul 19 05:07:30 2002
+@@ -289,7 +289,7 @@
+ XS (XS_GAIM_register)
+ {
+ char *name, *ver, *callback, *unused; /* exactly like X-Chat, eh? :) */
+- unsigned int junk;
++ STRLEN junk;
+ struct perlscript *scp;
+ dXSARGS;
+ items = 0;
+@@ -400,7 +400,7 @@
+ {
+ char *title;
+ char *message;
+- unsigned int junk;
++ STRLEN junk;
+ dXSARGS;
+ items = 0;
+
+@@ -468,7 +468,7 @@
+
+ XS (XS_GAIM_command)
+ {
+- unsigned int junk;
++ STRLEN junk;
+ char *command = NULL;
+ dXSARGS;
+ items = 0;
+@@ -520,7 +520,7 @@
+ XS (XS_GAIM_user_info)
+ {
+ struct gaim_connection *gc;
+- unsigned int junk;
++ STRLEN junk;
+ struct buddy *buddy = NULL;
+ dXSARGS;
+ items = 0;
+@@ -546,7 +546,7 @@
+ {
+ char *nick, *who, *what;
+ struct conversation *c;
+- int junk;
++ STRLEN junk;
+ int send, wflags;
+ dXSARGS;
+ items = 0;
+@@ -578,7 +578,7 @@
+ struct gaim_connection *gc;
+ char *nick, *what;
+ int isauto;
+- int junk;
++ STRLEN junk;
+ dXSARGS;
+ items = 0;
+
+@@ -601,7 +601,7 @@
+ char *nick, *what;
+ int isauto;
+ struct conversation *c;
+- unsigned int junk;
++ STRLEN junk;
+ dXSARGS;
+ items = 0;
+
+@@ -631,7 +631,7 @@
+ char *what;
+ struct conversation *b = NULL;
+ GSList *bcs;
+- unsigned int junk;
++ STRLEN junk;
+ dXSARGS;
+ items = 0;
+
+@@ -797,7 +797,7 @@
+
+ XS (XS_GAIM_add_event_handler)
+ {
+- unsigned int junk;
++ STRLEN junk;
+ struct _perl_event_handlers *handler;
+ dXSARGS;
+ items = 0;
+@@ -824,7 +824,7 @@
+
+ XS (XS_GAIM_add_timeout_handler)
+ {
+- unsigned int junk;
++ STRLEN junk;
+ long timeout;
+ struct _perl_timeout_handlers *handler;
+ dXSARGS;
View
23 databases/postgresql-server/MESSAGE
@@ -1,23 +1,16 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 00:12:41 zuntum Exp $
+$NetBSD: MESSAGE,v 1.1.2.1 2002/08/25 21:19:59 jlam Exp $
-PostgreSQL has a Web site at http://www.postgresql.org/ which carries
-details on the latest release, upcoming features, and other information to
-make your work or play with PostgreSQL more productive.
+To enable this package, put the following into your /etc/rc.conf:
-Please check the following URL for a listing of the current user-support
-mailing lists:
+ pgsql=yes
+ pgsql_flags="-i" # allows TCP/IP connections
+ pgsql_flags="-i -l" # enables SSL connections (TCP/IP required)
- http://www.postgresql.org/ -> Info Central -> Mailing Lists
+and make sure
-All of the mailing lists are currently archived and viewable at:
+ /usr/pkg/etc/rc.d/pgsql start
- http://www.postgresql.org/ -> Info Central -> Mailing Lists
+is started at boot time.
-And optionally, please connect to the following registration URL:
-
- http://www.postgresql.org/ -> Helping Us -> Survey/Register
-
-Thank you for choosing PostgreSQL, the most advanced open source database
-engine.
===========================================================================
View
9 databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19.2.2 2002/06/21 23:05:04 jlam Exp $
+# $NetBSD: Makefile,v 1.19.2.3 2002/08/25 21:20:00 jlam Exp $
PKGNAME= postgresql-server-${BASE_VERS}
COMMENT= PostgreSQL database server programs
@@ -41,6 +41,13 @@ OWN_DIRS_PERMS= ${PGHOME} ${PGUSER} ${PGGROUP} 0755
DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL
do-build:
+#
+# Avoid conflict between "${LOCALBASE}/include/openssl/des.h" and
+# "/usr/include/crypt.h" -- we want the definitions in the former.
+#
+.if (${OPSYS} == "SunOS")
+ ${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
+.endif
.for DIR in ${DIRS_TO_BUILD}
cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${ALL_TARGET}
View
6 databases/postgresql-server/files/pgsql.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: pgsql.sh,v 1.9 2002/04/05 16:23:23 jlam Exp $
+# $NetBSD: pgsql.sh,v 1.9.2.1 2002/08/25 21:20:01 jlam Exp $
#
# PostgreSQL database rc.d control script
#
@@ -17,8 +17,6 @@
# "pgsql_flags" contains options for the PostgreSQL postmaster. See
# postmaster(1) for possible options.
-PGHOME="@PGHOME@"
-
if [ -f /etc/rc.subr ]
then
. /etc/rc.subr
@@ -29,6 +27,8 @@ rcd_dir=`@DIRNAME@ $0`
name="pgsql"
rcvar=$name
pgsql_user="@PGUSER@"
+eval PGHOME="~$pgsql_user"
+
command="@PREFIX@/bin/postmaster"
ctl_command="@PREFIX@/bin/pg_ctl"
pidfile="${PGHOME}/data/postmaster.pid"
View
11 devel/gmake/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.29.2.2 2002/06/21 23:05:07 jlam Exp $
+# $NetBSD: Makefile,v 1.29.2.3 2002/08/25 21:20:02 jlam Exp $
# FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp
#
DISTNAME= make-3.79.1
PKGNAME= gmake-3.79.1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=make/}
@@ -18,6 +19,14 @@ CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
TEXINFO_OVERRIDE= YES
+.include "../../mk/bsd.prefs.mk"
+
+.if (${GMAKE_NSEC_TIMESTAMPS} == "NO")
+CONFIGURE_ARGS+= --disable-nsec-timestamps
+.endif
+
+BUILD_DEFS+= GMAKE_NSEC_TIMESTAMPS
+
post-extract:
${MV} ${WRKSRC}/make.texinfo ${WRKSRC}/make.texinfo.orig
${SED} '/@dircategory/s|.*|@dircategory Programming \& development tools|' \
View
6 devel/gmp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12.2.1 2002/06/23 06:29:49 jlam Exp $
+# $NetBSD: Makefile,v 1.12.2.2 2002/08/25 21:20:03 jlam Exp $
#
-DISTNAME= gmp-4.0.1
+DISTNAME= gmp-4.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=gmp/}
@@ -13,7 +13,7 @@ BUILD_DEPENDS+= m4-1.4:../../devel/m4
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --enable-cxx
+CONFIGURE_ARGS+= --enable-cxx --without-readline
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
M4= ${PREFIX}/bin/gm4
View
10 devel/gmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/04/12 14:12:18 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4.2.1 2002/08/25 21:20:04 jlam Exp $
include/gmp.h
include/gmpxx.h
@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gmp.info
@@ -15,10 +15,10 @@ info/gmp.info-8
lib/libgmp.a
lib/libgmp.la
lib/libgmp.so
-lib/libgmp.so.5
-lib/libgmp.so.5.1
+lib/libgmp.so.6.0
+lib/libgmp.so.6
+lib/libgmpxx.so.3.2
+lib/libgmpxx.so.3
lib/libgmpxx.a
lib/libgmpxx.la
lib/libgmpxx.so
-lib/libgmpxx.so.3
-lib/libgmpxx.so.3.1
View
4 devel/gmp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/27 13:33:23 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7.2.1 2002/08/25 21:20:05 jlam Exp $
#
# This Makefile fragment is included by packages that use gmp.
#
@@ -17,7 +17,7 @@ GMP_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gmp?= gmp>=3.0
+BUILDLINK_DEPENDS.gmp?= gmp>=4.1
DEPENDS+= ${BUILDLINK_DEPENDS.gmp}:../../devel/gmp
EVAL_PREFIX+= BUILDLINK_PREFIX.gmp=gmp
View
11 devel/gmp/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3.2.1 2002/06/23 18:44:16 jlam Exp $
+$NetBSD: distinfo,v 1.3.2.2 2002/08/25 21:20:05 jlam Exp $
-SHA1 (gmp-4.0.1.tar.gz) = 3ead9745123e1324c0f0ab9985d4cb28b6d74655
-Size (gmp-4.0.1.tar.gz) = 1745294 bytes
-SHA1 (patch-aa) = 01e298efa337dec5e92e9376f369128cf481fbf0
+SHA1 (gmp-4.1.tar.gz) = 6385fdfda2da9bd8c47256f5766b917f767c181b
+Size (gmp-4.1.tar.gz) = 2145387 bytes
+SHA1 (patch-ga) = 59b4b5cca8a78c3220b35b5abdbe9354f0c9865e
+SHA1 (patch-gb) = fc15a237f4bfc74aec382b3926dbfa1a224b7480
+SHA1 (patch-gc) = 811a6e3ce6691ce63338ca6283ba589db3ed6c84
+SHA1 (patch-gd) = 771fa505e8d2c8eed1e8c09f3d340c461ab350df
View
33 devel/gmp/patches/patch-aa
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.7.2.2 2002/06/23 18:44:17 jlam Exp $
-
---- longlong.h.orig Thu Nov 15 14:48:14 2001
-+++ longlong.h
-@@ -734,8 +734,8 @@
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("add%.l %5,%1\n\taddx%.l %3,%0" \
- : "=d" ((USItype)(sh)), "=&d" ((USItype)(sl)) \
-- : "%0" ((USItype)(ah)), "d" ((USItype)(bh)), \
-- "%1" ((USItype)(al)), "g" ((USItype)(bl)))
-+ : "0" ((USItype)(ah)), "d" ((USItype)(bh)), \
-+ "1" ((USItype)(al)), "g" ((USItype)(bl)))
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("sub%.l %5,%1\n\tsubx%.l %3,%0" \
- : "=d" ((USItype)(sh)), "=&d" ((USItype)(sl)) \
-@@ -750,7 +750,7 @@
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("mulu%.l %3,%1:%0" \
- : "=d" ((USItype)(w0)), "=d" ((USItype)(w1)) \
-- : "%0" ((USItype)(u)), "dmi" ((USItype)(v)))
-+ : "0" ((USItype)(u)), "dmi" ((USItype)(v)))
- #define UMUL_TIME 45
- #define udiv_qrnnd(q, r, n1, n0, d) \
- __asm__ ("divu%.l %4,%1:%0" \
-@@ -788,7 +788,7 @@
- " | End inlined umul_ppmm" \
- : "=&d" ((USItype)(xh)), "=&d" ((USItype)(xl)), \
- "=d" (__umul_tmp1), "=&d" (__umul_tmp2) \
-- : "%2" ((USItype)(a)), "d" ((USItype)(b))); \
-+ : "2" ((USItype)(a)), "d" ((USItype)(b))); \
- } while (0)
- #define UMUL_TIME 100
- #define UDIV_TIME 400
View
25 devel/gmp/patches/patch-ga
@@ -0,0 +1,25 @@
+$NetBSD: patch-ga,v 1.1.2.2 2002/08/25 21:20:07 jlam Exp $
+
+This is a patch for 4.1 from the GNU MP Homepage, it should be
+removed in future versions
+
+Index: randraw.c
+===================================================================
+RCS file: /home/cvsfiles/gmp/randraw.c,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -r1.18 -r1.19
+--- randraw.c 2002/05/14 16:59:44 1.18
++++ randraw.c 2002/06/09 08:12:03 1.19
+@@ -112,10 +112,8 @@
+ if (seedn == 0)
+ {
+ /* Seed is 0. Result is C % M. Assume table is sensibly stored,
+- with C smaller than M*/
++ with C smaller than M. */
+ *rp = c;
+-
+- ASSERT_ALWAYS (((mp_limb_t) 1 << m2exp) > c);
+
+ *seedp = c;
+ SIZ (rstate->_mp_seed) = 1;
View
33 devel/gmp/patches/patch-gb
@@ -0,0 +1,33 @@
+$NetBSD: patch-gb,v 1.1.2.2 2002/08/25 21:20:08 jlam Exp $
+
+This is a patch for 4.1 from the GNU MP Homepage, it should be
+removed in future versions
+
+--- mpz/powm_ui.c.~1.16.~ Thu May 16 09:20:49 2002
++++ mpz/powm_ui.c Sat Jun 1 10:41:34 2002
+@@ -115,6 +115,17 @@
+
+ /* Main loop. */
+
++ /* If m is already normalized (high bit of high limb set), and b is the
++ same size, but a bigger value, and e==1, then there's no modular
++ reductions done and we can end up with a result out of range at the
++ end. */
++ if (c == 0)
++ {
++ if (xn == mn && mpn_cmp (xp, mp, mn) >= 0)
++ mpn_sub_n (xp, xp, mp, mn);
++ goto finishup;
++ }
++
+ while (c != 0)
+ {
+ mpn_sqr_n (tp, xp, xn);
+@@ -149,6 +160,7 @@
+ c--;
+ }
+
++ finishup:
+ /* We shifted m left m_zero_cnt steps. Adjust the result by reducing
+ it with the original MOD. */
+ if (m_zero_cnt != 0)
View
27 devel/gmp/patches/patch-gc
@@ -0,0 +1,27 @@
+$NetBSD: patch-gc,v 1.1.2.2 2002/08/25 21:20:10 jlam Exp $
+
+This is a patch for 4.1 from the GNU MP Homepage, it should be
+removed in future versions
+
+--- mpf/inp_str.c.old Tue Jan 2 18:53:42 2001
++++ mpf/inp_str.c Wed Jul 3 10:57:33 2002
+@@ -64,6 +64,7 @@
+ c = getc (stream);
+ }
+ ungetc (c, stream);
++ nread--;
+
+ if (str_size >= alloc_size)
+ {
+@@ -74,9 +75,10 @@
+ str[str_size] = 0;
+
+ retval = mpf_set_str (rop, str, base);
++ (*__gmp_free_func) (str, alloc_size);
++
+ if (retval == -1)
+ return 0; /* error */
+
+- (*__gmp_free_func) (str, alloc_size);
+ return str_size + nread;
+ }
View
30 devel/gmp/patches/patch-gd
@@ -0,0 +1,30 @@
+$NetBSD: patch-gd,v 1.1.2.2 2002/08/25 21:20:11 jlam Exp $
+
+This is a patch for 4.1 from the GNU MP Homepage, it should be
+removed in future versions
+
+--- gmpxx.h.old Wed Jul 3 10:45:48 2002
++++ gmpxx.h Wed Jul 3 10:49:28 2002
+@@ -2633,10 +2633,18 @@
+ }
+
+ // conversion functions
+- const mpz_classref get_num() const { return mpz_classref(mpq_numref(mp)); }
+- mpz_classref get_num() { return mpz_classref(mpq_numref(mp)); }
+- const mpz_classref get_den() const { return mpz_classref(mpq_denref(mp)); }
+- mpz_classref get_den() { return mpz_classref(mpq_denref(mp)); }
++
++ // casting a reference to an mpz_t to mpz_class & is a dirty hack,
++ // but works because the internal representation of mpz_class is
++ // exactly an mpz_t
++ const mpz_class & get_num() const
++ { return reinterpret_cast<const mpz_class &>(*mpq_numref(mp)); }
++ mpz_class & get_num()
++ { return reinterpret_cast<mpz_class &>(*mpq_numref(mp)); }
++ const mpz_class & get_den() const
++ { return reinterpret_cast<const mpz_class &>(*mpq_denref(mp)); }
++ mpz_class & get_den()
++ { return reinterpret_cast<mpz_class &>(*mpq_denref(mp)); }
+
+ mpq_srcptr get_mpq_t() const { return mp; }
+ mpq_ptr get_mpq_t() { return mp; }
View
4 devel/p5-BSD-Resource/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3.2.1 2002/07/01 17:44:57 jlam Exp $
+# $NetBSD: Makefile,v 1.3.2.2 2002/08/25 21:20:12 jlam Exp $
-DISTNAME= BSD-Resource-1.10
+DISTNAME= BSD-Resource-1.15
PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5bsd
CATEGORIES= devel perl5
View
6 devel/p5-BSD-Resource/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:34 wiz Exp $
+$NetBSD: distinfo,v 1.2.2.1 2002/08/25 21:20:12 jlam Exp $
-SHA1 (BSD-Resource-1.10.tar.gz) = 116d5929a331b179ad56966e4ebd21a2de72800e
-Size (BSD-Resource-1.10.tar.gz) = 15791 bytes
+SHA1 (BSD-Resource-1.15.tar.gz) = 03f50e1322aa70a9b2dbe82c1b00a7a45f714379
+Size (BSD-Resource-1.15.tar.gz) = 16618 bytes
View
4 emulators/suse_base/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:37 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:20:13 jlam Exp $
sbin/linux-mkpwd
@unexec ${RM} -f %D/@@EMULSUBDIR@@/etc/ld.so.cache
@@EMULSUBDIR@@/etc/ld.so.conf
@unexec cd %D/@@EMULSUBDIR@@/etc && ${RM} -f group gshadow passwd shadow
-@exec ${MKDIR} -p %D/@@EMULSUBDIR@@/dev
+@exec ${MKDIR} %D/@@EMULSUBDIR@@/dev
@exec ln -s /dev/sound %D/@@EMULSUBDIR@@/dev/dsp
@unexec ${RM} -f %D/@@EMULSUBDIR@@/dev/dsp
@exec ln -s /dev/null %D/@@EMULSUBDIR@@/dev/null
View
26 graphics/ns-flash/Makefile
@@ -1,11 +1,23 @@
-# $NetBSD: Makefile,v 1.15.2.2 2002/06/21 23:05:25 jlam Exp $
+# $NetBSD: Makefile,v 1.15.2.3 2002/08/25 21:20:14 jlam Exp $
+
+DISTNAME= flash_${DISTUNAME}
+CATEGORIES= graphics www
+MASTER_SITES= http://download.macromedia.com/pub/shockwave/flash/${SUB}/
+
+MAINTAINER= packages@netbsd.org
+HOMEPAGE= http://www.flash.com/
+COMMENT= MacroMedia Flash Player Netscape plugin
ONLY_FOR_PLATFORM= *-*-i386 SunOS-*-sparc
+DIST_SUBDIR= flash/${FLASH_VERS}
+
.include "../../mk/bsd.prefs.mk"
+SUB= english/${DISTUNAME}/${FLASH_VERS}
+
.if (${MACHINE_ARCH} == "i386")
-FLASH_VERS= 5.0r47
+FLASH_VERS= 5.0r50
DEPENDS+= suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat
DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
DISTUNAME= linux
@@ -20,20 +32,10 @@ FLASH_VERS= 5.0
.endif
PKGNAME= ns-flash-${FLASH_VERS:S/r/./}
-DISTNAME= flash_${DISTUNAME}
-DIST_SUBDIR= flash/${FLASH_VERS}
-CATEGORIES= graphics www
-SUB= english/${DISTUNAME}/${FLASH_VERS}
-MASTER_SITES= http://download.macromedia.com/pub/shockwave/flash/${SUB}/
-
# Must update communicator/navigator to at least 4.76nb1
CONFLICTS+= communicator<=4.76nb1
CONFLICTS+= navigator<=4.76nb1
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.flash.com/
-COMMENT= MacroMedia Flash Player Netscape plugin
-
RESTRICTED= "Redistribution not permitted"
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
View
9 graphics/ns-flash/distinfo
@@ -1,7 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/05/09 21:13:34 wiz Exp $
-
-SHA1 (flash/5.0r47/flash_linux.tar.gz) = e40030f0a62104ffed7997723a3e412e2d403476
-Size (flash/5.0r47/flash_linux.tar.gz) = 574724 bytes
-SHA1 (flash/5.0r52/flash_solaris.tar.gz) = c6e71f85ad9dfb00814f3aa574c88d73ac987586
-Size (flash/5.0r52/flash_solaris.tar.gz) = 627444 bytes
+$NetBSD: distinfo,v 1.2.2.1 2002/08/25 21:20:15 jlam Exp $
+SHA1 (flash/5.0r50/flash_linux.tar.gz) = 572e13227afc18b7c0f5a6d675a8683fc903a5da
+Size (flash/5.0r50/flash_linux.tar.gz) = 574447 bytes
View
1 net/gnet/distinfo
@@ -1,3 +1,4 @@
+$NetBSD: distinfo,v 1.1.1.1.2.3 2002/08/25 21:20:17 jlam Exp $
SHA1 (gnet-1.1.4.tar.gz) = 1970534bebbfbd9a5255e7d23c26fdbad1ea6acb
Size (gnet-1.1.4.tar.gz) = 363006 bytes
View
6 net/gtk-gnutella/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15.2.1 2002/07/01 17:44:59 jlam Exp $
+# $NetBSD: Makefile,v 1.15.2.2 2002/08/25 21:20:17 jlam Exp $
#
-DISTNAME= gtk-gnutella-0.85
+DISTNAME= gtk-gnutella-0.90
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtk-gnutella/}
@@ -18,5 +18,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gtk-gnutella
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gtk-gnutella
+.include "../../textproc/libxml2/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
View
8 net/gtk-gnutella/PLIST
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.1.2.1 2002/08/25 21:20:19 jlam Exp $
bin/gtk-gnutella
share/doc/gtk-gnutella/README
+share/gtk-gnutella/pixmaps/arrow_down.xpm
+share/gtk-gnutella/pixmaps/arrow_up.xpm
+share/gtk-gnutella/pixmaps/firewall.xpm
+share/gtk-gnutella/pixmaps/no_firewall.xpm
+@dirrm share/gtk-gnutella/pixmaps
+@dirrm share/gtk-gnutella
@dirrm share/doc/gtk-gnutella
View
6 net/gtk-gnutella/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/04/15 06:59:23 martti Exp $
+$NetBSD: distinfo,v 1.6.2.1 2002/08/25 21:20:20 jlam Exp $
-SHA1 (gtk-gnutella-0.85.tar.gz) = 614cc8ff83ea1ed7d1fd002a3bb3d759dc23c083
-Size (gtk-gnutella-0.85.tar.gz) = 261538 bytes
+SHA1 (gtk-gnutella-0.90.tar.gz) = b31984b6e83b0471a5ee2de2486d85b3400ecb67
+Size (gtk-gnutella-0.90.tar.gz) = 469236 bytes
View
8 net/jwhois/PLIST
@@ -1,9 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:36 seb Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:20:21 jlam Exp $
bin/jwhois
@unexec ${INSTALL_INFO} --delete %D/info/jwhois.info %D/info/dir
info/jwhois.info
@exec ${INSTALL_INFO} %D/info/jwhois.info %D/info/dir
man/man1/jwhois.1
+man/sv/man1/jwhois.1
share/examples/jwhois.conf
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/jwhois.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/jwhois.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/jwhois.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/jwhois.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/jwhois.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/jwhois.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/jwhois.mo
View
5 net/lftp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15.2.2 2002/07/01 17:45:00 jlam Exp $
+# $NetBSD: Makefile,v 1.15.2.3 2002/08/25 21:20:22 jlam Exp $
DISTNAME= lftp-2.5.2
CATEGORIES= net
-MASTER_SITES= ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/
+MASTER_SITES= ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/ \
+ ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= michal@pasternak.w.lub.pl
View
5 net/lftp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2.2.1 2002/07/01 17:45:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2.2.2 2002/08/25 21:20:23 jlam Exp $
bin/lftp
bin/lftpget
man/man1/lftp.1
@@ -18,3 +18,6 @@ share/locale/zh_CN/LC_MESSAGES/lftp.mo
share/locale/zh_TW/LC_MESSAGES/lftp.mo
@dirrm share/examples/lftp
@dirrm share/lftp
+@exec ${MKDIR} %D/lib/lftp/${PKGVERSION}
+@dirrm lib/lftp/${PKGVERSION}
+@dirrm lib/lftp
View
7 net/nap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10.2.1 2002/07/01 17:45:01 jlam Exp $
+# $NetBSD: Makefile,v 1.10.2.2 2002/08/25 21:20:24 jlam Exp $
DISTNAME= nap-1.4.4
CATEGORIES= net
@@ -11,8 +11,9 @@ COMMENT= Terminal based Napster client similar to ircII
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
-# nap needs newterm()
-INCOMPAT_CURSES= 1.4* 1.5 1.5_* 1.5.[1-9]* 1.5[A-Z]
+# newterm()
+INCOMPAT_CURSES= NetBSD-1.4*-*
+INCOMPAT_CURSES+= NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-Z]-*
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nap ${PREFIX}/share/examples/nap
View
1 net/netsaint-base/distinfo
@@ -1,3 +1,4 @@
+$NetBSD: distinfo,v 1.4.2.1 2002/08/25 21:20:25 jlam Exp $
SHA1 (netsaint-0.0.7.tar.gz) = 5ce4832c9cccaba0baa49fe3e222c6753a811143
Size (netsaint-0.0.7.tar.gz) = 1278019 bytes
View
71 net/samba/Makefile
@@ -1,66 +1,24 @@
-# $NetBSD: Makefile,v 1.82.2.2 2002/06/30 06:24:08 jlam Exp $
-
-DISTNAME= samba-2.2.5
-WRKSRC= ${WRKDIR}/${DISTNAME}/source
-CATEGORIES= net
-MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
- ftp://ring.asahi-net.or.jp/pub/net/samba/ \
- ftp://samba.anu.edu.au/pub/samba/ \
- http://de.samba.org/samba/ftp/ \
- ftp://ftp.sunet.se/pub/unix/utilities/samba/
-COUNTRY_MIRRORS= au1 ca fi fr de it pl ru sg se us1 us6
-.for COUNTRY in ${COUNTRY_MIRRORS}
-MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/
-.endfor
-EXTRACT_SUFX= .tar.bz2
+# $NetBSD: Makefile,v 1.82.2.3 2002/08/25 21:20:26 jlam Exp $
+
+.include "Makefile.common"
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite for UNIX
-GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
USE_BUILDLINK2= # defined
-USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_SYSCONFSUBDIR?= samba
-
-VARDIR?= /var
-SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
-SAMBA_DATADIR= ${PREFIX}/share
-SAMBA_LOCKDIR?= ${VARDIR}/db/samba
-SAMBA_LOGDIR?= ${VARDIR}/log
-SAMBA_PIDDIR?= ${VARDIR}/run
-SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
-
-CONFIGURE_ARGS+= --localstatedir=${VARDIR}
-CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin
-CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
-CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_DATADIR}/samba/codepages
-CONFIGURE_ARGS+= --with-datadir=${SAMBA_DATADIR}
-CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR}
-CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR}
-CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR}
-CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE}
-CONFIGURE_ARGS+= --with-swatdir=${SAMBA_DATADIR}/samba/swat
+USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline
CONFIGURE_ARGS+= --with-readline
+
CONFIGURE_ARGS+= --with-ssl
CONFIGURE_ARGS+= --with-sslinc=${SSLBASE}
CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h
-CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
-
.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
.include "../../print/cups/buildlink2.mk"
BUILD_DEFS+= USE_CUPS
CONFIGURE_ARGS+= --enable-cups
-.else
-CONFIGURE_ARGS+= --disable-cups
.endif
.if defined(USE_PAM)
@@ -81,25 +39,14 @@ SMBPASSWD_FILE= /dev/null ${SAMBA_PRIVATE}/smbpasswd \
${ROOT_USER} ${ROOT_GROUP} 0600
.endif
-# The following are Linux-only options.
-CONFIGURE_ARGS+= --without-smbwrapper
-CONFIGURE_ARGS+= --without-smbmount
-
-# Explicitly disable winbind until it may be properly handled by pkgsrc.
-CONFIGURE_ARGS+= --without-winbind
-
-DOCDIR= ${PREFIX}/share/doc/samba
-HTMLDIR= ${PREFIX}/share/doc/html/samba
-EXAMPLESDIR= ${PREFIX}/share/examples/samba
-
-FILES_SUBST= SAMBA_PRIVATE=${SAMBA_PRIVATE}
-FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
-FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR}
-FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR}
MESSAGE_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE}
MESSAGE_SUBST+= ROOT_GROUP=${ROOT_GROUP}
MESSAGE_SUBST+= ROOT_USER=${ROOT_USER}
+DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
+HTMLDIR= ${PREFIX}/share/doc/html/${PKGBASE}
+EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE}
+
CONF_FILES= ${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
SUPPORT_FILES_PERMS= ${SMBPASSWD_FILE}
RCD_SCRIPTS= samba nmbd smbd
View
64 net/samba/Makefile.common
@@ -0,0 +1,64 @@
+# $NetBSD: Makefile.common,v 1.1.2.2 2002/08/25 21:20:29 jlam Exp $
+
+DISTNAME= samba-${SAMBA_DIST_VERS}
+SAMBA_DIST_VERS= 2.2.5
+WRKSRC?= ${WRKDIR}/${DISTNAME}/source
+CATEGORIES?= net
+MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
+ ftp://ring.asahi-net.or.jp/pub/net/samba/ \
+ ftp://samba.anu.edu.au/pub/samba/ \
+ http://de.samba.org/samba/ftp/ \
+ ftp://ftp.sunet.se/pub/unix/utilities/samba/
+COUNTRY_MIRRORS= au1 ca fi fr de it pl ru sg se us1 us6
+.for COUNTRY in ${COUNTRY_MIRRORS}
+MASTER_SITES+= ftp://${COUNTRY}.samba.org/pub/samba/
+.endfor
+EXTRACT_SUFX= .tar.bz2
+
+DISTINFO_FILE?= ${.CURDIR}/../../net/samba/distinfo
+PATCHDIR?= ${.CURDIR}/../../net/samba/patches
+
+GNU_CONFIGURE= # defined
+USE_LIBTOOL= # defined
+LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+
+.include "../../mk/bsd.prefs.mk"
+
+PKG_SYSCONFSUBDIR?= samba
+
+VARDIR?= /var
+SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
+SAMBA_DATADIR= ${PREFIX}/share
+SAMBA_LOCKDIR?= ${VARDIR}/db/samba
+SAMBA_LOGDIR?= ${VARDIR}/log
+SAMBA_PIDDIR?= ${VARDIR}/run
+SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
+
+CONFIGURE_ARGS+= --localstatedir=${VARDIR}
+CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin
+CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
+CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_DATADIR}/samba/codepages
+CONFIGURE_ARGS+= --with-datadir=${SAMBA_DATADIR}
+CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR}
+CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR}
+CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR}
+CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE}
+CONFIGURE_ARGS+= --with-swatdir=${SAMBA_DATADIR}/samba/swat
+
+CONFIGURE_ARGS+= --without-readline
+CONFIGURE_ARGS+= --without-ssl
+
+CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
+
+CONFIGURE_ARGS+= --disable-cups
+CONFIGURE_ARGS+= --without-pam
+CONFIGURE_ARGS+= --without-winbind
+
+# The following are Linux-only options.
+CONFIGURE_ARGS+= --without-smbwrapper
+CONFIGURE_ARGS+= --without-smbmount
+
+FILES_SUBST= SAMBA_PRIVATE=${SAMBA_PRIVATE}
+FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
+FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR}
+FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR}
View
10 net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6.2.1 2002/06/23 18:56:55 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6.2.2 2002/08/25 21:20:30 jlam Exp $
bin/findsmb
bin/make_printerdef
bin/make_smbcodepage
@@ -442,18 +442,10 @@ share/samba/swat/using_samba/this_edition.html
@dirrm share/examples/samba/LDAP/smbldap-tools/cgi
@dirrm share/examples/samba/LDAP/smbldap-tools
@dirrm share/examples/samba/LDAP
-@dirrm share/examples/samba/VFS/recycle
-@dirrm share/examples/samba/VFS/block
-@dirrm share/examples/samba/VFS
-@dirrm share/examples/samba/appliance
-@dirrm share/examples/samba/autofs
-@dirrm share/examples/samba/dce-dfs
-@dirrm share/examples/samba/libsmbclient
@dirrm share/examples/samba/misc
@dirrm share/examples/samba/printer-accounting
@dirrm share/examples/samba/printing
@dirrm share/examples/samba/simple
-@dirrm share/examples/samba/svr4-startup
@dirrm share/examples/samba/thoralf
@dirrm share/examples/samba/tridge
@dirrm share/examples/samba/validchars
View
5 net/samba/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.17.2.1 2002/06/23 18:56:56 jlam Exp $
+$NetBSD: distinfo,v 1.17.2.2 2002/08/25 21:20:31 jlam Exp $
SHA1 (samba-2.2.5.tar.bz2) = 67e1025a8d01ba51b8cea6f04176fdbc57b7c012
Size (samba-2.2.5.tar.bz2) = 4343641 bytes
+SHA1 (patch-aa) = 994befda25575f26829ea096d609dd204511d117
+SHA1 (patch-ab) = 777bd40add3c40b299e03fe9b26704ebffb528d4
SHA1 (patch-ac) = a055bcc69e1a40124ada075ac836d1061ecfcd15
+SHA1 (patch-ad) = 38dc1cf2d2c322db32a1a3cbebf9dff59841fa4f
SHA1 (patch-ag) = 256a7e1edb961985398a94c0b738fd96fe781f9c
SHA1 (patch-ah) = e87f2e393db68acc7028fe20d4772455379ad7aa
SHA1 (patch-aj) = e2c5f7580a8c701b6bf35d0d3004f714f2c810cb
View
15 net/samba/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.18.2.2 2002/08/25 21:20:32 jlam Exp $
+
+--- configure.in.orig Sun Jul 28 18:13:04 2002
++++ configure.in
+@@ -1976,6 +1976,10 @@ AC_ARG_WITH(pam,
+ # we can't build a pam module if we don't have pam.
+ AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)])
+
++dnl Checks for libraries.
++AC_CHECK_LIB(c, __libc_sched_setscheduler, PAM_NEEDS_LIBC=, PAM_NEEDS_LIBC=-lc)
++AC_SUBST(PAM_NEEDS_LIBC)
++
+ #################################################
+ # check for pam_smbpass support
+ AC_MSG_CHECKING(whether to use pam_smbpass)
View
62 net/samba/patches/patch-ab
@@ -0,0 +1,62 @@
+$NetBSD: patch-ab,v 1.14.2.2 2002/08/25 21:20:33 jlam Exp $
+
+--- configure.orig Sun Jul 28 18:13:04 2002
++++ configure
+@@ -11945,6 +11945,49 @@ else
+ fi
+
+
++echo $ac_n "checking for __libc_sched_setscheduler in -lc""... $ac_c" 1>&6
++echo "configure:11950: checking for __libc_sched_setscheduler in -lc" >&5
++ac_lib_var=`echo c'_'__libc_sched_setscheduler | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ ac_save_LIBS="$LIBS"
++LIBS="-lc $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 11958 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error. */
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char __libc_sched_setscheduler();
++
++int main() {
++__libc_sched_setscheduler()
++; return 0; }
++EOF
++if { (eval echo configure:11969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=yes"
++else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ rm -rf conftest*
++ eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++ echo "$ac_t""yes" 1>&6
++ PAM_NEEDS_LIBC=
++else
++ echo "$ac_t""no" 1>&6
++PAM_NEEDS_LIBC=-lc
++fi
++
++
++
+ #################################################
+ # check for pam_smbpass support
+ echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6
+@@ -13787,6 +13830,7 @@ s%@TERMLIBS@%$TERMLIBS%g
+ s%@TERMLDFLAGS@%$TERMLDFLAGS%g
+ s%@ROFF@%$ROFF%g
+ s%@DYNEXP@%$DYNEXP%g
++s%@PAM_NEEDS_LIBC@%$PAM_NEEDS_LIBC%g
+ s%@LDAPLIBS@%$LDAPLIBS%g
+ s%@QUOTAOBJS@%$QUOTAOBJS%g
+ s%@WINBIND_TARGETS@%$WINBIND_TARGETS%g
View
31 net/samba/patches/patch-ad
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.9.2.2 2002/08/25 21:20:34 jlam Exp $
+
+--- Makefile.in.orig Sun Jul 28 18:13:04 2002
++++ Makefile.in
+@@ -89,6 +89,8 @@ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $
+ FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
+ FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS)
+
++PAM_NEEDS_LIBC = @PAM_NEEDS_LIBC@
++
+ WINBIND_PROGS = @WINBIND_TARGETS@
+ WINBIND_SPROGS = @WINBIND_STARGETS@
+ WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@
+@@ -650,7 +652,7 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOB
+
+ bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) bin/.dummy
+ @echo Linking shared library $@
+- $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) -lc \
++ $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) $(PAM_NEEDS_LIBC) \
+ @SONAMEFLAG@`basename $@`
+
+ nsswitch/libnss_wins.so: $(NSS_OBJ)
+@@ -674,7 +676,7 @@ nsswitch/libnss_winbind.so: $(WINBIND_NS
+
+ nsswitch/pam_winbind.so: $(PAM_WINBIND_OBJ)
+ @echo Linking $@
+- @$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) \
++ @$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) $(LDFLAGS) $(DYNEXP) $(PAM_NEEDS_LIBC) \
+ @SONAMEFLAG@`basename $@`
+
+ bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \
View
4 net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7.2.1 2002/07/01 17:45:03 jlam Exp $
+# $NetBSD: Makefile,v 1.7.2.2 2002/08/25 21:20:35 jlam Exp $
DISTNAME= samba-2.0.10
WRKSRC= ${WRKDIR}/${DISTNAME}/source
@@ -11,8 +11,6 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite for UNIX
-#IGNORE= "${PKGNAME} has been superseded samba>=2.2.3"
-
BUILD_USES_MSGFMT= # defined
GNU_CONFIGURE= # defined
USE_BUILDLINK2= # defined
View
5 net/vtun/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14.2.1 2002/07/01 17:45:04 jlam Exp $
+# $NetBSD: Makefile,v 1.14.2.2 2002/08/25 21:20:36 jlam Exp $
-DISTNAME= vtun-2.4
+DISTNAME= vtun-2.5
CATEGORIES= net
MASTER_SITES= http://vtun.sourceforge.net/
@@ -18,6 +18,7 @@ CONFIGURE_ARGS+= --with-lzo-headers=${BUILDLINK_PREFIX.liblzo}/include
CONFIGURE_ARGS+= --with-lzo-lib=${BUILDLINK_PREFIX.liblzo}/lib
ALL_TARGET= vtund
+WRKSRC= ${WRKDIR}/vtun
DOCDIR= ${PREFIX}/share/doc/vtun
EGDIR= ${PREFIX}/share/examples/vtun
LOCKDIR= /var/run/vtund
View
6 net/vtun/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/12/21 21:04:23 jlam Exp $
+$NetBSD: distinfo,v 1.3.2.1 2002/08/25 21:20:37 jlam Exp $
-SHA1 (vtun-2.4.tar.gz) = 3ffbcc0864ca429ff37f39ffe30cb06e50144da7
-Size (vtun-2.4.tar.gz) = 82540 bytes
+SHA1 (vtun-2.5.tar.gz) = 6220497fc64b8b4d42e972e3b7855ec97cab1975
+Size (vtun-2.5.tar.gz) = 92510 bytes
SHA1 (patch-aa) = b921a0b095848a49e79c81696324a6e67e8f07ba
SHA1 (patch-ab) = e1891ef0c50ef79ee05967e06e110ce64891ab0a
View
4 net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45.2.1 2002/07/01 17:45:04 jlam Exp $
+# $NetBSD: Makefile,v 1.45.2.2 2002/08/25 21:20:37 jlam Exp $
DISTNAME= wget-1.7
CATEGORIES= net
@@ -12,7 +12,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/wget/wget.html
COMMENT= Retrieve files from the 'net via HTTP and FTP
-BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5= build
BUILD_USES_MSGFMT= YES
USE_BUILDLINK2= YES
View
5 net/zebra/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.50.2.1 2002/07/01 17:45:05 jlam Exp $
+# $NetBSD: Makefile,v 1.50.2.2 2002/08/25 21:20:39 jlam Exp $
# Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
#
-DISTNAME= zebra-0.92a
+DISTNAME= zebra-0.93a
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
View
6 net/zebra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:20:40 jlam Exp $
@unexec ${INSTALL_INFO} --delete %D/info/zebra.info %D/info/dir
info/zebra.info
@exec ${INSTALL_INFO} %D/info/zebra.info %D/info/dir
@@ -16,4 +16,8 @@ share/examples/zebra/bgpd.conf.sample2
share/examples/zebra/ospfd.conf.sample
share/examples/zebra/ripd.conf.sample
share/examples/zebra/zebra.conf.sample
+info/zebra.info-1
+info/zebra.info-2
+info/zebra.info-3
+info/zebra.info-4
@dirrm share/examples/zebra
View
31 net/zebra/distinfo
@@ -1,11 +1,24 @@
-$NetBSD: distinfo,v 1.6 2001/08/20 07:12:27 itojun Exp $
+$NetBSD: distinfo,v 1.6.2.1 2002/08/25 21:20:40 jlam Exp $
-SHA1 (zebra-0.92a.tar.gz) = 7dc3813dfe3c3a70f298cdbb0abefcb4663682d7
-Size (zebra-0.92a.tar.gz) = 1155814 bytes
-SHA1 (patch-aa) = ee8100984152dc69237b53977d63c506095cdfd2
-SHA1 (patch-ab) = 415ee0d3c18240165bfabc77d9fa6ff4c2e7ac34
-SHA1 (patch-ac) = 4bdc7ded7d39702529f774b8a809d33898c5559e
-SHA1 (patch-ad) = 7a9a1daa024b9efacefb3c469bc86dbbc36af47c
-SHA1 (patch-ae) = 0d255facaacd0521d9e5fe31698c1f7f5d4c7f61
-SHA1 (patch-af) = b3b879e8932196a8e3e9f6fe92815a817223aceb
+SHA1 (zebra-0.93a.tar.gz) = aa9d307a53adcd6e9b76003f230c4cd79eefba6b
+Size (zebra-0.93a.tar.gz) = 1335141 bytes
+SHA1 (patch-aa) = 689404752d3d793d9d2620303d6f3355f43e38cd
+SHA1 (patch-ab) = 6725c6034adaf5580186f46b7cd9e15c4de66db2
+SHA1 (patch-ac) = f6c10cd468cd89228202876de49981e664378cc7
+SHA1 (patch-ad) = fb20a6b64a9e07dd94bd62b01e4b2f17a437d840
+SHA1 (patch-ae) = bad18eda9b4ffd4cc22666b26573858e7de84a7d
+SHA1 (patch-af) = d045b85bfc8f8d5f6894e2333b0a799661997f90
SHA1 (patch-ag) = 62b5e4f28c1d13cb1f9c772250529aefe0511f90
+SHA1 (patch-ba) = 77aa37644c355af17f8f5f446c8bbc3b00c434d1
+SHA1 (patch-bb) = 31fe77cfe767becd067d5fa68ae27c66d8fb0c48
+SHA1 (patch-bc) = 7c98d7a810fdb2a95ad64735fac23eac071287d4
+SHA1 (patch-bd) = 2ce066ee0398b84c7a32754a100cdd807d13b457
+SHA1 (patch-ca) = 01f8992150efee456c87beba885a9c3bd75efa39
+SHA1 (patch-cc) = 3b9293d8adda8bd8742a5c518410f8c535ae0086
+SHA1 (patch-cd) = ca436711d23564f0aa1580c16abd6e72e85f4232
+SHA1 (patch-ce) = 03e3ba47ed6a37114294740bad0e678d66e5f842
+SHA1 (patch-cf) = 32be0cc835e003a167ccd92677d9dd74d9012516
+SHA1 (patch-cg) = 4844502b4a52e87aea56b09342ec51a7f269b623
+SHA1 (patch-ch) = 2db3581898631bee6f81e5b736226d5c859670ef
+SHA1 (patch-ci) = dfd651863ca4d80b6f280ed338458adeca3796ce
+SHA1 (patch-cj) = 6ec1fba77f03ef649206a7c22494a56764e39950
View
18 net/zebra/patches/patch-aa
@@ -1,18 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2000/08/24 01:25:38 kim Exp $
+$NetBSD: patch-aa,v 1.5.2.1 2002/08/25 21:20:41 jlam Exp $
---- bgpd/Makefile.am.orig Thu Aug 17 04:27:58 2000
-+++ bgpd/Makefile.am Wed Aug 23 16:19:15 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- bgpd/Makefile.am.orig Wed Jun 19 04:05:04 2002
++++ bgpd/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -30,15 +30,17 @@
+
+ EXTRA_DIST = $(sysconf_DATA) BGP4-MIB.txt
+sysconfdatadir=$(datadir)/examples/zebra
+
- noinst_LIBRARIES = libbgp.a
- sbin_PROGRAMS = bgpd
- #noinst_PROGRAMS = bgp_btoa
-@@ -36,14 +38,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-aa,v 1.5 2000/08/24 01:25:38 kim Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
View
18 net/zebra/patches/patch-ab
@@ -1,18 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2000/08/24 01:25:42 kim Exp $
+$NetBSD: patch-ab,v 1.3.2.1 2002/08/25 21:20:42 jlam Exp $
---- ospf6d/Makefile.am.orig Thu Aug 17 04:27:37 2000
-+++ ospf6d/Makefile.am Wed Aug 23 16:21:19 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ospf6d/Makefile.am.orig Sat Jun 29 15:20:39 2002
++++ ospf6d/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -34,15 +34,17 @@
+
+ EXTRA_DIST = $(sysconf_DATA)
+sysconfdatadir=$(datadir)/examples/zebra
+
- noinst_LIBRARIES = libospf6.a
- sbin_PROGRAMS = ospf6d
-
-@@ -33,14 +35,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ab,v 1.3 2000/08/24 01:25:42 kim Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
View
18 net/zebra/patches/patch-ac
@@ -1,18 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2000/08/24 01:25:44 kim Exp $
+$NetBSD: patch-ac,v 1.1.2.1 2002/08/25 21:20:43 jlam Exp $
---- ospfd/Makefile.am.orig Thu Aug 17 04:27:22 2000
-+++ ospfd/Makefile.am Wed Aug 23 16:22:52 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ospfd/Makefile.am.orig Wed Jun 19 04:06:08 2002
++++ ospfd/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -30,15 +30,17 @@
+
+ EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt
+sysconfdatadir=$(datadir)/examples/zebra
+
- noinst_LIBRARIES = libospf.a
- sbin_PROGRAMS = ospfd
-
-@@ -30,14 +32,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ac,v 1.1 2000/08/24 01:25:44 kim Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
View
18 net/zebra/patches/patch-ad
@@ -1,18 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2000/08/24 01:25:45 kim Exp $
+$NetBSD: patch-ad,v 1.1.2.1 2002/08/25 21:20:43 jlam Exp $
---- ripd/Makefile.am.orig Thu Aug 17 04:26:57 2000
-+++ ripd/Makefile.am Wed Aug 23 16:23:48 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ripd/Makefile.am.orig Wed Jun 19 04:06:18 2002
++++ ripd/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -23,15 +23,17 @@
+
+ EXTRA_DIST = $(sysconf_DATA) RIPv2-MIB.txt
+sysconfdatadir=$(datadir)/examples/zebra
+
- noinst_LIBRARIES = librip.a
- sbin_PROGRAMS = ripd
-
-@@ -25,14 +27,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ad,v 1.1 2000/08/24 01:25:45 kim Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
View
18 net/zebra/patches/patch-ae
@@ -1,18 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/08/24 01:25:46 kim Exp $
+$NetBSD: patch-ae,v 1.1.2.1 2002/08/25 21:20:44 jlam Exp $
---- ripngd/Makefile.am.orig Thu Aug 17 04:27:11 2000
-+++ ripngd/Makefile.am Wed Aug 23 16:24:39 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ripngd/Makefile.am.orig Wed Jun 19 04:06:33 2002
++++ ripngd/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -23,15 +23,17 @@
+
+ EXTRA_DIST = $(sysconf_DATA)
+sysconfdatadir=$(datadir)/examples/zebra
+
- noinst_LIBRARIES = libripng.a
- sbin_PROGRAMS = ripngd
-
-@@ -25,14 +27,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ae,v 1.1 2000/08/24 01:25:46 kim Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
View
18 net/zebra/patches/patch-af
@@ -1,18 +1,13 @@
-$NetBSD: patch-af,v 1.2 2001/01/11 05:34:16 itojun Exp $
+$NetBSD: patch-af,v 1.2.2.1 2002/08/25 21:20:45 jlam Exp $
---- zebra/Makefile.am.orig Wed Jan 10 10:11:11 2001
-+++ zebra/Makefile.am Thu Jan 11 13:57:23 2001
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
- INSTALL_SDATA=@INSTALL@ -m 600
+--- zebra/Makefile.am.orig Wed Jun 19 08:17:32 2002
++++ zebra/Makefile.am Wed Jul 10 08:34:31 2002
+@@ -43,15 +43,17 @@
+ #client : client_main.o ../lib/libzebra.a
+ # $(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
+sysconfdatadir=$(datadir)/examples/zebra
+
- LIB_IPV6 = @LIB_IPV6@
-
- ipforward = @IPFORWARD@
-@@ -50,14 +52,14 @@
-
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-af,v 1.2 2001/01/11 05:34:16 itojun Exp $
+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
fi; fi; \
done
-
View
11 net/zebra/patches/patch-ba
@@ -0,0 +1,11 @@
+$NetBSD: patch-ba,v 1.1.2.2 2002/08/25 21:20:46 jlam Exp $
+
+diff -u1 bgpd/bgp_fsm.c /home/itojun/work/zebra/zebra/bgpd/bgp_fsm.c
+--- bgpd/bgp_fsm.c Wed Jun 19 17:05:38 2002
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_fsm.c Sat Aug 3 21:05:48 2002
+@@ -348,2 +348,5 @@
+
++ /* Send capability. */
++ SET_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN);
++
+ /* Delete all existing events of the peer. */
View
13 net/zebra/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1.2.2 2002/08/25 21:20:47 jlam Exp $
+
+diff -u1 bgpd/bgp_open.c /home/itojun/work/zebra/zebra/bgpd/bgp_open.c
+--- bgpd/bgp_open.c Wed Jun 19 17:05:38 2002
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_open.c Sat Aug 3 21:05:48 2002
+@@ -670,7 +670,2 @@
+
+- /* Do not send capability. */
+- if (! CHECK_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN)
+- || CHECK_FLAG (peer->flags, PEER_FLAG_DONT_CAPABILITY))
+- return;
+-
+ /* When the peer is IPv4 unicast only, do not send capability. */
View
12 net/zebra/patches/patch-bc
@@ -0,0 +1,12 @@
+$NetBSD: patch-bc,v 1.1.2.2 2002/08/25 21:20:48 jlam Exp $
+
+diff -u1 bgpd/bgp_packet.c /home/itojun/work/zebra/zebra/bgpd/bgp_packet.c
+--- bgpd/bgp_packet.c Sat Jun 29 15:20:39 2002
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_packet.c Sat Aug 3 21:05:49 2002
+@@ -758,3 +758,5 @@
+ /* Set capability code. */
+- bgp_open_capability (s, peer);
++ if (CHECK_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN) &&
++ ! CHECK_FLAG (peer->flags, PEER_FLAG_DONT_CAPABILITY))
++ bgp_open_capability (s, peer);
+
View
49 net/zebra/patches/patch-bd
@@ -0,0 +1,49 @@
+$NetBSD: patch-bd,v 1.1.2.2 2002/08/25 21:20:49 jlam Exp $
+
+diff -u1 bgpd/bgp_vty.c /home/itojun/work/zebra/zebra/bgpd/bgp_vty.c
+--- bgpd/bgp_vty.c Mon Jul 8 22:31:01 2002
++++ /home/itojun/work/zebra/zebra/bgpd/bgp_vty.c Sat Aug 3 21:05:54 2002
+@@ -98,8 +98,2 @@
+
+- if (peer_address_self_check (&su))
+- {
+- vty_out (vty, "%% Cannot configure the local system as neighbor%s", VTY_NEWLINE);
+- return NULL;
+- }
+-
+ peer = peer_lookup (bgp, &su);
+@@ -128,8 +122,2 @@
+ {
+- if (peer_address_self_check (&su))
+- {
+- vty_out (vty, "%% Cannot configure the local system as neighbor%s", VTY_NEWLINE);
+- return NULL;
+- }
+-
+ peer = peer_lookup (bgp, &su);
+@@ -1123,3 +1111,4 @@
+ {
+- vty_out (vty, "%% Cannot configure the local system as neighbor%s", VTY_NEWLINE);
++ vty_out (vty, "%% Can not configure the local system as neighbor%s",
++ VTY_NEWLINE);
+ return CMD_WARNING;
+@@ -1200,9 +1189,2 @@
+ {
+- if (peer_address_self_check (&su))
+- {
+- vty_out (vty, "%% Cannot configure the local system as neighbor%s",
+- VTY_NEWLINE);
+- return CMD_WARNING;
+- }
+-
+ peer = peer_lookup (vty->index, &su);
+@@ -1410,2 +1392,9 @@
+ vty_out (vty, "%% Configure the peer-group first%s", VTY_NEWLINE);
++ return CMD_WARNING;
++ }
++
++ if (peer_address_self_check (&su))
++ {
++ vty_out (vty, "%% Can not configure the local system as neighbor%s",
++ VTY_NEWLINE);
+ return CMD_WARNING;
View
22 net/zebra/patches/patch-ca
@@ -0,0 +1,22 @@
+$NetBSD: patch-ca,v 1.1.2.2 2002/08/25 21:20:49 jlam Exp $
+
+diff -u1 ospf6d/ChangeLog /home/itojun/work/zebra/zebra/ospf6d/ChangeLog
+--- ospf6d/ChangeLog Mon Jul 8 22:31:02 2002
++++ /home/itojun/work/zebra/zebra/ospf6d/ChangeLog Sat Aug 3 21:06:01 2002
+@@ -1 +1,16 @@
++2002-07-14 Yasuhiro Ohara <yasu@sfc.wide.ad.jp>
++
++ * ospf6_dbex.c: bug that ospf6d fails to refresh self-originated
++ LSA if he have not the LSA before has been fixed.
++ * ospf6_asbr.c: bug of failing removing ASE LSA when remove
++ message arrived from zebra has been fixed.
++ * version: 0.9.6k
++
++2002-07-13 Yasuhiro Ohara <yasu@sfc.wide.ad.jp>
++
++ * ospf6_zebra.c: bug reported [zebra 14642] fixed.
++ The bug was related to the synchronization between zebra
++ and ospf6d. Now synchronization will be correctly done.
++ * version: 0.9.6j
++
+ 2002-07-07 Yasuhiro Ohara <yasu@sfc.wide.ad.jp>
View
30 net/zebra/patches/patch-cc
@@ -0,0 +1,30 @@
+$NetBSD: patch-cc,v 1.1.2.2 2002/08/25 21:20:50 jlam Exp $
+
+diff -u1 ospf6d/ospf6_area.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_area.c
+--- ospf6d/ospf6_area.c Mon Jul 8 22:31:02 2002
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_area.c Sat Aug 3 21:06:04 2002
+@@ -102,24 +102,2 @@
+ void
+-ospf6_area_intra_topo_add (struct ospf6_route_req *topo_entry)
+-{
+- if (topo_entry->route.type == OSPF6_DEST_TYPE_ROUTER)
+- {
+- if (CHECK_FLAG (topo_entry->path.router_bits, OSPF6_ROUTER_LSA_BIT_B))
+- ospf6_abr_abr_entry_add (topo_entry);
+- }
+- CALL_ADD_HOOK (&intra_topology_hook, topo_entry);
+-}
+-
+-void
+-ospf6_area_intra_topo_remove (struct ospf6_route_req *topo_entry)
+-{
+- if (topo_entry->route.type == OSPF6_DEST_TYPE_ROUTER)
+- {
+- if (CHECK_FLAG (topo_entry->path.router_bits, OSPF6_ROUTER_LSA_BIT_E))
+- ospf6_abr_abr_entry_add (topo_entry);
+- }
+- CALL_REMOVE_HOOK (&intra_topology_hook, topo_entry);
+-}
+-
+-void
+ ospf6_area_route_add (void *data)
View
16 net/zebra/patches/patch-cd
@@ -0,0 +1,16 @@
+$NetBSD: patch-cd,v 1.1.2.2 2002/08/25 21:20:51 jlam Exp $
+
+diff -u1 ospf6d/ospf6_asbr.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_asbr.c
+--- ospf6d/ospf6_asbr.c Mon Jul 8 22:31:02 2002
++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_asbr.c Sat Aug 3 21:06:04 2002
+@@ -119,3 +119,3 @@
+ lsa = ospf6_lsdb_lookup_lsdb (htons (OSPF6_LSA_TYPE_AS_EXTERNAL),
+- htonl (route->path.origin.id),
++ route->path.origin.id,
+