CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/10/16 01:23:11 Modified files: www/epiphany : Makefile distinfo www/epiphany/pkg: PLIST Log message: update to epiphany-3.14.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/10/16 02:21:38 Modified files: x11/gnome/mutter/patches: patch-configure_ac Added files: x11/gnome/mutter/patches: patch-src_backends_meta-cursor_c patch-src_core_display_c Log message: - cvs decided patch-src_backends_meta-cursor_c wasn't needed; i beg to differ. - while here apply a fix from upstream to fix a logic issue in changing grab behaviour no bump since it didn't build, spotted by aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/10/16 03:27:14 Modified files: security/libgpg-error: Makefile distinfo security/libgpg-error/pkg: PLIST Log message: Update to libgpg-error-1.17.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/10/16 05:55:42 Modified files: databases/puppetdb: Makefile distinfo databases/puppetdb/pkg: PLIST-main PLIST-plugin Log message: update to puppetdb-2.2.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/10/16 05:55:07 Modified files: x11/gnome/online-accounts: Makefile distinfo x11/gnome/online-accounts/pkg: PLIST Log message: update to gnome-online-accounts-3.14.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ni...@cvs.openbsd.org 2014/10/16 06:54:21 Modified files: net/p5-IO-Socket-Socks: Makefile distinfo net/p5-IO-Socket-Socks/pkg: PLIST Log message: Update version Ok benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2014/10/16 07:02:59 Modified files: net/hs-network-info: Makefile distinfo Log message: Update to network-info-0.2.0.5 From maintainer David Schaefer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ni...@cvs.openbsd.org 2014/10/16 07:04:08 Modified files: net/tcpreplay/pkg: PLIST Added files: net/tcpreplay/patches: patch-src_common_sendpacket_h Log message: Retry CVS failed stuff in attic
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2014/10/16 07:07:27 Modified files: devel/hs-uuid : Makefile distinfo databases/hs-postgresql-simple: Makefile Log message: Update to hs-uuid-1.3.4 From maintainer David Schaefer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/10/16 07:33:31 Modified files: sysutils/salt : Makefile distinfo Log message: Update to salt-2014.1.13.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ni...@cvs.openbsd.org 2014/10/16 07:41:26 Added files: net/tcpreplay/patches: patch-configure Log message: Restoring patch-configure from attic
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ni...@cvs.openbsd.org 2014/10/16 07:43:48 Modified files: net/tcpreplay/patches: patch-configure Log message: Retry version update Ok benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/10/16 09:16:36 Modified files: x11/lumina : Makefile distinfo x11/lumina/pkg : PLIST Log message: Update to lumina-0.7.0.1413399783.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/16 09:23:42 Modified files: net/monitoring-plugins: Makefile distinfo net/monitoring-plugins/patches: patch-configure_ac Log message: update to monitoring-plugins-2.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/16 09:24:07 Modified files: net/bird : Makefile distinfo Log message: update to bird-1.4.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/16 09:48:58 Modified files: misc/nyancat : Makefile distinfo misc/nyancat/patches: patch-src_nyancat_c Log message: update to nyancat-1.4.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: chr...@cvs.openbsd.org 2014/10/16 10:07:51 Modified files: net: Makefile net/unison : Makefile Makefile.inc net/unison/snapshot: Makefile distinfo net/unison/snapshot/pkg: DESCR PLIST net/unison/stable: Makefile distinfo net/unison/stable/patches: patch-ubase_util_ml net/unison/stable/pkg: DESCR PLIST Log message: * remove snapshot port, move net/unison/stable to net/unison * patch to retain backtrace on uncaught exceptions * add readme warning about incompadibilities between different OCaml versions.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: chr...@cvs.openbsd.org 2014/10/16 10:17:07 Added files: net/unison : distinfo Removed files: net/unison/snapshot: Makefile distinfo net/unison/snapshot/pkg: DESCR PLIST net/unison/stable: Makefile distinfo net/unison/stable/patches: patch-ubase_util_ml net/unison/stable/pkg: DESCR PLIST Log message: missing changes in last commit. Also note the changes were given OKs by ok sthen@, giovanni@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2014/10/16 11:18:42 Modified files: graphics/png : Makefile distinfo graphics/png/pkg: PLIST Log message: Update to png 1.6.13. ok naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2014/10/16 11:30:28 Modified files: mail/postfix/stable: Makefile distinfo Log message: Update to Postfix 2.11.2. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/10/16 11:53:25 Modified files: textproc/libxml: Makefile textproc/libxml/patches: patch-parser_c Log message: security fix for CVE-2014-3660, more billion laugh entity expansion fixes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/10/16 11:53:42 Modified files: textproc/libxml: Tag: OPENBSD_5_6 Makefile textproc/libxml/patches: Tag: OPENBSD_5_6 patch-parser_c Log message: security fix for CVE-2014-3660, more billion laugh entity expansion fixes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/10/16 11:53:56 Modified files: textproc/libxml: Tag: OPENBSD_5_5 Makefile textproc/libxml/patches: Tag: OPENBSD_5_5 patch-parser_c Log message: security fix for CVE-2014-3660, more billion laugh entity expansion fixes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2014/10/16 12:01:57 Modified files: mail/dovecot : Makefile distinfo mail/dovecot/patches: patch-doc_example-config_Makefile_in patch-doc_example-config_conf_d_10-mail_conf patch-doc_example-config_conf_d_Makefile_in mail/dovecot/pkg: PLIST-server Removed files: mail/dovecot/patches: patch-src_lib-ssl-iostream_iostream-openssl-context_c patch-src_lib-ssl-iostream_iostream-openssl_c patch-src_login-common_client-common_c patch-src_login-common_ssl-proxy-openssl_c patch-src_login-common_ssl-proxy_h Log message: Update to Dovecot 2.2.14. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2014/10/16 12:02:48 Modified files: mail/dovecot-antispam: Makefile Log message: Update after update to Dovecot 2.2.14. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2014/10/16 12:03:42 Modified files: mail/dovecot-pigeonhole: Makefile distinfo mail/dovecot-pigeonhole/pkg: PLIST Log message: Update to Dovecot-pigeonhole 0.4.3 which is required for Dovecot 2.2.14. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2014/10/16 12:41:41 Modified files: mail/postfix/snapshot: Makefile distinfo Log message: Update to Postfix 2.12-20141015. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2014/10/16 13:49:02 Modified files: audio/mpg123 : Makefile distinfo Log message: maintenance update to 1.21.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/10/16 16:53:56 Modified files: audio/xmms : Makefile Added files: audio/xmms/patches: patch-Input_mikmod_drv_xmms_c Log message: Fix following some libmikmod update; driver interface changed and now has an additional function pointer in the middle of a struct. Reported by naddy via bcallah.
Re: NEW: games/gnome-hearts
Brian Callahan said: Found this sitting in my tree, meant to submit this months ago... This is gnome-hearts, a free implementation of the Hearts card game. Some notes: The documentation requires some program called scrollkeeper, but that program hasn't seen a release in over 10 years. So I opted not to build the docs. OTOH, it's the card game Hearts, I don't think it really needs detailed documentation. portcheck complains that the python scripts don't have compiled forms. Is this something we need to care about? Port fails tests. Also, this implementation performs poorly in comparison to TkHears, where I can't at least win with 5 points without being minimally careful. -- Dmitrij D. Czarkoff
Re: [wip] Firefox 33.0rc2 31.2.0rc3, Seamonkey 2.30rc1 Thunderbird 31.0rc2
On Tue, Oct 14, 2014 at 05:55:41PM +0200, Landry Breuil wrote: Hi, i had quite some issues working on those lately (usual build boxes are crashed with dead disks since a month), so no time to actually test betas. I now need to build gecko 33 against systemwide icu to workaround https://bugzilla.mozilla.org/show_bug.cgi?id=1064665, but at least that shrinks the libraries/packages by some megs. While here, build seamonkey against gstreamer1 instead of 0.10. As usual, grab the port from here: http://cgit.rhaalovely.net/mozilla-firefox/?h=release git clone -b release http://git.rhaalovely.net/git/mozilla-firefox http://cgit.rhaalovely.net/mozilla-thunderbird/?h=release git clone -b release http://git.rhaalovely.net/git/mozilla-thunderbird http://cgit.rhaalovely.net/seamonkey/?h=release git clone -b release http://git.rhaalovely.net/git/seamonkey If you already have a clone, update its url to use git.rhaalovely.net instead of rhaalovely.net. Packages for the lazy ones.. might install on your system, or not. Works for me so far. http://rhaalovely.net/stuff/amd64/firefox-33.0.tgz http://rhaalovely.net/stuff/amd64/firefox-31.2.0.tgz http://rhaalovely.net/stuff/amd64/seamonkey-2.30.tgz http://rhaalovely.net/stuff/amd64/lightning-seamonkey-3.5v0.tgz http://rhaalovely.net/stuff/amd64/thunderbird-31.2.0.tgz http://rhaalovely.net/stuff/amd64/lightning-3.3.2v0.tgz Landry
Re: NEW: games/gnome-hearts
On 2014/10/09 17:20, Brian Callahan wrote: The documentation requires some program called scrollkeeper, textproc/rarian
unison: warn about OCaml version incompatibilities
Hi,
I keep being asked why unison fails to work since the upgrade to OCaml
4.02. Therefore I'd like to add this piece of information to the
install message.
The patch is just for my convenience when debugging. Is it ok to commit
this patch, too?
Unison comes in stable and snapshot versions. The snapshot version is
outdated and broken. Can it be removed? Should it be updated?
Christopher
Index: Makefile
===
RCS file: /cvs/ports/net/unison/stable/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile19 Sep 2014 12:56:23 - 1.23
+++ Makefile16 Oct 2014 11:35:18 -
@@ -3,7 +3,7 @@
COMMENT= multi-platform file synchronization tool
V= 2.40.102
-REVISION = 4
+REVISION = 5
MASTER_SITES= ${HOMEPAGE}download/releases/stable/
Index: patches/patch-uicommon_ml
===
RCS file: patches/patch-uicommon_ml
diff -N patches/patch-uicommon_ml
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-uicommon_ml 16 Oct 2014 11:35:18 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Don't discard backtraces for uncaught exceptions.
+
+--- uicommon.ml.orig Tue Sep 23 11:23:39 2014
uicommon.mlTue Sep 23 11:37:20 2014
+@@ -309,7 +309,8 @@ let reconItem2string oldPath theRI status =
+ let (r1, action, r2, path) = reconItem2stringList oldPath theRI in
+ Format.sprintf %s %s %s %s %s r1 (action2niceString action) r2 status path
+
+-let exn2string = function
++let exn2string exn =
++ let s = match exn with
+ Sys.Break - Terminated!
+ | Util.Fatal(s) - Printf.sprintf Fatal error: %s s
+ | Util.Transient(s) - Printf.sprintf Error: %s s
+@@ -323,6 +324,9 @@ let exn2string = function
+ | _ - )
+ | Invalid_argument s - Printf.sprintf Invalid argument: %s s
+ | other - Printf.sprintf Uncaught exception %s (Printexc.to_string other)
++ in
++ s ^
++ if Printexc.backtrace_status () then \n ^ Printexc.get_backtrace () else
+
+ (* precondition: uc = File (Updates(_, ..) on both sides *)
+ let showDiffs ri printer errprinter id =
Index: pkg/MESSAGE
===
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/MESSAGE 16 Oct 2014 11:35:18 -
@@ -0,0 +1,6 @@
+Unison uses native OCaml marshalling in its prococol. This
+means that unison might not work when the OCaml versions of
+two instances are out of sync.
+One way to work around this limitation of unison is to use
+the OPAM OCaml package and compiler manager to sync the
+OCaml versions on your machines.
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/unison/stable/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 20 Nov 2012 15:18:31 - 1.3
+++ pkg/PLIST 16 Oct 2014 11:35:18 -
@@ -1,7 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2012/11/20 15:18:31 giovanni Exp $
@bin bin/unison
-lib/ocaml/
-lib/ocaml/stublibs/
share/doc/unison/
share/doc/unison/BUGS.txt
share/doc/unison/NEWS
-- http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
signature.asc
Description: PGP signature
Re: NEW: games/gnome-hearts
On Thu, Oct 16, 2014 at 12:04:56PM +0100, Stuart Henderson wrote: On 2014/10/09 17:20, Brian Callahan wrote: The documentation requires some program called scrollkeeper, textproc/rarian Err seriously? I am in the process of trying to remove that old useless shit. Can we try not to import stuffs from the 80's please. -- Antoine
Re: NEW: games/gnome-hearts
On 10/16/14 07:53, Antoine Jacoutot wrote: On Thu, Oct 16, 2014 at 12:04:56PM +0100, Stuart Henderson wrote: On 2014/10/09 17:20, Brian Callahan wrote: The documentation requires some program called scrollkeeper, textproc/rarian Err seriously? I am in the process of trying to remove that old useless shit. Can we try not to import stuffs from the 80's please. As originally stated, I removed that stuff from the port. So importing gnome-hearts would in no way stop you from removing rarian.
Re: NEW: games/gnome-hearts
On Thu, Oct 16, 2014 at 08:19:47AM -0400, Brian Callahan wrote: On 10/16/14 07:53, Antoine Jacoutot wrote: On Thu, Oct 16, 2014 at 12:04:56PM +0100, Stuart Henderson wrote: On 2014/10/09 17:20, Brian Callahan wrote: The documentation requires some program called scrollkeeper, textproc/rarian Err seriously? I am in the process of trying to remove that old useless shit. Can we try not to import stuffs from the 80's please. As originally stated, I removed that stuff from the port. So importing gnome-hearts would in no way stop you from removing rarian. I did not read the thread, just the 'it requires' :-) Perfect then. -- Antoine
Re: unison: warn about OCaml version incompatibilities
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 10/16/14 13:38, Christopher Zimmermann wrote: Hi, I keep being asked why unison fails to work since the upgrade to OCaml 4.02. Therefore I'd like to add this piece of information to the install message. what about putting the MESSAGE in a README file ? The patch is just for my convenience when debugging. Is it ok to commit this patch, too? ok giovanni@ Unison comes in stable and snapshot versions. The snapshot version is outdated and broken. Can it be removed? Should it be updated? I am not using unison,-snapshot, it is unhooked since a lot, I think it can be removed. Cheers Giovanni -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQEcBAEBAgAGBQJUP7pqAAoJEI7Sc79XDlKKWs0H/ijO67vLmT/ScguY92EHqWB3 Qi0386frakxCylEBhN7hJJflYOQTYNlWVxa98tfUyFQZJrtguzxrG6NK36KYNQKS 5Y+93tzS9a+wSG9mwhgVNoKrYeHJNQniji7H84WpBMwdquvBQrHNQrShPP6Dwm7y tt9ZnAjCZJxB6SlJI/9Xk2AwRbtsOn01ElC04xHDeOIW+18bOLIajkSN+dHfwvAm mMRbUCXkn/CuzqFlsz0+PkJZ1WtCdwhgcLzky8OSYuf+0VNjDJUngoh7BBm8Yjad MPctiUqYOpaHt95aFEWO7s2mkwk/T9bVD/UxtRRryD07PnNrfOscL7/TBFM4cJ8= =cD0V -END PGP SIGNATURE-
Re: unison: warn about OCaml version incompatibilities
On Thu, Oct 16, 2014 at 2:30 PM, Giovanni Bechis giova...@paclan.it wrote: I am not using unison,-snapshot, it is unhooked since a lot, I think it can be removed. +1 Ciao! David -- If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will. -- Stewart Nelson
Re: unison: warn about OCaml version incompatibilities
On 2014/10/16 14:32, David Coppa wrote: On Thu, Oct 16, 2014 at 2:30 PM, Giovanni Bechis giova...@paclan.it wrote: I am not using unison,-snapshot, it is unhooked since a lot, I think it can be removed. +1 Probably makes sense to move net/unison/stable/* to net/unison/* as well (this will need @pkgpath net/unison/stable adding to plist).
Re: unison: warn about OCaml version incompatibilities
On 2014/10/16 13:38, Christopher Zimmermann wrote: Hi, I keep being asked why unison fails to work since the upgrade to OCaml 4.02. Therefore I'd like to add this piece of information to the install message. Ugh! In a previous version, they had this ... Update to 2.40.102 fixes an incompatibility between a server compiled with ocaml3 and a client compiled with ocaml4 Could something like this be done instead?
Re: unison: warn about OCaml version incompatibilities
On Thu, Oct 16, 2014 at 2:40 PM, Stuart Henderson st...@openbsd.org wrote: On 2014/10/16 14:32, David Coppa wrote: On Thu, Oct 16, 2014 at 2:30 PM, Giovanni Bechis giova...@paclan.it wrote: I am not using unison,-snapshot, it is unhooked since a lot, I think it can be removed. +1 Probably makes sense to move net/unison/stable/* to net/unison/* as well (this will need @pkgpath net/unison/stable adding to plist). Yes, like you did with mutt.
Re: unison: warn about OCaml version incompatibilities
On Thu, 16 Oct 2014 14:41:37 +0200 David Coppa dco...@gmail.com wrote:
On Thu, Oct 16, 2014 at 2:40 PM, Stuart Henderson st...@openbsd.org
wrote:
On 2014/10/16 14:32, David Coppa wrote:
On Thu, Oct 16, 2014 at 2:30 PM, Giovanni Bechis
giova...@paclan.it wrote:
I am not using unison,-snapshot, it is unhooked since a lot, I
think it can be removed.
+1
Probably makes sense to move net/unison/stable/* to net/unison/* as
well (this will need @pkgpath net/unison/stable adding to plist).
Yes, like you did with mutt.
Thanks for the hints! So is the following diff OK? Someone told me CVS
will clean up the empty directories on its own, doesn't it?
Christopher
Index: Makefile
===
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.865
diff -u -p -r1.865 Makefile
--- Makefile4 Oct 2014 18:50:55 - 1.865
+++ Makefile16 Oct 2014 13:06:27 -
@@ -609,6 +609,7 @@
SUBDIR += uhttpmock
SUBDIR += unifi
SUBDIR += unison
+ SUBDIR += unison,no_x11
SUBDIR += unworkable
SUBDIR += ushare
SUBDIR += uucp
Index: unison/Makefile
===
RCS file: /cvs/ports/net/unison/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- unison/Makefile 1 Feb 2010 17:00:14 - 1.7
+++ unison/Makefile 16 Oct 2014 13:06:27 -
@@ -1,9 +1,65 @@
-# $OpenBSD: Makefile,v 1.7 2010/02/01 17:00:14 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.24 2014/06/28 21:08:09 kili Exp $
-SUBDIR =
-# SUBDIR +=snapshot
-# SUBDIR +=snapshot,no_x11
-SUBDIR += stable
-SUBDIR += stable,no_x11
+COMMENT= multi-platform file synchronization tool
+CATEGORIES=net
-.include bsd.port.subdir.mk
+V= 2.40.102
+REVISION = 5
+DISTNAME= unison-${V}
+MASTER_SITES= ${HOMEPAGE}download/releases/stable/
+
+HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
+MAINTAINER=Giovanni Bechis giova...@openbsd.org
+
+# GPLv3
+PERMIT_PACKAGE_CDROM= Yes
+
+WANTLIB= c m util
+
+MODULES= lang/ocaml
+
+USE_GMAKE= Yes
+
+FLAVORS= no_x11
+FLAVOR?=
+
+FLAVOR_COMMA= ${FLAVOR_EXT:S/-/,/g}
+SUBST_VARS= FLAVOR_COMMA
+
+.if ${FLAVOR:Mno_x11}
+MAKE_FLAGS=UISTYLE=text
+.else
+MODULES += devel/gettext
+BUILD_DEPENDS+=x11/lablgtk2
+LIB_DEPENDS= x11/gtk+2
+MAKE_FLAGS=UISTYLE=gtk2
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender fontconfig freetype
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 gdk_pixbuf-2.0
+WANTLIB += gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo z
+WANTLIB += pthread
+.endif
+
+# CFLAGS _must_ be empty. This is an OCaml compiler.
+MAKE_FLAGS+= NATIVE=${MODOCAML_NATIVE:S/Yes/true/:S/No/false/} \
+ OCAMLOPT=ocamlopt.opt \
+ CFLAGS=
+
+TEST_TARGET= selftest
+PORTHOME= ${WRKDIR}
+
+# Avoid multiple all:: entries and use the real target entry.
+ALL_TARGET=unison
+
+DOCS= BUGS.txt NEWS README
+
+# Avoid the nightmare of their Makefile install target.
+# Do not use INSTALL_PROGRAM, as the bytecode version must not be stripped!
+do-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/unison ${PREFIX}/bin
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unison
+ @cd ${WRKSRC} ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/unison
+
+
+.include bsd.port.mk
Index: unison/Makefile.inc
===
RCS file: unison/Makefile.inc
diff -N unison/Makefile.inc
--- unison/Makefile.inc 28 Jun 2014 21:08:09 - 1.24
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,54 +0,0 @@
-# $OpenBSD: Makefile.inc,v 1.24 2014/06/28 21:08:09 kili Exp $
-
-DISTNAME= unison-$V
-CATEGORIES=net
-
-HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
-MAINTAINER=Giovanni Bechis giova...@openbsd.org
-
-# GPLv3
-PERMIT_PACKAGE_CDROM= Yes
-
-WANTLIB= c m util
-
-MODULES= lang/ocaml
-
-USE_GMAKE= Yes
-
-FLAVORS= no_x11
-FLAVOR?=
-
-.if ${FLAVOR:Mno_x11}
-MAKE_FLAGS=UISTYLE=text
-.else
-MODULES += devel/gettext
-BUILD_DEPENDS+=x11/lablgtk2
-LIB_DEPENDS= x11/gtk+2
-MAKE_FLAGS=UISTYLE=gtk2
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender expat fontconfig freetype pixman-1 pthread-stubs
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 gdk_pixbuf-2.0
-WANTLIB += gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo png xcb z
-WANTLIB += GL Xxf86vm drm gthread-2.0 pthread xcb-render xcb-shm
-.endif
-
-# CFLAGS _must_ be empty. This is an OCaml compiler.
-MAKE_FLAGS+= NATIVE=${MODOCAML_NATIVE:S/Yes/true/:S/No/false/} \
- OCAMLOPT=ocamlopt.opt \
- CFLAGS=
-
-TEST_TARGET= selftest
-PORTHOME= ${WRKDIR}
-
-# Avoid multiple
Re: unison: warn about OCaml version incompatibilities
On Thu, 16 Oct 2014 13:41:43 +0100 Stuart Henderson st...@openbsd.org wrote: On 2014/10/16 13:38, Christopher Zimmermann wrote: Hi, I keep being asked why unison fails to work since the upgrade to OCaml 4.02. Therefore I'd like to add this piece of information to the install message. Ugh! In a previous version, they had this ... Update to 2.40.102 fixes an incompatibility between a server compiled with ocaml3 and a client compiled with ocaml4 Could something like this be done instead? I guess this was about this svn commit: * Use hash function from OCaml 3.x for comparing archives, even when compiled with OCaml 4.x git-svn-id: https://webdav.seas.upenn.edu/svn/unison/trunk@514 4bce34ff-96ee-0310-b826-95abcfff6e26 This does not seem to be about marshalling, but is also a case of relying on OCaml stdlib functionality that is not meant to be included in portable protocols. Sorry to say, but I'm not motivated to fix this design bug of unison. (would take me about a days work). Christopher -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE signature.asc Description: PGP signature
Re: unison: warn about OCaml version incompatibilities
On 2014/10/16 15:15, Christopher Zimmermann wrote: On Thu, 16 Oct 2014 13:41:43 +0100 Stuart Henderson st...@openbsd.org wrote: On 2014/10/16 13:38, Christopher Zimmermann wrote: Hi, I keep being asked why unison fails to work since the upgrade to OCaml 4.02. Therefore I'd like to add this piece of information to the install message. Ugh! In a previous version, they had this ... Update to 2.40.102 fixes an incompatibility between a server compiled with ocaml3 and a client compiled with ocaml4 Could something like this be done instead? I guess this was about this svn commit: * Use hash function from OCaml 3.x for comparing archives, even when compiled with OCaml 4.x git-svn-id: https://webdav.seas.upenn.edu/svn/unison/trunk@514 4bce34ff-96ee-0310-b826-95abcfff6e26 This does not seem to be about marshalling, but is also a case of relying on OCaml stdlib functionality that is not meant to be included in portable protocols. Sorry to say, but I'm not motivated to fix this design bug of unison. (would take me about a days work). Christopher -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE Ah, OK.
Re: unison: warn about OCaml version incompatibilities
On 2014/10/16 15:08, Christopher Zimmermann wrote: Thanks for the hints! So is the following diff OK? yep. Someone told me CVS will clean up the empty directories on its own, doesn't it? It cleans them at checkout/update time as long as you use -p, there's no real way (short of messing with the repository) to remove them.
Re: unison: warn about OCaml version incompatibilities
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 10/16/14 15:08, Christopher Zimmermann wrote: Thanks for the hints! So is the following diff OK? ok giovanni@ Someone told me CVS will clean up the empty directories on its own, doesn't it? sthen@ has been exhaustive. Cheers Giovanni -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQEcBAEBAgAGBQJUP+Y3AAoJEI7Sc79XDlKKBwkH/0cvnzbOuiVBWaFhYEG/8pQ+ UdOwBR/ssU8x8TVbTTY4wBrfLXhQeLKKwd3+kzgjs0aVrTJ/87z4TK+6f7tzUl/C DX/OcWZMAjFGFTIBxr3Yt8ENGYEJaqdp6rGvVYvCC5QupllEtluWye8UGOk6XP0g +zcxGQfMhTAaPSuPfv83O+pNDDelX/jeLWKcHDlo0tzTc4ozyUahMRGX/dGhPgqQ EXjD7c4GLpXucxkJJoFHHZmBdRjQmMSpmj5z7N/a4EfzljruoInSkbshzzwFr/7Z oX6rJoLe0sdWBwIWvsGyuFIrunZDkLNpEltV8/EEgzW4QWDdXsvTkEJQk4SaxWg= =mjP3 -END PGP SIGNATURE-
Re: php-version for roundcubemail
On 2014/10/14 14:52, Lars wrote: Hi, I am doing a test install on a recent snapshot to find out if/how/how well roundcubemail runs on openbsd-httpd. I have the latest (available as package) php version installed: $ pkg_info | grep php php-5.5.16 server-side HTML-embedded scripting language php-curl-5.5.16 curl URL library extensions for php5 php-fpm-5.5.16 stand-alone FPM version of PHP php-mcrypt-5.5.16 mcrypt encryption/decryption extensions for php5 php-pdo_mysql-5.5.16p0 PDO mysql database access extensions for php5 php-pspell-5.5.16 pspell library extensions for php5 php-zip-5.5.16 zip functions for php5 Ports/packages are only geared up towards supporting a single version of PHP. However when I try to install roundcubemail the package it insists on using php-5.4.32: $ sudo pkg_add -vs roundcubemail Update candidates: quirks-2.23 - quirks-2.23 (ok) quirks-2.23 signed on 2014-10-10T11:41:36Z |No change in quirks-2.23Ambiguous: choose dependency for roundcubemail-1.0.3: a 0: php-5.4.32 1: php-5.4.32-ap2 Is there a specific reason for that? I would like to stick with a single version of php if possible. I couldn't find any information saying roundcubemail is not working with php 5.5. What am i missing? Roundcube should probably be OK with 5.5, and you can install both versions of PHP in parallel (except for php-fpm; but that won't be a forced dependency so you can just pick whichever version you want for that). Problem is with PHP extension modules outside of the main php release, as these are compiled for the default PHP version in port (5.4 at present). So e.g. you won't be able to use things like pecl-memcache, xcache, etc from packages with php-5.5 until the default version is flipped over. (If you want to try it yourself building things from ports you can change MODPHP_VERSION in php.port.mk and rebuild everything depending on it).
Re: UPDATE x2: audio/libmikmod 3.2.0 = 3.3.7 and audio/mikmod 3.2.2 = 3.2.6
On 2014-10-10, Brian Callahan bcal...@devio.us wrote: Attached is a single diff to update both audio/libmikmod and audio/mikmod to their latest versions. Runs well on amd64, testing elsewhere appreciated. Quick thoughts: * Does XMMS still build (work) with this? * Time to remove pval as maintainer of libmikmod? * While you're there, consider overhauling the DESCR files. -- Christian naddy Weisgerber na...@mips.inka.de
Re: php-version for roundcubemail
Hi Stuart, On 16.10.2014 18:24, Stuart Henderson wrote: Ports/packages are only geared up towards supporting a single version of PHP. Ok, that's what I figured out so far. Roundcube should probably be OK with 5.5, and you can install both versions of PHP in parallel (except for php-fpm; but that won't be a forced dependency so you can just pick whichever version you want for that). Problem is with PHP extension modules outside of the main php release, as these are compiled for the default PHP version in port (5.4 at present). So e.g. you won't be able to use things like pecl-memcache, xcache, etc from packages with php-5.5 until the default version is flipped over. (If you want to try it yourself building things from ports you can change MODPHP_VERSION in php.port.mk and rebuild everything depending on it). I already found MODPHP_VERSION and experimented with it but ran into some issues with other php-modules. That's when I decided to leave that to the smart guys here. I didn't finish the roundcube stuff yet but have another php-project running right now (miniflux.net). Thank you for the confirmation regards Lars
Re: MAINTAINER UPDATE: www/sope www/sogo to 2.2.9
Ping! running it on amd64 without having seen any regression since I sent that mail beginning of the month. On Saturday, October 4, 2014 13:34 CEST, Sebastian Reitenbach sebas...@l00-bugdead-prods.de wrote: Hi, attached updates to sope/sogo 2.2.9a, just containing a minor bugfix to the previsously sent versions, see below. OK? Sebastian On Tuesday, September 30, 2014 19:29 CEST, Sebastian Reitenbach sebas...@l00-bugdead-prods.de wrote: Hi, long overdue an update. The update to 2.2.6 was too short to make it into the release for 5.6. Meanwhile we're at 2.2.9. Attached patches update to that newer version, I have running since a few days without issues so far. With the change of 2.2.8 - 2.2.9, the documentation is not provided aspdf anymore. It would need Apache FOP java thingie to build the documentation. I think that is just too much, and those are documents not included anymore. as with the 2.2.6 update I sent in July, www/opengroupware needs a patch to since the changes in www/sope. This version does not yet include a SUBPACKAGE for activesync, but hopeto get it added with next release 2.2.10, which is supposed to be released in not too far future. OK? Sebastian
Re: MAINTAINER UPDATE: www/opengroupware
Ping! On Tuesday, September 30, 2014 19:30 CEST, Sebastian Reitenbach sebas...@l00-bugdead-prods.de wrote: Hi, opengroupware needs some compatibility patches from upstream to cope with newer versions of www/sope. While touching it, a few minor bug fixes and enhancements included. OK? Sebastian
Re: UPDATE x2: audio/libmikmod 3.2.0 = 3.3.7 and audio/mikmod 3.2.2 = 3.2.6
On 10/16/14 12:33, Christian Weisgerber wrote: On 2014-10-10, Brian Callahan bcal...@devio.us wrote: Attached is a single diff to update both audio/libmikmod and audio/mikmod to their latest versions. Runs well on amd64, testing elsewhere appreciated. Quick thoughts: * Does XMMS still build (work) with this? It does now with the xmms commit sthen@ just made. That commit also fixes MOD support with the libmikmod that is currently in-tree (previously, xmms would segfault when loading a MOD file). * Time to remove pval as maintainer of libmikmod? Sure; I can take libmikmod, seeing as mikmod is already mine. * While you're there, consider overhauling the DESCR files. Have something in mind? the DESCR files reflect the documentation as it is currently written. ~Brian
virt-manager GtkVnc Error
I am trying to use virt-manager on a snapshot both OS and ports from 10th of August (should be very close to November 1st release). predrag@oko$ uname -a OpenBSD oko.bagdala2.net 5.6 GENERIC.MP#333 amd64 virt-manager compiles and runs fine. I can see the status of all KVM hosts on the remote location (btw I am using openconnect to connect to that location and it works like a charm). However trying to open vnc for a particular machine gives error Error launching details: cannot import name GtkVnc Traceback (most recent call last): File /usr/local/share/virt-manager/virtManager/engine.py, line 803, in _show_vm_helper details = self._get_details_dialog(uri, uuid) File /usr/local/share/virt-manager/virtManager/engine.py, line 760, in _get_details_dialog obj = vmmDetails(con.get_vm(uuid)) File /usr/local/share/virt-manager/virtManager/details.py, line 488, in __init__ from virtManager.console import vmmConsolePages File /usr/local/share/virt-manager/virtManager/console.py, line 27, in module from gi.repository import GtkVnc Since this is a new port has anybody managed Vnc to work. Most Kind Regards, Predrag Punosevac P.S. I also notice that memory, disk, and network can't be displayed. CPU usage both guest and host works fine.
