? wip Index: devel/yasm/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/devel/yasm/Makefile,v retrieving revision 1.30 diff -p -u -r1.30 Makefile --- devel/yasm/Makefile 22 Apr 2011 13:43:24 -0000 1.30 +++ devel/yasm/Makefile 17 Dec 2011 03:55:35 -0000 @@ -13,6 +13,10 @@ LICENSE= modified-bsd AND (artistic OR g PKG_DESTDIR_SUPPORT= user-destdir +# [TRC 20111214: Observed a build failure which looks like a job +# ordering problem.] +MAKE_JOBS_SAFE= no + USE_TOOLS+= msgfmt GNU_CONFIGURE= YES USE_LIBTOOL= YES Index: games/alephone/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/games/alephone/Makefile,v retrieving revision 1.14 diff -p -u -r1.14 Makefile --- games/alephone/Makefile 21 May 2011 05:22:17 -0000 1.14 +++ games/alephone/Makefile 17 Dec 2011 03:55:36 -0000 @@ -29,6 +29,7 @@ BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.6 .include "../../devel/SDL/buildlink3.mk" BUILDLINK_API_DEPENDS.boost-headers+= boost-headers>=1.31 .include "../../devel/boost-headers/buildlink3.mk" +.include "../../devel/SDL_ttf/buildlink3.mk" BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.6 .include "../../graphics/SDL_image/buildlink3.mk" .include "../../net/SDL_net/buildlink3.mk" Index: lang/coq/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/lang/coq/Makefile,v retrieving revision 1.31 diff -p -u -r1.31 Makefile --- lang/coq/Makefile 22 Apr 2011 13:43:59 -0000 1.31 +++ lang/coq/Makefile 17 Dec 2011 03:56:36 -0000 @@ -31,7 +31,8 @@ PLIST_SRC= ${PKGDIR}/PLIST.opt ${PKGDIR} .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") . if !empty(MACHINE_PLATFORM:MLinux-*-*) || \ !empty(MACHINE_PLATFORM:MDarwin-*-*) || \ - !empty(MACHINE_PLATFORM:MFreeBSD-*-*) + !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \ + !empty(MACHINE_PLATFORM:MNetBSD-*-*) PLIST_SRC+= ${PKGDIR}/PLIST.natdynlink . endif .endif Index: mail/mutt-devel/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/mail/mutt-devel/Makefile,v retrieving revision 1.82 diff -p -u -r1.82 Makefile --- mail/mutt-devel/Makefile 22 Apr 2011 13:44:04 -0000 1.82 +++ mail/mutt-devel/Makefile 17 Dec 2011 03:56:37 -0000 @@ -46,6 +46,11 @@ CONFIGURE_ARGS+= --without-wc-funcs CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh .endif +# [TRC 20111216: Work around a stupid botch in mutt which checks +# whether the *build* host's /var/mail or /var/spool/mail exists in +# order to statically decide where to read mail from. Seriously?] +CONFIGURE_ARGS+= --with-homespool=yes + .include "options.mk" LDFLAGS+= ${_STRIPFLAG_CC} Index: multimedia/gst-plugins0.10-good/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/multimedia/gst-plugins0.10-good/Makefile,v retrieving revision 1.22 diff -p -u -r1.22 Makefile --- multimedia/gst-plugins0.10-good/Makefile 18 May 2011 09:38:18 -0000 1.22 +++ multimedia/gst-plugins0.10-good/Makefile 17 Dec 2011 03:57:00 -0000 @@ -10,14 +10,10 @@ COMMENT+= good plugins # some plugins were moved from bad to good CONFLICTS+= gst-plugins0.10-bad<0.10.18 -CONFIGURE_ARGS+= --enable-gconf -CONFIGURE_ARGS+= --enable-gconftool -CONFIGURE_ARGS+= --enable-zlib +.include "options.mk" -# We depend on libxml anyway (indirectly through GConf), so this -# doesn't hurt. Just make it explicite. +CONFIGURE_ARGS+= --enable-zlib CONFIGURE_ARGS+= --enable-annodex -.include "../../textproc/libxml2/buildlink3.mk" GCONF_SCHEMAS= gstreamer-0.10.schemas @@ -25,9 +21,12 @@ GCONF_SCHEMAS= gstreamer-0.10.schemas TEST_TARGET= check-torture post-install: +.if !empty(PKG_OPTIONS:Mgconf) ${INSTALL_DATA} ${WRKSRC}/gconf/gstreamer-0.10.schemas \ ${DESTDIR}${GCONF_SCHEMAS_DIR} +.endif -.include "../../devel/GConf/schemas.mk" +.include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: multimedia/gst-plugins0.10-good/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/multimedia/gst-plugins0.10-good/PLIST,v retrieving revision 1.24 diff -p -u -r1.24 PLIST --- multimedia/gst-plugins0.10-good/PLIST 18 May 2011 09:38:18 -0000 1.24 +++ multimedia/gst-plugins0.10-good/PLIST 17 Dec 2011 03:57:00 -0000 @@ -17,7 +17,7 @@ lib/gstreamer-0.10/libgsteffectv.la lib/gstreamer-0.10/libgstequalizer.la lib/gstreamer-0.10/libgstflv.la lib/gstreamer-0.10/libgstflxdec.la -lib/gstreamer-0.10/libgstgconfelements.la +${PLIST.gconf}lib/gstreamer-0.10/libgstgconfelements.la lib/gstreamer-0.10/libgstgoom.la lib/gstreamer-0.10/libgstgoom2k1.la lib/gstreamer-0.10/libgsticydemux.la @@ -46,7 +46,7 @@ lib/gstreamer-0.10/libgstvideomixer.la lib/gstreamer-0.10/libgstwavenc.la lib/gstreamer-0.10/libgstwavparse.la lib/gstreamer-0.10/libgsty4menc.la -share/gconf/schemas/gstreamer-0.10.schemas +${PLIST.gconf}share/gconf/schemas/gstreamer-0.10.schemas share/gstreamer-0.10/presets/GstIirEqualizer10Bands.prs share/gstreamer-0.10/presets/GstIirEqualizer3Bands.prs share/locale/af/LC_MESSAGES/gst-plugins-good-0.10.mo Index: multimedia/gst-plugins0.10-good/options.mk =================================================================== RCS file: multimedia/gst-plugins0.10-good/options.mk diff -N multimedia/gst-plugins0.10-good/options.mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multimedia/gst-plugins0.10-good/options.mk 17 Dec 2011 03:57:00 -0000 @@ -0,0 +1,15 @@ +# $NetBSD$ + +PKG_OPTIONS_VAR= PKG_OPTIONS.gst-plugins0.10-good +PKG_SUPPORTED_OPTIONS= gconf + +.include "../../mk/bsd.options.mk" + +PLIST_VARS+= gconf + +.if !empty(PKG_OPTIONS:Mgconf) +PLIST.gconf= yes +CONFIGURE_ARGS+= --enable-gconf +CONFIGURE_ARGS+= --enable-gconftool +.include "../../devel/GConf/schemas.mk" +.endif Index: multimedia/vlc/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/multimedia/vlc/PLIST,v retrieving revision 1.43 diff -p -u -r1.43 PLIST --- multimedia/vlc/PLIST 12 Sep 2011 21:50:38 -0000 1.43 +++ multimedia/vlc/PLIST 17 Dec 2011 03:57:30 -0000 @@ -135,6 +135,7 @@ lib/vlc/plugins/audio_mixer/libfloat32_m lib/vlc/plugins/audio_mixer/libspdif_mixer_plugin.la lib/vlc/plugins/audio_mixer/libtrivial_mixer_plugin.la lib/vlc/plugins/audio_output/libaout_file_plugin.la +${PLIST.sdl}lib/vlc/plugins/audio_output/libaout_sdl_plugin.la lib/vlc/plugins/audio_output/liboss_plugin.la ${PLIST.pulseaudio}lib/vlc/plugins/audio_output/libpulse_plugin.la lib/vlc/plugins/codec/liba52_plugin.la @@ -156,6 +157,7 @@ lib/vlc/plugins/codec/liblpcm_plugin.la lib/vlc/plugins/codec/libmpeg_audio_plugin.la ${PLIST.x11}lib/vlc/plugins/codec/libpng_plugin.la lib/vlc/plugins/codec/librawvideo_plugin.la +${PLIST.sdl}lib/vlc/plugins/codec/libsdl_image_plugin.la lib/vlc/plugins/codec/libspudec_plugin.la lib/vlc/plugins/codec/libsubsdec_plugin.la lib/vlc/plugins/codec/libsubsusf_plugin.la @@ -336,6 +338,7 @@ lib/vlc/plugins/video_filter/libvideo_fi lib/vlc/plugins/video_filter/libwall_plugin.la lib/vlc/plugins/video_filter/libwave_plugin.la lib/vlc/plugins/video_filter/libyuvp_plugin.la +${PLIST.sdl}lib/vlc/plugins/video_output/libvout_sdl_plugin.la ${PLIST.x11}lib/vlc/plugins/video_output/libsnapshot_plugin.la lib/vlc/plugins/video_output/libvmem_plugin.la lib/vlc/plugins/video_output/libvout_wrapper_plugin.la Index: net/ekiga/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/net/ekiga/Makefile,v retrieving revision 1.25 diff -p -u -r1.25 Makefile --- net/ekiga/Makefile 23 Aug 2011 13:06:52 -0000 1.25 +++ net/ekiga/Makefile 17 Dec 2011 03:57:30 -0000 @@ -24,33 +24,24 @@ CONFIGURE_ARGS+= --enable-gstreamer .include "options.mk" -GCONF_SCHEMAS= ekiga.schemas - GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ .include "../../audio/esound/buildlink3.mk" .include "../../databases/openldap-client/buildlink3.mk" -.include "../../devel/GConf/schemas.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/libgnome/buildlink3.mk" -.include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libsigc++/buildlink3.mk" .include "../../devel/opal/buildlink3.mk" .include "../../devel/ptlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libv4l/buildlink3.mk" -.include "../../mail/evolution-data-server/buildlink3.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../security/cyrus-sasl/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/libnotify/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libXv/buildlink3.mk" Index: net/ekiga/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/net/ekiga/PLIST,v retrieving revision 1.5 diff -p -u -r1.5 PLIST --- net/ekiga/PLIST 17 Nov 2009 19:50:57 -0000 1.5 +++ net/ekiga/PLIST 17 Dec 2011 03:57:30 -0000 @@ -4,9 +4,9 @@ bin/ekiga-config-tool bin/ekiga-helper man/man1/ekiga.1 share/applications/ekiga.desktop -share/dbus-1/services/org.ekiga.Ekiga.service -share/dbus-1/services/org.ekiga.Helper.service -share/gconf/schemas/ekiga.schemas +${PLIST.dbus}share/dbus-1/services/org.ekiga.Ekiga.service +${PLIST.dbus}share/dbus-1/services/org.ekiga.Helper.service +${PLIST.gconf}share/gconf/schemas/ekiga.schemas share/gnome/help/ekiga/C/ekiga.xml share/gnome/help/ekiga/C/figures/accounts_d1.png share/gnome/help/ekiga/C/figures/accounts_h323.png Index: net/ekiga/options.mk =================================================================== RCS file: /cvsroot/pkgsrc/net/ekiga/options.mk,v retrieving revision 1.1 diff -p -u -r1.1 options.mk --- net/ekiga/options.mk 22 Mar 2009 08:51:24 -0000 1.1 +++ net/ekiga/options.mk 17 Dec 2011 03:57:30 -0000 @@ -1,13 +1,55 @@ # $NetBSD: options.mk,v 1.1 2009/03/22 08:51:24 wiz Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.ekiga -PKG_SUPPORTED_OPTIONS+= avahi -PKG_SUGGESTED_OPTIONS+= avahi +PKG_OPTIONS_VAR= PKG_OPTIONS.ekiga +PKG_SUPPORTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify +#PKG_SUGGESTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify .include "../../mk/bsd.options.mk" +PLIST_VARS+= dbus gconf + .if !empty(PKG_OPTIONS:Mavahi) .include "../../net/avahi/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-avahi .endif + +.if !empty(PKG_OPTIONS:Mdbus) +CONFIGURE_ARGS+= --enable-dbus --enable-dbus-service +PLIST.dbus= yes +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-dbus --disable-dbus-service +.endif + +.if !empty(PKG_OPTIONS:Mevolution-data-server) +CONFIGURE_ARGS+= --enable-eds +.include "../../mail/evolution-data-server/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-eds +.endif + +.if !empty(PKG_OPTIONS:Mgconf) +PLIST.gconf =yes +GCONF_SCHEMAS= ekiga.schemas +CONFIGURE_ARGS+= --enable-gconf +.include "../../devel/GConf/schemas.mk" +.else +CONFIGURE_ARGS+= --disable-gconf +.endif + +.if !empty(PKG_OPTIONS:Mgnome) +CONFIGURE_ARGS+= --enable-gnome +.include "../../devel/libgnome/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-gnome +.endif + +.if !empty(PKG_OPTIONS:Mnotify) +CONFIGURE_ARGS+= --enable-notify +.include "../../sysutils/libnotify/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-notify +.endif Index: net/tor/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/net/tor/Makefile,v retrieving revision 1.82.2.1 diff -p -u -r1.82.2.1 Makefile --- net/tor/Makefile 2 Nov 2011 20:07:26 -0000 1.82.2.1 +++ net/tor/Makefile 17 Dec 2011 03:57:31 -0000 @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.82.2.1 2011/11/02 20:07:26 tron Exp $ # -DISTNAME= tor-0.2.2.34 +DISTNAME= tor-0.2.2.35 CATEGORIES= net security MASTER_SITES= http://www.torproject.org/dist/ # MASTER_SITES redirects to https, and ftp(1) cannot handle that. Index: net/tor/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/net/tor/distinfo,v retrieving revision 1.49.2.1 diff -p -u -r1.49.2.1 distinfo --- net/tor/distinfo 2 Nov 2011 20:07:26 -0000 1.49.2.1 +++ net/tor/distinfo 17 Dec 2011 03:57:31 -0000 @@ -1,6 +1,6 @@ $NetBSD: distinfo,v 1.49.2.1 2011/11/02 20:07:26 tron Exp $ -SHA1 (tor-0.2.2.34.tar.gz) = 81d777d07d01513da483bcd27dc92bc36112e771 -RMD160 (tor-0.2.2.34.tar.gz) = 3cbf6f00ab88010ed2f916526c4acef9a8514c37 -Size (tor-0.2.2.34.tar.gz) = 2752710 bytes +SHA1 (tor-0.2.2.35.tar.gz) = 98408e08c0c616c4c7669d018a66c55fc660cad3 +RMD160 (tor-0.2.2.35.tar.gz) = 9986f0892d410de9f3d496a5db6de29288295e92 +Size (tor-0.2.2.35.tar.gz) = 2787536 bytes SHA1 (patch-aa) = 5b89228dc37c459c48f24616933a5673a5a0a0d1 Index: print/LPRng-core/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/print/LPRng-core/Makefile,v retrieving revision 1.35 diff -p -u -r1.35 Makefile --- print/LPRng-core/Makefile 12 Feb 2010 00:21:17 -0000 1.35 +++ print/LPRng-core/Makefile 17 Dec 2011 03:58:08 -0000 @@ -18,7 +18,9 @@ MAKE_JOBS_SAFE= no CONFLICTS+= cups-[0-9]* -USE_TOOLS+= chgrp chown gmake +USE_TOOLS+= chgrp:run +USE_TOOLS+= chown:run +USE_TOOLS+= gmake USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} @@ -28,8 +30,11 @@ CONFIGURE_ARGS+= --with-printcap_path=${ CONFIGURE_ARGS+= --with-filterdir=${FILTER_DIR:Q} CONFIGURE_ARGS+= --with-filter_path=${FILTER_PATH:Q} CONFIGURE_ARGS+= --with-ld_library_path=${FILTER_LD_PATH:Q} -CONFIGURE_ENV+= CHGRP=${TOOLS_CHGRP:Q} -CONFIGURE_ENV+= CHOWN=${TOOLS_CHOWN:Q} +# [TRC 20111216: Provisional kludge to work around pkgsrc brokenness. +# This should be CHGRP=${CHGRP:Q} CHOWN=${CHOWN:Q}, but setting +# UNPRIVILEGED=yes screws that.] +CONFIGURE_ENV+= CHGRP=/usr/bin/chgrp +CONFIGURE_ENV+= CHOWN=/usr/sbin/chown .include "options.mk" Index: print/evince/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/print/evince/Makefile,v retrieving revision 1.73 diff -p -u -r1.73 Makefile --- print/evince/Makefile 22 Apr 2011 13:42:18 -0000 1.73 +++ print/evince/Makefile 17 Dec 2011 03:58:08 -0000 @@ -8,24 +8,15 @@ PKGREVISION= 6 COMMENT= Document viewer -GCONF_SCHEMAS+= evince-thumbnailer.schemas -GCONF_SCHEMAS+= evince-thumbnailer-ps.schemas - .include "options.mk" CONFIGURE_ARGS+= --enable-comics CONFIGURE_ARGS+= --disable-nautilus -GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas BUILD_DEPENDS+= gsed-[0-9]*:../../textproc/gsed -.include "../../devel/GConf/schemas.mk" .include "../../devel/glib2/schemas.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../security/libgnome-keyring/buildlink3.mk" -.include "../../sysutils/dbus/buildlink3.mk" -BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70 -.include "../../sysutils/dbus-glib/buildlink3.mk" BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" Index: print/evince/Makefile.common =================================================================== RCS file: /cvsroot/pkgsrc/print/evince/Makefile.common,v retrieving revision 1.35 diff -p -u -r1.35 Makefile.common --- print/evince/Makefile.common 11 Jan 2011 12:47:55 -0000 1.35 +++ print/evince/Makefile.common 17 Dec 2011 03:58:08 -0000 @@ -39,6 +39,5 @@ BUILDLINK_API_DEPENDS.poppler-glib+= pop .include "../../print/poppler-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" -.include "../../mk/omf-scrollkeeper.mk" BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 .include "../../x11/gtk2/buildlink3.mk" Index: print/evince/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/print/evince/PLIST,v retrieving revision 1.31 diff -p -u -r1.31 PLIST --- print/evince/PLIST 18 Jan 2011 10:08:44 -0000 1.31 +++ print/evince/PLIST 17 Dec 2011 03:58:08 -0000 @@ -56,9 +56,11 @@ lib/evince/3/backends/libcomicsdocument. ${PLIST.djvu}lib/evince/3/backends/libdjvudocument.la ${PLIST.dvi}lib/evince/3/backends/libdvidocument.la lib/evince/3/backends/libpdfdocument.la +${PLIST.gdk-pixbuf}lib/evince/3/backends/libpixbufdocument.la lib/evince/3/backends/libpsdocument.la lib/evince/3/backends/libtiffdocument.la lib/evince/3/backends/pdfdocument.evince-backend +${PLIST.gdk-pixbuf}lib/evince/3/backends/pixbufdocument.evince-backend lib/evince/3/backends/psdocument.evince-backend lib/evince/3/backends/tiffdocument.evince-backend lib/libevdocument.la @@ -66,11 +68,11 @@ lib/libevview.la lib/pkgconfig/evince-document-2.32.pc lib/pkgconfig/evince-view-2.32.pc libexec/evince-convert-metadata -libexec/evinced +${PLIST.dbus}libexec/evinced man/man1/evince.1 share/GConf/gsettings/evince.convert share/applications/evince.desktop -share/dbus-1/services/org.gnome.evince.Daemon.service +${PLIST.dbus}share/dbus-1/services/org.gnome.evince.Daemon.service share/evince/evince-previewer-ui.xml share/evince/evince-toolbar.xml share/evince/evince-ui.xml @@ -114,11 +116,11 @@ share/evince/icons/hicolor/48x48/actions share/evince/icons/hicolor/scalable/actions/object-rotate-left.svg share/evince/icons/hicolor/scalable/actions/object-rotate-right.svg share/evince/icons/hicolor/scalable/mimetypes/x-office-presentation.svg -share/gconf/schemas/evince-thumbnailer-comics.schemas -${PLIST.djvu}share/gconf/schemas/evince-thumbnailer-djvu.schemas -${PLIST.dvi}share/gconf/schemas/evince-thumbnailer-dvi.schemas -share/gconf/schemas/evince-thumbnailer-ps.schemas -share/gconf/schemas/evince-thumbnailer.schemas +${PLIST.gconf}share/gconf/schemas/evince-thumbnailer-comics.schemas +${PLIST.gconf}${PLIST.djvu}share/gconf/schemas/evince-thumbnailer-djvu.schemas +${PLIST.gconf}${PLIST.dvi}share/gconf/schemas/evince-thumbnailer-dvi.schemas +${PLIST.gconf}share/gconf/schemas/evince-thumbnailer-ps.schemas +${PLIST.gconf}share/gconf/schemas/evince-thumbnailer.schemas share/glib-2.0/schemas/org.gnome.Evince.gschema.xml share/gnome/help/evince/C/evince.xml share/gnome/help/evince/C/figures/evince_start_window.png Index: print/evince/options.mk =================================================================== RCS file: /cvsroot/pkgsrc/print/evince/options.mk,v retrieving revision 1.5 diff -p -u -r1.5 options.mk --- print/evince/options.mk 21 Oct 2009 17:28:02 -0000 1.5 +++ print/evince/options.mk 17 Dec 2011 03:58:08 -0000 @@ -1,12 +1,23 @@ # $NetBSD: options.mk,v 1.5 2009/10/21 17:28:02 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.evince -PKG_SUPPORTED_OPTIONS= dvi djvu +PKG_SUPPORTED_OPTIONS= dbus dvi djvu gconf gdk-pixbuf gnome-keyring +PKG_SUPPORTED_OPTIONS+= scrollkeeper .include "../../mk/bsd.options.mk" PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} +.if !empty(PKG_OPTIONS:Mdbus) +.include "../../sysutils/dbus/buildlink3.mk" +BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70 +.include "../../sysutils/dbus-glib/buildlink3.mk" +CONFIGURE_ARGS+= --enable-dbus +PLIST.dbus= yes +.else +CONFIGURE_ARGS+= --disable-dbus +.endif + .if !empty(PKG_OPTIONS:Mdvi) CONFIGURE_ARGS+= --enable-dvi PLIST.dvi= yes @@ -20,3 +31,34 @@ PLIST.djvu= yes GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas .include "../../graphics/djvulibre-lib/buildlink3.mk" .endif + +.if !empty(PKG_OPTIONS:Mgconf) +.include "../../devel/GConf/schemas.mk" +CONFIGURE_ARGS+= --with-gconf +GCONF_SCHEMAS+= evince-thumbnailer.schemas +GCONF_SCHEMAS+= evince-thumbnailer-ps.schemas +GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas +PLIST.gconf= yes +.else +CONFIGURE_ARGS+= --without-gconf +CONFIGURE_ARGS+= --disable-schemas-install +.endif + +.if !empty(PKG_OPTIONS:Mgdk-pixbuf) +CONFIGURE_ARGS+= --enable-pixbuf +PLIST.gdk-pixbuf= yes +.endif + +.if !empty(PKG_OPTIONS:Mgnome-keyring) +.include "../../security/libgnome-keyring/buildlink3.mk" +CONFIGURE_ARGS+= --with-keyring +.else +CONFIGURE_ARGS+= --without-keyring +.endif + +.if !empty(PKG_OPTIONS:Mscrollkeeper) +.include "../../mk/omf-scrollkeeper.mk" +CONFIGURE_ARGS+= --enable-scrollkeeper +.else +CONFIGURE_ARGS+= --disable-scrollkeeper +.endif Index: sysutils/bacula/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/sysutils/bacula/Makefile,v retrieving revision 1.38 diff -p -u -r1.38 Makefile --- sysutils/bacula/Makefile 24 Sep 2011 12:59:34 -0000 1.38 +++ sysutils/bacula/Makefile 17 Dec 2011 03:58:40 -0000 @@ -15,6 +15,9 @@ PLIST_SUBST+= BACULA_DB=${BACULA_DB} MESSAGE_SUBST+= PREFIX=${PREFIX} MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} +# For make_catalog_backup.pl.in. +USE_TOOLS+= perl:run + CONFIGURE_ARGS+= --with-dir-group=${BACULA_GROUP} CONFIGURE_ARGS+= --with-dir-user=${BACULA_DIR_USER} CONFIGURE_ARGS+= --with-sd-group=${BACULA_GROUP}