CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2009/04/20 01:43:21 Modified files: mail/mutt : Makefile.inc mail/mutt/snapshot: Makefile distinfo mail/mutt/snapshot/pkg: PLIST mail/mutt/stable: Makefile mail/mutt/stable/pkg: PLIST Added files: mail/mutt/snapshot/patches: sidebar-buffy_c Log message: update to 1.5.19 and take MAINTAINER. thanks to Simon Kuhnle, landry@ and Brad for testing various versions of this diff. ok landry@ after a few rounds of pain with Maildir and the sidebar patch, eventually resulting in snapshot/patches/sidebar-buffy_c.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2009/04/20 04:29:05 Log message: Import QT version of tea editor. TEA is a powerful and simple-in-use QT-based text editor with syntax highlighting. TEA can also open Openoffice.org Writer and Microsoft Word 2007 files. Status: Vendor Tag: giovanni Release Tags: giovanni-20090420 N ports/editors/teaqt/distinfo N ports/editors/teaqt/Makefile N ports/editors/teaqt/pkg/DESCR N ports/editors/teaqt/pkg/PLIST N ports/editors/teaqt/patches/patch-src_pro N ports/editors/teaqt/patches/patch-spellchecker_cpp No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2009/04/20 04:31:29 Modified files: editors: Makefile Log message: Link editors/teaqt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2009/04/20 09:15:40 Modified files: x11/gnome/yelp : Makefile Added files: x11/gnome/yelp/patches: patch-src_yelp-transform_c Log message: - add a workaround to prevent hard crashes in YelpTransform; the issue is still very obscure but being investigated... - fix a memory leak ; from upstream SVN r3246 ok jasper@ (a while ago)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2009/04/20 09:30:40 Modified files: multimedia/recordmydesktop/base: Makefile multimedia/recordmydesktop/base/pkg: DESCR Log message: - really enable JACK support for audio recording ; tweak MESSAGE accordingly go ahead jasper@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2009/04/20 09:32:38 Modified files: net/ntp: Makefile Added files: net/ntp/patches: patch-ntpq_ntpq_c Log message: Security: Prevent a buffer overflow in ntpq. (CVE-2009-0159) From upstream via FreeBSD.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2009/04/20 14:45:47 Modified files: emulators/qemu : Makefile emulators/qemu/files: README.OpenBSD qemu-ifup Log message: autoselect the most likely interface for qemu-ifup to bridge with by looking at the default IPv4 route. still overridable in the environment as before. ok todd@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2009/04/20 14:52:27 ports/x11/xfce4/xfce4-clipman/patches Update of /cvs/ports/x11/xfce4/xfce4-clipman/patches In directory cvs.openbsd.org:/tmp/cvs-serv26402/patches Log Message: Directory /cvs/ports/x11/xfce4/xfce4-clipman/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2009/04/20 17:28:04 Modified files: graphics/enblend-enfuse: Makefile Log message: knock out a few arch which have no hope of building this
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2009/04/20 17:32:11 Modified files: graphics : Makefile Log message: link hugin and dependencies so people can have packages.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ke...@cvs.openbsd.org 2009/04/20 21:16:32 Modified files: www/phpmyadmin : Makefile distinfo Log message: update phpmyadmin to 3.1.3.2. This version addresses the following security flaw which affects versions before 3.1.3.2. CVE-2009-1285 Static code injection vulnerability http://web.nvd.nist.gov/view/vuln/detail;jsessionid=6ab7cff13414b91166c7d9ed13fd?execution=e1s1 ok giovanni@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2009/04/20 23:57:08 Modified files: devel/teensyloader: Makefile Log message: mark BROKEN maintainer was unable to fix the changed and unversioned distfile for 3 weeks
Re: UPDATE: misc/memcached
Scott Vokes wrote: This updates memcached from 1.2.6 to 1.2.8 (they strongly encourage updating). Please note that the patch-memcached_c file is no longer necessary, and should be deleted. I don't use memcahced on anything -current, so I cannot test it, but FYI, something along $ rm patches/patch-memcached_c $ cvs delete patches/patch-memcached_c $ cvs -q diff -uNp should make the deletion included in your diff. /Alexander
4.5-stable print/ghostscript ghostscript-8.63p5
Security update for print/ghostscript to ghostscript-8.63p5. Back ported from current. Fixes SA34534, CVE-2009-0196, CVE-2009-0583 and CVE-2009-0584. You'll need patch -E when applying the diff. The following patches will be added to the patches dir. added: patch-icclib_icc_c patch-src_gdevpdtb_c patch-jbig2dec_jbig2_symbol_dict_c Ian McWilliam ghostscript.diff Description: Binary data
Re: UPDATE: games/prboom
On Mon, Mar 16, 2009 at 10:55:39AM -0700, Ryan Freeman wrote:
On Sat, Feb 21, 2009 at 06:46:03PM +, Stuart Henderson wrote:
On 2009/02/21 10:01, Ryan Freeman wrote:
On Fri, Jan 23, 2009 at 11:30:03AM -0800, Ryan Freeman wrote:
hello,
attached is a patch updating prboom to the latest release, 2.5.0.
changelog here: http://prboom.sourceforge.net/
i have modified the patches so data files do go under
/usr/local/share/games/doom rather than
/usr/local/share/prboom
as all the other doom ports are generally setup to use that standard
location for iwads and port's helper wads. regards,
bump?
ports is locked now.
since ports is now unlocked...
bump
? prboom-2.5.0.diff
Index: Makefile
===
RCS file: /cvs/ports/games/prboom/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile5 Dec 2007 13:15:09 - 1.14
+++ Makefile23 Jan 2009 18:55:46 -
@@ -1,31 +1,34 @@
# $OpenBSD: Makefile,v 1.14 2007/12/05 13:15:09 ajacoutot Exp $
-COMMENT= enhanced clone of Id Software's Doom game; multiplayer
-DISTNAME= prboom-2.4.7
-PKGNAME= ${DISTNAME}p1
-CATEGORIES=games x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prboom/}
+COMMENT = enhanced clone of Id Software's Doom game; multiplayer
+DISTNAME = prboom-2.5.0
+CATEGORIES = games x11
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=prboom/}
-HOMEPAGE= http://prboom.sourceforge.net/
+HOMEPAGE = http://prboom.sourceforge.net/
+
+MAINTAINER =Ryan Freeman r...@slipgate.org
# GPL
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP =Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+WANTLIB = SDL c m pthread GL GLU
-WANTLIB= SDL c m pthread z GL GLU
+USE_X11 = Yes
-USE_X11=Yes
+LIB_DEPENDS = SDL_mixer.=3::devel/sdl-mixer \
+ SDL_net.=1::devel/sdl-net
+# png.=4::graphics/png
-LIB_DEPENDS= SDL_mixer.=3::devel/sdl-mixer \
- SDL_net.=1::devel/sdl-net \
- png.=4::graphics/png
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=prboom/}
-CONFIGURE_ENV+=CPPFLAGS=-I${X11BASE}/include
-I${LOCALBASE}/include/libpng \
+CONFIGURE_ENV +=CPPFLAGS=-I${X11BASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=--disable-cpu-opt
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS += --disable-cpu-opt
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/games/prboom/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo5 Apr 2007 15:38:11 - 1.9
+++ distinfo23 Jan 2009 18:55:46 -
@@ -1,5 +1,5 @@
-MD5 (prboom-2.4.7.tar.gz) = mUL1IXZNf4nfIhikVtpPAg==
-RMD160 (prboom-2.4.7.tar.gz) = eMhUiVTdlUafgJm8j6aX9ippwX4=
-SHA1 (prboom-2.4.7.tar.gz) = Uq65M9t3C0gzExfcNX9sutMIVgA=
-SHA256 (prboom-2.4.7.tar.gz) = 3iLbqs0loPCxbFB6ojJqkLf13Pz4YsPccHaZbGGHzS8=
-SIZE (prboom-2.4.7.tar.gz) = 999524
+MD5 (prboom-2.5.0.tar.gz) = qKFfYfomJquYBRqycDN4xA==
+RMD160 (prboom-2.5.0.tar.gz) = zGlcoM65+bnKKs5yZ6BkeZxh/7o=
+SHA1 (prboom-2.5.0.tar.gz) = 8X3G7U5y0HuFQpF3sAuHCeo29aA=
+SHA256 (prboom-2.5.0.tar.gz) = ImwcRw+MyYMydTZAT0BaHQJs8KUYjGlKEkPMhjABS64=
+SIZE (prboom-2.5.0.tar.gz) = 1049505
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/games/prboom/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 22 Sep 2006 05:54:38 - 1.1
+++ patches/patch-Makefile_in 23 Jan 2009 18:55:46 -
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2006/09/22 05:54:38 jsg Exp $
Makefile.in.orig Fri Sep 22 13:30:36 2006
-+++ Makefile.inFri Sep 22 13:30:54 2006
-@@ -207,7 +207,7 @@ AUX_DIST_GEN = \
- $(ac_aux_dir)/missing
-
- MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
+$OpenBSD$
+--- Makefile.in.orig Sat Dec 13 12:04:48 2008
Makefile.inSat Dec 13 12:05:11 2008
+@@ -163,7 +163,7 @@ build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
-docdir = $(prefix)/share/doc/@pack...@-@VERSION@
+docdir = $(prefix)/share/doc/prboom
- SUBDIRS = doc data src ICONS VisualC8 VisualC6
- EXTRA_DIST = prboom.spec.in prboom.spec config.h bootstrap $(AUX_DIST_GEN)
- doc_DATA = README COPYING AUTHORS NEWS
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
Index: patches/patch-configure
===
RCS file: /cvs/ports/games/prboom/patches/patch-configure,v
retrieving revision 1.6
diff -u -r1.6 patch-configure
---
openoffice3 won't start
Hi! I'm using today's snapshot, and the openoffice-3.0.1p3 package and a clean ~/.openoffice.org/ directory. When trying to start it with soffice, I get this popup: [OpenOffice.org 3.0 - Fatal Error] The application cannot be started. The user interface language cannot be determined. ... and in the console a lot of warnings about libraries (attached, because of very long lines) What did I do wrong? Thanks, Daniel -- LÉVAI Dániel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1 /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_Dispatch' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_Context' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_get_dispatch' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_set_warning_func' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_add_dispatch' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_get_context' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_get_dispatch_table_size' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_set_context' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_set_dispatch' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_noop_enable_warnings' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/swrast_dri.so: undefined symbol '_glapi_Dispatch' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/swrast_dri.so: undefined symbol '_glapi_Context' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/swrast_dri.so: undefined symbol '_glapi_get_dispatch' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/swrast_dri.so: undefined symbol '_glapi_set_warning_func' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/swrast_dri.so: undefined symbol '_glapi_add_dispatch' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/swrast_dri.so: undefined symbol '_glapi_get_context' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/swrast_dri.so: undefined symbol '_glapi_get_dispatch_table_size' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/swrast_dri.so: undefined symbol '_glapi_check_multithread' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/swrast_dri.so: undefined symbol '_glapi_set_context' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/swrast_dri.so: undefined symbol '_glapi_set_dispatch' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/swrast_dri.so: undefined symbol '_glapi_noop_enable_warnings' /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0: /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISt23__codecvt_abstract_baseIcc11__mbstate_tE) size mismatch, relink your program /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0: /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISt5ctypeIcE) size mismatch, relink your program /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0: /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISt21__ctype_abstract_baseIcE) size mismatch, relink your program /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0: /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISd) size mismatch, relink your program /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0: /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISi) size mismatch, relink your program /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0: /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISo) size mismatch, relink your program /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0: /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISt9basic_iosIcSt11char_traitsIcEE) size mismatch, relink your program /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0: /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZNSt6locale5_Impl11_S_id_ctypeE) size mismatch, relink your program /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0: /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZNSt6locale5_Impl13_S_id_numericE) size mismatch, relink your program
Re: NEW: www/lightsquid
Thanks for pointing that. This is version with your patch and missed dependency for p5-GD. On Sat, April 18, 2009 06:44, Stuart Henderson wrote: On 2009/04/17 17:00, Kirill Bychkov wrote: Hi. This is a port of extremely fast analyzer for squid logs. Tested only on i386. I've made this test with 1126MB access.log: time /var/www/htdocs/lightsquid/lightparser.pl 8m37.08s real 8m29.05s user 0m2.66s system time sarg SARG: Records in file: 8633814, reading: 100.00% SARG: Successful report generated on /var/www/htdocs/sarg/2009Mar25-2009Apr14 42m5.85s real 9m7.10s user 5m14.21s system Please test and commit. here's an update using @sample so that when the package is upgraded you don't have conflicts from edited config files, and makes it so make plist doesn't add unwanted files. lightsquid.tar.gz Description: application/gzip
Re: openoffice3 won't start
On 2009/04/20 09:44, LEVAI Daniel wrote: Hi! I'm using today's snapshot, and the openoffice-3.0.1p3 package and a clean ~/.openoffice.org/ directory. When trying to start it with soffice, I get this popup: [OpenOffice.org 3.0 - Fatal Error] The application cannot be started. The user interface language cannot be determined. have you tried starting it again? it's not right that it should do that, but I've had it happen the first time I started OOo 3, and it worked ok when I tried again. i'll deal with the other bits in a separate mail.
gcc3/4 stuff [was Re: openoffice3 won't start]
On 2009/04/20 09:44, LEVAI Daniel wrote: Hi! I'm using today's snapshot, and the openoffice-3.0.1p3 package and a clean ~/.openoffice.org/ directory. When trying to start it with soffice, I get this popup: [OpenOffice.org 3.0 - Fatal Error] The application cannot be started. The user interface language cannot be determined. .. ... and in the console a lot of warnings about libraries (attached, because of very long lines) .. /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0: /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISt23__codecvt_abstract_baseIcc11__mbstate_tE) size mismatch, relink your program .. OOo 3 must be built with gcc 4 [see footnote 0] and pulls in libestdc++ from the gcc 4 port. textproc/libwpd, textproc/icu4c and devel/gperf all pull in libstdc++ (GCC 3). if you try and mix the two in the same process you have conflicting symbols. - gperf is also used by webkit (GCC 4), libiconv, a2ps (C only). - libwpd and icu4c are also used by OOo 2 (GCC 3 C++), webkit (GCC 4 C++), yaz, tin and dwdiff (C only). - question / thinking aloud: are the C ABIs also incompatible between GCC 3 and 4, or is it just C++? I'm wondering if it's going to be possible to switch OOo 2 to GCC 4 (or remove it) and then move these libraries over to being built with GCC 4 (on arch which support it), or is that just going to result in problems for the other software? is it silently broken or noisy? (I'll try it if I can work out what patches are needed to get gperf built with GCC4).. /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_Dispatch' /usr/local/openoffice.org3/program/soffice.bin:/usr/X11R6/lib/modules/dri/r300_dri.so: undefined symbol '_glapi_Context' I think this may also be related to mixing GCC 3/4, iirc Mesa uses C++. and now, SIGCOFFEE. [0] as an aside for those interested why, it supports C++ constructs that gcc 3 can't handle, sometimes they can be unwrapped a bit so you can spoon-feed them to help out the compiler front-end; it's not super complicated but it is fiddly, few people know how to do it (the one I managed myself was more through luck than anything else, I really don't know C++), and the error messages given by gcc when it doesn't understand how to parse something Do Not Help All That Much ;-) here are examples of the sort of changes that have been made to work around some of these in various ports, you can find more if you dig through grep . `locate patches/|grep 'patch-.*[ch][px][px]$'`|more. -SKIPSMImagePixelType icurrent(SKIPSMImagePixelType(sa(sx))); +SKIPSMImagePixelType foo = SKIPSMImagePixelType(sa(sx)); +SKIPSMImagePixelType icurrent(foo); -typedef typename SizeToTypesizeof(*typeToSize(t() + u()))::result Promote; +typedef typename SizeToTypesizeof(*typeToSize(PromoteType::t() + PromoteType::u()))::result Promote; -::rtl::OUString aMessage( String( ModuleRes( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) ) ); +::rtl::OUString aMessage = ::rtl::OUString ( String( ModuleRes( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) ) ); - KFileDialog fdlg(QString(),filters, parent); + QString s; + KFileDialog fdlg(s, filters, parent); - Atom * Molecule::CreateAtom() + OpenBabel::OBAtom * Molecule::CreateAtom() -QDBusInterface( QDBusConnection::sessionBus().baseService(), /kmplot, org.kde.kmplot.KmPlot ).call( QDBus::NoBlock, stopDrawing ); +QDBusReplybool reply = QDBusInterface( QDBusConnection::sessionBus().baseService(), /kmplot, org.kde.kmplot.KmPlot ).call( QDBus::NoBlock, stopDrawing ); -QTextStream( stderr, QIODevice::WriteOnly ) +QTextStream out( stderr, QIODevice::WriteOnly ); + +out
UPDATE: productivity/homebank 4.0.1 - 4.0.2
Trivial update. Builds and runs on i386.
http://homebank.free.fr/ChangeLog
--
viq
Index: Makefile
===
RCS file: /cvs/ports/productivity/homebank/Makefile,v
retrieving revision 1.2
diff -u -d -r1.2 Makefile
--- Makefile20 Dec 2008 11:55:49 - 1.2
+++ Makefile20 Apr 2009 11:56:52 -
@@ -2,8 +2,7 @@
COMMENT = personal accounting application
-DISTNAME = homebank-4.0.1
-PKGNAME= ${DISTNAME}p0
+DISTNAME = homebank-4.0.2
CATEGORIES = productivity x11
HOMEPAGE = http://homebank.free.fr
Index: distinfo
===
RCS file: /cvs/ports/productivity/homebank/distinfo,v
retrieving revision 1.1.1.1
diff -u -d -r1.1.1.1 distinfo
--- distinfo16 Dec 2008 20:31:10 - 1.1.1.1
+++ distinfo20 Apr 2009 11:56:52 -
@@ -1,5 +1,5 @@
-MD5 (homebank-4.0.1.tar.gz) = Fqhwvk98RAqKKxzsZBfh/A==
-RMD160 (homebank-4.0.1.tar.gz) = DT4IgSTnE6mVsu9RmPZhOcGtOeU=
-SHA1 (homebank-4.0.1.tar.gz) = Dqqx+xwDKGmqDdD187SqLC+wL8Y=
-SHA256 (homebank-4.0.1.tar.gz) = CqCshwFAU99K/QEcXUfluOQLpG0ExbXNtbXuY/JOV+Q=
-SIZE (homebank-4.0.1.tar.gz) = 2508316
+MD5 (homebank-4.0.2.tar.gz) = ejwE5UDd8WYO9R/hm8CQwQ==
+RMD160 (homebank-4.0.2.tar.gz) = uxaHVTUXn4c13t5DiyUIoz0F+PM=
+SHA1 (homebank-4.0.2.tar.gz) = DsT7tE1IN5udxOuANHXChy1Aklw=
+SHA256 (homebank-4.0.2.tar.gz) = 6jE6PXvN6YFByydOWDCyYu3YI6Jx0YTlNhxrLDDmzAk=
+SIZE (homebank-4.0.2.tar.gz) = 2548216
pgpcqt9g1ZHiw.pgp
Description: PGP signature
Re: UPDATE: productivity/homebank 4.0.1 - 4.0.2
On Mon, Apr 20, 2009 at 01:59:49PM +0200, v...@viq.ath.cx wrote:
Trivial update. Builds and runs on i386.
http://homebank.free.fr/ChangeLog
--
viq
Index: Makefile
===
RCS file: /cvs/ports/productivity/homebank/Makefile,v
retrieving revision 1.2
diff -u -d -r1.2 Makefile
--- Makefile 20 Dec 2008 11:55:49 - 1.2
+++ Makefile 20 Apr 2009 11:56:52 -
@@ -2,8 +2,7 @@
COMMENT =personal accounting application
-DISTNAME = homebank-4.0.1
-PKGNAME= ${DISTNAME}p0
+DISTNAME = homebank-4.0.2
CATEGORIES = productivity x11
HOMEPAGE = http://homebank.free.fr
Index: distinfo
===
RCS file: /cvs/ports/productivity/homebank/distinfo,v
retrieving revision 1.1.1.1
diff -u -d -r1.1.1.1 distinfo
--- distinfo 16 Dec 2008 20:31:10 - 1.1.1.1
+++ distinfo 20 Apr 2009 11:56:52 -
@@ -1,5 +1,5 @@
-MD5 (homebank-4.0.1.tar.gz) = Fqhwvk98RAqKKxzsZBfh/A==
-RMD160 (homebank-4.0.1.tar.gz) = DT4IgSTnE6mVsu9RmPZhOcGtOeU=
-SHA1 (homebank-4.0.1.tar.gz) = Dqqx+xwDKGmqDdD187SqLC+wL8Y=
-SHA256 (homebank-4.0.1.tar.gz) = CqCshwFAU99K/QEcXUfluOQLpG0ExbXNtbXuY/JOV+Q=
-SIZE (homebank-4.0.1.tar.gz) = 2508316
+MD5 (homebank-4.0.2.tar.gz) = ejwE5UDd8WYO9R/hm8CQwQ==
+RMD160 (homebank-4.0.2.tar.gz) = uxaHVTUXn4c13t5DiyUIoz0F+PM=
+SHA1 (homebank-4.0.2.tar.gz) = DsT7tE1IN5udxOuANHXChy1Aklw=
+SHA256 (homebank-4.0.2.tar.gz) = 6jE6PXvN6YFByydOWDCyYu3YI6Jx0YTlNhxrLDDmzAk=
+SIZE (homebank-4.0.2.tar.gz) = 2548216
Hi Viq,
Same diff here with an extra patch to fix regress test.
Diff available here too: http://openbsd.raveland.org/ports/homebank-4.0.2.diff
(patch already committed upstream)
Regards,
--
Pierre-Emmanuel André pea at raveland.org
GPG key: 0x7AE329DC
Index: Makefile
===
RCS file: /cvs/ports/productivity/homebank/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile20 Dec 2008 11:55:49 - 1.2
+++ Makefile20 Apr 2009 08:02:45 -
@@ -2,8 +2,7 @@
COMMENT = personal accounting application
-DISTNAME = homebank-4.0.1
-PKGNAME= ${DISTNAME}p0
+DISTNAME = homebank-4.0.2
CATEGORIES = productivity x11
HOMEPAGE = http://homebank.free.fr
Index: distinfo
===
RCS file: /cvs/ports/productivity/homebank/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo16 Dec 2008 20:31:10 - 1.1.1.1
+++ distinfo20 Apr 2009 08:02:45 -
@@ -1,5 +1,5 @@
-MD5 (homebank-4.0.1.tar.gz) = Fqhwvk98RAqKKxzsZBfh/A==
-RMD160 (homebank-4.0.1.tar.gz) = DT4IgSTnE6mVsu9RmPZhOcGtOeU=
-SHA1 (homebank-4.0.1.tar.gz) = Dqqx+xwDKGmqDdD187SqLC+wL8Y=
-SHA256 (homebank-4.0.1.tar.gz) = CqCshwFAU99K/QEcXUfluOQLpG0ExbXNtbXuY/JOV+Q=
-SIZE (homebank-4.0.1.tar.gz) = 2508316
+MD5 (homebank-4.0.2.tar.gz) = ejwE5UDd8WYO9R/hm8CQwQ==
+RMD160 (homebank-4.0.2.tar.gz) = uxaHVTUXn4c13t5DiyUIoz0F+PM=
+SHA1 (homebank-4.0.2.tar.gz) = DsT7tE1IN5udxOuANHXChy1Aklw=
+SHA256 (homebank-4.0.2.tar.gz) = 6jE6PXvN6YFByydOWDCyYu3YI6Jx0YTlNhxrLDDmzAk=
+SIZE (homebank-4.0.2.tar.gz) = 2548216
Index: patches/patch-po_POTFILES_in
===
RCS file: patches/patch-po_POTFILES_in
diff -N patches/patch-po_POTFILES_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-po_POTFILES_in20 Apr 2009 08:02:45 -
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- po/POTFILES.in.origMon Mar 9 12:14:33 2009
po/POTFILES.in Mon Mar 9 12:14:54 2009
+@@ -28,4 +28,5 @@ src/ui_category.c
+ src/ui_payee.c
+ src/widgets.c
+ src/xml.c
++src/hb_category.c
+
Re: UPDATE: bzflag 2.0.12
On 2009/04/13 21:43, Brad wrote:
On Thu, Apr 09, 2009 at 02:01:46AM -0400, Brad wrote:
Here is an update to bzflag 2.0.12. No new features, just mainly
build fixes and other bug fixes. Any improvement with macppc?
For anyone using this update.. here is an updated diff against the
current tree after enabling the GLEW support and the PLIST regen.
Even if it is slow could someone try building this on any other
archs besides amd64/i386/powerpc like say sparc64 and see if the
game will even start up? Please check the in-tree version first
and make sure it funtions properly.
on a netra t1 over remote X:
the previous version starts up, but SIGABRT's when it tries playing
sounds (no audio device on that box).
the new version functions (I can't possibly say runs).
Index: Makefile
===
RCS file: /cvs/ports/games/bzflag/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 13 Apr 2009 23:29:44 - 1.16
+++ Makefile 14 Apr 2009 01:33:14 -
@@ -2,8 +2,7 @@
COMMENT= graphical multiplayer 3D tank war game
-DISTNAME=bzflag-2.0.8
-PKGNAME= ${DISTNAME}p6
+DISTNAME=bzflag-2.0.12
CATEGORIES= games x11
MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=bzflag/}
@@ -23,18 +22,19 @@ MODULES= devel/gettext
LIB_DEPENDS= SDL.=4::devel/sdl \
curl.=3::net/curl \
- GLEW::graphics/glew
+ GLEW::graphics/glew \
+ cares::net/libcares
-WANTLIB= GL GLU ICE SM X11 Xau Xdmcp Xext Xrandr Xrender \
- c crypto idn m ncurses pthread sndio ssl stdc++ \
- usbhid z
+WANTLIB= GL GLU ICE SM X11 Xau Xdmcp Xext Xi Xrandr Xrender \
+ Xxf86vm c crypto idn m ncurses pthread sndio ssl \
+ stdc++ usbhid z
-AUTOCONF_VERSION=2.59
+AUTOCONF_VERSION= 2.61
CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS+=--enable-debug
+CONFIGURE_ARGS+= --disable-ccachetest \
+ --with-glew
CONFIGURE_ENV+= CPPFLAGS=-I${X11BASE}/include -I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib \
- ac_cv_lib_cares_ares_init=no \
ac_cv_lib_bind_gethostent=no
pre-build:
@@ -43,5 +43,10 @@ pre-build:
${WRKSRC}/src/platform/Makefile.sed
@mv ${WRKSRC}/src/platform/Makefile.sed \
${WRKSRC}/src/platform/Makefile.in
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+ @mv ${PREFIX}/share/bzflag/bzflag.desktop \
+ ${PREFIX}/share/applications
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/games/bzflag/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 5 Apr 2007 15:38:09 - 1.7
+++ distinfo 9 Apr 2009 05:03:38 -
@@ -1,5 +1,5 @@
-MD5 (bzflag-2.0.8.tar.gz) = Y2IejvUAT/73DoTc2ikxLA==
-RMD160 (bzflag-2.0.8.tar.gz) = C4hA8lDa08eB2WLGMfZf9kACKiQ=
-SHA1 (bzflag-2.0.8.tar.gz) = 1Z85ZnV6b+4ki1M+yzgvg+lr9XQ=
-SHA256 (bzflag-2.0.8.tar.gz) = V7FKPiMe2kBDx4LDIJEKVDudC9/R+FaPrl1MoGcR9x4=
-SIZE (bzflag-2.0.8.tar.gz) = 11908327
+MD5 (bzflag-2.0.12.tar.gz) = gb9GHk4hHlCxoqf10NZkDw==
+RMD160 (bzflag-2.0.12.tar.gz) = urFxIz08VuzGvOGQkZb2g0TCUwg=
+SHA1 (bzflag-2.0.12.tar.gz) = PvFznL3YuIjck+/kJWCk/fwqIXQ=
+SHA256 (bzflag-2.0.12.tar.gz) = 6dSYuG1IhtB9XHOA67FZAeAu8chQ5gzLskg/OX5vEBM=
+SIZE (bzflag-2.0.12.tar.gz) = 12071712
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/games/bzflag/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_ac
--- patches/patch-configure_ac30 Sep 2006 12:45:16 - 1.3
+++ patches/patch-configure_ac9 Apr 2009 05:07:56 -
@@ -1,38 +1,54 @@
$OpenBSD: patch-configure_ac,v 1.3 2006/09/30 12:45:16 steven Exp $
configure.ac.origMon Apr 17 16:11:11 2006
-+++ configure.ac Sat Sep 23 09:43:43 2006
-@@ -73,12 +73,12 @@ AC_PROG_MAKE_SET
- AC_PROG_CC
- AC_PROG_CXX
+--- configure.ac.origWed Jun 25 14:00:55 2008
configure.ac Thu Apr 9 01:04:32 2009
+@@ -236,7 +236,7 @@ fi
+ AC_MSG_RESULT([$ac_ff_effect_directional])
--AC_PATH_PROG(CCACHE, ccache)
--if test $CCACHE
--then
-- CC=ccache $CC
-- CXX=ccache $CXX
--fi
-+dnl AC_PATH_PROG(CCACHE, ccache)
-+dnl if test $CCACHE
-+dnl then
-+dnl CC=ccache $CC
-+dnl CXX=ccache $CXX
-+dnl fi
+ case $host_os in
+- linux*|kfreebsd*|freebsd*|netbsd*|dragonfly*) linux=true;;
++ linux*|kfreebsd*|freebsd*|netbsd*|openbsd*|dragonfly*) linux=true;;
+ *) linux=false;;
+ esac
+ AM_CONDITIONAL(LINUX, $linux)
+@@ -345,11 +345,8 @@ case $host_os in
+ fi
- AC_CHECK_TOOL(WINDRES, windres, :)
+ AC_CHECK_LIB(Xext, XextAddDisplay, [GLIBS=-lXext $GLIBS], [], $GLIBS)
+-
+-if
Re: openoffice3 won't start
On Monday 20 April 2009 11.03.26 Stuart Henderson wrote: On 2009/04/20 09:44, LEVAI Daniel wrote: Hi! I'm using today's snapshot, and the openoffice-3.0.1p3 package and a clean ~/.openoffice.org/ directory. When trying to start it with soffice, I get this popup: [OpenOffice.org 3.0 - Fatal Error] The application cannot be started. The user interface language cannot be determined. have you tried starting it again? it's not right that it should do that, but I've had it happen the first time I started OOo 3, and it worked ok when I tried again. Yes, I've tried, no luck, every time I get this error window, and then soffice exits. Daniel -- LÉVAI Dániel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: gcc3/4 stuff [was Re: openoffice3 won't start]
On Monday 20 April 2009 11.22.02 Stuart Henderson wrote: On 2009/04/20 09:44, LEVAI Daniel wrote: Hi! I'm using today's snapshot, and the openoffice-3.0.1p3 package and a clean ~/.openoffice.org/ directory. When trying to start it with soffice, I get this popup: [OpenOffice.org 3.0 - Fatal Error] The application cannot be started. The user interface language cannot be determined. .. ... and in the console a lot of warnings about libraries (attached, because of very long lines) .. /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0 : /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISt23__codecvt_abstract_baseIcc11__mbstate_tE) size mismatch, relink your program .. OOo 3 must be built with gcc 4 [see footnote 0] and pulls in libestdc++ from the gcc 4 port. textproc/libwpd, textproc/icu4c and devel/gperf all pull in libstdc++ (GCC 3). if you try and mix the two in the same process you have conflicting symbols. [...] Does this mean that now you can not use the openoffice.org3 packages with -current, and we must wait until it will be compiled with gcc4? Daniel -- LÉVAI Dániel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: gcc3/4 stuff [was Re: openoffice3 won't start]
On 2009/04/20 16:28, LEVAI Daniel wrote: /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0 : /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISt23__codecvt_abstract_baseIcc11__mbstate_tE) size mismatch, relink your program .. OOo 3 must be built with gcc 4 [see footnote 0] and pulls in libestdc++ from the gcc 4 port. textproc/libwpd, textproc/icu4c and devel/gperf all pull in libstdc++ (GCC 3). if you try and mix the two in the same process you have conflicting symbols. [...] Does this mean that now you can not use the openoffice.org3 packages with -current, and we must wait until it will be compiled with gcc4? *h* OOo is already compiled with gcc4, and for some people it is at least partly working. I just tried as a test and here I'm only seeing the _dri.so error messages, not the size mismatch ones.. odd... It might be helpful to give some more information (dmesg, pkg_info, where you downloaded the packages from)
Re: gcc3/4 stuff [was Re: openoffice3 won't start]
On Monday 20 April 2009 17.23.22 Stuart Henderson wrote: On 2009/04/20 16:28, LEVAI Daniel wrote: /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so. 47.0 : /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISt23__codecvt_abstract_baseIcc11__mbstate_tE) size mismatch, relink your program .. OOo 3 must be built with gcc 4 [see footnote 0] and pulls in libestdc++ from the gcc 4 port. textproc/libwpd, textproc/icu4c and devel/gperf all pull in libstdc++ (GCC 3). if you try and mix the two in the same process you have conflicting symbols. [...] Does this mean that now you can not use the openoffice.org3 packages with -current, and we must wait until it will be compiled with gcc4? *h* OOo is already compiled with gcc4, and for some people it is at least partly working. I just tried as a test and here I'm only seeing the _dri.so error messages, not the size mismatch ones.. odd... Sorry, yes, I thought I meant until the other packages (gperf, icu4c etc...) gets recompiled with gcc4. :) It might be helpful to give some more information (dmesg, pkg_info, where you downloaded the packages from) I can only provide those tomorrow, when another day begins at the office :) Thanks so far! Daniel -- LÉVAI Dániel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1
Re: gcc3/4 stuff [was Re: openoffice3 won't start]
On Mon, Apr 20, 2009 at 04:23:22PM +0100, Stuart Henderson wrote: On 2009/04/20 16:28, LEVAI Daniel wrote: /usr/local/openoffice.org3/program/soffice.bin:/usr/lib/libstdc++.so.47.0 : /usr/local/lib/libestdc++.so.8.0 : WARNING: symbol(_ZTISt23__codecvt_abstract_baseIcc11__mbstate_tE) size mismatch, relink your program .. OOo 3 must be built with gcc 4 [see footnote 0] and pulls in libestdc++ from the gcc 4 port. textproc/libwpd, textproc/icu4c and devel/gperf all pull in libstdc++ (GCC 3). if you try and mix the two in the same process you have conflicting symbols. [...] Does this mean that now you can not use the openoffice.org3 packages with -current, and we must wait until it will be compiled with gcc4? *h* OOo is already compiled with gcc4, and for some people it is at least partly working. I just tried as a test and here I'm only seeing the _dri.so error messages, not the size mismatch ones.. odd... I still do not understand those. What the fuck is openoffice doing with libGL? Whatever it's doing it is doing it wrong. -0- -- Mike: The Fourth Dimension is a shambles? Bernie: Nobody ever empties the ashtrays. People are SO inconsiderate. -- Gary Trudeau, Doonesbury
Port proposal, lockf(1) ported from freebsd.
Hi there,
I've ported lockf(1) from Freebsd, made some style changes to conform
to style(9) and added an option to write the lock holder pid in the
lockfile (-p) option.
It's a single file with 246 lines.
I'll port/write the manpage if you think the port may be
accepted. This is the first port I'm proposing, so please tell me if
I'm doing something wrong.
What to do with the header copyright ? Do I change it ?
Here is the diff from the freebsd code, below is code itself.
--- lockf.orig.cThu Apr 16 20:20:20 2009
+++ lockf.c Thu Apr 16 21:27:28 2009
@@ -34,15 +34,16 @@
#include signal.h
#include stdio.h
#include stdlib.h
+#include string.h
#include sysexits.h
#include unistd.h
-static int acquire_lock(const char *name, int flags);
+static int acquire_lock(const char *, int);
static void cleanup(void);
-static void killed(int sig);
-static void timeout(int sig);
+static void killed(int);
+static void timeout(int);
static void usage(void);
-static void wait_for_lock(const char *name);
+static void wait_for_lock(const char *);
static const char *lockname;
static int lockfd = -1;
@@ -55,13 +56,17 @@ static volatile sig_atomic_t timed_out;
int
main(int argc, char **argv)
{
- int ch, silent, status, waitsec;
+ char pidbuf[32];
+ int ch, silent, status, waitsec, storepid;
pid_t child;
-
- silent = keep = 0;
+
+ silent = keep = storepid = 0;
waitsec = -1; /* Infinite. */
- while ((ch = getopt(argc, argv, skt:)) != -1) {
+ while ((ch = getopt(argc, argv, pskt:)) != -1) {
switch (ch) {
+ case 'p':
+ storepid = 1;
+ break;
case 'k':
keep = 1;
break;
@@ -134,6 +139,13 @@ main(int argc, char **argv)
errx(EX_TEMPFAIL, %s: already locked, lockname);
}
/* At this point, we own the lock. */
+ if (storepid) {
+ if (ftruncate(lockfd, 0) == -1) /* Make sure file is empty */
+ err(EX_IOERR, ftruncate error);
+ snprintf(pidbuf, sizeof(pidbuf), %ld, (unsigned long)
getpid());
+ if (write(lockfd, pidbuf, strlen(pidbuf)) 0)
+ err(EX_IOERR, write error);
+ }
if (atexit(cleanup) == -1)
err(EX_OSERR, atexit failed);
if ((child = fork()) == -1)
@@ -164,7 +176,7 @@ acquire_lock(const char *name, int flags)
{
int fd;
- if ((fd = open(name, O_RDONLY|O_CREAT|O_EXLOCK|flags, 0666)) == -1) {
+ if ((fd = open(name, O_WRONLY|O_CREAT|O_EXLOCK|flags, 0666)) == -1) {
if (errno == EAGAIN || errno == EINTR)
return (-1);
err(EX_CANTCREAT, cannot open %s, name);
@@ -192,7 +204,6 @@ cleanup(void)
static void
killed(int sig)
{
-
cleanup();
signal(sig, SIG_DFL);
if (kill(getpid(), sig) == -1)
@@ -208,13 +219,13 @@ timeout(int sig)
timed_out = 1;
}
-static void
+__dead void
usage(void)
{
-
- fprintf(stderr,
- usage: lockf [-ks] [-t seconds] file command [arguments]\n);
- exit(EX_USAGE);
+ extern char *__progname;
+
+ err(EX_USAGE,
+ usage: %s [-pks] [-t seconds] file command [arguments]\n,
__progname);
}
/*
Follows the complete source file.
/*
* Copyright (C) 1997 John D. Polstra. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in the
*documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY JOHN D. POLSTRA AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL JOHN D. POLSTRA OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include sys/cdefs.h
#include sys/types.h
#include sys/wait.h
#include err.h
#include errno.h
#include fcntl.h
#include signal.h
#include stdio.h
#include stdlib.h
#include string.h
#include sysexits.h
update: pekwm 0.1.10
Update to pekwm 0.1.10.
pekwm now has builtin compat code for swprintf so the following patches may be
removed:
patches/patch-configure
patches/patch-src_FrameListMenu_cc
patches/patch-src_Frame_cc
patches/patch-src_PDecor_cc
Builds and works fine on i386; also builds okay on amd64.
Please test, etc.
Thanks!
Nicholas
Index: Makefile
===
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile9 Oct 2008 16:56:12 - 1.13
+++ Makefile4 Apr 2009 19:40:50 -
@@ -2,7 +2,7 @@
COMMENT= aewm++ based pretty themable window manager
-DISTNAME= pekwm-0.1.7
+DISTNAME= pekwm-0.1.10
CATEGORIES=x11
HOMEPAGE= http://pekwm.org/
Index: distinfo
===
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo9 Oct 2008 16:56:12 - 1.6
+++ distinfo4 Apr 2009 19:40:50 -
@@ -1,5 +1,5 @@
-MD5 (pekwm-0.1.7.tar.bz2) = MKz6QaUAWp8xEXBB7DLrDQ==
-RMD160 (pekwm-0.1.7.tar.bz2) = d8YY3e/qrRapt1cwTKIz7Omxjjw=
-SHA1 (pekwm-0.1.7.tar.bz2) = 3NkdyNCAAL2N9AKwi3z7LXGwOLw=
-SHA256 (pekwm-0.1.7.tar.bz2) = IhbrDHIvSq0Vdhp/Ts7WfqEoSgDjLgPWbeS1X4wclSQ=
-SIZE (pekwm-0.1.7.tar.bz2) = 363788
+MD5 (pekwm-0.1.10.tar.bz2) = BDLyCR4a/IvgTb9fCsIq0A==
+RMD160 (pekwm-0.1.10.tar.bz2) = jo8Wj4SIl9gH+/uS9n7MuhBgkAE=
+SHA1 (pekwm-0.1.10.tar.bz2) = WpL7P2RGJwkA/k3s1JGuhBqS3jg=
+SHA256 (pekwm-0.1.10.tar.bz2) = J8BUu7wZLZuPEhK/4ncvX+yJZtQfG1WX/lTQ/s+tP90=
+SIZE (pekwm-0.1.10.tar.bz2) = 372622
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 9 Oct 2008 16:56:12 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,35 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2008/10/09 16:56:12 ajacoutot Exp $
configure.orig Tue Oct 7 17:37:23 2008
-+++ configure Tue Oct 7 17:37:15 2008
-@@ -7397,12 +7397,12 @@ if test -n $libpng12_CFLAGS; then
- pkg_cv_libpng12_CFLAGS=$libpng12_CFLAGS
- elif test -n $PKG_CONFIG; then
- if test -n $PKG_CONFIG \
--{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng12
= 1.2.0\) 5
-- ($PKG_CONFIG --exists --print-errors libpng12 = 1.2.0) 25
-+{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng =
1.2.0\) 5
-+ ($PKG_CONFIG --exists --print-errors libpng = 1.2.0) 25
- ac_status=$?
- echo $as_me:$LINENO: \$? = $ac_status 5
- (exit $ac_status); }; then
-- pkg_cv_libpng12_CFLAGS=`$PKG_CONFIG --cflags libpng12 = 1.2.0
2/dev/null`
-+ pkg_cv_libpng12_CFLAGS=`$PKG_CONFIG --cflags libpng = 1.2.0 2/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -7413,12 +7413,12 @@ if test -n $libpng12_LIBS; then
- pkg_cv_libpng12_LIBS=$libpng12_LIBS
- elif test -n $PKG_CONFIG; then
- if test -n $PKG_CONFIG \
--{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng12
= 1.2.0\) 5
-- ($PKG_CONFIG --exists --print-errors libpng12 = 1.2.0) 25
-+{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng =
1.2.0\) 5
-+ ($PKG_CONFIG --exists --print-errors libpng = 1.2.0) 25
- ac_status=$?
- echo $as_me:$LINENO: \$? = $ac_status 5
- (exit $ac_status); }; then
-- pkg_cv_libpng12_LIBS=`$PKG_CONFIG --libs libpng12 = 1.2.0 2/dev/null`
-+ pkg_cv_libpng12_LIBS=`$PKG_CONFIG --libs libpng = 1.2.0 2/dev/null`
- else
- pkg_failed=yes
- fi
Index: patches/patch-data_Makefile_in
===
RCS file: /cvs/ports/x11/pekwm/patches/patch-data_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-data_Makefile_in
--- patches/patch-data_Makefile_in 11 Jun 2007 08:56:43 - 1.1
+++ patches/patch-data_Makefile_in 4 Apr 2009 19:40:50 -
@@ -1,12 +1,25 @@
-$OpenBSD: patch-data_Makefile_in,v 1.1 2007/06/11 08:56:43 ajacoutot Exp $
data/Makefile.in.orig Mon Jun 11 10:39:01 2007
-+++ data/Makefile.in Mon Jun 11 10:39:11 2007
-@@ -439,7 +439,7 @@ info: info-recursive
+$OpenBSD$
+--- data/Makefile.in.orig Mon Jan 26 17:59:45 2009
data/Makefile.in Sat Apr 4 20:32:32 2009
+@@ -461,7 +461,7 @@ info: info-recursive
info-am:
-install-data-am: install-cfgdataDATA
+install-data-am:
- install-dvi: install-dvi-recursive
+ install-exec-am:
+@@ -507,8 +507,10 @@ uninstall-info: uninstall-info-recursive
+
+ all-local: config menu
+
+-%: $(srcdir)/%.in
+- @SED@ -e 's:PREFIX:$(pkgdatadir):g' -e s:THEME:@THEME@:g $ $@
++config:
++ @SED@ -e 's:PREFIX:$(pkgdatadir):g' -e s:THEME:@THEME@:g $...@.in
$@
++menu:
++ @SED@ -e 's:PREFIX:$(pkgdatadir):g' -e s:THEME:@THEME@:g $...@.in
$@
+
+ distclean-local:
+ rm -f *\~ .\#*
Index: patches/patch-data_scripts_Makefile_in
pkg_add -ui behaviour
hi there, it is time for another of my biweekly snapshot upgrade. this is what i see this time during the update process: Candidates for updating php5-gd-5.2.9 - php5-gd-5.2.9 php5-gd-5.2.9-no_x11 Ambiguous: choose package for php5-gd-5.2.9 0: None 1: php5-gd-5.2.9 2: php5-gd-5.2.9-no_x11 Your choice: 1 i can undarstand the point of these questions when installing a new package as it is really ambiguous what i might want. but during the upgrade i think it is quite obvious what is my choice. i know that doing the version number parsing dance is difficult, but would it be difficult to teach pkg_add to pick the same flavour of a particular package when doing the upgrade? is this feasable? Candidates for updating py-Imaging-1.1.6p0-python2.5 - py-Imaging-1.1.6p0-python2.5 py-Imaging-1.1.6p0-python2.4 Ambiguous: choose package for py-Imaging-1.1.6p0-python2.5 0: None 1: py-Imaging-1.1.6p0-python2.4 2: py-Imaging-1.1.6p0-python2.5 Your choice: 2 this case is not so trivial... what would happen if i chose (1)? would it then pull in python 2.4 as a dependency? obviously, in this case it is not desirable (for me) but does pkg_add handle additional new dependencies of an upgrade? say the upgrade of midnight commander suddenly had another package as run dependancy that the previous version did not have -f -- what we do not understand we do not possess. -- goethe
Re: pkg_add -ui behaviour
On Mon, Apr 20, 2009 at 11:54:43PM +0200, frantisek holop wrote: midnight commander suddenly had another package as run dependancy that the previous version did not have it will install this dependency, to meet dependency rules from the packing list instructions. You can see those instructions with `-f' option to pkg_info(1). For example: # pkg_info -f yelp | grep '^.depend' -- best regards q#
update: x11/dwm
Attached patch updates dwm to version 5.5.
Tested on two work stations I use daily running a recent snapshot of
i386. Terminals and web browsing work for me.
Please double check and commit.
Jim
Index: dwm/Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.11
diff -u -N -p dwm/Makefile
--- dwm/Makefile9 Feb 2009 00:11:22 - 1.11
+++ dwm/Makefile21 Apr 2009 00:33:00 -
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2009/02/09 00:11:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2008/10/15 18:47:54 kili Exp $
COMMENT= dynamic window manager
-DISTNAME= dwm-5.4.1
+DISTNAME= dwm-5.5
CATEGORIES=x11
Index: dwm/distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.10
diff -u -N -p dwm/distinfo
--- dwm/distinfo9 Feb 2009 00:11:23 - 1.10
+++ dwm/distinfo21 Apr 2009 00:33:00 -
@@ -1,5 +1,5 @@
-MD5 (dwm-5.4.1.tar.gz) = m51yInQDF+A/2qcYMi/h7A==
-RMD160 (dwm-5.4.1.tar.gz) = PSzBo642X757N+tsomys6w9Fr3g=
-SHA1 (dwm-5.4.1.tar.gz) = AyiwDs/dWNwW6JF1m9ah3UXxZ4w=
-SHA256 (dwm-5.4.1.tar.gz) = iDwmhwZKVQkEp3/CKbuVcTor+bnrXimXJmz0Y2EL0UI=
-SIZE (dwm-5.4.1.tar.gz) = 17970
+MD5 (dwm-5.5.tar.gz) = NS2VLoOasOLfCwlZolCwmA==
+RMD160 (dwm-5.5.tar.gz) = BF3sykDeoGS4m0jobNLL4A9Uau8=
+SHA1 (dwm-5.5.tar.gz) = rXVhBrG9OnQpEnJG9XfyhCs6T9Y=
+SHA256 (dwm-5.5.tar.gz) = 7la0PzoSwpKuTfKQJBKuWhazRYE7kiBzLjxIZpNxuMg=
+SIZE (dwm-5.5.tar.gz) = 17959
Index: dwm/patches/patch-config_def_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
retrieving revision 1.5
diff -u -N -p dwm/patches/patch-config_def_h
--- dwm/patches/patch-config_def_h 9 Feb 2009 00:11:23 - 1.5
+++ dwm/patches/patch-config_def_h 21 Apr 2009 00:33:00 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-config_def_h,v 1.5 2009/02/09 00:11:23 sthen Exp $
config.def.h.orig Sun Feb 8 09:46:55 2009
-+++ config.def.h Sun Feb 8 14:44:57 2009
+$OpenBSD: patch-config_def_h,v 1.4 2008/10/15 18:47:54 kili Exp $
+--- config.def.h.orig Mon Apr 20 15:49:55 2009
config.def.h Mon Apr 20 15:53:36 2009
@@ -1,13 +1,13 @@
/* See LICENSE file for copyright and license details. */
@@ -22,7 +22,7 @@ $OpenBSD: patch-config_def_h,v 1.5 2009/02/09 00:11:23
static unsigned int borderpx= 1;/* border pixel of windows */
static unsigned int snap= 32; /* snap pixel */
static Bool showbar = True; /* False means no bar */
-@@ -23,6 +23,8 @@ static Rule rules[] = {
+@@ -21,6 +21,8 @@ static Rule rules[] = {
/* class instancetitle tags mask isfloating */
{ Gimp, NULL, NULL, 0,True },
{ Firefox, NULL, NULL, 1 8, True },
@@ -31,7 +31,7 @@ $OpenBSD: patch-config_def_h,v 1.5 2009/02/09 00:11:23
};
/* layout(s) */
-@@ -49,7 +51,7 @@ static Layout layouts[] = {
+@@ -47,7 +49,7 @@ static Layout layouts[] = {
/* commands */
static const char *dmenucmd[] = { dmenu_run, -fn, font, -nb,
normbgcolor, -nf, normfgcolor, -sb, selbgcolor, -sf, selfgcolor, NULL };
Index: dwm/patches/patch-config_mk
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_mk,v
retrieving revision 1.4
diff -u -N -p dwm/patches/patch-config_mk
--- dwm/patches/patch-config_mk 9 Feb 2009 00:11:23 - 1.4
+++ dwm/patches/patch-config_mk 21 Apr 2009 00:33:00 -
@@ -1,7 +1,7 @@
-$OpenBSD: patch-config_mk,v 1.4 2009/02/09 00:11:23 sthen Exp $
config.mk.orig Sun Feb 8 09:46:55 2009
-+++ config.mk Sun Feb 8 14:44:57 2009
-@@ -4,28 +4,28 @@ VERSION = 5.4
+$OpenBSD: patch-config_mk,v 1.3 2008/10/15 18:47:54 kili Exp $
+--- config.mk.orig Mon Apr 20 15:36:56 2009
config.mk Mon Apr 20 15:40:20 2009
+@@ -4,28 +4,28 @@ VERSION = 5.5
# Customize below to fit your system
# paths
@@ -16,10 +16,8 @@ $OpenBSD: patch-config_mk,v 1.4 2009/02/09 00:11:23 st
+X11LIB = ${X11BASE}/lib
# Xinerama, un-comment if you want it
--#XINERAMALIBS = -L${X11LIB} -lXinerama
--#XINERAMAFLAGS = -DXINERAMA
-+XINERAMALIBS = -L${X11LIB} -lXinerama
-+XINERAMAFLAGS = -DXINERAMA
+ XINERAMALIBS = -L${X11LIB} -lXinerama
+ XINERAMAFLAGS = -DXINERAMA
# includes and libs
-INCS = -I. -I/usr/include -I${X11INC}
