date:20130818

UPDATE: QEMU 1.6.0

2013-08-18 Thread Brad Smith

Here is an update to QEMU 1.6.0.

Looking for any testing.


Index: Makefile
===
RCS file: /cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile
--- Makefile19 Aug 2013 05:28:20 -  1.109
+++ Makefile19 Aug 2013 05:29:44 -
@@ -4,8 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc sparc
 
 COMMENT=   multi system emulator
 
-DISTNAME=  qemu-1.5.1
-REVISION=  0
+DISTNAME=  qemu-1.6.0
 CATEGORIES=emulators
 MASTER_SITES=  http://wiki.qemu.org/download/
 EXTRACT_SUFX=  .tar.bz2
@@ -84,9 +83,6 @@ CONFIGURE_ARGS+=--disable-debug-info
 .endif
 
 TEST_TARGET=   check
-
-post-extract:
-   @rm ${WRKSRC}/include/libfdt_env.h
 
 post-install:
${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup \
Index: distinfo
===
RCS file: /cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo18 Jul 2013 20:20:18 -  1.30
+++ distinfo19 Aug 2013 05:29:44 -
@@ -1,2 +1,2 @@
-SHA256 (qemu-1.5.1.tar.bz2) = TBWh7i84eYPrXBSX9mv1Z8NNFLpIUXFI9ur++K4J4+g=
-SIZE (qemu-1.5.1.tar.bz2) = 11931754
+SHA256 (qemu-1.6.0.tar.bz2) = MTLlitom1DtpJOjC8H24CqHlAi89zwPe59i7kZSyy0g=
+SIZE (qemu-1.6.0.tar.bz2) = 12040196
Index: patches/patch-configure
===
RCS file: /cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.35
diff -u -p -r1.35 patch-configure
--- patches/patch-configure 18 Jul 2013 20:20:18 -  1.35
+++ patches/patch-configure 19 Aug 2013 05:29:44 -
@@ -1,39 +1,7 @@
 $OpenBSD: patch-configure,v 1.35 2013/07/18 20:20:18 brad Exp $
 configure.orig Wed Jun 26 17:47:29 2013
-+++ configure  Fri Jun 28 00:47:20 2013
-@@ -2517,9 +2517,31 @@ fi
- 
- ##
- # fdt probe
-+# fdt support is mandatory for at least some target architectures,
-+# so insist on it if we're building those system emulators.
-+fdt_required=no
-+for target in $target_list; do
-+  case $target in
-+arm*-softmmu|ppc*-softmmu|microblaze*-softmmu)
-+  fdt_required=yes
-+;;
-+  esac
-+done
-+
-+if test "$fdt_required" = "yes"; then
-+  if test "$fdt" = "no"; then
-+error_exit "fdt disabled but some requested targets require it." \
-+  "You can turn off fdt only if you also disable all the system 
emulation" \
-+  "targets which need it (by specifying a cut down --target-list)."
-+  fi
-+  fdt=yes
-+fi
-+
- if test "$fdt" != "no" ; then
-   fdt_libs="-lfdt"
-+  # explicitly check for libfdt_env.h as it is missing in some stable installs
-   cat > $TMPC << EOF
-+#include 
- int main(void) { return 0; }
- EOF
-   if compile_prog "" "$fdt_libs" ; then
-@@ -3389,8 +3411,6 @@ fi
+--- configure.orig Thu Aug  1 18:01:00 2013
 configure  Thu Aug  1 23:49:10 2013
+@@ -3379,8 +3379,6 @@ fi
  if test "$gcov" = "yes" ; then
CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
Index: pkg/PLIST
===
RCS file: /cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -r1.26 PLIST
--- pkg/PLIST   3 Jun 2013 22:34:24 -   1.26
+++ pkg/PLIST   19 Aug 2013 05:29:44 -
@@ -60,6 +60,7 @@ share/locale/de_DE/LC_MESSAGES/qemu.mo
 share/locale/fr_FR/
 share/locale/fr_FR/LC_MESSAGES/
 share/locale/fr_FR/LC_MESSAGES/qemu.mo
+share/locale/hu/LC_MESSAGES/qemu.mo
 share/locale/it/LC_MESSAGES/qemu.mo
 share/locale/tr/LC_MESSAGES/qemu.mo
 share/qemu/
@@ -127,6 +128,7 @@ share/qemu/pxe-rtl8139.rom
 share/qemu/pxe-virtio.rom
 share/qemu/q35-acpi-dsdt.aml
 share/qemu/qemu-icon.bmp
+share/qemu/qemu_logo_no_text.svg
 share/qemu/s390-ccw.img
 share/qemu/s390-zipl.rom
 share/qemu/sgabios.bin

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

2013-08-18 Thread patrick keshishian

On 8/18/13, Matthew Dempsky  wrote:
> On Sun, Aug 18, 2013 at 2:43 AM, patrick keshishian 
> wrote:
>> + bt::timeval::timeval(const ::timeval &t)
>> +-  : tv_sec(t.tv_sec), tv_usec(t.tv_usec)
>> +-{ }
>> ++{ tv_sec = t.tv_sec; tv_usec = t.tv_usec; }
>
> What's the point of these changes?

The bt::timeval struct's definition changed. tv_sec and tv_usec are
no longer direct members, and can not be initialized as before.

--patrick

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

2013-08-18 Thread Matthew Dempsky

On Sun, Aug 18, 2013 at 2:43 AM, patrick keshishian  wrote:
> + bt::timeval::timeval(const ::timeval &t)
> +-  : tv_sec(t.tv_sec), tv_usec(t.tv_usec)
> +-{ }
> ++{ tv_sec = t.tv_sec; tv_usec = t.tv_usec; }

What's the point of these changes?

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

2013-08-18 Thread patrick keshishian

On 8/18/13, Christian Weisgerber  wrote:
> patrick keshishian  wrote:
>
>> unsquandering ... (hopefully)
>
> I think most of this is pointless and misleading.  The timeout value
> that is passed around is NOT a time_t.  It's a time offset in the
> range 0 .. 3600*1000 milliseconds.  Putting it into a time_t is an
> abuse of that type.

I agree. The purpose of nextTimeout(), seems to be, to returning
an interval in milliseconds. That is then passed to Timer::setTimeout().

--patrick


>> +--- lib/Timer.hh.orig   Fri Mar 18 01:07:09 2005
>>  lib/Timer.hhSat Aug 17 22:43:03 2013
>> +@@ -37,16 +37,12 @@ struct timeval;
>> + namespace bt {
>> +
>> +   // use a wrapper class to avoid the header as well
>> +-  struct timeval {
>> +-long tv_sec;
>> +-long tv_usec;
>> ++  struct timeval : public ::timeval {
>
> Now THIS is a good catch.
>
> --
> Christian "naddy" Weisgerber  na...@mips.inka.de

Re: UPDATE: www/rawdog 2.15 => 2.17

2013-08-18 Thread Brian Callahan


On 08/12/13 09:53, Brian Callahan wrote:

On 8/8/2013 9:13 PM, Brian Callahan wrote:

Hi ports --

Attached is an update to rawdog. As stated in my py-feedparser update
email, feedparser is now a RUN_DEP, so please don't test this without
the updated feedparser.

Also, reformat the Makefile to add a space between VARIABLE and =. Since
I've taken over maintainership, a mix of VARIABLE= and VARIABLE = has
crept in and I prefer having the space there.

Works for me on amd64.

OK?

~Brian



Ping.

Anyone? Reattached for convenience. Remember to test with the updated 
py-feedparser.



Index: Makefile
===
RCS file: /cvs/ports/www/rawdog/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile	14 Jul 2013 17:28:39 -	1.25
+++ Makefile	9 Aug 2013 00:53:45 -
@@ -1,27 +1,29 @@
 # $OpenBSD: Makefile,v 1.25 2013/07/14 17:28:39 bcallah Exp $
 
-COMMENT=	RSS Aggregator Without Delusions Of Grandeur
+COMMENT =	RSS Aggregator Without Delusions Of Grandeur
 
-MODPY_EGG_VERSION=	2.15
-DISTNAME=	rawdog-${MODPY_EGG_VERSION}
-CATEGORIES=	www news
+MODPY_EGG_VERSION =	2.17
+DISTNAME =	rawdog-${MODPY_EGG_VERSION}
+CATEGORIES =	www news
 
-HOMEPAGE=	http://offog.org/code/rawdog.html
+HOMEPAGE =	http://offog.org/code/rawdog.html
 
 MAINTAINER =	Brian Callahan 
 
 # GPLv2, LGPLv2.1
-PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_CDROM =	Yes
 
-MASTER_SITES=	http://offog.org/files/
+MASTER_SITES =	http://offog.org/files/
 
-MODULES=	lang/python
+MODULES =	lang/python
+
+RUN_DEPENDS =	textproc/py-feedparser
 
 USE_GROFF =	Yes
-NO_TEST=	Yes
+NO_TEST =	Yes
 
-DOCDIR=		${PREFIX}/share/doc/rawdog
-EXAMPLESDIR=	${PREFIX}/share/examples/rawdog
+DOCDIR =	${PREFIX}/share/doc/rawdog
+EXAMPLESDIR =	${PREFIX}/share/examples/rawdog
 
 do-configure:
 	@perl -pi -e \
Index: distinfo
===
RCS file: /cvs/ports/www/rawdog/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo	14 Jul 2013 17:28:39 -	1.14
+++ distinfo	9 Aug 2013 00:53:45 -
@@ -1,2 +1,2 @@
-SHA256 (rawdog-2.15.tar.gz) = kcfiAkFteoiB2PoHgf3/ztwGtmloB+m794Fg76WOQfI=
-SIZE (rawdog-2.15.tar.gz) = 102934
+SHA256 (rawdog-2.17.tar.gz) = rUnH2L99zgo7+bCeH4Bg3bwlrakwoOfq9LCx/4vlLwk=
+SIZE (rawdog-2.17.tar.gz) = 64671
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/www/rawdog/patches/patch-setup_py,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-setup_py
--- patches/patch-setup_py	14 Jul 2013 17:28:40 -	1.3
+++ patches/patch-setup_py	9 Aug 2013 00:53:45 -
@@ -1,10 +1,12 @@
 $OpenBSD: patch-setup_py,v 1.3 2013/07/14 17:28:40 bcallah Exp $
 setup.py.orig	Sat Jul 13 12:24:47 2013
-+++ setup.py	Sat Jul 13 20:52:14 2013
-@@ -15,5 +15,5 @@ setup(name = "rawdog",
- 	url = "http://offog.org/code/rawdog.html";,
- 	license = "GNU GPL v2 or later",
+--- setup.py.orig	Thu Aug  1 08:29:11 2013
 setup.py	Thu Aug  1 22:26:39 2013
+@@ -14,7 +14,7 @@ setup(name = "rawdog",
+ 	author_email = "a...@offog.org",
+ 	url = "http://offog.org/code/rawdog/";,
  	scripts = ['rawdog'],
 -	data_files = [('share/man/man1', ['rawdog.1'])],
 +	data_files = [('man/man1', ['rawdog.1'])],
- 	packages = ['rawdoglib'])
+ 	packages = ['rawdoglib'],
+ 	classifiers = [
+ 		"Development Status :: 5 - Production/Stable",
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/rawdog/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- pkg/PLIST	14 Jul 2013 17:28:40 -	1.8
+++ pkg/PLIST	9 Aug 2013 00:53:45 -
@@ -4,8 +4,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/rawdoglib/
 lib/python${MODPY_VERSION}/site-packages/rawdoglib/__init__.py
 lib/python${MODPY_VERSION}/site-packages/rawdoglib/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/rawdoglib/feedparser.py
-lib/python${MODPY_VERSION}/site-packages/rawdoglib/feedparser.pyc
 lib/python${MODPY_VERSION}/site-packages/rawdoglib/feedscanner.py
 lib/python${MODPY_VERSION}/site-packages/rawdoglib/feedscanner.pyc
 lib/python${MODPY_VERSION}/site-packages/rawdoglib/persister.py

Re: UPDATE: textproc/py-feedparser 5.0.1 => 5.1.3

2013-08-18 Thread Brian Callahan


On 08/12/13 09:53, Brian Callahan wrote:

On 8/8/2013 9:08 PM, Brian Callahan wrote:

Hi ports --

Attached is an update to py-feedparser bringing it up to its latest
version. Feedparser is now required for www/rawdog (update patch for
that to be sent shortly).

Some tweaks: change the V variable to MODPY_EGG_VERSION because that is
convention, and to reduce future PLIST churn. Also, the feedparser.org
homepage appears to be gone so change HOMEPAGE to its googlecode page.

Works for me on amd64.

OK? (MAINTAINER timeout)

~Brian



Ping.


Anyone? Reattached for convenience.


Index: Makefile
===
RCS file: /cvs/ports/textproc/py-feedparser/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile	7 Aug 2013 21:32:42 -	1.15
+++ Makefile	9 Aug 2013 01:00:34 -
@@ -2,13 +2,12 @@
 
 COMMENT=	RSS and Atom feeds parser written in Python
 
-V=		5.0.1
-DISTNAME=	feedparser-${V}
+MODPY_EGG_VERSION=	5.1.3
+DISTNAME=	feedparser-${MODPY_EGG_VERSION}
 PKGNAME=	py-${DISTNAME}
-REVISION=	2
 CATEGORIES=	textproc
 
-HOMEPAGE=	http://www.feedparser.org/
+HOMEPAGE=	https://code.google.com/p/feedparser/
 
 MAINTAINER=	Romain Gaillegue 
 
@@ -18,6 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 MASTER_SITES=	https://feedparser.googlecode.com/files/
 
 MODULES=	lang/python
+MODPY_SETUP_TOOLS=	Yes
 
 do-test:
 	cd ${WRKSRC}/feedparser/ && ${MODPY_BIN} feedparsertest.py
Index: distinfo
===
RCS file: /cvs/ports/textproc/py-feedparser/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo	18 Mar 2011 12:17:50 -	1.7
+++ distinfo	9 Aug 2013 01:00:34 -
@@ -1,5 +1,2 @@
-MD5 (feedparser-5.0.1.tar.gz) = Df1K1uEFm6jfO27rxg7vWQ==
-RMD160 (feedparser-5.0.1.tar.gz) = 5dTqffPk7GfDsv+9h5j7V6Hfpz0=
-SHA1 (feedparser-5.0.1.tar.gz) = EWMdQcl4K5Kv1TO4o6o+oM6qHvE=
-SHA256 (feedparser-5.0.1.tar.gz) = kyICWKZhryQaVpUXH98JtMs5I04u24vA2O9uUXNQECc=
-SIZE (feedparser-5.0.1.tar.gz) = 313356
+SHA256 (feedparser-5.1.3.tar.gz) = rVQ2OeidQ2heLx07bkhxFWLuw743nmlYqSD76vTGO84=
+SIZE (feedparser-5.1.3.tar.gz) = 283614
Index: patches/patch-feedparser_feedparser_py
===
RCS file: patches/patch-feedparser_feedparser_py
diff -N patches/patch-feedparser_feedparser_py
--- patches/patch-feedparser_feedparser_py	25 May 2012 12:27:33 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-feedparser_feedparser_py,v 1.1 2012/05/25 12:27:33 jasper Exp $
-
-Security fix for CVE-2012-2921,
-feedparser DOCTYPE and ENTITY XML Declaration Denial of Service Vulnerability
-
-Patch from upstream:
-https://code.google.com/p/feedparser/source/detail?r=703&path=/trunk/feedparser/feedparser.py
-
 feedparser/feedparser.py.orig	Fri May 25 14:24:41 2012
-+++ feedparser/feedparser.py	Fri May 25 14:25:48 2012
-@@ -3703,9 +3703,6 @@ def parse(url_file_stream_or_string, etag=None, modifi
- result['bozo'] = 1
- result['bozo_exception'] = NonXMLContentType(bozo_message)
- 
--if data is not None:
--result['version'], data, entities = _stripDoctype(data)
--
- # ensure that baseuri is an absolute uri using an acceptable URI scheme
- contentloc = http_headers.get('content-location', http_headers.get('Content-Location', ''))
- href = result.get('href', '')
-@@ -3790,6 +3787,9 @@ def parse(url_file_stream_or_string, etag=None, modifi
- 'document declared as %s, but parsed as %s' % \
- (result['encoding'], proposed_encoding))
- result['encoding'] = proposed_encoding
-+
-+if data is not None:
-+result['version'], data, entities = _stripDoctype(data)
- 
- if not _XML_AVAILABLE:
- use_strict_parser = 0
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-feedparser/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST	16 Mar 2011 22:52:10 -	1.3
+++ pkg/PLIST	9 Aug 2013 01:00:34 -
@@ -1,5 +1,8 @@
 @comment $OpenBSD: PLIST,v 1.3 2011/03/16 22:52:10 jasper Exp $
-lib/python${MODPY_VERSION}/site-packages/feedparser-5.0.1-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/feedparser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/feedparser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/feedparser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/feedparser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/feedparser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/feedparser.py
 lib/python${MODPY_VERSION}/site-packages/feedparser.pyc
-share/doc/py-feedparser/

Re: A request.

2013-08-18 Thread Stuart Henderson

On 2013/08/17 15:28, Bill Swisher wrote:
> I'm running OpenBSD 5.3 and have loaded the ntop-1.1 package.  Years
> ago I ran this package under Suse 9.* and it would fail giving me a
> core dump.  Here is the message:
> ntop v.1.1 MT [i386-unknown-openbsd5.2] listening on ne1
> 4192 Pkts/3.6 MB [IP 3.6 MB/Other 0]   Thpt: 405.2
> Kbps/405.2 KbpsSegmentation fault (core dumped)
> 
> There was a release, I think it was in the 1.2* or 1.3* range but am
> probably wrong, which fixed that problem.  I would like to know if
> you'd be willing to produce a new package based on one of the later
> versions of the code.  I'd like to do it myself but frankly I'm
> probably incapable of it.  If you would like a copy of the file
> ntop.core:
> -rw---   1 root  bill   4459084 Aug 17 13:28 ntop.core
> I could attach it to another message for you.
> 
> I like the package and used to run it 24X7 in a remote terminal, the
> OpenBSD machine doesn't have any X installed since it doesn't need it
> for what I use it for.
> 
> Thanks and let me know if there's anything I can do to assist, if you
> decide to do this.
> 
> -- 
> Tcl long ago fell into the Forth trap, and is now trying desperately to
> extricate itself (with some help from Sun's marketing department).
> -- Larry Wall in <199705101952.maa00...@wall.org>
> 

It might be possible to update to a more recent ntop now (until we had
kernel backed threads there was a blocking problem).. if anyone wants to
look at this you're probably going to need to point it at the libbind
resolver library (ports/net/libbind), it doesn't work with the async
resolver in libc.

Fixes after portcheck run, part 2

2013-08-18 Thread Vadim Zhukov

Hello all.

Second bunch of fixes for problems found with portcheck(1).
More to come.

For games/heroes, this removes "ggi" FLAVOR, because we have
graphics/ggi removed a long ago.

okay?
--
  WBR,
Vadim Zhukov


Index: editors/emacs/Makefile
===
RCS file: /cvs/ports/editors/emacs/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- editors/emacs/Makefile  4 Jun 2013 18:41:41 -   1.38
+++ editors/emacs/Makefile  18 Aug 2013 21:32:28 -
@@ -6,6 +6,7 @@ COMMENT=GNU editor: extensible, custom
 
 VERSION=   24.3
 DISTNAME=  emacs-${VERSION}
+REVISION=  0
 
 CATEGORIES=editors
 
@@ -42,6 +43,7 @@ MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRI
 SUBST_VARS=GCCARCH VERSION
 
 MODULES=   devel/gettext
+RUN_DEPENDS=   devel/desktop-file-utils x11/gtk+2,-guic
 LIB_DEPENDS=   devel/libexecinfo security/gnutls textproc/libxml
 
 .if ${FLAVOR} == "no_x11"
Index: editors/emacs/pkg/PLIST
===
RCS file: /cvs/ports/editors/emacs/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- editors/emacs/pkg/PLIST 7 May 2013 07:06:42 -   1.12
+++ editors/emacs/pkg/PLIST 18 Aug 2013 21:32:28 -
@@ -4005,3 +4005,7 @@ share/icons/hicolor/scalable/apps/
 share/icons/hicolor/scalable/apps/emacs.svg
 share/icons/hicolor/scalable/mimetypes/
 share/icons/hicolor/scalable/mimetypes/emacs-document.svg
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Index: editors/libreoffice/Makefile
===
RCS file: /cvs/ports/editors/libreoffice/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- editors/libreoffice/Makefile21 Jun 2013 06:07:58 -  1.90
+++ editors/libreoffice/Makefile18 Aug 2013 21:31:06 -
@@ -17,6 +17,7 @@ PKGNAME-java= libreoffice-java-${VERSION
 CATEGORIES=editors productivity
 DPB_PROPERTIES=parallel
 
+REVISION-main= 0
 EPOCH= 0
 
 MAINTAINER=Robert Nagy 
Index: editors/libreoffice/pkg/PLIST-main
===
RCS file: /cvs/ports/editors/libreoffice/pkg/PLIST-main,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST-main
--- editors/libreoffice/pkg/PLIST-main  21 Jun 2013 06:07:58 -  1.29
+++ editors/libreoffice/pkg/PLIST-main  18 Aug 2013 21:31:06 -
@@ -3134,12 +3134,6 @@ lib/libreoffice/ure/
 lib/libreoffice/ure-link
 lib/libreoffice/ure/bin/
 lib/libreoffice/ure/bin/regcomp
-@exec %D/bin/update-mime-database %D/share/mime
-@unexec-delete %D/bin/update-mime-database %D/share/mime
-@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
-@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
-@exec %D/bin/update-desktop-database
-@unexec-delete %D/bin/update-desktop-database
 @bin lib/libreoffice/ure/bin/regcomp.bin
 @bin lib/libreoffice/ure/bin/regmerge
 @bin lib/libreoffice/ure/bin/regview
Index: games/angband/Makefile
===
RCS file: /cvs/ports/games/angband/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- games/angband/Makefile  11 Mar 2013 11:07:37 -  1.27
+++ games/angband/Makefile  18 Aug 2013 21:36:30 -
@@ -9,6 +9,7 @@ V_DLDIR =   ${V:C/\.[0-9]$//}
 DISTNAME=  angband-v${V}
 PKGNAME=   angband-${V}
 CATEGORIES=games
+REVISION=  0
 
 HOMEPAGE=  http://rephial.org
 
@@ -36,6 +37,8 @@ USE_GMAKE =   Yes
 FLAVORS=   no_x11 sdl
 FLAVOR?=
 
+RUN_DEPENDS =  devel/desktop-file-utils
+
 .if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS+=   --without-x
 .else
@@ -50,7 +53,6 @@ PKG_ARGS +=   -Dsdl=1
 LIB_DEPENDS += devel/sdl-mixer \
devel/sdl-image \
devel/sdl-ttf
-RUN_DEPENDS += devel/desktop-file-utils
 WANTLIB += SDL SDL_image SDL_mixer SDL_ttf pthread 
 .else
 CONFIGURE_ARGS +=  --disable-sdl-mixer # defaults to ON
Index: games/dopewars/Makefile
===
RCS file: /cvs/ports/games/dopewars/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- games/dopewars/Makefile 21 Mar 2013 08:45:17 -  1.58
+++ games/dopewars/Makefile 18 Aug 2013 21:39:55 -
@@ -3,7 +3,7 @@
 COMMENT=   game where you deal drugs on the streets of NY
 
 DISTNAME=  dopewars-1.5.12
-REVISION=  9
+REVISION=  10
 CATEGORIES=games
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dopewars/}
 
@@ -17,7 +17,

Re: pstree(1) dumps core on macppc/current

2013-08-18 Thread Jan Stary

On Aug 18 20:06:00, mpieuc...@nolizard.org wrote:
> On 18/08/13(Sun) 19:40, Jan Stary wrote:
> > On Aug 18 19:38:29, h...@stare.cz wrote:
> > > After I upgraded a MacMini to current/macppc,
> > > this is what happens when I try to run pstree:
> > > 
> > >   $ pstree
> > >   Bad system call (core dumped) 
> > > 
> > > I made a ktrace of it (attached).
> > > It looks like the ps(1) child is exiting prematurely.
> > > Could this be related to the recent ABI change?
> 
> Yes.
> 
> > > 
> > > This installation of pstree was done from the port;
> > > the prebuilt package (July 20) is too old for current.
> > 
> > Maybe I should say explicitly that I removed and reinstalled all packages,
> > as per the current.html note about the recent ABI change.
> 
> powerpc snapshots still predate the ABI change, just wait for a new one ;)

Rebuilt sys and world from current source,
rebuilt the pstree port, and it works. Thanks.

Jan

Re: UPDATE: net/snort 2.9.5.3

2013-08-18 Thread Lawrence Teo

On Thu, Aug 08, 2013 at 03:21:05PM -0400, Adam Jeanguenat wrote:
> On 2013-08-07 at 15:59:44 -0400, Lawrence Teo wrote:
> > This updates Snort to 2.9.5.3.
> > 
> > While testing I found that since Snort 2.9.4.1, upstream has removed the
> > ability for Snort to listen on "non-Ethernet" devices such as our
> > pflog(4) by default.  This diff re-enables that ability by using the
> > --enable-non-ether-decoders configure flag.
> > 
> > Tested on amd64, i386, macppc.
> 
> Tested these and the daq patches on amd64 and i386 with no issues.

Thank you for testing, Adam.

I have also tested this and the DAQ 2.0.1 update
(http://marc.info/?l=openbsd-ports&m=137590540710450&w=2) on the
64-bit time_t amd64 and i386 snapshots.

If there are no objections, I would like to commit both the Snort and
DAQ updates sometime this week.  OK's are also welcome. :)
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.80
diff -u -p -u -p -r1.80 Makefile
--- Makefile10 Jul 2013 02:10:22 -  1.80
+++ Makefile7 Aug 2013 01:57:51 -
@@ -4,8 +4,8 @@ SHARED_ONLY =   Yes
 
 COMMENT =  highly flexible sniffer/NIDS
 
-VERSION =  2.9.5.0
-DISTNAME = snort-2.9.5
+VERSION =  2.9.5.3
+DISTNAME = snort-${VERSION}
 
 CATEGORIES =   net security
 
@@ -25,7 +25,8 @@ USE_GROFF =   Yes
 SEPARATE_BUILD =   Yes
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  ${CONFIGURE_SHARED} \
-   --disable-static-daq
+   --disable-static-daq \
+   --enable-non-ether-decoders
 
 LIB_DEPENDS =  devel/pcre \
net/libdnet \
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 distinfo
--- distinfo10 Jul 2013 02:10:22 -  1.25
+++ distinfo7 Aug 2013 01:34:18 -
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.5.tar.gz) = H5mXcW6MCGydYIKUpVwyOEaHfI8WrNEpqQyl+tu6GJA=
-SIZE (snort-2.9.5.tar.gz) = 5422421
+SHA256 (snort-2.9.5.3.tar.gz) = Pv0x/TN+g2r1PXkPwpl/SfzDUeUHHUxuT1hqiLBwxSo=
+SIZE (snort-2.9.5.3.tar.gz) = 5047591
Index: patches/patch-etc_snort_conf
===
RCS file: /cvs/ports/net/snort/patches/patch-etc_snort_conf,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-etc_snort_conf
--- patches/patch-etc_snort_conf23 Apr 2013 02:04:13 -  1.9
+++ patches/patch-etc_snort_conf7 Aug 2013 01:34:18 -
@@ -2,8 +2,8 @@ $OpenBSD: patch-etc_snort_conf,v 1.9 201
 
 reputation preprocessor disabled, still experimental
 
 etc/snort.conf.origThu Mar 21 14:09:05 2013
-+++ etc/snort.conf Thu Apr  4 22:31:37 2013
+--- etc/snort.conf.origTue Jul 23 14:37:33 2013
 etc/snort.conf Mon Aug  5 14:38:56 2013
 @@ -101,17 +101,17 @@ ipvar AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.1
  # Path to your rules files (this can be a relative path)
  # Note for Windows users:  You are advised to make this an absolute path,
@@ -65,7 +65,7 @@ reputation preprocessor disabled, still 
  include $RULE_PATH/app-detect.rules
  include $RULE_PATH/attack-responses.rules
  include $RULE_PATH/backdoor.rules
-@@ -648,6 +650,9 @@ include $RULE_PATH/web-iis.rules
+@@ -659,6 +661,9 @@ include $RULE_PATH/web-iis.rules
  include $RULE_PATH/web-misc.rules
  include $RULE_PATH/web-php.rules
  include $RULE_PATH/x11.rules
Index: patches/patch-src_decode_h
===
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_decode_h
--- patches/patch-src_decode_h  10 Jul 2013 02:10:22 -  1.4
+++ patches/patch-src_decode_h  7 Aug 2013 01:34:18 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_decode_h,v 1.4 2013/07/10 02:10:22 lteo Exp $
 src/decode.h.orig  Tue Jun  4 23:19:52 2013
-+++ src/decode.h   Tue Jul  2 20:52:28 2013
-@@ -812,9 +812,9 @@ typedef struct _SLLHdr {
+--- src/decode.h.orig  Wed Jul  3 17:31:22 2013
 src/decode.h   Mon Aug  5 14:37:49 2013
+@@ -813,9 +813,9 @@ typedef struct _SLLHdr {
   * Pflog1_Hdr:  CVS = 1.3,  DLT_OLD_PFLOG = 17,  Length = 28
   * Pflog2_Hdr:  CVS = 1.8,  DLT_PFLOG = 117, Length = 48
   * Pflog3_Hdr:  CVS = 1.12, DLT_PFLOG = 117, Length = 64
Index: patches/patch-src_dynamic-preprocessors_Makefile_in
===
RCS file: 
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 10 Jul 2013 02:10:22 
-  1.11
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 7 Aug 2013 01:34:

Re: xmlcatalog(1) dumps core on macppc/current

2013-08-18 Thread Kenneth R Westerback

On Sun, Aug 18, 2013 at 07:45:16PM +0200, Jan Stary wrote:
> After I upgraded a MacMini to current/macppc,
> this is what happens when xmlcatalog is run
> during a build of mutt (or by hand any other time)
> 
>   Bad system call (core dumped) 
> 
> I made a ktrace of it (attached).
> Could this be related to the recent ABI change?
> 
>   Jan
> 

Yes it could.

 Ken

Re: Fixes after portcheck run

2013-08-18 Thread Vadim Zhukov

18.08.2013 21:30 пользователь "Antoine Jacoutot" 
написал:
>
> On Sun, Aug 18, 2013 at 09:19:17PM +0400, Vadim Zhukov wrote:
> > Here is the first bunch of fixes for handling of FreeDesktop goo.
> > Okay?
> > --
> >   WBR,
> > Vadim Zhukov
> >
> >
> > Index: audio/deadbeef/Makefile
> > ===
> > RCS file: /cvs/ports/audio/deadbeef/Makefile,v
> > retrieving revision 1.7
> > diff -u -p -r1.7 Makefile
> > --- audio/deadbeef/Makefile   31 May 2013 15:34:40 -  1.7
> > +++ audio/deadbeef/Makefile   18 Aug 2013 16:41:57 -
> > @@ -4,7 +4,7 @@ SHARED_ONLY = Yes
> >
> >  COMMENT =DeaDBeeF is an audio player
> >  DISTNAME =   deadbeef-0.5.6
> > -REVISION =   2
> > +REVISION =   3
> >  CATEGORIES = audio
> >
> >  HOMEPAGE =   http://deadbeef.sourceforge.net/
> > Index: audio/deadbeef/pkg/PLIST
> > ===
> > RCS file: /cvs/ports/audio/deadbeef/pkg/PLIST,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 PLIST
> > --- audio/deadbeef/pkg/PLIST  5 Feb 2013 09:19:31 -   1.4
> > +++ audio/deadbeef/pkg/PLIST  18 Aug 2013 16:41:57 -
> > @@ -123,5 +123,5 @@ share/locale/zh_CN/LC_MESSAGES/deadbeef.
> >  share/locale/zh_TW/LC_MESSAGES/deadbeef.mo
> >  @exec %D/bin/update-desktop-database
> >  @unexec-delete %D/bin/update-desktop-database
> > -@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
> > -@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t
%D/share/icons/hicolor 2> /dev/null || true
> > +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> > +@unexec-delete %D/bin/gtk-update-icon-cache -q -t
%D/share/icons/hicolor
> > Index: audio/exaile/Makefile
> > ===
> > RCS file: /cvs/ports/audio/exaile/Makefile,v
> > retrieving revision 1.27
> > diff -u -p -r1.27 Makefile
> > --- audio/exaile/Makefile 3 Apr 2013 06:49:47 -   1.27
> > +++ audio/exaile/Makefile 18 Aug 2013 16:46:01 -
> > @@ -5,7 +5,7 @@ COMMENT = music manager and player for G
> >  V =  3.3
> >  P =  1
> >  DISTNAME =   exaile-${V}.${P}
> > -REVISION =   0
> > +REVISION =   1
> >
> >  CATEGORIES = audio x11
> >
> > Index: audio/exaile/pkg/PLIST
> > ===
> > RCS file: /cvs/ports/audio/exaile/pkg/PLIST,v
> > retrieving revision 1.11
> > diff -u -p -r1.11 PLIST
> > --- audio/exaile/pkg/PLIST3 Apr 2013 06:49:47 -   1.11
> > +++ audio/exaile/pkg/PLIST18 Aug 2013 16:46:01 -
> > @@ -1116,8 +1116,6 @@ share/exaile/data/ui/widgets/volume_cont
> >  share/exaile/xdg/
> >  share/exaile/xdg/exaile/
> >  share/exaile/xdg/exaile/settings.ini
> > -@exec %D/bin/update-desktop-database
> > -@unexec-delete %D/bin/update-desktop-database
> >  share/locale/ar/LC_MESSAGES/exaile.mo
> >  share/locale/ast/LC_MESSAGES/exaile.mo
> >  share/locale/be/LC_MESSAGES/exaile.mo
>
> Are you sure this is correct?

Yes, it is duplicated at the end of PLIST.

> > Index: audio/gtkpod/Makefile
> > ===
> > RCS file: /cvs/ports/audio/gtkpod/Makefile,v
> > retrieving revision 1.45
> > diff -u -p -r1.45 Makefile
> > --- audio/gtkpod/Makefile 10 Mar 2013 22:55:02 -  1.45
> > +++ audio/gtkpod/Makefile 18 Aug 2013 16:50:15 -
> > @@ -2,7 +2,7 @@
> >
> >  COMMENT= GTK+2 program to synchronize an Apple iPod
> >  DISTNAME=gtkpod-1.0.0
> > -REVISION =   1
> > +REVISION =   2
> >  CATEGORIES=  audio x11
> >  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=gtkpod/}
> >
> > @@ -24,7 +24,8 @@ USE_GMAKE=  Yes
> >
> >  #libmp4v2 is dlopen()'ed at runtime
> >  RUN_DEPENDS= devel/desktop-file-utils \
> > - multimedia/libmp4v2
> > + multimedia/libmp4v2 \
> > + x11/gtk+2,-guic
> >
> >  LIB_DEPENDS= audio/libid3tag \
> >   audio/libgpod \
> > Index: audio/gtkpod/pkg/PLIST
> > ===
> > RCS file: /cvs/ports/audio/gtkpod/pkg/PLIST,v
> > retrieving revision 1.11
> > diff -u -p -r1.11 PLIST
> > --- audio/gtkpod/pkg/PLIST15 Nov 2011 15:43:52 -  1.11
> > +++ audio/gtkpod/pkg/PLIST18 Aug 2013 16:50:15 -
> > @@ -132,3 +132,5 @@ share/locale/sv/LC_MESSAGES/gtkpod.mo
> >  share/locale/zh_CN/LC_MESSAGES/gtkpod.mo
> >  @exec %D/bin/update-desktop-database
> >  @unexec-delete %D/bin/update-desktop-database
> > +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> > +@unexec-delete %D/bin/gtk-update-icon-cache -q -t
%D/share/icons/hicolor
> > Index: comms/chirp/Makefile
> > ===
> > RCS file: /cvs/ports/comms/chirp/Makefile,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 Makefile
> > --- comms/chirp/Make

Re: pstree(1) dumps core on macppc/current

2013-08-18 Thread Martin Pieuchot

On 18/08/13(Sun) 19:40, Jan Stary wrote:
> On Aug 18 19:38:29, h...@stare.cz wrote:
> > After I upgraded a MacMini to current/macppc,
> > this is what happens when I try to run pstree:
> > 
> > $ pstree
> > Bad system call (core dumped) 
> > 
> > I made a ktrace of it (attached).
> > It looks like the ps(1) child is exiting prematurely.
> > Could this be related to the recent ABI change?

Yes.

> > 
> > This installation of pstree was done from the port;
> > the prebuilt package (July 20) is too old for current.
> 
> Maybe I should say explicitly that I removed and reinstalled all packages,
> as per the current.html note about the recent ABI change.

powerpc snapshots still predate the ABI change, just wait for a new one ;)

Martin

xmlcatalog(1) dumps core on macppc/current

2013-08-18 Thread Jan Stary

After I upgraded a MacMini to current/macppc,
this is what happens when xmlcatalog is run
during a build of mutt (or by hand any other time)

Bad system call (core dumped) 

I made a ktrace of it (attached).
Could this be related to the recent ABI change?

Jan

Re: pstree(1) dumps core on macppc/current

2013-08-18 Thread Jan Stary

On Aug 18 19:38:29, h...@stare.cz wrote:
> After I upgraded a MacMini to current/macppc,
> this is what happens when I try to run pstree:
> 
>   $ pstree
>   Bad system call (core dumped) 
> 
> I made a ktrace of it (attached).
> It looks like the ps(1) child is exiting prematurely.
> Could this be related to the recent ABI change?
> 
> This installation of pstree was done from the port;
> the prebuilt package (July 20) is too old for current.

Maybe I should say explicitly that I removed and reinstalled all packages,
as per the current.html note about the recent ABI change.

> On i386 though, the prebuilt package runs fine.
> 
>   Jan
>

Re: Fixes after portcheck run

2013-08-18 Thread Antoine Jacoutot

On Sun, Aug 18, 2013 at 09:19:17PM +0400, Vadim Zhukov wrote:
> Here is the first bunch of fixes for handling of FreeDesktop goo.
> Okay?
> --
>   WBR,
> Vadim Zhukov
> 
> 
> Index: audio/deadbeef/Makefile
> ===
> RCS file: /cvs/ports/audio/deadbeef/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- audio/deadbeef/Makefile   31 May 2013 15:34:40 -  1.7
> +++ audio/deadbeef/Makefile   18 Aug 2013 16:41:57 -
> @@ -4,7 +4,7 @@ SHARED_ONLY = Yes
>  
>  COMMENT =DeaDBeeF is an audio player
>  DISTNAME =   deadbeef-0.5.6
> -REVISION =   2
> +REVISION =   3
>  CATEGORIES = audio
>  
>  HOMEPAGE =   http://deadbeef.sourceforge.net/
> Index: audio/deadbeef/pkg/PLIST
> ===
> RCS file: /cvs/ports/audio/deadbeef/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- audio/deadbeef/pkg/PLIST  5 Feb 2013 09:19:31 -   1.4
> +++ audio/deadbeef/pkg/PLIST  18 Aug 2013 16:41:57 -
> @@ -123,5 +123,5 @@ share/locale/zh_CN/LC_MESSAGES/deadbeef.
>  share/locale/zh_TW/LC_MESSAGES/deadbeef.mo
>  @exec %D/bin/update-desktop-database
>  @unexec-delete %D/bin/update-desktop-database
> -@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> 
> /dev/null || true
> -@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 
> 2> /dev/null || true
> +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> +@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> Index: audio/exaile/Makefile
> ===
> RCS file: /cvs/ports/audio/exaile/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- audio/exaile/Makefile 3 Apr 2013 06:49:47 -   1.27
> +++ audio/exaile/Makefile 18 Aug 2013 16:46:01 -
> @@ -5,7 +5,7 @@ COMMENT = music manager and player for G
>  V =  3.3
>  P =  1
>  DISTNAME =   exaile-${V}.${P}
> -REVISION =   0
> +REVISION =   1
>  
>  CATEGORIES = audio x11
>  
> Index: audio/exaile/pkg/PLIST
> ===
> RCS file: /cvs/ports/audio/exaile/pkg/PLIST,v
> retrieving revision 1.11
> diff -u -p -r1.11 PLIST
> --- audio/exaile/pkg/PLIST3 Apr 2013 06:49:47 -   1.11
> +++ audio/exaile/pkg/PLIST18 Aug 2013 16:46:01 -
> @@ -1116,8 +1116,6 @@ share/exaile/data/ui/widgets/volume_cont
>  share/exaile/xdg/
>  share/exaile/xdg/exaile/
>  share/exaile/xdg/exaile/settings.ini
> -@exec %D/bin/update-desktop-database
> -@unexec-delete %D/bin/update-desktop-database
>  share/locale/ar/LC_MESSAGES/exaile.mo
>  share/locale/ast/LC_MESSAGES/exaile.mo
>  share/locale/be/LC_MESSAGES/exaile.mo

Are you sure this is correct?

> Index: audio/gtkpod/Makefile
> ===
> RCS file: /cvs/ports/audio/gtkpod/Makefile,v
> retrieving revision 1.45
> diff -u -p -r1.45 Makefile
> --- audio/gtkpod/Makefile 10 Mar 2013 22:55:02 -  1.45
> +++ audio/gtkpod/Makefile 18 Aug 2013 16:50:15 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= GTK+2 program to synchronize an Apple iPod
>  DISTNAME=gtkpod-1.0.0
> -REVISION =   1
> +REVISION =   2
>  CATEGORIES=  audio x11
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=gtkpod/}
>  
> @@ -24,7 +24,8 @@ USE_GMAKE=  Yes
>  
>  #libmp4v2 is dlopen()'ed at runtime
>  RUN_DEPENDS= devel/desktop-file-utils \
> - multimedia/libmp4v2
> + multimedia/libmp4v2 \
> + x11/gtk+2,-guic
>  
>  LIB_DEPENDS= audio/libid3tag \
>   audio/libgpod \
> Index: audio/gtkpod/pkg/PLIST
> ===
> RCS file: /cvs/ports/audio/gtkpod/pkg/PLIST,v
> retrieving revision 1.11
> diff -u -p -r1.11 PLIST
> --- audio/gtkpod/pkg/PLIST15 Nov 2011 15:43:52 -  1.11
> +++ audio/gtkpod/pkg/PLIST18 Aug 2013 16:50:15 -
> @@ -132,3 +132,5 @@ share/locale/sv/LC_MESSAGES/gtkpod.mo
>  share/locale/zh_CN/LC_MESSAGES/gtkpod.mo
>  @exec %D/bin/update-desktop-database
>  @unexec-delete %D/bin/update-desktop-database
> +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> +@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> Index: comms/chirp/Makefile
> ===
> RCS file: /cvs/ports/comms/chirp/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- comms/chirp/Makefile  14 Jun 2013 19:05:14 -  1.2
> +++ comms/chirp/Makefile  18 Aug 2013 16:54:38 -
> @@ -3,7 +3,7 @@
>  COMMENT= tool to programme a wide range of amateur radios
>  
>  MODPY_EGG_VERSION= 0.3.1
> -REVISION=0
> +REVISION=1
>  DISTNAME=chirp-${MODPY_EGG_VERSION}
>  
>  CATEGORIES

Fixes after portcheck run

2013-08-18 Thread Vadim Zhukov

Here is the first bunch of fixes for handling of FreeDesktop goo.
Okay?
--
  WBR,
Vadim Zhukov


Index: audio/deadbeef/Makefile
===
RCS file: /cvs/ports/audio/deadbeef/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- audio/deadbeef/Makefile 31 May 2013 15:34:40 -  1.7
+++ audio/deadbeef/Makefile 18 Aug 2013 16:41:57 -
@@ -4,7 +4,7 @@ SHARED_ONLY =   Yes
 
 COMMENT =  DeaDBeeF is an audio player
 DISTNAME = deadbeef-0.5.6
-REVISION = 2
+REVISION = 3
 CATEGORIES =   audio
 
 HOMEPAGE = http://deadbeef.sourceforge.net/
Index: audio/deadbeef/pkg/PLIST
===
RCS file: /cvs/ports/audio/deadbeef/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- audio/deadbeef/pkg/PLIST5 Feb 2013 09:19:31 -   1.4
+++ audio/deadbeef/pkg/PLIST18 Aug 2013 16:41:57 -
@@ -123,5 +123,5 @@ share/locale/zh_CN/LC_MESSAGES/deadbeef.
 share/locale/zh_TW/LC_MESSAGES/deadbeef.mo
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> 
/dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> 
/dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Index: audio/exaile/Makefile
===
RCS file: /cvs/ports/audio/exaile/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- audio/exaile/Makefile   3 Apr 2013 06:49:47 -   1.27
+++ audio/exaile/Makefile   18 Aug 2013 16:46:01 -
@@ -5,7 +5,7 @@ COMMENT =   music manager and player for G
 V =3.3
 P =1
 DISTNAME = exaile-${V}.${P}
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   audio x11
 
Index: audio/exaile/pkg/PLIST
===
RCS file: /cvs/ports/audio/exaile/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- audio/exaile/pkg/PLIST  3 Apr 2013 06:49:47 -   1.11
+++ audio/exaile/pkg/PLIST  18 Aug 2013 16:46:01 -
@@ -1116,8 +1116,6 @@ share/exaile/data/ui/widgets/volume_cont
 share/exaile/xdg/
 share/exaile/xdg/exaile/
 share/exaile/xdg/exaile/settings.ini
-@exec %D/bin/update-desktop-database
-@unexec-delete %D/bin/update-desktop-database
 share/locale/ar/LC_MESSAGES/exaile.mo
 share/locale/ast/LC_MESSAGES/exaile.mo
 share/locale/be/LC_MESSAGES/exaile.mo
Index: audio/gtkpod/Makefile
===
RCS file: /cvs/ports/audio/gtkpod/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- audio/gtkpod/Makefile   10 Mar 2013 22:55:02 -  1.45
+++ audio/gtkpod/Makefile   18 Aug 2013 16:50:15 -
@@ -2,7 +2,7 @@
 
 COMMENT=   GTK+2 program to synchronize an Apple iPod
 DISTNAME=  gtkpod-1.0.0
-REVISION = 1
+REVISION = 2
 CATEGORIES=audio x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
 
@@ -24,7 +24,8 @@ USE_GMAKE=Yes
 
 #libmp4v2 is dlopen()'ed at runtime
 RUN_DEPENDS=   devel/desktop-file-utils \
-   multimedia/libmp4v2
+   multimedia/libmp4v2 \
+   x11/gtk+2,-guic
 
 LIB_DEPENDS=   audio/libid3tag \
audio/libgpod \
Index: audio/gtkpod/pkg/PLIST
===
RCS file: /cvs/ports/audio/gtkpod/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- audio/gtkpod/pkg/PLIST  15 Nov 2011 15:43:52 -  1.11
+++ audio/gtkpod/pkg/PLIST  18 Aug 2013 16:50:15 -
@@ -132,3 +132,5 @@ share/locale/sv/LC_MESSAGES/gtkpod.mo
 share/locale/zh_CN/LC_MESSAGES/gtkpod.mo
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Index: comms/chirp/Makefile
===
RCS file: /cvs/ports/comms/chirp/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- comms/chirp/Makefile14 Jun 2013 19:05:14 -  1.2
+++ comms/chirp/Makefile18 Aug 2013 16:54:38 -
@@ -3,7 +3,7 @@
 COMMENT=   tool to programme a wide range of amateur radios
 
 MODPY_EGG_VERSION= 0.3.1
-REVISION=  0
+REVISION=  1
 DISTNAME=  chirp-${MODPY_EGG_VERSION}
 
 CATEGORIES=comms hamradio
@@ -18,9 +18,9 @@ MASTER_SITES= http://chirp.danplanet.com
 MODULES=   lang/python
 COMMON_DEPS=   devel/py-serial \
textproc/libxml,-python
-BUILD_DEPENDS= ${COMMON_DEPS} \
+BUILD_DEPENDS= ${COMMON_DEPS}
+RUN_DEPENDS=   ${COM

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

2013-08-18 Thread Theo de Raadt

> I think most of this is pointless and misleading.  The timeout value
> that is passed around is NOT a time_t.  It's a time offset in the
> range 0 .. 3600*1000 milliseconds.  Putting it into a time_t is an
> abuse of that type.

However, typecasting a time_t to an int is almost always an error.

Unless justified.

Re: lang/ghc and time_t

2013-08-18 Thread Matthias Kilian

On Fri, Aug 16, 2013 at 11:41:34AM +0200, David Coppa wrote:
> > Otherwise, ghc assumes time_t is long.
> > 
> > [1] Adapted from the larger diff at 
> > https://raw.github.com/iquiw/ghc-NetBSD-patches/master/ghc-7.6.2-NetBSD.patch
> 
> New diff that adds the configure.ac bits, just because I'm unsure
> if they'd be needed or not...

Not during a normal build, I guess. But it may be used when building
a new bootstrapper. So it's ok to include it.

> Index: patches/patch-libraries_time_Data_Time_Clock_CTimeval_hs
> ===
> RCS file: patches/patch-libraries_time_Data_Time_Clock_CTimeval_hs
> diff -N patches/patch-libraries_time_Data_Time_Clock_CTimeval_hs
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-libraries_time_Data_Time_Clock_CTimeval_hs  16 Aug 2013 
> 09:32:34 -
> @@ -0,0 +1,52 @@
> +$OpenBSD$
> +--- libraries/time/Data/Time/Clock/CTimeval.hs.orig  Mon Oct 31 01:39:22 2011
>  libraries/time/Data/Time/Clock/CTimeval.hs   Fri Aug 16 09:53:12 2013
> +@@ -7,18 +7,42 @@ module Data.Time.Clock.CTimeval where
> + import Foreign
> + import Foreign.C
> + 
> +-data CTimeval = MkCTimeval CLong CLong
> ++#include "HsTimeConfig.h"
> + 
> ++--
> ++-- we assume time_t and suseconds_t are either long long, long or int.
> ++--
> ++#ifndef SIZEOF_TIME_T
> ++#error "SIZEOF_TIME_T is not defined!"
> ++#endif
> ++#if SIZEOF_TIME_T == SIZEOF_LONG_LONG
> ++type TimeT = CLLong
> ++#elif SIZEOF_TIME_T == SIZEOF_LONG
> ++type TimeT = CLong
> ++#elif SIZEOF_TIME_T == SIZEOF_INT
> ++type TimeT = CInt
> ++#endif
> ++
> ++#if SIZEOF_SUSECONDS_T == SIZEOF_LONG_LONG
> ++type SusecondsT = CLLong
> ++#elif SIZEOF_SUSECONDS_T == SIZEOF_LONG
> ++type SusecondsT = CLong
> ++#elif SIZEOF_SUSECONDS_T == SIZEOF_INT
> ++type SusecondsT = CInt
> ++#endif
> ++
> ++data CTimeval = MkCTimeval TimeT SusecondsT
> ++
> + instance Storable CTimeval where
> +-sizeOf _ = (sizeOf (undefined :: CLong)) * 2
> ++sizeOf _ = sizeOf (undefined :: TimeT) + sizeOf (undefined :: 
> SusecondsT)
> + alignment _ = alignment (undefined :: CLong)

Is that the correct alignment?

I'd prefer to run some tests on amd64 and i386 before this goes in
(unless someone beats me doing tests).

Ciao,
Kili

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

2013-08-18 Thread Christian Weisgerber

patrick keshishian  wrote:

> unsquandering ... (hopefully)

I think most of this is pointless and misleading.  The timeout value
that is passed around is NOT a time_t.  It's a time offset in the
range 0 .. 3600*1000 milliseconds.  Putting it into a time_t is an
abuse of that type.

> +--- lib/Timer.hh.origFri Mar 18 01:07:09 2005
>  lib/Timer.hh Sat Aug 17 22:43:03 2013
> +@@ -37,16 +37,12 @@ struct timeval;
> + namespace bt {
> + 
> +   // use a wrapper class to avoid the header as well
> +-  struct timeval {
> +-long tv_sec;
> +-long tv_usec;
> ++  struct timeval : public ::timeval {

Now THIS is a good catch.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

New tool: portcheck

2013-08-18 Thread Vadim Zhukov

Hello all.

So here is an attempt on separate portcheck(1) utility. It intended to
be run anytime you want: when creating a port, when updating it or to
run validate the whole tree. Manual page is at the end of this letter,
and actual code begins right after my signature. It currently handles
the following problems:

  * extra REVISION marks
  * non-0.0 SHARED_LIBS
  * VCS leftovers and other extra files in port directories
  * executable bits on files in port directories
  * missing -guic and other FreeDesktop goo
  * distfiles that need a DIST_SUBDIR or {url} syntax
  * unreliable MASTER_SITES (blacklist, suggestions are welcome)

Also it could uncover some more problems that ports infrastructure will
report itself. Just run "cd /usr/ports && portcheck -A" and see...

The portcheck (tries to) correctly handles nested hierarchies of ports,
module-only port directories (like www/mozilla), placing of distinfo
and PLIST files upper in hierarchy and so on.

It also tries to probe different FLAVORs, altough the logic there could
be improved. But even in current design, it discovered, for example,
missing licensing info for "compface" FLAVOR in mail/claws-mail.

I'll prepare and send patches for some of the detected errors a bit
later. Hope you'll enjoy this tool. After positive feedback on previous
attempts for portimport(1), I'm looking for okays to import portcheck(1)
under ports/infrastructure/bin/.

--
  WBR,
Vadim Zhukov


#!/bin/ksh
#
# $OpenBSD$
# Copyright (c) 2013 Vadim Zhukov
# 
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
# 
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

set -e
set +X

usage() {
echo "usage: ${0##*/} [-ACdPU] [-p portsdir] [-x glob]" >&2
exit 1
}



# Parsing command line options
#

existing_port=false
ignore_cvs=false
plist_checks=true
portsdir=
rootrun=false
unset ignore_list
debugging=false

while getopts "ACdPp:Ux:" OPT; do
case $OPT in
A)
$rootrun || set -A ignore_list -- "${ignore_list[@]}" \
.cvsignore \
INDEX \
README \
bulk \
distfiles \
infrastructure \
logs \
lost+found \
mystuff \
openbsd-wip \
p5-ports-wip \
packages \
plist \
pobj \
update
rootrun=true
existing_port=true
ignore_cvs=true
;;

C)
ignore_cvs=true
;;

d)
debugging=true
;;

P)
plist_checks=false
;;

p)
if [[ ${PWD##"$OPTARG"} == "$PWD" ]]; then
cat >&2 < 0)) && usage



# Detect path to root of directory tree of current port(-s) and put it
# in $portsdir, unless it was set by user above. As a last resort, we
# use some heuristics based on the commonly used names.
#
# We also have a $pkgpath variable, that represents subdirectory under
# root ports directory where the port(-s) will be imported. In case we
# use heuristics for determining $portsdir, we'll set up $pkgpath, too,
# since we would get this info anyway.
#
# In make_args we write PORTSDIR_PATH override, that allows us to run
# even in ports directory that is not on the PORTSDIR_PATH. This is
# useful, for example, when you check your port on cvs.openbsd.org,
# where you cannot just override mk.conf.
#

pkgpath=

if [[ -z $portsdir ]]; then
# heuristics mode ON
pkgpath=${PWD##*/ports/*(mystuff/|openbsd-wip/|p5-ports-wip/)}
portsdir=${PWD%"/$pkgpath"}
fi

if [[ -z $portsdir ]]; then
cat >&2 <&2
error=true
}

err_duplicated() {
err "both $2 and some of its parents has $1"
}

err_core_found() {
err "file or directory \"$1\" found, CVS will ignore it"
}

err_coredump_found() {
err "core dump file found: $1"
}

is_vcs_item() {
[[ -d "$1" && ${1##*/} == @(CVS|.fslckout|.git|.hg|.svn) ]]
}

ignoring() {
local iglob

Update www/tt-rss 1.9

2013-08-18 Thread Atanas Vladimirov

Update Tiny Tiny RSS to 1.9 (Jul 21, 2013)
I removed '@sample tt-rss/config.php' from PLIST, because you don't need
it when you install (update) for the first time (from older version).
Is that right? Any comments?  

Index: Makefile
===
RCS file: /home/vlado/cvsync/cvsroot/ports/www/tt-rss/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile12 Aug 2013 04:11:22 -  1.18
+++ Makefile18 Aug 2013 11:54:44 -
@@ -2,7 +2,7 @@
 
 COMMENT=   webbased rss reader with standalone look and feel
 
-V= 1.7.9
+V= 1.9
 DISTNAME=  Tiny-Tiny-RSS-$V
 REVISION=  0
 PKGNAME=   tt-rss-$V
Index: distinfo
===
RCS file: /home/vlado/cvsync/cvsroot/ports/www/tt-rss/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo4 Jun 2013 19:59:37 -   1.6
+++ distinfo18 Aug 2013 09:23:50 -
@@ -1,2 +1,2 @@
-SHA256 (Tiny-Tiny-RSS-1.7.9.tar.gz) = 
ly8PihAz8HYJOtb/ZICgwyFmvd7sIXxRdtoZr9Ah4/8=
-SIZE (Tiny-Tiny-RSS-1.7.9.tar.gz) = 2321780
+SHA256 (Tiny-Tiny-RSS-1.9.tar.gz) = 
8ushQbCVELmWu4jxKdGEpFXW8fx/4fMkGBF2CmMj9FU=
+SIZE (Tiny-Tiny-RSS-1.9.tar.gz) = 2410978
Index: patches/patch-config_php-dist
===
RCS file: 
/home/vlado/cvsync/cvsroot/ports/www/tt-rss/patches/patch-config_php-dist,v
retrieving revision 1.2
diff -u -p -r1.2 patch-config_php-dist
--- patches/patch-config_php-dist   4 Jun 2013 19:59:38 -   1.2
+++ patches/patch-config_php-dist   18 Aug 2013 10:46:01 -
@@ -1,12 +1,12 @@
-$OpenBSD: patch-config_php-dist,v 1.2 2013/06/04 19:59:38 landry Exp $
 config.php-dist.orig   Mon May 13 11:34:26 2013
-+++ config.php-distTue Jun  4 21:02:03 2013
+$OpenBSD: patch-config_php-dist,v 1.3 2013/08/18  $
+--- config.php-dist.orig   Sun Jul 21 09:28:48 2013
 config.php-distSun Aug 18 12:27:44 2013
 @@ -49,7 +49,7 @@
// *** Files and directories ***
// *
  
 -  define('PHP_EXECUTABLE', '/usr/bin/php');
 +  define('PHP_EXECUTABLE', '${MODPHP_BIN}');
-   // Path to PHP executable, used for various command-line tt-rss programs
- 
-   define('LOCK_DIRECTORY', 'lock');
+   // Path to PHP *COMMAND LINE* executable, used for various command-line 
tt-rss 
+   // programs and update daemon. Do not try to use CGI binary here, it 
won't work. 
+   // If you see HTTP headers being displayed while running tt-rss 
scripts, 
Index: pkg/DESCR
===
RCS file: /home/vlado/cvsync/cvsroot/ports/www/tt-rss/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR   1 Apr 2009 18:22:49 -   1.1.1.1
+++ pkg/DESCR   18 Aug 2013 09:37:38 -
@@ -12,4 +12,5 @@ real desktop application as possible.
   - Supports keyboard shortcuts
   - Supports interface translations (work in progress)
   - Supports feed enclosures (podcasts)
-  - Supports article scoring 
+  - Supports article scoring
+  - Official Android client
Index: pkg/PLIST
===
RCS file: /home/vlado/cvsync/cvsroot/ports/www/tt-rss/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   4 Jun 2013 19:59:38 -   1.6
+++ pkg/PLIST   18 Aug 2013 11:42:14 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2013/06/04 19:59:38 landry Exp $
+@comment $OpenBSD$
 tt-rss/
 tt-rss/LICENSE
 tt-rss/README.md
@@ -22,7 +22,6 @@ tt-rss/cache/simplepie/.empty
 tt-rss/cache/upload/
 tt-rss/cache/upload/.empty
 @owner
-tt-rss/cdm.css
 tt-rss/classes/
 tt-rss/classes/.htaccess
 tt-rss/classes/api.php
@@ -73,7 +72,12 @@ tt-rss/classes/pref/users.php
 tt-rss/classes/rpc.php
 tt-rss/classes/ttrssmailer.php
 tt-rss/config.php-dist
-@sample tt-rss/config.php
+tt-rss/css/
+tt-rss/css/cdm.css
+tt-rss/css/layout.css
+tt-rss/css/prefs.css
+tt-rss/css/tt-rss.css
+tt-rss/css/utility.css
 tt-rss/errors.php
 @owner www
 tt-rss/feed-icons/
@@ -83,35 +87,41 @@ tt-rss/feed-icons/index.html
 tt-rss/image.php
 tt-rss/images/
 tt-rss/images/alert.png
-tt-rss/images/alert.svg
 tt-rss/images/archive.png
 tt-rss/images/blank_icon.gif
-tt-rss/images/close_notify.svg
 tt-rss/images/collapse.png
+tt-rss/images/cross.png
+tt-rss/images/error.png
 tt-rss/images/favicon-72px.png
 tt-rss/images/favicon.png
-tt-rss/images/footer.png
+tt-rss/images/feed.png
+tt-rss/images/filter.png
+tt-rss/images/folder.png
 tt-rss/images/fresh.png
 tt-rss/images/indicator_tiny.gif
 tt-rss/images/indicator_white.gif
+tt-rss/images/information.png
 tt-rss/images/label.png
 tt-rss/images/logo_small.png
 tt-rss/images/logo_wide.png
-tt-rss/images/mark_set.svg
-tt-rss/images/mark_unset.svg
+tt-rss/images/mark_set.png
+tt-rss/images/mark_uns

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

2013-08-18 Thread patrick keshishian

Swaping accounts for sending diff in-line and not have
gmail fuck it up.

On Sat, Aug 17, 2013 at 20:03:32 -0600, Theo de Raadt wrote:
> > > > So basically, this takes a long long value, and casts it to a long.
> > > 
> > > Yes, but that's not the entire story.
> > > 
> > > the function declaration is: long nextTimeout(int resolution)
> > > 
> > > So it would truncate anyway. But look at it closer. It
> > > takes the value of timeval.tv_sec (your time_t / long long)
> > > and mod's it with resolution (an int value). The only thing
> > > it then does is multiply it by 1000L.
> > > 
> > > The only reason this function "broke" is C++'s std::max()
> > > defined as a template function, requiring both args be of
> > > the same typename. Since the original code uses 1000L
> > > literal for the first arg, the compiler was having issues with
> > > the long long as the second arg., but ...
> > > 
> > > What is long long % int? another int value? Yes, I realize
> > > it would be a long long according to the compiler, but,
> > > I fail to see where/how 0x % 0xFF would
> > > ever be greater than 0xfe.
> > > 
> > > As is, the best you can expect from that function is a long
> > > second argument for std::max(). Unless I'm completely missing
> > > something here (and I'll certainly budget for that possibility).
> > 
> > You're completely missing the point.
> > 
> > We provide an opportunity to the entire community to fix things
> > in the best way possible.
> > 
> > And you squander it.
> > 
> > The solution is to take all the subsystems and arguments to time_t,
> > throughout the entire program, and then do the best from there.
> > 
> > Instead, you chose to prematurely downcast.
> 
> Now, before you say this is impossible or ridiculous, let me say this.
> 
> We did what I suggest to the entire base tree, before the kernel
> changes were commited.  If we can do this to the entire base tree
> system -- something much much larger than the average package, then
> people working in the ports tree can at least try to not squander
> the opportunity.
> 
> Please & thanks.


unsquandering ... (hopefully)

The reason for the extra REVISION bump is for ajacoutot@'s
patch-src_Toolbar_cc addition (it missed the bump?).

Minimally tested.


Index: Makefile
===
RCS file: /cvs/obsd/ports/x11/blackbox/Makefile,v
retrieving revision 1.51
diff -u -p -u -p -r1.51 Makefile
--- Makefile21 Mar 2013 08:48:55 -  1.51
+++ Makefile18 Aug 2013 07:14:22 -
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.50 2013/03/11 11:46:08 espie Exp $
+# $OpenBSD: Makefile,v 1.51 2013/03/21 08:48:55 ajacoutot Exp $
 
 COMMENT=   small & pretty window manager for 8 and more bits displays
 
 DISTNAME=  blackbox-0.70.1
-REVISION=  2
+REVISION=  4
 CATEGORIES=x11
 
 HOMEPAGE=  http://blackboxwm.sourceforge.net/
Index: patches/patch-lib_Resource_cc
===
RCS file: patches/patch-lib_Resource_cc
diff -N patches/patch-lib_Resource_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-lib_Resource_cc   18 Aug 2013 07:14:22 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+64bit time_t fix.
+
+--- lib/Resource.cc.orig   Wed Apr  6 14:16:50 2005
 lib/Resource.ccSat Aug 17 22:26:11 2013
+@@ -207,6 +207,13 @@ void bt::Resource::write(const char* resource, unsigne
+ }
+ 
+ 
++void bt::Resource::write(const char* resource, unsigned long long value) {
++  char tmp[64];
++  sprintf(tmp, "%llu", value);
++  write(resource, tmp);
++}
++
++
+ void bt::Resource::write(const char* resource, bool value)
+ { write(resource, boolAsString(value)); }
+ 
Index: patches/patch-lib_Resource_hh
===
RCS file: patches/patch-lib_Resource_hh
diff -N patches/patch-lib_Resource_hh
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-lib_Resource_hh   18 Aug 2013 07:14:22 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+64bit time_t fix.
+
+--- lib/Resource.hh.orig   Mon Jan  3 01:42:52 2005
 lib/Resource.hhSat Aug 17 22:25:59 2013
+@@ -78,6 +78,7 @@ namespace bt {
+ void write(const char* resource, unsigned int value);
+ void write(const char* resource, long value);
+ void write(const char* resource, unsigned long value);
++void write(const char* resource, unsigned long long value);
+ void write(const char* resource, bool value);
+ void write(const char* resource, double value);
+ 
Index: patches/patch-lib_Timer_cc
===
RCS file: patches/patch-lib_Timer_cc
diff -N patches/patch-lib_Timer_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-lib_Timer_cc  18 Aug 2013 07:14:22 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+64bit time_t fix.
+
+--- lib/Timer.cc.orig  Fri Mar 18 01:07:09 2005
 lib/Timer.cc   S

UPDATE: QEMU 1.6.0

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

Re: UPDATE: www/rawdog 2.15 => 2.17

Re: UPDATE: textproc/py-feedparser 5.0.1 => 5.1.3

Re: A request.

Fixes after portcheck run, part 2

Re: pstree(1) dumps core on macppc/current

Re: UPDATE: net/snort 2.9.5.3

Re: xmlcatalog(1) dumps core on macppc/current

Re: Fixes after portcheck run

Re: pstree(1) dumps core on macppc/current

xmlcatalog(1) dumps core on macppc/current

Re: pstree(1) dumps core on macppc/current

Re: Fixes after portcheck run

Fixes after portcheck run

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

Re: lang/ghc and time_t

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

New tool: portcheck

Update www/tt-rss 1.9

Re: x11/blackbox: "time_t" fix (too late i see .. but please read)

23 matches

Site Navigation

Mail list logo

Footer information