gnome help system
Greetings, Hi to all, I'm experimenting some problems with the help system on gnome, this it's what i found: Navigating trough the help system, yelp stop running a few seconds after it start and it does without any error message $ time yelp 0m31.39s real 0m21.65s user 0m4.79s system $ Without navigating trough the help system, yelp remains running, until you start using the sections on the help system. I'm running OpenBSD-current on i386 $ pkg_info ImageMagick-6.4.5.6 image processing tools ORBit2-2.14.17 high-performance CORBA Object Request Broker OpenEXR-1.6.1p0 high dynamic range image format aalib-1.4p1 ascii art library agg-2.5p0 anti-grain geometry graphics library alacarte-0.11.10easy GNOME menu editing tool amsn-0.97.2p0 open source MSN Messenger clone apache-ant-1.7.0p3 java replacement for make apg-2.2.3p0 automated password generator arts-1.5.10p0 K Desktop Environment, aRTs aspell-0.60.6p3 spell checker designed to eventually replace Ispell aspell6-es-1.9a_1p1 aspell dictionary for Spanish asterisk-1.4.22.2p0-h323 open source multi-protocol PBX and telephony toolkit at-spi-1.24.1p4 GNOME accessibility interface atk-1.24.0 accessibility toolkit used by gtk+ autoconf-2.13p1 automatically configure source code on many Un*x platforms autoconf-2.52p3 automatically configure source code on many Un*x platforms autoconf-2.59p3 automatically configure source code on many Un*x platforms autoconf-2.61p3 automatically configure source code on many Un*x platforms autoconf-2.62 automatically configure source code on many Un*x platforms automake-1.4.6 GNU Standards-compliant Makefile generator automake-1.8.5p1GNU standards-compliant Makefile generator automake-1.9.6p2GNU standards-compliant Makefile generator babl-0.0.22 dynamic pixel format conversion library bash-3.2.48 GNU Bourne Again Shell bison-2.3 GNU parser generator boehm-gc-7.0p1 garbage collection and memory leak detection for C and C++ boost-1.34.1p2 free peer-reviewed portable C++ source libraries bug-buddy-2.24.2p4 graphical bug reporting tool for GNOME bwidget-1.8.0p0 high-level widget set for Tcl/Tk bzip2-1.0.5 block-sorting file compressor, unencumbered cabextract-1.2p0extracts files from Microsoft CAB archives cairo-1.8.6p1 vector graphics library cairomm-1.4.4p0 C++ interface for cairo cdparanoia-3.a9.8p0 CDDA reading utility with extra data verification features cdrdao-1.2.0write audio/data CD-Rs in disk-at-once mode cdrtools-2.01p1 ISO 9660 filesystem and CD creation tools check-0.9.5 unit test framework for C programs cmake-2.4.8p0 portable build system conduit-0.3.15p8synchronization application for GNOME cups-1.2.7p17 Common Unix Printing System curl-7.19.4 get files from FTP, Gopher, HTTP or HTTPS servers cyrus-sasl-2.1.22p5 RFC SASL (Simple Authentication and Security Layer) db-4.6.21 Berkeley DB package, revision 4 db-java-4.6.21p1Java bindings for Berkeley DB, revision 4 dbus-1.2.12p0 message bus system dbus-glib-0.80 glib bindings for dbus message system dbus-python-0.83.0p1 dbus bindings for Python deskbar-applet-2.24.3p5 universal search and navigation for GNOME desktop-file-utils-0.15 utilities for 'desktop' entries detex-2.8 strip TeX/LaTeX codes from a file devhelp-0.22p2 API documentation browser for GNOME dia-0.96.1p11 technical diagrams drawing tool djvulibre-3.5.21view, decode and encode DjVu files docbook-4.4 technical documentation XML/SGML definitions docbook-dsssl-1.72 modular DSSSL stylesheets for the DocBook DTD docbook-xsl-1.68.1p1 docbook XSL modular stylesheet dovecot-1.1.11p1compact IMAP/POP3 server driconf-0.9.1p0 configuration utility for DRI drivers dvd+rw-tools-7.0p0 mastering tools for DVD+RW/+R/-R/-RW dvi2tty-5.3.1 converts .dvi files to plain text eel-2.24.1p3Eazel Extensions Library ekiga-2.0.12p14 SIP and H.323 compatible conferencing application empathy-2.24.1p9telepathy based messenger for GNOME enchant-1.4.2p1 generic spell checking library/wrapper eog-2.24.3.1p5 Eye of GNOME, image viewing and cataloging program esound-0.2.41v0 sound library for Enlightenment espeak-1.37p0 compact speech synthesizer evince-2.24.2p3 document viewer for multiple document formats evolution-2.24.5p3 integrated email and PIM software for GNOME evolution-data-server-2.24.5p0 data backends for the Evolution mail/PIM suite evolution-plugin-rss-0.1.2p2 RSS-reader plugin for GNOME evolution-plugin-webcal-2.24.0p2 webcal(endar) handler for GNOME faac-1.26 MPEG-2 and MPEG-4 AAC encoder faad-2.6.1 MPEG-2 and MPEG-4 AAC decoder fam-2.7.0p6 File Alteration Monitor fasm-1.67.29p0 flat assembler festival-1.95betap2 general multi-lingual speech synthesis system
Re: keeping makewhatis happy wrt/ pod (Was: Re: UPD: devel/p5-Moose)
On Mon, Mar 23, 2009 at 09:06:07AM -0600, Theo de Raadt wrote: > > On Sun, Mar 22, 2009 at 12:47:28AM -0600, Theo de Raadt wrote: > > > Another way to solve this is a rewrite of pod2man .. which will then > > > generate mandoc instead. > > > > > > That also benefits the other manual page project. > > > > hum... so let's trade 10 lines of makewhatis to a complete new back-end > > to pod2man ? > > > > I'm not saying this would not be a good idea, but: > > - we will always need to parse some nroff stuff. Converting all manpages in > > all 3rd party ports is not realistic. > > Huh? > > Converting all pods to mandoc, and getting the prettiness for fre, isn't > worth it? "For free" ? pod2man is 1700 lines. Figuring out what to rewrite to get mandoc instead of old nroff isn't exactly "for free"... Yes, it's worthwhile. No I currently don't have the time to do it. Small incremental changes to makewhatis that take 1 or 2 hours, on the other hand, are doable...
Re: update: devel/subversion -> 1.6.0
On Mon, Mar 23, 2009 at 10:51:10AM +, Stefan Sperling wrote: > On Sun, Mar 22, 2009 at 11:47:37PM +, Stefan Sperling wrote: > > Here is a diff that updates devel/subversion to 1.6.0. > > Updated diff based on comments by ajacoutot@ (extra BUILD_DEPENDS > for the gnome-keyring subpackage had errors and were not even needed). And another update, dropping some PLIST changes. steven@ pointed out that some directories added to PLIST by 'make update-plist' were bogus. Stefan Index: Makefile === RCS file: /usr/cvs/ports/devel/subversion/Makefile,v retrieving revision 1.57 diff -u -p -r1.57 Makefile --- Makefile16 Mar 2009 22:20:02 - 1.57 +++ Makefile23 Mar 2009 10:18:03 - @@ -1,21 +1,23 @@ # $OpenBSD: Makefile,v 1.57 2009/03/16 22:20:02 kili Exp $ -COMMENT-main= subversion revision control system -COMMENT-perl= perl interface to subversion -COMMENT-python=python interface to subversion -COMMENT-ruby= ruby interface to subversion -COMMENT-ap2= apache2 subversion modules - -VERSION= 1.5.6 -DISTNAME= subversion-${VERSION} -PKGNAME= ${DISTNAME} -PKGNAME-main= ${DISTNAME} -PKGNAME-perl= p5-SVN-${VERSION} -PKGNAME-python=py-subversion-${VERSION}p0 -PKGNAME-ruby= ruby-subversion-${VERSION} -PKGNAME-ap2= ap2-subversion-${VERSION} +COMMENT-main= subversion revision control system +COMMENT-perl= perl interface to subversion +COMMENT-python=python interface to subversion +COMMENT-ruby= ruby interface to subversion +COMMENT-ap2= apache2 subversion modules +COMMENT-gnome-keyring= gnome-keyring support for subversion + +VERSION= 1.6.0 +DISTNAME= subversion-1.6.0 +PKGNAME= ${DISTNAME} +PKGNAME-main= ${DISTNAME} +PKGNAME-perl= p5-SVN-${VERSION} +PKGNAME-python=py-subversion-${VERSION} +PKGNAME-ruby= ruby-subversion-${VERSION} +PKGNAME-ap2= ap2-subversion-${VERSION} +PKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION} -SO_VERSION=1.1 +SO_VERSION=1.2 SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \ svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_ra-1 svn_ra_neon-1 \ svn_ra_local-1 svn_ra_neon-1 svn_ra_svn-1 svn_repos-1 svn_subr-1 svn_wc-1 @@ -36,18 +38,20 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}/tarballs/ +EXTRACT_SUFX= .tar.bz2 -PSEUDO_FLAVORS=no_bindings no_ap2 +PSEUDO_FLAVORS=no_bindings no_ap2 no_gnome-keyring FLAVOR?= MODULES= devel/gettext lang/python -WANTLIB= expat db z +WANTLIB= expat db z sqlite3 LIB_DEPENDS= neon.>=26:neon->=0.26.2:net/neon \ apr-1::devel/apr \ aprutil-1::devel/apr-util \ - sasl2.>=2::security/cyrus-sasl2 + sasl2.>=2::security/cyrus-sasl2 \ + sqlite3::databases/sqlite3 MULTI_PACKAGES=-main @@ -58,11 +62,11 @@ RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPEN CONTRIB_HOOK_SCRIPTS= case-insensitive.py pre-commit-check.py \ check-mime-type.pl pre-lock-require-needs-lock.py \ commit-block-joke.py remove-zombie-locks.py \ - syntax-check.sh + syntax-check.sh commit-email.pl # There's also 'enforcer', but we handle it separately, see post-install TOOLS_HOOK_SCRIPTS=commit-access-control.cfg.example \ - commit-access-control.pl commit-email.pl commit-email.rb \ + commit-access-control.pl commit-email.rb \ log-police.py svn2feed.py svnperms.conf.example \ svnperms.py verify-po.py # There's also 'mailer', but we handle it separately, see post-install @@ -121,6 +125,23 @@ MODULES+= lang/ruby BUILD_DEPENDS+=:swig->=1.3.36:devel/swig .endif +.if !${FLAVOR:L:Mno_gnome-keyring} +MULTI_PACKAGES+= -gnome-keyring +SHARED_ONLY= Yes +LIB_DEPENDS-gnome-keyring= dbus-1.>=7::x11/dbus \ + glib-2.0::devel/glib2 \ + gnome-keyring.>=4::x11/gnome/keyring \ + pcre.>=2::devel/pcre \ + ${MODGETTEXT_LIB_DEPENDS} \ + svn_subr-1.>=${SO_VERSION}:${PKGNAME}:devel/subversion,-main +WANTLIB-gnome-keyring= ${WANTLIB} apr-1 aprutil-1 iconv +SHARED_LIBS+= svn_auth_gnome_keyring-1 ${SO_VERSION} +# gnome-keyring depends on dbus depends on pthread, so svn won't be able +# to load libsvn_auth_gnome_keyring without this: +WANTLIB-main+= pthread +CFLAGS+= -pthread +.endif + # BSD make cannot build target autogen-swig to regenerate bindings USE_GMAKE= Yes MAKE_FLAGS=MAKE=${MAKE_PROGRAM} @@ -129,6 +150,7 @@ AUTOCONF_VERSION=2.62 CONFIGURE_STYLE=autoconf CONFIGURE_ENV= PYTHON2=${MODPY_BIN} CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ + --with-sasl=${LOCALBASE} \
openvpn and pthreads
hi, i've been looking at compiling the openvpn package with pthreads enabled, since that is needed for plugins like the ldap authentication plugin (one plugin I've been asked about many times in the past), which is very useful. >From the reports I got so far, openvpn seems to run stable with --enable-pthreads. Does anyone here have concerns regarding this change? Also I would really like to get reports on more people running with this. (see attached diff to the net/openvpn port) felix -- GPG/PGP: D9AC74D0 / 076E 1E87 3E05 1C7F B1A0 8A48 0D31 9BD3 D9AC 74D0 http://hazardous.org/~fkr - f...@hazardous.org - f...@silc|irc - FKR-RIPE https://www.bytemine.net/ - bytemine - BSD based Hosting/Solutions/Ideas Index: Makefile === RCS file: /cvs/ports/net/openvpn/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- Makefile8 Mar 2009 15:56:52 - 1.21 +++ Makefile23 Mar 2009 23:20:22 - @@ -4,7 +4,7 @@ VERSION= 2.1_rc15 DISTNAME= openvpn-${VERSION} -PKGNAME= ${DISTNAME:S/_//g}p0 +PKGNAME= ${DISTNAME:S/_//g}p1 CATEGORIES=net security HOMEPAGE= http://openvpn.net/ @@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c crypto ssl +WANTLIB= c crypto ssl pthread MASTER_SITES= ${HOMEPAGE}/release/ @@ -28,7 +28,7 @@ CONFIGURE_STYLE=gnu # pthread support is supposed to be unstable on OpenBSD -CONFIGURE_ARGS+=--disable-pthread \ +CONFIGURE_ARGS+=--enable-pthread \ --with-lzo-headers=${DEPBASE}/include \ --with-lzo-lib=${DEPBASE}/lib \ --enable-password-save
FIX: net/poptop
Remove unused devel/gettext dependencies, fixes vax build. Ok ? Comments ? Cheers Giovanni Index: Makefile === RCS file: /cvs/ports/net/poptop/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile21 Jan 2009 16:07:15 - 1.9 +++ Makefile23 Mar 2009 18:07:34 - @@ -4,7 +4,7 @@ COMMENT=PPTP Server V=1.3.4 DISTNAME= pptpd-$V -PKGNAME= poptop-$V +PKGNAME= poptop-$Vp0 CATEGORIES=net HOMEPAGE= http://www.poptop.org/ @@ -21,13 +21,9 @@ WANTLIB= c util MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poptop/} CONFIGURE_STYLE= gnu -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lintl -liconv" CONFIGURE_ARGS+= --with-bsdppp --with-pppd-ip-alloc FAKE_FLAGS=DESTDIR= USE_GMAKE= Yes - -MODULES= devel/gettext post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/poptop
Re: keeping makewhatis happy wrt/ pod (Was: Re: UPD: devel/p5-Moose)
> On Sun, Mar 22, 2009 at 12:47:28AM -0600, Theo de Raadt wrote: > > Another way to solve this is a rewrite of pod2man .. which will then > > generate mandoc instead. > > > > That also benefits the other manual page project. > > hum... so let's trade 10 lines of makewhatis to a complete new back-end > to pod2man ? > > I'm not saying this would not be a good idea, but: > - we will always need to parse some nroff stuff. Converting all manpages in > all 3rd party ports is not realistic. Huh? Converting all pods to mandoc, and getting the prettiness for fre, isn't worth it? It has no downside.
Re: PATCH: Gnokii icon in GNOME menu
On Mon, Mar 23, 2009 at 02:04:16PM +, Mikolaj Kucharski wrote: > On Mon, Mar 23, 2009 at 01:46:21PM +, Stuart Henderson wrote: > > On 2009/03/23 13:34, Mikolaj Kucharski wrote: > > > Third try to the list. Any okays? > > > > Does this need the gtk-update-icon-cache goo? (and if not, it's probably > > a good opportunity for someone to explain when it is and isn't needed :) > > No. Gnokii doesn't provide `index.theme' file from which > `icon-theme.cache' file is created by gtk-update-icon-cache(1). Of cource, that shoule be: "No, it does not provide any icons for any theme under %D/share/icons". -- best regards q#
Re: PATCH: Gnokii icon in GNOME menu
On Mon, Mar 23, 2009 at 02:04:16PM +, Mikolaj Kucharski wrote: > Below information was found without looking into sources, but I'm pretty > sure that it true. Just to be more precise. gtk-update-icon-cache(1) updates/creates icon-theme.cache file from index.theme file. This stuff is usually placed in: %D/share/icons//index.theme %D/share/icons//icon-theme.cache update-desktop-database updates cache file from .desktop files: %D/share/applications/.desktop %D/share/applications/mimeinfo.cache update-mime-database(1) updates cache files from .xml files placed under %D/share/mime: %D/share/mime/packages/.xml %D/share/mime/XMLnamespaces %D/share/mime/aliases %D/share/mime/globs %D/share/mime/globs2 %D/share/mime/magic %D/share/mime/mime.cache %D/share/mime/subclasses %D/share/mime/types -- best regards q#
Re: PATCH: Gnokii icon in GNOME menu
On Mon, Mar 23, 2009 at 01:46:21PM +, Stuart Henderson wrote: > On 2009/03/23 13:34, Mikolaj Kucharski wrote: > > Third try to the list. Any okays? > > Does this need the gtk-update-icon-cache goo? (and if not, it's probably > a good opportunity for someone to explain when it is and isn't needed :) No. Gnokii doesn't provide `index.theme' file from which `icon-theme.cache' file is created by gtk-update-icon-cache(1). Below information was found without looking into sources, but I'm pretty sure that it true. gtk-update-icon-cache(1) updates/creates following type of files: $ cd /usr/local/share/icons $ ls -1 ./*/*.cache ./Clearlooks/icon-theme.cache ./Crux/icon-theme.cache ./Foxtrot/icon-theme.cache ./Gion/icon-theme.cache ./HighContrast-SVG/icon-theme.cache ./HighContrastLargePrint/icon-theme.cache ./HighContrastLargePrintInverse/icon-theme.cache ./LowContrastLargePrint/icon-theme.cache ./Mist/icon-theme.cache ./Neu/icon-theme.cache ./Tango/icon-theme.cache ./gnome-alternative/icon-theme.cache ./gnome/icon-theme.cache ./hicolor/icon-theme.cache update-desktop-database updates: /usr/local/share/applications/mimeinfo.cache update-mime-database(1) updates: $ grep -Rh -A1 -e 'comment no checksum' /var/db/pkg/ | grep -ve 'comment no checksum' share/mime/XMLnamespaces share/mime/aliases share/mime/globs share/mime/globs2 share/mime/magic share/mime/mime.cache share/mime/subclasses share/mime/types -- best regards q#
Re: PATCH: Gnokii icon in GNOME menu
On Mon, 23 Mar 2009, Stuart Henderson wrote: > On 2009/03/23 13:34, Mikolaj Kucharski wrote: > > Third try to the list. Any okays? > > Does this need the gtk-update-icon-cache goo? (and if not, it's probably > a good opportunity for someone to explain when it is and isn't needed :) It does not :) gtk-update-icon-cache is for icon themes only. These themes are installed under /usr/local/share/icons/. Have a look at gtk-update-icon-cache(1) for more details. The patch looks fine to me, Robert, could you commit it? -- Antoine
Re: PATCH: Gnokii icon in GNOME menu
Yup. On (2009-03-23 15:00), Antoine Jacoutot wrote: > On Mon, 23 Mar 2009, Stuart Henderson wrote: > > > On 2009/03/23 13:34, Mikolaj Kucharski wrote: > > > Third try to the list. Any okays? > > > > Does this need the gtk-update-icon-cache goo? (and if not, it's probably > > a good opportunity for someone to explain when it is and isn't needed :) > > It does not :) > gtk-update-icon-cache is for icon themes only. These themes are > installed under /usr/local/share/icons/. > Have a look at gtk-update-icon-cache(1) for more details. > > The patch looks fine to me, Robert, could you commit it? > > -- > Antoine
Re: PATCH: Gnokii icon in GNOME menu
On 2009/03/23 13:34, Mikolaj Kucharski wrote: > Third try to the list. Any okays? Does this need the gtk-update-icon-cache goo? (and if not, it's probably a good opportunity for someone to explain when it is and isn't needed :) > On Thu, Mar 12, 2009 at 05:25:24AM +, Mikolaj Kucharski wrote: > > Any news? > > > > > > On Mon, Feb 16, 2009 at 09:38:26PM +, Mikolaj Kucharski wrote: > > > Hi, > > > > > > Install xpm file so Gnokii will have icon in desktop menus. > > -- > best regards > q# > Index: Makefile > === > RCS file: /cvs/ports/comms/gnokii/Makefile,v > retrieving revision 1.19 > diff -u -r1.19 Makefile > --- Makefile 26 Jan 2009 10:59:14 - 1.19 > +++ Makefile 16 Feb 2009 21:35:37 - > @@ -3,7 +3,7 @@ > COMMENT= tools to talk to GSM cellular phones > > DISTNAME=gnokii-0.6.14 > -PKGNAME= ${DISTNAME}p8 > +PKGNAME= ${DISTNAME}p9 > CATEGORIES= comms x11 > SHARED_LIBS += gnokii 2.7 # .3.0 > > @@ -61,8 +61,11 @@ > ${INSTALL_DATA} ${WRKSRC}/Docs/man/gnokii.1 \ > ${PREFIX}/man/man1 > .if !${FLAVOR:L:Mno_x11} > + ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps > ${INSTALL_DATA} ${WRKSRC}/Docs/man/xgnokii.1x \ > ${PREFIX}/man/man1/xgnokii.1 > + ${INSTALL_DATA} ${WRKSRC}/Docs/sample/logo/gnokii.xpm \ > + ${PREFIX}/share/pixmaps/xgnokii.xpm > .endif > > do-regress: > Index: pkg/PLIST > === > RCS file: /cvs/ports/comms/gnokii/pkg/PLIST,v > retrieving revision 1.6 > diff -u -r1.6 PLIST > --- pkg/PLIST 26 Jan 2009 10:59:14 - 1.6 > +++ pkg/PLIST 16 Feb 2009 21:35:37 - > @@ -46,3 +46,5 @@ > share/locale/sl/LC_MESSAGES/gnokii.mo > share/locale/sv/LC_MESSAGES/gnokii.mo > share/locale/zh_CN/LC_MESSAGES/gnokii.mo > +share/pixmaps/ > +share/pixmaps/xgnokii.xpm
Re: PATCH: Gnokii icon in GNOME menu
Third try to the list. Any okays? On Thu, Mar 12, 2009 at 05:25:24AM +, Mikolaj Kucharski wrote: > Any news? > > > On Mon, Feb 16, 2009 at 09:38:26PM +, Mikolaj Kucharski wrote: > > Hi, > > > > Install xpm file so Gnokii will have icon in desktop menus. -- best regards q# Index: Makefile === RCS file: /cvs/ports/comms/gnokii/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- Makefile26 Jan 2009 10:59:14 - 1.19 +++ Makefile16 Feb 2009 21:35:37 - @@ -3,7 +3,7 @@ COMMENT= tools to talk to GSM cellular phones DISTNAME= gnokii-0.6.14 -PKGNAME= ${DISTNAME}p8 +PKGNAME= ${DISTNAME}p9 CATEGORIES=comms x11 SHARED_LIBS += gnokii 2.7 # .3.0 @@ -61,8 +61,11 @@ ${INSTALL_DATA} ${WRKSRC}/Docs/man/gnokii.1 \ ${PREFIX}/man/man1 .if !${FLAVOR:L:Mno_x11} + ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/Docs/man/xgnokii.1x \ ${PREFIX}/man/man1/xgnokii.1 + ${INSTALL_DATA} ${WRKSRC}/Docs/sample/logo/gnokii.xpm \ + ${PREFIX}/share/pixmaps/xgnokii.xpm .endif do-regress: Index: pkg/PLIST === RCS file: /cvs/ports/comms/gnokii/pkg/PLIST,v retrieving revision 1.6 diff -u -r1.6 PLIST --- pkg/PLIST 26 Jan 2009 10:59:14 - 1.6 +++ pkg/PLIST 16 Feb 2009 21:35:37 - @@ -46,3 +46,5 @@ share/locale/sl/LC_MESSAGES/gnokii.mo share/locale/sv/LC_MESSAGES/gnokii.mo share/locale/zh_CN/LC_MESSAGES/gnokii.mo +share/pixmaps/ +share/pixmaps/xgnokii.xpm
Re: sqlite-3.6.11
merge after jakemsr@ commit could someone do ports bulk build w/ it, please? Index: Makefile === RCS file: /cvs/ports/databases/sqlite3/Makefile,v retrieving revision 1.42 diff -u -r1.42 Makefile --- Makefile23 Mar 2009 00:33:02 - 1.42 +++ Makefile23 Mar 2009 11:26:46 - @@ -3,9 +3,9 @@ COMMENT-main= embedded SQL implementation COMMENT-tcl= TCL bindings for Sqlite3 COMMENT-lemon= LEMON LALR(1) parser generator -V= 3.6.10 +V= 3.6.11 DISTNAME= sqlite-${V} -PKGNAME-main= sqlite3-${V}p0 +PKGNAME-main= sqlite3-${V} PKGNAME-tcl= sqlite3-tcl-${V} PKGNAME-lemon= lemon-${V} CATEGORIES=databases Index: distinfo === RCS file: /cvs/ports/databases/sqlite3/distinfo,v retrieving revision 1.23 diff -u -r1.23 distinfo --- distinfo31 Jan 2009 15:49:34 - 1.23 +++ distinfo23 Mar 2009 11:26:46 - @@ -1,5 +1,5 @@ -MD5 (sqlite-3.6.10.tar.gz) = oDvcht9AJbaIHVhVfktb0w== -RMD160 (sqlite-3.6.10.tar.gz) = Ux5yhTADteWofKYXuw8uy0FKrcQ= -SHA1 (sqlite-3.6.10.tar.gz) = da0OIzy72i58SH93cvV9FqyfP7c= -SHA256 (sqlite-3.6.10.tar.gz) = IVfbNKoKrOjVoaXHIygPKECzODSYoiXKs2AU8KRfqgE= -SIZE (sqlite-3.6.10.tar.gz) = 2763053 +MD5 (sqlite-3.6.11.tar.gz) = frsJlpardsxv9l3UltF4WA== +RMD160 (sqlite-3.6.11.tar.gz) = w42CyD9dZM+zAuMjLFB7r7C2TnQ= +SHA1 (sqlite-3.6.11.tar.gz) = vRw3F4TZkPe16ZyEHljeuH+/S24= +SHA256 (sqlite-3.6.11.tar.gz) = /Qe+ebTU6EU2deFCkHp3fQd3bsKz4qn03XZFon/NKKE= +SIZE (sqlite-3.6.11.tar.gz) = 2804714 Index: patches/patch-Makefile_in === RCS file: /cvs/ports/databases/sqlite3/patches/patch-Makefile_in,v retrieving revision 1.11 diff -u -r1.11 patch-Makefile_in --- patches/patch-Makefile_in 31 Jan 2009 15:49:34 - 1.11 +++ patches/patch-Makefile_in 23 Mar 2009 11:26:46 - @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2009/01/31 15:49:34 simon Exp $ Makefile.in.orig Thu Jan 15 15:01:45 2009 -+++ Makefile.inTue Jan 27 10:23:37 2009 -@@ -172,11 +172,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.l +--- Makefile.in.orig Sun Feb 15 15:07:08 2009 Makefile.inSun Mar 22 13:28:08 2009 +@@ -176,11 +176,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.l table.lo tokenize.lo trigger.lo update.lo \ util.lo vacuum.lo \ vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo \ @@ -15,7 +15,7 @@ # Determine the real value of LIBOBJ based on the 'configure' script # -@@ -268,7 +268,8 @@ SRC = \ +@@ -273,7 +273,8 @@ SRC = \ $(TOP)/src/vdbeInt.h \ $(TOP)/src/vtab.c \ $(TOP)/src/walker.c \ @@ -25,7 +25,7 @@ # Generated source code files # -@@ -431,7 +432,7 @@ HDR += \ +@@ -438,7 +439,7 @@ HDR += \ # hidden when the library is built via the amalgamation). # TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la @@ -34,18 +34,18 @@ TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION)) -@@ -456,7 +457,7 @@ libsqlite3.la: $(LIBOBJ) +@@ -466,7 +467,7 @@ libsqlite3.la: $(LIBOBJ) libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -o $@ tclsqlite.lo \ - libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ + libsqlite3.la -L./.libs @TCL_STUB_LIB_SPEC@ $(TLIBS) \ - -rpath "$(libdir)/sqlite" \ - -module -avoid-version - -@@ -493,6 +494,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c + -rpath "$(TCLLIBDIR)" \ + -version-info "8:6:8" \ + -avoid-version +@@ -504,6 +505,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c sqlite3.lo: sqlite3.c - $(LTCOMPILE) -c sqlite3.c + $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c +pthread_stub.lo: $(TOP)/src/pthread_stub.c + $(LTCOMPILE) -c $(TOP)/src/pthread_stub.c @@ -53,7 +53,7 @@ # Rules to build individual files # alter.lo: $(TOP)/src/alter.c $(HDR) -@@ -783,6 +787,8 @@ clean: +@@ -799,6 +803,8 @@ clean: distclean:clean rm -f config.log config.status libtool Makefile sqlite3.pc Index: patches/patch-configure === RCS file: /cvs/ports/databases/sqlite3/patches/patch-configure,v retrieving revision 1.5 diff -u -r1.5 patch-configure --- patches/patch-configure 27 Oct 2008 23:20:39 - 1.5 +++ patches/patch-configure 23 Mar 2009 11:26:46 - @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.5 2008/10/27 23:20:39 steven Exp $ configure.orig Tue Oct 14 20:07:39 2008 -+++ configure Mon Oct 27 18:30:05 2008 -@@ -10793,7 +10793,7 @@ USE_AMALGAMATION=1 +--- configure.orig Sun Feb 15 15:07:08 2009 configure Sun Mar 22 13:27:07 2009 +@@ -12216,7 +12216,7 @@ USE_AMALGAMATION=1 # if not, then we fall bac
Re: update: devel/subversion -> 1.6.0
On Sun, Mar 22, 2009 at 11:47:37PM +, Stefan Sperling wrote: > Here is a diff that updates devel/subversion to 1.6.0. Updated diff based on comments by ajacoutot@ (extra BUILD_DEPENDS for the gnome-keyring subpackage had errors and were not even needed). Stefan Index: Makefile === RCS file: /usr/cvs/ports/devel/subversion/Makefile,v retrieving revision 1.57 diff -u -p -r1.57 Makefile --- Makefile16 Mar 2009 22:20:02 - 1.57 +++ Makefile23 Mar 2009 10:18:03 - @@ -1,21 +1,23 @@ # $OpenBSD: Makefile,v 1.57 2009/03/16 22:20:02 kili Exp $ -COMMENT-main= subversion revision control system -COMMENT-perl= perl interface to subversion -COMMENT-python=python interface to subversion -COMMENT-ruby= ruby interface to subversion -COMMENT-ap2= apache2 subversion modules - -VERSION= 1.5.6 -DISTNAME= subversion-${VERSION} -PKGNAME= ${DISTNAME} -PKGNAME-main= ${DISTNAME} -PKGNAME-perl= p5-SVN-${VERSION} -PKGNAME-python=py-subversion-${VERSION}p0 -PKGNAME-ruby= ruby-subversion-${VERSION} -PKGNAME-ap2= ap2-subversion-${VERSION} +COMMENT-main= subversion revision control system +COMMENT-perl= perl interface to subversion +COMMENT-python=python interface to subversion +COMMENT-ruby= ruby interface to subversion +COMMENT-ap2= apache2 subversion modules +COMMENT-gnome-keyring= gnome-keyring support for subversion + +VERSION= 1.6.0 +DISTNAME= subversion-1.6.0 +PKGNAME= ${DISTNAME} +PKGNAME-main= ${DISTNAME} +PKGNAME-perl= p5-SVN-${VERSION} +PKGNAME-python=py-subversion-${VERSION} +PKGNAME-ruby= ruby-subversion-${VERSION} +PKGNAME-ap2= ap2-subversion-${VERSION} +PKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION} -SO_VERSION=1.1 +SO_VERSION=1.2 SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \ svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_ra-1 svn_ra_neon-1 \ svn_ra_local-1 svn_ra_neon-1 svn_ra_svn-1 svn_repos-1 svn_subr-1 svn_wc-1 @@ -36,18 +38,20 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}/tarballs/ +EXTRACT_SUFX= .tar.bz2 -PSEUDO_FLAVORS=no_bindings no_ap2 +PSEUDO_FLAVORS=no_bindings no_ap2 no_gnome-keyring FLAVOR?= MODULES= devel/gettext lang/python -WANTLIB= expat db z +WANTLIB= expat db z sqlite3 LIB_DEPENDS= neon.>=26:neon->=0.26.2:net/neon \ apr-1::devel/apr \ aprutil-1::devel/apr-util \ - sasl2.>=2::security/cyrus-sasl2 + sasl2.>=2::security/cyrus-sasl2 \ + sqlite3::databases/sqlite3 MULTI_PACKAGES=-main @@ -58,11 +62,11 @@ RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPEN CONTRIB_HOOK_SCRIPTS= case-insensitive.py pre-commit-check.py \ check-mime-type.pl pre-lock-require-needs-lock.py \ commit-block-joke.py remove-zombie-locks.py \ - syntax-check.sh + syntax-check.sh commit-email.pl # There's also 'enforcer', but we handle it separately, see post-install TOOLS_HOOK_SCRIPTS=commit-access-control.cfg.example \ - commit-access-control.pl commit-email.pl commit-email.rb \ + commit-access-control.pl commit-email.rb \ log-police.py svn2feed.py svnperms.conf.example \ svnperms.py verify-po.py # There's also 'mailer', but we handle it separately, see post-install @@ -121,6 +125,23 @@ MODULES+= lang/ruby BUILD_DEPENDS+=:swig->=1.3.36:devel/swig .endif +.if !${FLAVOR:L:Mno_gnome-keyring} +MULTI_PACKAGES+= -gnome-keyring +SHARED_ONLY= Yes +LIB_DEPENDS-gnome-keyring= dbus-1.>=7::x11/dbus \ + glib-2.0::devel/glib2 \ + gnome-keyring.>=4::x11/gnome/keyring \ + pcre.>=2::devel/pcre \ + ${MODGETTEXT_LIB_DEPENDS} \ + svn_subr-1.>=${SO_VERSION}:${PKGNAME}:devel/subversion,-main +WANTLIB-gnome-keyring= ${WANTLIB} apr-1 aprutil-1 iconv +SHARED_LIBS+= svn_auth_gnome_keyring-1 ${SO_VERSION} +# gnome-keyring depends on dbus depends on pthread, so svn won't be able +# to load libsvn_auth_gnome_keyring without this: +WANTLIB-main+= pthread +CFLAGS+= -pthread +.endif + # BSD make cannot build target autogen-swig to regenerate bindings USE_GMAKE= Yes MAKE_FLAGS=MAKE=${MAKE_PROGRAM} @@ -129,6 +150,7 @@ AUTOCONF_VERSION=2.62 CONFIGURE_STYLE=autoconf CONFIGURE_ENV= PYTHON2=${MODPY_BIN} CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ + --with-sasl=${LOCALBASE} \ --without-jikes \ --without-jdk .if !${FLAVOR:L:Mno_bindings} @@ -144,15 +166,20 @@ CONFIGURE_ARGS+=--with-apxs=${LOCALBASE} CONFIGURE_ARGS+=--without-apxs .endif +.if !${FLAVOR:L:Mno_g
Re: keeping makewhatis happy wrt/ pod (Was: Re: UPD: devel/p5-Moose)
On Sun, Mar 22, 2009 at 12:47:28AM -0600, Theo de Raadt wrote: > Another way to solve this is a rewrite of pod2man .. which will then > generate mandoc instead. > > That also benefits the other manual page project. hum... so let's trade 10 lines of makewhatis to a complete new back-end to pod2man ? I'm not saying this would not be a good idea, but: - we will always need to parse some nroff stuff. Converting all manpages in all 3rd party ports is not realistic. - I'll just put this on my list of things to do when I have time. ;-)
Re: problem building ports after PkgSpec change
On 2009/03/22 22:55, Nigel J. Taylor wrote: > - db:db-4.*:databases/db/v4 \ > + db::databases/db/v4 \ oh, and this one should be db:db->=4,<5:databases/db/v4 (&c for the others).
Re: problem building ports after PkgSpec change
On 2009/03/22 22:55, Nigel J. Taylor wrote: > Hi, > > I had to make the following changes to the Makefile's to build packages as in > the diffs below. These used to build a while ago. Looking at CVS > src/usr.sbin/pkg_add/OpenBSD/PkgSpec.pm was updated expecting some breakages, > guessing this might be the reason. > > I am not sure which need fixing PkgSpec or the Makefile's. thanks - that's exactly the reason - the Makefiles need to be fixed as they don't comply with a strict interpretation of packages-specs(7), but we also have to bump PKGNAME when touching anything that makes it into the package (LIB_DEPENDS and RUN_DEPENDS do, but BUILD_DEPENDS doesn't). I'll look at these.
Re: changing pkg_add -ui behaviour
Marc Espie wrote: > On Fri, Mar 20, 2009 at 04:14:40AM +0100, frantisek holop wrote: >> hi there, >> >> i am just thinking out loud, but would it make sense >> that "pkg_add -u not-yet-installed-package" would >> instead of complaining about unresolvable package name >> just go ahead and try to install that package? >> >> this could allow for the scenario of updating and >> installing packages from the same command line >> without having to know what is already installed >> and what is not... > > My current plans are much further along. There's still a lot of cleanup to > do, but you should like the end result once things work... >