update Wed Mar 24 18:37:00 PDT 2010
authorCharlie <root@crater.dragonflybsd.org>
Thu, 25 Mar 2010 01:50:29 +0000 (18:50 -0700)
committerCharlie <root@crater.dragonflybsd.org>
Thu, 25 Mar 2010 01:50:29 +0000 (18:50 -0700)
104 files changed:
audio/snd/Makefile
benchmarks/zelibm/Makefile
cad/geda/Makefile
cross/avr-gcc/Makefile
devel/darcs/Makefile
devel/g-wrap/Makefile
devel/g-wrap/buildlink3.mk
devel/gmp/buildlink3.mk
devel/gnustep-base/Makefile
devel/guile-fcgi/Makefile
devel/guile-gnome/Makefile
devel/guile-gtk/Makefile
devel/guile-gtk/buildlink3.mk
devel/guile-lib/Makefile
devel/guile-slib/Makefile
devel/guile-www/Makefile
devel/php-gmp/Makefile
doc/CHANGES-2010
doc/TODO
editors/TeXmacs/Makefile
filesystems/fuse-afpfs-ng/Makefile
finance/gnucash/Makefile
games/gnome-games/Makefile
geography/proj-swig/Makefile
graphics/graphviz/Makefile
graphics/guile-cairo/Makefile
ham/gnuradio-radio-astronomy/Makefile
ham/gnuradio-usrp/Makefile
ham/usrp-docs/Makefile
ham/usrp/Makefile
ham/usrp/buildlink3.mk
lang/ecl/Makefile
lang/ecl/buildlink3.mk
lang/gcc34/Makefile
lang/gcc44/Makefile
lang/ghc/Makefile
lang/ghc/buildlink3.mk
lang/guile/Makefile
lang/guile/buildlink3.mk
lang/kaffe/Makefile.common
lang/librep/Makefile
lang/librep/buildlink3.mk
lang/maude/Makefile
lang/opencobol/Makefile
lang/smalltalk/Makefile
lang/swi-prolog-lite/Makefile
lang/swi-prolog-lite/buildlink3.mk
lang/swi-prolog-packages/Makefile
lang/yap/Makefile
mail/clamav/Makefile
mail/clamav/buildlink3.mk
mail/p5-Mail-ClamAV/Makefile
mail/spamassassin/INSTALL [new file with mode: 0644]
mail/spamassassin/MESSAGE
mail/spamassassin/Makefile
mail/spamassassin/PLIST
mail/spamassassin/distinfo
mail/spamassassin/options.mk
mail/spamassassin/patches/patch-ab
mail/spamassassin/patches/patch-ba [deleted file]
mail/spamassassin/patches/patch-bc [deleted file]
mail/spamassassin/patches/patch-be [deleted file]
math/genius/Makefile
math/glpk/Makefile
math/glpk/buildlink3.mk
math/libmatheval/Makefile
math/mpfr/Makefile
math/mpfr/buildlink3.mk
math/ntl/Makefile
math/ntl/buildlink3.mk
math/ordCalc/Makefile
math/p5-Math-BigInt-GMP/Makefile
math/p5-Math-BigInt-Pari/Makefile
math/p5-Math-GMP/Makefile
math/p5-Math-Pari/Makefile
math/pari/Makefile
math/pari/buildlink3.mk
math/pspp/Makefile
misc/kdeutils3/Makefile
misc/kdeutils4/Makefile
mk/defaults/options.description
net/dhid/Makefile
net/dhisd/Makefile
net/kdenetwork4/Makefile
net/kismet/Makefile
net/ktorrent-kde3/Makefile
net/ktorrent/Makefile
net/tightvnc/Makefile
net/tightvnc/distinfo
net/tightvnc/patches/patch-ac
pkgtools/mtree/Makefile.common
print/lilypond/Makefile
security/gnutls/Makefile
security/lsh/Makefile
security/sfs/Makefile
security/srp_client/Makefile
security/ssss/Makefile
sysutils/mesure/Makefile
time/gnotime/Makefile
wm/sawfish/Makefile
www/galway/Makefile
x11/rep-gtk2/Makefile
x11/wxhaskell/Makefile
x11/xbindkeys/Makefile

index 054c34e..2b816d0 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2009/12/15 21:30:53 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2010/03/24 19:43:21 asau Exp $
 #
 
 DISTNAME=              snd-9.9
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=snd/}
 
index 7f2ee7f..25fb9b0 100644 (file)
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/03/24 19:43:22 asau Exp $
 #
 
 DISTNAME=              zelibm
 PKGNAME=               zelibm-0
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            benchmarks
 MASTER_SITES=          http://people.redhat.com/drepper/libm/
 
index a8dee28..10572e1 100644 (file)
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.62 2010/03/11 05:57:52 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.63 2010/03/24 19:43:22 asau Exp $
 #
 
 DISTNAME=      geda-gaf-${PKGVERSION}
 PKGNAME=       geda-${PKGVERSION}
 PKGVERSION=    1.6.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    cad
 MASTER_SITES=  ftp://ftp.geda.seul.org/pub/geda/release/v1.6/${PKGVERSION}/ \
                http://geda.seul.org/release/v1.6/${PKGVERSION}/
index c716566..da4ab4e 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2009/12/12 05:02:19 obache Exp $
+# $NetBSD: Makefile,v 1.23 2010/03/24 19:43:22 asau Exp $
 
 DISTNAME=              gcc-4.4.1
 PKGNAME=               avr-gcc-4.4.1
+PKGREVISION=           1
 CATEGORIES=            cross
 MASTER_SITES=          ${MASTER_SITE_GNU:=gcc/releases/${DISTNAME}/}
 EXTRACT_SUFX=          .tar.bz2
index ffd5813..998c9f5 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/01/17 12:02:12 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/03/24 19:43:22 asau Exp $
 
 DISTNAME=              darcs-2.0.2
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            devel scm
 MASTER_SITES=          http://www.darcs.net/
 
index 4b82164..ae4f030 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2009/12/15 21:40:00 joerg Exp $
+# $NetBSD: Makefile,v 1.57 2010/03/24 19:43:22 asau Exp $
 
 DISTNAME=      g-wrap-1.9.12
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  http://savannah.nongnu.org/download/g-wrap/
 
index 6bf0588..2cbd404 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/12/15 21:40:00 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       g-wrap
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        g-wrap
 G_WRAP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.g-wrap+= g-wrap>=1.9.5
-BUILDLINK_ABI_DEPENDS.g-wrap?= g-wrap>=1.9.12nb2
+BUILDLINK_ABI_DEPENDS.g-wrap?= g-wrap>=1.9.12nb3
 BUILDLINK_PKGSRCDIR.g-wrap?=   ../../devel/g-wrap
 
 .include "../../devel/libffi/buildlink3.mk"
index f29e85a..aa58b03 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2010/03/24 21:54:15 asau Exp $
 
 BUILDLINK_TREE+=       gmp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        gmp
 GMP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gmp+=            gmp>=4.2.1
-BUILDLINK_ABI_DEPENDS.gmp+=    gmp>=4.2.1
+BUILDLINK_ABI_DEPENDS.gmp+=    gmp>=5.0.1
 BUILDLINK_PKGSRCDIR.gmp?=      ../../devel/gmp
 .endif # GMP_BUILDLINK3_MK
 
index 44976b1..f0a5a2a 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2009/05/19 08:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/03/24 19:43:22 asau Exp $
 
 DISTNAME=      gnustep-base-1.18.0
+PKGREVISION=   1
 CATEGORIES=    devel gnustep
 MASTER_SITES=  ${MASTER_SITE_GNUSTEP:=core/}
 
index 1cd2404..7df6c8c 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/12/15 21:40:00 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2010/03/24 19:43:22 asau Exp $
 
 DISTNAME=      guile-fcgi-0.1
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    devel www
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 
index 4a3602f..4cf779b 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/03/24 19:43:23 asau Exp $
 
 DISTNAME=      guile-gnome-platform-2.16.1
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    devel
 MASTER_SITES=  http://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/
 
index dc9f1ce..744b72f 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2010/03/24 19:43:23 asau Exp $
 #
 
 DISTNAME=              guile-gtk-0.60
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            devel x11
 MASTER_SITES=          ${MASTER_SITE_GNU:=guile-gtk/}
 
index 2281525..d00e218 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/12/15 21:40:00 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       guile-gtk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        guile-gtk
 GUILE_GTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.guile-gtk+=      guile-gtk>=0.4
-BUILDLINK_ABI_DEPENDS.guile-gtk?=      guile-gtk>=0.60nb3
+BUILDLINK_ABI_DEPENDS.guile-gtk?=      guile-gtk>=0.60nb5
 BUILDLINK_PKGSRCDIR.guile-gtk?=        ../../devel/guile-gtk
 
 .include "../../lang/guile/buildlink3.mk"
index b45c274..2034f36 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2009/12/15 21:40:01 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/03/24 19:43:23 asau Exp $
 
 DISTNAME=      guile-lib-0.1.6
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  http://download.gna.org/guile-lib/
 # http://download.savannah.nongnu.org/releases/guile-lib/
index 1ad3bf1..6f4d0b0 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2009/12/15 21:40:01 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2010/03/24 19:43:23 asau Exp $
 
 DISTNAME=      guile-slib-3.2.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
index 33ca9e7..da14202 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/02/07 16:12:01 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/03/24 19:43:23 asau Exp $
 
 DISTNAME=      guile-www-2.25
+PKGREVISION=   1
 CATEGORIES=    devel www
 MASTER_SITES=  http://www.gnuvola.org/software/guile-www/
 
index 4b1b065..cdf9720 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/03/03 07:32:26 taca Exp $
+# $NetBSD: Makefile,v 1.11 2010/03/24 19:43:23 asau Exp $
 
 MODNAME=               gmp
+PKGREVISION=           1
 CATEGORIES+=           devel math
 COMMENT=               PHP extension for arbitrary precision math
 
index a79aeab..b7336a6 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.1369 2010/03/24 17:06:09 martti Exp $
+$NetBSD: CHANGES-2010,v 1.1371 2010/03/24 21:43:52 heinz Exp $
 
 [Please note that pkgsrc is in a freeze in preparation for the
 pkgsrc-2010Q1 branch right now.  No new packages in pkgsrc, please,
@@ -1622,3 +1622,5 @@ Changes to the packages collection and infrastructure in 2010:
        Updated www/ja-trac to 0.11.7pl1 [obache 2010-03-24]
        Updated net/tnftpd to 20100324 [lukem 2010-03-24]
        Updated editors/vim-share to 7.2.411 [martti 2010-03-24]
+       Updated net/tightvnc to 1.3.10nb4 [sbd 2010-03-24]
+       Updated mail/spamassassin to 3.3.1 [heinz 2010-03-24]
index 2a9e917..dcc2197 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.9154 2010/03/22 11:25:39 obache Exp $
+$NetBSD: TODO,v 1.9155 2010/03/24 21:43:52 heinz Exp $
 
 Suggested new packages
 ======================
@@ -1240,7 +1240,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o sope-4.6
        o source-highlight-3.1.3
        o sox-14.2.0
-       o spamassassin-3.3.1 [heinz]
        o spcaview-20060501
        o spim-7.4
        o sqlitemanager-1.2.4
index 713a0d1..19c80b5 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2010/02/10 19:17:37 joerg Exp $
+# $NetBSD: Makefile,v 1.86 2010/03/24 19:43:23 asau Exp $
 
 DISTNAME=              TeXmacs-1.0.6.15-src
 PKGNAME=               ${DISTNAME:S/-src//}
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            editors
 MASTER_SITES=          ftp://ftp.texmacs.org/pub/TeXmacs/targz/
 MASTER_SITES+=         http://www.texmacs.org/Download/ftp/targz/
index d8abdda..fbbaee6 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/07/08 16:24:53 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/03/24 19:43:23 asau Exp $
 
 DISTNAME=      afpfs-ng-0.8.1
 PKGNAME=       fuse-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=afpfs-ng/}
 EXTRACT_SUFX=  .tar.bz2
index dd3e81f..4885cdb 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.140 2010/01/18 09:58:49 wiz Exp $
+# $NetBSD: Makefile,v 1.141 2010/03/24 19:43:23 asau Exp $
 #
 
 DISTNAME=              gnucash-2.2.9
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            finance
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=gnucash/}
 
index 5157c86..452b1d6 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2010/02/10 19:17:38 joerg Exp $
+# $NetBSD: Makefile,v 1.108 2010/03/24 19:43:24 asau Exp $
 
 DISTNAME=              gnome-games-2.28.2
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            games gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-games/2.28/}
 EXTRACT_SUFX=          .tar.bz2
index 738f1cc..6432bd1 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/03/14 16:32:15 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/03/24 19:43:24 asau Exp $
 #
 
 DISTNAME=              proj-swig-0.02
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            geography
 MASTER_SITES=          http://acert.ir.bbn.com/downloads/acert-geospatial/
 
index e614c7c..662b5d7 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2010/03/24 19:43:24 asau Exp $
 
 DISTNAME=      graphviz-2.24.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
index becf9f2..33ebcd7 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/12/15 21:48:01 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/03/24 19:43:24 asau Exp $
 #
 
 DISTNAME=      guile-cairo-1.4.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics
 MASTER_SITES=  http://download.gna.org/guile-cairo/
 
index 3f29177..873b265 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/03/24 19:43:24 asau Exp $
 
 PKGNAME=       gnuradio-radio-astronomy-${VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       GNU Radio module for radio astronomy
 
 PKG_DESTDIR_SUPPORT=   user-destdir
index 447a433..b225a67 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/12/15 21:50:13 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/03/24 19:43:24 asau Exp $
 
 PKGNAME=       gnuradio-usrp-${VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       USRP bindings for GNU Radio
 
 PKG_DESTDIR_SUPPORT=   user-destdir
index 75f1adc..cad1d0c 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/12/15 21:50:13 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2010/03/24 19:43:25 asau Exp $
 
 PKGNAME=       usrp-docs-${VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       Documentation for the usrp module
 
 PKG_DESTDIR_SUPPORT=   user-destdir
index 38f8ac3..06f6283 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2009/12/15 21:50:13 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/03/24 19:43:24 asau Exp $
 
 PKGNAME=       usrp-${VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       Non GNU Radio specific part of the USRP code base
 
 PKG_DESTDIR_SUPPORT=   user-destdir
index ed90e5e..0e856ea 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/08/12 12:21:41 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       usrp
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=        usrp
 USRP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.usrp+=   usrp>=3.0.4
+BUILDLINK_ABI_DEPENDS.usrp?=   usrp>=3.2nb2
 BUILDLINK_PKGSRCDIR.usrp?=     ../../ham/usrp
 
 .include "../../ham/gnuradio-core/buildlink3.mk"
index 03c3150..924c410 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/03/15 05:20:13 asau Exp $
+# $NetBSD: Makefile,v 1.9 2010/03/24 19:43:25 asau Exp $
 #
 
 DISTNAME=              ecl-10.3.1
+PKGREVISION=           1
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ecls/}
 EXTRACT_SUFX=          .tgz
index 91e3e6c..c48e1eb 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/03/15 05:20:13 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       ecl
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=        ecl
 ECL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ecl+=    ecl>=10.3.1
+BUILDLINK_ABI_DEPENDS.ecl?=    ecl>=10.3.1nb1
 BUILDLINK_PKGSRCDIR.ecl?=      ../../lang/ecl
 
 .include "../../devel/boehm-gc/buildlink3.mk"
index 973f84d..2057d5b 100644 (file)
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2009/06/16 15:25:31 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2010/03/24 19:43:25 asau Exp $
 #
 
 DISTNAME=      gcc-${GCC_VERSION}
 PKGNAME=       gcc34-${GCC_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=  .tar.bz2
index 4f2567a..b648980 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/03/15 08:27:06 adam Exp $
+# $NetBSD: Makefile,v 1.12 2010/03/24 19:43:25 asau Exp $
 #
 
 DISTNAME=              gcc-${GCC_VERSION}
 PKGNAME=               gcc44-${GCC_VERSION}
+PKGREVISION=           1
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=          .tar.bz2
index c9593eb..4d99e41 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2009/05/20 00:58:18 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/03/24 19:43:25 asau Exp $
 
 DISTNAME=      ghc-6.8.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  http://www.haskell.org/ghc/dist/6.8.3/
 DISTFILES=     ghc-6.8.3-src.tar.bz2 \
index ed2479f..48837d1 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/05/20 00:58:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       ghc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ghc
 GHC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ghc+=    ghc>=6.8.3
-BUILDLINK_ABI_DEPENDS.ghc?=    ghc>=6.8.3nb1
+BUILDLINK_ABI_DEPENDS.ghc?=    ghc>=6.8.3nb2
 BUILDLINK_PKGSRCDIR.ghc?=      ../../lang/ghc
 
 BUILDLINK_DEPMETHOD.ghc?=      build
index 62ca4a9..6129d28 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2009/12/15 23:41:45 joerg Exp $
+# $NetBSD: Makefile,v 1.94 2010/03/24 19:43:25 asau Exp $
 
 DISTNAME=              guile-1.8.7
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_GNU:=guile/}
 
index 492d55d..8f7432f 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/05/20 00:58:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       guile
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        guile
 GUILE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.guile+=  guile>=1.8.1
-BUILDLINK_ABI_DEPENDS.guile+=  guile>=1.8.6nb4
+BUILDLINK_ABI_DEPENDS.guile+=  guile>=1.8.7nb2
 BUILDLINK_PKGSRCDIR.guile?=    ../../lang/guile
 
 .include "../../devel/gmp/buildlink3.mk"
index 4f5fb6a..b77bc5f 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.20 2009/12/14 18:32:08 joerg Exp $
+# $NetBSD: Makefile.common,v 1.21 2010/03/24 19:43:25 asau Exp $
 
 DISTNAME=              kaffe-1.1.7
+PKGREVISION=           1
 CATEGORIES=            lang java
 MASTER_SITES=          ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
 
index f55950a..39964f0 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2009/07/14 10:01:28 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2010/03/24 19:43:25 asau Exp $
 #
 
 DISTNAME=              librep-0.90.0
+PKGREVISION=           1
 CATEGORIES=            lang devel
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=librep/}
 EXTRACT_SUFX=          .tar.bz2
index 627b6fe..bdd5085 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/07/14 10:01:28 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       librep
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=        librep
 LIBREP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.librep+= librep>=0.90.0
+BUILDLINK_ABI_DEPENDS.librep?= librep>=0.90.0nb1
 BUILDLINK_PKGSRCDIR.librep?=   ../../lang/librep
 MAKE_FLAGS+=                   rep_LIBTOOL=${LIBTOOL:Q}
 
index 62551fb..d641078 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2009/03/06 09:55:30 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/03/24 19:43:25 asau Exp $
 #
 
 DISTNAME=      Maude-2.3
 PKGNAME=       maude-2.3
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://maude.cs.uiuc.edu/download/ \
                http://maude.cs.uiuc.edu/download/current/
index 611f25d..fd945b7 100644 (file)
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2009/12/15 23:41:46 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/03/24 19:43:25 asau Exp $
 #
 
 DISTNAME=              open-cobol-0.32
 PKGNAME=               opencobol-0.32
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=open-cobol/}
 
index 11ccc48..8db1aa3 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2010/01/21 06:21:07 asau Exp $
+# $NetBSD: Makefile,v 1.50 2010/03/24 19:43:26 asau Exp $
 
 DISTNAME=      smalltalk-3.1
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=smalltalk/}
 
index 465c86a..de41bb1 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/02/10 21:56:40 asau Exp $
+# $NetBSD: Makefile,v 1.16 2010/03/24 19:43:26 asau Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               swi-prolog-lite-${SWIPLVERS}
+PKGREVISION=           1
 
 MAINTAINER=            pkgsrc-users@NetBSD.org
 COMMENT=               ISO/Edinburgh-style Prolog compiler
index 9203479..bb60fa8 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2010/02/10 21:56:41 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       swi-prolog-lite
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=        swi-prolog-lite
 SWI_PROLOG_LITE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.swi-prolog-lite+=        swi-prolog-lite>=5.2.9
+BUILDLINK_ABI_DEPENDS.swi-prolog-lite?=        swi-prolog-lite>=5.9.7nb1
 BUILDLINK_PKGSRCDIR.swi-prolog-lite?=  ../../lang/swi-prolog-lite
 
 .include "../../devel/ncurses/buildlink3.mk"
index fca72ea..61fc823 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2010/02/11 01:06:58 asau Exp $
+# $NetBSD: Makefile,v 1.24 2010/03/24 19:43:26 asau Exp $
 
 .include "../../lang/swi-prolog-lite/Makefile.common"
 
 PKGNAME=               swi-prolog-packages-${SWIPLVERS}
+PKGREVISION=           1
 
 MAINTAINER=            pkgsrc-users@NetBSD.org
 COMMENT=               Packages for SWI Prolog
index e6625d3..86168a7 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/02/11 20:43:49 asau Exp $
+# $NetBSD: Makefile,v 1.8 2010/03/24 19:43:26 asau Exp $
 #
 
 DISTNAME=              Yap-5.1.3
+PKGREVISION=           1
 CATEGORIES=            lang
 # MASTER_SITES=                ${MASTER_SITE_SOURCEFORGE:=yap/}
 MASTER_SITES=          http://www.dcc.fc.up.pt/~vsc/Yap/current/
index 565756d..910eb80 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.99 2010/03/21 16:29:40 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2010/03/24 19:43:26 asau Exp $
 
 DISTNAME=      clamav-${CLAMAV_VERSION}
 PKGNAME=       clamav-${CLAMAV_VERSION:S/-/./}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clamav/}
 
index ac5930d..41a47ae 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/12/15 21:54:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       clamav
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=        clamav
 CLAMAV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.clamav+= clamav>=0.95.3nb1
+BUILDLINK_ABI_DEPENDS.clamav?= clamav>=0.95.3nb2
 BUILDLINK_PKGSRCDIR.clamav?=   ../../mail/clamav
 
 .include "../../archivers/bzip2/buildlink3.mk"
index ec37780..9640294 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/01/17 12:02:25 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/03/24 19:43:26 asau Exp $
 
 DISTNAME=      Mail-ClamAV-0.29
 PKGNAME=       p5-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Mail/}
 
diff --git a/mail/spamassassin/INSTALL b/mail/spamassassin/INSTALL
new file mode 100644 (file)
index 0000000..a445277
--- /dev/null
@@ -0,0 +1,8 @@
+# $NetBSD: INSTALL,v 1.1 2010/03/24 21:41:10 heinz Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+       sa-update --verbose --install @RULESARCHIVE@
+       ;;
+esac
+
index a2ac941..8d30433 100644 (file)
@@ -1,16 +1,21 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.11 2007/05/02 15:20:45 heinz Exp $
+$NetBSD: MESSAGE,v 1.12 2010/03/24 21:41:10 heinz Exp $
 
-If you upgrade from an earlier version *PLEASE* take a look at the file
-UPGRADE in
+IMPORTANT: The spamassassin package provided by pkgsrc contains the rules
+IMPORTANT: available at the time of the official SpamAssassin release.
+IMPORTANT: You have to decide when/how to update them, see the documentation
+IMPORTANT: for 'sa-update'.
 
-        ${PREFIX}/share/doc/spamassassin/
+If you upgrade from an earlier version please take a look at the documents
+in
 
-Some configuration options were changed and some features are now provided
-by plugins (they may not be enabled after installation).
+        ${PREFIX}/share/doc/spamassassin/
 
 For more information see 'perldoc Mail::SpamAssassin::Conf' and the man
-pages for 'spamassassin', 'spamd'/'spamc', 'sa-learn', 'sa-update' and
+pages for 'spamassassin', 'spamd''spamc', 'sa-learn', 'sa-update' and
 'sa-compile'.
+If you want to compile the rules, you may have to increase the data
+segment size for the 'sa-compile' process.
+
 Please check that your existing mail configuration still works.
 ===========================================================================
index f2338cb..ca750cc 100644 (file)
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.96 2010/01/02 03:48:40 heinz Exp $
+# $NetBSD: Makefile,v 1.97 2010/03/24 21:41:10 heinz Exp $
 
-DISTNAME=      Mail-SpamAssassin-3.2.5
-PKGNAME=       spamassassin-3.2.5
-PKGREVISION=   4
+DISTNAME=      Mail-SpamAssassin-3.3.1
+PKGNAME=       spamassassin-3.3.1
 SVR4_PKGNAME=  sa
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:=spamassassin/source/}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=    ${RULESARCHIVE}
+DISTFILES+=    ${RULESARCHIVEASC}
+DISTFILES+=    ${RULESARCHIVESHA}
+EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=    heinz@NetBSD.org
 HOMEPAGE=      http://spamassassin.apache.org/
@@ -17,20 +21,29 @@ PKG_INSTALLATION_TYPES=     overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
 
-DEPENDS+=      p5-Net-DNS>=0.34:../../net/p5-Net-DNS
-DEPENDS+=      p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser
-DEPENDS+=      p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
-DEPENDS+=      {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64
-DEPENDS+=      p5-libwww-[0-9]*:../../www/p5-libwww
+RULESARCHIVE=  Mail-SpamAssassin-rules-3.3.1.r923114.tgz
+RULESARCHIVEASC=${RULESARCHIVE}.asc
+RULESARCHIVESHA=${RULESARCHIVE}.sha1
+FILES_SUBST+=  RULESARCHIVE=${RULESDIR}/${RULESARCHIVE}
+PLIST_SUBST+=   RULESARCHIVE=${RULESARCHIVE:Q}
+PLIST_SUBST+=   RULESARCHIVEASC=${RULESARCHIVEASC:Q}
+PLIST_SUBST+=   RULESARCHIVESHA=${RULESARCHIVESHA:Q}
+
+DEPENDS+=      gnupg-[0-9]*:../../security/gnupg
 DEPENDS+=      p5-Archive-Tar>=1.23:../../archivers/p5-Archive-Tar
+DEPENDS+=      p5-DB_File-[0-9]*:../../databases/p5-DB_File
+DEPENDS+=      p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
+DEPENDS+=      p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser
 DEPENDS+=      p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress
 DEPENDS+=      p5-IO-Zlib>=1.04:../../devel/p5-IO-Zlib
-DEPENDS+=      gnupg-[0-9]*:../../security/gnupg
-DEPENDS+=      p5-DB_File-[0-9]*:../../databases/p5-DB_File
+DEPENDS+=      p5-NetAddr-IP>=4.007:../../net/p5-NetAddr-IP
+DEPENDS+=      p5-Net-DNS>=0.58:../../net/p5-Net-DNS
+DEPENDS+=      {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64
+DEPENDS+=      p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes
+DEPENDS+=      p5-libwww-[0-9]*:../../www/p5-libwww
 
 USE_TOOLS+=    perl
 
-
 CONFLICTS=             p5-Mail-SpamAssassin-[0-9]*
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}
@@ -46,14 +59,14 @@ SPAMASSASSIN_CONTACT_ADDRESS?=      postmaster
 BUILD_DEFS+=           SPAMASSASSIN_CONTACT_ADDRESS
 BUILD_DEFS+=           VARBASE
 
-PLIST_ADD=             ${WRKSRC}/.PLIST_ADD
-PLIST_SRC=             ${PKGDIR}/PLIST ${PLIST_ADD}
+DYNAMIC_PLIST=         ${WRKSRC}/.PLIST_ADD
+PLIST_SRC=             ${PKGDIR}/PLIST ${DYNAMIC_PLIST}
 PERL5_PACKLIST=                auto/Mail/SpamAssassin/.packlist
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_DIRS=                spamc
-BUILD_DIRS=            .
+BUILD_DIRS=            .  # build at the top-level directory, not in "spamc"
 PERL5_CONFIGURE=       NO # we need the default "do-configure" target
 PERL5_CONFIGURE_DIRS=  ${WRKSRC}
 
@@ -65,8 +78,12 @@ MAKE_PARAMS+=                DEFRULESDIR="${RULESDIR}"
 MAKE_PARAMS+=          LOCALRULESDIR="${PKG_SYSCONFDIR}"
 MAKE_PARAMS+=          LOCALSTATEDIR="${VARBASE}/spamassassin"
 MAKE_PARAMS+=          PERL_BIN="${PERL5}"
+MAKE_PARAMS+=          PERL_WARN=yes
+MAKE_PARAMS+=          PERL_TAINT=yes
 MAKE_PARAMS+=          SYSCONFDIR="${PKG_SYSCONFDIR}"
 
+TEST_MAKE_FLAGS=       HOME=${HOME}  # for test t/razor2.t
+
 RCD_SCRIPTS=           spamd
 RCD_SCRIPT_SRC.spamd=  ${WRKSRC}/spamd/netbsd-rc-script.sh
 
@@ -77,12 +94,12 @@ DOCDIR=                     ${PREFIX}/${DOC_SUBDIR}
 RULE_SUBDIR=           share/spamassassin
 RULESDIR=              ${PREFIX}/${RULE_SUBDIR}
 
-PRE_FILES=             init.pre v310.pre v312.pre v320.pre
+PRE_FILES=             init.pre v310.pre v312.pre v320.pre v330.pre
 .for p in ${PRE_FILES}
 CONF_FILES+=           ${EGDIR}/${p}  ${PKG_SYSCONFDIR}/${p}
 .endfor
 CONF_FILES+=           ${EGDIR}/local.cf  ${PKG_SYSCONFDIR}/local.cf   \
-                       ${RULESDIR}/user_prefs.template         \
+                       ${RULESDIR}/user_prefs.template                 \
                          ${PKG_SYSCONFDIR}/user_prefs.template
 
 SA_INSTALLDIRS=                ${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/ldap
@@ -94,6 +111,7 @@ SA_DOCFILES+=                CREDITS PACKAGING Changes
 SA_DOCFILES+=          ldap/README ldap/README.testing ldap/sa_test.ldif
 SA_DOCFILES+=          rules/STATISTICS-set0.txt rules/STATISTICS-set1.txt
 SA_DOCFILES+=          rules/STATISTICS-set2.txt rules/STATISTICS-set3.txt
+SA_DOCFILES+=          rules/sa-update-pubkey.txt
 SA_DOCFILES+=          spamc/README.qmail
 SA_DOCFILES+=          sample-nonspam.txt sample-spam.txt
 SA_DOCFILES+=          spamd/README spamd/README.vpopmail
@@ -106,6 +124,7 @@ OWN_DIRS+=          ${VARBASE}/spamassassin
 OWN_DIRS_PERMS+=       ${PKG_SYSCONFDIR}/sa-update-keys ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 
 SUBST_CLASSES+=                sa2
+SUBST_MESSAGE.sa2=     Setting correct paths for pkgsrc (part 1)
 SUBST_STAGE.sa2=       pre-configure
 SUBST_FILES.sa2=       README spamd/spamd.raw
 SUBST_SED.sa2=         -e s!@@PREFIX@@!${PREFIX}!g
@@ -113,6 +132,7 @@ SUBST_SED.sa2+=             -e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g
 SUBST_SED.sa2+=                -e s!@VARBASE@!${VARBASE}!g
 
 SUBST_CLASSES+=                sa3
+SUBST_MESSAGE.sa3=     Setting correct paths for pkgsrc (part 2)
 SUBST_STAGE.sa3=       pre-configure
 SUBST_FILES.sa3=       INSTALL UPGRADE USAGE ldap/README
 SUBST_FILES.sa3+=      spamc/README.qmail spamc/spamc.pod
@@ -136,7 +156,7 @@ INTERPRETER_SUPPORT=        YES
 .endif
 
 # These variables are substituted in netbsd-rc-script.sh.
-FILES_SUBST+=          INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT:Q}
+FILES_SUBST+=          INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT}
 FILES_SUBST+=          OPSYS=${OPSYS}
 
 INSTALLATION_DIRS+=    ${SA_INSTALLDIRS}
@@ -144,28 +164,31 @@ INSTALLATION_DIRS+=       ${SA_INSTALLDIRS}
 pre-configure: perl5-configure
        # GNU configure needs version.h -> create it
        cd ${WRKSRC}/spamc && ${PERL5} ./version.h.pl
-       # values will be set via the SUBST framework in options.mk
+       # values in 'config' will be set via the SUBST framework in options.mk
        ${CP} ${WRKSRC}/t/config.dist ${WRKSRC}/t/config
 
 post-install:
-       ${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; :
+       ${TEST} -r ${DYNAMIC_PLIST} && ${RM} ${DYNAMIC_PLIST} ; :
 .for f in ${SA_DOCFILES}
        ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
-       ${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD}
+       ${ECHO} "${DOC_SUBDIR}/${f}" >> ${DYNAMIC_PLIST}
 .endfor
 
        set -e ; cd ${WRKSRC}/rules;                                    \
-       for f in [0-9]*.cf; do                                          \
-               ${ECHO} "${RULE_SUBDIR}/$$f" >> ${PLIST_ADD};           \
-       done;                                                           \
        for f in ${PRE_FILES}; do                                       \
                ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR} &&             \
-               ${ECHO} "${EG_SUBDIR}/$$f" >> ${PLIST_ADD};             \
+               ${ECHO} "${EG_SUBDIR}/$$f" >> ${DYNAMIC_PLIST};         \
        done
        # examples are in the static PLIST
        ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVE}       \
+               ${DESTDIR}${RULESDIR}
+       ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVEASC}    \
+               ${DESTDIR}${RULESDIR}
+       ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVESHA}    \
+               ${DESTDIR}${RULESDIR}
 
 # make sure we install the patched version of init.pre but can run the
 # tests with the original file
index 09bfdf3..78ecbfc 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2007/05/02 15:20:45 heinz Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/03/24 21:41:10 heinz Exp $
 @comment Most of this PLIST is auto-generated; see Makefile.
 share/examples/rc.d/spamd
 share/examples/spamassassin/local.cf
@@ -7,3 +7,6 @@ share/examples/spamassassin/procmailrc.example
 share/spamassassin/languages
 share/spamassassin/sa-update-pubkey.txt
 share/spamassassin/user_prefs.template
+share/spamassassin/${RULESARCHIVE}
+share/spamassassin/${RULESARCHIVEASC}
+share/spamassassin/${RULESARCHIVESHA}
index 037ab03..6239506 100644 (file)
@@ -1,12 +1,18 @@
-$NetBSD: distinfo,v 1.51 2010/01/02 03:48:40 heinz Exp $
+$NetBSD: distinfo,v 1.52 2010/03/24 21:41:10 heinz Exp $
 
-SHA1 (Mail-SpamAssassin-3.2.5.tar.gz) = 14b1f6eae0221a152176f7f597f55581445e800a
-RMD160 (Mail-SpamAssassin-3.2.5.tar.gz) = 5a72a97d124e72ff4da1627982748377f1e34128
-Size (Mail-SpamAssassin-3.2.5.tar.gz) = 1223706 bytes
-SHA1 (patch-ab) = debb4851d063404e0a59557603cc08b259050b26
+SHA1 (Mail-SpamAssassin-3.3.1.tar.gz) = 8b32a857cc89c8d057442400bc00f33fd703ce06
+RMD160 (Mail-SpamAssassin-3.3.1.tar.gz) = 154fb16de88b3cc9fac41f721af21b181a2368f3
+Size (Mail-SpamAssassin-3.3.1.tar.gz) = 1196842 bytes
+SHA1 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = 7aeeb7abb2d727bb35d3a0927a1390ad3cddad59
+RMD160 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = 9b6e17e05b3a323ba820ec2dc432d8b7dfc4d0ac
+Size (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = 255548 bytes
+SHA1 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.asc) = 3e11775118e0e4be5720fdc3b99661e187943fd8
+RMD160 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.asc) = bc9c1755977c0b8677a3a8e700068f0e7288f434
+Size (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.asc) = 823 bytes
+SHA1 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 949b64216a6bb6833bd4f2ccab18b53719dda311
+RMD160 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 8b6c82596c158e5e010643a4d16a987dcc65244c
+Size (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 84 bytes
+SHA1 (patch-ab) = 84ebc0f611365c00205a85cb84970772a0931ef8
 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
 SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
 SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424
-SHA1 (patch-ba) = ea6b8eac3d9475641725dc4aa1e7a4d31912a044
-SHA1 (patch-bc) = 71fcf6297eacbd69a5c5d5b1911f648e4011ce3e
-SHA1 (patch-be) = 42b9975742834e836159b754f4a50a0d68d8ea75
index 87f57f5..d9fb731 100644 (file)
-# $NetBSD: options.mk,v 1.8 2009/03/07 13:25:19 seb Exp $
+# $NetBSD: options.mk,v 1.9 2010/03/24 21:41:10 heinz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.spamassassin
 PKG_SUPPORTED_OPTIONS= inet6
-PKG_SUPPORTED_OPTIONS+=        online-tests
-PKG_SUPPORTED_OPTIONS+=        spamassassin-perl-warnings
-PKG_SUPPORTED_OPTIONS+=        spamassassin-taint-checks
-PKG_SUPPORTED_OPTIONS+=        spamassassin-test-awl-sql
-PKG_SUPPORTED_OPTIONS+=        spamassassin-test-bayes-sql
-PKG_SUPPORTED_OPTIONS+=        spamassassin-test-prefork
 PKG_SUPPORTED_OPTIONS+=        ssl
 
-PKG_OPTIONS_LEGACY_OPTS+=      awl-sql-tests:spamassassin-test-awl-sql
-PKG_OPTIONS_LEGACY_OPTS+=      bayes-sql-tests:spamassassin-test-bayes-sql
-PKG_OPTIONS_LEGACY_OPTS+=      net-tests:online-tests
-PKG_OPTIONS_LEGACY_OPTS+=      perl-taint-checks:spamassassin-taint-checks
-PKG_OPTIONS_LEGACY_OPTS+=      perl-warnings:spamassassin-perl-warnings
-PKG_OPTIONS_LEGACY_OPTS+=      spamassassin-test-net:online-tests
-
 #
 # Default options
 #
-PKG_SUGGESTED_OPTIONS= inet6 spamassassin-taint-checks
-PKG_SUGGESTED_OPTIONS+=        spamassassin-perl-warnings ssl
+PKG_SUGGESTED_OPTIONS= inet6 ssl
 
 .include "../../mk/bsd.options.mk"
 
 #
-# change t/config according to all the options
+# change t/config according to enable/disable software options
 #
+AWL_SQL_TEST?=         n  # to  enable tests, set to 'y' on make command line
+BAYES_SQL_TEST?=       n  # to  enable tests, set to 'y' on make command line
+LONG_TEST?=            y  # to disable tests, set to 'n' on make command line
+NET_TEST?=             y  # to disable tests, set to 'n' on make command line
+PREFORK_TEST?=         n  # to  enable tests, set to 'y' on make command line
+ROOT_TEST?=            n  # to  enable tests, set to 'y' on make command line
+
 SUBST_CLASSES+=                satests
 SUBST_STAGE.satests=   post-configure
 SUBST_FILES.satests=   t/config
 SUBST_SED.satests=     -e s!awl_sql_tests=n!awl_sql_tests=${AWL_SQL_TEST}!
 SUBST_SED.satests+=    -e s!bayes_sql_tests=n!bayes_sql_tests=${BAYES_SQL_TEST}!
+SUBST_SED.satests+=    -e s!run_long_tests=n!run_long_tests=${LONG_TEST}!
 SUBST_SED.satests+=    -e s!run_net_tests=n!run_net_tests=${NET_TEST}!
+SUBST_SED.satests+=    -e s!run_root_tests=n!run_root_tests=${ROOT_TEST}!
 SUBST_SED.satests+=    -e s!prefork_stress_test=n!prefork_stress_test=${PREFORK_TEST}!
 
-#
-# Enable tests of the SQL storage module for the automatic whitelist
-# (AWL). This option enables interactive questions about the database
-# configuration during 'configure' phase.
-#
-.if !empty(PKG_OPTIONS:Mspamassassin-test-awl-sql)
-AWL_SQL_TEST=y
-.else
-AWL_SQL_TEST=n
-.endif
-
-#
-# Enable tests of the SQL storage module for Bayes information.
-# This option enables interactive questions about the database
-# configuration during 'configure' phase.
-#
-.if !empty(PKG_OPTIONS:Mspamassassin-test-bayes-sql)
-BAYES_SQL_TEST=y
-.else
-BAYES_SQL_TEST=n
-.endif
-
-#
-# Enable Internet based tests during 'make test' (Razor, Pyzor, etc.)
-#
-.if !empty(PKG_OPTIONS:Monline-tests)
-NET_TEST=y
-.else
-NET_TEST=n
-.endif
-
-#
-# Enable Perl warnings in spamd and spamassassin
-#
-.if !empty(PKG_OPTIONS:Mspamassassin-perl-warnings)
-MAKE_PARAMS+=          PERL_WARN=yes
-.else
-MAKE_PARAMS+=          PERL_WARN=no
-.endif
-
-#
-# Enable Perl taint checks in spamd and spamassassin to improve security
-#
-.if !empty(PKG_OPTIONS:Mspamassassin-taint-checks)
-MAKE_PARAMS+=          PERL_TAINT=yes
-.else
-MAKE_PARAMS+=          PERL_TAINT=no
-.endif
-
-#
-# Enable spamd prefork stress test (will kill any processes containing the
-# string 'spam child' in their process title).
-#
-.if !empty(PKG_OPTIONS:Mspamassassin-test-prefork)
-PREFORK_TEST=y
-.else
-PREFORK_TEST=n
-.endif
-
 #
 # Build spamc and spamd with support for connections over SSL
 #
index e7b871c..ca6de75 100644 (file)
@@ -1,34 +1,21 @@
-$NetBSD: patch-ab,v 1.15 2010/01/01 13:55:32 heinz Exp $
-
-  - deal with internal changes of ExtUtils::MakeMaker and how SpamAssassin
-    (ab)used those internals regarding DESTDIR support. Will not be necessary
-    starting with SA 3.3.0.
+$NetBSD: patch-ab,v 1.16 2010/03/24 21:41:11 heinz Exp $
 
   - enable build of qmail-spamc
   - some files (local.cf, *.pre) are managed by pkgsrc, disable
     their installation.
   - pkgsrc creates B_DATADIR, so there is no need to re-set permissions
 
---- Makefile.PL.orig   2008-06-10 09:21:07.000000000 +0000
+--- Makefile.PL.orig   2009-08-09 23:01:31.000000000 +0200
 +++ Makefile.PL
-@@ -143,7 +143,7 @@ $mm_knows_destdir    = $ExtUtils::MakeMa
- $mm_has_good_destdir = $mm_version >= 6.11;
- # Add DESTDIR hack only if it's requested (and necessary)
- $mm_needs_destdir    = $opt{'destdir'} && !$mm_has_good_destdir;
--$mm_has_destdir      = $mm_knows_destdir || $mm_needs_destdir;
-+$mm_has_destdir      = $mm_has_good_destdir || $mm_needs_destdir;
- push(@ATT_KEYS, 'DESTDIR') if $mm_needs_destdir;
- # Now make EU::MM understand our extended vars
-@@ -174,6 +174,7 @@ my %makefile = (
+@@ -138,6 +138,7 @@ my %makefile = (
        'spamassassin.raw' => 'spamassassin',
        'sa-learn.raw'     => 'sa-learn',
        'sa-update.raw'    => 'sa-update',
 +      'spamc/qmail-spamc.c' => 'spamc/qmail-spamc$(EXE_EXT)',
-       'sa-compile.raw'    => 'sa-compile',
-       'spamc/spamc.c'    => 'spamc/spamc$(EXE_EXT)',
-       'spamd/spamd.raw'  => 'spamd/spamd',
-@@ -1201,17 +1202,19 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
+       'sa-compile.raw'   => 'sa-compile',
+       'sa-awl.raw'       => 'sa-awl',
+       'sa-check_spamd.raw' => 'sa-check_spamd',
+@@ -1095,18 +1096,20 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
  
  conf__install:
        -$(MKPATH) $(B_CONFDIR)
@@ -37,12 +24,14 @@ $NetBSD: patch-ab,v 1.15 2010/01/01 13:55:32 heinz Exp $
 -      $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
 -      $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
 -      $(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}"
+-      $(PERL) -MFile::Copy -e "copy(q{rules/v330.pre}, q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}"
 +      @ # manage local.cf and *.pre through pkgsrc .mk files
 +      @ # $(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}"
 +      @ # $(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
 +      @ # $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
 +      @ # $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
 +      @ # $(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}"
++      @ # $(PERL) -MFile::Copy -e "copy(q{rules/v330.pre}, q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}"
  
  data__install:
        -$(MKPATH) $(B_DATADIR)
diff --git a/mail/spamassassin/patches/patch-ba b/mail/spamassassin/patches/patch-ba
deleted file mode 100644 (file)
index 2636b50..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2008/01/09 15:55:52 heinz Exp $
-
- Both submitted upstream (bug id 5628/5630):
- - no need for a hard-coded path, the appropriate variables already exist
- - the documentation conflicts with the code
-
---- sa-update.raw.orig 2007-08-08 15:19:47.000000000 +0200
-+++ sa-update.raw
-@@ -1322,7 +1322,7 @@ Options:
-                           keyring. Use multiple times for multiple files
-   --updatedir path        Directory to place updates, defaults to the
-                           SpamAssassin site rules directory
--                          (default: /var/lib/spamassassin/<version>)
-+                          (default: @@LOCAL_STATE_DIR@@/@@VERSION@@)
-   -D, --debug [area=n,...]  Print debugging messages
-   -V, --version           Print version
-   -h, --help              Print usage message
-@@ -1441,7 +1441,7 @@ Note: use of this option automatically e
- By default, C<sa-update> will use the system-wide rules update directory:
--        @@LOCAL_STATE_DIR@@/spamassassin/@@VERSION@@
-+        @@LOCAL_STATE_DIR@@/@@VERSION@@
- If the updates should be stored in another location, specify it here.
diff --git a/mail/spamassassin/patches/patch-bc b/mail/spamassassin/patches/patch-bc
deleted file mode 100644 (file)
index ccb313a..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-bc,v 1.3 2008/06/22 22:41:01 heinz Exp $
-
- Both submitted upstream (bug id 5628/5630):
- - no need for a hard-coded path, the appropriate variables already exist
- - the documentation conflicts with the code
-
---- sa-compile.raw.orig        2008-06-10 11:21:07.000000000 +0200
-+++ sa-compile.raw
-@@ -684,7 +684,7 @@ Options:
-   --siteconfigpath=path         Path for site configs
-                                 (default: /etc/mail/spamassassin)
-   --updatedir=path              Directory to place updates
--                      (default: /var/lib/spamassassin/compiled/<perlversion>/<version>)
-+                      (default: @@LOCAL_STATE_DIR@@/compiled/@@PERL_MAJOR_VER@@/@@VERSION@@)
-   --cf='config line'            Additional line of configuration
-   -D, --debug [area=n,...]    Print debugging messages
-   -V, --version                       Print version
-@@ -746,12 +746,12 @@ the default directories (usually C</etc/
- By default, C<sa-compile> will use the system-wide rules update directory:
--        @@LOCAL_STATE_DIR@@/spamassassin/compiled/@@PERL_MAJOR_VER@@/@@VERSION@@
-+        @@LOCAL_STATE_DIR@@/compiled/@@PERL_MAJOR_VER@@/@@VERSION@@
- If the updates should be stored in another location, specify it here.
- Note that use of this option is not recommended; if sa-compile is placing the
--compiled rules the wrong directory, you probably need to rebuild SpamAssassin
-+compiled rules in the wrong directory, you probably need to rebuild SpamAssassin
- with different C<Makefile.PL> arguments, instead of overriding sa-compile's
- runtime behaviour.
diff --git a/mail/spamassassin/patches/patch-be b/mail/spamassassin/patches/patch-be
deleted file mode 100644 (file)
index 08de57f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.1 2010/01/02 03:48:40 heinz Exp $
-
---- rules/72_active.cf.orig    2008-06-10 09:21:33.000000000 +0000
-+++ rules/72_active.cf
-@@ -540,7 +540,7 @@ describe FH_DATE_IS_19XX   The date is not
- ##} FH_DATE_IS_19XX
- ##{ FH_DATE_PAST_20XX
--header   FH_DATE_PAST_20XX    Date =~ /20[1-9][0-9]/ [if-unset: 2006]\r
-+header   FH_DATE_PAST_20XX    Date =~ /20[2-9][0-9]/ [if-unset: 2006]\r
- describe FH_DATE_PAST_20XX    The date is grossly in the future.\r
- ##} FH_DATE_PAST_20XX
index 487dc83..ad4a4df 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/01/20 17:16:38 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2010/03/24 19:43:26 asau Exp $
 #
 
 DISTNAME=              genius-1.0.9
+PKGREVISION=           1
 CATEGORIES=            math
 MASTER_SITES=          http://ftp.5z.com/pub/genius/
 
index 7859063..bf9ac76 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2009/01/17 23:36:22 adam Exp $
+# $NetBSD: Makefile,v 1.27 2010/03/24 19:43:26 asau Exp $
 
 DISTNAME=      glpk-4.35
+PKGREVISION=   1
 CATEGORIES=    math
 MASTER_SITES=  ftp://ftp.gnu.org/gnu/glpk/
 
index 3034cc2..db55ecd 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       glpk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        glpk
 GLPK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.glpk+=   glpk>=4.8nb1
-BUILDLINK_ABI_DEPENDS.glpk+=   glpk>=4.9nb1
+BUILDLINK_ABI_DEPENDS.glpk+=   glpk>=4.35nb1
 BUILDLINK_PKGSRCDIR.glpk?=     ../../math/glpk
 
 .include "../../devel/gmp/buildlink3.mk"
index acc8621..3cf6c19 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/12/15 21:55:05 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/03/24 19:43:26 asau Exp $
 #
 
 DISTNAME=              libmatheval-1.1.4
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            math
 MASTER_SITES=          ${MASTER_SITE_GNU:=libmatheval/}
 
index b4e01c7..bef455f 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/01/15 14:04:36 asau Exp $
+# $NetBSD: Makefile,v 1.16 2010/03/24 19:43:26 asau Exp $
 #
 
 DISTNAME=              mpfr-2.4.2
 PKGNAME=               ${DISTNAME}.3   # append patch level
+PKGREVISION=           1
 CATEGORIES=            math
 MASTER_SITES=          http://www.mpfr.org/mpfr-current/
 
index efdc043..f7bff2b 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       mpfr
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=        mpfr
 MPFR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mpfr+=   mpfr>=2.0.3
+BUILDLINK_ABI_DEPENDS.mpfr?=   mpfr>=2.4.2.3nb1
 BUILDLINK_PKGSRCDIR.mpfr?=     ../../math/mpfr
 
 .include "../../devel/gmp/buildlink3.mk"
index 27c7047..f5c3a7a 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2009/12/03 17:48:58 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2010/03/24 19:43:27 asau Exp $
 
 DISTNAME=              ntl-5.3.1
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            math devel
 MASTER_SITES=          http://www.shoup.net/ntl/
 
index e7258e0..20edc07 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       ntl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ntl
 NTL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ntl+=    ntl>=5.3.1
-BUILDLINK_ABI_DEPENDS.ntl+=    ntl>=5.3.1nb1
+BUILDLINK_ABI_DEPENDS.ntl+=    ntl>=5.3.1nb2
 BUILDLINK_PKGSRCDIR.ntl?=      ../../math/ntl
 
 .include "../../devel/gmp/buildlink3.mk"
index 8218ae7..b9dbc0b 100644 (file)
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2010/01/23 23:27:55 is Exp $
+# $NetBSD: Makefile,v 1.5 2010/03/24 19:43:27 asau Exp $
 #
 
 ORDCALCVER=    0.2
 PKGNAME=       ordCalc-${ORDCALCVER}
 DISTNAME=      ordCalc_${ORDCALCVER}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    math
 MASTER_SITES=  http://mtnmath.com/ord/
 EXTRACT_SUFX=  .tar.bz2
index 9749e4a..bda334b 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2009/05/03 18:07:08 sno Exp $
+# $NetBSD: Makefile,v 1.3 2010/03/24 19:43:27 asau Exp $
 #
 
 DISTNAME=              Math-BigInt-GMP-1.24
 PKGNAME=               p5-${DISTNAME}
+PKGREVISION=           1
 CATEGORIES=            math perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Math/}
 
index eb3f9a3..6ee2355 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/07/08 10:24:53 sno Exp $
+# $NetBSD: Makefile,v 1.2 2010/03/24 19:43:27 asau Exp $
 #
 
 DISTNAME=              Math-BigInt-Pari-1.13
 PKGNAME=               p5-${DISTNAME}
+PKGREVISION=           1
 CATEGORIES=            math perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Math/}
 
index 1689dd1..8631212 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2009/09/22 20:40:35 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/03/24 19:43:27 asau Exp $
 #
 
 DISTNAME=              Math-GMP-2.06
 PKGNAME=               p5-${DISTNAME}
+PKGREVISION=           1
 SVR4_PKGNAME=          p5mgp
 CATEGORIES=            math perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Math/}
index 9d8ef10..e9d3cbe 100644 (file)
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2010/03/10 09:24:52 sno Exp $
+# $NetBSD: Makefile,v 1.39 2010/03/24 19:43:27 asau Exp $
 #
 
 DISTNAME=              Math-Pari-2.01080604
 PKGNAME=               p5-${DISTNAME:S/01080604/010806.04/}
 #PKGREVISION=          1
+PKGREVISION=           1
 SVR4_PKGNAME=          p5mpa
 CATEGORIES+=           perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Math/}
index f6745da..5a3aef0 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2010/03/13 22:16:34 schmonz Exp $
+# $NetBSD: Makefile,v 1.48 2010/03/24 19:43:27 asau Exp $
 
 DISTNAME=      pari-2.3.5
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    math
 MASTER_SITES=  http://pari.math.u-bordeaux.fr/pub/pari/unix/
 
index 5710b48..fb7a63d 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/02/06 10:37:06 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/03/24 21:54:16 asau Exp $
 
 BUILDLINK_TREE+=       pari
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        pari
 PARI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pari+=   pari>=2.3.4
-BUILDLINK_ABI_DEPENDS.pari+=   pari>=2.3.4
+BUILDLINK_ABI_DEPENDS.pari+=   pari>=2.3.5nb5
 BUILDLINK_PKGSRCDIR.pari?=     ../../math/pari
 
 pkgbase := pari
index 4b095cf..d47492a 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2009/12/30 13:33:27 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2010/03/24 19:43:27 asau Exp $
 #
 
 DISTNAME=      pspp-0.6.2
+PKGREVISION=   1
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_GNU:=pspp/}
 
index 6be65de..a19d15c 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2010/02/10 19:17:41 joerg Exp $
+# $NetBSD: Makefile,v 1.74 2010/03/24 19:43:27 asau Exp $
 
 DISTNAME=      kdeutils-${_KDE_VERSION}
-PKGREVISION=   7
+PKGREVISION=   8
 COMMENT=       Utilities for the KDE integrated X11 desktop
 
 PKG_DESTDIR_SUPPORT=   user-destdir
index db9b5ca..ae5902b 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/02/10 19:17:41 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/03/24 19:43:27 asau Exp $
 
 DISTNAME=      kdeutils-${_KDE_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc
 COMMENT=       Utilities for the KDE integrated X11 desktop
 
index 3c0b478..95dc56d 100644 (file)
@@ -170,7 +170,7 @@ gsl                 Use GNU Scientific Library.
 gstreamer              Enable gstreamer support.
 gtk                    Enable support for GTK.
 gtk2                   Enable support for GTK2.
-gtkspell               Enable gtkspell support.        .
+gtkspell               Enable gtkspell support.
 guile                  Enable support for GUILE.
 gzip                   Enable compression using gzip.
 hal                    Support for the freedesktop.org Hardware Abstraction Layer.
index 993b754..0a69630 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2009/12/17 22:38:50 abs Exp $
+# $NetBSD: Makefile,v 1.21 2010/03/24 19:43:28 asau Exp $
 #
 
 DISTNAME=      dhid-5.2
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.dhis.org/pub/dhis/
 
index 75c2d2b..59abb24 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2009/12/18 00:39:50 abs Exp $
+# $NetBSD: Makefile,v 1.15 2010/03/24 19:43:28 asau Exp $
 #
 
 DISTNAME=      dhisd-5.1
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.dhis.org/pub/dhis/
 
index 44812ed..06640b9 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/01/27 10:38:40 markd Exp $
+# $NetBSD: Makefile,v 1.7 2010/03/24 19:43:28 asau Exp $
 
 DISTNAME=      kdenetwork-${_KDE_VERSION}
+PKGREVISION=   1
 CATEGORIES=    net
 COMMENT=       Network modules for the KDE integrated X11 desktop
 
index f05ccd1..3af633a 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/02/11 21:58:29 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2010/03/24 19:43:28 asau Exp $
 
 DISTNAME=              kismet-2008-05-R1
 PKGNAME=               kismet-2008.05.01
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            net
 MASTER_SITES=          http://www.kismetwireless.net/code/
 
index 8c35747..4614aec 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/20 21:52:23 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/03/24 19:43:28 asau Exp $
 
 DISTNAME=      ktorrent-${KTORRENT_VER}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    net kde
 MASTER_SITES=  http://ktorrent.org/downloads/${KTORRENT_VER}/
 EXTRACT_SUFX=  .tar.bz2
index 25182f3..73f5b99 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/03/20 21:53:06 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/03/24 19:43:28 asau Exp $
 
 DISTNAME=      ktorrent-${KTORRENT_VER}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    net kde
 MASTER_SITES=  http://ktorrent.org/downloads/${KTORRENT_VER}/
 EXTRACT_SUFX=  .tar.bz2
index f4b4aab..3f3e74f 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2010/01/18 09:59:20 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/03/24 21:35:12 sbd Exp $
 
 DISTNAME=              tightvnc-1.3.10
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            net x11
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
 DISTFILES=             ${DISTNAME}_unixsrc.tar.bz2
index 9ceb1b7..723f32b 100644 (file)
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.17 2010/02/26 18:26:51 joerg Exp $
+$NetBSD: distinfo,v 1.18 2010/03/24 21:35:12 sbd Exp $
 
 SHA1 (tightvnc-1.3.10_unixsrc.tar.bz2) = ab4ed3d8e9d5188edf0ff27fce3027495f1a8851
 RMD160 (tightvnc-1.3.10_unixsrc.tar.bz2) = 0c24207ec13c1d41f445ccbdea16ce2b5d0729a7
 Size (tightvnc-1.3.10_unixsrc.tar.bz2) = 1780510 bytes
 SHA1 (patch-aa) = 3445af5bc4b85f7a45049378f5806a5c993503f4
 SHA1 (patch-ab) = b610979131497edae24119961bb56122e9d5a5c4
-SHA1 (patch-ac) = 7068947b76270e858c66d1c46a8ebb8675ecdbbd
+SHA1 (patch-ac) = de1acb24b39b5b0d262c91bf6539edcb38217573
 SHA1 (patch-ad) = ea79684c715de8a8364c391b5df38945b0a56ad1
 SHA1 (patch-ae) = f541c3d7f143145798eb2d3eca3d2a1992619a50
 SHA1 (patch-af) = 372b8ca93a93dab938363c6b9408ab82155a172d
index 4c86f03..55b46bb 100644 (file)
@@ -1,17 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2003/11/27 17:27:29 abs Exp $
+$NetBSD: patch-ac,v 1.4 2010/03/24 21:35:12 sbd Exp $
 
---- Xvnc/config/cf/vnc.def.orig        2003-07-31 15:19:37.000000000 +0100
+--- Xvnc/config/cf/vnc.def.orig        2009-02-05 09:48:09.000000000 +0000
 +++ Xvnc/config/cf/vnc.def
-@@ -10,8 +10,6 @@
- #ifdef BeforeVendorCF
--#include "platform.def"
--
- /*****************************************************************************/
- /*
-  * First try to switch off all the extras that we don't want.  This includes
-@@ -117,13 +115,7 @@
+@@ -117,13 +117,7 @@
   * You may need to change this.
   */
  
index 92b78e2..db95966 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2010/03/21 16:29:42 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2010/03/24 20:18:01 sbd Exp $
 #
 # This Makefile fragment is included by:
 #
@@ -10,7 +10,7 @@ DISTNAME=             mtree-20081105
 MASTER_SITES=          # empty
 DISTFILES=             # empty
 
-MAINTAINER=            pkgsrc-users@NetBSD.org
+MAINTAINER=            sbd@NetBSD.org
 HOMEPAGE=              http://www.NetBSD.org/
 COMMENT=               Utility for mapping and checking directory hierarchies
 
index a1c2a7a..0a7a830 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2009/12/15 22:06:35 joerg Exp $
+# $NetBSD: Makefile,v 1.62 2010/03/24 19:43:28 asau Exp $
 #
 
 DISTNAME=      lilypond-2.12.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print
 MASTER_SITES=  http://lilypond.org/download/sources/v2.12/
 
index 6b5a957..2215056 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2009/11/03 00:15:41 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2010/03/24 19:43:28 asau Exp $
 
 DISTNAME=      gnutls-2.8.5
+PKGREVISION=   1
 CATEGORIES=    security devel
 MASTER_SITES=  ftp://ftp.gnutls.org/pub/gnutls/ \
                ftp://ftp.gnupg.org/gcrypt/gnutls/ \
index 11260f4..8ecd021 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/03/13 04:40:12 obache Exp $
+# $NetBSD: Makefile,v 1.19 2010/03/24 19:43:28 asau Exp $
 #
 
 DISTNAME=              lsh-2.0.4
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          http://www.lysator.liu.se/~nisse/archive/ \
                        ftp://ftp.lysator.liu.se/pub/security/lsh/
index c9fa2ba..3f2fe70 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2010/01/17 12:02:44 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/03/24 19:43:28 asau Exp $
 #
 
 DISTNAME=              sfs-0.7.2
-PKGREVISION=           10
+PKGREVISION=           11
 CATEGORIES=            net security
 MASTER_SITES=          ${MASTER_SITE_GENTOO:=distfiles/}
 
index 525e128..484780e 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/01/27 21:26:59 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2010/03/24 19:43:28 asau Exp $
 
 DISTNAME=              srp-1.4.4
 PKGNAME=               srp-client-1.4.4
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            security net
 MASTER_SITES=          ftp://ftp.zedz.net/pub/crypto/programs/srp/
 
index 5a2c27c..bccf4b2 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/02/19 15:12:04 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/03/24 19:43:29 asau Exp $
 
 DISTNAME=      ssss-0.5
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  http://point-at-infinity.org/ssss/
 DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} ssss.1
index 3eb0a92..6d8aa58 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/27 19:21:58 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/03/24 19:43:29 asau Exp $
 #
 
 DISTNAME=              mesure-0.5
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_BACKUP}
 
index 0963c9c..877edd7 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/03/24 19:43:29 asau Exp $
 
 DISTNAME=      gnotime-2.3.0
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    time gnome
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gttr/}
 
index f023efc..aa00841 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2009/08/26 19:58:24 sno Exp $
+# $NetBSD: Makefile,v 1.53 2010/03/24 19:43:29 asau Exp $
 #
 
 DISTNAME=              sawfish-1.5.0
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            x11 wm
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=sawmill/}
 EXTRACT_SUFX=          .tar.bz2
index bac5904..3b819f5 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2009/12/15 22:16:10 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/03/24 19:43:29 asau Exp $
 #
 
 DISTNAME=      galway-0.33
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    www x11 gnome
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=  .tgz
index bae3bad..535cd87 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2009/08/26 19:58:40 sno Exp $
+# $NetBSD: Makefile,v 1.9 2010/03/24 19:43:29 asau Exp $
 
 DISTNAME=              rep-gtk-0.18.6r2
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            x11 lang
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=rep-gtk/}
 EXTRACT_SUFX=          .tar.bz2
index 3cf2c74..0516cf8 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/03/24 19:43:29 asau Exp $
 
 DISTNAME=              wxhaskell-src-0.9.4
 PKGNAME=               ${DISTNAME:S/-src//}
-PKGREVISION=           10
+PKGREVISION=           11
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=wxhaskell/}
 EXTRACT_SUFX=          .zip
index ec80e6c..14444bb 100644 (file)
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2009/12/15 22:18:09 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/03/24 19:43:29 asau Exp $
 #
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "Makefile.common"
 
-PKGREVISION=           3
+PKGREVISION=           4
 
 CONFIGURE_ARGS+=       --disable-tk