From 8515688e4fc1e61508e192542688b3ff53ea4ca8 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 25 Aug 2002 21:19:46 +0000 Subject: Merge changes in the main trunk into the buildlink2 branch for those packages that have been converted to USE_BUILDLINK2. --- archivers/liblzo/Makefile | 13 ++--- archivers/liblzo/distinfo | 6 +- audio/vorbis-tools/DESCR | 2 +- audio/vorbis-tools/Makefile | 24 ++++---- audio/vorbis-tools/distinfo | 8 +-- audio/vorbis-tools/patches/patch-aa | 30 ---------- audio/vorbis-tools/patches/patch-ab | 28 --------- chat/gaim/Makefile | 25 ++------ chat/gaim/Makefile.common | 33 +++++++++++ chat/gaim/PLIST | 52 +---------------- chat/gaim/PLIST.common | 52 +++++++++++++++++ chat/gaim/distinfo | 9 +-- chat/gaim/patches/patch-aa | 8 +-- chat/gaim/patches/patch-ab | 94 ++++++++++++++++++++++++++++++ databases/postgresql-server/MESSAGE | 23 +++----- databases/postgresql-server/Makefile | 9 ++- databases/postgresql-server/files/pgsql.sh | 6 +- devel/gmake/Makefile | 11 +++- devel/gmp/Makefile | 6 +- devel/gmp/PLIST | 10 ++-- devel/gmp/buildlink.mk | 4 +- devel/gmp/distinfo | 11 ++-- devel/gmp/patches/patch-aa | 33 ----------- devel/gmp/patches/patch-ga | 25 ++++++++ devel/gmp/patches/patch-gb | 33 +++++++++++ devel/gmp/patches/patch-gc | 27 +++++++++ devel/gmp/patches/patch-gd | 30 ++++++++++ devel/p5-BSD-Resource/Makefile | 4 +- devel/p5-BSD-Resource/distinfo | 6 +- emulators/suse_base/PLIST | 4 +- graphics/ns-flash/Makefile | 26 +++++---- graphics/ns-flash/distinfo | 9 +-- net/gnet/distinfo | 1 + net/gtk-gnutella/Makefile | 6 +- net/gtk-gnutella/PLIST | 8 ++- net/gtk-gnutella/distinfo | 6 +- net/jwhois/PLIST | 8 ++- net/lftp/Makefile | 5 +- net/lftp/PLIST | 5 +- net/nap/Makefile | 7 ++- net/netsaint-base/distinfo | 1 + net/samba/Makefile | 71 +++------------------- net/samba/Makefile.common | 64 ++++++++++++++++++++ net/samba/PLIST | 10 +--- net/samba/distinfo | 5 +- net/samba/patches/patch-aa | 15 +++++ net/samba/patches/patch-ab | 62 ++++++++++++++++++++ net/samba/patches/patch-ad | 31 ++++++++++ net/samba20/Makefile | 4 +- net/vtun/Makefile | 5 +- net/vtun/distinfo | 6 +- net/wget/Makefile | 4 +- net/zebra/Makefile | 5 +- net/zebra/PLIST | 6 +- net/zebra/distinfo | 31 +++++++--- net/zebra/patches/patch-aa | 18 ++---- net/zebra/patches/patch-ab | 18 ++---- net/zebra/patches/patch-ac | 18 ++---- net/zebra/patches/patch-ad | 18 ++---- net/zebra/patches/patch-ae | 18 ++---- net/zebra/patches/patch-af | 18 ++---- net/zebra/patches/patch-ba | 11 ++++ net/zebra/patches/patch-bb | 13 +++++ net/zebra/patches/patch-bc | 12 ++++ net/zebra/patches/patch-bd | 49 ++++++++++++++++ net/zebra/patches/patch-ca | 22 +++++++ net/zebra/patches/patch-cc | 30 ++++++++++ net/zebra/patches/patch-cd | 16 +++++ net/zebra/patches/patch-ce | 10 ++++ net/zebra/patches/patch-cf | 25 ++++++++ net/zebra/patches/patch-cg | 23 ++++++++ net/zebra/patches/patch-ch | 37 ++++++++++++ net/zebra/patches/patch-ci | 33 +++++++++++ net/zebra/patches/patch-cj | 10 ++++ print/gimp-print-lib/distinfo | 3 +- print/gimp-print-lib/patches/patch-ac | 13 +++++ print/tcl-pdflib/PLIST | 6 +- print/xpdf/Makefile | 4 +- security/gnupg/Makefile | 3 +- security/gnupg/PLIST | 4 +- security/gnupg/distinfo | 4 +- security/gnupg/patches/patch-ad | 20 +++++++ security/gnupg/patches/patch-ae | 20 +++++++ security/pam-smbpass/Makefile | 49 +++++----------- security/pam-smbpass/distinfo | 6 -- security/pam-smbpass/patches/patch-aa | 13 ----- security/pam-smbpass/patches/patch-ab | 31 ---------- security/racoon/Makefile | 8 ++- security/zebedee/Makefile | 5 +- shells/zsh/Makefile | 4 +- shells/zsh/PLIST | 36 +++++++++++- shells/zsh/distinfo | 8 ++- shells/zsh/patches/patch-ac | 13 +++++ shells/zsh/patches/patch-ad | 13 +++++ sysutils/amanda-common/Makefile.common | 6 +- sysutils/gentoo/Makefile | 4 +- sysutils/gentoo/PLIST | 3 +- sysutils/gentoo/distinfo | 6 +- sysutils/gkrellm/buildlink.mk | 34 +++++++++++ sysutils/grub/Makefile | 27 ++++++++- sysutils/grub/PLIST | 6 +- sysutils/grun/Makefile | 6 +- sysutils/ups-nut-cgi/DESCR | 2 +- sysutils/ups-nut-cgi/Makefile | 7 +-- sysutils/ups-nut-cgi/distinfo | 12 ++-- sysutils/ups-nut-cgi/patches/patch-aa | 13 ++--- sysutils/ups-nut-cgi/patches/patch-ad | 20 +++---- sysutils/ups-nut-cgi/patches/patch-ae | 40 ++++++------- sysutils/ups-nut/MESSAGE | 6 +- sysutils/ups-nut/Makefile | 19 +++--- sysutils/ups-nut/PLIST | 58 +++++++++--------- sysutils/ups-nut/distinfo | 9 +-- sysutils/ups-nut/patches/patch-aa | 11 ++-- sysutils/ups-nut/patches/patch-ac | 18 ++++++ sysutils/xps/Makefile | 5 +- textproc/ispell-base/Makefile | 7 ++- textproc/ispell-base/distinfo | 10 +++- textproc/ispell-base/patches/patch-al | 13 +++++ textproc/ispell-base/patches/patch-am | 13 +++++ textproc/ispell-base/patches/patch-an | 13 +++++ textproc/ispell-base/patches/patch-ao | 13 +++++ textproc/ispell-base/patches/patch-ap | 13 +++++ textproc/ispell-base/patches/patch-aq | 13 +++++ textproc/t1utils/DESCR | 5 -- textproc/t1utils/Makefile | 15 ----- textproc/t1utils/PLIST | 13 ----- textproc/t1utils/distinfo | 4 -- textproc/texi2html/Makefile | 4 +- time/plan/PLIST | 4 +- wm/fluxbox/distinfo | 3 +- wm/fluxbox/patches/patch-ab | 46 +++++++++++++++ wm/icewm/Makefile | 4 +- wm/icewm/Makefile.common | 7 +-- wm/icewm/PLIST | 5 +- wm/icewm/distinfo | 8 +-- wm/icewm/patches/patch-ae | 10 ++-- wm/wmx/PLIST | 4 +- www/Mosaic/Makefile | 4 +- www/Mosaic/PLIST | 4 +- www/amaya/distinfo | 6 +- www/amaya/patches/patch-aa | 16 +++-- www/amaya/patches/patch-ae | 15 +++++ www/amaya/patches/patch-af | 13 +++++ www/ap-dav/Makefile | 4 +- www/ap-perl/Makefile | 25 ++++---- www/ap-ssl/Makefile | 9 +-- www/ap-ssl/distinfo | 6 +- www/apache2/Makefile | 34 +++++------ www/apache2/files/apache.sh | 12 +++- www/apache6/Makefile | 43 ++++++++++---- www/apache6/PLIST | 8 ++- www/apache6/files/apache.sh | 9 ++- www/apache6/files/config.layout | 6 +- www/bozohttpd/DESCR | 2 +- www/bozohttpd/Makefile | 10 ++-- www/bozohttpd/distinfo | 10 ++-- www/bozohttpd/patches/patch-aa | 12 ---- www/bozohttpd/patches/patch-ab | 17 ++++-- www/bozohttpd/patches/patch-ae | 21 ------- www/communicator/MESSAGE | 5 +- www/communicator/PLIST.post | 4 +- www/curl/distinfo | 3 +- www/curl/patches/patch-ab | 20 +++++++ www/cvsweb/Makefile | 49 ++++++++++++---- www/cvsweb/PLIST | 22 ++++++- www/cvsweb/distinfo | 9 +-- www/cvsweb/patches/patch-aa | 18 ++++-- www/cvsweb/patches/patch-ab | 12 ++++ www/dillo/Makefile | 5 +- www/dillo/distinfo | 6 +- www/elinks/distinfo | 2 +- www/kannel/Makefile | 13 +++-- www/kannel/PLIST | 18 +++--- www/kannel/distinfo | 11 ++-- www/kannel/patches/patch-aa | 8 +-- www/kannel/patches/patch-ab | 19 ++---- www/kannel/patches/patch-ac | 13 ----- www/links-gui/Makefile | 6 +- www/links-gui/distinfo | 6 +- www/links/Makefile | 6 +- www/links/Makefile.common | 4 +- www/links/distinfo | 6 +- www/lynx-current/distinfo | 3 +- www/lynx-current/patches/patch-ab | 23 ++++++++ www/lynx/Makefile | 11 ++-- www/lynx/distinfo | 5 +- www/lynx/patches/patch-ab | 23 ++++++++ www/opera6/Makefile | 8 +-- www/opera6/distinfo | 6 +- www/sitecopy/Makefile | 4 +- www/sitecopy/PLIST | 3 +- www/sitecopy/distinfo | 9 +-- www/sitecopy/patches/patch-aa | 20 +++---- www/sitecopy/patches/patch-ab | 14 +++++ www/w3m/Makefile.common | 9 ++- www/wdg-validate/Makefile | 10 ++-- www/wdg-validate/distinfo | 14 ++--- x11/aterm/Makefile | 4 +- x11/aterm/distinfo | 3 +- x11/aterm/patches/patch-ae | 25 ++++++++ x11/ttmkfdir/Makefile | 2 +- x11/ttmkfdir/PLIST | 2 +- x11/ttmkfdir/patches/patch-aa | 2 +- x11/ttmkfdir/patches/patch-ab | 2 +- x11/xpmroot/Makefile | 4 +- x11/xpmroot/distinfo | 6 +- 206 files changed, 1994 insertions(+), 997 deletions(-) delete mode 100644 audio/vorbis-tools/patches/patch-aa delete mode 100644 audio/vorbis-tools/patches/patch-ab create mode 100644 chat/gaim/Makefile.common create mode 100644 chat/gaim/PLIST.common create mode 100644 chat/gaim/patches/patch-ab delete mode 100644 devel/gmp/patches/patch-aa create mode 100644 devel/gmp/patches/patch-ga create mode 100644 devel/gmp/patches/patch-gb create mode 100644 devel/gmp/patches/patch-gc create mode 100644 devel/gmp/patches/patch-gd create mode 100644 net/samba/Makefile.common create mode 100644 net/samba/patches/patch-aa create mode 100644 net/samba/patches/patch-ab create mode 100644 net/samba/patches/patch-ad create mode 100644 net/zebra/patches/patch-ba create mode 100644 net/zebra/patches/patch-bb create mode 100644 net/zebra/patches/patch-bc create mode 100644 net/zebra/patches/patch-bd create mode 100644 net/zebra/patches/patch-ca create mode 100644 net/zebra/patches/patch-cc create mode 100644 net/zebra/patches/patch-cd create mode 100644 net/zebra/patches/patch-ce create mode 100644 net/zebra/patches/patch-cf create mode 100644 net/zebra/patches/patch-cg create mode 100644 net/zebra/patches/patch-ch create mode 100644 net/zebra/patches/patch-ci create mode 100644 net/zebra/patches/patch-cj create mode 100644 print/gimp-print-lib/patches/patch-ac create mode 100644 security/gnupg/patches/patch-ad create mode 100644 security/gnupg/patches/patch-ae delete mode 100644 security/pam-smbpass/distinfo delete mode 100644 security/pam-smbpass/patches/patch-aa delete mode 100644 security/pam-smbpass/patches/patch-ab create mode 100644 shells/zsh/patches/patch-ac create mode 100644 shells/zsh/patches/patch-ad create mode 100644 sysutils/gkrellm/buildlink.mk create mode 100644 sysutils/ups-nut/patches/patch-ac create mode 100644 textproc/ispell-base/patches/patch-al create mode 100644 textproc/ispell-base/patches/patch-am create mode 100644 textproc/ispell-base/patches/patch-an create mode 100644 textproc/ispell-base/patches/patch-ao create mode 100644 textproc/ispell-base/patches/patch-ap create mode 100644 textproc/ispell-base/patches/patch-aq delete mode 100644 textproc/t1utils/DESCR delete mode 100644 textproc/t1utils/Makefile delete mode 100644 textproc/t1utils/PLIST delete mode 100644 textproc/t1utils/distinfo create mode 100644 wm/fluxbox/patches/patch-ab create mode 100644 www/amaya/patches/patch-ae create mode 100644 www/amaya/patches/patch-af delete mode 100644 www/bozohttpd/patches/patch-aa delete mode 100644 www/bozohttpd/patches/patch-ae create mode 100644 www/curl/patches/patch-ab create mode 100644 www/cvsweb/patches/patch-ab delete mode 100644 www/kannel/patches/patch-ac create mode 100644 www/lynx-current/patches/patch-ab create mode 100644 www/lynx/patches/patch-ab create mode 100644 www/sitecopy/patches/patch-ab create mode 100644 x11/aterm/patches/patch-ae diff --git a/archivers/liblzo/Makefile b/archivers/liblzo/Makefile index 30c4ce55637..dd71f8f16df 100644 --- a/archivers/liblzo/Makefile +++ b/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 diff --git a/archivers/liblzo/distinfo b/archivers/liblzo/distinfo index b4d7a06ce18..8ea8d71659c 100644 --- a/archivers/liblzo/distinfo +++ b/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 diff --git a/audio/vorbis-tools/DESCR b/audio/vorbis-tools/DESCR index cf40d1f554a..7459e309793 100644 --- a/audio/vorbis-tools/DESCR +++ b/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 diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index f950b95ca72..86fcfa0d3dc 100644 --- a/audio/vorbis-tools/Makefile +++ b/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" diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo index c6d0e68bc10..6f0b9bcff7b 100644 --- a/audio/vorbis-tools/distinfo +++ b/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 diff --git a/audio/vorbis-tools/patches/patch-aa b/audio/vorbis-tools/patches/patch-aa deleted file mode 100644 index 142541b93c4..00000000000 --- a/audio/vorbis-tools/patches/patch-aa +++ /dev/null @@ -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); - } - diff --git a/audio/vorbis-tools/patches/patch-ab b/audio/vorbis-tools/patches/patch-ab deleted file mode 100644 index 8d497ea1875..00000000000 --- a/audio/vorbis-tools/patches/patch-ab +++ /dev/null @@ -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; - } diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index 6a78dd1ba14..283beafe0e2 100644 --- a/chat/gaim/Makefile +++ b/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" diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common new file mode 100644 index 00000000000..ba5fdc4b5fe --- /dev/null +++ b/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 diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST index 1a1ebd6570b..4ce0c475c55 100644 --- a/chat/gaim/PLIST +++ b/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 diff --git a/chat/gaim/PLIST.common b/chat/gaim/PLIST.common new file mode 100644 index 00000000000..f0c7d3a0bd4 --- /dev/null +++ b/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 diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo index cfc12e98cff..5a86381983a 100644 --- a/chat/gaim/distinfo +++ b/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 diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa index 59ff2083f73..92af147bd5f 100644 --- a/chat/gaim/patches/patch-aa +++ b/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)" - diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab new file mode 100644 index 00000000000..f7bb8a83887 --- /dev/null +++ b/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; diff --git a/databases/postgresql-server/MESSAGE b/databases/postgresql-server/MESSAGE index 8bae0e26ede..7e1666577e3 100644 --- a/databases/postgresql-server/MESSAGE +++ b/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. =========================================================================== diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile index 61ed0e7d192..8591cdc1521 100644 --- a/databases/postgresql-server/Makefile +++ b/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} diff --git a/databases/postgresql-server/files/pgsql.sh b/databases/postgresql-server/files/pgsql.sh index 3b5e633e6ef..9fa790a1136 100644 --- a/databases/postgresql-server/files/pgsql.sh +++ b/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" diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 577ea0e49e5..a18c1d54c18 100644 --- a/devel/gmake/Makefile +++ b/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|' \ diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile index 5c1695fd5d3..ac7293dff44 100644 --- a/devel/gmp/Makefile +++ b/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 diff --git a/devel/gmp/PLIST b/devel/gmp/PLIST index 699c97d3d33..e8632cafaf0 100644 --- a/devel/gmp/PLIST +++ b/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 diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk index 3c587e4d081..d06448c8403 100644 --- a/devel/gmp/buildlink.mk +++ b/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 diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo index 6148ed031ca..3d9d6817ff4 100644 --- a/devel/gmp/distinfo +++ b/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 diff --git a/devel/gmp/patches/patch-aa b/devel/gmp/patches/patch-aa deleted file mode 100644 index b1e92346401..00000000000 --- a/devel/gmp/patches/patch-aa +++ /dev/null @@ -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 diff --git a/devel/gmp/patches/patch-ga b/devel/gmp/patches/patch-ga new file mode 100644 index 00000000000..9dcb41d0829 --- /dev/null +++ b/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; diff --git a/devel/gmp/patches/patch-gb b/devel/gmp/patches/patch-gb new file mode 100644 index 00000000000..991427ba277 --- /dev/null +++ b/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) diff --git a/devel/gmp/patches/patch-gc b/devel/gmp/patches/patch-gc new file mode 100644 index 00000000000..a478bb29be6 --- /dev/null +++ b/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; + } diff --git a/devel/gmp/patches/patch-gd b/devel/gmp/patches/patch-gd new file mode 100644 index 00000000000..26f4eaafc01 --- /dev/null +++ b/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(*mpq_numref(mp)); } ++ mpz_class & get_num() ++ { return reinterpret_cast(*mpq_numref(mp)); } ++ const mpz_class & get_den() const ++ { return reinterpret_cast(*mpq_denref(mp)); } ++ mpz_class & get_den() ++ { return reinterpret_cast(*mpq_denref(mp)); } + + mpq_srcptr get_mpq_t() const { return mp; } + mpq_ptr get_mpq_t() { return mp; } diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile index a9b930a9d86..30fcbe6147b 100644 --- a/devel/p5-BSD-Resource/Makefile +++ b/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 diff --git a/devel/p5-BSD-Resource/distinfo b/devel/p5-BSD-Resource/distinfo index 5be29e13a8c..c4f6372bd4d 100644 --- a/devel/p5-BSD-Resource/distinfo +++ b/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 diff --git a/emulators/suse_base/PLIST b/emulators/suse_base/PLIST index 25c9091a2af..fafecad0210 100644 --- a/emulators/suse_base/PLIST +++ b/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 diff --git a/graphics/ns-flash/Makefile b/graphics/ns-flash/Makefile index cff3d72c8e1..109784e979e 100644 --- a/graphics/ns-flash/Makefile +++ b/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} diff --git a/graphics/ns-flash/distinfo b/graphics/ns-flash/distinfo index 58be6028db9..8956fb1261b 100644 --- a/graphics/ns-flash/distinfo +++ b/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 diff --git a/net/gnet/distinfo b/net/gnet/distinfo index 6a6adc8efef..cb464262c4a 100644 --- a/net/gnet/distinfo +++ b/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 diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index 09eaffff9b9..ca4705d1252 100644 --- a/net/gtk-gnutella/Makefile +++ b/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" diff --git a/net/gtk-gnutella/PLIST b/net/gtk-gnutella/PLIST index 1c982ec268d..166de3679f0 100644 --- a/net/gtk-gnutella/PLIST +++ b/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 diff --git a/net/gtk-gnutella/distinfo b/net/gtk-gnutella/distinfo index 266ec1853c3..cd2301255fa 100644 --- a/net/gtk-gnutella/distinfo +++ b/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 diff --git a/net/jwhois/PLIST b/net/jwhois/PLIST index b206897666b..83910f7e3fc 100644 --- a/net/jwhois/PLIST +++ b/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 diff --git a/net/lftp/Makefile b/net/lftp/Makefile index c8d4a66c113..922cb9202c3 100644 --- a/net/lftp/Makefile +++ b/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 diff --git a/net/lftp/PLIST b/net/lftp/PLIST index 3b28dd3d45b..3654cf0743d 100644 --- a/net/lftp/PLIST +++ b/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 diff --git a/net/nap/Makefile b/net/nap/Makefile index 930057e796b..5b623a94cee 100644 --- a/net/nap/Makefile +++ b/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 diff --git a/net/netsaint-base/distinfo b/net/netsaint-base/distinfo index b687faed850..a8f2f6f4866 100644 --- a/net/netsaint-base/distinfo +++ b/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 diff --git a/net/samba/Makefile b/net/samba/Makefile index 4103ea57301..99400c18bac 100644 --- a/net/samba/Makefile +++ b/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 diff --git a/net/samba/Makefile.common b/net/samba/Makefile.common new file mode 100644 index 00000000000..3161603cb64 --- /dev/null +++ b/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} diff --git a/net/samba/PLIST b/net/samba/PLIST index 75b66be0efb..c9a759f7fae 100644 --- a/net/samba/PLIST +++ b/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 diff --git a/net/samba/distinfo b/net/samba/distinfo index f51d0960e1c..217134c8f26 100644 --- a/net/samba/distinfo +++ b/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 diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa new file mode 100644 index 00000000000..39fcf563360 --- /dev/null +++ b/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) diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab new file mode 100644 index 00000000000..3243b2a3c1e --- /dev/null +++ b/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 <&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 diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad new file mode 100644 index 00000000000..4d3207b916d --- /dev/null +++ b/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) \ diff --git a/net/samba20/Makefile b/net/samba20/Makefile index a0d2f934f1e..b1cc174fd3d 100644 --- a/net/samba20/Makefile +++ b/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 diff --git a/net/vtun/Makefile b/net/vtun/Makefile index 8177237b286..c6494188f17 100644 --- a/net/vtun/Makefile +++ b/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 diff --git a/net/vtun/distinfo b/net/vtun/distinfo index 70d02fec2e9..08c3cced0dd 100644 --- a/net/vtun/distinfo +++ b/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 diff --git a/net/wget/Makefile b/net/wget/Makefile index e32e50e27a0..e2a2757d60f 100644 --- a/net/wget/Makefile +++ b/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 diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 0cc1dfc5425..c3f79ecd344 100644 --- a/net/zebra/Makefile +++ b/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} diff --git a/net/zebra/PLIST b/net/zebra/PLIST index 820de18b3b8..2a588acf61a 100644 --- a/net/zebra/PLIST +++ b/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 diff --git a/net/zebra/distinfo b/net/zebra/distinfo index d9c1d8d13e8..17057db3959 100644 --- a/net/zebra/distinfo +++ b/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 diff --git a/net/zebra/patches/patch-aa b/net/zebra/patches/patch-aa index edcdfc43e5f..fd8a93451b7 100644 --- a/net/zebra/patches/patch-aa +++ b/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 - diff --git a/net/zebra/patches/patch-ab b/net/zebra/patches/patch-ab index 28c972e950d..ee02c1f0ab9 100644 --- a/net/zebra/patches/patch-ab +++ b/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 - diff --git a/net/zebra/patches/patch-ac b/net/zebra/patches/patch-ac index 05d0735c369..7c6ef54bf78 100644 --- a/net/zebra/patches/patch-ac +++ b/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 - diff --git a/net/zebra/patches/patch-ad b/net/zebra/patches/patch-ad index e70ec8d7424..d05d18d0d3c 100644 --- a/net/zebra/patches/patch-ad +++ b/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 - diff --git a/net/zebra/patches/patch-ae b/net/zebra/patches/patch-ae index fef09c4fde5..ffb5066133e 100644 --- a/net/zebra/patches/patch-ae +++ b/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 - diff --git a/net/zebra/patches/patch-af b/net/zebra/patches/patch-af index 8db65252a52..750e463f5c4 100644 --- a/net/zebra/patches/patch-af +++ b/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 - diff --git a/net/zebra/patches/patch-ba b/net/zebra/patches/patch-ba new file mode 100644 index 00000000000..36c96b6a9fc --- /dev/null +++ b/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. */ diff --git a/net/zebra/patches/patch-bb b/net/zebra/patches/patch-bb new file mode 100644 index 00000000000..dcfc0267509 --- /dev/null +++ b/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. */ diff --git a/net/zebra/patches/patch-bc b/net/zebra/patches/patch-bc new file mode 100644 index 00000000000..a73b82ffda1 --- /dev/null +++ b/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); + diff --git a/net/zebra/patches/patch-bd b/net/zebra/patches/patch-bd new file mode 100644 index 00000000000..12094a627be --- /dev/null +++ b/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; diff --git a/net/zebra/patches/patch-ca b/net/zebra/patches/patch-ca new file mode 100644 index 00000000000..93a4ed0ff6c --- /dev/null +++ b/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 ++ ++ * 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 ++ ++ * 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 diff --git a/net/zebra/patches/patch-cc b/net/zebra/patches/patch-cc new file mode 100644 index 00000000000..f0b3577a829 --- /dev/null +++ b/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) diff --git a/net/zebra/patches/patch-cd b/net/zebra/patches/patch-cd new file mode 100644 index 00000000000..af17a16c3cd --- /dev/null +++ b/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, + ospf6->router_id, ospf6->lsdb); +@@ -419,2 +419,5 @@ + assert (ospf6); ++ ++ if (IS_OSPF6_DUMP_ASBR) ++ zlog_info ("ASBR: refresh %s", lsa->str); + diff --git a/net/zebra/patches/patch-ce b/net/zebra/patches/patch-ce new file mode 100644 index 00000000000..656df89df7c --- /dev/null +++ b/net/zebra/patches/patch-ce @@ -0,0 +1,10 @@ +$NetBSD: patch-ce,v 1.1.2.2 2002/08/25 21:20:52 jlam Exp $ + +diff -u1 ospf6d/ospf6_dbex.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_dbex.c +--- ospf6d/ospf6_dbex.c Mon Jul 8 22:31:02 2002 ++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_dbex.c Sat Aug 3 21:06:05 2002 +@@ -363,3 +363,3 @@ + if (received->lsa_hdr->lsh_advrtr == ospf6->router_id +- && have && ismore_recent < 0) ++ && (! have || ismore_recent < 0)) + { diff --git a/net/zebra/patches/patch-cf b/net/zebra/patches/patch-cf new file mode 100644 index 00000000000..eeaf70554ba --- /dev/null +++ b/net/zebra/patches/patch-cf @@ -0,0 +1,25 @@ +$NetBSD: patch-cf,v 1.1.2.2 2002/08/25 21:20:53 jlam Exp $ + +diff -u1 ospf6d/ospf6_intra.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_intra.c +--- ospf6d/ospf6_intra.c Mon Jul 8 22:31:02 2002 ++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_intra.c Sat Jul 13 01:03:44 2002 +@@ -39,2 +39,12 @@ + ++ if (IS_OSPF6_DUMP_INTRA) ++ { ++ char buf[64]; ++ struct prefix_ls *p_ls; ++ p_ls = (struct prefix_ls *) &topo_entry->route.prefix; ++ inet_ntop (AF_INET, &p_ls->adv_router, buf, sizeof (buf)); ++ zlog_info ("INTRA: Calculate [%s] %s and %s", ++ (type == ADD ? "add" : "remove"), lsa->str, buf); ++ } ++ + intra_prefix = OSPF6_LSA_HEADER_END (lsa->header); +@@ -200,6 +210,2 @@ + { +- if (IS_OSPF6_DUMP_INTRA) +- zlog_info ("INTRA: topology hook: Examining %s (%p)", +- node.lsa->str, node.lsa); +- + if (IS_LSA_MAXAGE (node.lsa)) diff --git a/net/zebra/patches/patch-cg b/net/zebra/patches/patch-cg new file mode 100644 index 00000000000..8c4a1ab083c --- /dev/null +++ b/net/zebra/patches/patch-cg @@ -0,0 +1,23 @@ +$NetBSD: patch-cg,v 1.1.2.2 2002/08/25 21:20:54 jlam Exp $ + +diff -u1 ospf6d/ospf6_lsa.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_lsa.c +--- ospf6d/ospf6_lsa.c Mon Jul 8 22:31:02 2002 ++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_lsa.c Sat Aug 3 21:06:08 2002 +@@ -777,2 +777,3 @@ + struct ospf6_lsdb *lsdb = NULL; ++ void (*hook) (struct ospf6_lsa *, struct ospf6_lsa *); + +@@ -806,8 +807,7 @@ + +-#if 0 +- if (lsdb->hook) +- (*lsdb->hook) (lsa, NULL); +-#else /*0*/ +- CALL_REMOVE_HOOK (&database_hook, lsa); +-#endif /*0*/ ++ /* call LSDB hook to re-process LSA */ ++ hook = ospf6_lsdb_hook[ntohs (lsa->header->type) & ++ OSPF6_LSTYPE_CODE_MASK].hook; ++ if (hook) ++ (*hook) (NULL, lsa); + diff --git a/net/zebra/patches/patch-ch b/net/zebra/patches/patch-ch new file mode 100644 index 00000000000..cb30bd04d60 --- /dev/null +++ b/net/zebra/patches/patch-ch @@ -0,0 +1,37 @@ +$NetBSD: patch-ch,v 1.1.2.2 2002/08/25 21:20:56 jlam Exp $ + +diff -u1 ospf6d/ospf6_route.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_route.c +--- ospf6d/ospf6_route.c Sun Jul 7 17:12:48 2002 ++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_route.c Sat Aug 3 21:06:12 2002 +@@ -1015,2 +1015,6 @@ + ++ u_int route_count = 0; ++ u_int path_count = 0; ++ u_int route_redundant = 0; ++ + memset (&prefix, 0, sizeof (struct prefix)); +@@ -1103,3 +1107,5 @@ + { +- if (! node->info) ++ struct ospf6_route_node *route = node->info; ++ ++ if (! route) + continue; +@@ -1107,6 +1113,15 @@ + if (detail) +- ospf6_route_show_detail (vty, node->info); ++ ospf6_route_show_detail (vty, route); + else +- ospf6_route_show (vty, node->info); ++ ospf6_route_show (vty, route); ++ ++ route_count++; ++ path_count += route->path_list->count; ++ if (route->path_list->count > 1) ++ route_redundant++; + } ++ ++ vty_out (vty, "===========%s", VTY_NEWLINE); ++ vty_out (vty, "Route: %d Path: %d Redundant: %d%s", ++ route_count, path_count, route_redundant, VTY_NEWLINE); + diff --git a/net/zebra/patches/patch-ci b/net/zebra/patches/patch-ci new file mode 100644 index 00000000000..075614c8323 --- /dev/null +++ b/net/zebra/patches/patch-ci @@ -0,0 +1,33 @@ +$NetBSD: patch-ci,v 1.1.2.2 2002/08/25 21:20:57 jlam Exp $ + +diff -u1 ospf6d/ospf6_zebra.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_zebra.c +--- ospf6d/ospf6_zebra.c Sun Jul 7 17:12:48 2002 ++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6_zebra.c Sat Aug 3 21:06:15 2002 +@@ -435,6 +435,9 @@ + +- if (type == REMOVE && nexthop_list->count == 0) ++ if (type == REMOVE && nexthop_list->count != 0) ++ type = ADD; ++ else if (type == REMOVE && nexthop_list->count == 0) + { +- if (! ospf6_route_end (&route)) +- ospf6_route_next (&route); ++ if (IS_OSPF6_DUMP_ZEBRA) ++ zlog_info ("ZEBRA: all nexthop with the selected path has gone"); ++ + if (! memcmp (&request->route, &route.route, +@@ -446,3 +449,3 @@ + if (IS_OSPF6_DUMP_ZEBRA) +- zlog_info ("ZEBRA: find alternative path to add"); ++ zlog_info ("ZEBRA: found alternative path to add"); + +@@ -478,2 +481,9 @@ + zlog_info ("ZEBRA: can't find alternative path, remove"); ++ ++ if (IS_OSPF6_DUMP_ZEBRA) ++ { ++ zlog_info ("ZEBRA: Debug: walk over the route ?"); ++ ospf6_route_log_request ("Debug route", "***", &route); ++ ospf6_route_log_request ("Debug request", "***", request); ++ } + diff --git a/net/zebra/patches/patch-cj b/net/zebra/patches/patch-cj new file mode 100644 index 00000000000..74a9b6504e9 --- /dev/null +++ b/net/zebra/patches/patch-cj @@ -0,0 +1,10 @@ +$NetBSD: patch-cj,v 1.1.2.2 2002/08/25 21:20:59 jlam Exp $ + +diff -u1 ospf6d/ospf6d.h /home/itojun/work/zebra/zebra/ospf6d/ospf6d.h +--- ospf6d/ospf6d.h Mon Jul 8 22:31:04 2002 ++++ /home/itojun/work/zebra/zebra/ospf6d/ospf6d.h Sat Aug 3 21:06:15 2002 +@@ -76,3 +76,3 @@ + +-#define OSPF6_DAEMON_VERSION "0.9.6i" ++#define OSPF6_DAEMON_VERSION "0.9.6k" + diff --git a/print/gimp-print-lib/distinfo b/print/gimp-print-lib/distinfo index a494a224464..c5788fef12d 100644 --- a/print/gimp-print-lib/distinfo +++ b/print/gimp-print-lib/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2002/05/03 12:43:06 drochner Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/08/25 21:21:00 jlam Exp $ SHA1 (gimp-print-4.2.1.tar.gz) = 51a2c5a3da85950e876ee049f9a377b03bf502f8 Size (gimp-print-4.2.1.tar.gz) = 4691313 bytes SHA1 (patch-aa) = 9302f17215f3ee1dd3fd10dbf48f2bc4a4593aa8 SHA1 (patch-ab) = ac96c5825c09a8507ce16efd95fa9d24720d6899 +SHA1 (patch-ac) = 2e7c114dd67e21b861bac405cc1a665460e66867 diff --git a/print/gimp-print-lib/patches/patch-ac b/print/gimp-print-lib/patches/patch-ac new file mode 100644 index 00000000000..51562e1b41e --- /dev/null +++ b/print/gimp-print-lib/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.4.2 2002/08/25 21:21:01 jlam Exp $ + +--- src/Makefile.in.orig Fri Apr 26 20:56:31 2002 ++++ src/Makefile.in +@@ -192,7 +192,7 @@ + AUTOMAKE_OPTIONS = 1.4 gnu + + MAINT_CHARSET = latin1 +-NONGIMP_SUBDIRS = cups foomatic ghost testpattern ++NONGIMP_SUBDIRS = # cups foomatic ghost testpattern + SUBDIRS = printdef main escputil gimp $(NONGIMP_SUBDIRS) + + MAINTAINERCLEANFILES = Makefile.in diff --git a/print/tcl-pdflib/PLIST b/print/tcl-pdflib/PLIST index 433ac8d8192..f07c1f2e8a5 100644 --- a/print/tcl-pdflib/PLIST +++ b/print/tcl-pdflib/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:28:03 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/08/25 21:21:02 jlam Exp $ lib/tcl8.3/pdflib/pdflib_tcl.a lib/tcl8.3/pdflib/pdflib_tcl.la lib/tcl8.3/pdflib/pdflib_tcl.so -lib/tcl8.3/pdflib/pdflib_tcl.so.2 -lib/tcl8.3/pdflib/pdflib_tcl.so.2.1 +lib/tcl8.3/pdflib/pdflib_tcl.so.0 +lib/tcl8.3/pdflib/pdflib_tcl.so.0.0 lib/tcl8.3/pdflib/pkgIndex.tcl @dirrm lib/tcl8.3/pdflib diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index 68369457428..29da71d0421 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7.2.2 2002/07/01 17:45:07 jlam Exp $ +# $NetBSD: Makefile,v 1.7.2.3 2002/08/25 21:21:03 jlam Exp $ # DISTNAME= xpdf-1.00 @@ -30,8 +30,8 @@ MAKE_ENV+= SED="${SED}" ECHO="${ECHO}" CONFIGURE_ARGS+= --enable-a4-paper .endif +.include "../../fonts/t1lib/buildlink2.mk" .include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" -.include "../../textproc/t1lib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 12311e71ac2..42a841964c3 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.31.2.1 2002/07/01 17:45:08 jlam Exp $ +# $NetBSD: Makefile,v 1.31.2.2 2002/08/25 21:21:04 jlam Exp $ # DISTNAME= gnupg-1.0.7 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/pub/gcrypt/gnupg/ # don't remove this -- we may add idea.c to it below diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST index 2ab812a61e8..885eca6c41f 100644 --- a/security/gnupg/PLIST +++ b/security/gnupg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/05/07 18:48:46 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2002/08/25 21:21:05 jlam Exp $ bin/gpg bin/gpgkeys_mailto bin/gpgsplit @@ -8,7 +8,7 @@ info/gpgv.info @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gpgv.info ${IDEA}lib/gnupg/idea lib/gnupg/rndegd -lib/gnupg/rndlinux +lib/gnupg/rndunix lib/gnupg/tiger man/man1/gpg.1 man/man1/gpgv.1 diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index a81e8e0cf70..8fa9272e48a 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2002/05/07 18:48:46 wiz Exp $ +$NetBSD: distinfo,v 1.8.2.1 2002/08/25 21:21:06 jlam Exp $ SHA1 (gnupg-1.0.7.tar.gz) = 46da038c60143fa49abae2fae6fcbd0f58f7a46e Size (gnupg-1.0.7.tar.gz) = 2399025 bytes @@ -7,3 +7,5 @@ Size (idea.c.20010605) = 15480 bytes SHA1 (patch-aa) = fffd3e55792bb27df002bacbc5d8bf9096d5dd64 SHA1 (patch-ab) = ce3b5ff0331e51ca6cd11b969e8df3719ca5d547 SHA1 (patch-ac) = 9e3d0c6a7b828e52f5a773591f87e4a9072ad698 +SHA1 (patch-ad) = 55ca924c9aefe9eeca44b301ac523e7ebb2514e9 +SHA1 (patch-ae) = ff58490a6505e333f776efa7cafaa269c4833597 diff --git a/security/gnupg/patches/patch-ad b/security/gnupg/patches/patch-ad new file mode 100644 index 00000000000..ca3844ef26f --- /dev/null +++ b/security/gnupg/patches/patch-ad @@ -0,0 +1,20 @@ +$NetBSD: patch-ad,v 1.1.4.2 2002/08/25 21:21:07 jlam Exp $ + +--- configure.orig Mon Apr 29 16:59:16 2002 ++++ configure +@@ -3928,8 +3928,14 @@ + NAME_OF_DEV_RANDOM="/dev/random" + NAME_OF_DEV_URANDOM="/dev/urandom" + case "${target}" in +- *-openbsd* | *-netbsd*) ++ *-openbsd*) + NAME_OF_DEV_RANDOM="/dev/srandom" ++ NAME_OF_DEV_URANDOM="/dev/urandom" ++ DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" ++ ;; ++ ++ *-netbsd*) ++ NAME_OF_DEV_RANDOM="/dev/random" + NAME_OF_DEV_URANDOM="/dev/urandom" + DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" + ;; diff --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae new file mode 100644 index 00000000000..bab4493f1fc --- /dev/null +++ b/security/gnupg/patches/patch-ae @@ -0,0 +1,20 @@ +$NetBSD: patch-ae,v 1.1.4.2 2002/08/25 21:21:08 jlam Exp $ + +--- configure.ac.orig Mon Apr 29 16:56:08 2002 ++++ configure.ac +@@ -325,8 +325,14 @@ + NAME_OF_DEV_RANDOM="/dev/random" + NAME_OF_DEV_URANDOM="/dev/urandom" + case "${target}" in +- *-openbsd* | *-netbsd*) ++ *-openbsd*) + NAME_OF_DEV_RANDOM="/dev/srandom" ++ NAME_OF_DEV_URANDOM="/dev/urandom" ++ DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" ++ ;; ++ ++ *-netbsd*) ++ NAME_OF_DEV_RANDOM="/dev/random" + NAME_OF_DEV_URANDOM="/dev/urandom" + DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x" + ;; diff --git a/security/pam-smbpass/Makefile b/security/pam-smbpass/Makefile index 119f2d71222..cca3306d079 100644 --- a/security/pam-smbpass/Makefile +++ b/security/pam-smbpass/Makefile @@ -1,38 +1,17 @@ -# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/07/01 17:45:09 jlam Exp $ - -DISTNAME= samba-2.2.2 -# -# The pam-smbpass version number is found in the README file within the -# Samba sources. -# -PKGNAME= pam-smbpass-0.7.5 -CATEGORIES= security -MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \ - ftp://ring.asahi-net.or.jp/pub/net/samba/ \ - ftp://samba.anu.edu.au/pub/samba/ \ - ftp://de.samba.org/pub/mirror/samba/ \ - ftp://se.samba.org/pub/samba/ \ - ftp://ftp.sunet.se/pub/unix/utilities/samba/ - -MAINTAINER= jlam@netbsd.org -COMMENT= PAM authentication against a Samba password database - -DEPENDS+= samba>=2.0:../../net/samba - -USE_BUILDLINK2= yes -WRKSRC= ${WRKDIR}/${DISTNAME}/source - -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig - -SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}/samba -SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} -CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE} -CONFIGURE_ARGS+= --with-pam_smbpass -CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/08/25 21:21:10 jlam Exp $ + +.include "../../net/samba/Makefile.common" + +PKGNAME= pam-smbpass-${SAMBA_DIST_VERS} +CATEGORIES= security + +MAINTAINER= jlam@netbsd.org +COMMENT= PAM authentication against a Samba password database + +DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba + +USE_BUILDLINK2= # defined +CONFIGURE_ARGS+= --with-pam ALL_TARGET= pam_smbpass diff --git a/security/pam-smbpass/distinfo b/security/pam-smbpass/distinfo deleted file mode 100644 index c89a18873e8..00000000000 --- a/security/pam-smbpass/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/01/29 22:35:59 jlam Exp $ - -SHA1 (samba-2.2.2.tar.gz) = b7aa9159e9944d150391b697189adf0a48e6f890 -Size (samba-2.2.2.tar.gz) = 6622889 bytes -SHA1 (patch-aa) = 153f83db6a0d81dfdb48e92efe62f20c808652d3 -SHA1 (patch-ab) = c6c1bc735b6e4fc62ab13f973ce20ca5e627d247 diff --git a/security/pam-smbpass/patches/patch-aa b/security/pam-smbpass/patches/patch-aa deleted file mode 100644 index 212dd985b55..00000000000 --- a/security/pam-smbpass/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/01/29 22:35:59 jlam Exp $ - ---- Makefile.in.orig Sat Oct 13 17:09:06 2001 -+++ Makefile.in -@@ -619,7 +619,7 @@ - - bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) - @echo Linking shared library $@ -- $(LD) @LDSHFLAGS@ -symbolic -o $@ $(PAM_SMBPASS_OBJ) -lpam $(LIBS) -lc -+ $(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(LIBS) -lc - - nsswitch/libnss_wins.so: $(NSS_OBJ) - @echo "Linking $@" diff --git a/security/pam-smbpass/patches/patch-ab b/security/pam-smbpass/patches/patch-ab deleted file mode 100644 index b8cf9b66990..00000000000 --- a/security/pam-smbpass/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/01/29 22:35:59 jlam Exp $ - ---- configure.orig Sat Oct 13 17:09:16 2001 -+++ configure -@@ -8288,6 +8288,10 @@ - EOF - - ;; -+ *netbsd*) -+ LDSHFLAGS="-shared -Wl,--export-dynamic" -+ PICFLAG="-fPIC" -+ ;; - *bsd*) LDSHFLAGS="-shared -Bshareable" - ;; - *irix*) cat >> confdefs.h <<\EOF -@@ -8392,6 +8396,7 @@ - ;; - esac - -+if test x$PICFLAG = x; then - # try to work out how to produce pic code with this compiler - echo $ac_n "checking whether ${CC-cc} accepts -fpic""... $ac_c" 1>&6 - echo "configure:8398: checking whether ${CC-cc} accepts -fpic" >&5 -@@ -8411,6 +8416,7 @@ - echo "$ac_t""$ac_cv_prog_cc_fpic" 1>&6 - if test $ac_cv_prog_cc_fpic = yes; then - PICFLAG="-fpic"; -+fi - fi - if test x$PICFLAG = x; then - echo $ac_n "checking whether ${CC-cc} accepts -KPIC""... $ac_c" 1>&6 diff --git a/security/racoon/Makefile b/security/racoon/Makefile index 9f7a2d05ce3..145393da5f5 100644 --- a/security/racoon/Makefile +++ b/security/racoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48.2.2 2002/06/30 06:24:08 jlam Exp $ +# $NetBSD: Makefile,v 1.48.2.3 2002/08/25 21:21:13 jlam Exp $ # DISTNAME= racoon-20020507a @@ -16,8 +16,8 @@ CRYPTO= yes IGNORE+= "${PKGNAME} requires ipsec-ready NetBSD" .endif -.include "../../mk/bsd.prefs.mk" BUILD_DEFS+= USE_INET6 +.include "../../mk/bsd.prefs.mk" USE_BUILDLINK2= yes @@ -25,6 +25,8 @@ CONFLICTS+= racoon-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME}/racoon +PKG_SYSCONFSUBDIR?= racoon + GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-debug .if defined(USE_INET6) && ${USE_INET6} == "YES" @@ -32,7 +34,7 @@ CONFIGURE_ARGS+=--enable-ipv6 .else CONFIGURE_ARGS+=--disable-ipv6 .endif -CONFIGURE_ARGS+=--sysconfdir=/etc/racoon +CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR} .if defined(PKGREVISION) CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20020507anb${PKGREVISION} .else diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile index 9c1e491525e..e2eb8bebef6 100644 --- a/security/zebedee/Makefile +++ b/security/zebedee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5.2.2 2002/06/30 06:24:12 jlam Exp $ +# $NetBSD: Makefile,v 1.5.2.3 2002/08/25 21:21:14 jlam Exp $ # DISTNAME= zebedee-2.3.1 @@ -10,8 +10,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.winton.org.uk/zebedee/ COMMENT= Simple tunneling program for TCP or UDP with encryption -BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 - +USE_PERL5= build USE_GMAKE= # defined USE_BUILDLINK2= # defined diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index f43d052a850..7852f799e9e 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.32.2.1 2002/06/30 06:24:12 jlam Exp $ +# $NetBSD: Makefile,v 1.32.2.2 2002/08/25 21:21:15 jlam Exp $ -DISTNAME= zsh-4.0.4 +DISTNAME= zsh-4.0.6 CATEGORIES= shells MASTER_SITES= ftp://ftp.rge.com/pub/shells/zsh/ \ ftp://sunsite.auc.dk/pub/unix/shells/zsh/ \ diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST index 17c6cce67a3..7721242bc56 100644 --- a/shells/zsh/PLIST +++ b/shells/zsh/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:40 seb Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2002/08/25 21:21:16 jlam Exp $ bin/zsh @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; echo %D/%F) >/etc/shells @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true) >/etc/shells @@ -38,7 +38,9 @@ share/zsh/${PKGVERSION}/functions/_archie share/zsh/${PKGVERSION}/functions/_arg_compile share/zsh/${PKGVERSION}/functions/_arguments share/zsh/${PKGVERSION}/functions/_arp +share/zsh/${PKGVERSION}/functions/_arping share/zsh/${PKGVERSION}/functions/_arrays +share/zsh/${PKGVERSION}/functions/_auto-apt share/zsh/${PKGVERSION}/functions/_autocd share/zsh/${PKGVERSION}/functions/_autoload share/zsh/${PKGVERSION}/functions/_bash_completions @@ -54,7 +56,9 @@ share/zsh/${PKGVERSION}/functions/_cache_invalid share/zsh/${PKGVERSION}/functions/_call_function share/zsh/${PKGVERSION}/functions/_call_program share/zsh/${PKGVERSION}/functions/_cd +share/zsh/${PKGVERSION}/functions/_cdcd share/zsh/${PKGVERSION}/functions/_chflags +share/zsh/${PKGVERSION}/functions/_chkconfig share/zsh/${PKGVERSION}/functions/_chown share/zsh/${PKGVERSION}/functions/_combination share/zsh/${PKGVERSION}/functions/_command @@ -76,6 +80,7 @@ share/zsh/${PKGVERSION}/functions/_cvs share/zsh/${PKGVERSION}/functions/_cvsup share/zsh/${PKGVERSION}/functions/_dd share/zsh/${PKGVERSION}/functions/_deb_packages +share/zsh/${PKGVERSION}/functions/_debfoster share/zsh/${PKGVERSION}/functions/_default share/zsh/${PKGVERSION}/functions/_describe share/zsh/${PKGVERSION}/functions/_description @@ -90,6 +95,7 @@ share/zsh/${PKGVERSION}/functions/_disable share/zsh/${PKGVERSION}/functions/_domains share/zsh/${PKGVERSION}/functions/_dpkg share/zsh/${PKGVERSION}/functions/_dpkg_source +share/zsh/${PKGVERSION}/functions/_dput share/zsh/${PKGVERSION}/functions/_dupload share/zsh/${PKGVERSION}/functions/_dvi share/zsh/${PKGVERSION}/functions/_echotc @@ -105,6 +111,7 @@ share/zsh/${PKGVERSION}/functions/_expand_word share/zsh/${PKGVERSION}/functions/_fakeroot share/zsh/${PKGVERSION}/functions/_fc share/zsh/${PKGVERSION}/functions/_fetchmail +share/zsh/${PKGVERSION}/functions/_figlet share/zsh/${PKGVERSION}/functions/_file_descriptors share/zsh/${PKGVERSION}/functions/_files share/zsh/${PKGVERSION}/functions/_find @@ -112,11 +119,14 @@ share/zsh/${PKGVERSION}/functions/_finger share/zsh/${PKGVERSION}/functions/_first share/zsh/${PKGVERSION}/functions/_flex share/zsh/${PKGVERSION}/functions/_floppy +share/zsh/${PKGVERSION}/functions/_fsh share/zsh/${PKGVERSION}/functions/_functions share/zsh/${PKGVERSION}/functions/_gcc share/zsh/${PKGVERSION}/functions/_gdb share/zsh/${PKGVERSION}/functions/_generic share/zsh/${PKGVERSION}/functions/_getconf +share/zsh/${PKGVERSION}/functions/_global +share/zsh/${PKGVERSION}/functions/_global_tags share/zsh/${PKGVERSION}/functions/_gnu_generic share/zsh/${PKGVERSION}/functions/_gprof share/zsh/${PKGVERSION}/functions/_grep @@ -130,10 +140,12 @@ share/zsh/${PKGVERSION}/functions/_history share/zsh/${PKGVERSION}/functions/_history_complete_word share/zsh/${PKGVERSION}/functions/_hosts share/zsh/${PKGVERSION}/functions/_iconv +share/zsh/${PKGVERSION}/functions/_ifconfig share/zsh/${PKGVERSION}/functions/_ignored share/zsh/${PKGVERSION}/functions/_imagemagick share/zsh/${PKGVERSION}/functions/_in_vared share/zsh/${PKGVERSION}/functions/_init_d +share/zsh/${PKGVERSION}/functions/_irssi share/zsh/${PKGVERSION}/functions/_ispell share/zsh/${PKGVERSION}/functions/_java share/zsh/${PKGVERSION}/functions/_jobs @@ -144,6 +156,7 @@ share/zsh/${PKGVERSION}/functions/_joe share/zsh/${PKGVERSION}/functions/_kill share/zsh/${PKGVERSION}/functions/_killall share/zsh/${PKGVERSION}/functions/_kld +share/zsh/${PKGVERSION}/functions/_last share/zsh/${PKGVERSION}/functions/_limits share/zsh/${PKGVERSION}/functions/_links share/zsh/${PKGVERSION}/functions/_list @@ -163,6 +176,7 @@ share/zsh/${PKGVERSION}/functions/_mail share/zsh/${PKGVERSION}/functions/_mailboxes share/zsh/${PKGVERSION}/functions/_main_complete share/zsh/${PKGVERSION}/functions/_make +share/zsh/${PKGVERSION}/functions/_make-kpkg share/zsh/${PKGVERSION}/functions/_man share/zsh/${PKGVERSION}/functions/_match share/zsh/${PKGVERSION}/functions/_math @@ -171,14 +185,18 @@ share/zsh/${PKGVERSION}/functions/_mere share/zsh/${PKGVERSION}/functions/_message share/zsh/${PKGVERSION}/functions/_mh share/zsh/${PKGVERSION}/functions/_modutils +share/zsh/${PKGVERSION}/functions/_mondo share/zsh/${PKGVERSION}/functions/_most_recent_file share/zsh/${PKGVERSION}/functions/_mount +share/zsh/${PKGVERSION}/functions/_mozilla +share/zsh/${PKGVERSION}/functions/_mtools share/zsh/${PKGVERSION}/functions/_multi_parts share/zsh/${PKGVERSION}/functions/_mutt share/zsh/${PKGVERSION}/functions/_my_accounts share/zsh/${PKGVERSION}/functions/_mysql_utils share/zsh/${PKGVERSION}/functions/_ncftp share/zsh/${PKGVERSION}/functions/_nedit +share/zsh/${PKGVERSION}/functions/_net_interfaces share/zsh/${PKGVERSION}/functions/_netscape share/zsh/${PKGVERSION}/functions/_newsgroups share/zsh/${PKGVERSION}/functions/_next_label @@ -226,10 +244,14 @@ share/zsh/${PKGVERSION}/functions/_requested share/zsh/${PKGVERSION}/functions/_retrieve_cache share/zsh/${PKGVERSION}/functions/_rlogin share/zsh/${PKGVERSION}/functions/_rpm +share/zsh/${PKGVERSION}/functions/_rsync share/zsh/${PKGVERSION}/functions/_ruby share/zsh/${PKGVERSION}/functions/_samba +share/zsh/${PKGVERSION}/functions/_sccs share/zsh/${PKGVERSION}/functions/_sched share/zsh/${PKGVERSION}/functions/_sep_parts +share/zsh/${PKGVERSION}/functions/_service +share/zsh/${PKGVERSION}/functions/_services share/zsh/${PKGVERSION}/functions/_set share/zsh/${PKGVERSION}/functions/_setopt share/zsh/${PKGVERSION}/functions/_setup @@ -239,6 +261,7 @@ share/zsh/${PKGVERSION}/functions/_slrn share/zsh/${PKGVERSION}/functions/_smit share/zsh/${PKGVERSION}/functions/_socket share/zsh/${PKGVERSION}/functions/_source +share/zsh/${PKGVERSION}/functions/_spamassassin share/zsh/${PKGVERSION}/functions/_ssh share/zsh/${PKGVERSION}/functions/_stat share/zsh/${PKGVERSION}/functions/_store_cache @@ -267,6 +290,7 @@ share/zsh/${PKGVERSION}/functions/_unhash share/zsh/${PKGVERSION}/functions/_unsetopt share/zsh/${PKGVERSION}/functions/_update-alternatives share/zsh/${PKGVERSION}/functions/_urls +share/zsh/${PKGVERSION}/functions/_urpmi share/zsh/${PKGVERSION}/functions/_user_admin share/zsh/${PKGVERSION}/functions/_user_at_host share/zsh/${PKGVERSION}/functions/_users @@ -302,11 +326,13 @@ share/zsh/${PKGVERSION}/functions/_x_resource share/zsh/${PKGVERSION}/functions/_x_selection_timeout share/zsh/${PKGVERSION}/functions/_x_title share/zsh/${PKGVERSION}/functions/_x_utils +share/zsh/${PKGVERSION}/functions/_x_visual share/zsh/${PKGVERSION}/functions/_x_window share/zsh/${PKGVERSION}/functions/_xargs share/zsh/${PKGVERSION}/functions/_xauth share/zsh/${PKGVERSION}/functions/_xdvi share/zsh/${PKGVERSION}/functions/_xfig +share/zsh/${PKGVERSION}/functions/_xloadimage share/zsh/${PKGVERSION}/functions/_xmodmap share/zsh/${PKGVERSION}/functions/_xrdb share/zsh/${PKGVERSION}/functions/_xset @@ -329,6 +355,12 @@ share/zsh/${PKGVERSION}/functions/_zpty share/zsh/${PKGVERSION}/functions/_zstyle share/zsh/${PKGVERSION}/functions/allopt share/zsh/${PKGVERSION}/functions/bash-backward-kill-word +share/zsh/${PKGVERSION}/functions/bash-backward-word +share/zsh/${PKGVERSION}/functions/bash-down-case-word +share/zsh/${PKGVERSION}/functions/bash-forward-word +share/zsh/${PKGVERSION}/functions/bash-kill-word +share/zsh/${PKGVERSION}/functions/bash-transpose-words +share/zsh/${PKGVERSION}/functions/bash-up-case-word share/zsh/${PKGVERSION}/functions/checkmail share/zsh/${PKGVERSION}/functions/colors share/zsh/${PKGVERSION}/functions/compaudit @@ -360,6 +392,7 @@ share/zsh/${PKGVERSION}/functions/prompt_off_setup share/zsh/${PKGVERSION}/functions/prompt_oliver_setup share/zsh/${PKGVERSION}/functions/prompt_redhat_setup share/zsh/${PKGVERSION}/functions/prompt_suse_setup +share/zsh/${PKGVERSION}/functions/prompt_walters_setup share/zsh/${PKGVERSION}/functions/prompt_zefram_setup share/zsh/${PKGVERSION}/functions/promptinit share/zsh/${PKGVERSION}/functions/promptnl @@ -370,6 +403,7 @@ share/zsh/${PKGVERSION}/functions/zkbd share/zsh/${PKGVERSION}/functions/zmv share/zsh/${PKGVERSION}/functions/zrecompile share/zsh/${PKGVERSION}/functions/zstyle+ +@exec ${MKDIR} %D/share/zsh/site-functions @dirrm share/zsh/site-functions @dirrm share/zsh/${PKGVERSION}/functions @dirrm share/zsh/${PKGVERSION} diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index 970257b3c6e..4453a2869c6 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.8.2.1 2002/06/23 18:59:36 jlam Exp $ +$NetBSD: distinfo,v 1.8.2.2 2002/08/25 21:21:17 jlam Exp $ -SHA1 (zsh-4.0.4.tar.bz2) = 7e0f5f6fc5468afa9c42861119ed834617c4327a -Size (zsh-4.0.4.tar.bz2) = 1680823 bytes +SHA1 (zsh-4.0.6.tar.bz2) = 16caf04f4f8901e0f0d98a23f42fe5b27eaa112e +Size (zsh-4.0.6.tar.bz2) = 1699373 bytes SHA1 (patch-aa) = 5e5fde0f21a64c2e0579958868b05737ef0c6afb SHA1 (patch-ab) = 6923c88e487b02654c99e602d2c7c097c2b0a2e0 +SHA1 (patch-ac) = 6cb1a1ba4476088bfbd9aab824256c714f13062c +SHA1 (patch-ad) = f912420b8a5be2fa7b335b9d9cb20ba884988a8b diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac new file mode 100644 index 00000000000..a51a94e86af --- /dev/null +++ b/shells/zsh/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.7.2.2 2002/08/25 21:21:18 jlam Exp $ + +--- zshconfig.ac.orig Wed Oct 24 11:16:27 2001 ++++ zshconfig.ac Thu Jul 18 17:59:09 2002 +@@ -915,7 +915,7 @@ + select poll \ + readlink lstat lchown faccessx fchdir ftruncate \ + fseeko ftello \ +- mkfifo _mktemp \ ++ mkfifo \ + waitpid wait3 \ + sigaction sigblock sighold sigrelse sigsetmask sigprocmask \ + killpg setpgid setpgrp tcsetpgrp tcgetattr nice \ diff --git a/shells/zsh/patches/patch-ad b/shells/zsh/patches/patch-ad new file mode 100644 index 00000000000..0df769f5672 --- /dev/null +++ b/shells/zsh/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.5.4.2 2002/08/25 21:21:19 jlam Exp $ + +--- configure.orig Thu Jul 18 17:50:10 2002 ++++ configure Thu Jul 18 17:59:13 2002 +@@ -5050,7 +5050,7 @@ + select poll \ + readlink lstat lchown faccessx fchdir ftruncate \ + fseeko ftello \ +- mkfifo _mktemp \ ++ mkfifo \ + waitpid wait3 \ + sigaction sigblock sighold sigrelse sigsetmask sigprocmask \ + killpg setpgid setpgrp tcsetpgrp tcgetattr nice \ diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index 0414576fccb..cac8d19c4cd 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2001/10/19 09:44:10 veego Exp $ +# $NetBSD: Makefile.common,v 1.6.2.1 2002/08/25 21:21:20 jlam Exp $ # # common make file fragment shared by all amanda-* pkgs. # @@ -7,6 +7,8 @@ AMANDA_GROUP?= operator .elif ${OPSYS} == "SunOS" AMANDA_GROUP?= sysadmin +.elif ${OPSYS} == "Darwin" +AMANDA_GROUP?= operator .endif AMANDA_USER?= backup @@ -16,6 +18,8 @@ BUILD_DEFS+= AMANDA_USER AMANDA_GROUP AMANDA_SMB AMANDA_VAR USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig +CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config/config.guess +CONFIG_SUB_OVERRIDE= ${WRKSRC}/config/config.sub GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-user=${AMANDA_USER} diff --git a/sysutils/gentoo/Makefile b/sysutils/gentoo/Makefile index 33b232b72f5..60ff57ae6a8 100644 --- a/sysutils/gentoo/Makefile +++ b/sysutils/gentoo/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3.2.1 2002/06/30 06:24:14 jlam Exp $ +# $NetBSD: Makefile,v 1.3.2.2 2002/08/25 21:21:21 jlam Exp $ # -DISTNAME= gentoo-0.11.22 +DISTNAME= gentoo-0.11.31 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gentoo/} diff --git a/sysutils/gentoo/PLIST b/sysutils/gentoo/PLIST index 0d7e5fccabb..e1c860d5e3c 100644 --- a/sysutils/gentoo/PLIST +++ b/sysutils/gentoo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/29 12:37:16 wiz Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/08/25 21:21:22 jlam Exp $ bin/gentoo etc/gentoogtkrc etc/gentoorc @@ -125,5 +125,6 @@ share/gentoo/icons/xbm2.xpm share/gentoo/icons/xcf.xpm share/gentoo/icons/xpm.xpm share/gentoo/icons/xpm2.xpm +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gentoo.mo @dirrm share/gentoo/icons @dirrm share/gentoo diff --git a/sysutils/gentoo/distinfo b/sysutils/gentoo/distinfo index d9829ea161c..7d211d6f150 100644 --- a/sysutils/gentoo/distinfo +++ b/sysutils/gentoo/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/03/15 13:28:49 wiz Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/08/25 21:21:22 jlam Exp $ -SHA1 (gentoo-0.11.22.tar.gz) = 32d0c95c7b6a296df6d73dfa73525d471dfe6b15 -Size (gentoo-0.11.22.tar.gz) = 728502 bytes +SHA1 (gentoo-0.11.31.tar.gz) = 327b6241613e4c5ae256dffa528c6f2f46fe60b0 +Size (gentoo-0.11.31.tar.gz) = 923857 bytes SHA1 (patch-ae) = 63d3a848f084fd1355b25102e10cbe3c94a45445 diff --git a/sysutils/gkrellm/buildlink.mk b/sysutils/gkrellm/buildlink.mk new file mode 100644 index 00000000000..966be31b84f --- /dev/null +++ b/sysutils/gkrellm/buildlink.mk @@ -0,0 +1,34 @@ +# $NetBSD: buildlink.mk,v 1.2.2.2 2002/08/25 21:21:24 jlam Exp $ +# +# This Makefile fragment is included by packages that use gkrellm. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.gkrellm to the dependency pattern +# for the version of gkrellm desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(GKRELLM_BUILDLINK_MK) +GKRELLM_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.gkrellm?= gkrellm>=1.2.11nb1 +DEPENDS+= ${BUILDLINK_DEPENDS.gkrellm}:../../sysutils/gkrellm + +EVAL_PREFIX+= BUILDLINK_PREFIX.gkrellm=gkrellm +BUILDLINK_PREFIX.gkrellm_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.gkrellm+= include/gkrellm/gkrellm.h +BUILDLINK_FILES.gkrellm+= include/gkrellm/gkrellm_public_proto.h + +BUILDLINK_TARGETS.gkrellm= gkrellm-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gkrellm} + +pre-configure: ${BUILDLINK_TARGETS} +gkrellm-buildlink: _BUILDLINK_USE + +.endif # GKRELLM_BUILDLINK_MK diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index bd73b0a8186..dd274573727 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.6.2.2 2002/06/30 06:24:14 jlam Exp $ +# $NetBSD: Makefile,v 1.6.2.3 2002/08/25 21:21:25 jlam Exp $ # DISTNAME= grub-0.92 CATEGORIES= sysutils MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/ -MAINTAINER= jgoerzen@complete.org +MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.gnu.org/software/grub/ COMMENT= GRand Unified Bootloader -- Boots *BSD, Linux, groks ffs, FAT, ext2 @@ -15,6 +15,29 @@ GNU_CONFIGURE= YES USE_GMAKE= YES USE_BUILDLINK2= YES +.include "../../mk/bsd.prefs.mk" + +.if defined(GRUB_NETWORK_CARDS) +BUILD_DEFS+= GRUB_NETWORK_CARDS +CONFIGURE_ARGS+= --enable-diskless +PLIST_SUBST+= NETBOOT= + +.for GRUB_NETWORK_CARD in ${GRUB_NETWORK_CARDS} +CONFIGURE_ARGS+= --enable-${GRUB_NETWORK_CARD} +.endfor + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub + ${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \ + ${PREFIX}/share/doc/grub +.else +PLIST_SUBST+= NETBOOT="@comment " +.endif + +.if defined(GRUB_SCAN_ARGS) +CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS} +.endif + .include "../../devel/binutils/buildlink2.mk" .include "../../devel/ncurses/buildlink2.mk" diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST index 9fe13ba3c5a..d453f890bb4 100644 --- a/sysutils/grub/PLIST +++ b/sysutils/grub/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/11 19:53:25 magick Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2002/08/25 21:21:25 jlam Exp $ bin/mbchk @unexec install-info --delete --info-dir=%D/info %D/info/grub.info info/grub.info @@ -14,11 +14,14 @@ man/man8/grub.8 sbin/grub sbin/grub-install sbin/grub-md5-crypt +${NETBOOT}share/doc/grub/README.netboot share/grub/${MACHINE_ARCH}-/e2fs_stage1_5 share/grub/${MACHINE_ARCH}-/fat_stage1_5 share/grub/${MACHINE_ARCH}-/ffs_stage1_5 share/grub/${MACHINE_ARCH}-/jfs_stage1_5 share/grub/${MACHINE_ARCH}-/minix_stage1_5 +${NETBOOT}share/grub/${MACHINE_ARCH}-/nbgrub +${NETBOOT}share/grub/${MACHINE_ARCH}-/pxegrub share/grub/${MACHINE_ARCH}-/reiserfs_stage1_5 share/grub/${MACHINE_ARCH}-/stage1 share/grub/${MACHINE_ARCH}-/stage2 @@ -28,3 +31,4 @@ share/grub/${MACHINE_ARCH}-/xfs_stage1_5 @exec install-info --info-dir=%D/info %D/info/multiboot.info @dirrm share/grub/${MACHINE_ARCH}- @dirrm share/grub +${NETBOOT}@dirrm share/doc/grub diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile index 782eb83fd56..dec3bdb1ec7 100644 --- a/sysutils/grun/Makefile +++ b/sysutils/grun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/30 06:24:15 jlam Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.3 2002/08/25 21:21:26 jlam Exp $ DISTNAME= grun-0.9.2 CATEGORIES= misc @@ -12,10 +12,12 @@ USE_BUILDLINK2= YES USE_X11= YES GNU_CONFIGURE= YES USE_GMAKE= YES -USE_PTHREAD= native pth-syscall pth +PTHREAD_OPTS+= require post-install: ${MV} ${LOCALBASE}/man/man1/grun.1x ${LOCALBASE}/man/man1/grun.1 .include "../../x11/gtk/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut-cgi/DESCR b/sysutils/ups-nut-cgi/DESCR index 5a76a0c57b7..167a3054f47 100644 --- a/sysutils/ups-nut-cgi/DESCR +++ b/sysutils/ups-nut-cgi/DESCR @@ -1 +1 @@ -ups-nut-cgi provides CGI scripts to monitor UPS status via WEB browser. +ups-nut-cgi provides CGI scripts to monitor UPS status via a web browser. diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index ab44a5c4676..b12c7b876e9 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15.2.2 2002/06/30 06:24:15 jlam Exp $ +# $NetBSD: Makefile,v 1.15.2.3 2002/08/25 21:21:34 jlam Exp $ -DISTNAME= nut-0.45.5 -PKGNAME= ups-nut-cgi-0.45.5 -PKGREVISION= 1 +DISTNAME= nut-0.50.0 +PKGNAME= ups-nut-cgi-0.50.0 CATEGORIES= sysutils MASTER_SITES= http://www.exploits.org/nut/release/ diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo index 17061836930..5a84a88b9cc 100644 --- a/sysutils/ups-nut-cgi/distinfo +++ b/sysutils/ups-nut-cgi/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.7.2.1 2002/06/23 19:01:15 jlam Exp $ +$NetBSD: distinfo,v 1.7.2.2 2002/08/25 21:21:35 jlam Exp $ -SHA1 (nut-0.45.5.tar.gz) = 5cb08e27fb7e528a453d164d401410d341bf3bb3 -Size (nut-0.45.5.tar.gz) = 386936 bytes -SHA1 (patch-aa) = 6057ca39afdfc4e49380c8f4d35f2371df9fe549 +SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3 +Size (nut-0.50.0.tar.gz) = 382755 bytes +SHA1 (patch-aa) = cd7b96973d696c1a1f1051fc30c516e158c89ec5 SHA1 (patch-ab) = dfc1663368b670b84b1545c388bcd5f8703c08e3 SHA1 (patch-ac) = ded33bbc4c78b2b7c53230c0d4ab3c663104582f -SHA1 (patch-ad) = 7c705b7d1d70962f3f39f399753f585d439032fb -SHA1 (patch-ae) = 39ea3f3a4234790837ccf6e5799c39b6ba390975 +SHA1 (patch-ad) = 3620c734b396a2de657b6dceb7d5ba3cc821250b +SHA1 (patch-ae) = 6cff43dc5ed449a8f3c9b1e4864a47336b69fb30 diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa index e1c366e3bb4..46697e64162 100644 --- a/sysutils/ups-nut-cgi/patches/patch-aa +++ b/sysutils/ups-nut-cgi/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3.2.1 2002/06/23 19:01:16 jlam Exp $ +$NetBSD: patch-aa,v 1.3.2.2 2002/08/25 21:21:36 jlam Exp $ ---- Makefile.in.orig Fri Mar 8 23:21:11 2002 +--- Makefile.in.orig Wed Apr 17 00:00:49 2002 +++ Makefile.in -@@ -9,9 +9,10 @@ +@@ -9,7 +9,7 @@ MODELPATH = $(INSTALLROOT)@MODELPATH@ INSTALLDIRS = $(CONFPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@ STATEPATH = $(INSTALLROOT)@STATEPATH@ @@ -10,11 +10,8 @@ $NetBSD: patch-aa,v 1.3.2.1 2002/06/23 19:01:16 jlam Exp $ +SUBDIRS = common CFLAGS = -I../include @CFLAGS@ -+ # these are here so they can be overridden during a make install - RUNUID=@RUN_AS_USER@ - RUNGID=@RUN_AS_GROUP@ -@@ -64,7 +65,7 @@ +@@ -65,7 +65,7 @@ install-dirs: install-man: @cd man; $(MAKE) install; cd ..; @@ -23,7 +20,7 @@ $NetBSD: patch-aa,v 1.3.2.1 2002/06/23 19:01:16 jlam Exp $ @cd clients; $(MAKE) cgi; cd ..; install-cgi: install-dirs -@@ -72,7 +73,6 @@ +@@ -73,7 +73,6 @@ install-cgi: install-dirs ./install-sh -d $(CGIPATH) || exit 1; \ fi \ diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad index a8ac5a5382d..e4dd560e7ad 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ad +++ b/sysutils/ups-nut-cgi/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ +$NetBSD: patch-ad,v 1.4.2.2 2002/08/25 21:21:36 jlam Exp $ ---- configure.in.orig Tue Feb 26 05:46:25 2002 +--- configure.in.orig Tue Apr 16 23:34:38 2002 +++ configure.in -@@ -16,6 +16,7 @@ +@@ -18,6 +18,7 @@ dnl | default values for things later on STATEPATH="/var/state/ups" MODELPATH="$prefix/bin" CGIPATH="$prefix/cgi-bin" @@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ RUN_AS_USER="nobody" RUN_AS_GROUP="nogroup" PIDPATH="/var/run" -@@ -120,9 +121,43 @@ +@@ -118,9 +119,43 @@ if ( test x"$ac_cv_func_connect" = x"no" ], [], []) fi @@ -54,7 +54,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ dnl Include in case GD was compiled with Xpm support AC_CHECK_LIB(X11, XBell, -@@ -131,13 +166,16 @@ +@@ -129,13 +164,16 @@ AC_CHECK_LIB(X11, XBell, echo "Retrying with -L /usr/X11R6/lib" unset ac_cv_lib_X11_XBell AC_CHECK_LIB(X11, XBell, @@ -73,7 +73,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ dnl Skip this chunk if there's no LIBX to use if test "$LIBX" != "" -@@ -145,69 +183,34 @@ +@@ -143,69 +181,35 @@ then dnl Include in case GD was compiled with Xpm support AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage, @@ -120,7 +120,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ -[-lm -lpng -lz], +[$GRAPHICS_LIBS -lm -lpng -lz], ) -- + -dnl Don't run the ttf/xpm tests against gd unless -dnl we actually have something to test! -dnl @@ -154,13 +154,13 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ +GRAPHICS_LIBS="$LIBGD" +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" - AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h err.h) + AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h) +CFLAGS=$CFLAGS_save +CPPFLAGS=$CPPFLAGS_save AC_HEADER_TIME AC_CHECK_HEADERS(sys/time.h) -@@ -220,7 +223,7 @@ +@@ -218,7 +222,7 @@ if test -n "$LD_LIBRARY_PATH"; then for lib in `echo $LD_LIBRARY_PATH | $AWK -F: '{ for (i = NF; i > 0; --i) print $i }' | sort | uniq`; do if test -f ${lib}/libpng.so; then AC_CHECK_LIB(png, png_info_init, @@ -169,7 +169,7 @@ $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ ], [], [-lm -R${lib}],) -@@ -524,7 +527,8 @@ +@@ -550,7 +554,8 @@ AC_SUBST(DRIVER_INSTALL_TARGET) AC_SUBST(LIBOBJ) AC_SUBST(BUILDOBJ) AC_SUBST(NETLIBS) diff --git a/sysutils/ups-nut-cgi/patches/patch-ae b/sysutils/ups-nut-cgi/patches/patch-ae index f50fae45b14..a86635c3a17 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ae +++ b/sysutils/ups-nut-cgi/patches/patch-ae @@ -1,38 +1,38 @@ -$NetBSD: patch-ae,v 1.1 2001/11/19 03:47:42 lukem Exp $ +$NetBSD: patch-ae,v 1.1.2.1 2002/08/25 21:21:37 jlam Exp $ ---- clients/upsstats.c.orig Wed Aug 29 22:36:41 2001 +--- clients/upsstats.c.orig Thu Mar 21 17:01:16 2002 +++ clients/upsstats.c -@@ -73,6 +73,7 @@ +@@ -74,6 +74,7 @@ int main() double tempf; char model[64], status[64], battpct[64], utility[64], loadpct[64], upstemp[64], acfreq[64], *stat, *ptr; + char runtime[64]; int i; - strcpy (monhost, MONHOST); /* default host */ -@@ -149,6 +150,7 @@ - - printf ("\n"); + extractcgiargs(); +@@ -162,6 +163,7 @@ int main() + printf("\n"); + printf("\n"); +#if 0 - printf ("
\n");
+ 	printf("
\n");
  
  	/* TODO: handle self tests */
-@@ -156,6 +158,7 @@
- /*	printf ("Last UPS Self Test: Not Available\n"); */
- /*	printf ("    Last Test Date: Not Available\n"); */
- 	printf ("
\n");
+@@ -169,6 +171,7 @@ int main() 
+ /*	printf("Last UPS Self Test: Not Available\n"); */
+ /*	printf("    Last Test Date: Not Available\n"); */
+ 	printf("
\n"); +#endif - printf ("
\n");
+ 	printf("
\n");
  
-@@ -173,6 +176,9 @@
+@@ -186,6 +189,9 @@ int main() 
  
- 	if (getupsvar (monhost, "acfreq", acfreq, sizeof(acfreq)) > 0)
- 		printf (" Output Freq: %s Hz\n", acfreq);
+ 	if (getupsvar(monhost, "acfreq", acfreq, sizeof(acfreq)) > 0)
+ 		printf(" Output Freq: %s Hz\n", acfreq);
 +
-+	if (getupsvar (monhost, "runtime", runtime, sizeof(runtime)) > 0)
-+		printf ("     Runtime: %s\n", runtime);
++	if (getupsvar(monhost, "runtime", runtime, sizeof(runtime)) > 0)
++		printf("     Runtime: %s\n", runtime);
  
- 	printf ("
\n");
- 	printf ("
Network UPS Tools upsstats %s
\n", UPS_VERSION);
+ 	printf("

\n"); + printf("

Network UPS Tools upsstats %s
\n", UPS_VERSION); diff --git a/sysutils/ups-nut/MESSAGE b/sysutils/ups-nut/MESSAGE index 58ba30948dc..e1d84376cdb 100644 --- a/sysutils/ups-nut/MESSAGE +++ b/sysutils/ups-nut/MESSAGE @@ -1,9 +1,13 @@ ====================================================================== -$NetBSD: MESSAGE,v 1.1.2.2 2002/06/23 19:01:10 jlam Exp $ +$NetBSD: MESSAGE,v 1.1.2.3 2002/08/25 21:21:28 jlam Exp $ ${NUT_CONFDIR}/upsd.users has a new format from version 0.45.5. You will need to update this before restarting upsd(8). Refer to ${NUT_EGDIR}/upsd.users.sample and upsd.users(5) for more information. + The network port used by nut changed in version 0.50.0, + to the IANA assigned 3493, from 3305 in previous versions. + You will need to update all clients. + ====================================================================== diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index d0379daa03d..1e7b50f1f06 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.18.2.2 2002/06/30 06:24:16 jlam Exp $ +# $NetBSD: Makefile,v 1.18.2.3 2002/08/25 21:21:29 jlam Exp $ # -DISTNAME= nut-0.45.5 -PKGNAME= ups-nut-0.45.5 -PKGREVISION= 1 +DISTNAME= nut-0.50.0 +PKGNAME= ups-nut-0.50.0 CATEGORIES= sysutils MASTER_SITES= http://www.exploits.org/nut/release/ @@ -74,12 +73,14 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/$${script} \ ${PREFIX}/etc/rc.d/$${script}; \ done - ${INSTALL_DATA_DIR} ${NUT_DOCDIR} ${NUT_DOCDIR}/cables - ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables - ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/Changes.trust ${NUT_DOCDIR} + ${INSTALL_DATA_DIR} ${NUT_DOCDIR} + ${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables ${NUT_DOCDIR}/drivers ${INSTALL_DATA} ${WRKSRC}/README ${NUT_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/driver.list ${NUT_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables + ${INSTALL_DATA} ${WRKSRC}/docs/drivers/*.txt ${NUT_DOCDIR}/drivers .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST index b5ecec3d6be..2f03063165f 100644 --- a/sysutils/ups-nut/PLIST +++ b/sysutils/ups-nut/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7.2.1 2002/06/23 19:01:11 jlam Exp $ +@comment $NetBSD: PLIST,v 1.7.2.2 2002/08/25 21:21:29 jlam Exp $ bin/upsc bin/upscmd bin/upsct @@ -16,12 +16,20 @@ man/man5/upsmon.conf.5 man/man5/upssched.conf.5 man/man8/apcsmart.8 man/man8/belkin.8 +man/man8/bestferrups801-807.8 man/man8/bestups.8 +man/man8/cyberpower.8 +man/man8/everups.8 man/man8/fentonups.8 +man/man8/genericups.8 +man/man8/hp.8 +man/man8/masterguard.8 +man/man8/mge-ellipse.8 man/man8/newapc.8 -man/man8/newvictron.8 man/man8/nutupsdrv.8 man/man8/powercom.8 +man/man8/sec.8 +man/man8/tripplite.8 man/man8/upsc.8 man/man8/upscmd.8 man/man8/upsct.8 @@ -31,73 +39,66 @@ man/man8/upsdrvctl.8 man/man8/upslog.8 man/man8/upsmon.8 man/man8/upssched.8 -sbin/ups-drivers/aeg +man/man8/victronups.8 sbin/ups-drivers/apcsmart sbin/ups-drivers/belkin sbin/ups-drivers/bestferrups801-807 -sbin/ups-drivers/bestfort -sbin/ups-drivers/bestuferrups sbin/ups-drivers/bestups sbin/ups-drivers/cyberpower -sbin/ups-drivers/engetron sbin/ups-drivers/everups sbin/ups-drivers/fentonups sbin/ups-drivers/genericups sbin/ups-drivers/hp -sbin/ups-drivers/ipt-anzen sbin/ups-drivers/masterguard sbin/ups-drivers/mge-ellipse -sbin/ups-drivers/mgeups -sbin/ups-drivers/multilink -sbin/ups-drivers/mustekups +sbin/ups-drivers/mge-utalk sbin/ups-drivers/newapc -sbin/ups-drivers/newpowercom -sbin/ups-drivers/newvictron -sbin/ups-drivers/optiups sbin/ups-drivers/powercom +sbin/ups-drivers/powerware sbin/ups-drivers/sec -sbin/ups-drivers/sms -sbin/ups-drivers/toshiba1500 sbin/ups-drivers/tripplite -sbin/ups-drivers/ups-trust425+625 -sbin/ups-drivers/upseyeux sbin/ups-drivers/victronups sbin/upsd sbin/upsdrvctl sbin/upsmon sbin/upssched -share/doc/nut/Changes.trust share/doc/nut/FAQ share/doc/nut/README share/doc/nut/access.txt -share/doc/nut/belkin.txt -share/doc/nut/bestferrups801-807.txt share/doc/nut/big-servers.txt +share/doc/nut/cables/apc.txt +share/doc/nut/cables/ge-imv-victron.txt +share/doc/nut/cables/imv.txt +share/doc/nut/cables/mgeups.txt share/doc/nut/cables/powerware.txt share/doc/nut/cables/repotec.txt share/doc/nut/cables/sms.txt -share/doc/nut/cables/victron.txt share/doc/nut/chroot.txt share/doc/nut/commands.txt share/doc/nut/config-files.txt share/doc/nut/configure.txt share/doc/nut/data-room.txt share/doc/nut/design.txt +share/doc/nut/developers.txt share/doc/nut/driver-control.txt -share/doc/nut/dummycons.txt -share/doc/nut/dummyups.txt -share/doc/nut/generic-ups.txt -share/doc/nut/mge-ellipse.txt +share/doc/nut/driver.list +share/doc/nut/drivers/belkin.txt +share/doc/nut/drivers/bestferrups801-807.txt +share/doc/nut/drivers/dummycons.txt +share/doc/nut/drivers/dummyups.txt +share/doc/nut/drivers/generic-ups.txt +share/doc/nut/drivers/mge-ellipse.txt +share/doc/nut/drivers/mge-utalk.txt +share/doc/nut/drivers/multilink.txt +share/doc/nut/drivers/powercom.txt +share/doc/nut/drivers/snmp-ups.txt share/doc/nut/model-arguments.txt -share/doc/nut/multilink.txt share/doc/nut/new-modules.txt share/doc/nut/pager.txt -share/doc/nut/powercom.txt share/doc/nut/protocol.txt share/doc/nut/shutdown.txt share/doc/nut/tips.txt share/doc/nut/todo.txt -share/doc/nut/ups-trust425+625.txt share/doc/nut/upssched.txt share/examples/nut/hosts.conf.sample share/examples/nut/multimon.conf.sample @@ -108,6 +109,7 @@ share/examples/nut/upsmon.conf.sample share/examples/nut/upssched.conf.sample share/examples/nut/upsset.conf.sample @dirrm share/examples/nut +@dirrm share/doc/nut/drivers @dirrm share/doc/nut/cables @dirrm share/doc/nut @dirrm sbin/ups-drivers diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo index 194e96113e4..105f1f66f99 100644 --- a/sysutils/ups-nut/distinfo +++ b/sysutils/ups-nut/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.9.2.1 2002/06/23 19:01:11 jlam Exp $ +$NetBSD: distinfo,v 1.9.2.2 2002/08/25 21:21:30 jlam Exp $ -SHA1 (nut-0.45.5.tar.gz) = 5cb08e27fb7e528a453d164d401410d341bf3bb3 -Size (nut-0.45.5.tar.gz) = 386936 bytes -SHA1 (patch-aa) = 74fcdb7d75dcc7a53b0591bd22ff5c6bbeb572ff +SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3 +Size (nut-0.50.0.tar.gz) = 382755 bytes +SHA1 (patch-aa) = 4d16a24725a0ff645c430ba43ef8c52856491a73 SHA1 (patch-ab) = fac1a47430a2c2d692ecede2ac6ed78c60a82566 +SHA1 (patch-ac) = 60b2ac079232ab4af1b41928760601f0a09b9ae1 SHA1 (patch-ad) = 1132a678cc53882cc92764ed17bbd4cf4152c58d SHA1 (patch-ag) = b6ae992f9b92d68683ac6adb7378d11158cc1fdc diff --git a/sysutils/ups-nut/patches/patch-aa b/sysutils/ups-nut/patches/patch-aa index 8962838e8ae..dd24b5eef01 100644 --- a/sysutils/ups-nut/patches/patch-aa +++ b/sysutils/ups-nut/patches/patch-aa @@ -1,15 +1,16 @@ -$NetBSD: patch-aa,v 1.5.2.2 2002/06/23 19:01:12 jlam Exp $ +$NetBSD: patch-aa,v 1.5.2.3 2002/08/25 21:21:31 jlam Exp $ ---- models/upscommon.c.orig Fri Mar 15 00:59:57 2002 +--- models/upscommon.c.orig Fri May 17 15:27:55 2002 +++ models/upscommon.c -@@ -716,6 +716,10 @@ - return; - } +@@ -688,6 +688,11 @@ void info_ready(void) + { + int ret; +#ifdef HAVE_MMAP + /* sync external file representation before operating on the file */ + msync(shared_info, info_size, MS_INVALIDATE); +#endif ++ ret = rename(initfn, statefn); if (ret != 0) diff --git a/sysutils/ups-nut/patches/patch-ac b/sysutils/ups-nut/patches/patch-ac new file mode 100644 index 00000000000..96687a5c9ae --- /dev/null +++ b/sysutils/ups-nut/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.4.4.2 2002/08/25 21:21:32 jlam Exp $ + +--- clients/upslog.c.orig Fri May 17 08:26:22 2002 ++++ clients/upslog.c +@@ -180,6 +180,13 @@ void print_status(void) + continue; + } + ++ /* if a %%, append % and start over */ ++ if (logformat[i+1] == '%') { ++ snprintfcat(logbuffer, sizeof(logbuffer), "%%"); ++ i++; ++ continue; ++ } ++ + /* it must start with a % now - %[ ]%*/ + + cmd = xstrdup(&logformat[i+1]); diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile index db9fc525c02..13eba18a81d 100644 --- a/sysutils/xps/Makefile +++ b/sysutils/xps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18.2.1 2002/06/30 06:24:17 jlam Exp $ +# $NetBSD: Makefile,v 1.18.2.2 2002/08/25 21:21:38 jlam Exp $ DISTNAME= xps-3.14 CATEGORIES= sysutils @@ -8,8 +8,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.netwinder.org/~rocky/xps-home/ COMMENT= displays the Unix process list as a hierarchical tree -BUILD_DEPENDS= perl>=${PERL5_REQD}:../../lang/perl5 - +USE_PERL5= build USE_GMAKE= # defined USE_X11BASE= # defined diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile index 377e80c7700..6577c40c0b1 100644 --- a/textproc/ispell-base/Makefile +++ b/textproc/ispell-base/Makefile @@ -1,12 +1,15 @@ -# $NetBSD: Makefile,v 1.6.2.1 2002/06/30 06:24:18 jlam Exp $ +# $NetBSD: Makefile,v 1.6.2.2 2002/08/25 21:21:40 jlam Exp $ # DISTNAME= ispell-3.1.20 PKGNAME= ispell-base-3.1.20 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc MASTER_SITES= ftp://ftp.cs.ucla.edu/pub/ispell-3.1/ +PATCH_SITES= ftp://kdstevens.com/pub/stevens/ +PATCHFILES= ispell-patch1.gz + MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/ispell/ispell.html COMMENT= Interactive spelling checker diff --git a/textproc/ispell-base/distinfo b/textproc/ispell-base/distinfo index 6c2a25ff498..8bb0485dd05 100644 --- a/textproc/ispell-base/distinfo +++ b/textproc/ispell-base/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.3 2002/02/18 15:14:43 seb Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/08/25 21:21:41 jlam Exp $ SHA1 (ispell-3.1.20.tar.gz) = f8f849a3868ef3d88c1ba6fe5b49505f75de786e Size (ispell-3.1.20.tar.gz) = 677987 bytes +SHA1 (ispell-patch1.gz) = 61d7237cdbb8af1f2cb1f673e1c06aea0669089b +Size (ispell-patch1.gz) = 1110 bytes SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32 SHA1 (patch-ab) = f67725f76e3fe9136381e55e3aab37ef8b729cf7 SHA1 (patch-ac) = 05b7f88754819faf2e282221ce1c2fcc446f0b36 @@ -13,3 +15,9 @@ SHA1 (patch-ah) = 2a5da425a5a6c97907218b96515f2a9718d1e9ca SHA1 (patch-ai) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67 SHA1 (patch-aj) = 645d9c15fe6148e4ced398729aab6ffc9662c1d8 SHA1 (patch-ak) = a60cbdead54b450457a1313107513c61747c4c1f +SHA1 (patch-al) = 8e75a7b529e76ed7137510e5e18f7b87084c62a8 +SHA1 (patch-am) = d42829fe0c22bc4f42bc60f403576f80dde7e66a +SHA1 (patch-an) = b1f17843e68a1ff6d6ddb4814c8fcf070add2f8e +SHA1 (patch-ao) = 6ddf8412689f17cff7632a90ea443513da9d8448 +SHA1 (patch-ap) = 47411640b343a5d60b9d9e8d28574bd0397dde45 +SHA1 (patch-aq) = b37bfe33f3b710bef1141afabb2dae3d9b1776cd diff --git a/textproc/ispell-base/patches/patch-al b/textproc/ispell-base/patches/patch-al new file mode 100644 index 00000000000..61ccd8d9862 --- /dev/null +++ b/textproc/ispell-base/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1.2.2 2002/08/25 21:21:43 jlam Exp $ + +--- config.X.orig Fri Jul 19 21:47:10 2002 ++++ config.X Fri Jul 19 21:48:05 2002 +@@ -315,7 +315,7 @@ + ** space. Otherwise make it the null string. + */ + #ifndef MAKE_SORTTMP +-#define MAKE_SORTTMP "-T ${TMPDIR-/usr/tmp}" ++#define MAKE_SORTTMP "-T ${TMPDIR-/tmp}" + #endif + + /* diff --git a/textproc/ispell-base/patches/patch-am b/textproc/ispell-base/patches/patch-am new file mode 100644 index 00000000000..102dd35f9fb --- /dev/null +++ b/textproc/ispell-base/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.1.2.2 2002/08/25 21:21:44 jlam Exp $ + +--- munchlist.X.orig Fri Jul 19 21:47:10 2002 ++++ munchlist.X Fri Jul 19 21:48:24 2002 +@@ -128,7 +128,7 @@ + set -vx + fi + LIBDIR=!!LIBDIR!! +-TDIR=${TMPDIR-/usr/tmp} ++TDIR=${TMPDIR-/tmp} + TMP=${TDIR}/munch$$ + SORTTMP="-T ${TDIR}" # !!SORTTMP!! + if [ -r ./icombine ] diff --git a/textproc/ispell-base/patches/patch-an b/textproc/ispell-base/patches/patch-an new file mode 100644 index 00000000000..99cc7e541f8 --- /dev/null +++ b/textproc/ispell-base/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1.2.2 2002/08/25 21:21:45 jlam Exp $ + +--- splitdict.orig Fri Jul 19 21:49:28 2002 ++++ splitdict Fri Jul 19 21:48:33 2002 +@@ -51,7 +51,7 @@ + # Get rid of all old RCS log lines in preparation for the 3.1 release. + # + # +-TMP=${TMPDIR:-/usr/tmp}/sd$$ ++TMP=${TMPDIR:-/tmp}/sd$$ + + case "$#" in + 3) diff --git a/textproc/ispell-base/patches/patch-ao b/textproc/ispell-base/patches/patch-ao new file mode 100644 index 00000000000..d689a688892 --- /dev/null +++ b/textproc/ispell-base/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.1.2.2 2002/08/25 21:21:45 jlam Exp $ + +--- subset.X.orig Fri Jul 19 21:47:10 2002 ++++ subset.X Fri Jul 19 21:48:52 2002 +@@ -77,7 +77,7 @@ + # + # + LIBDIR=!!LIBDIR!! +-TDIR=${TMPDIR-/usr/tmp} ++TDIR=${TMPDIR-/tmp} + TMP=${TDIR}/sset$$. + SORTTMP="-T ${TDIR}" # !!SORTTMP!! + USAGE="Usage: subset [-b base] [-l langfile] dict-0 dict-1 ..." diff --git a/textproc/ispell-base/patches/patch-ap b/textproc/ispell-base/patches/patch-ap new file mode 100644 index 00000000000..ff387da7ec5 --- /dev/null +++ b/textproc/ispell-base/patches/patch-ap @@ -0,0 +1,13 @@ +$NetBSD: patch-ap,v 1.1.2.2 2002/08/25 21:21:46 jlam Exp $ + +--- tryaffix.X.orig Fri Jul 19 21:47:10 2002 ++++ tryaffix.X Fri Jul 19 21:49:02 2002 +@@ -73,7 +73,7 @@ + # Get rid of all old RCS log lines in preparation for the 3.1 release. + # + # +-SORTTMP="-T ${TMPDIR-/usr/tmp}" # !!SORTTMP!! ++SORTTMP="-T ${TMPDIR-/tmp}" # !!SORTTMP!! + USAGE='tryaffix [-p | -s] [-c] dict-file affix[+addition] ...' + counts=no + pre= diff --git a/textproc/ispell-base/patches/patch-aq b/textproc/ispell-base/patches/patch-aq new file mode 100644 index 00000000000..f60886c48e1 --- /dev/null +++ b/textproc/ispell-base/patches/patch-aq @@ -0,0 +1,13 @@ +$NetBSD: patch-aq,v 1.1.2.2 2002/08/25 21:21:47 jlam Exp $ + +--- zapdups.X.orig Fri Jul 19 21:47:10 2002 ++++ zapdups.X Fri Jul 19 21:49:09 2002 +@@ -68,7 +68,7 @@ + # + # + LIBDIR=!!LIBDIR!! +-TDIR=${TMPDIR-/usr/tmp} ++TDIR=${TMPDIR-/tmp} + TMP=${TDIR}/zd$$ + SORTTMP="-T ${TDIR}" # !!SORTTMP!! + USAGE="zapdups [-d [-n]] [-l langfile] dict-0 dict-1 ..." diff --git a/textproc/t1utils/DESCR b/textproc/t1utils/DESCR deleted file mode 100644 index 9680c8027ee..00000000000 --- a/textproc/t1utils/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -Utilities for working with Postscript Type 1 font files. In -particular, this package includes programs for changing font files -between ASCII and binary formats, and a "human readable" format, -and it also includes a program for extracting the useful information -from the "resource fork" of MacOS files. diff --git a/textproc/t1utils/Makefile b/textproc/t1utils/Makefile deleted file mode 100644 index a14b97a05c9..00000000000 --- a/textproc/t1utils/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.6.2.1 2002/06/30 06:24:21 jlam Exp $ -# - -DISTNAME= t1utils-1.23 -CATEGORIES= textproc converters -MASTER_SITES= http://www.lcdf.org/~eddietwo/type/ - -MAINTAINER= jonb@netbsd.org -HOMEPAGE= http://www.lcdf.org/~eddietwo/type/ -COMMENT= Utility programs for dealing with Postscript Type 1 font files - -GNU_CONFIGURE= YES -USE_BUILDLINK2= YES - -.include "../../mk/bsd.pkg.mk" diff --git a/textproc/t1utils/PLIST b/textproc/t1utils/PLIST deleted file mode 100644 index 8d3eda2b603..00000000000 --- a/textproc/t1utils/PLIST +++ /dev/null @@ -1,13 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:56 zuntum Exp $ -bin/t1ascii -bin/t1asm -bin/t1binary -bin/t1disasm -bin/t1mac -bin/t1unmac -man/man1/t1ascii.1 -man/man1/t1asm.1 -man/man1/t1binary.1 -man/man1/t1disasm.1 -man/man1/t1mac.1 -man/man1/t1unmac.1 diff --git a/textproc/t1utils/distinfo b/textproc/t1utils/distinfo deleted file mode 100644 index 88eaf885af2..00000000000 --- a/textproc/t1utils/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.3 2001/07/26 22:46:03 dillo Exp $ - -SHA1 (t1utils-1.23.tar.gz) = b9b44b6b76494c6b7444af0341d338f1bc6eaa7f -Size (t1utils-1.23.tar.gz) = 72306 bytes diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile index 7bb24c90bd2..2d430e17304 100644 --- a/textproc/texi2html/Makefile +++ b/textproc/texi2html/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.11.2.1 2002/06/30 06:24:22 jlam Exp $ +# $NetBSD: Makefile,v 1.11.2.2 2002/08/25 21:21:49 jlam Exp $ # DISTNAME= texi2html-1.64 CATEGORIES= textproc MASTER_SITES= http://www.mathematik.uni-kl.de/~obachman/Texi2html/Distrib/ -MAINTAINER= tv@netbsd.org +MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.mathematik.uni-kl.de/~obachman/Texi2html/ COMMENT= Texinfo-to-HTML direct translator diff --git a/time/plan/PLIST b/time/plan/PLIST index 156ab91f714..c15a69ccbdf 100644 --- a/time/plan/PLIST +++ b/time/plan/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:01 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:21:50 jlam Exp $ bin/plan libexec/plan/pland libexec/plan/notifier libexec/plan/netplan libexec/plan/plan_cal.ps -@exec ${MKDIR} -p %D/libexec/plan/netplan.dir && ${CHMOD} 700 %D/libexec/plan/netplan.dir && ${CHOWN} 32767:39 %D/libexec/plan/netplan.dir +@exec ${MKDIR} %D/libexec/plan/netplan.dir && ${CHMOD} 700 %D/libexec/plan/netplan.dir && ${CHOWN} 32767:39 %D/libexec/plan/netplan.dir @unexec ${RMDIR} %D/libexec/plan/netplan.dir 2>/dev/null || echo "==> %D/libexec/plan/netplan.dir not empty. You should remove it manually if it's no longer needed." @unexec ${RMDIR} %D/libexec/plan 2>/dev/null || true man/man1/plan.1 diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo index 1e1487d74e1..a5676757e3e 100644 --- a/wm/fluxbox/distinfo +++ b/wm/fluxbox/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2002/04/22 18:39:19 wiz Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/08/25 21:21:51 jlam Exp $ SHA1 (fluxbox-0.1.8.tar.gz) = 48c010631d24ed3cf9620169cd1203c2cc7cb0b3 Size (fluxbox-0.1.8.tar.gz) = 437047 bytes SHA1 (patch-aa) = 4d2360c918e6df49ab306fad67d43b1cc9a1020e +SHA1 (patch-ab) = 6460c6170bef06511dcb8225869f9097fe4267f3 diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab new file mode 100644 index 00000000000..4c6fb30473a --- /dev/null +++ b/wm/fluxbox/patches/patch-ab @@ -0,0 +1,46 @@ +$NetBSD: patch-ab,v 1.3.2.2 2002/08/25 21:21:53 jlam Exp $ + +--- src/Makefile.in.orig Sat Apr 20 06:11:45 2002 ++++ src/Makefile.in +@@ -152,6 +152,10 @@ fluxbox_LDADD = $(LDADD) + fluxbox_DEPENDENCIES = + fluxbox_LDFLAGS = + CXXFLAGS = @CXXFLAGS@ ++CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//) ++CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//) ++CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) ++LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) + CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + CXXLD = $(CXX) +@@ -171,9 +175,12 @@ GZIP_ENV = --best + SOURCES = $(fluxbox_SOURCES) + OBJECTS = $(fluxbox_OBJECTS) + ++Image.o: Image.C ++Image.lo: Image.C ++ + all: all-redirect + .SUFFIXES: +-.SUFFIXES: .S .c .cc .lo .o .obj .s ++.SUFFIXES: .S .c .cc .C .lo .o .obj .s + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile + +@@ -254,10 +261,16 @@ maintainer-clean-libtool: + fluxbox$(EXEEXT): $(fluxbox_OBJECTS) $(fluxbox_DEPENDENCIES) + @rm -f fluxbox$(EXEEXT) + $(CXXLINK) $(fluxbox_LDFLAGS) $(fluxbox_OBJECTS) $(fluxbox_LDADD) $(LIBS) ++.cc.C: ++ cp -f $< $@ ++.C.o: ++ $(CXXCOMPILE_NOOPT) -c $< + .cc.o: + $(CXXCOMPILE) -c $< + .cc.obj: + $(CXXCOMPILE) -c `cygpath -w $<` ++.C.lo: ++ $(LTCXXCOMPILE_NOOPT) -c $< + .cc.lo: + $(LTCXXCOMPILE) -c $< + diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile index 9a874ea97d7..d894e06f1c0 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.11.2.1 2002/07/01 17:45:12 jlam Exp $ +# $NetBSD: Makefile,v 1.11.2.2 2002/08/25 21:21:53 jlam Exp $ -PKGNAME= ${DISTNAME:S/-2/.2/} +PKGNAME= ${DISTNAME} COMMENT= Small, fast and light-weight window manager CONFLICTS+= icewm-gnome-[0-9]* diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index a871392571c..0ec471b85f2 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,10 +1,8 @@ -# $NetBSD: Makefile.common,v 1.13 2002/03/10 22:11:36 wiz Exp $ +# $NetBSD: Makefile.common,v 1.13.2.1 2002/08/25 21:21:54 jlam Exp $ -DISTNAME= icewm-1.0.9-2 +DISTNAME= icewm-1.2.0 CATEGORIES= x11 wm MASTER_SITES= http://download.sourceforge.net/icewm/ -EXTRACT_SUFX= .tar.bz2 -PKGREVISION= 1 MAINTAINER= packages@netbsd.org HOMEPAGE= http://icewm.sourceforge.net/ @@ -17,7 +15,6 @@ BUILD_USES_MSGFMT= # defined DISTINFO_FILE= ${.CURDIR}/../../wm/icewm/distinfo FILESDIR= ${.CURDIR}/../../wm/icewm/files PATCHDIR= ${.CURDIR}/../../wm/icewm/patches -WRKSRC= ${WRKDIR}/icewm-1.0.9 .include "../../mk/bsd.prefs.mk" diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST index aaf17617f10..fe48969b3a5 100644 --- a/wm/icewm/PLIST +++ b/wm/icewm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/26 09:41:39 martti Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:21:54 jlam Exp $ bin/genpref bin/icehelp bin/icesh @@ -283,6 +283,7 @@ share/doc/icewm/FAQ share/doc/icewm/README share/doc/icewm/TODO share/locale/ca/LC_MESSAGES/icewm.mo +share/locale/cs/LC_MESSAGES/icewm.mo share/locale/de/LC_MESSAGES/icewm.mo share/locale/en/LC_MESSAGES/icewm.mo share/locale/es/LC_MESSAGES/icewm.mo @@ -297,6 +298,8 @@ share/locale/pl/LC_MESSAGES/icewm.mo share/locale/pt_BR/LC_MESSAGES/icewm.mo share/locale/ro/LC_MESSAGES/icewm.mo share/locale/ru/LC_MESSAGES/icewm.mo +share/locale/sv/LC_MESSAGES/icewm.mo +share/locale/zh_CN.gb2312/LC_MESSAGES/icewm.mo share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo @dirrm etc/X11/icewm @dirrm lib/X11/icewm/icons diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo index b05c221224e..11d2aecef2d 100644 --- a/wm/icewm/distinfo +++ b/wm/icewm/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.6 2002/05/03 10:56:38 wiz Exp $ +$NetBSD: distinfo,v 1.6.2.1 2002/08/25 21:21:55 jlam Exp $ -SHA1 (icewm-1.0.9-2.tar.bz2) = f42d64996cde40f790247eb5428fb56dc2bfdb2f -Size (icewm-1.0.9-2.tar.bz2) = 484612 bytes +SHA1 (icewm-1.2.0.tar.gz) = bef4daba4bb94120f08f90755a9bc3518c254c21 +Size (icewm-1.2.0.tar.gz) = 684306 bytes SHA1 (patch-aa) = 8dc74038552f8c9783622229981a9a83b3464512 SHA1 (patch-ab) = bd8501ef2606efecb8f603578e1e2f978e586923 SHA1 (patch-ac) = 5275f5e9b5dae569d8d01a1209c00f40490edcbc -SHA1 (patch-ae) = edc66c096499df9a8b76d43376b3e40c408c99d3 +SHA1 (patch-ae) = e577de295c2024e51b0b571dc8eaaf5169ad57e4 SHA1 (patch-af) = 61a5060c95f9110b536c3312c1afc8d722af5226 SHA1 (patch-ag) = b6fb34262124dff0c33efe6f9c3261068af71c7d diff --git a/wm/icewm/patches/patch-ae b/wm/icewm/patches/patch-ae index 506b2f05f47..ad564bef033 100644 --- a/wm/icewm/patches/patch-ae +++ b/wm/icewm/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2002/02/26 09:41:40 martti Exp $ +$NetBSD: patch-ae,v 1.2.2.1 2002/08/25 21:21:56 jlam Exp $ ---- src/wmtaskbar.cc.orig Tue Oct 9 16:54:04 2001 -+++ src/wmtaskbar.cc Tue Feb 26 08:48:08 2002 -@@ -287,7 +287,11 @@ +--- src/wmtaskbar.cc.orig Thu May 16 05:00:02 2002 ++++ src/wmtaskbar.cc Sat May 25 09:41:09 2002 +@@ -288,7 +288,11 @@ } else fClock = 0; #ifdef CONFIG_APPLET_APM @@ -12,5 +12,5 @@ $NetBSD: patch-ae,v 1.2 2002/02/26 09:41:40 martti Exp $ + if (taskBarShowApm && access(APMDEV, 0) == 0) { +#endif fApm = new YApm(this); - if (fApm->height() + ADD1 > ht) ht = fApm->height() + ADD1; + if (fApm->height() > ht) ht = fApm->height(); } else diff --git a/wm/wmx/PLIST b/wm/wmx/PLIST index e43104aa94a..95fdeb0ef94 100644 --- a/wm/wmx/PLIST +++ b/wm/wmx/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:01 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:21:57 jlam Exp $ bin/wmx share/doc/wmx/README share/doc/wmx/README.contrib @dirrm share/doc/wmx -@exec ${MKDIR} -p %D/etc/wmx +@exec ${MKDIR} %D/etc/wmx @unexec ${RMDIR} -p %D/etc/wmx 2>/dev/null || true diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile index 997e3928384..1ce57ef2a21 100644 --- a/www/Mosaic/Makefile +++ b/www/Mosaic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34.2.2 2002/06/21 23:05:46 jlam Exp $ +# $NetBSD: Makefile,v 1.34.2.3 2002/08/25 21:21:58 jlam Exp $ # FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp # @@ -9,7 +9,7 @@ WRKSRC= ${WRKDIR}/Mosaic-src CATEGORIES= www MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/Web/Mosaic/Unix/source/ -MAINTAINER= tv@netbsd.org +MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/ COMMENT= World Wide Web browser diff --git a/www/Mosaic/PLIST b/www/Mosaic/PLIST index c25a3a401ca..e78b634a9b2 100644 --- a/www/Mosaic/PLIST +++ b/www/Mosaic/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:02 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:21:59 jlam Exp $ bin/Mosaic bin/mosaic lib/X11/app-defaults/Mosaic -@exec ${MKDIR} -p %D/share/mosaic +@exec ${MKDIR} %D/share/mosaic @unexec ${RM} -rf %D/share/mosaic diff --git a/www/amaya/distinfo b/www/amaya/distinfo index 0f55ac1b673..45b17a9855e 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.4.2.1 2002/06/30 06:24:31 jlam Exp $ +$NetBSD: distinfo,v 1.4.2.2 2002/08/25 21:22:00 jlam Exp $ SHA1 (amaya-src-5.1.tgz) = fe032cce47ed3979606d43bd21e10c2d41d6e05b Size (amaya-src-5.1.tgz) = 4925073 bytes -SHA1 (patch-aa) = aa7212f3424ac2593a9f38a6e2436ff781ba6fd0 +SHA1 (patch-aa) = 22dd34ab9dcd70220effb2fff690f70a5f1bbeb7 SHA1 (patch-ab) = 6f5940d24e285dcdcaf4420cf25b6bc8f750ab28 SHA1 (patch-ac) = e8740b482a7422fadadff451fb148beacd081838 SHA1 (patch-ad) = de880e28c117fdb64fc48e2b2d03be16c634bd8b +SHA1 (patch-ae) = 5e1e356471bb26ca463e3f09f0447044d2aaac39 +SHA1 (patch-af) = 9f29ef449cd5112b771e4c248a881ec4b41d7a0f diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa index 0809985fb38..3dd273780bc 100644 --- a/www/amaya/patches/patch-aa +++ b/www/amaya/patches/patch-aa @@ -1,7 +1,15 @@ -$NetBSD: patch-aa,v 1.7 2001/08/09 19:03:19 jlam Exp $ - ---- ../configure.orig Tue Jul 3 07:23:50 2001 -+++ ../configure +$NetBSD: patch-aa,v 1.7.2.1 2002/08/25 21:22:01 jlam Exp $ +--- ../configure.orig Tue Jul 3 13:23:50 2001 ++++ ../configure Mon Jul 1 02:48:37 2002 +@@ -3049,7 +3049,7 @@ + fi + + +-for ac_hdr in stdio.h ++for ac_hdr in stdio.h wchar.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -6425,12 +6425,6 @@ diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae new file mode 100644 index 00000000000..a393c4e95ef --- /dev/null +++ b/www/amaya/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.5.4.2 2002/08/25 21:22:02 jlam Exp $ +--- ../thotlib/include/ustring.h.orig Mon Jul 1 02:49:43 2002 ++++ ../thotlib/include/ustring.h Mon Jul 1 02:55:09 2002 +@@ -5,7 +5,11 @@ + #ifdef _WINDOWS + #include + #endif /* _WINDOWS */ ++ ++#include "config.h" ++#ifdef HAVE_WCHAR_H + #include ++#endif /* HAVE_WCHAR_H */ + + #ifdef _WINDOWS + #define strncasecmp _strnicmp diff --git a/www/amaya/patches/patch-af b/www/amaya/patches/patch-af new file mode 100644 index 00000000000..1decba3d8b3 --- /dev/null +++ b/www/amaya/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.4.4.2 2002/08/25 21:22:03 jlam Exp $ +--- ../config.h.in.orig Mon Jul 1 02:52:16 2002 ++++ ../config.h.in Mon Jul 1 02:52:51 2002 +@@ -321,6 +321,9 @@ + /* Define if you have the header file. */ + #undef HAVE_UNIXLIB_H + ++/* Define if you have the header file. */ ++#undef HAVE_WCHAR_H ++ + /* Define if you have the dl library (-ldl). */ + #undef HAVE_LIBDL + diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile index c41ce4c82ba..883b75fee90 100644 --- a/www/ap-dav/Makefile +++ b/www/ap-dav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4.2.1 2002/07/01 17:45:12 jlam Exp $ +# $NetBSD: Makefile,v 1.4.2.2 2002/08/25 21:22:04 jlam Exp $ DISTNAME= mod_dav-1.0.3-1.3.6 PKGNAME= ap-dav-1.0.3 @@ -9,7 +9,7 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.webdav.org/mod_dav/ COMMENT= Apache WebDAV module -# Ugly mess that says apache>=1.3.9 and apache<=2.0. +# Ugly mess that says apache>=1.3.9 and apache<2.0. BUILDLINK_DEPENDS.apache= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*} USE_BUILDLINK2= YES diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile index 41ea807615d..def3e6b016f 100644 --- a/www/ap-perl/Makefile +++ b/www/ap-perl/Makefile @@ -1,19 +1,20 @@ -# $NetBSD: Makefile,v 1.19.2.1 2002/06/30 15:31:15 jlam Exp $ +# $NetBSD: Makefile,v 1.19.2.2 2002/08/25 21:22:05 jlam Exp $ # -DISTNAME= mod_perl-1.25 -PKGNAME= ap-perl-1.25 -PKGREVISION= 1 -CATEGORIES= www perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} \ - http://perl.apache.org/dist/ +DISTNAME= mod_perl-1.25 +PKGNAME= ap-perl-1.25 +PKGREVISION= 1 +CATEGORIES= www perl5 +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} \ + http://perl.apache.org/dist/ -MAINTAINER= packages@netbsd.org -HOMEPAGE= http://perl.apache.org/ -COMMENT= Module that embeds a Perl interpreter into Apache +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://perl.apache.org/ +COMMENT= Module that embeds a Perl interpreter into Apache -DEPENDS+= {perl>=5.8.0rc2,libperl>=${LIBPERL5_REQD}}:../../lang/libperl -DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource +DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache +DEPENDS+= {libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl +DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource USE_BUILDLINK2= YES APACHE_MODULE= YES diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index ec83de3b72b..6254f917e93 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.47.2.2 2002/07/01 17:45:13 jlam Exp $ +# $NetBSD: Makefile,v 1.47.2.3 2002/08/25 21:22:05 jlam Exp $ -DISTNAME= mod_ssl-2.8.9-1.3.26 -PKGNAME= ap-ssl-2.8.9 +DISTNAME= mod_ssl-2.8.10-1.3.26 +PKGNAME= ap-ssl-2.8.10 +PKGREVISION= 1 CATEGORIES= www security MASTER_SITES= http://www.modssl.org/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \ @@ -13,7 +14,7 @@ COMMENT= SSL/TLS protocols module for Apache CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]* -BUILDLINK_DEPENDS.apache= apache-1.3.26nb1 +BUILDLINK_DEPENDS.apache= apache-1.3.26nb4 USE_BUILDLINK2= YES APACHE_MODULE= YES diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo index 984bac306b1..ce484007e0b 100644 --- a/www/ap-ssl/distinfo +++ b/www/ap-ssl/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10.2.1 2002/06/23 19:03:25 jlam Exp $ +$NetBSD: distinfo,v 1.10.2.2 2002/08/25 21:22:07 jlam Exp $ -SHA1 (mod_ssl-2.8.9-1.3.26.tar.gz) = 3075124cce758f06b292baa754d55eab639cdfc9 -Size (mod_ssl-2.8.9-1.3.26.tar.gz) = 752613 bytes +SHA1 (mod_ssl-2.8.10-1.3.26.tar.gz) = 6af4bbd91f2323c95f8d3ca1c461edc17fc1d13e +Size (mod_ssl-2.8.10-1.3.26.tar.gz) = 753241 bytes SHA1 (patch-aa) = 6b66b8d9e8bd03613376dca3b4e0dad3a2e7ed15 SHA1 (patch-ab) = bd1d4eeff91f87a2b46f1ce0ad95dab8a3c23c84 diff --git a/www/apache2/Makefile b/www/apache2/Makefile index e3b52d282d8..4ffec1e553c 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.6.2.3 2002/06/23 19:03:28 jlam Exp $ +# $NetBSD: Makefile,v 1.6.2.4 2002/08/25 21:22:07 jlam Exp $ -DISTNAME= httpd-2.0.39 -PKGNAME= apache-2.0.39 +DISTNAME= httpd-${APACHE_VERSION} +PKGNAME= apache-${APACHE_VERSION} +APACHE_VERSION= 2.0.39 +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://httpd.apache.org/dist/httpd/old/ \ @@ -10,9 +12,9 @@ MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://httpd.apache.org/ -COMMENT= HTTP (Web) server, version 2 +COMMENT= Apache HTTP (Web) server, version 2 -CONFLICTS= apache-*modssl-[0-9]* apache-[0-9]* apache6-[0-9]* +CONFLICTS= apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]* CONFLICTS+= ap-*-[0-9]* # Apache-1.x DSOs BUILD_DEFS+= USE_INET6 @@ -46,10 +48,11 @@ CONFIGURE_ARGS+= --enable-modules="${APACHE_MODULES}" CONFIGURE_ARGS+= --enable-so BUILD_DEFS+= APACHE_MODULES +APACHE_USER?= www +APACHE_GROUP?= www + SUEXEC_COMMENT?= "@comment " .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES -APACHE_SUEXEC_USER?= www -APACHE_SUEXEC_GROUP?= nogroup APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/apache/htdocs APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin APACHE_SUEXEC_CONFIGURE_ARGS+= \ @@ -62,10 +65,11 @@ CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} BUILD_DEFS+= APACHE_SUEXEC APACHE_SUEXEC_CONFIGURE_ARGS SUEXEC_COMMENT= # empty -PKG_GROUPS= ${APACHE_SUEXEC_GROUP} -PKG_USERS= ${APACHE_SUEXEC_USER}:${APACHE_SUEXEC_GROUP}::Apache\\ suEXEC\\ user .endif +PKG_GROUPS= ${APACHE_GROUP} +PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\\ user + PLIST_SUBST+= SUEXEC_COMMENT=${SUEXEC_COMMENT} PKG_SYSCONFVAR= apache @@ -83,11 +87,7 @@ MAKE_DIRS= ${PREFIX}/share/httpd MAKE_DIRS+= ${PREFIX}/share/httpd/htdocs OWN_DIRS= /var/log/httpd OWN_DIRS+= /var/db/httpd -.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES -OWN_DIRS_PERMS+= /var/db/httpd/proxy ${APACHE_SUEXEC_USER} ${APACHE_SUEXEC_GROUP} 0755 -.else -OWN_DIRS_PERMS+= /var/db/httpd/proxy nobody nobody 0755 -.endif +OWN_DIRS_PERMS+= /var/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755 # Add dependencies for the modules that will be built. For each module # ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace @@ -124,10 +124,8 @@ AP_CONF_FILE_SED+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g" AP_CONF_FILE_SED+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g" AP_CONF_FILE_SED+= -e "s|logs/|/var/log/httpd/|g" AP_CONF_FILE_SED+= -e "s|/var/log/httpd/foo\.log|logs/foo.log/|g" -.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES -AP_CONF_FILE_SED+= -e "s|^\(User[ ]\).*|\1${APACHE_SUEXEC_USER}|g" -AP_CONF_FILE_SED+= -e "s|^\(Group[ ]\).*|\1${APACHE_SUEXEC_GROUP}|g" -.endif +AP_CONF_FILE_SED+= -e "s|^\(User[ ]\).*|\1${APACHE_USER}|g" +AP_CONF_FILE_SED+= -e "s|^\(Group[ ]\).*|\1${APACHE_GROUP}|g" post-install: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \ diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh index 22b785949d8..a6b818f8103 100644 --- a/www/apache2/files/apache.sh +++ b/www/apache2/files/apache.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.3 2002/04/13 21:35:51 jlam Exp $ +# $NetBSD: apache.sh,v 1.3.2.1 2002/08/25 21:22:08 jlam Exp $ # # PROVIDE: apache # REQUIRE: DAEMON @@ -19,13 +19,16 @@ rcvar=$name command="@PREFIX@/sbin/httpd" ctl_command="@PREFIX@/sbin/apachectl" required_files="@PKG_SYSCONFDIR@/httpd.conf" +extra_commands="reload" start_cmd="apache_doit start" stop_cmd="apache_doit stop" restart_cmd="apache_doit restart" +reload_cmd="apache_doit reload" # "${apache_start}" is the subcommand sent to apachectl to control how # httpd is started. It's value may be overridden in: # +# @PKG_SYSCONFDIR@/apache_start.conf # /etc/rc.conf # /etc/rc.conf.d/apache, # @@ -33,17 +36,22 @@ restart_cmd="apache_doit restart" # and "startssl", and defaults to "start". # apache_start=start +if [ -f @PKG_SYSCONFDIR@/apache_start.conf ] +then + . @PKG_SYSCONFDIR@/apache_start.conf +fi apache_doit () { case $1 in start) action=${apache_start} ;; + reload) action=graceful ;; *) action=$1 ;; esac ${ctl_command} ${action} } -if [ -f /etc/rc.subr ] +if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ] then load_rc_config $name run_rc_command "$1" diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 63d44da861e..3ed39cdbb94 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49.2.2 2002/06/30 06:24:31 jlam Exp $ +# $NetBSD: Makefile,v 1.49.2.3 2002/08/25 21:22:09 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -7,8 +7,10 @@ # sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs) # -DISTNAME= apache_1.3.26 -PKGNAME= apache6-1.3.26 +DISTNAME= apache_${APACHE_VERSION} +PKGNAME= apache6-${APACHE_VERSION} +APACHE_VERSION= 1.3.26 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://www.apache.de/dist/httpd/ \ @@ -23,9 +25,9 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= itojun@netbsd.org HOMEPAGE= http://httpd.apache.org/ -COMMENT= HTTP (Web) server with IPv6 support +COMMENT= Apache HTTP (Web) server with IPv6 support -CONFLICTS= apache-[0-9]* apache-*modssl-[0-9]* apache6-[0-9]* +CONFLICTS= apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]* EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz} USE_BUILDLINK2= YES @@ -38,6 +40,7 @@ CONFIGURE_ARGS+= --enable-module=most \ --enable-rule=INET6 # proxy module is broken with the IPv6 patch CONFIGURE_ARGS+= --disable-module=proxy +CONFIGURE_ARGS+= --without-confadjust CONFIGURE_ARGS+= --with-perl=${PERL5} CONFIGURE_ARGS+= --with-port=80 CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}" @@ -50,20 +53,30 @@ BUILD_DEFS+= USE_INET6 IGNORE= "IPv6 only build" .endif +.if empty(STRIPFLAG) +CONFIGURE_ARGS+= --without-execstrip +.endif + PKG_SYSCONFSUBDIR?= httpd +APACHE_USER?= www +APACHE_GROUP?= www +BUILD_DEFS+= APACHE_USER +BUILD_DEFS+= APACHE_GROUP + +CONFIGURE_ARGS+= --server-uid=${APACHE_USER} +CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP} + .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES -APACHE_SUEXEC_USER?= www APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin APACHE_SUEXEC_CONFIGURE_ARGS+= \ - --suexec-caller=${APACHE_SUEXEC_USER} \ + --suexec-caller=${APACHE_USER} \ --suexec-safepath='${APACHE_SUEXEC_PATH}' \ --suexec-docroot=${APACHE_SUEXEC_DOCROOT} CONFIGURE_ARGS+= --enable-suexec \ ${APACHE_SUEXEC_CONFIGURE_ARGS:M--suexec-*} PLIST_SRC= ${PKGDIR}/PLIST.suexec -PKG_USERS= ${APACHE_SUEXEC_USER}:nogroup::Apache\\ suEXEC\\ user BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS .endif @@ -73,6 +86,12 @@ BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS PLIST_SRC+= ${PKGDIR}/PLIST +.if defined(NOPIC) +PLIST_SUBST+= SHLIBS="@comment " +.else +PLIST_SUBST+= SHLIBS="" +.endif + APACHE_CUSTOM_CFLAGS?= # empty .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES @@ -101,6 +120,9 @@ BUILD_DEFS+= APACHE_CUSTOM_CFLAGS BUILD_DEFS+= APACHE_PERF_TUNING BUILD_DEFS+= APACHE_SUEXEC +PKG_GROUPS= ${APACHE_GROUP} +PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\\ user + EGDIR= ${PREFIX}/share/examples/httpd CONF_FILES= ${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf @@ -108,8 +130,9 @@ SUPPORT_FILES= ${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic SUPPORT_FILES+= ${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types RCD_SCRIPTS= apache -OWN_DIRS= /var/log/httpd -OWN_DIRS+= /var/spool/httpd +OWN_DIRS+= ${PREFIX}/lib/httpd +OWN_DIRS+= /var/httpd +OWN_DIRS+= /var/log/httpd pre-patch: ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f diff --git a/www/apache6/PLIST b/www/apache6/PLIST index 3728c2dd14f..25b87f17f93 100644 --- a/www/apache6/PLIST +++ b/www/apache6/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 19:03:35 jlam Exp $ +@comment $NetBSD: PLIST,v 1.1.2.2 2002/08/25 21:22:11 jlam Exp $ +bin/checkgid bin/dbmmanage bin/htdigest bin/htpasswd @@ -50,6 +51,7 @@ include/httpd/xml/xmlparse.h include/httpd/xml/xmlrole.h include/httpd/xml/xmltok.h include/httpd/xml/xmltok_impl.h +${SHLIBS}lib/httpd/httpd.exp libexec/cgi-bin/printenv libexec/cgi-bin/test-cgi man/man1/dbmmanage.1 @@ -604,7 +606,9 @@ share/httpd/icons/world2.png @dirrm share/httpd/htdocs/manual/images @dirrm share/httpd/htdocs/manual/howto @dirrm share/httpd/htdocs/manual +@unexec ${RMDIR} %D/share/httpd/htdocs 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/httpd 2>/dev/null || ${TRUE} @dirrm share/examples/httpd +@unexec ${RMDIR} %D/lib/httpd 2>/dev/null || ${TRUE} @dirrm include/httpd/xml @dirrm include/httpd - diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh index 5777b3a8bf4..b8311698952 100644 --- a/www/apache6/files/apache.sh +++ b/www/apache6/files/apache.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.13 2002/02/26 20:28:41 jlam Exp $ +# $NetBSD: apache.sh,v 1.13.2.1 2002/08/25 21:22:12 jlam Exp $ # # PROVIDE: apache # REQUIRE: DAEMON @@ -19,9 +19,11 @@ rcvar=$name command="@PREFIX@/sbin/httpd" ctl_command="@PREFIX@/sbin/apachectl" required_files="@PKG_SYSCONFDIR@/httpd.conf" +extra_commands="reload" start_cmd="apache_doit start" stop_cmd="apache_doit stop" restart_cmd="apache_doit restart" +reload_cmd="apache_doit reload" # "${apache_start}" is the subcommand sent to apachectl to control how # httpd is started. It's value may be overridden in: @@ -43,15 +45,16 @@ apache_doit () { case $1 in start) action=${apache_start} ;; + reload) action=graceful ;; *) action=$1 ;; esac ${ctl_command} ${action} } -if [ -f /etc/rc.subr ] +if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ] then load_rc_config $name run_rc_command "$1" else - eval ${start_cmd} + apache_doit "$1" fi diff --git a/www/apache6/files/config.layout b/www/apache6/files/config.layout index 620a76245b0..cbce564dc62 100644 --- a/www/apache6/files/config.layout +++ b/www/apache6/files/config.layout @@ -1,4 +1,4 @@ -# $NetBSD: config.layout,v 1.3 2001/11/26 07:34:07 jlam Exp $ +# $NetBSD: config.layout,v 1.3.2.1 2002/08/25 21:22:13 jlam Exp $ prefix: @PREFIX@ @@ -14,8 +14,8 @@ htdocsdir: ${prefix}/share/httpd/htdocs manualdir: ${prefix}/share/httpd/htdocs/manual cgidir: ${exec_prefix}/libexec/cgi-bin includedir: ${prefix}/include/httpd -localstatedir: /var/run +localstatedir: /var/httpd runtimedir: /var/run logfiledir: /var/log/httpd -proxycachedir: /var/spool/httpd/proxy +proxycachedir: /var/httpd/proxy diff --git a/www/bozohttpd/DESCR b/www/bozohttpd/DESCR index 7ec406d1f08..65c7b8de34d 100644 --- a/www/bozohttpd/DESCR +++ b/www/bozohttpd/DESCR @@ -3,4 +3,4 @@ feature is the lack of features, reducing the code size and improving verifiability. It supports CGI/1.1, HTTP/1.1, HTTP/1.0, HTTP/0.9, ~user translations, -and can run multiple IP-based http servers on single machine. +and can run multiple IP-based or virtual http servers on single machine. diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index 74dc1d895c1..c4193ded72b 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.15.2.1 2002/06/21 23:05:47 jlam Exp $ +# $NetBSD: Makefile,v 1.15.2.2 2002/08/25 21:22:15 jlam Exp $ # -DISTNAME= bozohttpd-5.09 +DISTNAME= bozohttpd-5.14 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} EXTRACT_SUFX= .tar.bz2 -MAINTAINER= packages@netbsd.org +MAINTAINER= mrg@eterna.com.au HOMEPAGE= http://www.eterna.com.au/bozohttpd/ COMMENT= bozotic HTTP server; small and secure @@ -14,9 +14,11 @@ BUILD_DEFS+= USE_INET6 USE_BUILDLINK2= YES +MAKE_ENV+= BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/man + .include "../../mk/bsd.prefs.mk" -.if defined(USE_INET6) && (${USE_INET6} == "YES") +.if defined(USE_INET6) && ${USE_INET6} == "YES" CPPFLAGS+= -DINET6 .endif diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo index b7723916230..1114df391f0 100644 --- a/www/bozohttpd/distinfo +++ b/www/bozohttpd/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.9 2002/04/23 11:23:59 zuntum Exp $ +$NetBSD: distinfo,v 1.9.2.1 2002/08/25 21:22:16 jlam Exp $ -SHA1 (bozohttpd-5.09.tar.bz2) = 38670bf3216cf97fa2e7af1415afe0831bdd8ddc -Size (bozohttpd-5.09.tar.bz2) = 18439 bytes -SHA1 (patch-aa) = 3831938ead3fd2792d61878c10aa7ada431e8cd7 -SHA1 (patch-ab) = 3dbf43680c52c60251221243e855fc2d2f26c1ff -SHA1 (patch-ae) = 65a715f22af38be3bf2c47dd0b9dceedad23e412 +SHA1 (bozohttpd-5.14.tar.bz2) = ce4eeb87b8005b4eac5d52c8647c0ed3cae9f56e +Size (bozohttpd-5.14.tar.bz2) = 21666 bytes +SHA1 (patch-ab) = 706f678d56bbedd1b2f02f543c265d48dae8011d diff --git a/www/bozohttpd/patches/patch-aa b/www/bozohttpd/patches/patch-aa deleted file mode 100644 index 821cc55ed82..00000000000 --- a/www/bozohttpd/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/05/19 12:02:20 bad Exp $ - ---- Makefile.orig Wed May 19 21:45:11 1999 -+++ Makefile Wed May 19 21:50:17 1999 -@@ -3,4 +3,7 @@ - PROG= bozohttpd - MAN= bozohttpd.8 - -+BINDIR=$(PREFIX)/libexec -+MANDIR=$(PREFIX)/man -+ - .include diff --git a/www/bozohttpd/patches/patch-ab b/www/bozohttpd/patches/patch-ab index a944326c50e..52063c8052c 100644 --- a/www/bozohttpd/patches/patch-ab +++ b/www/bozohttpd/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.8 2001/12/14 16:26:03 mrg Exp $ +$NetBSD: patch-ab,v 1.8.2.1 2002/08/25 21:22:18 jlam Exp $ ---- bozohttpd.8.in.orig Sat Sep 22 20:10:00 2001 -+++ bozohttpd.8.in Sat Dec 15 03:15:41 2001 -@@ -172,8 +172,8 @@ +--- bozohttpd.8.in.orig Fri Aug 23 15:43:44 2002 ++++ bozohttpd.8.in Fri Aug 23 15:48:04 2002 +@@ -197,8 +197,8 @@ .Xr inetd.conf 5 entry would be: .Bd -literal @@ -13,3 +13,12 @@ $NetBSD: patch-ab,v 1.8 2001/12/14 16:26:03 mrg Exp $ .Ed .Pp This would serve web pages from +@@ -218,7 +218,7 @@ + .Pp + To configure set of virtual hosts, one would use an entry like: + .Bd -literal +-www stream tcp nowait:600 httpd /usr/pkg/libexec/bozohttpd bozohttpd -v /var/vroot /var/www ++www stream tcp nowait:600 httpd @PREFIX@/libexec/bozohttpd bozohttpd -v /var/vroot /var/www + .Ed + .Pp + and inside diff --git a/www/bozohttpd/patches/patch-ae b/www/bozohttpd/patches/patch-ae deleted file mode 100644 index 325b62195b3..00000000000 --- a/www/bozohttpd/patches/patch-ae +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2002/04/23 11:24:00 zuntum Exp $ - ---- bozohttpd.c.orig Sat Sep 22 12:10:00 2001 -+++ bozohttpd.c -@@ -359,6 +359,7 @@ - case 'c': - #ifndef NO_CGIBIN_SUPPORT - cgibin = optarg; -+ debug((DEBUG_OBESE, "cgibin (cgi-bin directory) is %s", cgibin)); - break; - #else - error(1, "CGI is not enabled"); -@@ -1734,7 +1735,7 @@ - int savederrno; - - /* only log if the level is low enough */ -- if (level < dflag) -+ if (dflag < level) - return; - - savederrno = errno; diff --git a/www/communicator/MESSAGE b/www/communicator/MESSAGE index c082935f9dd..d79e98a66a4 100644 --- a/www/communicator/MESSAGE +++ b/www/communicator/MESSAGE @@ -1,5 +1,5 @@ ============================================================================== -$NetBSD: MESSAGE,v 1.1 2001/11/01 02:16:34 zuntum Exp $ +$NetBSD: MESSAGE,v 1.1.2.1 2002/08/25 21:22:19 jlam Exp $ alpha: The Digital UNIX version of Netscape requires COMPAT_OSF1 in your kernel, plus /emul/osf1 libraries. @@ -17,4 +17,7 @@ sparc: The SunOS version of Netscape requires COMPAT_SUNOS in your kernel, version is 'netscape_nis'. Netscape appears to have stopped with 4.61. SunOS 'navigator' has problems saving files, 'communicator' does not. +sparc: The Solaris version of Netscape requires COMPAT_SVR4 in your kernel, + plus /emul/svr4 libraries. + ============================================================================== diff --git a/www/communicator/PLIST.post b/www/communicator/PLIST.post index 28a29cba0a3..7d98b1e1ee0 100644 --- a/www/communicator/PLIST.post +++ b/www/communicator/PLIST.post @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.post,v 1.2 2002/02/15 10:13:03 skrll Exp $ +@comment $NetBSD: PLIST.post,v 1.2.2.1 2002/08/25 21:22:19 jlam Exp $ @dirrm lib/netscape/${BINNAME}-${NS_VERS}/spell @dirrm lib/netscape/${BINNAME}-${NS_VERS}/plugins @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/trouble @@ -18,6 +18,6 @@ @dirrm lib/netscape/${BINNAME}-${NS_VERS}/java/classes @dirrm lib/netscape/${BINNAME}-${NS_VERS}/java @dirrm lib/netscape/${BINNAME}-${NS_VERS} -@exec ${MKDIR} -p %D/lib/netscape/plugins +@exec ${MKDIR} %D/lib/netscape/plugins @unexec ${RMDIR} %D/lib/netscape/plugins 2>/dev/null || true @unexec ${RMDIR} %D/lib/netscape 2>/dev/null || true diff --git a/www/curl/distinfo b/www/curl/distinfo index 0a32816084c..eee1dcd48ac 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.10.2.1 2002/06/23 19:03:40 jlam Exp $ +$NetBSD: distinfo,v 1.10.2.2 2002/08/25 21:22:20 jlam Exp $ SHA1 (curl-7.9.7.tar.gz) = 6fcb23be788984bcfca7debe5f307ec65fb56101 Size (curl-7.9.7.tar.gz) = 717489 bytes SHA1 (patch-aa) = 5990fe1f4d583847751549f2e647f23b2bbbbe96 +SHA1 (patch-ab) = 7054f8d9f19fa2a9d7b816fd58ae08ef97bcbb1c diff --git a/www/curl/patches/patch-ab b/www/curl/patches/patch-ab new file mode 100644 index 00000000000..c137c2154d4 --- /dev/null +++ b/www/curl/patches/patch-ab @@ -0,0 +1,20 @@ +$NetBSD: patch-ab,v 1.2.4.2 2002/08/25 21:22:22 jlam Exp $ + +--- lib/ftp.c.orig Mon Apr 29 11:57:25 2002 ++++ lib/ftp.c Fri Jul 19 04:22:35 2002 +@@ -1576,12 +1576,13 @@ + + #ifdef HAVE_STRFTIME + if(data->set.get_filetime && data->info.filetime) { ++ time_t filetime = data->info.filetime; + struct tm *tm; + #ifdef HAVE_LOCALTIME_R + struct tm buffer; +- tm = (struct tm *)localtime_r(&data->info.filetime, &buffer); ++ tm = (struct tm *)localtime_r(&filetime, &buffer); + #else +- tm = localtime((unsigned long *)&data->info.filetime); ++ tm = localtime(&filetime); + #endif + /* format: "Tue, 15 Nov 1994 12:45:26 GMT" */ + strftime(buf, BUFSIZE-1, "Last-Modified: %a, %d %b %Y %H:%M:%S %Z\r\n", diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile index 0f53390431b..235f5b85d80 100644 --- a/www/cvsweb/Makefile +++ b/www/cvsweb/Makefile @@ -1,35 +1,60 @@ # -# $NetBSD: Makefile,v 1.9.2.1 2002/06/30 06:24:32 jlam Exp $ +# $NetBSD: Makefile,v 1.9.2.2 2002/08/25 21:22:23 jlam Exp $ # -DISTNAME= cvsweb-1.112 -CATEGORIES= net -MASTER_SITES= http://stud.fh-heilbronn.de/~zeller/download/ +DISTNAME= cvsweb-2.0.5 +CATEGORIES= www +MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/ -MAINTAINER= kim@tac.nyc.ny.us -HOMEPAGE= http://stud.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi/ +MAINTAINER= lukem@netbsd.org +HOMEPAGE= http://www.freebsd.org/projects/cvsweb.html COMMENT= Web interface for browsing a CVS repository USE_BUILDLINK2= YES -WRKSRC= ${WRKDIR}/cvsweb PKG_SYSCONFSUBDIR?= httpd EGDIR= ${PREFIX}/share/examples/${PKGBASE} +DOCDIR= ${PREFIX}/share/doc/${PKGBASE} -CONF_FILES= ${EGDIR}/cvsweb.conf.default ${PKG_SYSCONFDIR}/cvsweb.conf +CVSWEB_CONF_FILES= cvsweb.conf \ + cvsweb.conf-freebsd \ + cvsweb.conf-netbsd \ + cvsweb.conf-openbsd \ + cvsweb.conf-ruby + +CVSWEB_ICONS= back.gif dir.gif \ + miniback.gif minidir.gif minitext.gif text.gif + +CVSWEB_DOCS= ChangeLog INSTALL README README.FreeBSD \ + TODO TODO.FreeBSD + +CONF_FILES= ${EGDIR}/cvsweb.conf ${PKG_SYSCONFDIR}/cvsweb.conf + +.if !exists(/usr/bin/rlog) +DEPENDS+= rcs-[0-9]*:../../devel/rcs +.endif do-build: ${MV} ${WRKSRC}/cvsweb.cgi ${WRKSRC}/cvsweb.cgi.bak ${SED} -e 's,/usr/bin/perl,${PERL5},' \ - -e 's,/usr/local/web/apache/conf/,${PKG_SYSCONFDIR}/,' \ + -e 's,/usr/local/etc/cvsweb/,${PKG_SYSCONFDIR}/,' \ ${WRKSRC}/cvsweb.cgi.bak > ${WRKSRC}/cvsweb.cgi do-install: ${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/cgi-bin ${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/libexec/cgi-bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cvsweb - ${INSTALL_DATA} ${WRKSRC}/cvsweb.conf \ - ${PREFIX}/share/examples/cvsweb/cvsweb.conf.default + ${INSTALL_DATA_DIR} ${EGDIR} +.for f in ${CVSWEB_CONF_FILES} + ${INSTALL_DATA} ${WRKSRC}/${f} ${EGDIR}/${f} +.endfor + ${INSTALL_DATA_DIR} ${EGDIR}/icons +.for f in ${CVSWEB_ICONS} + ${INSTALL_DATA} ${WRKSRC}/icons/${f} ${EGDIR}/icons/${f} +.endfor + ${INSTALL_DATA_DIR} ${DOCDIR} +.for f in ${CVSWEB_DOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f} +.endfor .include "../../lang/perl5/buildlink2.mk" diff --git a/www/cvsweb/PLIST b/www/cvsweb/PLIST index 897163017f2..cacf0cf7af6 100644 --- a/www/cvsweb/PLIST +++ b/www/cvsweb/PLIST @@ -1,4 +1,22 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:38 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/08/25 21:22:23 jlam Exp $ libexec/cgi-bin/cvsweb.cgi -share/examples/cvsweb/cvsweb.conf.default +share/doc/cvsweb/ChangeLog +share/doc/cvsweb/INSTALL +share/doc/cvsweb/README +share/doc/cvsweb/README.FreeBSD +share/doc/cvsweb/TODO +share/doc/cvsweb/TODO.FreeBSD +share/examples/cvsweb/cvsweb.conf +share/examples/cvsweb/cvsweb.conf-freebsd +share/examples/cvsweb/cvsweb.conf-netbsd +share/examples/cvsweb/cvsweb.conf-openbsd +share/examples/cvsweb/cvsweb.conf-ruby +share/examples/cvsweb/icons/back.gif +share/examples/cvsweb/icons/dir.gif +share/examples/cvsweb/icons/miniback.gif +share/examples/cvsweb/icons/minidir.gif +share/examples/cvsweb/icons/minitext.gif +share/examples/cvsweb/icons/text.gif +@dirrm share/examples/cvsweb/icons @dirrm share/examples/cvsweb +@dirrm share/doc/cvsweb diff --git a/www/cvsweb/distinfo b/www/cvsweb/distinfo index 78b698f8a6f..fcb6cb7ed34 100644 --- a/www/cvsweb/distinfo +++ b/www/cvsweb/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.4 2001/10/15 17:25:10 martti Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/08/25 21:22:24 jlam Exp $ -SHA1 (cvsweb-1.112.tar.gz) = 4dc996712c365f064a8b8d26a69b3df083ecac0a -Size (cvsweb-1.112.tar.gz) = 37239 bytes -SHA1 (patch-aa) = 318c11abe236a6c5d49cf013817da6849b2855da +SHA1 (cvsweb-2.0.5.tar.gz) = 6fb2049eb8f9a79788b9f84523399d761dbc6205 +Size (cvsweb-2.0.5.tar.gz) = 51948 bytes +SHA1 (patch-aa) = be834a845486db0f104ec0ae990a5452e4f03811 +SHA1 (patch-ab) = 8bb35592e5ba45783d2c1026d5036539fb808f24 diff --git a/www/cvsweb/patches/patch-aa b/www/cvsweb/patches/patch-aa index ace0a500130..b7115ff9996 100644 --- a/www/cvsweb/patches/patch-aa +++ b/www/cvsweb/patches/patch-aa @@ -1,10 +1,18 @@ -$NetBSD: patch-aa,v 1.3 2001/10/15 17:25:10 martti Exp $ +$NetBSD: patch-aa,v 1.3.2.1 2002/08/25 21:22:25 jlam Exp $ ---- cvsweb.cgi.orig Mon Oct 15 13:45:06 2001 -+++ cvsweb.cgi Mon Oct 15 13:48:30 2001 +--- cvsweb.cgi.orig Tue Jul 23 15:58:32 2002 ++++ cvsweb.cgi Wed Jul 24 11:01:53 2002 @@ -1,4 +1,4 @@ --#!/usr/bin/perl -wsT -+#!/usr/bin/perl -s +-#!/usr/bin/perl -wT ++#!/usr/bin/perl -w # # cvsweb - a CGI interface to CVS trees. # +@@ -3631,6 +3631,7 @@ + } + + sub html_footer() { ++ return if ($address eq ""); + print "
\n
$address
\n\n\n"; + } + diff --git a/www/cvsweb/patches/patch-ab b/www/cvsweb/patches/patch-ab new file mode 100644 index 00000000000..9414700096d --- /dev/null +++ b/www/cvsweb/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.3.2.2 2002/08/25 21:22:26 jlam Exp $ + +--- cvsweb.conf.orig Wed Jul 10 17:30:56 2002 ++++ cvsweb.conf Wed Jul 24 11:02:29 2002 +@@ -495,6 +495,7 @@ + @cvs_options = qw(-lf); + + push @cvs_options, '-R' if ($uname eq 'FreeBSD' || $uname eq 'OpenBSD'); ++push @cvs_options, '-u' if ($uname eq 'NetBSD'); + + # Only FreeBSD's and OpenBSD's cvs(1) supports -R (read only access + # mode) option, which considerably speeds up checkouts over NFS. diff --git a/www/dillo/Makefile b/www/dillo/Makefile index 528b3fac539..75500f9a386 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.6.2.2 2002/06/30 06:24:32 jlam Exp $ +# $NetBSD: Makefile,v 1.6.2.3 2002/08/25 21:22:26 jlam Exp $ # -DISTNAME= dillo-0.6.5 -PKGREVISION= 1 +DISTNAME= dillo-0.6.6 CATEGORIES= www MASTER_SITES= http://dillo.cipsga.org.br/download/ diff --git a/www/dillo/distinfo b/www/dillo/distinfo index 3e42413fae7..aae5b7c18fb 100644 --- a/www/dillo/distinfo +++ b/www/dillo/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7.2.1 2002/06/23 19:03:42 jlam Exp $ +$NetBSD: distinfo,v 1.7.2.2 2002/08/25 21:22:26 jlam Exp $ -SHA1 (dillo-0.6.5.tar.gz) = 34e11b573e577d24fc20a2b8a9a13f44883ecf51 -Size (dillo-0.6.5.tar.gz) = 310323 bytes +SHA1 (dillo-0.6.6.tar.gz) = 6ff27fe122f53f2e554a5377b67258d2df7ec381 +Size (dillo-0.6.6.tar.gz) = 310331 bytes SHA1 (patch-aa) = 1ae5a680306102d03d587acfbbf16cbf1f5df366 SHA1 (patch-ab) = 1687c870ae8f6c5a3be4a91335a6d913d9773ff2 diff --git a/www/elinks/distinfo b/www/elinks/distinfo index 0f94d71faa3..2c50aa29a99 100644 --- a/www/elinks/distinfo +++ b/www/elinks/distinfo @@ -1,4 +1,4 @@ - +$NetBSD: distinfo,v 1.1.1.1.2.3 2002/08/25 21:22:27 jlam Exp $ SHA1 (elinks-0.3.0.tar.bz2) = c531d7922b1fb51fb8eeda960ff1e41c656db03e Size (elinks-0.3.0.tar.bz2) = 446820 bytes diff --git a/www/kannel/Makefile b/www/kannel/Makefile index 75cdd16f268..2b4c3dc4e0d 100644 --- a/www/kannel/Makefile +++ b/www/kannel/Makefile @@ -1,24 +1,25 @@ -# $NetBSD: Makefile,v 1.8.2.2 2002/07/01 17:45:14 jlam Exp $ +# $NetBSD: Makefile,v 1.8.2.3 2002/08/25 21:22:28 jlam Exp $ # DISTNAME= gateway-${KANNEL_VER} PKGNAME= kannel-${KANNEL_VER} CATEGORIES= www net -MASTER_SITES= http://www.kannel.3glab.org/download/${KANNEL_VER}/ +MASTER_SITES= http://www.kannel.org/download/${KANNEL_VER}/ MAINTAINER= rh@netbsd.org -HOMEPAGE= http://www.kannel.org/ -COMMENT= open source WAP and SMS gateway +HOMEPAGE= http://www.kannel.org +COMMENT= Open source WAP and SMS gateway -KANNEL_VER= 1.0.3 +KANNEL_VER= 1.2.0 GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_GMAKE= YES USE_PERL5= YES -USE_PTHREAD= native pth +PTHREAD_OPTS+= require CONFIGURE_ARGS+= --disable-docs +CONFIGURE_ARGS+= --disable-ssl CFLAGS+= -I${BUILDLINK_PREFIX.libxml2}/include/libxml2/libxml .include "../../textproc/libxml2/buildlink2.mk" diff --git a/www/kannel/PLIST b/www/kannel/PLIST index b97a1c3acba..cb27385ffc4 100644 --- a/www/kannel/PLIST +++ b/www/kannel/PLIST @@ -1,9 +1,13 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:14 zuntum Exp $ -bin/bearerbox -bin/smsbox -bin/wapbox +@comment $NetBSD: PLIST,v 1.1.2.1 2002/08/25 21:22:29 jlam Exp $ +bin/seewbmp bin/wmlsc bin/wmlsdasm -bin/seewbmp -bin/run_kannel_box -bin/start-stop-daemon +man/man1/seewbmp.1 +man/man1/wmlsc.1 +man/man1/wmlsdasm.1 +man/man8/kannel.8 +man/man8/run_kannel_box.8 +sbin/bearerbox +sbin/run_kannel_box +sbin/smsbox +sbin/wapbox diff --git a/www/kannel/distinfo b/www/kannel/distinfo index 3f06dc8c8e8..c240c0abc29 100644 --- a/www/kannel/distinfo +++ b/www/kannel/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/07/21 14:16:53 wiz Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/08/25 21:22:29 jlam Exp $ -SHA1 (gateway-1.0.3.tar.gz) = 5ee499460f9a98b11fdd9bc48ac7607e896206a6 -Size (gateway-1.0.3.tar.gz) = 656472 bytes -SHA1 (patch-aa) = ebe7f7d88e57620e13c25bb85ff6af5446583417 -SHA1 (patch-ab) = 55cfc733d2cd278b710c5509016342266592ac14 -SHA1 (patch-ac) = bfde3bb30215f18be89c03923d6b2262feb4d060 +SHA1 (gateway-1.2.0.tar.gz) = f81fdfca26be69de8505550a076fb3628f477af2 +Size (gateway-1.2.0.tar.gz) = 2094749 bytes +SHA1 (patch-aa) = 5982f3ddffe19910aa433b7c47c734f18387bf0e +SHA1 (patch-ab) = df965c5d3bf3751c46d1650eb3f8e2adcfb66277 diff --git a/www/kannel/patches/patch-aa b/www/kannel/patches/patch-aa index af575fdbc1e..a8705be728a 100644 --- a/www/kannel/patches/patch-aa +++ b/www/kannel/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2001/07/21 14:16:54 wiz Exp $ +$NetBSD: patch-aa,v 1.2.2.1 2002/08/25 21:22:30 jlam Exp $ ---- utils/start-stop-daemon.c.orig Fri May 26 20:05:53 2000 -+++ utils/start-stop-daemon.c Fri Jun 29 09:07:15 2001 +--- utils/start-stop-daemon.c.orig Mon Apr 23 16:52:29 2001 ++++ utils/start-stop-daemon.c Sun Jul 7 21:28:04 2002 @@ -34,8 +34,13 @@ - #elif defined(__FreeBSD__) + #elif defined(__FreeBSD__) || defined(__APPLE__) #define FreeBSD #else +#include diff --git a/www/kannel/patches/patch-ab b/www/kannel/patches/patch-ab index 39e3a87847e..7e46c7ba952 100644 --- a/www/kannel/patches/patch-ab +++ b/www/kannel/patches/patch-ab @@ -1,22 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2001/07/21 14:16:54 wiz Exp $ +$NetBSD: patch-ab,v 1.2.2.1 2002/08/25 21:22:31 jlam Exp $ ---- Makefile.in.orig Tue Feb 13 13:12:02 2001 -+++ Makefile.in Fri Jun 29 08:59:52 2001 -@@ -87,7 +87,7 @@ +--- Makefile.in.orig Tue Jun 11 20:59:52 2002 ++++ Makefile.in Sun Jul 7 21:30:27 2002 +@@ -90,7 +90,7 @@ # Set this to something if you want all installed binaries to have a suffix. # Version number is common. --suffix = -$(VERSION) +-suffix = $(SUFFIX) +suffix = # # You probably don't need to touch anything below this, if you're just -@@ -185,7 +185,7 @@ - install: all - $(INSTALL) -d $(bindir) - for prog in $(progs); do \ -- $(INSTALL) $$prog $(bindir)/`basename $$prog`$(suffix); \ -+ ${BSD_INSTALL_PROGRAM} $$prog $(bindir)/`basename $$prog`${suffix}; \ - done - - install-docs: diff --git a/www/kannel/patches/patch-ac b/www/kannel/patches/patch-ac deleted file mode 100644 index a9f21cc2a12..00000000000 --- a/www/kannel/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2001/07/21 14:16:54 wiz Exp $ - ---- configure.orig Tue Mar 27 17:23:16 2001 -+++ configure Fri Jun 29 09:00:47 2001 -@@ -542,7 +542,7 @@ - - - --docdir='${prefix}/doc/kannel' -+docdir='${prefix}/share/doc/kannel' - - - # Extract the first word of "gcc", so it can be a program name with args. diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile index fe168325e1a..40eb08369c6 100644 --- a/www/links-gui/Makefile +++ b/www/links-gui/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2.2.4 2002/06/30 04:00:46 jlam Exp $ +# $NetBSD: Makefile,v 1.2.2.5 2002/08/25 21:22:34 jlam Exp $ # -PKGNAME= links-gui-2.0 +PKGNAME= links-gui-2.1.0.2 COMMENT= Lynx-like text and graphics WWW browser CONFLICTS+= links-[0-9]* elinks-[0-9]* @@ -16,4 +16,4 @@ CONFIGURE_ARGS+= --enable-graphics .include "../../graphics/png/buildlink2.mk" .include "../../graphics/tiff/buildlink2.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../www/links/Makefile.common" diff --git a/www/links-gui/distinfo b/www/links-gui/distinfo index 8da05d02df1..5c0a7137687 100644 --- a/www/links-gui/distinfo +++ b/www/links-gui/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 19:04:10 jlam Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.3 2002/08/25 21:22:35 jlam Exp $ -SHA1 (links-2.0.tar.bz2) = c4584e728ebbb5ef60aab6d661a2d865445c451d -Size (links-2.0.tar.bz2) = 3499871 bytes +SHA1 (links-2.1pre2.tar.bz2) = b3a807968ce028fe9fc702292bb107c6249d05e3 +Size (links-2.1pre2.tar.bz2) = 3509541 bytes diff --git a/www/links/Makefile b/www/links/Makefile index 4a7d2df8e5e..2e525e19edd 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8.2.4 2002/06/30 04:00:45 jlam Exp $ +# $NetBSD: Makefile,v 1.8.2.5 2002/08/25 21:22:32 jlam Exp $ # -PKGNAME= links-2.0 +PKGNAME= links-2.1.0.2 COMMENT= Lynx-like text WWW browser -CONFLICTS+= links-gui-[0-9]* elinks-[0-9] +CONFLICTS+= links-gui-[0-9]* elinks-[0-9]* USE_BUILDLINK2= YES diff --git a/www/links/Makefile.common b/www/links/Makefile.common index 37ec2a69977..d3b779b96d6 100644 --- a/www/links/Makefile.common +++ b/www/links/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.1.2.2 2002/06/23 19:04:08 jlam Exp $ +# $NetBSD: Makefile.common,v 1.1.2.3 2002/08/25 21:22:33 jlam Exp $ # -DISTNAME= links-2.0 +DISTNAME= links-2.1pre2 CATEGORIES= www MASTER_SITES= \ http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/download/ \ diff --git a/www/links/distinfo b/www/links/distinfo index 5a1c66991df..daea1395204 100644 --- a/www/links/distinfo +++ b/www/links/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3.2.1 2002/06/23 19:04:08 jlam Exp $ +$NetBSD: distinfo,v 1.3.2.2 2002/08/25 21:22:33 jlam Exp $ -SHA1 (links-2.0.tar.bz2) = c4584e728ebbb5ef60aab6d661a2d865445c451d -Size (links-2.0.tar.bz2) = 3499871 bytes +SHA1 (links-2.1pre2.tar.bz2) = b3a807968ce028fe9fc702292bb107c6249d05e3 +Size (links-2.1pre2.tar.bz2) = 3509541 bytes diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo index 5d8bea82cbd..4d1973ba555 100644 --- a/www/lynx-current/distinfo +++ b/www/lynx-current/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2002/05/04 17:06:48 fredb Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/08/25 21:22:38 jlam Exp $ SHA1 (lynx2.8.5dev.7.tar.bz2) = 8e9eb4bf11944c24517e99ec0ef76b203022c5fe Size (lynx2.8.5dev.7.tar.bz2) = 1966524 bytes SHA1 (patch-aa) = 8935e11ef53dc6a686b2fc19359aa2db7fffc226 +SHA1 (patch-ab) = 5f683f4cf53582db6b2cbc8e37f840a6e51e3345 SHA1 (patch-ae) = 116b1a797f52b214c125dd362ed1161bab78313f diff --git a/www/lynx-current/patches/patch-ab b/www/lynx-current/patches/patch-ab new file mode 100644 index 00000000000..d94a02927b1 --- /dev/null +++ b/www/lynx-current/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.3.2.2 2002/08/25 21:22:40 jlam Exp $ + +--- src/LYCurses.c.orig Wed Aug 21 21:16:48 2002 ++++ src/LYCurses.c +@@ -564,9 +564,7 @@ PUBLIC void curses_style ARGS2( + } + #endif /* USE_COLOR_STYLE */ + +-#ifndef USE_SLANG + PRIVATE BOOL lynx_called_initscr = FALSE; +-#endif + + #if defined(HAVE_USE_DEFAULT_COLORS) && defined(USE_DEFAULT_COLORS) + /* +@@ -1274,7 +1272,7 @@ PUBLIC void stop_curses NOARGS + lynx_nl2crlf(TRUE); + lynx_enable_mouse (0); + #if (!defined(WIN_EX) || defined(__CYGWIN__)) /* @@@ */ +- if(LYscreen) { ++ if(LYscreen || lynx_called_initscr) { + endwin(); /* stop curses */ + LYDELSCR(); + } diff --git a/www/lynx/Makefile b/www/lynx/Makefile index a0b9559a058..cdf576d2cfd 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.49.2.1 2002/06/30 06:24:34 jlam Exp $ +# $NetBSD: Makefile,v 1.49.2.2 2002/08/25 21:22:35 jlam Exp $ # DISTNAME= lynx2.8.4rel.1 -PKGNAME= lynx-2.8.4.1.2 +PKGNAME= lynx-2.8.4.1.3 CATEGORIES= www -MASTER_SITES= http://lynx.isc.org/release/ \ - ftp://lynx.isc.org/lynx/ \ +MASTER_SITES= http://lynx.isc.org/lynx2.8.4/ \ + ftp://lynx.isc.org/lynx2.8.4/ \ ftp://ftp.nl.uu.net/pub/unix/www/lynx/lynx2.8.4/ \ ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/WWW/lynx/lynx2.8.4/ EXTRACT_SUFX= .tar.bz2 @@ -14,7 +14,8 @@ PATCH_SITES= http://lynx.isc.org/lynx2.8.4/patches/ \ ftp://lynx.isc.org/lynx/lynx2.8.4/patches/ \ ftp://ftp.nl.uu.net/pub/unix/www/lynx/lynx2.8.4/patches/ \ ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/WWW/lynx/lynx2.8.4/patches/ -PATCHFILES= lynx2.8.4rel.1a.patch lynx2.8.4rel.1b.patch +PATCHFILES= lynx2.8.4rel.1a.patch lynx2.8.4rel.1b.patch \ + lynx2.8.4rel.1c.patch PATCH_DIST_STRIP= -p1 MAINTAINER= fredb@netbsd.org diff --git a/www/lynx/distinfo b/www/lynx/distinfo index fd3f23d3b2c..f7c1f4e47f1 100644 --- a/www/lynx/distinfo +++ b/www/lynx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/12/31 19:31:07 fredb Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/08/25 21:22:36 jlam Exp $ SHA1 (lynx2.8.4rel.1.tar.bz2) = 11285022fbe6910fb0a47adc14581ceb0c3bfc98 Size (lynx2.8.4rel.1.tar.bz2) = 1940531 bytes @@ -6,5 +6,8 @@ SHA1 (lynx2.8.4rel.1a.patch) = 65473d215a17a80c1c1203c6c35c4fc7c6951a5d Size (lynx2.8.4rel.1a.patch) = 7530 bytes SHA1 (lynx2.8.4rel.1b.patch) = 323edfa079bf8e6ed517e1031a6797ade4fe823a Size (lynx2.8.4rel.1b.patch) = 8939 bytes +SHA1 (lynx2.8.4rel.1c.patch) = 47c9d74c063714b499f03135f3ecba894a037a10 +Size (lynx2.8.4rel.1c.patch) = 9270 bytes SHA1 (patch-aa) = 123ebe71a00dfdd309d54b96f52ea83002d43cb2 +SHA1 (patch-ab) = dd533235a5ee83b946df76d29d26dbbb679f9ccf SHA1 (patch-ae) = ebd644a91ad08060baaf724d44bb03bb2f51a260 diff --git a/www/lynx/patches/patch-ab b/www/lynx/patches/patch-ab new file mode 100644 index 00000000000..fd302eb702b --- /dev/null +++ b/www/lynx/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.3.2.2 2002/08/25 21:22:38 jlam Exp $ + +--- src/LYCurses.c.orig Tue Aug 20 22:33:51 2002 ++++ src/LYCurses.c +@@ -548,9 +548,7 @@ PUBLIC void curses_style ARGS2( + } + #endif /* USE_COLOR_STYLE */ + +-#ifndef USE_SLANG + PRIVATE BOOL lynx_called_initscr = FALSE; +-#endif + + #if HAVE_USE_DEFAULT_COLORS && USE_DEFAULT_COLORS + /* +@@ -1250,7 +1248,7 @@ PUBLIC void stop_curses NOARGS + lynx_nl2crlf(TRUE); + lynx_enable_mouse (0); + #if (!defined(WIN_EX) || defined(__CYGWIN__)) /* @@@ */ +- if(LYscreen) { ++ if(LYscreen || lynx_called_initscr) { + endwin(); /* stop curses */ + LYDELSCR(); + } diff --git a/www/opera6/Makefile b/www/opera6/Makefile index b7ee6ca6728..9a9a35fd502 100644 --- a/www/opera6/Makefile +++ b/www/opera6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8.2.3 2002/06/23 19:04:26 jlam Exp $ +# $NetBSD: Makefile,v 1.8.2.4 2002/08/25 21:22:40 jlam Exp $ DISTNAME= opera-${OPERA_PKG_VERSION} CATEGORIES= www @@ -39,9 +39,9 @@ DEPENDS+= suse_libpng>=6.4:../../emulators/${SUSE_DIR_PREFIX}_libpng DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11 OPERA_ARCH= i386 -OPERA_DIR= 601/final/en/qt_static -OPERA_DIST_VERSION= 6.01-20020523.1-static-qt -OPERA_PKG_VERSION= 6.01 +OPERA_DIR= 602/final/en/qt_static +OPERA_DIST_VERSION= 6.02-20020701.1-static-qt +OPERA_PKG_VERSION= 6.02 .endif RPMFILES= ${DISTFILES} diff --git a/www/opera6/distinfo b/www/opera6/distinfo index 458c8078147..e3036e9f5bc 100644 --- a/www/opera6/distinfo +++ b/www/opera6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3.2.1 2002/06/23 19:04:26 jlam Exp $ +$NetBSD: distinfo,v 1.3.2.2 2002/08/25 21:22:41 jlam Exp $ -SHA1 (./opera-6.01-20020523.1-static-qt.i386.rpm) = 4a2ea0df5979e0b3145bdfa4d0ea15b3cbb64fa7 -Size (./opera-6.01-20020523.1-static-qt.i386.rpm) = 4840045 bytes +SHA1 (./opera-6.02-20020701.1-static-qt.i386.rpm) = 8d043a6340907289011a6be7a3bd3ffa2b740a2a +Size (./opera-6.02-20020701.1-static-qt.i386.rpm) = 4915848 bytes diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index 8c993ae6b40..5d7cf162f81 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10.2.1 2002/06/30 06:24:34 jlam Exp $ +# $NetBSD: Makefile,v 1.10.2.2 2002/08/25 21:22:41 jlam Exp $ -DISTNAME= sitecopy-0.10.15 +DISTNAME= sitecopy-0.11.4 CATEGORIES= www MASTER_SITES= http://www.lyra.org/sitecopy/ diff --git a/www/sitecopy/PLIST b/www/sitecopy/PLIST index 68de7fabb89..8a8761258c2 100644 --- a/www/sitecopy/PLIST +++ b/www/sitecopy/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:49 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/08/25 21:22:42 jlam Exp $ bin/sitecopy man/man1/sitecopy.1 share/doc/sitecopy/FAQ @@ -10,6 +10,7 @@ ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/sitecopy.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sitecopy.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sitecopy.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/sitecopy.mo +${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/sitecopy.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sitecopy.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/sitecopy.mo share/sitecopy/changes.awk diff --git a/www/sitecopy/distinfo b/www/sitecopy/distinfo index 9590922f3f6..70b3c91bcbe 100644 --- a/www/sitecopy/distinfo +++ b/www/sitecopy/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/05/15 23:27:07 jlam Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/08/25 21:22:42 jlam Exp $ -SHA1 (sitecopy-0.10.15.tar.gz) = 810bf312b830366985e9f6182b8379d28f9b3118 -Size (sitecopy-0.10.15.tar.gz) = 627536 bytes -SHA1 (patch-aa) = ebd41e69b9a6c4ba88bb344d8dce67aa669e248f +SHA1 (sitecopy-0.11.4.tar.gz) = 765e40e769e91fff0323e4cae73ad8048b453a2c +Size (sitecopy-0.11.4.tar.gz) = 737326 bytes +SHA1 (patch-aa) = ba1955f8cd86c16bca08872105db91c1532dc882 +SHA1 (patch-ab) = d8ce1af8b87a0d156a1795fef824553f64b22f59 diff --git a/www/sitecopy/patches/patch-aa b/www/sitecopy/patches/patch-aa index 6e46eabf385..6aec080e559 100644 --- a/www/sitecopy/patches/patch-aa +++ b/www/sitecopy/patches/patch-aa @@ -1,15 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/05/15 23:27:07 jlam Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/08/25 21:22:43 jlam Exp $ ---- Makefile.in.orig Wed Feb 14 18:39:36 2001 +--- Makefile.in.orig Mon Jan 14 06:02:02 2002 +++ Makefile.in -@@ -21,8 +21,8 @@ - datadir = $(prefix)/@DATADIRNAME@ - # Previously I had: - # datadir = @datadir@/sitecopy +@@ -15,7 +15,7 @@ + bindir = @bindir@ + mandir = @mandir@ + man1dir = $(mandir)/man1 -docdir = $(prefix)/doc/sitecopy --sc_datadir = $(datadir)/sitecopy +docdir = $(prefix)/share/doc/sitecopy -+sc_datadir = $(prefix)/share/sitecopy - - top_srcdir = @top_srcdir@ - top_builddir = . + localedir = $(datadir)/locale + datadir = @datadir@ + pkgdatadir = $(datadir)/@PACKAGE@ diff --git a/www/sitecopy/patches/patch-ab b/www/sitecopy/patches/patch-ab new file mode 100644 index 00000000000..f0420fc698a --- /dev/null +++ b/www/sitecopy/patches/patch-ab @@ -0,0 +1,14 @@ +$NetBSD: patch-ab,v 1.1.2.2 2002/08/25 21:22:44 jlam Exp $ + +--- src/console_fe.c.orig Mon Jan 14 05:42:21 2002 ++++ src/console_fe.c +@@ -44,6 +44,9 @@ + #ifdef HAVE_ERRNO_H + #include + #endif ++#ifdef HAVE_LOCALE_H ++#include ++#endif + #include + #include + #include diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common index 09e4904f26c..ffe72c38ec2 100644 --- a/www/w3m/Makefile.common +++ b/www/w3m/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4.2.3 2002/06/30 06:24:35 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4.2.4 2002/08/25 21:22:44 jlam Exp $ # DISTNAME= w3m-${W3M_VERS} @@ -95,8 +95,7 @@ CONFIGURE_ENV+= use_cookie=y CONFIGURE_ENV+= use_cookie=n .endif .if ${W3M_USE_SSL} == YES -USE_SSL= YES -CONFIGURE_ENV+= use_ssl=y use_ssl_verify=n +CONFIGURE_ENV+= use_ssl=y use_ssl_verify=y CONFIGURE_ARGS+= --ssl-includedir=${SSLBASE}/include/openssl CONFIGURE_ARGS+= --ssl-libdir=${SSLBASE}/lib .include "../../security/openssl/buildlink2.mk" @@ -111,9 +110,9 @@ CONFIGURE_ENV+= lynx_key=n HELP_W3M= -w3m .endif .if ${W3M_USE_IMAGE} == YES -CONFIGURE_ENV+= use_image=y +CONFIGURE_ENV+= use_image=y .else -CONFIGURE_ENV+= use_image=n +CONFIGURE_ENV+= use_image=n .endif CONFIGURE_ENV+= use_menu=y use_matrix=n use_ansi_color=y CONFIGURE_ENV+= use_help_cgi=n use_migemo=n diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile index 941d49f7301..c55b1f19dcd 100644 --- a/www/wdg-validate/Makefile +++ b/www/wdg-validate/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.4.2.1 2002/07/01 17:45:14 jlam Exp $ +# $NetBSD: Makefile,v 1.4.2.2 2002/08/25 21:22:45 jlam Exp $ # DISTNAME= validate -PKGNAME= wdg-validate-1.0.3 +PKGNAME= wdg-validate-1.0.4 CATEGORIES= www MASTER_SITES= http://www.htmlhelp.com/tools/validator/offline/ -DISTFILES= validate sgml-lib.tar.gz README +DISTFILES= validate sgml-lib-1.0.tar.gz README MAINTAINER= norm@sandbox.org.uk HOMEPAGE= http://www.htmlhelp.com/tools/validator/offline/ @@ -13,8 +13,8 @@ COMMENT= HTML validator from the Web Design Group DEPENDS+= lq-sp>=1.3.4.5:../../textproc/lq-sp -DIST_SUBDIR= wdg-validate -EXTRACT_ONLY= sgml-lib.tar.gz +DIST_SUBDIR= ${PKGNAME} +EXTRACT_ONLY= sgml-lib-1.0.tar.gz USE_BUILDLINK2= YES REPLACE_PERL= validate.netbsd diff --git a/www/wdg-validate/distinfo b/www/wdg-validate/distinfo index a8a537283e4..01a9cf3c14f 100644 --- a/www/wdg-validate/distinfo +++ b/www/wdg-validate/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2002/02/14 16:29:03 abs Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/08/25 21:22:46 jlam Exp $ -SHA1 (wdg-validate/validate) = 1150b3c540f304203e0539c320f3d2b7fd43ad6f -Size (wdg-validate/validate) = 15039 bytes -SHA1 (wdg-validate/sgml-lib.tar.gz) = 57bc51940b873b66af5c585e1c5d314512bd55eb -Size (wdg-validate/sgml-lib.tar.gz) = 159465 bytes -SHA1 (wdg-validate/README) = 0d287e7b41d4c5cb26d22fc22300b229c28ae66a -Size (wdg-validate/README) = 2418 bytes +SHA1 (wdg-validate-1.0.4/validate) = eb9ea352528fa5db2cbedc5ad4dbe59aa91d5e58 +Size (wdg-validate-1.0.4/validate) = 15210 bytes +SHA1 (wdg-validate-1.0.4/sgml-lib-1.0.tar.gz) = 57bc51940b873b66af5c585e1c5d314512bd55eb +Size (wdg-validate-1.0.4/sgml-lib-1.0.tar.gz) = 159465 bytes +SHA1 (wdg-validate-1.0.4/README) = 0d287e7b41d4c5cb26d22fc22300b229c28ae66a +Size (wdg-validate-1.0.4/README) = 2418 bytes SHA1 (patch-aa) = e9759bb7d3b949573a87687cc89ecdc3a8aabf61 diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index 3e33ee7a544..9078bd0bbc8 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7.2.1 2002/06/30 06:24:38 jlam Exp $ +# $NetBSD: Makefile,v 1.7.2.2 2002/08/25 21:22:47 jlam Exp $ # DISTNAME= aterm-0.4.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aterm/} diff --git a/x11/aterm/distinfo b/x11/aterm/distinfo index e754858a026..72ae51eceba 100644 --- a/x11/aterm/distinfo +++ b/x11/aterm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3.2.1 2002/06/23 19:04:54 jlam Exp $ +$NetBSD: distinfo,v 1.3.2.2 2002/08/25 21:22:47 jlam Exp $ SHA1 (aterm-0.4.2.tar.gz) = 8ce3f1fcdc12805068ff5acde6f130a22e1f5b9b Size (aterm-0.4.2.tar.gz) = 312730 bytes @@ -6,3 +6,4 @@ SHA1 (patch-aa) = 59cf8fe42bf4291b2a98c0d95170a02308197645 SHA1 (patch-ab) = 9b4e6785912de338db958e9ad48c4cafcb344270 SHA1 (patch-ac) = 28c79343079680251a013ec3fe364b01f5a5ccac SHA1 (patch-ad) = 0c87ee69672e98189afa2cfdcdd9691a1571f354 +SHA1 (patch-ae) = b4bbe033f29a8ee24cfff511fb59739d3582341d diff --git a/x11/aterm/patches/patch-ae b/x11/aterm/patches/patch-ae new file mode 100644 index 00000000000..20192241526 --- /dev/null +++ b/x11/aterm/patches/patch-ae @@ -0,0 +1,25 @@ +$NetBSD: patch-ae,v 1.1.2.2 2002/08/25 21:22:48 jlam Exp $ + +--- src/command.c.orig Thu Sep 6 18:38:07 2001 ++++ src/command.c +@@ -1146,6 +1146,11 @@ + num_fds = getdtablesize(); + #endif + ++#if defined(__NetBSD__) ++ if (num_fds > FD_SETSIZE) ++ num_fds = FD_SETSIZE; ++#endif ++ + #ifdef META8_OPTION + meta_char = (Options & Opt_meta8 ? 0x80 : 033); + if (rs_modifier +@@ -2024,7 +2029,7 @@ + #endif + + /* See if we can read from the application */ +- if (FD_ISSET(cmd_fd, &readfds)) { ++ if (retval > 0 && FD_ISSET(cmd_fd, &readfds)) { + unsigned int count = BUFSIZ; + + cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; diff --git a/x11/ttmkfdir/Makefile b/x11/ttmkfdir/Makefile index 03d5e36c774..990ae3c67ad 100644 --- a/x11/ttmkfdir/Makefile +++ b/x11/ttmkfdir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1.2.3 2002/06/30 06:24:45 jlam Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.4 2002/08/25 21:22:50 jlam Exp $ # DISTNAME= ttmkfdir diff --git a/x11/ttmkfdir/PLIST b/x11/ttmkfdir/PLIST index c0e6ce148b0..31fabebf405 100644 --- a/x11/ttmkfdir/PLIST +++ b/x11/ttmkfdir/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 19:06:54 jlam Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.3 2002/08/25 21:22:51 jlam Exp $ bin/ttmkfdir diff --git a/x11/ttmkfdir/patches/patch-aa b/x11/ttmkfdir/patches/patch-aa index 4fafa2d39cf..7ffc35187b2 100644 --- a/x11/ttmkfdir/patches/patch-aa +++ b/x11/ttmkfdir/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1.2.2 2002/06/23 19:06:56 jlam Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.3 2002/08/25 21:22:52 jlam Exp $ --- Makefile.orig Sat Jun 8 21:36:43 2002 +++ Makefile Sat Jun 8 21:42:01 2002 diff --git a/x11/ttmkfdir/patches/patch-ab b/x11/ttmkfdir/patches/patch-ab index 88c6d6fc6dd..8696b97077d 100644 --- a/x11/ttmkfdir/patches/patch-ab +++ b/x11/ttmkfdir/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1.2.2 2002/06/23 19:06:57 jlam Exp $ +$NetBSD: patch-ab,v 1.1.1.1.2.3 2002/08/25 21:22:53 jlam Exp $ --- ttmkfdir.c.orig Sat Jun 8 21:37:58 2002 +++ ttmkfdir.c Sat Jun 8 21:38:18 2002 diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index 3bcf01f57f5..9d38a9affbe 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26.2.2 2002/06/30 06:24:48 jlam Exp $ +# $NetBSD: Makefile,v 1.26.2.3 2002/08/25 21:22:54 jlam Exp $ # DISTNAME= fvwm-${PKG_VERSION} @@ -11,7 +11,7 @@ MAINTAINER= martti@netbsd.org HOMEPAGE= http://www.fvwm.org/generated/manpages/xpmroot.html COMMENT= Sets the root window to an Xpm pixmap -PKG_VERSION= 2.4.8 +PKG_VERSION= 2.4.9 USE_BUILDLINK2= YES USE_X11BASE= YES GNU_CONFIGURE= YES diff --git a/x11/xpmroot/distinfo b/x11/xpmroot/distinfo index e9710a0559b..0768391d7db 100644 --- a/x11/xpmroot/distinfo +++ b/x11/xpmroot/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9.2.1 2002/06/23 19:07:23 jlam Exp $ +$NetBSD: distinfo,v 1.9.2.2 2002/08/25 21:22:54 jlam Exp $ -SHA1 (fvwm-2.4.8.tar.gz) = 42e1b90ceab2414536af4ee5de47e90b08b0ce6f -Size (fvwm-2.4.8.tar.gz) = 1716147 bytes +SHA1 (fvwm-2.4.9.tar.gz) = 67da9f8ba8aae0315b18074d1e0ec0e57668e786 +Size (fvwm-2.4.9.tar.gz) = 1721388 bytes -- cgit v1.2.3