diff options
| author | agc <agc> | 2010-07-04 07:17:04 +0000 |
|---|---|---|
| committer | agc <agc> | 2010-07-04 07:17:04 +0000 |
| commit | b9d3cc1975b5d0422e0d448c4601f88b80356917 (patch) | |
| tree | 874d526a51479bdf7a195a658fef54f5702e3cca | |
| parent | 2c2dd6294866939bbc7216371e898c870a8893d9 (diff) | |
| download | pkgsrc-b9d3cc1975b5d0422e0d448c4601f88b80356917.tar.gz | |
Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching
error, and to sync with reality.
134 files changed, 1555 insertions, 296 deletions
diff --git a/graphics/gegl/PLIST b/graphics/gegl/PLIST index 69b3ab4bb63..16f9d0af970 100644 --- a/graphics/gegl/PLIST +++ b/graphics/gegl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2010/06/14 18:48:32 drochner Exp $ +@comment $NetBSD: PLIST,v 1.9.2.1 2010/07/04 07:17:04 agc Exp $ bin/gegl include/gegl-0.1/gegl-buffer.h include/gegl-0.1/gegl-chant.h @@ -110,6 +110,7 @@ lib/gegl-0.1/svg-saturate.la lib/gegl-0.1/text.la lib/gegl-0.1/threshold.la lib/gegl-0.1/unsharp-mask.la +${PLIST.v4l}lib/gegl-0.1/v4l.la lib/gegl-0.1/value-invert.la lib/gegl-0.1/weighted-blend.la lib/gegl-0.1/whitebalance.la diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile index 48ac4004e07..e2089aace49 100644 --- a/graphics/ivtools/Makefile +++ b/graphics/ivtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2010/04/05 22:52:23 markd Exp $ +# $NetBSD: Makefile,v 1.23.4.1 2010/07/04 07:17:04 agc Exp $ DISTNAME= ivtools-1.2.8 CATEGORIES= graphics @@ -11,11 +11,12 @@ COMMENT= Drawing editors for PostScript, TeX, and web graphics CONFLICTS+= dclock-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir +NOT_FOR_PLATFORM= ${LP64PLATFORMS} + DEPENDS+= pstoedit>=3.0:../../graphics/pstoedit DEPENDS+= wget>=1.0:../../net/wget -PKG_DESTDIR_SUPPORT= user-destdir - USE_LANGUAGES= c c++ USE_TOOLS+= imake bash:run diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile index 69328740149..8fe95ad7b21 100644 --- a/graphics/librsvg/Makefile +++ b/graphics/librsvg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:38 wiz Exp $ +# $NetBSD: Makefile,v 1.41.2.1 2010/07/04 07:17:04 agc Exp $ DISTNAME= librsvg-2.26.3 PKGREVISION= 1 @@ -36,7 +36,7 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.12.0 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 post-install: - rmdir -p ${PREFIX}/lib/mozilla/plugins || ${TRUE} + rmdir -p ${DESTDIR}${PREFIX}/lib/mozilla/plugins || ${TRUE} .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgsf/buildlink3.mk" diff --git a/graphics/mpgtx/PLIST b/graphics/mpgtx/PLIST index bc18a9208ab..69bfcede4cd 100644 --- a/graphics/mpgtx/PLIST +++ b/graphics/mpgtx/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/17 11:39:35 grant Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:17:04 agc Exp $ bin/mpgcat bin/mpgdemux bin/mpginfo diff --git a/graphics/plotutils-nox11/PLIST b/graphics/plotutils-nox11/PLIST index 1880879bbea..03ee3001ee6 100644 --- a/graphics/plotutils-nox11/PLIST +++ b/graphics/plotutils-nox11/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:59:25 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6.10.1 2010/07/04 07:17:05 agc Exp $ bin/double bin/graph +bin/hersheydemo bin/ode bin/pic2plot bin/plot @@ -20,13 +21,11 @@ man/man1/spline.1 man/man1/tek2plot.1 share/libplot/README share/libplot/colors.txt -share/libplot/demo-page -share/libplot/h-demo.c -share/libplot/h-fonts.doc -share/libplot/h-glyphs.doc +share/libplot/h-fonts.txt +share/libplot/h-glyphs.txt share/libplot/hershey.bib -share/libplot/kana.doc -share/libplot/kanji.doc +share/libplot/kana.txt +share/libplot/kanji.txt share/ode/README share/ode/atwoods.ode share/ode/bead.ode diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 9b816b2261d..db2d9e342d9 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.123 2010/06/13 22:42:10 wiz Exp $ +# $NetBSD: Makefile,v 1.123.2.1 2010/07/04 07:17:05 agc Exp $ -DISTNAME= libpng-1.4.2 +DISTNAME= libpng-1.4.3 PKGNAME= ${DISTNAME:S/lib//} CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ diff --git a/graphics/png/distinfo b/graphics/png/distinfo index a6f3f8a502f..767e9893692 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.68 2010/06/13 22:42:10 wiz Exp $ +$NetBSD: distinfo,v 1.68.2.1 2010/07/04 07:17:05 agc Exp $ -SHA1 (libpng-1.4.2.tar.bz2) = 2670d702bbeee7b28bd7e4814e460524731354c3 -RMD160 (libpng-1.4.2.tar.bz2) = a7bbad2394d93d57cea4ae26f870466bb553449e -Size (libpng-1.4.2.tar.bz2) = 655710 bytes +SHA1 (libpng-1.4.3.tar.bz2) = 82eda95439daaef6ed564b1532cf805b01759557 +RMD160 (libpng-1.4.3.tar.bz2) = ad0abc000e0a338d94ff7f8fe2b862d5944ec7bb +Size (libpng-1.4.3.tar.bz2) = 658335 bytes SHA1 (patch-aa) = fc7f010f347cb77d8b478395a59ba4c4c1abd4b9 SHA1 (patch-ac) = 44b167433e066556022d9b43fa33a7f887f83617 SHA1 (patch-ae) = e9700e7d3dd536d80e47cffa20b412a6c69660be diff --git a/graphics/rabbit/Makefile b/graphics/rabbit/Makefile index 1732a294dbf..6b16274276a 100644 --- a/graphics/rabbit/Makefile +++ b/graphics/rabbit/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.20 2010/06/18 09:16:08 obache Exp $ +# $NetBSD: Makefile,v 1.20.2.1 2010/07/04 07:17:05 agc Exp $ # DISTNAME= rabbit-0.6.4 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics ruby MASTER_SITES= http://www.cozmixng.org/~kou/download/ diff --git a/graphics/rabbit/distinfo b/graphics/rabbit/distinfo index 4260b85dace..935672b5561 100644 --- a/graphics/rabbit/distinfo +++ b/graphics/rabbit/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.16 2010/06/18 09:16:08 obache Exp $ +$NetBSD: distinfo,v 1.16.2.1 2010/07/04 07:17:05 agc Exp $ SHA1 (rabbit-0.6.4.tar.gz) = 77b9850a2a616b45790735ec544d039503fd2327 RMD160 (rabbit-0.6.4.tar.gz) = 0243187185641923232c71fffd16d4ce22cf73bb Size (rabbit-0.6.4.tar.gz) = 5895707 bytes SHA1 (patch-ae) = 301505f066dfe2a7911a6bbbd07a4ee224e6d040 +SHA1 (patch-af) = a71f3d7f52ad3d3dd901de10b55adbc13f324f4e diff --git a/graphics/rabbit/patches/patch-af b/graphics/rabbit/patches/patch-af new file mode 100644 index 00000000000..b3fb5511716 --- /dev/null +++ b/graphics/rabbit/patches/patch-af @@ -0,0 +1,19 @@ +$NetBSD: patch-af,v 1.1.2.2 2010/07/04 07:17:05 agc Exp $ + +enable keybord interface on Clutter render. +http://www.cozmixng.org/retro/projects/rabbit/changesets/1380 + +--- lib/rabbit/renderer/display/clutter-embed.rb.orig 2010-01-29 14:09:05.000000000 +0000 ++++ lib/rabbit/renderer/display/clutter-embed.rb +@@ -195,9 +195,11 @@ module Rabbit + add_widget_to_window(@window) + widget.show + attach_menu(@window) ++ attach_key(@window) + end + + def detach ++ detach_key(@window) + detach_menu(@window) + widget.hide + unless @window.destroyed? diff --git a/ham/gnuradio-core-docs/Makefile b/ham/gnuradio-core-docs/Makefile index aec065fc63d..6620dc100f8 100644 --- a/ham/gnuradio-core-docs/Makefile +++ b/ham/gnuradio-core-docs/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2009/09/11 16:23:29 joerg Exp $ +# $NetBSD: Makefile,v 1.8.8.1 2010/07/04 07:17:40 agc Exp $ PKGNAME= gnuradio-core-docs-${VERSION} COMMENT= GNU Radio core module documentation -PKGREVISION= 4 +PKGREVISION= 5 PKG_DESTDIR_SUPPORT= user-destdir @@ -10,7 +10,7 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+=--enable-doxygen -BUILD_DEPENDS+=doxygen>=1.5.7.1:../../devel/doxygen +BUILD_DEPENDS+=doxygen>=1.6.3:../../devel/doxygen BUILD_DIRS= docs diff --git a/ham/gnuradio-core-docs/PLIST b/ham/gnuradio-core-docs/PLIST index c1cfd4bf67b..90438b67f70 100644 --- a/ham/gnuradio-core-docs/PLIST +++ b/ham/gnuradio-core-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2009/09/11 16:23:29 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8.8.1 2010/07/04 07:17:40 agc Exp $ share/doc/gnuradio-${PKGVERSION}/README share/doc/gnuradio-${PKGVERSION}/README.hacking share/doc/gnuradio-${PKGVERSION}/html/annotated.html @@ -3096,9 +3096,6 @@ share/doc/gnuradio-${PKGVERSION}/html/config_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/config_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/config_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/control_8h.html -share/doc/gnuradio-${PKGVERSION}/html/control_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/control_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/control_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/control_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/control_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/control_8h__incl.png @@ -3216,6 +3213,9 @@ share/doc/gnuradio-${PKGVERSION}/html/dotprod__fff__altivec_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/doxygen.css share/doc/gnuradio-${PKGVERSION}/html/doxygen.png share/doc/gnuradio-${PKGVERSION}/html/eth__buffer_8h.html +share/doc/gnuradio-${PKGVERSION}/html/eth__buffer_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/eth__buffer_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/eth__buffer_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/eth__buffer_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/eth__buffer_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/eth__buffer_8h__incl.png @@ -3241,14 +3241,14 @@ share/doc/gnuradio-${PKGVERSION}/html/exception_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fcomplex__dotprod__x86_8h.html share/doc/gnuradio-${PKGVERSION}/html/fcomplex__dotprod__x86_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fft__1d_8h.html -share/doc/gnuradio-${PKGVERSION}/html/fft__1d_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/fft__1d_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/fft__1d_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/fft__1d_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/fft__1d_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fft__1d_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/fft__1d_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fft__1d__r2_8h.html +share/doc/gnuradio-${PKGVERSION}/html/fft__1d__r2_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/fft__1d__r2_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/fft__1d__r2_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/fft__1d__r2_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/fft__1d__r2_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fft__1d__r2_8h__incl.png @@ -3381,6 +3381,9 @@ share/doc/gnuradio-${PKGVERSION}/html/fusb_8h__dep__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fusb_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/fusb_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/fusb__darwin_8h.html +share/doc/gnuradio-${PKGVERSION}/html/fusb__darwin_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/fusb__darwin_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/fusb__darwin_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/fusb__darwin_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/fusb__darwin_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/fusb__darwin_8h__incl.png @@ -3423,9 +3426,6 @@ share/doc/gnuradio-${PKGVERSION}/html/gc__cdefs_8h__dep__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gc__cdefs_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/gc__cdefs_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gc__client__thread__info_8h.html -share/doc/gnuradio-${PKGVERSION}/html/gc__client__thread__info_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/gc__client__thread__info_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/gc__client__thread__info_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/gc__client__thread__info_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/gc__client__thread__info_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gc__client__thread__info_8h__incl.png @@ -3486,6 +3486,9 @@ share/doc/gnuradio-${PKGVERSION}/html/gc__job__manager_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gc__job__manager_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/gc__job__manager_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gc__job__manager__impl_8h.html +share/doc/gnuradio-${PKGVERSION}/html/gc__job__manager__impl_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/gc__job__manager__impl_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/gc__job__manager__impl_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/gc__job__manager__impl_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/gc__job__manager__impl_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gc__job__manager__impl_8h__incl.png @@ -3516,9 +3519,6 @@ share/doc/gnuradio-${PKGVERSION}/html/gc__spu__args_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gc__spu__args_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/gc__spu__args_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gc__spu__config_8h.html -share/doc/gnuradio-${PKGVERSION}/html/gc__spu__config_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/gc__spu__config_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/gc__spu__config_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/gc__spu__config_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/gc__spu__config_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gc__spu__config_8h__incl.png @@ -3947,6 +3947,9 @@ share/doc/gnuradio-${PKGVERSION}/html/gr__dd__mpsk__sync__cc_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gr__dd__mpsk__sync__cc_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/gr__dd__mpsk__sync__cc_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gr__decode__ccsds__27__fb_8h.html +share/doc/gnuradio-${PKGVERSION}/html/gr__decode__ccsds__27__fb_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/gr__decode__ccsds__27__fb_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/gr__decode__ccsds__27__fb_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/gr__decode__ccsds__27__fb_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/gr__decode__ccsds__27__fb_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gr__decode__ccsds__27__fb_8h__incl.png @@ -3962,6 +3965,9 @@ share/doc/gnuradio-${PKGVERSION}/html/gr__delay_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gr__delay_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/gr__delay_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gr__descrambler__bb_8h.html +share/doc/gnuradio-${PKGVERSION}/html/gr__descrambler__bb_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/gr__descrambler__bb_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/gr__descrambler__bb_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/gr__descrambler__bb_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/gr__descrambler__bb_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gr__descrambler__bb_8h__incl.png @@ -5410,14 +5416,14 @@ share/doc/gnuradio-${PKGVERSION}/html/gr__sync__interpolator_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gr__sync__interpolator_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/gr__sync__interpolator_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gr__test_8h.html +share/doc/gnuradio-${PKGVERSION}/html/gr__test_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/gr__test_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/gr__test_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/gr__test_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/gr__test_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gr__test_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/gr__test_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gr__test__types_8h.html -share/doc/gnuradio-${PKGVERSION}/html/gr__test__types_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/gr__test__types_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/gr__test__types_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/gr__test__types_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/gr__threshold__ff_8h.html share/doc/gnuradio-${PKGVERSION}/html/gr__threshold__ff_8h__incl.map @@ -5787,65 +5793,93 @@ share/doc/gnuradio-${PKGVERSION}/html/gri__wavfile_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/gri__wavfile_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/gri__wavfile_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/group__applications.html +share/doc/gnuradio-${PKGVERSION}/html/group__applications.map share/doc/gnuradio-${PKGVERSION}/html/group__applications.png share/doc/gnuradio-${PKGVERSION}/html/group__atsc.html +share/doc/gnuradio-${PKGVERSION}/html/group__atsc.map share/doc/gnuradio-${PKGVERSION}/html/group__atsc.png share/doc/gnuradio-${PKGVERSION}/html/group__base__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__base__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__base__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__block.html +share/doc/gnuradio-${PKGVERSION}/html/group__block.map share/doc/gnuradio-${PKGVERSION}/html/group__block.png share/doc/gnuradio-${PKGVERSION}/html/group__coding__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__coding__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__coding__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__container__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__container__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__container__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__converter__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__converter__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__converter__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__defs_8dox.html share/doc/gnuradio-${PKGVERSION}/html/group__demodulation__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__demodulation__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__demodulation__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__dft__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__dft__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__dft__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__eq__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__eq__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__eq__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__filter__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__filter__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__filter__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__filter__design.html share/doc/gnuradio-${PKGVERSION}/html/group__gcell.html +share/doc/gnuradio-${PKGVERSION}/html/group__gcell.map share/doc/gnuradio-${PKGVERSION}/html/group__gcell.png share/doc/gnuradio-${PKGVERSION}/html/group__hardware.html share/doc/gnuradio-${PKGVERSION}/html/group__internal.html share/doc/gnuradio-${PKGVERSION}/html/group__level__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__level__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__level__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__math__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__math__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__math__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__misc.html share/doc/gnuradio-${PKGVERSION}/html/group__misc__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__misc__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__misc__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__modulation__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__modulation__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__modulation__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__ofdm__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__ofdm__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__ofdm__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__pager.html +share/doc/gnuradio-${PKGVERSION}/html/group__pager.map share/doc/gnuradio-${PKGVERSION}/html/group__pager.png share/doc/gnuradio-${PKGVERSION}/html/group__pager__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__pager__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__pager__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__radar.html +share/doc/gnuradio-${PKGVERSION}/html/group__radar.map share/doc/gnuradio-${PKGVERSION}/html/group__radar.png share/doc/gnuradio-${PKGVERSION}/html/group__sink__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__sink__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__sink__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__slicedice__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__slicedice__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__slicedice__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__source__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__source__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__source__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__sync__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__sync__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__sync__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__usrp.html +share/doc/gnuradio-${PKGVERSION}/html/group__usrp.map share/doc/gnuradio-${PKGVERSION}/html/group__usrp.png share/doc/gnuradio-${PKGVERSION}/html/group__usrp2.html +share/doc/gnuradio-${PKGVERSION}/html/group__usrp2.map share/doc/gnuradio-${PKGVERSION}/html/group__usrp2.png share/doc/gnuradio-${PKGVERSION}/html/group__vocoder__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__vocoder__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__vocoder__blk.png share/doc/gnuradio-${PKGVERSION}/html/group__wavelet__blk.html +share/doc/gnuradio-${PKGVERSION}/html/group__wavelet__blk.map share/doc/gnuradio-${PKGVERSION}/html/group__wavelet__blk.png share/doc/gnuradio-${PKGVERSION}/html/gsm__fr__decode__ps_8h.html share/doc/gnuradio-${PKGVERSION}/html/gsm__fr__decode__ps_8h__incl.map @@ -5875,6 +5909,9 @@ share/doc/gnuradio-${PKGVERSION}/html/i2c__bbio_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/i2c__bbio_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/i2c__bbio_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/i2c__bbio__pp_8h.html +share/doc/gnuradio-${PKGVERSION}/html/i2c__bbio__pp_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/i2c__bbio__pp_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/i2c__bbio__pp_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/i2c__bbio__pp_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/i2c__bbio__pp_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/i2c__bbio__pp_8h__incl.png @@ -6636,6 +6673,9 @@ share/doc/gnuradio-${PKGVERSION}/html/microtune__4702_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/microtune__4702_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/microtune__4702_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/microtune__4702__eval__board_8h.html +share/doc/gnuradio-${PKGVERSION}/html/microtune__4702__eval__board_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/microtune__4702__eval__board_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/microtune__4702__eval__board_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/microtune__4702__eval__board_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/microtune__4702__eval__board_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/microtune__4702__eval__board_8h__incl.png @@ -6699,9 +6739,6 @@ share/doc/gnuradio-${PKGVERSION}/html/omnithread_8h.html share/doc/gnuradio-${PKGVERSION}/html/omnithread_8h__dep__incl.map share/doc/gnuradio-${PKGVERSION}/html/omnithread_8h__dep__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/omnithread_8h__dep__incl.png -share/doc/gnuradio-${PKGVERSION}/html/omnithread_8h__incl.map -share/doc/gnuradio-${PKGVERSION}/html/omnithread_8h__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/omnithread_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/omnithread_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/open__usrp2__socket_8h.html share/doc/gnuradio-${PKGVERSION}/html/open__usrp2__socket_8h_source.html @@ -6721,9 +6758,6 @@ share/doc/gnuradio-${PKGVERSION}/html/ot__nt_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/ot__nt_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/ot__nt_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/ot__posix_8h.html -share/doc/gnuradio-${PKGVERSION}/html/ot__posix_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/ot__posix_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/ot__posix_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/ot__posix_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/ot__posix_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/ot__posix_8h__incl.png @@ -6782,9 +6816,6 @@ share/doc/gnuradio-${PKGVERSION}/html/pageri__util_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/pageri__util_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/pageri__util_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/pktfilter_8h.html -share/doc/gnuradio-${PKGVERSION}/html/pktfilter_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/pktfilter_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/pktfilter_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/pktfilter_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/pmt_8h.html share/doc/gnuradio-${PKGVERSION}/html/pmt_8h__dep__incl.map @@ -6795,6 +6826,9 @@ share/doc/gnuradio-${PKGVERSION}/html/pmt_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/pmt_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/pmt_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/pmt__int_8h.html +share/doc/gnuradio-${PKGVERSION}/html/pmt__int_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/pmt__int_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/pmt__int_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/pmt__int_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/pmt__int_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/pmt__int_8h__incl.png @@ -6807,9 +6841,6 @@ share/doc/gnuradio-${PKGVERSION}/html/pmt__pool_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/pmt__serial__tags_8h.html share/doc/gnuradio-${PKGVERSION}/html/pmt__serial__tags_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/pmt__unv__int_8h.html -share/doc/gnuradio-${PKGVERSION}/html/pmt__unv__int_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/pmt__unv__int_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/pmt__unv__int_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/pmt__unv__int_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/port_8h.html share/doc/gnuradio-${PKGVERSION}/html/port_8h__dep__incl.map @@ -6863,9 +6894,6 @@ share/doc/gnuradio-${PKGVERSION}/html/realtime_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/realtime_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/realtime_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/ring_8h.html -share/doc/gnuradio-${PKGVERSION}/html/ring_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/ring_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/ring_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/ring_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/ring_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/ring_8h__incl.png @@ -6927,6 +6955,9 @@ share/doc/gnuradio-${PKGVERSION}/html/spu_2gc__jd__queue_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/spu_2gc__jd__queue_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/spu_2gc__jd__queue_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/spu__buffers_8h.html +share/doc/gnuradio-${PKGVERSION}/html/spu__buffers_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/spu__buffers_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/spu__buffers_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/spu__buffers_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/spu__buffers_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/spu__buffers_8h__incl.png @@ -6934,6 +6965,9 @@ share/doc/gnuradio-${PKGVERSION}/html/spu__buffers_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/std__paths_8h.html share/doc/gnuradio-${PKGVERSION}/html/std__paths_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/strtod__si_8h.html +share/doc/gnuradio-${PKGVERSION}/html/strtod__si_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/strtod__si_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/strtod__si_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/strtod__si_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/strtod__si_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/strtod__si_8h__incl.png @@ -7104,6 +7138,9 @@ share/doc/gnuradio-${PKGVERSION}/html/trellis__calc__metric_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/trellis__calc__metric_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/trellis__calc__metric_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/trellis__encoder__bb_8h.html +share/doc/gnuradio-${PKGVERSION}/html/trellis__encoder__bb_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/trellis__encoder__bb_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/trellis__encoder__bb_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/trellis__encoder__bb_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/trellis__encoder__bb_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/trellis__encoder__bb_8h__incl.png @@ -7139,6 +7176,9 @@ share/doc/gnuradio-${PKGVERSION}/html/trellis__metric__type_8h__dep__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/trellis__metric__type_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/trellis__metric__type_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/trellis__metrics__c_8h.html +share/doc/gnuradio-${PKGVERSION}/html/trellis__metrics__c_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/trellis__metrics__c_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/trellis__metrics__c_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/trellis__metrics__c_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/trellis__metrics__c_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/trellis__metrics__c_8h__incl.png @@ -7164,6 +7204,9 @@ share/doc/gnuradio-${PKGVERSION}/html/trellis__permutation_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/trellis__permutation_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/trellis__permutation_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/trellis__siso__combined__f_8h.html +share/doc/gnuradio-${PKGVERSION}/html/trellis__siso__combined__f_8h__dep__incl.map +share/doc/gnuradio-${PKGVERSION}/html/trellis__siso__combined__f_8h__dep__incl.md5 +share/doc/gnuradio-${PKGVERSION}/html/trellis__siso__combined__f_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/trellis__siso__combined__f_8h__incl.map share/doc/gnuradio-${PKGVERSION}/html/trellis__siso__combined__f_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/trellis__siso__combined__f_8h__incl.png @@ -7282,9 +7325,6 @@ share/doc/gnuradio-${PKGVERSION}/html/usrp2__bytesex_8h__incl.md5 share/doc/gnuradio-${PKGVERSION}/html/usrp2__bytesex_8h__incl.png share/doc/gnuradio-${PKGVERSION}/html/usrp2__bytesex_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/usrp2__cdefs_8h.html -share/doc/gnuradio-${PKGVERSION}/html/usrp2__cdefs_8h__dep__incl.map -share/doc/gnuradio-${PKGVERSION}/html/usrp2__cdefs_8h__dep__incl.md5 -share/doc/gnuradio-${PKGVERSION}/html/usrp2__cdefs_8h__dep__incl.png share/doc/gnuradio-${PKGVERSION}/html/usrp2__cdefs_8h_source.html share/doc/gnuradio-${PKGVERSION}/html/usrp2__impl_8h.html share/doc/gnuradio-${PKGVERSION}/html/usrp2__impl_8h__dep__incl.map diff --git a/ham/usrp-docs/Makefile b/ham/usrp-docs/Makefile index cad1d0cc045..f2236672100 100644 --- a/ham/usrp-docs/Makefile +++ b/ham/usrp-docs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2010/03/24 19:43:25 asau Exp $ +# $NetBSD: Makefile,v 1.9.4.1 2010/07/04 07:17:40 agc Exp $ PKGNAME= usrp-docs-${VERSION} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= Documentation for the usrp module PKG_DESTDIR_SUPPORT= user-destdir @@ -12,7 +12,7 @@ USE_TOOLS+= make CONFIGURE_ARGS+=--enable-doxygen CONFIGURE_ARGS+=--docdir=${LOCALBASE}/share/doc/gnuradio/usrp -BUILD_DEPENDS+= doxygen>=1.6.1:../../devel/doxygen +BUILD_DEPENDS+= doxygen>=1.6.3:../../devel/doxygen BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto BUILD_DIRS= usrp/doc diff --git a/ham/usrp-docs/PLIST b/ham/usrp-docs/PLIST index 8d4bc7d287b..aad1d9f3887 100644 --- a/ham/usrp-docs/PLIST +++ b/ham/usrp-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2009/10/07 17:06:13 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8.8.1 2010/07/04 07:17:40 agc Exp $ share/doc/usrp-${PKGVERSION}/html/ad9862_8h.html share/doc/usrp-${PKGVERSION}/html/ad9862_8h__dep__incl.map share/doc/usrp-${PKGVERSION}/html/ad9862_8h__dep__incl.md5 @@ -699,9 +699,6 @@ share/doc/usrp-${PKGVERSION}/html/classxcvr2450__coll__graph.map share/doc/usrp-${PKGVERSION}/html/classxcvr2450__coll__graph.md5 share/doc/usrp-${PKGVERSION}/html/classxcvr2450__coll__graph.png share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h.html -share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__dep__incl.map -share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__dep__incl.md5 -share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__dep__incl.png share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__incl.map share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__incl.md5 share/doc/usrp-${PKGVERSION}/html/darwin__libusb_8h__incl.png @@ -917,6 +914,9 @@ share/doc/usrp-${PKGVERSION}/html/fusb_8h__dep__incl.md5 share/doc/usrp-${PKGVERSION}/html/fusb_8h__dep__incl.png share/doc/usrp-${PKGVERSION}/html/fusb_8h_source.html share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc.html +share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc__dep__incl.map +share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc__dep__incl.md5 +share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc__dep__incl.png share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc__incl.map share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc__incl.md5 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc__incl.png @@ -1119,9 +1119,6 @@ share/doc/usrp-${PKGVERSION}/html/inherit__graph__9.png share/doc/usrp-${PKGVERSION}/html/inherits.html share/doc/usrp-${PKGVERSION}/html/mainpage_8dox.html share/doc/usrp-${PKGVERSION}/html/md5_8h.html -share/doc/usrp-${PKGVERSION}/html/md5_8h__dep__incl.map -share/doc/usrp-${PKGVERSION}/html/md5_8h__dep__incl.md5 -share/doc/usrp-${PKGVERSION}/html/md5_8h__dep__incl.png share/doc/usrp-${PKGVERSION}/html/md5_8h__incl.map share/doc/usrp-${PKGVERSION}/html/md5_8h__incl.md5 share/doc/usrp-${PKGVERSION}/html/md5_8h__incl.png @@ -1137,9 +1134,6 @@ share/doc/usrp-${PKGVERSION}/html/mld__threads_8h_source.html share/doc/usrp-${PKGVERSION}/html/rate__to__regval_8h.html share/doc/usrp-${PKGVERSION}/html/rate__to__regval_8h_source.html share/doc/usrp-${PKGVERSION}/html/std__paths_8h.html -share/doc/usrp-${PKGVERSION}/html/std__paths_8h__dep__incl.map -share/doc/usrp-${PKGVERSION}/html/std__paths_8h__dep__incl.md5 -share/doc/usrp-${PKGVERSION}/html/std__paths_8h__dep__incl.png share/doc/usrp-${PKGVERSION}/html/std__paths_8h_source.html share/doc/usrp-${PKGVERSION}/html/structdarwin__dev__handle-members.html share/doc/usrp-${PKGVERSION}/html/structdarwin__dev__handle.html @@ -1167,6 +1161,9 @@ share/doc/usrp-${PKGVERSION}/html/tab_l.gif share/doc/usrp-${PKGVERSION}/html/tab_r.gif share/doc/usrp-${PKGVERSION}/html/tabs.css share/doc/usrp-${PKGVERSION}/html/test__usrp__standard__rx_8cc.html +share/doc/usrp-${PKGVERSION}/html/test__usrp__standard__rx_8cc__dep__incl.map +share/doc/usrp-${PKGVERSION}/html/test__usrp__standard__rx_8cc__dep__incl.md5 +share/doc/usrp-${PKGVERSION}/html/test__usrp__standard__rx_8cc__dep__incl.png share/doc/usrp-${PKGVERSION}/html/test__usrp__standard__rx_8cc__incl.map share/doc/usrp-${PKGVERSION}/html/test__usrp__standard__rx_8cc__incl.md5 share/doc/usrp-${PKGVERSION}/html/test__usrp__standard__rx_8cc__incl.png @@ -1180,6 +1177,9 @@ share/doc/usrp-${PKGVERSION}/html/time__stuff_8h__dep__incl.md5 share/doc/usrp-${PKGVERSION}/html/time__stuff_8h__dep__incl.png share/doc/usrp-${PKGVERSION}/html/time__stuff_8h_source.html share/doc/usrp-${PKGVERSION}/html/usrp__basic_8cc.html +share/doc/usrp-${PKGVERSION}/html/usrp__basic_8cc__dep__incl.map +share/doc/usrp-${PKGVERSION}/html/usrp__basic_8cc__dep__incl.md5 +share/doc/usrp-${PKGVERSION}/html/usrp__basic_8cc__dep__incl.png share/doc/usrp-${PKGVERSION}/html/usrp__basic_8cc__incl.map share/doc/usrp-${PKGVERSION}/html/usrp__basic_8cc__incl.md5 share/doc/usrp-${PKGVERSION}/html/usrp__basic_8cc__incl.png @@ -1201,13 +1201,13 @@ share/doc/usrp-${PKGVERSION}/html/usrp__cal__dc__offset_8cc__incl.map share/doc/usrp-${PKGVERSION}/html/usrp__cal__dc__offset_8cc__incl.md5 share/doc/usrp-${PKGVERSION}/html/usrp__cal__dc__offset_8cc__incl.png share/doc/usrp-${PKGVERSION}/html/usrp__config_8cc.html +share/doc/usrp-${PKGVERSION}/html/usrp__config_8cc__dep__incl.map +share/doc/usrp-${PKGVERSION}/html/usrp__config_8cc__dep__incl.md5 +share/doc/usrp-${PKGVERSION}/html/usrp__config_8cc__dep__incl.png share/doc/usrp-${PKGVERSION}/html/usrp__config_8cc__incl.map share/doc/usrp-${PKGVERSION}/html/usrp__config_8cc__incl.md5 share/doc/usrp-${PKGVERSION}/html/usrp__config_8cc__incl.png share/doc/usrp-${PKGVERSION}/html/usrp__config_8h.html -share/doc/usrp-${PKGVERSION}/html/usrp__config_8h__dep__incl.map -share/doc/usrp-${PKGVERSION}/html/usrp__config_8h__dep__incl.md5 -share/doc/usrp-${PKGVERSION}/html/usrp__config_8h__dep__incl.png share/doc/usrp-${PKGVERSION}/html/usrp__config_8h_source.html share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8cc.html share/doc/usrp-${PKGVERSION}/html/usrp__dbid_8cc__incl.map @@ -1231,6 +1231,9 @@ share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h__incl.md5 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h__incl.png share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h_source.html share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc.html +share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__dep__incl.map +share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__dep__incl.md5 +share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__dep__incl.png share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__incl.map share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__incl.md5 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__incl.png diff --git a/inputmethod/Chinput/patches/patch-aa b/inputmethod/Chinput/patches/patch-aa index 0dd1e85c4fd..7b5da738563 100644 --- a/inputmethod/Chinput/patches/patch-aa +++ b/inputmethod/Chinput/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/06/15 09:31:39 shell Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:18:43 agc Exp $ --- src/Makefile.orig Mon Jun 10 21:05:56 2002 +++ src/Makefile diff --git a/inputmethod/Chinput/patches/patch-ab b/inputmethod/Chinput/patches/patch-ab index 95ffe37e58d..283df298594 100644 --- a/inputmethod/Chinput/patches/patch-ab +++ b/inputmethod/Chinput/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/06/15 09:31:39 shell Exp $ +$NetBSD: patch-ab,v 1.1.1.1.58.1 2010/07/04 07:18:43 agc Exp $ --- src/XIM.h.orig Mon Jun 10 21:19:55 2002 +++ src/XIM.h diff --git a/inputmethod/Chinput/patches/patch-ac b/inputmethod/Chinput/patches/patch-ac index 5b5cece2002..9edf9673055 100644 --- a/inputmethod/Chinput/patches/patch-ac +++ b/inputmethod/Chinput/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/06/15 09:31:39 shell Exp $ +$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:18:43 agc Exp $ --- src/chinput.c.orig Mon Jun 10 21:16:56 2002 +++ src/chinput.c diff --git a/inputmethod/Chinput/patches/patch-ad b/inputmethod/Chinput/patches/patch-ad index 88b3844f261..5ce8ff8a4a6 100644 --- a/inputmethod/Chinput/patches/patch-ad +++ b/inputmethod/Chinput/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/06/15 09:31:39 shell Exp $ +$NetBSD: patch-ad,v 1.1.1.1.58.1 2010/07/04 07:18:43 agc Exp $ --- src/config.c.orig Mon Jun 10 22:53:45 2002 +++ src/config.c diff --git a/inputmethod/Chinput/patches/patch-ae b/inputmethod/Chinput/patches/patch-ae index bc5dd39a801..48082aa9106 100644 --- a/inputmethod/Chinput/patches/patch-ae +++ b/inputmethod/Chinput/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/06/15 09:31:39 shell Exp $ +$NetBSD: patch-ae,v 1.1.1.1.58.1 2010/07/04 07:18:43 agc Exp $ --- src/init.c.orig Mon Jun 10 21:23:44 2002 +++ src/init.c diff --git a/inputmethod/Chinput/patches/patch-af b/inputmethod/Chinput/patches/patch-af index 0eaefda5501..08fcccdc8ee 100644 --- a/inputmethod/Chinput/patches/patch-af +++ b/inputmethod/Chinput/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/06/15 09:31:39 shell Exp $ +$NetBSD: patch-af,v 1.1.1.1.58.1 2010/07/04 07:18:43 agc Exp $ --- resource/Chinput.ad.orig Mon Jun 10 21:55:02 2002 +++ resource/Chinput.ad diff --git a/inputmethod/scim-tomoe/Makefile b/inputmethod/scim-tomoe/Makefile index 42f1012e643..e7a516cd7a6 100644 --- a/inputmethod/scim-tomoe/Makefile +++ b/inputmethod/scim-tomoe/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:50 wiz Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2010/07/04 07:18:43 agc Exp $ # DISTNAME= scim-tomoe-0.6.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= inputmethod MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tomoe/} diff --git a/inputmethod/scim-tomoe/distinfo b/inputmethod/scim-tomoe/distinfo index 39bf607254a..d06ce4a5bdc 100644 --- a/inputmethod/scim-tomoe/distinfo +++ b/inputmethod/scim-tomoe/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2010/05/28 09:31:35 obache Exp $ +$NetBSD: distinfo,v 1.2.2.1 2010/07/04 07:18:43 agc Exp $ SHA1 (scim-tomoe-0.6.0.tar.gz) = 481ee2f8f9baa6105a349da36360aed06e432291 RMD160 (scim-tomoe-0.6.0.tar.gz) = c95059e7f594192c97b082aa61818060391a8591 Size (scim-tomoe-0.6.0.tar.gz) = 385126 bytes SHA1 (patch-aa) = 0554574908f37adae9d8771dcadce2e038c5857a -SHA1 (patch-ab) = 1c598b251d218a9f1da7c089dd51780e97108d40 +SHA1 (patch-ab) = b27e4074c5f3b18eb8969c66929c78f9f6ff8fe0 diff --git a/inputmethod/scim-tomoe/patches/patch-ab b/inputmethod/scim-tomoe/patches/patch-ab index eca48c8ba59..9946cf24cf3 100644 --- a/inputmethod/scim-tomoe/patches/patch-ab +++ b/inputmethod/scim-tomoe/patches/patch-ab @@ -1,18 +1,32 @@ -$NetBSD: patch-ab,v 1.1 2010/05/28 09:31:35 obache Exp $ +$NetBSD: patch-ab,v 1.1.2.1 2010/07/04 07:18:43 agc Exp $ -support gucharmap-2 +* GtkSpinButton: setting an adjustment with non-zero page size is deprecated +* support gucharmap-2 --- src/scim_tomoe_prefs_widget.cpp.orig 2007-05-07 07:49:15.000000000 +0000 +++ src/scim_tomoe_prefs_widget.cpp -@@ -472,9 +472,9 @@ apply_config (ScimTomoePrefsWidget *pref +@@ -170,7 +170,7 @@ create_spin_button (ScimTomoePrefsWidget + gtk_widget_show (label); + + GtkObject *adj = gtk_adjustment_new (value, min, max, step, +- page_size, page_size); ++ page_size, 0.0); + GtkWidget *spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.0, 0); + g_object_set_data (G_OBJECT (spin), + OBJECT_DATA_CONFIG_KEY, (gpointer) key); +@@ -472,9 +472,13 @@ apply_config (ScimTomoePrefsWidget *pref String (SCIM_TOMOE_CONFIG_UNICODE_TABLE_FONT_DEFAULT)); if (font.length() > 0) { - gucharmap_charmap_set_font (charmap, font.c_str ()); -+ gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(font.c_str ())); ++ PangoFontDescription *desc = pango_font_description_from_string(font.c_str ()); ++ gucharmap_charmap_set_font_desc (charmap, desc); ++ pango_font_description_free (desc); } else { - gucharmap_charmap_set_font (charmap, NULL); -+ gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(NULL)); ++ PangoFontDescription *desc = pango_font_description_new (); ++ gucharmap_charmap_set_font_desc (charmap, desc); ++ pango_font_description_free (desc); set_default_font (prefs, SCIM_TOMOE_CONFIG_CAND_FONT, GTK_WIDGET (charmap)); } diff --git a/inputmethod/skkfep/patches/patch-ab b/inputmethod/skkfep/patches/patch-ab index 8e27f43e81a..6eceff8aa09 100644 --- a/inputmethod/skkfep/patches/patch-ab +++ b/inputmethod/skkfep/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $ +$NetBSD: patch-ab,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- configs/netbsd.h.orig Tue Jul 7 00:31:13 1998 +++ configs/netbsd.h Mon Dec 20 23:53:25 1999 diff --git a/inputmethod/skkfep/patches/patch-ac b/inputmethod/skkfep/patches/patch-ac index a3ed20f125a..5aac5dff775 100644 --- a/inputmethod/skkfep/patches/patch-ac +++ b/inputmethod/skkfep/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $ +$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- Makefile.orig Tue Jul 7 00:31:14 1998 +++ Makefile Mon Dec 20 23:45:52 1999 diff --git a/inputmethod/skkfep/patches/patch-bb b/inputmethod/skkfep/patches/patch-bb index 4a433fa38ea..4ba1d8c320d 100644 --- a/inputmethod/skkfep/patches/patch-bb +++ b/inputmethod/skkfep/patches/patch-bb @@ -1,4 +1,4 @@ -$NetBSD: patch-bb,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $ +$NetBSD: patch-bb,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- connserv.c.orig Tue Jul 7 00:31:16 1998 +++ connserv.c Tue Nov 7 20:58:57 2000 diff --git a/inputmethod/skkfep/patches/patch-bd b/inputmethod/skkfep/patches/patch-bd index 13766383566..b1a2412f05b 100644 --- a/inputmethod/skkfep/patches/patch-bd +++ b/inputmethod/skkfep/patches/patch-bd @@ -1,4 +1,4 @@ -$NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $ +$NetBSD: patch-bd,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- fep.c.orig Tue Jul 7 00:31:16 1998 +++ fep.c Tue Dec 21 00:42:53 1999 diff --git a/inputmethod/skkfep/patches/patch-be b/inputmethod/skkfep/patches/patch-be index a7eacb8a21d..28e243767bd 100644 --- a/inputmethod/skkfep/patches/patch-be +++ b/inputmethod/skkfep/patches/patch-be @@ -1,4 +1,4 @@ -$NetBSD: patch-be,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $ +$NetBSD: patch-be,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- readwrite.c.orig Tue Jul 7 00:31:15 1998 +++ readwrite.c Sun Sep 27 10:24:06 1998 diff --git a/inputmethod/skkfep/patches/patch-bf b/inputmethod/skkfep/patches/patch-bf index b5e49156c22..c61afe5a8ba 100644 --- a/inputmethod/skkfep/patches/patch-bf +++ b/inputmethod/skkfep/patches/patch-bf @@ -1,4 +1,4 @@ -$NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $ +$NetBSD: patch-bf,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- stty.c.orig Wed Sep 23 01:22:53 1998 +++ stty.c Sun Sep 27 10:21:12 1998 diff --git a/inputmethod/skkfep/patches/patch-bg b/inputmethod/skkfep/patches/patch-bg index 954b5685280..c139be496cd 100644 --- a/inputmethod/skkfep/patches/patch-bg +++ b/inputmethod/skkfep/patches/patch-bg @@ -1,4 +1,4 @@ -$NetBSD: patch-bg,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $ +$NetBSD: patch-bg,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- skkfep.1.orig Tue Jul 7 00:31:16 1998 +++ skkfep.1 Sat Dec 25 17:28:26 1999 diff --git a/inputmethod/skkserv/patches/patch-aa b/inputmethod/skkserv/patches/patch-aa index 07c5161730c..027b983a05b 100644 --- a/inputmethod/skkserv/patches/patch-aa +++ b/inputmethod/skkserv/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- Makefile.in.orig Mon Feb 3 18:21:39 1997 +++ Makefile.in Tue Dec 21 20:03:09 1999 diff --git a/inputmethod/skkserv/patches/patch-ab b/inputmethod/skkserv/patches/patch-ab index d3e44ea1829..c0e47630e23 100644 --- a/inputmethod/skkserv/patches/patch-ab +++ b/inputmethod/skkserv/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $ +$NetBSD: patch-ab,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- configure.in.orig Mon Feb 3 17:02:01 1997 +++ configure.in Tue Dec 21 15:46:54 1999 diff --git a/inputmethod/skkserv/patches/patch-ac b/inputmethod/skkserv/patches/patch-ac index 37f8526a3c4..c9dfbaf2a9e 100644 --- a/inputmethod/skkserv/patches/patch-ac +++ b/inputmethod/skkserv/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $ +$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- config.h.in.orig Fri Jan 17 20:27:10 1997 +++ config.h.in Tue Dec 21 15:52:49 1999 diff --git a/inputmethod/skkserv/patches/patch-ad b/inputmethod/skkserv/patches/patch-ad index a2bb2976249..8e0190f7a14 100644 --- a/inputmethod/skkserv/patches/patch-ad +++ b/inputmethod/skkserv/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $ +$NetBSD: patch-ad,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- configure.orig Fri Feb 7 14:00:43 1997 +++ configure Tue Dec 21 15:46:55 1999 diff --git a/inputmethod/skkserv/patches/patch-ae b/inputmethod/skkserv/patches/patch-ae index 8963184631c..5ab2fe3f9f4 100644 --- a/inputmethod/skkserv/patches/patch-ae +++ b/inputmethod/skkserv/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $ +$NetBSD: patch-ae,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- skkserv/Makefile.in.orig Fri Feb 7 11:05:23 1997 +++ skkserv/Makefile.in Tue Dec 21 07:41:57 1999 diff --git a/inputmethod/skkserv/patches/patch-af b/inputmethod/skkserv/patches/patch-af index 2699f3f9c83..6845222b04f 100644 --- a/inputmethod/skkserv/patches/patch-af +++ b/inputmethod/skkserv/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:58 seb Exp $ +$NetBSD: patch-af,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- skkserv/skkserv.c.orig Tue Jan 21 04:16:36 1997 +++ skkserv/skkserv.c Mon Nov 6 00:12:57 2000 diff --git a/inputmethod/skkserv/patches/patch-bsearch b/inputmethod/skkserv/patches/patch-bsearch index 5cc1c2a22b7..913944ebbf0 100644 --- a/inputmethod/skkserv/patches/patch-bsearch +++ b/inputmethod/skkserv/patches/patch-bsearch @@ -1,4 +1,4 @@ -$NetBSD: patch-bsearch,v 1.1.1.1 2002/05/31 12:59:59 seb Exp $ +$NetBSD: patch-bsearch,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ Binary search patch. Originally from skk-users mailing list diff --git a/inputmethod/skkserv/patches/patch-jisyo b/inputmethod/skkserv/patches/patch-jisyo index d00792dab62..c939762d257 100644 --- a/inputmethod/skkserv/patches/patch-jisyo +++ b/inputmethod/skkserv/patches/patch-jisyo @@ -1,4 +1,4 @@ -$NetBSD: patch-jisyo,v 1.1.1.1 2002/05/31 12:59:59 seb Exp $ +$NetBSD: patch-jisyo,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ Dictionary (SKK-JISYO.L) corrigenda. Partially from skk-dic mailing list. diff --git a/inputmethod/tomoe-gtk/Makefile b/inputmethod/tomoe-gtk/Makefile index d207d925b00..95de888c772 100644 --- a/inputmethod/tomoe-gtk/Makefile +++ b/inputmethod/tomoe-gtk/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:50 wiz Exp $ +# $NetBSD: Makefile,v 1.7.2.1 2010/07/04 07:18:44 agc Exp $ # DISTNAME= tomoe-gtk-0.6.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= inputmethod MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tomoe/} diff --git a/inputmethod/tomoe-gtk/distinfo b/inputmethod/tomoe-gtk/distinfo index 82d9a2934f5..34d472fda20 100644 --- a/inputmethod/tomoe-gtk/distinfo +++ b/inputmethod/tomoe-gtk/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2010/05/14 11:02:20 obache Exp $ +$NetBSD: distinfo,v 1.2.2.1 2010/07/04 07:18:44 agc Exp $ SHA1 (tomoe-gtk-0.6.0.tar.gz) = dddb1178c437380a92b59dbc273dafdd2045e1d1 RMD160 (tomoe-gtk-0.6.0.tar.gz) = 72e0954b8994d1e62acb7d4cb0c478dadb54b8f0 Size (tomoe-gtk-0.6.0.tar.gz) = 448058 bytes SHA1 (patch-aa) = 7b185b3ec670661c5bcd85f3e1ef91729348b19c +SHA1 (patch-ab) = 3a06e51f7ca8ab0930a2482d6f006d883b88840d diff --git a/inputmethod/tomoe-gtk/patches/patch-ab b/inputmethod/tomoe-gtk/patches/patch-ab new file mode 100644 index 00000000000..fe48bf41f1d --- /dev/null +++ b/inputmethod/tomoe-gtk/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.1.2.2 2010/07/04 07:18:44 agc Exp $ + +Gtk-WARNING **: GtkSpinButton: setting an adjustment with non-zero page size is deprecated + +--- src/tomoe-reading-search.c.orig 2007-04-25 07:49:31.000000000 +0000 ++++ src/tomoe-reading-search.c +@@ -203,7 +203,7 @@ tomoe_reading_search_init (TomoeReadingS + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4); + /*gtk_widget_show (label);*/ + +- adj = gtk_adjustment_new (1.0, 1.0, 200.0, 1.0, 5.0, 5.0); ++ adj = gtk_adjustment_new (1.0, 1.0, 200.0, 1.0, 5.0, 0.0); + spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.0, 0); + priv->min_strokes_spin = spin; + g_signal_connect (G_OBJECT (spin), "value-changed", +@@ -217,7 +217,7 @@ tomoe_reading_search_init (TomoeReadingS + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4); + /*gtk_widget_show (label);*/ + +- adj = gtk_adjustment_new (20.0, 1.0, 200.0, 1.0, 5.0, 5.0); ++ adj = gtk_adjustment_new (20.0, 1.0, 200.0, 1.0, 5.0, 0.0); + spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.0, 0); + priv->max_strokes_spin = spin; + g_signal_connect (G_OBJECT (spin), "value-changed", diff --git a/inputmethod/unicon-im/patches/patch-aa b/inputmethod/unicon-im/patches/patch-aa index 92265ab60c7..c958a8e2904 100644 --- a/inputmethod/unicon-im/patches/patch-aa +++ b/inputmethod/unicon-im/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/06/15 09:29:15 shell Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- Makefile.in.orig Mon May 22 17:21:20 2000 +++ Makefile.in diff --git a/inputmethod/unicon-im/patches/patch-ac b/inputmethod/unicon-im/patches/patch-ac index 20601d7dd4e..55a9b932801 100644 --- a/inputmethod/unicon-im/patches/patch-ac +++ b/inputmethod/unicon-im/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/06/15 09:29:15 shell Exp $ +$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- server/TLS_Debug.hpp.orig Sat Jun 8 14:12:06 2002 +++ server/TLS_Debug.hpp diff --git a/inputmethod/unicon-im/patches/patch-ag b/inputmethod/unicon-im/patches/patch-ag index 97dc8e06fa8..737b87c3f80 100644 --- a/inputmethod/unicon-im/patches/patch-ag +++ b/inputmethod/unicon-im/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/06/15 09:29:16 shell Exp $ +$NetBSD: patch-ag,v 1.1.1.1.58.1 2010/07/04 07:18:44 agc Exp $ --- data/Makefile.in.orig Sat Jun 8 20:34:49 2002 +++ data/Makefile.in diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index 222efb46fc0..f93661322c3 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.158 2010/04/01 22:03:09 fhajny Exp $ +# $NetBSD: Makefile,v 1.158.4.1 2010/07/04 07:19:39 agc Exp $ .include "license.mk" DISTNAME= perl-5.10.1 CATEGORIES= lang devel perl5 -PKGREVISION= 1 +PKGREVISION= 2 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/5.0/,} DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index f14a552c5f8..9ed1059c06e 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.64 2010/04/01 22:03:09 fhajny Exp $ +$NetBSD: distinfo,v 1.64.4.1 2010/07/04 07:19:39 agc Exp $ SHA1 (perl-5.10.1.tar.gz) = 8536ed1c14444d1efea069525a816fbc7be7109f RMD160 (perl-5.10.1.tar.gz) = 6fe727a5e8878c26b5bd7cfc7165e10f311f7214 @@ -17,6 +17,7 @@ SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097 SHA1 (patch-cn) = 7ca2b1ff19f8371637a34ec26779b37d74c74cca SHA1 (patch-co) = c4a4e30171cebb1ceaa14850b9be99ffa7c94519 SHA1 (patch-db) = 3aef75518bfea88cb5166026f04ef4d7c016bc99 +SHA1 (patch-fa) = 0a496df9e340291a6162efb1b63b0420c2559be8 SHA1 (patch-ta) = 69f0d2df022eb8ff0dbcc77bde638cdc9c6391b1 SHA1 (patch-zc) = a23002397ffaebb243f7683c95c8fb227af90f49 SHA1 (patch-zd) = 1a4ae60e9ae350c813d8b91c61e93805b3e66210 diff --git a/lang/perl5/patches/patch-fa b/lang/perl5/patches/patch-fa new file mode 100644 index 00000000000..450672bad19 --- /dev/null +++ b/lang/perl5/patches/patch-fa @@ -0,0 +1,565 @@ +$NetBSD: patch-fa,v 1.1.4.2 2010/07/04 07:19:39 agc Exp $ + +fixes CVE-2010-1168 and CVE-2010-1447 by updating Safe.pm to the current +version + +--- ./ext/Safe/Safe.pm.orig 2009-08-22 18:39:32.000000000 +0000 ++++ ./ext/Safe/Safe.pm +@@ -2,8 +2,9 @@ package Safe; + + use 5.003_11; + use strict; ++use Scalar::Util qw(reftype); + +-$Safe::VERSION = "2.18"; ++$Safe::VERSION = "2.27"; + + # *** Don't declare any lexicals above this point *** + # +@@ -11,18 +12,18 @@ $Safe::VERSION = "2.18"; + # see any lexicals in scope (apart from __ExPr__ which is unavoidable) + + sub lexless_anon_sub { +- # $_[0] is package; +- # $_[1] is strict flag; ++ # $_[0] is package; ++ # $_[1] is strict flag; + my $__ExPr__ = $_[2]; # must be a lexical to create the closure that +- # can be used to pass the value into the safe +- # world ++ # can be used to pass the value into the safe ++ # world + + # Create anon sub ref in root of compartment. + # Uses a closure (on $__ExPr__) to pass in the code to be executed. + # (eval on one line to keep line numbers as expected by caller) + eval sprintf + 'package %s; %s strict; sub { @_=(); eval q[my $__ExPr__;] . $__ExPr__; }', +- $_[0], $_[1] ? 'use' : 'no'; ++ $_[0], $_[1] ? 'use' : 'no'; + } + + use Carp; +@@ -30,6 +31,18 @@ BEGIN { eval q{ + use Carp::Heavy; + } } + ++use B (); ++BEGIN { ++ no strict 'refs'; ++ if (defined &B::sub_generation) { ++ *sub_generation = \&B::sub_generation; ++ } ++ else { ++ # fake sub generation changing for perls < 5.8.9 ++ my $sg; *sub_generation = sub { ++$sg }; ++ } ++} ++ + use Opcode 1.01, qw( + opset opset_to_ops opmask_add + empty_opset full_opset invert_opset verify_opset +@@ -38,6 +51,23 @@ use Opcode 1.01, qw( + + *ops_to_opset = \&opset; # Temporary alias for old Penguins + ++# Regular expressions and other unicode-aware code may need to call ++# utf8->SWASHNEW (via perl's utf8.c). That will fail unless we share the ++# SWASHNEW method. ++# Sadly we can't just add utf8::SWASHNEW to $default_share because perl's ++# utf8.c code does a fetchmethod on SWASHNEW to check if utf8.pm is loaded, ++# and sharing makes it look like the method exists. ++# The simplest and most robust fix is to ensure the utf8 module is loaded when ++# Safe is loaded. Then we can add utf8::SWASHNEW to $default_share. ++require utf8; ++# we must ensure that utf8_heavy.pl, where SWASHNEW is defined, is loaded ++# but without depending on knowledge of that implementation detail. ++# This code (//i on a unicode string) ensures utf8 is fully loaded ++# and also loads the ToFold SWASH. ++# (Swashes are cached internally by perl in PL_utf8_* variables ++# independent of being inside/outside of Safe. So once loaded they can be) ++do { my $a = pack('U',0xC4); my $b = chr 0xE4; utf8::upgrade $b; $a =~ /$b/i }; ++# now we can safely include utf8::SWASHNEW in $default_share defined below. + + my $default_root = 0; + # share *_ and functions defined in universal.c +@@ -57,10 +87,15 @@ my $default_share = [qw[ + &utf8::downgrade + &utf8::native_to_unicode + &utf8::unicode_to_native ++ &utf8::SWASHNEW + $version::VERSION + $version::CLASS ++ $version::STRICT ++ $version::LAX + @version::ISA +-], ($] >= 5.008001 && qw[ ++], ($] < 5.010 && qw[ ++ &utf8::SWASHGET ++]), ($] >= 5.008001 && qw[ + &Regexp::DESTROY + ]), ($] >= 5.010 && qw[ + &re::is_regexp +@@ -93,6 +128,12 @@ my $default_share = [qw[ + &version::noop + &version::is_alpha + &version::qv ++ &version::vxs::declare ++ &version::vxs::qv ++ &version::vxs::_VERSION ++ &version::vxs::stringify ++ &version::vxs::new ++ &version::vxs::parse + ]), ($] >= 5.011 && qw[ + &re::regexp_pattern + ])]; +@@ -103,14 +144,14 @@ sub new { + bless $obj, $class; + + if (defined($root)) { +- croak "Can't use \"$root\" as root name" +- if $root =~ /^main\b/ or $root !~ /^\w[:\w]*$/; +- $obj->{Root} = $root; +- $obj->{Erase} = 0; ++ croak "Can't use \"$root\" as root name" ++ if $root =~ /^main\b/ or $root !~ /^\w[:\w]*$/; ++ $obj->{Root} = $root; ++ $obj->{Erase} = 0; + } + else { +- $obj->{Root} = "Safe::Root".$default_root++; +- $obj->{Erase} = 1; ++ $obj->{Root} = "Safe::Root".$default_root++; ++ $obj->{Erase} = 1; + } + + # use permit/deny methods instead till interface issues resolved +@@ -125,7 +166,9 @@ sub new { + # the whole glob *_ rather than $_ and @_ separately, otherwise + # @_ in non default packages within the compartment don't work. + $obj->share_from('main', $default_share); ++ + Opcode::_safe_pkg_prep($obj->{Root}) if($Opcode::VERSION > 1.04); ++ + return $obj; + } + +@@ -140,7 +183,7 @@ sub erase { + my ($stem, $leaf); + + no strict 'refs'; +- $pkg = "main::$pkg\::"; # expand to full symbol table name ++ $pkg = "main::$pkg\::"; # expand to full symbol table name + ($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/; + + # The 'my $foo' is needed! Without it you get an +@@ -149,7 +192,7 @@ sub erase { + + #warn "erase($pkg) stem=$stem, leaf=$leaf"; + #warn " stem_symtab hash ".scalar(%$stem_symtab)."\n"; +- # ", join(', ', %$stem_symtab),"\n"; ++ # ", join(', ', %$stem_symtab),"\n"; + + # delete $stem_symtab->{$leaf}; + +@@ -220,12 +263,12 @@ sub dump_mask { + } + + +- + sub share { + my($obj, @vars) = @_; + $obj->share_from(scalar(caller), \@vars); + } + ++ + sub share_from { + my $obj = shift; + my $pkg = shift; +@@ -236,26 +279,27 @@ sub share_from { + no strict 'refs'; + # Check that 'from' package actually exists + croak("Package \"$pkg\" does not exist") +- unless keys %{"$pkg\::"}; ++ unless keys %{"$pkg\::"}; + my $arg; + foreach $arg (@$vars) { +- # catch some $safe->share($var) errors: +- my ($var, $type); +- $type = $1 if ($var = $arg) =~ s/^(\W)//; +- # warn "share_from $pkg $type $var"; +- for (1..2) { # assign twice to avoid any 'used once' warnings +- *{$root."::$var"} = (!$type) ? \&{$pkg."::$var"} +- : ($type eq '&') ? \&{$pkg."::$var"} +- : ($type eq '$') ? \${$pkg."::$var"} +- : ($type eq '@') ? \@{$pkg."::$var"} +- : ($type eq '%') ? \%{$pkg."::$var"} +- : ($type eq '*') ? *{$pkg."::$var"} +- : croak(qq(Can't share "$type$var" of unknown type)); +- } ++ # catch some $safe->share($var) errors: ++ my ($var, $type); ++ $type = $1 if ($var = $arg) =~ s/^(\W)//; ++ # warn "share_from $pkg $type $var"; ++ for (1..2) { # assign twice to avoid any 'used once' warnings ++ *{$root."::$var"} = (!$type) ? \&{$pkg."::$var"} ++ : ($type eq '&') ? \&{$pkg."::$var"} ++ : ($type eq '$') ? \${$pkg."::$var"} ++ : ($type eq '@') ? \@{$pkg."::$var"} ++ : ($type eq '%') ? \%{$pkg."::$var"} ++ : ($type eq '*') ? *{$pkg."::$var"} ++ : croak(qq(Can't share "$type$var" of unknown type)); ++ } + } + $obj->share_record($pkg, $vars) unless $no_record or !$vars; + } + ++ + sub share_record { + my $obj = shift; + my $pkg = shift; +@@ -264,41 +308,137 @@ sub share_record { + # Record shares using keys of $obj->{Shares}. See reinit. + @{$shares}{@$vars} = ($pkg) x @$vars if @$vars; + } ++ ++ + sub share_redo { + my $obj = shift; + my $shares = \%{$obj->{Shares} ||= {}}; + my($var, $pkg); + while(($var, $pkg) = each %$shares) { +- # warn "share_redo $pkg\:: $var"; +- $obj->share_from($pkg, [ $var ], 1); ++ # warn "share_redo $pkg\:: $var"; ++ $obj->share_from($pkg, [ $var ], 1); + } + } ++ ++ + sub share_forget { + delete shift->{Shares}; + } + ++ + sub varglob { + my ($obj, $var) = @_; + no strict 'refs'; + return *{$obj->root()."::$var"}; + } + ++sub _clean_stash { ++ my ($root, $saved_refs) = @_; ++ $saved_refs ||= []; ++ no strict 'refs'; ++ foreach my $hook (qw(DESTROY AUTOLOAD), grep /^\(/, keys %$root) { ++ push @$saved_refs, \*{$root.$hook}; ++ delete ${$root}{$hook}; ++ } ++ ++ for (grep /::$/, keys %$root) { ++ next if \%{$root.$_} eq \%$root; ++ _clean_stash($root.$_, $saved_refs); ++ } ++} + + sub reval { + my ($obj, $expr, $strict) = @_; + my $root = $obj->{Root}; + +- my $evalsub = lexless_anon_sub($root,$strict, $expr); +- return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub); ++ my $evalsub = lexless_anon_sub($root, $strict, $expr); ++ # propagate context ++ my $sg = sub_generation(); ++ my @subret = (wantarray) ++ ? Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub) ++ : scalar Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub); ++ _clean_stash($root.'::') if $sg != sub_generation(); ++ $obj->wrap_code_refs_within(@subret); ++ return (wantarray) ? @subret : $subret[0]; + } + ++ ++sub wrap_code_refs_within { ++ my $obj = shift; ++ ++ $obj->_find_code_refs('wrap_code_ref', @_); ++} ++ ++ ++sub _find_code_refs { ++ my $obj = shift; ++ my $visitor = shift; ++ ++ for my $item (@_) { ++ my $reftype = $item && reftype $item ++ or next; ++ if ($reftype eq 'ARRAY') { ++ $obj->_find_code_refs($visitor, @$item); ++ } ++ elsif ($reftype eq 'HASH') { ++ $obj->_find_code_refs($visitor, values %$item); ++ } ++ # XXX GLOBs? ++ elsif ($reftype eq 'CODE') { ++ $item = $obj->$visitor($item); ++ } ++ } ++} ++ ++ ++sub wrap_code_ref { ++ my ($obj, $sub) = @_; ++ ++ # wrap code ref $sub with _safe_call_sv so that, when called, the ++ # execution will happen with the compartment fully 'in effect'. ++ ++ croak "Not a CODE reference" ++ if reftype $sub ne 'CODE'; ++ ++ my $ret = sub { ++ my @args = @_; # lexical to close over ++ my $sub_with_args = sub { $sub->(@args) }; ++ ++ my @subret; ++ my $error; ++ do { ++ local $@; # needed due to perl_call_sv(sv, G_EVAL|G_KEEPERR) ++ my $sg = sub_generation(); ++ @subret = (wantarray) ++ ? Opcode::_safe_call_sv($obj->{Root}, $obj->{Mask}, $sub_with_args) ++ : scalar Opcode::_safe_call_sv($obj->{Root}, $obj->{Mask}, $sub_with_args); ++ $error = $@; ++ _clean_stash($obj->{Root}.'::') if $sg != sub_generation(); ++ }; ++ if ($error) { # rethrow exception ++ $error =~ s/\t\(in cleanup\) //; # prefix added by G_KEEPERR ++ die $error; ++ } ++ return (wantarray) ? @subret : $subret[0]; ++ }; ++ ++ return $ret; ++} ++ ++ + sub rdo { + my ($obj, $file) = @_; + my $root = $obj->{Root}; + ++ my $sg = sub_generation(); + my $evalsub = eval +- sprintf('package %s; sub { @_ = (); do $file }', $root); +- return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub); ++ sprintf('package %s; sub { @_ = (); do $file }', $root); ++ my @subret = (wantarray) ++ ? Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub) ++ : scalar Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub); ++ _clean_stash($root.'::') if $sg != sub_generation(); ++ $obj->wrap_code_refs_within(@subret); ++ return (wantarray) ? @subret : $subret[0]; + } + + +@@ -390,15 +530,7 @@ of this software. + Your mileage will vary. If in any doubt B<do not use it>. + + +-=head2 RECENT CHANGES +- +-The interface to the Safe module has changed quite dramatically since +-version 1 (as supplied with Perl5.002). Study these pages carefully if +-you have code written to use Safe version 1 because you will need to +-makes changes. +- +- +-=head2 Methods in class Safe ++=head1 METHODS + + To create a new compartment, use + +@@ -417,9 +549,7 @@ object returned by the above constructor + is implicit in each case. + + +-=over 8 +- +-=item permit (OP, ...) ++=head2 permit (OP, ...) + + Permit the listed operators to be used when compiling code in the + compartment (in I<addition> to any operators already permitted). +@@ -427,29 +557,30 @@ compartment (in I<addition> to any opera + You can list opcodes by names, or use a tag name; see + L<Opcode/"Predefined Opcode Tags">. + +-=item permit_only (OP, ...) ++=head2 permit_only (OP, ...) + + Permit I<only> the listed operators to be used when compiling code in + the compartment (I<no> other operators are permitted). + +-=item deny (OP, ...) ++=head2 deny (OP, ...) + + Deny the listed operators from being used when compiling code in the + compartment (other operators may still be permitted). + +-=item deny_only (OP, ...) ++=head2 deny_only (OP, ...) + + Deny I<only> the listed operators from being used when compiling code +-in the compartment (I<all> other operators will be permitted). ++in the compartment (I<all> other operators will be permitted, so you probably ++don't want to use this method). + +-=item trap (OP, ...) ++=head2 trap (OP, ...) + +-=item untrap (OP, ...) ++=head2 untrap (OP, ...) + + The trap and untrap methods are synonyms for deny and permit + respectfully. + +-=item share (NAME, ...) ++=head2 share (NAME, ...) + + This shares the variable(s) in the argument list with the compartment. + This is almost identical to exporting variables using the L<Exporter> +@@ -465,9 +596,9 @@ for a glob (i.e. all symbol table entri + including scalar, array, hash, sub and filehandle). + + Each NAME is assumed to be in the calling package. See share_from +-for an alternative method (which share uses). ++for an alternative method (which C<share> uses). + +-=item share_from (PACKAGE, ARRAYREF) ++=head2 share_from (PACKAGE, ARRAYREF) + + This method is similar to share() but allows you to explicitly name the + package that symbols should be shared from. The symbol names (including +@@ -475,20 +606,29 @@ type characters) are supplied as an arra + + $safe->share_from('main', [ '$foo', '%bar', 'func' ]); + ++Names can include package names, which are relative to the specified PACKAGE. ++So these two calls have the same effect: ++ ++ $safe->share_from('Scalar::Util', [ 'reftype' ]); ++ $safe->share_from('main', [ 'Scalar::Util::reftype' ]); + +-=item varglob (VARNAME) ++=head2 varglob (VARNAME) + + This returns a glob reference for the symbol table entry of VARNAME in + the package of the compartment. VARNAME must be the B<name> of a +-variable without any leading type marker. For example, ++variable without any leading type marker. For example: ++ ++ ${$cpt->varglob('foo')} = "Hello world"; ++ ++has the same effect as: + + $cpt = new Safe 'Root'; + $Root::foo = "Hello world"; +- # Equivalent version which doesn't need to know $cpt's package name: +- ${$cpt->varglob('foo')} = "Hello world"; + ++but avoids the need to know $cpt's package name. + +-=item reval (STRING, STRICT) ++ ++=head2 reval (STRING, STRICT) + + This evaluates STRING as perl code inside the compartment. + +@@ -511,9 +651,9 @@ expression evaluated, or a return statem + subroutines and B<eval()>. The context (list or scalar) is determined + by the caller as usual. + +-This behaviour differs from the beta distribution of the Safe extension +-where earlier versions of perl made it hard to mimic the return +-behaviour of the eval() command and the context was always scalar. ++If the return value of reval() is (or contains) any code reference, ++those code references are wrapped to be themselves executed always ++in the compartment. See L</wrap_code_refs_within>. + + The formerly undocumented STRICT argument sets strictness: if true + 'use strict;' is used, otherwise it uses 'no strict;'. B<Note>: if +@@ -553,14 +693,12 @@ the code in the compartment. + A similar effect applies to I<all> runtime symbol lookups in code + called from a compartment but not compiled within it. + +- +- +-=item rdo (FILENAME) ++=head2 rdo (FILENAME) + + This evaluates the contents of file FILENAME inside the compartment. + See above documentation on the B<reval> method for further details. + +-=item root (NAMESPACE) ++=head2 root (NAMESPACE) + + This method returns the name of the package that is the root of the + compartment's namespace. +@@ -569,7 +707,7 @@ Note that this behaviour differs from ve + where the root module could be used to change the namespace. That + functionality has been withdrawn pending deeper consideration. + +-=item mask (MASK) ++=head2 mask (MASK) + + This is a get-or-set method for the compartment's operator mask. + +@@ -579,14 +717,34 @@ the compartment. + With the MASK argument present, it sets the operator mask for the + compartment (equivalent to calling the deny_only method). + +-=back ++=head2 wrap_code_ref (CODEREF) + ++Returns a reference to an anonymous subroutine that, when executed, will call ++CODEREF with the Safe compartment 'in effect'. In other words, with the ++package namespace adjusted and the opmask enabled. + +-=head2 Some Safety Issues ++Note that the opmask doesn't affect the already compiled code, it only affects ++any I<further> compilation that the already compiled code may try to perform. + +-This section is currently just an outline of some of the things code in +-a compartment might do (intentionally or unintentionally) which can +-have an effect outside the compartment. ++This is particularly useful when applied to code references returned from reval(). ++ ++(It also provides a kind of workaround for RT#60374: "Safe.pm sort {} bug with ++-Dusethreads". See L<http://rt.perl.org/rt3//Public/Bug/Display.html?id=60374> ++for I<much> more detail.) ++ ++=head2 wrap_code_refs_within (...) ++ ++Wraps any CODE references found within the arguments by replacing each with the ++result of calling L</wrap_code_ref> on the CODE reference. Any ARRAY or HASH ++references in the arguments are inspected recursively. ++ ++Returns nothing. ++ ++=head1 RISKS ++ ++This section is just an outline of some of the things code in a compartment ++might do (intentionally or unintentionally) which can have an effect outside ++the compartment. + + =over 8 + +@@ -624,7 +782,7 @@ but more subtle effect. + + =back + +-=head2 AUTHOR ++=head1 AUTHOR + + Originally designed and implemented by Malcolm Beattie. + diff --git a/lang/python26/Makefile b/lang/python26/Makefile index d8c4960d925..4deb6c65196 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2010/05/02 14:09:11 wiz Exp $ +# $NetBSD: Makefile,v 1.23.2.1 2010/07/04 07:19:40 agc Exp $ DISTNAME= Python-2.6.5 PKGNAME= ${DISTNAME:S/Python/python26/} +PKGREVISION= 1 CATEGORIES= lang python MASTER_SITES= http://www.python.org/ftp/python/2.6.5/ EXTRACT_SUFX= .tar.bz2 diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 9eacb078297..508979eecc3 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2010/05/02 14:09:11 wiz Exp $ +$NetBSD: distinfo,v 1.21.2.1 2010/07/04 07:19:40 agc Exp $ SHA1 (Python-2.6.5.tar.bz2) = 24c94f5428a8c94c9d0b316e3019fee721fdb5d1 RMD160 (Python-2.6.5.tar.bz2) = 909c6a13749396f2b19fed51821d3e2577b2833b @@ -8,6 +8,7 @@ SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026 SHA1 (patch-ac) = 858580a4e5c7474127eafb27bdfa96dc96cafad5 SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b +SHA1 (patch-af) = 42a93a321f6f480133513082c54bcab30e91445f SHA1 (patch-ah) = f973ac5a82ba5c665d2ec4b0f6130e903b5a5d7c SHA1 (patch-al) = d753e00ab65564a08988f7934870716aca9b02a9 SHA1 (patch-am) = 77f8ca811777d53d7a1972c177e59568dc49651b diff --git a/lang/python26/patches/patch-af b/lang/python26/patches/patch-af new file mode 100644 index 00000000000..8a15f6acb98 --- /dev/null +++ b/lang/python26/patches/patch-af @@ -0,0 +1,326 @@ +$NetBSD: patch-af,v 1.1.4.2 2010/07/04 07:19:40 agc Exp $ + +Fix for the memory corruption caused by the "audioop" module reported +in CVE-2010-2089. Patch taken from here: + +https://bugzilla.redhat.com/attachment.cgi?id=418359&action=diff + +--- Modules/audioop.c.orig 2010-06-29 09:09:00.000000000 +0100 ++++ Modules/audioop.c 2010-06-29 09:09:00.000000000 +0100 +@@ -295,6 +295,29 @@ + + static PyObject *AudioopError; + ++static int ++audioop_check_size(int size) ++{ ++ if ( size != 1 && size != 2 && size != 4 ) { ++ PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); ++ return 0; ++ } else { ++ return 1; ++ } ++} ++ ++static int ++audioop_check_parameters(int len, int size) ++{ ++ if (!audioop_check_size(size)) ++ return 0; ++ if ( len % size != 0 ) { ++ PyErr_SetString(AudioopError, "not a whole number of frames"); ++ return 0; ++ } ++ return 1; ++} ++ + static PyObject * + audioop_getsample(PyObject *self, PyObject *args) + { +@@ -304,10 +327,8 @@ + + if ( !PyArg_ParseTuple(args, "s#ii:getsample", &cp, &len, &size, &i) ) + return 0; +- if ( size != 1 && size != 2 && size != 4 ) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + if ( i < 0 || i >= len/size ) { + PyErr_SetString(AudioopError, "Index out of range"); + return 0; +@@ -328,10 +349,8 @@ + + if ( !PyArg_ParseTuple(args, "s#i:max", &cp, &len, &size) ) + return 0; +- if ( size != 1 && size != 2 && size != 4 ) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + for ( i=0; i<len; i+= size) { + if ( size == 1 ) val = (int)*CHARP(cp, i); + else if ( size == 2 ) val = (int)*SHORTP(cp, i); +@@ -352,10 +371,8 @@ + + if (!PyArg_ParseTuple(args, "s#i:minmax", &cp, &len, &size)) + return NULL; +- if (size != 1 && size != 2 && size != 4) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); ++ if (!audioop_check_parameters(len, size)) + return NULL; +- } + for (i = 0; i < len; i += size) { + if (size == 1) val = (int) *CHARP(cp, i); + else if (size == 2) val = (int) *SHORTP(cp, i); +@@ -376,10 +393,8 @@ + + if ( !PyArg_ParseTuple(args, "s#i:avg", &cp, &len, &size) ) + return 0; +- if ( size != 1 && size != 2 && size != 4 ) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + for ( i=0; i<len; i+= size) { + if ( size == 1 ) val = (int)*CHARP(cp, i); + else if ( size == 2 ) val = (int)*SHORTP(cp, i); +@@ -403,10 +418,8 @@ + + if ( !PyArg_ParseTuple(args, "s#i:rms", &cp, &len, &size) ) + return 0; +- if ( size != 1 && size != 2 && size != 4 ) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + for ( i=0; i<len; i+= size) { + if ( size == 1 ) val = (int)*CHARP(cp, i); + else if ( size == 2 ) val = (int)*SHORTP(cp, i); +@@ -614,10 +627,8 @@ + + if ( !PyArg_ParseTuple(args, "s#i:avgpp", &cp, &len, &size) ) + return 0; +- if ( size != 1 && size != 2 && size != 4 ) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + /* Compute first delta value ahead. Also automatically makes us + ** skip the first extreme value + */ +@@ -671,10 +682,8 @@ + + if ( !PyArg_ParseTuple(args, "s#i:maxpp", &cp, &len, &size) ) + return 0; +- if ( size != 1 && size != 2 && size != 4 ) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + /* Compute first delta value ahead. Also automatically makes us + ** skip the first extreme value + */ +@@ -722,10 +731,8 @@ + + if ( !PyArg_ParseTuple(args, "s#i:cross", &cp, &len, &size) ) + return 0; +- if ( size != 1 && size != 2 && size != 4 ) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + ncross = -1; + prevval = 17; /* Anything <> 0,1 */ + for ( i=0; i<len; i+= size) { +@@ -750,6 +757,8 @@ + + if ( !PyArg_ParseTuple(args, "s#id:mul", &cp, &len, &size, &factor ) ) + return 0; ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + + if ( size == 1 ) maxval = (double) 0x7f; + else if ( size == 2 ) maxval = (double) 0x7fff; +@@ -792,6 +801,12 @@ + if ( !PyArg_ParseTuple(args, "s#idd:tomono", + &cp, &len, &size, &fac1, &fac2 ) ) + return 0; ++ if (!audioop_check_parameters(len, size)) ++ return NULL; ++ if ( ((len / size) & 1) != 0 ) { ++ PyErr_SetString(AudioopError, "not a whole number of frames"); ++ return NULL; ++ } + + if ( size == 1 ) maxval = (double) 0x7f; + else if ( size == 2 ) maxval = (double) 0x7fff; +@@ -837,6 +852,8 @@ + if ( !PyArg_ParseTuple(args, "s#idd:tostereo", + &cp, &len, &size, &fac1, &fac2 ) ) + return 0; ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + + if ( size == 1 ) maxval = (double) 0x7f; + else if ( size == 2 ) maxval = (double) 0x7fff; +@@ -896,7 +913,8 @@ + if ( !PyArg_ParseTuple(args, "s#s#i:add", + &cp1, &len1, &cp2, &len2, &size ) ) + return 0; +- ++ if (!audioop_check_parameters(len1, size)) ++ return NULL; + if ( len1 != len2 ) { + PyErr_SetString(AudioopError, "Lengths should be the same"); + return 0; +@@ -950,11 +968,8 @@ + if ( !PyArg_ParseTuple(args, "s#ii:bias", + &cp, &len, &size , &bias) ) + return 0; +- +- if ( size != 1 && size != 2 && size != 4) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + + rv = PyString_FromStringAndSize(NULL, len); + if ( rv == 0 ) +@@ -986,12 +1001,9 @@ + if ( !PyArg_ParseTuple(args, "s#i:reverse", + &cp, &len, &size) ) + return 0; ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + +- if ( size != 1 && size != 2 && size != 4 ) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } +- + rv = PyString_FromStringAndSize(NULL, len); + if ( rv == 0 ) + return 0; +@@ -1023,12 +1035,10 @@ + if ( !PyArg_ParseTuple(args, "s#ii:lin2lin", + &cp, &len, &size, &size2) ) + return 0; +- +- if ( (size != 1 && size != 2 && size != 4) || +- (size2 != 1 && size2 != 2 && size2 != 4)) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; ++ if (!audioop_check_size(size2)) ++ return NULL; + + new_len = (len/size)*size2; + if (new_len < 0) { +@@ -1080,10 +1090,8 @@ + &nchannels, &inrate, &outrate, &state, + &weightA, &weightB)) + return NULL; +- if (size != 1 && size != 2 && size != 4) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); ++ if (!audioop_check_size(size)) + return NULL; +- } + if (nchannels < 1) { + PyErr_SetString(AudioopError, "# of channels should be >= 1"); + return NULL; +@@ -1269,11 +1277,8 @@ + if ( !PyArg_ParseTuple(args, "s#i:lin2ulaw", + &cp, &len, &size) ) + return 0 ; +- +- if ( size != 1 && size != 2 && size != 4) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + + rv = PyString_FromStringAndSize(NULL, len/size); + if ( rv == 0 ) +@@ -1303,11 +1308,8 @@ + if ( !PyArg_ParseTuple(args, "s#i:ulaw2lin", + &cp, &len, &size) ) + return 0; +- +- if ( size != 1 && size != 2 && size != 4) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_size(size)) ++ return NULL; + + new_len = len*size; + if (new_len < 0) { +@@ -1343,11 +1345,8 @@ + if ( !PyArg_ParseTuple(args, "s#i:lin2alaw", + &cp, &len, &size) ) + return 0; +- +- if ( size != 1 && size != 2 && size != 4) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + + rv = PyString_FromStringAndSize(NULL, len/size); + if ( rv == 0 ) +@@ -1377,11 +1376,8 @@ + if ( !PyArg_ParseTuple(args, "s#i:alaw2lin", + &cp, &len, &size) ) + return 0; +- +- if ( size != 1 && size != 2 && size != 4) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_size(size)) ++ return NULL; + + new_len = len*size; + if (new_len < 0) { +@@ -1418,12 +1414,8 @@ + if ( !PyArg_ParseTuple(args, "s#iO:lin2adpcm", + &cp, &len, &size, &state) ) + return 0; +- +- +- if ( size != 1 && size != 2 && size != 4) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_parameters(len, size)) ++ return NULL; + + str = PyString_FromStringAndSize(NULL, len/(size*2)); + if ( str == 0 ) +@@ -1526,11 +1518,8 @@ + if ( !PyArg_ParseTuple(args, "s#iO:adpcm2lin", + &cp, &len, &size, &state) ) + return 0; +- +- if ( size != 1 && size != 2 && size != 4) { +- PyErr_SetString(AudioopError, "Size should be 1, 2 or 4"); +- return 0; +- } ++ if (!audioop_check_size(size)) ++ return NULL; + + /* Decode state, should have (value, step) */ + if ( state == Py_None ) { diff --git a/mail/cone/Makefile b/mail/cone/Makefile index c79a27847ef..030cb7c64ce 100644 --- a/mail/cone/Makefile +++ b/mail/cone/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2010/05/18 13:24:15 adam Exp $ +# $NetBSD: Makefile,v 1.7.2.1 2010/07/04 07:20:39 agc Exp $ DISTNAME= cone-0.83 +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} EXTRACT_SUFX= .tar.bz2 diff --git a/mail/cone/PLIST b/mail/cone/PLIST index 292f74a407a..7da76bc9db1 100644 --- a/mail/cone/PLIST +++ b/mail/cone/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2010/05/18 13:24:15 adam Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2010/07/04 07:20:39 agc Exp $ bin/cone bin/leaf bin/mailtool @@ -64,6 +64,11 @@ share/cone/cone06newaccount.html share/cone/cone07remoteconfig.html share/cone/cone08gpg.html share/cone/cone09masterpassword.html +share/cone/cone10certificates.html +share/cone/cone11encryption.html +share/cone/cone12filters.html +share/cone/cone13addressbook.html +share/cone/cone14ldapaddressbook.html share/cone/conn.html share/cone/cppnamespace.html share/cone/emailaddress.html diff --git a/mail/demime/patches/patch-aa b/mail/demime/patches/patch-aa index 9ef1c8db102..cd808101d5c 100644 --- a/mail/demime/patches/patch-aa +++ b/mail/demime/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/06/07 12:21:09 tron Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:20:39 agc Exp $ --- demime.stable.orig Wed Apr 17 17:08:40 2002 +++ demime.stable diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile index 85af0d1bd7e..f059ae3e316 100644 --- a/mail/exim3/Makefile +++ b/mail/exim3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2010/03/21 16:29:41 wiz Exp $ +# $NetBSD: Makefile,v 1.37.4.1 2010/07/04 07:20:40 agc Exp $ DISTNAME= exim-3.36 PKGREVISION= 7 @@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.exim.org/ COMMENT= The Exim mail transfer agent, a replacement for sendmail +PKG_DESTDIR_SUPPORT = user-destdir MAKE_JOBS_SAFE= no CONFLICTS+= exim-exiscan-[0-9]* @@ -19,7 +20,6 @@ BUILD_DEFS+= EXIM_DB.mysql EXIM_DB.pgsql PKG_SYSCONFSUBDIR?= exim EGDIR= ${PREFIX}/share/examples/exim -MAKE_ENV+= INST_CONFIGURE_FILE="${EGDIR}/configure" CONF_FILES= ${EGDIR}/configure ${PKG_SYSCONFDIR}/configure MESSAGE_SUBST+= EGDIR="${EGDIR}" @@ -84,6 +84,10 @@ SUBST_STAGE.paths= post-patch INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/examples/exim +INSTALL_ENV+= INST_BIN_DIRECTORY=${DESTDIR}${PREFIX}/sbin \ + INST_CONFIGURE_FILE=${DESTDIR}${EGDIR}/configure \ + INST_UID=${ROOT_USER} + post-extract: ${CP} ${FILESDIR}/Makefile-DragonFly ${FILESDIR}/os.h-DragonFly \ ${WRKSRC}/OS/ @@ -103,9 +107,9 @@ pre-configure: done post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/exim_newaliases ${PREFIX}/sbin/exim_newaliases - ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR} - ${CP} ${FILESDIR}/exim.8 ${PREFIX}/${PKGMANDIR}/man8/exim.8 + ${INSTALL_SCRIPT} ${WRKDIR}/exim_newaliases ${DESTDIR}${PREFIX}/sbin/exim_newaliases + ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${DESTDIR}${EGDIR} + ${CP} ${FILESDIR}/exim.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/exim.8 .include "../../devel/pcre/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile index 78cf0215c50..aa687f4e132 100644 --- a/mail/getmail/Makefile +++ b/mail/getmail/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.94 2010/04/30 21:56:19 schmonz Exp $ +# $NetBSD: Makefile,v 1.94.2.1 2010/07/04 07:20:40 agc Exp $ -DISTNAME= getmail-4.17.0 +DISTNAME= getmail-4.20.0 CATEGORIES= mail MASTER_SITES= ${HOMEPAGE}old-versions/ diff --git a/mail/getmail/distinfo b/mail/getmail/distinfo index 4b3612fb50e..e508b4af7ea 100644 --- a/mail/getmail/distinfo +++ b/mail/getmail/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.80 2010/04/30 21:56:19 schmonz Exp $ +$NetBSD: distinfo,v 1.80.2.1 2010/07/04 07:20:40 agc Exp $ -SHA1 (getmail-4.17.0.tar.gz) = c3a480b56c17a6fedec36468511094c914175232 -RMD160 (getmail-4.17.0.tar.gz) = 3decaa01651391f671baaa54b0debcbcff3e8d1f -Size (getmail-4.17.0.tar.gz) = 156472 bytes -SHA1 (patch-aa) = ede8c22fb5b0908d71f0001b2bde7e03706a6506 +SHA1 (getmail-4.20.0.tar.gz) = 999e8987ff8321291eca507549ce5e8ce0e65030 +RMD160 (getmail-4.20.0.tar.gz) = bdf20ee8e30f3b1a1f087627e86003befa995fee +Size (getmail-4.20.0.tar.gz) = 156907 bytes +SHA1 (patch-aa) = 323d0e91dbdb782b4c2f768bf92047b6a063cf78 diff --git a/mail/getmail/patches/patch-aa b/mail/getmail/patches/patch-aa index bd5195f6512..9d9e57ea587 100644 --- a/mail/getmail/patches/patch-aa +++ b/mail/getmail/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.6 2008/02/19 10:34:07 schmonz Exp $ +$NetBSD: patch-aa,v 1.6.24.1 2010/07/04 07:20:40 agc Exp $ ---- setup.py.orig 2007-11-23 11:26:55.000000000 -0500 +--- setup.py.orig 2007-11-23 16:26:55.000000000 +0000 +++ setup.py @@ -39,12 +39,11 @@ GETMAILDOCDIR = os.path.join( datadir or prefix, diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index f8168efe721..fdaf3a8d0e5 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2010/02/10 19:17:40 joerg Exp $ +# $NetBSD: Makefile,v 1.60.4.1 2010/07/04 07:20:40 agc Exp $ DISTNAME= mailman-2.1.12 PKGREVISION= 1 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.list.org/ COMMENT= The GNU Mailing List Manager +PKG_DESTDIR_SUPPORT= destdir + .include "../../mk/bsd.prefs.mk" PKG_SYSCONFSUBDIR?= httpd @@ -39,6 +41,7 @@ PLIST_SUBST+= MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//} PKG_GROUPS_VARS+= MAILMAN_GROUP MAILMAN_CGIGROUP MAILMAN_MAILGROUP PKG_USERS_VARS+= MAILMAN_USER +USERGROUP_PHASE= pre-install PKG_GROUPS= ${MAILMAN_GROUP} PKG_USERS= ${MAILMAN_USER}:${MAILMAN_GROUP} @@ -108,24 +111,24 @@ post-patch: ${RM} -f ${WRKSRC}/[A-Z]*.orig pre-install: - ${INSTALL} -d -o ${MAILMAN_USER} -g ${MAILMAN_GROUP} -m 775 ${EXECDIR} - ${INSTALL_DATA_DIR} ${DOCDIR} - ${INSTALL_DATA_DIR} ${EXECDIR}/support + ${INSTALL} -d -o ${MAILMAN_USER} -g ${MAILMAN_GROUP} -m 775 ${DESTDIR}${EXECDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${EXECDIR}/support post-install: cd ${WRKSRC} && for i in [A-IN-U]*; do \ - ${INSTALL_DATA} $$i ${DOCDIR}/; \ + ${INSTALL_DATA} $$i ${DESTDIR}${DOCDIR}/; \ done cd ${WRKSRC}/doc && for i in \ mailman-*.ps mailman-*.pdf mailman-*.txt; do \ - ${INSTALL_DATA} $$i ${DOCDIR}/; \ + ${INSTALL_DATA} $$i ${DESTDIR}${DOCDIR}/; \ done - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKDIR}/mailman.conf.dist ${EGDIR}/mailman.conf - ${CHOWN} -R root:${MAILMAN_GROUP} ${EXECDIR} - ${CHMOD} -R g+w ${EXECDIR} - ${CHMOD} g+s ${EXECDIR}/cgi-bin/* - ${PY_COMPILE_ALL} ${PREFIX}/lib/mailman/bin ${PREFIX}/lib/mailman/cron ${PREFIX}/lib/mailman/scripts + ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKDIR}/mailman.conf.dist ${DESTDIR}${EGDIR}/mailman.conf + ${CHOWN} -R root:${MAILMAN_GROUP} ${DESTDIR}${EXECDIR} + ${CHMOD} -R g+w ${DESTDIR}${EXECDIR} + ${CHMOD} g+s ${DESTDIR}${EXECDIR}/cgi-bin/* + ${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/lib/mailman/bin ${DESTDIR}${PREFIX}/lib/mailman/cron ${DESTDIR}${PREFIX}/lib/mailman/scripts .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo index bb125b644c4..e5d162158b9 100644 --- a/mail/mailman/distinfo +++ b/mail/mailman/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2009/06/03 06:55:07 adam Exp $ +$NetBSD: distinfo,v 1.17.10.1 2010/07/04 07:20:40 agc Exp $ SHA1 (mailman-2.1.12.tgz) = 6d6281f7ce322e271f0259321f4d8931ff46e6ae RMD160 (mailman-2.1.12.tgz) = 94d8d132bb37180bf4c02ccd2a5fb3862ce13b94 Size (mailman-2.1.12.tgz) = 8010027 bytes -SHA1 (patch-aa) = 77235e964da9d2b0c2725cd7d47c247b0356a45d +SHA1 (patch-aa) = 3f32d6de2e05c638b6915d64bbc7a70e12ce4470 SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30 SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2 diff --git a/mail/mailman/patches/patch-aa b/mail/mailman/patches/patch-aa index da2d703031d..575cad64ed7 100644 --- a/mail/mailman/patches/patch-aa +++ b/mail/mailman/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.5 2009/06/03 06:58:55 adam Exp $ +$NetBSD: patch-aa,v 1.5.10.1 2010/07/04 07:20:40 agc Exp $ ---- misc/Makefile.in.orig 2009-02-23 22:23:35.000000000 +0100 +--- misc/Makefile.in.orig 2009-02-23 21:23:35.000000000 +0000 +++ misc/Makefile.in @@ -41,7 +41,7 @@ DEFS= @DEFS@ OPT= @OPT@ @@ -11,7 +11,17 @@ $NetBSD: patch-aa,v 1.5 2009/06/03 06:58:55 adam Exp $ ICONDIR= $(prefix)/icons SCRIPTSDIR= $(prefix)/scripts -@@ -99,6 +99,7 @@ install-packages: +@@ -91,14 +91,15 @@ install-other: + $(INSTALL) -m $(FILEMODE) sitelist.cfg $(DESTDIR)$(DATADIR) + + install-packages: +- if [ -z "$(EMAILPKG)" -a -d $(PYTHONLIBDIR)/email ] ; \ ++ if [ -z "$(DESTDIR)$(EMAILPKG)" -a -d $(DESTDIR)$(PYTHONLIBDIR)/email ] ; \ + then \ +- rm -rf $(PYTHONLIBDIR)/email* ; \ ++ rm -rf $(DESTDIR)$(PYTHONLIBDIR)/email* ; \ + fi + for p in $(PACKAGES); \ do \ gunzip -c $(srcdir)/$$p.tar.gz | (cd $(PKGDIR) ; tar xf -); \ (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \ diff --git a/mail/solid-pop3d/MESSAGE b/mail/solid-pop3d/MESSAGE index 33874fe214f..a9dfa2fb9d0 100644 --- a/mail/solid-pop3d/MESSAGE +++ b/mail/solid-pop3d/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2002/05/12 16:54:45 hubertf Exp $ +$NetBSD: MESSAGE,v 1.1.1.1.58.1 2010/07/04 07:20:40 agc Exp $ The config file for ${PKGNAME} must be located at ${PKG_SYSCONFDIR} Example files are located at ${EGDIR} diff --git a/mail/solid-pop3d/PLIST.apop b/mail/solid-pop3d/PLIST.apop index 873da03dc2b..0334ca0ad63 100644 --- a/mail/solid-pop3d/PLIST.apop +++ b/mail/solid-pop3d/PLIST.apop @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST.apop,v 1.1.1.1 2002/05/12 16:54:45 hubertf Exp $ +@comment $NetBSD: PLIST.apop,v 1.1.1.1.58.1 2010/07/04 07:20:40 agc Exp $ man/man1/pop_auth.1 diff --git a/mail/solid-pop3d/patches/patch-aa b/mail/solid-pop3d/patches/patch-aa index b37a16dfce3..7ff493a2a8a 100644 --- a/mail/solid-pop3d/patches/patch-aa +++ b/mail/solid-pop3d/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/12 16:54:45 hubertf Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:20:41 agc Exp $ --- configure Mon May 6 01:06:20 2002 +++ configure Mon May 6 01:06:28 2002 diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index c98c5f6f835..2302b07bdf8 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch.mk,v 1.43 2009/07/15 09:40:30 joerg Exp $ +# $NetBSD: fetch.mk,v 1.43.8.1 2010/07/04 07:22:09 agc Exp $ _MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} @@ -188,27 +188,35 @@ fetch-check-interactive: .USEBEFORE # to try to resume interrupted file transfers to avoid downloading # the whole file. The default is set in pkgsrc/mk/defaults/mk.conf. # +# FETCH_TIMEOUT, if defined, will cause the fetch command to quit on stalled +# connections after the given amount of seconds. +# The specific behavior depends on the command used. +# # If this host is behind a filtering firewall, use passive ftp(1) -_FETCH_BEFORE_ARGS.ftp= ${PASSIVE_FETCH:D-p} +_FETCH_BEFORE_ARGS.ftp= ${PASSIVE_FETCH:D-p} \ + ${FETCH_TIMEOUT:D-q ${FETCH_TIMEOUT}} _FETCH_AFTER_ARGS.ftp= # empty _FETCH_RESUME_ARGS.ftp= -R _FETCH_OUTPUT_ARGS.ftp= -o _FETCH_CMD.ftp= ${TOOLS_PATH.ftp} -_FETCH_BEFORE_ARGS.fetch= # empty +_FETCH_BEFORE_ARGS.fetch= ${FETCH_TIMEOUT:D-T ${FETCH_TIMEOUT}} _FETCH_AFTER_ARGS.fetch= # empty _FETCH_RESUME_ARGS.fetch= -r _FETCH_OUTPUT_ARGS.fetch= -o _FETCH_CMD.fetch= ${TOOLS_PATH.fetch} -_FETCH_BEFORE_ARGS.wget= ${PASSIVE_FETCH:D--passive-ftp} +_FETCH_BEFORE_ARGS.wget= ${PASSIVE_FETCH:D--passive-ftp} \ + ${FETCH_TIMEOUT:D--timeout=${FETCH_TIMEOUT}} _FETCH_AFTER_ARGS.wget= # empty _FETCH_RESUME_ARGS.wget= -c _FETCH_OUTPUT_ARGS.wget= -O _FETCH_CMD.wget= ${PREFIX}/bin/wget -_FETCH_BEFORE_ARGS.curl= ${PASSIVE_FETCH:D--ftp-pasv} +_FETCH_BEFORE_ARGS.curl= ${PASSIVE_FETCH:D--ftp-pasv} \ + ${FETCH_TIMEOUT:D--connect-timeout=${FETCH_TIMEOUT}} \ + ${FETCH_TIMEOUT:D--speed-time=${FETCH_TIMEOUT}} _FETCH_AFTER_ARGS.curl= -O # must be here to honor -o option _FETCH_RESUME_ARGS.curl= -C - _FETCH_OUTPUT_ARGS.curl= -o diff --git a/net/edonkey2k/PLIST b/net/edonkey2k/PLIST index 12d8c111c22..d7416b64134 100644 --- a/net/edonkey2k/PLIST +++ b/net/edonkey2k/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/16 20:57:48 wiz Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:23:31 agc Exp $ bin/donkey diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 93617f141ed..c455ebf4c57 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2010/05/29 08:51:11 joerg Exp $ +# $NetBSD: Makefile,v 1.70.2.1 2010/07/04 07:23:31 agc Exp $ DISTNAME= freeradius-${RADVER} PKGREVISION= 4 @@ -11,6 +11,7 @@ COMMENT= Free RADIUS server implementation CONFLICTS+= freeradius-2.[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no .include "../../mk/bsd.prefs.mk" @@ -138,19 +139,15 @@ post-build: ${CP} ${PKGDIR:Q}/MESSAGE.pam ${WRKDIR:Q}/.MESSAGE_SRC.pam .endif +INSTALLATION_DIRS+= ${EGDIR}/certs/demoCA +INSTALL_ENV+= R=${DESTDIR} +MAKE_DIRS_PERMS+= ${PKG_SYSCONFDIR}/certs ${RADIUS_USER} ${RADIUS_GROUP} 0750 +MAKE_DIRS_PERMS+= ${PKG_SYSCONFDIR}/certs/demoCA ${RADIUS_USER} ${RADIUS_GROUP} 0750 + post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA_DIR} ${EGDIR}/certs - ${INSTALL_DATA_DIR} ${EGDIR}/certs/demoCA .for f in ${EGFILES} - ${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${EGDIR}/${f} + ${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${DESTDIR}${EGDIR}/${f} .endfor - ${INSTALL_SCRIPT} ${WRKSRC}/src/modules/rlm_perl/example.pl ${EGDIR} - ${MKDIR} ${PKG_SYSCONFDIR}/certs - ${MKDIR} ${PKG_SYSCONFDIR}/certs/demoCA - ${CHOWN} ${RADIUS_USER}:${RADIUS_GROUP} ${PKG_SYSCONFDIR}/certs - ${CHOWN} ${RADIUS_USER}:${RADIUS_GROUP} ${PKG_SYSCONFDIR}/certs/demoCA - ${CHMOD} 0750 ${PKG_SYSCONFDIR}/certs - ${CHMOD} 0750 ${PKG_SYSCONFDIR}/certs/demoCA + ${INSTALL_SCRIPT} ${WRKSRC}/src/modules/rlm_perl/example.pl ${DESTDIR}${EGDIR} .include "../../mk/bsd.pkg.mk" diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index bfad674eb55..9c1a8066a35 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:10 wiz Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2010/07/04 07:23:31 agc Exp $ # DISTNAME= gtk-vnc-0.3.10 @@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= pkg-config intltool +USE_TOOLS+= pkg-config msgfmt intltool PKGCONFIG_OVERRIDE+= gtk-vnc-1.0.pc.in PY_PATCHPLIST= yes diff --git a/net/hobbitclient/Makefile b/net/hobbitclient/Makefile index d927110e65f..2054950dd62 100644 --- a/net/hobbitclient/Makefile +++ b/net/hobbitclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2009/08/31 22:00:30 he Exp $ +# $NetBSD: Makefile,v 1.10.8.1 2010/07/04 07:23:32 agc Exp $ # DISTNAME= hobbit-4.2.0 @@ -46,6 +46,7 @@ PKG_HOME.${BBUSER}= ${BBTOPDIR} PKG_GROUPS_VARS+= BBGROUP PKG_USERS_VARS+= BBUSER +USERGROUP_PHASE= pre-install CONFIGURE_ARGS+="--client" diff --git a/net/irrd/MESSAGE b/net/irrd/MESSAGE index 2b5a76bbb96..4ccd5e5cd0a 100644 --- a/net/irrd/MESSAGE +++ b/net/irrd/MESSAGE @@ -1,4 +1,6 @@ =========================================================================== +$NetBSD: MESSAGE,v 1.1.4.1 2010/07/04 07:23:32 agc Exp $ +=========================================================================== The useful user documentation is ${PREFIX}/share/doc/irrd/irrd-user.pdf or ${PREFIX}/share/doc/irrd/irrd-user.sgml diff --git a/net/irrd/Makefile b/net/irrd/Makefile index 48c7faffa88..941451f08f6 100644 --- a/net/irrd/Makefile +++ b/net/irrd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2010/02/23 20:37:05 spz Exp $ +# $NetBSD: Makefile,v 1.42.4.1 2010/07/04 07:23:32 agc Exp $ DISTNAME= irrd2.3.9 PKGNAME= irrd-2.3.9 @@ -21,6 +21,8 @@ USE_TOOLS+= automake autoconf flex perl:run yacc WRKSRC= ${WRKDIR}/${DISTNAME}/src +BUILD_DEFS+= VARBASE + PKG_SYSCONFSUBDIR= irrd EGDIR= ${PREFIX}/share/examples/irrd DOCDIR= ${PREFIX}/share/doc/irrd diff --git a/net/irrd/distinfo b/net/irrd/distinfo index 0067e5b1191..c9be224188d 100644 --- a/net/irrd/distinfo +++ b/net/irrd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2010/02/23 20:37:05 spz Exp $ +$NetBSD: distinfo,v 1.13.4.1 2010/07/04 07:23:32 agc Exp $ SHA1 (irrd2.3.9.tgz) = 73281b1f73bfa2267535d70906ff35c266083ec2 RMD160 (irrd2.3.9.tgz) = de212320204cde0d05abf848e952f8f1bf06503d @@ -11,3 +11,4 @@ SHA1 (patch-ag) = 9b23300fcaf1b1a48547fff2501f1e81ba86ed0c SHA1 (patch-ah) = 74a5e88dd79385ebb7bb3cb7a3cd6da46d26fd54 SHA1 (patch-ai) = d256698195bc90727c54ddb3f55c14e0e4f0437f SHA1 (patch-aj) = c357f5da9f127978263b22220ea11e3e650eaaf0 +SHA1 (patch-ak) = 93a3d155ad981155c129358d91d1706eb952b65b diff --git a/net/irrd/patches/patch-ak b/net/irrd/patches/patch-ak new file mode 100644 index 00000000000..e8ebc45ecc1 --- /dev/null +++ b/net/irrd/patches/patch-ak @@ -0,0 +1,22 @@ +$NetBSD: patch-ak,v 1.1.2.2 2010/07/04 07:23:32 agc Exp $ + +--- programs/irr_notify/notify_msgs.c.orig 2009-04-20 18:51:16.000000000 +0000 ++++ programs/irr_notify/notify_msgs.c +@@ -161,7 +161,7 @@ void maint_request (trace_t *tr, FILE *f + + #ifdef HAVE_SENDMAIL + sprintf (email, "%s < %s", SENDMAIL_CMD, buf); +-#elif HAVE_MAIL ++#elif defined HAVE_MAIL + sprintf (email, "%s \"%s\" < %s", MAIL_CMD, to_addr, buf); + #else + trace (NORM, tr, "No mail or sendmail found\n"); +@@ -627,7 +627,7 @@ void send_email (trace_t *tr, char *add + /* chmod (msg_hdl[ndx[i]].fname, S_IRWXO|S_IRGRP|S_IRWXU); */ + #ifdef HAVE_SENDMAIL + sprintf (buf, "%s < %s", SENDMAIL_CMD, msg_hdl[ndx[i]].fname); +-#elif HAVE_MAIL ++#elif defined HAVE_MAIL + sprintf (buf, "%s \"%s\" < %s", MAIL_CMD, p, msg_hdl[ndx[i]].fname); + #else + trace (NORM, tr, "No mail or sendmail found\n"); diff --git a/net/kdenetwork3/patches/patch-ac b/net/kdenetwork3/patches/patch-ac index 6acddc1f929..b119ff1b7fc 100644 --- a/net/kdenetwork3/patches/patch-ac +++ b/net/kdenetwork3/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:59:28 skrll Exp $ +$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:23:32 agc Exp $ --- kppp/connect.cpp.orig Wed May 8 19:30:04 2002 +++ kppp/connect.cpp diff --git a/net/lambdamoo-doc/patches/patch-aa b/net/lambdamoo-doc/patches/patch-aa index f4df13254b4..d3cf2f6c5ff 100644 --- a/net/lambdamoo-doc/patches/patch-aa +++ b/net/lambdamoo-doc/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/26 00:17:59 rh Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:23:33 agc Exp $ --- ProgrammersManual.texinfo.orig Mon May 28 07:29:56 2001 +++ ProgrammersManual.texinfo Mon May 28 07:38:25 2001 diff --git a/net/lambdamoo/PLIST b/net/lambdamoo/PLIST index 419df5d8a75..eafa79f0889 100644 --- a/net/lambdamoo/PLIST +++ b/net/lambdamoo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/26 00:21:43 rh Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:23:32 agc Exp $ sbin/moo share/doc/lambdamoo/README share/doc/lambdamoo/README.Minimal diff --git a/net/lambdamoo/patches/patch-aa b/net/lambdamoo/patches/patch-aa index a5c0137e0c8..dc739ee60eb 100644 --- a/net/lambdamoo/patches/patch-aa +++ b/net/lambdamoo/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/26 00:21:43 rh Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:23:32 agc Exp $ --- config.h.in.orig Mon Dec 28 21:26:51 1998 +++ config.h.in Sun May 27 17:01:08 2001 diff --git a/net/lambdamoo/patches/patch-ab b/net/lambdamoo/patches/patch-ab index cb37ceb24a3..4941991bd93 100644 --- a/net/lambdamoo/patches/patch-ab +++ b/net/lambdamoo/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/26 00:21:43 rh Exp $ +$NetBSD: patch-ab,v 1.1.1.1.58.1 2010/07/04 07:23:32 agc Exp $ --- restart.sh.orig Mon Mar 3 13:45:05 1997 +++ restart.sh diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index 58bb4229af8..6cec4040d7e 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2009/10/18 20:12:57 zafer Exp $ +# $NetBSD: Makefile,v 1.27.6.1 2010/07/04 07:23:33 agc Exp $ DISTNAME= mDNSResponder-108 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.opensource.apple.com/tarballs/mDNSResponder/ diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo index fee8c80dd4c..31920e5f46c 100644 --- a/net/mDNSResponder/distinfo +++ b/net/mDNSResponder/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2007/06/17 19:41:12 minskim Exp $ +$NetBSD: distinfo,v 1.17.30.1 2010/07/04 07:23:33 agc Exp $ SHA1 (mDNSResponder-108.tar.gz) = d51509077be75ec8ba49c805fef701c3370428fc RMD160 (mDNSResponder-108.tar.gz) = 3a1961f3267bcf009b52c8d8ce234ee6045aeed2 Size (mDNSResponder-108.tar.gz) = 1362840 bytes SHA1 (patch-aa) = 3e8dec4b8d28ed633818edcdea57881dcbb466dc -SHA1 (patch-ab) = 4903e995df9e895bb1cfc49f7fa0c17c8a5379db +SHA1 (patch-ab) = ca0921175169a007879dc3cea62ee191a969fbdc SHA1 (patch-ac) = 0613bd07f6626e5c06a3584bef8f2372dfef319a SHA1 (patch-udns) = 62710cea2b54af5f5dfca0ba04a36308e4456990 diff --git a/net/mDNSResponder/patches/patch-ab b/net/mDNSResponder/patches/patch-ab index 1b87c862023..342f6a94efd 100644 --- a/net/mDNSResponder/patches/patch-ab +++ b/net/mDNSResponder/patches/patch-ab @@ -1,8 +1,26 @@ -$NetBSD: patch-ab,v 1.5 2006/07/11 14:39:29 drochner Exp $ +$NetBSD: patch-ab,v 1.5.36.1 2010/07/04 07:23:33 agc Exp $ +add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007 ---- mDNSPosix/mDNSPosix.c.orig 2006-02-20 22:40:36.000000000 +0100 -+++ mDNSPosix/mDNSPosix.c -@@ -852,7 +852,13 @@ mDNSlocal int SetupSocket(struct sockadd +--- mDNSPosix/mDNSPosix.c.orig 2006-02-20 15:40:36.000000000 -0600 ++++ mDNSPosix/mDNSPosix.c 2010-06-30 17:57:01.575378400 -0500 +@@ -633,7 +633,7 @@ + { + char line[256]; + char nameserver[16]; +- char keyword[10]; ++ char keyword[11]; + int numOfServers = 0; + FILE *fp = fopen(filePath, "r"); + if (fp == NULL) return -1; +@@ -652,6 +652,7 @@ + numOfServers++; + } + } ++ fclose(fp); + return (numOfServers > 0) ? 0 : -1; + } + +@@ -852,7 +853,13 @@ { struct ipv6_mreq imr6; struct sockaddr_in6 bindAddr6; @@ -17,7 +35,7 @@ $NetBSD: patch-ab,v 1.5 2006/07/11 14:39:29 drochner Exp $ if (err == 0) { err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_PKTINFO, &kOn, sizeof(kOn)); -@@ -861,7 +867,13 @@ mDNSlocal int SetupSocket(struct sockadd +@@ -861,7 +868,13 @@ #else #warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts #endif @@ -32,7 +50,7 @@ $NetBSD: patch-ab,v 1.5 2006/07/11 14:39:29 drochner Exp $ if (err == 0) { err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_HOPLIMIT, &kOn, sizeof(kOn)); -@@ -1339,6 +1351,36 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanR +@@ -1339,6 +1352,36 @@ return(err == 0); } @@ -69,7 +87,7 @@ $NetBSD: patch-ab,v 1.5 2006/07/11 14:39:29 drochner Exp $ // mDNS core calls this routine to initialise the platform-specific data. mDNSexport mStatus mDNSPlatformInit(mDNS *const m) { -@@ -1360,6 +1402,10 @@ mDNSexport mStatus mDNSPlatformInit(mDNS +@@ -1360,6 +1403,10 @@ GetUserSpecifiedRFC1034ComputerName(&m->hostlabel); if (m->hostlabel.c[0] == 0) MakeDomainLabelFromLiteralString(&m->hostlabel, "Computer"); diff --git a/net/mydns-mysql/Makefile b/net/mydns-mysql/Makefile index a19fc396097..9e8eb203ad1 100644 --- a/net/mydns-mysql/Makefile +++ b/net/mydns-mysql/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2010/02/19 20:30:21 joerg Exp $ +# $NetBSD: Makefile,v 1.10.4.1 2010/07/04 07:23:33 agc Exp $ PKGNAME= ${DISTNAME:S/-/-mysql-/} -PKGREVISION= 3 +PKGREVISION= 4 COMMENT= MySQL-based DNS server CONFLICTS= mydns-pgsql-[0-9]* diff --git a/net/mydns-pgsql/Makefile b/net/mydns-pgsql/Makefile index 08f88e60d19..07d34f2d434 100644 --- a/net/mydns-pgsql/Makefile +++ b/net/mydns-pgsql/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2010/02/19 20:30:21 joerg Exp $ +# $NetBSD: Makefile,v 1.14.4.1 2010/07/04 07:23:33 agc Exp $ PKGNAME= ${DISTNAME:S/-/-pgsql-/} -PKGREVISION= 8 +PKGREVISION= 9 COMMENT= PostgreSQL-based DNS server CONFLICTS= mydns-mysql-[0-9]* diff --git a/net/mydns-pgsql/Makefile.common b/net/mydns-pgsql/Makefile.common index ca30e8def73..ab43ff215d7 100644 --- a/net/mydns-pgsql/Makefile.common +++ b/net/mydns-pgsql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2010/02/19 20:30:21 joerg Exp $ +# $NetBSD: Makefile.common,v 1.15.4.1 2010/07/04 07:23:33 agc Exp $ DISTNAME= mydns-1.1.0 CATEGORIES= net @@ -36,9 +36,10 @@ PKG_USERS= ${MYDNS_USER}:${MYDNS_GROUP} INSTALLATION_DIRS+= ${EGDIR} +USERGROUP_PHASE+= pre-install + post-install: ${WRKSRC}/src/mydns/mydns --dump-config > ${DESTDIR}${EGDIR}/mydns.conf - ${CHMOD} 0600 ${DESTDIR}${EGDIR}/mydns.conf .include "../../security/openssl/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/net/ncftp3/Makefile b/net/ncftp3/Makefile index 2fe911462df..58b52393bf5 100644 --- a/net/ncftp3/Makefile +++ b/net/ncftp3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2010/04/18 12:22:40 zafer Exp $ +# $NetBSD: Makefile,v 1.22.2.1 2010/07/04 07:23:33 agc Exp $ DISTNAME= ncftp-3.2.4-src PKGNAME= ncftp3-3.2.4 @@ -12,7 +12,7 @@ LICENSE= artistic PKG_DESTDIR_SUPPORT= user-destdir -INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} +INSTALL_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} GNU_CONFIGURE= yes diff --git a/net/rancid/Makefile b/net/rancid/Makefile index 79c3903b223..24198ae0f08 100644 --- a/net/rancid/Makefile +++ b/net/rancid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/03/12 23:39:16 pettai Exp $ +# $NetBSD: Makefile,v 1.1.1.1.4.1 2010/07/04 07:23:34 agc Exp $ # DISTNAME= rancid-2.3.2 @@ -60,6 +60,12 @@ INSTALLATION_DIRS= share/examples/rancid INSTALLATION_DIRS+= share/doc/rancid INSTALLATION_DIRS+= ${VARBASE}/rancid +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" && exists(/sbin/ping) +CONFIGURE_ARGS+= ac_cv_PING_PATH=/sbin/ping +.endif + post-install: ${INSTALL_DATA} ${WRKSRC}/etc/lg.conf.sample ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKSRC}/etc/rancid.conf.sample ${DESTDIR}${EGDIR} diff --git a/net/rootprobe/PLIST b/net/rootprobe/PLIST index 32aa66c9e30..6c605e475c6 100644 --- a/net/rootprobe/PLIST +++ b/net/rootprobe/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/15 00:11:36 itojun Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:23:34 agc Exp $ bin/rootprobe bin/cctldprobe diff --git a/net/sipcalc/PLIST b/net/sipcalc/PLIST index 50c8f3c07c2..d5a27a236fa 100644 --- a/net/sipcalc/PLIST +++ b/net/sipcalc/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/17 11:52:29 grant Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:23:34 agc Exp $ bin/sipcalc man/man1/sipcalc.1 diff --git a/net/sipsak/Makefile b/net/sipsak/Makefile index d4432eda1df..ee0d2238ef6 100644 --- a/net/sipsak/Makefile +++ b/net/sipsak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:35 wiz Exp $ +# $NetBSD: Makefile,v 1.7.4.1 2010/07/04 07:23:34 agc Exp $ DISTNAME= sipsak-0.9.6-1 PKGNAME= ${DISTNAME:S/-1//} @@ -17,6 +17,15 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-1//} GNU_CONFIGURE= YES USE_TOOLS+= gmake +.include "../../mk/bsd.prefs.mk" + +.if ${PKGSRC_COMPILER} == "sunpro" +SUBST_CLASSES+= inline +SUBST_STAGE.inline= post-patch +SUBST_FILES.inline= header_f.h +SUBST_SED.inline= -e 's/inline //g' +.endif + INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "../../security/openssl/buildlink3.mk" diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 937e8340f04..db0ac9da23a 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2010/06/14 15:33:13 wiz Exp $ +# $NetBSD: Makefile,v 1.47.2.1 2010/07/04 07:23:34 agc Exp $ DISTNAME= wireshark-1.2.9 PKGREVISION= 1 @@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFLICTS+= ethereal-[0-9]* USE_LANGUAGES= c c++ -USE_TOOLS+= gmake perl pkg-config +USE_TOOLS+= gmake perl pkg-config yacc lex USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= # empty @@ -30,6 +30,8 @@ CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} +CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc} +CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex} PTHREAD_OPTS+= require diff --git a/net/wireshark/options.mk b/net/wireshark/options.mk index acc6195edac..02ded3d2c10 100644 --- a/net/wireshark/options.mk +++ b/net/wireshark/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2010/05/15 20:27:28 tron Exp $ +# $NetBSD: options.mk,v 1.4.2.1 2010/07/04 07:23:34 agc Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark PKG_SUPPORTED_OPTIONS= gtk2 lua @@ -9,8 +9,7 @@ PKG_SUGGESTED_OPTIONS= gtk2 lua PLIST_VARS+= gtk2 .if !empty(PKG_OPTIONS:Mgtk2) -CONFIGURE_ARGS+= --enable-gtk2 -CONFIGURE_ARGS+= --with-gtk-prefix=${BUILDLINK_PREFIX.gtk2} +CONFIGURE_ARGS+= --enable-wireshark PLIST.gtk2= yes .include "../../x11/gtk2/buildlink3.mk" .else diff --git a/print/bg5ps/patches/patch-ab b/print/bg5ps/patches/patch-ab index e056c631f85..a0824139887 100644 --- a/print/bg5ps/patches/patch-ab +++ b/print/bg5ps/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/06/15 08:22:17 shell Exp $ +$NetBSD: patch-ab,v 1.1.1.1.58.1 2010/07/04 07:24:39 agc Exp $ --- bg5ps.conf.orig Fri Dec 21 13:39:19 2001 +++ bg5ps.conf diff --git a/print/bg5ps/patches/patch-ac b/print/bg5ps/patches/patch-ac index e51f9247b8d..06d320b85f4 100644 --- a/print/bg5ps/patches/patch-ac +++ b/print/bg5ps/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/06/15 08:22:18 shell Exp $ +$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:24:39 agc Exp $ --- bg5ps.orig Tue Feb 15 04:46:43 2000 +++ bg5ps diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile index 2c3507413ff..537916f4ce6 100644 --- a/print/ghostscript/Makefile +++ b/print/ghostscript/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.79 2010/06/13 22:45:15 wiz Exp $ +# $NetBSD: Makefile,v 1.79.2.1 2010/07/04 07:24:39 agc Exp $ DISTNAME= ghostscript-8.71 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} MASTER_SITES+= http://ghostscript.com/releases/ diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo index 764c72b895a..8cd37df1f66 100644 --- a/print/ghostscript/distinfo +++ b/print/ghostscript/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2010/06/13 22:45:15 wiz Exp $ +$NetBSD: distinfo,v 1.33.2.1 2010/07/04 07:24:39 agc Exp $ SHA1 (ghostscript-8.71.tar.gz) = 629299140f612fac32f6289be0904107dfd1b555 RMD160 (ghostscript-8.71.tar.gz) = efce74cf22cf99b2b1a145df466e79a86e3dfefb @@ -15,3 +15,6 @@ SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc SHA1 (patch-am) = 47a994e902d565f2a06b054766d6fa93c7534d21 SHA1 (patch-an) = 875360319e486f4606627d8cfa3dbffd48d76130 +SHA1 (patch-ba) = 9c9f9aa27bcbcb43c9eb3b7f7ae6d70fb6545057 +SHA1 (patch-bb) = 6487b61fafe39a4ac8141b9f84044fc210df66ac +SHA1 (patch-bc) = c35ee6c3075b89714fbb74956d68747d3c17bf9c diff --git a/print/ghostscript/patches/patch-ba b/print/ghostscript/patches/patch-ba new file mode 100644 index 00000000000..ade192176c1 --- /dev/null +++ b/print/ghostscript/patches/patch-ba @@ -0,0 +1,47 @@ +$NetBSD: patch-ba,v 1.3.2.2 2010/07/04 07:24:39 agc Exp $ + +Fix for security vulnerability reported in CVE-2010-1628 taken from here: + +http://bugs.ghostscript.com/attachment.cgi?id=6350 + +--- psi/idosave.h.orig 2008-08-28 23:48:19.000000000 +0100 ++++ psi/idosave.h 2010-06-30 13:31:32.000000000 +0100 +@@ -18,6 +18,22 @@ + # define idosave_INCLUDED + + /* ++ * Structure for saved change chain for save/restore. Because of the ++ * garbage collector, we need to distinguish the cases where the change ++ * is in a static object, a dynamic ref, or a dynamic struct. ++ */ ++typedef struct alloc_change_s alloc_change_t; ++struct alloc_change_s { ++ alloc_change_t *next; ++ ref_packed *where; ++ ref contents; ++#define AC_OFFSET_STATIC (-2) /* static object */ ++#define AC_OFFSET_REF (-1) /* dynamic ref */ ++#define AC_OFFSET_ALLOCATED (-3) /* a newly allocated ref array */ ++ short offset; /* if >= 0, offset within struct */ ++}; ++ ++/* + * Save a change that must be undone by restore. We have to pass the + * pointer to the containing object to alloc_save_change for two reasons: + * +@@ -29,6 +45,7 @@ + * relocate the pointer to it from the change record during garbage + * collection. + */ ++ + int alloc_save_change(gs_dual_memory_t *dmem, const ref *pcont, + ref_packed *ptr, client_name_t cname); + int alloc_save_change_in(gs_ref_memory_t *mem, const ref *pcont, +@@ -36,6 +53,6 @@ + /* Remove an AC_OFFSET_ALLOCATED element. */ + void alloc_save_remove(gs_ref_memory_t *mem, ref_packed *obj, client_name_t cname); + /* Allocate a structure for recording an allocation event. */ +-int alloc_save_change_alloc(gs_ref_memory_t *mem, client_name_t cname, ref_packed ***ppr); ++int alloc_save_change_alloc(gs_ref_memory_t *mem, client_name_t cname, alloc_change_t **pcp); + + #endif /* idosave_INCLUDED */ diff --git a/print/ghostscript/patches/patch-bb b/print/ghostscript/patches/patch-bb new file mode 100644 index 00000000000..7b74d58ceee --- /dev/null +++ b/print/ghostscript/patches/patch-bb @@ -0,0 +1,50 @@ +$NetBSD: patch-bb,v 1.3.2.2 2010/07/04 07:24:39 agc Exp $ + +Fix for security vulnerability reported in CVE-2010-1628 taken from here: + +http://bugs.ghostscript.com/attachment.cgi?id=6350 + +--- psi/isave.c.orig 2008-08-28 23:48:19.000000000 +0100 ++++ psi/isave.c 2010-06-30 13:31:32.000000000 +0100 +@@ -156,22 +156,6 @@ + /* A link to igcref.c . */ + ptr_proc_reloc(igc_reloc_ref_ptr_nocheck, ref_packed); + +-/* +- * Structure for saved change chain for save/restore. Because of the +- * garbage collector, we need to distinguish the cases where the change +- * is in a static object, a dynamic ref, or a dynamic struct. +- */ +-typedef struct alloc_change_s alloc_change_t; +-struct alloc_change_s { +- alloc_change_t *next; +- ref_packed *where; +- ref contents; +-#define AC_OFFSET_STATIC (-2) /* static object */ +-#define AC_OFFSET_REF (-1) /* dynamic ref */ +-#define AC_OFFSET_ALLOCATED (-3) /* a newly allocated ref array */ +- short offset; /* if >= 0, offset within struct */ +-}; +- + static + CLEAR_MARKS_PROC(change_clear_marks) + { +@@ -519,7 +503,7 @@ + + /* Allocate a structure for recording an allocation event. */ + int +-alloc_save_change_alloc(gs_ref_memory_t *mem, client_name_t cname, ref_packed ***ppr) ++alloc_save_change_alloc(gs_ref_memory_t *mem, client_name_t cname, alloc_change_t **pcp) + { + register alloc_change_t *cp; + +@@ -533,8 +517,7 @@ + cp->where = 0; + cp->offset = AC_OFFSET_ALLOCATED; + make_null(&cp->contents); +- mem->changes = cp; +- *ppr = &cp->where; ++ *pcp = cp; + return 1; + } + diff --git a/print/ghostscript/patches/patch-bc b/print/ghostscript/patches/patch-bc new file mode 100644 index 00000000000..5d795b9d13d --- /dev/null +++ b/print/ghostscript/patches/patch-bc @@ -0,0 +1,42 @@ +$NetBSD: patch-bc,v 1.3.2.2 2010/07/04 07:24:39 agc Exp $ + +Fix for security vulnerability reported in CVE-2010-1628 taken from here: + +http://bugs.ghostscript.com/attachment.cgi?id=6350 + +--- psi/ialloc.c.orig 2008-08-28 23:48:19.000000000 +0100 ++++ psi/ialloc.c 2010-06-30 13:31:32.000000000 +0100 +@@ -185,7 +185,14 @@ + */ + chunk_t *pcc = mem->pcc; + ref *end; ++ alloc_change_t *cp = 0; ++ int code = 0; + ++ if ((gs_memory_t *)mem != mem->stable_memory) { ++ code = alloc_save_change_alloc(mem, "gs_alloc_ref_array", &cp); ++ if (code < 0) ++ return code; ++ } + obj = gs_alloc_struct_array((gs_memory_t *) mem, num_refs + 1, + ref, &st_refs, cname); + if (obj == 0) +@@ -210,14 +217,10 @@ + chunk_locate_ptr(obj, &cl); + cl.cp->has_refs = true; + } +- if ((gs_memory_t *)mem != mem->stable_memory) { +- ref_packed **ppr = 0; +- int code = alloc_save_change_alloc(mem, "gs_alloc_ref_array", &ppr); +- if (code < 0) +- return code; +- if (ppr) +- *ppr = (ref_packed *)obj; +- } ++ if (cp) { ++ mem->changes = cp; ++ cp->where = (ref_packed *)obj; ++ } + } + make_array(parr, attrs | mem->space, num_refs, obj); + return 0; diff --git a/print/ja-a2ps/PLIST b/print/ja-a2ps/PLIST index 46bb923e550..34b7b7ebfa8 100644 --- a/print/ja-a2ps/PLIST +++ b/print/ja-a2ps/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:03 seb Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:24:40 agc Exp $ bin/a2ps-j diff --git a/print/ja-vfxdvik/patches/patch-ad b/print/ja-vfxdvik/patches/patch-ad index e325605fe49..e313bb32200 100644 --- a/print/ja-vfxdvik/patches/patch-ad +++ b/print/ja-vfxdvik/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:01:06 seb Exp $ +$NetBSD: patch-ad,v 1.1.1.1.58.1 2010/07/04 07:24:40 agc Exp $ --- texk/make/paths.mk.orig Mon Jan 11 00:42:53 1999 +++ texk/make/paths.mk Mon May 28 22:59:54 2001 diff --git a/print/ja-vfxdvik/patches/patch-ae b/print/ja-vfxdvik/patches/patch-ae index e111293bc96..6fe15e30a61 100644 --- a/print/ja-vfxdvik/patches/patch-ae +++ b/print/ja-vfxdvik/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:01:06 seb Exp $ +$NetBSD: patch-ae,v 1.1.1.1.58.1 2010/07/04 07:24:40 agc Exp $ --- texk/xdvik/withenable.ac.orig Wed May 30 22:19:29 2001 +++ texk/xdvik/withenable.ac Wed May 30 22:24:24 2001 diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile index 1c30376b7a6..237b5464b0c 100644 --- a/print/teTeX3-bin/Makefile +++ b/print/teTeX3-bin/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.60 2010/06/17 00:44:01 minskim Exp $ +# $NetBSD: Makefile,v 1.60.2.1 2010/07/04 07:24:40 agc Exp $ DISTNAME= tetex-src-3.0 PKGNAME= ${DISTNAME:C/tetex/teTeX/:C/src/bin/} PKGREVISION= 45 CATEGORIES= print -MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/} +MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.tug.org/tetex/ diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile index 0c4e7870324..86d4b51999d 100644 --- a/print/teTeX3-texmf/Makefile +++ b/print/teTeX3-texmf/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.44 2010/06/17 00:35:43 minskim Exp $ +# $NetBSD: Makefile,v 1.44.2.1 2010/07/04 07:24:40 agc Exp $ # DISTNAME= tetex-texmf-3.0 PKGNAME= ${DISTNAME:C/tetex/teTeX/} PKGREVISION= 26 CATEGORIES= print -MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/} +MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.tug.org/tetex/ diff --git a/print/teTeX3-texmfsrc/Makefile b/print/teTeX3-texmfsrc/Makefile index e82e5b9f39b..ef823b55fb4 100644 --- a/print/teTeX3-texmfsrc/Makefile +++ b/print/teTeX3-texmfsrc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2010/02/15 13:38:20 joerg Exp $ +# $NetBSD: Makefile,v 1.15.4.1 2010/07/04 07:24:40 agc Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp # @@ -6,7 +6,7 @@ DISTNAME= tetex-texmfsrc-3.0 PKGNAME= ${DISTNAME:S/tetex/teTeX/} PKGREVISION= 1 CATEGORIES= print -MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/} +MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.tug.org/tetex/ diff --git a/print/yup/PLIST b/print/yup/PLIST index 2843354baae..e9c31397d1c 100644 --- a/print/yup/PLIST +++ b/print/yup/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/04 14:32:55 cjep Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:24:40 agc Exp $ bin/yup man/man1/yup.1 diff --git a/print/yup/patches/patch-aa b/print/yup/patches/patch-aa index 3e4e89bec45..f6a173c04a0 100644 --- a/print/yup/patches/patch-aa +++ b/print/yup/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/06/04 14:32:55 cjep Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:24:41 agc Exp $ --- yup.orig Wed Feb 15 13:26:04 1995 +++ yup Tue Oct 2 21:44:58 2001 diff --git a/security/Makefile b/security/Makefile index 90b04028edf..b74ab922579 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.384 2010/06/01 11:01:27 drochner Exp $ +# $NetBSD: Makefile,v 1.384.2.1 2010/07/04 07:25:36 agc Exp $ # COMMENT= Security tools diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk index ddea4ba06d3..09f1ba92297 100644 --- a/security/heimdal/buildlink3.mk +++ b/security/heimdal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.36 2010/01/17 12:02:40 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.36.4.1 2010/07/04 07:25:36 agc Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -19,7 +19,13 @@ pkgbase := heimdal . include "../../databases/openldap-client/buildlink3.mk" .endif .include "../../security/openssl/buildlink3.mk" + +CHECK_BUILTIN.heimdal:= yes +.include "../../security/heimdal/builtin.mk" +CHECK_BUILTIN.heimdal:= no +.if !empty(USE_BUILTIN.heimdal:M[nN][oO]) .include "../../mk/bdb.buildlink3.mk" +.endif .endif # HEIMDAL_BUILDLINK3_MK BUILDLINK_TREE+= -heimdal diff --git a/security/py-lasso/Makefile b/security/py-lasso/Makefile index 6e746d963b3..d0d5ca5ff80 100644 --- a/security/py-lasso/Makefile +++ b/security/py-lasso/Makefile @@ -1,17 +1,18 @@ -# $NetBSD: Makefile,v 1.3 2010/01/17 12:02:43 wiz Exp $ +# $NetBSD: Makefile,v 1.3.4.1 2010/07/04 07:25:36 agc Exp $ # PKGNAME= ${PYPKGPREFIX}-${DISTNAME} PKGREVISION= 1 COMMENT= Libery Alliance Single Sign On binding for Python -PKG_DESTDIR_SUPPORT= destdir +PKG_DESTDIR_SUPPORT= user-destdir + +BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat CONFIGURE_ARGS+= --disable-php4 CONFIGURE_ARGS+= --disable-perl -do-install: - cd ${WRKSRC}/bindings/python && ${MAKE} install +INSTALL_DIRS= bindings/python PY_PATCHPLIST= yes .include "../../lang/python/extension.mk" diff --git a/security/py-openid/Makefile b/security/py-openid/Makefile index 1666c655b30..0c36f4b6600 100644 --- a/security/py-openid/Makefile +++ b/security/py-openid/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.2 2010/01/23 22:57:05 joerg Exp $ +# $NetBSD: Makefile,v 1.2.4.1 2010/07/04 07:25:36 agc Exp $ -DISTVERS= 2.2.4 +DISTVERS= 2.2.5 +GITREF= b666238 DISTNAME= python-openid-${DISTVERS} PKGNAME= ${PYPKGPREFIX}-openid-${DISTVERS} CATEGORIES= security python -MASTER_SITES= http://www.openidenabled.com/files/python-openid/packages/ -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= http://github.com/openid/python-openid/tarball/${DISTVERS}/ +WRKSRC= ${WRKDIR}/openid-python-openid-${GITREF} MAINTAINER= roy@NetBSD.org HOMEPAGE= http://www.openidenabled.com/openid/libraries/python/ diff --git a/security/py-openid/distinfo b/security/py-openid/distinfo index 3c9be40b6db..e85c79bb7b4 100644 --- a/security/py-openid/distinfo +++ b/security/py-openid/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/07/21 14:08:04 roy Exp $ +$NetBSD: distinfo,v 1.1.1.1.8.1 2010/07/04 07:25:36 agc Exp $ -SHA1 (python-openid-2.2.4.tar.bz2) = 45599d46ebb36bf4cbf617622abe736c59ccb8e1 -RMD160 (python-openid-2.2.4.tar.bz2) = 91f692c7a90e0de0bd7339bce97a42379b8923c1 -Size (python-openid-2.2.4.tar.bz2) = 320342 bytes +SHA1 (python-openid-2.2.5.tar.gz) = add5a399576afd69c8368a7f6ba83287f3a62514 +RMD160 (python-openid-2.2.5.tar.gz) = 6ba011970c99ac46141655d32d82e633e4bd408d +Size (python-openid-2.2.5.tar.gz) = 300524 bytes diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile index 41ba18dce95..a402396cd06 100644 --- a/security/zebedee/Makefile +++ b/security/zebedee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2010/01/17 12:02:45 wiz Exp $ +# $NetBSD: Makefile,v 1.30.4.1 2010/07/04 07:25:36 agc Exp $ DISTNAME= zebedee-2.5.3 PKGREVISION= 4 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.winton.org.uk/zebedee/ COMMENT= Simple tunneling program for TCP or UDP with encryption +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= gmake perl tclsh:run MAKE_ENV+= PERL5=${PERL5:Q} diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo index d5d9a237cb0..bace4d24790 100644 --- a/security/zebedee/distinfo +++ b/security/zebedee/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2006/03/08 23:06:40 minskim Exp $ +$NetBSD: distinfo,v 1.9.40.1 2010/07/04 07:25:36 agc Exp $ SHA1 (zebedee-2.5.3.tar.gz) = 54717faade0275929163369942885cc448bc9986 RMD160 (zebedee-2.5.3.tar.gz) = 2b4bee4c5f66f59628308a6c300b4c9d0c854e30 Size (zebedee-2.5.3.tar.gz) = 176088 bytes -SHA1 (patch-aa) = 5ab4c410cc372c1eb1e56f90ff92386b92454b40 +SHA1 (patch-aa) = 925b9240514201c2b60c62b4e302c8332211380d SHA1 (patch-ab) = d7b800bab4b5e0f242b4e0a8545e3364abc3f95b diff --git a/security/zebedee/patches/patch-aa b/security/zebedee/patches/patch-aa index 94a3fba77bf..134f5065bf9 100644 --- a/security/zebedee/patches/patch-aa +++ b/security/zebedee/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2006/03/08 23:06:40 minskim Exp $ +$NetBSD: patch-aa,v 1.8.40.1 2010/07/04 07:25:37 agc Exp $ --- Makefile.orig 2005-09-05 22:59:53.000000000 -0700 +++ Makefile @@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.8 2006/03/08 23:06:40 minskim Exp $ # Installation directories for the Linux/Solaris/*NIX World -ROOTDIR = /usr -+ROOTDIR =$(LOCALBASE) ++ROOTDIR =$(DESTDIR)$(PREFIX) BINDIR = $(ROOTDIR)/bin -ZBDDIR = $(ROOTDIR)/lib/zebedee +ZBDDIR = $(ROOTDIR)/share/doc/zebedee diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile index cdc0e5f1c48..45b804d93dd 100644 --- a/sysutils/amanda-client/Makefile +++ b/sysutils/amanda-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2009/05/20 00:58:27 wiz Exp $ +# $NetBSD: Makefile,v 1.47.10.1 2010/07/04 07:26:44 agc Exp $ # PKGNAME= amanda-client-${VERS} @@ -7,6 +7,8 @@ SVR4_PKGNAME= amacl COMMENT= Client part of Amanda, a network backup system +PKG_DESTDIR_SUPPORT= destdir + GNU_CONFIGURE= yes USE_TOOLS+= awk:run perl:run diff --git a/sysutils/amanda-client/distinfo b/sysutils/amanda-client/distinfo index 234a170b10d..4bd977c9e86 100644 --- a/sysutils/amanda-client/distinfo +++ b/sysutils/amanda-client/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.9 2008/02/15 16:23:09 gdt Exp $ +$NetBSD: distinfo,v 1.9.24.1 2010/07/04 07:26:44 agc Exp $ SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2 RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236 Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes SHA1 (patch-aa) = b76a56b28aba238d838764b9d562e29cbb882553 -SHA1 (patch-ab) = c2b966dae6007ae320b0f31051d463e4e51b054b +SHA1 (patch-ab) = 4c1b2a5f025854a9469a9fcdc11f6110b22d4989 SHA1 (patch-ac) = 6327632e03e635c515789db9590d2eee6ebf121b SHA1 (patch-ad) = 0cef70057b2003ac9de7ac130c84746504981a95 SHA1 (patch-ae) = 00f5f000c0d6ff3e655ecbbe30183529bb244b66 diff --git a/sysutils/amanda-client/patches/patch-ab b/sysutils/amanda-client/patches/patch-ab index 3f101658a9c..e67707ee14c 100644 --- a/sysutils/amanda-client/patches/patch-ab +++ b/sysutils/amanda-client/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.8 2008/02/15 16:23:09 gdt Exp $ +$NetBSD: patch-ab,v 1.8.24.1 2010/07/04 07:26:45 agc Exp $ Don't install any manpages except client-specific ones, namely RECOVER_MAN8_PAGES. ---- man/Makefile.in.orig 2007-06-06 19:22:52.000000000 -0400 +--- man/Makefile.in.orig 2007-06-06 23:22:52.000000000 +0000 +++ man/Makefile.in @@ -373,19 +373,10 @@ SERVER_MAN8_PAGES = amadmin.8 \ #endif @@ -14,15 +14,17 @@ RECOVER_MAN8_PAGES. - $(SERVER_MAN8_PAGES) \ - $(RECOVER_MAN8_PAGES) \ - $(RESTORE_MAN8_PAGES) -+man8_pages = $(RECOVER_MAN8_PAGES) - - man5_pages = $(COMMON_MAN5_PAGES) +- +-man5_pages = $(COMMON_MAN5_PAGES) -ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \ - $(COMMON_MAN5_PAGES) \ - $(COMMON_MAN8_PAGES) \ - $(SERVER_MAN8_PAGES) \ - $(RECOVER_MAN8_PAGES) \ - $(RESTORE_MAN8_PAGES) ++man8_pages = $(RECOVER_MAN8_PAGES) ++ ++man5_pages = +ALL_MAN_PAGES = $(RECOVER_MAN8_PAGES) diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile index b8285ab10af..7e9ff6e7d1c 100644 --- a/sysutils/amanda-plot/Makefile +++ b/sysutils/amanda-plot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2008/07/29 17:21:39 pgoyette Exp $ +# $NetBSD: Makefile,v 1.25.18.1 2010/07/04 07:26:45 agc Exp $ # PKGNAME= amanda-plot-${VERS} @@ -7,6 +7,8 @@ SVR4_PKGNAME= amapl COMMENT= Visualizes the behavior of Amanda, a network backup system +PKG_DESTDIR_SUPPORT= destdir + DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot DEPENDS+= amanda-server-2.5.2p1{,nb[0-9]*}:../../sysutils/amanda-server diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile index 1d91e2df3f9..758b8c4c0e5 100644 --- a/sysutils/amanda-server/Makefile +++ b/sysutils/amanda-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2008/07/29 17:21:39 pgoyette Exp $ +# $NetBSD: Makefile,v 1.45.18.1 2010/07/04 07:26:45 agc Exp $ PKGNAME= amanda-server-${VERS} PKGREVISION= 1 @@ -6,6 +6,8 @@ SVR4_PKGNAME= amase COMMENT= Server part of Amanda, a network backup system +PKG_DESTDIR_SUPPORT= destdir + USE_TOOLS+= awk:run perl:run .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/etcutils/Makefile b/sysutils/etcutils/Makefile index 82589427170..212f985026b 100644 --- a/sysutils/etcutils/Makefile +++ b/sysutils/etcutils/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/05/07 09:13:59 jmmv Exp $ +# $NetBSD: Makefile,v 1.1.1.1.2.1 2010/07/04 07:26:45 agc Exp $ # DISTNAME= etcutils-0.1 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/jmmv/etcutils/0.1/ @@ -14,7 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=/etc +CONFIGURE_ARGS+= --sysconfdir=/etc SH=${SH} PKG_OPTIONS_VAR= PKG_OPTIONS.etcutils PKG_SUPPORTED_OPTIONS= tests diff --git a/sysutils/fabric/Makefile b/sysutils/fabric/Makefile index 8ad71519f14..51708bb7777 100644 --- a/sysutils/fabric/Makefile +++ b/sysutils/fabric/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2010/05/26 22:19:02 gls Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2010/07/04 07:26:45 agc Exp $ # -VERSION= 0.9.0 +VERSION= 0.9.1 DISTNAME= Fabric-${VERSION} PKGNAME= ${DISTNAME:S/F/f/} CATEGORIES= sysutils net MASTER_SITES= http://code.fabfile.org/projects/fabric/files/ MAINTAINER= gls@NetBSD.org -HOMEPAGE= http://fabfile.org +HOMEPAGE= http://fabfile.org/ COMMENT= Simple Pythonic remote deployment tool LICENSE= 2-clause-bsd diff --git a/sysutils/fabric/PLIST b/sysutils/fabric/PLIST index b6c5b27fec1..827b2e12260 100644 --- a/sysutils/fabric/PLIST +++ b/sysutils/fabric/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/05/26 18:26:20 gls Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.2.1 2010/07/04 07:26:45 agc Exp $ bin/fab ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt @@ -55,8 +55,10 @@ share/doc/fabric/api/core/context_managers.rst share/doc/fabric/api/core/decorators.rst share/doc/fabric/api/core/operations.rst share/doc/fabric/api/core/utils.rst +share/doc/fabric/changes/${PKGVERSION}.rst share/doc/fabric/changes/0.9.rst share/doc/fabric/development.rst +share/doc/fabric/faq.rst share/doc/fabric/index.rst share/doc/fabric/installation.rst share/doc/fabric/tutorial.rst diff --git a/sysutils/fabric/distinfo b/sysutils/fabric/distinfo index ea43ec9de58..685d598f283 100644 --- a/sysutils/fabric/distinfo +++ b/sysutils/fabric/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/05/26 18:26:20 gls Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2010/07/04 07:26:45 agc Exp $ -SHA1 (Fabric-0.9.0.tar.gz) = bacc51ad35c1ecf7fceb98ac487b049c189f5c44 -RMD160 (Fabric-0.9.0.tar.gz) = 0264ba7c748d6d28deefc5d66ef0e7e559426b49 -Size (Fabric-0.9.0.tar.gz) = 179999 bytes +SHA1 (Fabric-0.9.1.tar.gz) = c7845346f742beafc01276a6ad25c2460e82c5cb +RMD160 (Fabric-0.9.1.tar.gz) = afdec80ba52c7de7b0aac4d1db3f71bc017838df +Size (Fabric-0.9.1.tar.gz) = 184256 bytes SHA1 (patch-aa) = f6927f0446418782629b4b347884561c72e76ea2 diff --git a/sysutils/foremost/Makefile b/sysutils/foremost/Makefile index 4bd0b441dd7..d07605f82bd 100644 --- a/sysutils/foremost/Makefile +++ b/sysutils/foremost/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/02/22 23:19:16 rillig Exp $ +# $NetBSD: Makefile,v 1.2.32.1 2010/07/04 07:26:45 agc Exp $ DISTNAME= foremost-1.4 CATEGORIES= sysutils @@ -8,10 +8,11 @@ MAINTAINER= lkundrak@skosi.org HOMEPAGE= http://foremost.sourceforge.net/ COMMENT= Recover various formats of files using typical data structures +PKG_DESTDIR_SUPPORT= user-destdir + EGDIR= ${PREFIX}/share/examples/foremost CONF_FILES= ${EGDIR}/foremost.conf ${PKG_SYSCONFDIR}/foremost.conf -pre-install: - ${INSTALL_DATA_DIR} ${EGDIR} +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${EGDIR} .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/foremost/distinfo b/sysutils/foremost/distinfo index 7179d2b7aa4..f681ee2810c 100644 --- a/sysutils/foremost/distinfo +++ b/sysutils/foremost/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2007/02/22 23:19:16 rillig Exp $ +$NetBSD: distinfo,v 1.2.32.1 2010/07/04 07:26:45 agc Exp $ SHA1 (foremost-1.4.tar.gz) = c6f9f28ae80a57388a8e8a6b958bc8c76797fad4 RMD160 (foremost-1.4.tar.gz) = b2ea590ab78f96e74cb3842ad60dc4f1429244ef Size (foremost-1.4.tar.gz) = 49521 bytes -SHA1 (patch-aa) = 727975dedae9261a4088083931eb709771873062 -SHA1 (patch-ab) = c56e70d64e30c0867beb3fd3ad40336cb6364c31 +SHA1 (patch-aa) = 39f986d19d80efe431d92af7884ae0a395ff9576 +SHA1 (patch-ab) = a5f6eb555818b333faebfc611fbabf8cef49f441 SHA1 (patch-ac) = 7832701bafa1336fda2b4e08ef38bca8ddf29f8d diff --git a/sysutils/foremost/patches/patch-aa b/sysutils/foremost/patches/patch-aa index 3e71ecaea7a..8b28bc69444 100644 --- a/sysutils/foremost/patches/patch-aa +++ b/sysutils/foremost/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ +$NetBSD: patch-aa,v 1.1.1.1.32.1 2010/07/04 07:26:46 agc Exp $ --- Makefile.orig 2005-11-05 18:12:37.000000000 +0100 +++ Makefile @@ -9,8 +9,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ -BIN = /usr/local/bin -MAN = /usr/local/man/man1 -CONF= /usr/local/etc -+BIN = $(PREFIX)/bin -+MAN = $(PREFIX)/$(PKGMANDIR)/man1 ++BIN = ${DESTDIR}$(PREFIX)/bin ++MAN = ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1 +CONF= $(PKG_SYSCONFDIR) # Setup for compiling and cross-compiling for Windows # The CR_ prefix refers to cross compiling from OSX to Windows diff --git a/sysutils/foremost/patches/patch-ab b/sysutils/foremost/patches/patch-ab index 18f53005a45..64ba01c82e5 100644 --- a/sysutils/foremost/patches/patch-ab +++ b/sysutils/foremost/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ +$NetBSD: patch-ab,v 1.1.1.1.32.1 2010/07/04 07:26:46 agc Exp $ --- Makefile.orig 2007-01-26 15:10:20.000000000 +0100 +++ Makefile @@ -12,10 +12,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ # You shouldn't need to change anything below this line #--------------------------------------------------------------------- @@ -27,6 +27,11 @@ RAW_FLAGS += -DVERSION=\"$(VERSION)\" - BIN = $(PREFIX)/bin - MAN = $(PREFIX)/$(PKGMANDIR)/man1 + BIN = ${DESTDIR}$(PREFIX)/bin + MAN = ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1 CONF= $(PKG_SYSCONFDIR) -+SAMPLES = $(PREFIX)/share/examples/foremost ++SAMPLES = ${DESTDIR}$(PREFIX)/share/examples/foremost + +# Tell it to config.c +RAW_FLAGS += -DCONFDIR=\"$(CONF)\" @@ -32,10 +32,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ -macinstall: MAN = /usr/share/man/man1/ -macinstall: CONF = /usr/local/etc/ + install -m 444 foremost.conf $(SAMPLES) -+macinstall: BIN = $(PREFIX)/bin/ -+macinstall: MAN = $(PREFIX)/$(PKGMANDIR)/man1/ ++macinstall: BIN = ${DESTDIR}$(PREFIX)/bin/ ++macinstall: MAN = ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1/ +macinstall: CONF = $(PREFIX)/etc/ -+macinstall: SAMPLES = $(PREFIX)/share/examples/foremost ++macinstall: SAMPLES = ${DESTDIR}$(PREFIX)/share/examples/foremost macinstall: mac install @@ -45,8 +45,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ -macuninstall: BIN = /usr/bin -macuninstall: MAN = /usr/share/man/man1 -+macuninstall: BIN = $(PREFIX)/bin -+macuninstall: MAN = $(PREFIX)/$(PKGMANDIR)/man1 ++macuninstall: BIN =${DESTDIR} $(PREFIX)/bin ++macuninstall: MAN =${DESTDIR} $(PREFIX)/$(PKGMANDIR)/man1 macuninstall: uninstall #--------------------------------------------------------------------- diff --git a/sysutils/hddtemp/Makefile b/sysutils/hddtemp/Makefile index f7d4ccf6d5f..58fecc611d7 100644 --- a/sysutils/hddtemp/Makefile +++ b/sysutils/hddtemp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:11 wiz Exp $ +# $NetBSD: Makefile,v 1.3.32.1 2010/07/04 07:26:46 agc Exp $ DISTNAME= hddtemp-0.3-beta15 PKGNAME= hddtemp-0.3b15 @@ -13,6 +13,7 @@ COMMENT= Gather temperature stats for disk drives SITES.hddtemp.db= http://www.guzu.net/linux/ +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews ONLY_FOR_PLATFORM= Linux-*-* @@ -24,8 +25,9 @@ CONFIGURE_ARGS+= --prefix=${PREFIX:Q} .include "../../mk/bsd.prefs.mk" +INSTALLATION_DIRS+= share/misc + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/misc - ${INSTALL_DATA} ${DISTDIR}/hddtemp.db ${PREFIX}/share/misc + ${INSTALL_DATA} ${DISTDIR}/hddtemp.db ${DESTDIR}${PREFIX}/share/misc .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/mtoolsfm/PLIST b/sysutils/mtoolsfm/PLIST index 5f63cd26d1b..29495381e90 100644 --- a/sysutils/mtoolsfm/PLIST +++ b/sysutils/mtoolsfm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/09 22:47:51 agc Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:26:46 agc Exp $ bin/MToolsFM man/man1/MToolsFM.1 share/locale/de/LC_MESSAGES/MToolsFM.mo diff --git a/sysutils/su2/PLIST b/sysutils/su2/PLIST index 1a7ec9157c6..320c27fc6be 100644 --- a/sysutils/su2/PLIST +++ b/sysutils/su2/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/04 09:56:38 cjep Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:26:46 agc Exp $ bin/su2 man/man1/su2.1 diff --git a/sysutils/su2/patches/patch-ac b/sysutils/su2/patches/patch-ac index ceea31829d3..fd272c2eb66 100644 --- a/sysutils/su2/patches/patch-ac +++ b/sysutils/su2/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/06/04 09:56:38 cjep Exp $ +$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:26:46 agc Exp $ --- su2.man.orig Tue Oct 2 22:09:48 2001 +++ su2.man diff --git a/sysutils/xfm/patches/patch-aa b/sysutils/xfm/patches/patch-aa index ffd1ca09e4e..7c34288d809 100644 --- a/sysutils/xfm/patches/patch-aa +++ b/sysutils/xfm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/06/04 16:44:55 cjep Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:26:46 agc Exp $ --- lib/Apps.orig Tue Aug 1 08:48:54 2000 +++ lib/Apps Tue Aug 1 08:56:32 2000 diff --git a/sysutils/xfm/patches/patch-ac b/sysutils/xfm/patches/patch-ac index 2481b0f4856..6c0fd369dbe 100644 --- a/sysutils/xfm/patches/patch-ac +++ b/sysutils/xfm/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/06/04 16:44:55 cjep Exp $ +$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:26:46 agc Exp $ --- src/FmErrors.c.orig Tue Aug 1 09:19:16 2000 +++ src/FmErrors.c Tue Aug 1 09:20:09 2000 diff --git a/sysutils/xfm/patches/patch-ae b/sysutils/xfm/patches/patch-ae index ae3bf56e13a..8ec38f1cc20 100644 --- a/sysutils/xfm/patches/patch-ae +++ b/sysutils/xfm/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/06/04 16:44:55 cjep Exp $ +$NetBSD: patch-ae,v 1.1.1.1.58.1 2010/07/04 07:26:46 agc Exp $ --- Imake.options.orig Wed Apr 5 00:05:36 2000 +++ Imake.options Wed Sep 6 00:37:02 2000 diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index d86b6d2d8e9..525cf0a7ab4 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2008/02/04 14:42:15 wiz Exp $ +# $NetBSD: Makefile,v 1.67.24.1 2010/07/04 07:26:47 agc Exp $ DISTNAME= xosview-1.8.3 PKGREVISION= 2 @@ -10,6 +10,7 @@ HOMEPAGE= http://xosview.sourceforge.net/ COMMENT= X11 graphical display of OS statistics PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_X11BASE= YES USE_LANGUAGES= c c++ @@ -20,7 +21,8 @@ CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib INSTALLATION_DIRS= bin lib/X11/app-defaults ${PKGMANDIR}/man1 -MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}/man1 +INSTALL_MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX:Q}/${PKGMANDIR:Q}/man1 +INSTALL_MAKE_FLAGS+= PREFIX_TO_USE=${DESTDIR}${PREFIX} .include "../../mk/bsd.prefs.mk" @@ -38,12 +40,15 @@ LIBS+= -lsocket -lnsl USE_TOOLS+= gmake .endif -.if ${UNPRIVILEGED:M[Yy][Ee][Ss]} != "" +.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \ + ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" +SPECIAL_PERMS+= bin/xosview ${REAL_ROOT_USER} kmem 2555 +.endif + SUBST_CLASSES+= unpriv SUBST_STAGE.unpriv= pre-configure SUBST_FILES.unpriv= config/Makefile.top.in SUBST_SED.unpriv= -e s,@INSTALL_ARGS@,, -.endif SUBST_CLASSES+= paths SUBST_STAGE.paths= post-configure |