Re: tweak for faq15.html
On Wed, May 01, 2013 at 06:27:13PM -0400, Nick Holland wrote: >So, if you want to hit this thing before I do...that's where I'd >recommend starting. OK, here's a first try. I just skipped the example about overwriting existing config files, as rsync doesn't provide a default rsyncd.conf. I think the text is clear enough with the example, otherwise another package should be used in this example. Index: faq15.html === RCS file: /cvs/www/faq/faq15.html,v retrieving revision 1.91 diff -u -r1.91 faq15.html --- faq15.html 1 May 2013 13:16:32 - 1.91 +++ faq15.html 2 May 2013 20:46:16 - @@ -316,19 +316,16 @@ with the package name, as in the following basic example. -$ sudo pkg_add -v screen-4.0.3p1 -parsing screen-4.0.3p1 -installed /etc/screenrc from /usr/local/share/examples/screen/screenrc | 71% -screen-4.0.3p1: complete +$ sudo pkg_add -v rsync-3.0.9p2 +rsync-3.0.9p2: ok In this example the -v flag was used to give a more verbose -output. -This option is not needed but it is helpful for debugging and was -used here to give a little more insight into what pkg_add(1) is actually +output. However, in this case there was no additional output. +This option is not needed but it is helpful for debugging and can be +used to give a little more insight into what pkg_add(1) is actually doing. -Notice the message mentioning /etc/screenrc. Specifying multiple -v flags will produce even more verbose output. @@ -342,14 +339,13 @@ you can try something like: -$ sudo pkg_add -i screen -Ambiguous: screen could be screen-4.0.3p3 screen-4.0.3p3-shm -Choose one package - 0:- 1: screen-4.0.3p3 - 2: screen-4.0.3p3-shm +$ sudo pkg_add -i rsync +Ambiguous: choose package for rsync + a 0: + 1: rsync-3.0.9p2 + 2: rsync-3.0.9p2-iconv Your choice: 1 -screen-4.0.3p3: complete +rsync-3.0.9p2: ok @@ -420,8 +416,8 @@ Let's consider installation via FTP in the next example: -$ sudo pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/5.3/packages/`machine -a`/screen-4.0.3p3.tgz -screen-4.0.3p1: complete +$ sudo pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/5.3/packages/`machine -a`/rsync-3.0.9p2.tgz +rsync-3.0.9p2: ok @@ -443,15 +439,6 @@ Instead, it will inform you about this as follows (only when using the -v flag, however!): - -$ sudo pkg_add -v screen-4.0.3p1 -parsing screen-4.0.3p1 -The existing file /etc/screenrc has NOT been changed** | 71% -It does NOT match the sample file /usr/local/share/examples/screen/screenrc -You may wish to update it manually -screen-4.0.3p1: complete - - Sometimes you may encounter an error like the one in the following example: @@ -522,7 +509,7 @@ mutt-1.4.2.2i tty-based e-mail client pcre-6.4p1 perl-compatible regular expression library png-1.2.14p0library for manipulating PNG images -screen-4.0.3p1 multi-screen window manager +rsync-3.0.9p2 mirroring/synchronization over low bandwidth links tcsh-6.14.00p1 extended C-shell with many useful features tiff-3.8.2p0tools and library routines for working with TIFF images tin-1.8.2p0 threaded NNTP and spool based UseNet newsreader @@ -579,16 +566,19 @@ above) and use http://www.openbsd.org/cgi-bin/man.cgi?query=pkg_delete&sektion=1&manpath=OpenBSD+5.3";>pkg_delete(1) to remove the package. -In the example below, the screen package is being removed. +In the example below, the rsync package is being removed. Notice that on some occasions there are instructions of extra items that need to be removed that pkg_delete(1) did not remove for you. As with the pkg_add(1) utility, you can use the -v flag to get more verbose output. -$ sudo pkg_delete screen -screen-4.0.3p1: complete -Clean shared items: complete +$ sudo pkg_delete rsync +rsync-3.0.9p2: ok +Read shared items: ok +--- -rsync-3.0.9p2 --- +You should also run /usr/sbin/userdel _rsync +You should also run /usr/sbin/groupdel _rsync @@ -596,7 +586,7 @@ and flavors with the package name, since pkg_delete(1) will usually be able to find the full name by itself. You need to specify the complete package name (in the example, that is -screen-4.0.3p1) only if ambiguity is possible due to multiple installed +rsync-3.0.9p2) only if ambiguity is possible due to multiple installed packages with the specified name. In that case pkg_delete(1) cannot know which package to delete. @@ -606,11 +596,13 @@ Instead it will inform you about this as follows: -$ sudo pkg_delete screen -screen-4.0.3p1: complete -Clean shared items: complete screen-4.0.3p1 --- -You should also remove /etc/screenrc (which was modified) +$ sudo pkg_delete rsync +rsync-3.0.9p2: ok +Read shared items: ok +--- -rsync-3.0.9p2 --- +You should also remove /etc/rsyncd.conf +You should also run /usr/sbin/userdel _rsync +You shoul
Re: tweak for faq15.html
On 2013/05/02 22:24, Maurice Janssen wrote: > On 05/02/13 00:27, Nick Holland wrote: > >On 05/01/13 17:23, Stuart Henderson wrote: > >>+CC ports > >> > >>On 2013/05/01 21:45, Maurice Janssen wrote on www@: > >>>The first chunk is obvious, I think. > >>>The second chunk is for consistency only. > >>I think this page needs further tweaking; > >This section needs a re-working. > > > >screen? I picked that app as a "lots of people might want it" type thing > >way back when it was the only game in town. > > > >We got tmux now. When fixing things up, let's find a better example. > >There's a reason we have tmux in base -- screen is past due for retirement. > > > >rsync leaps into mind, but maybe something with a few dependencies to > >give a better show... > > > >So, if you want to hit this thing before I do...that's where I'd > >recommend starting. > > > >Nick. > > I'll send a diff with rsync instead of screen. There are two > flavours of rsync, so the interactive example can still be used. > There is a separate example about dependencies (tin), so I suppose > it's not a problem that rsync doesn't have any. kobodeluxe is probably a better example for this, rsync gets updated comparatively often so it will go out-of-date very easily. It has dependencies too. > I'm not sure about the -v option though. Like Stuart said, "pkg_add > -v rsync" doesn't give more output that without -v, but perhaps that > could be explained in the text below. > > Maurice >
Re: tweak for faq15.html
On 05/02/13 00:27, Nick Holland wrote: On 05/01/13 17:23, Stuart Henderson wrote: +CC ports On 2013/05/01 21:45, Maurice Janssen wrote on www@: The first chunk is obvious, I think. The second chunk is for consistency only. I think this page needs further tweaking; This section needs a re-working. screen? I picked that app as a "lots of people might want it" type thing way back when it was the only game in town. We got tmux now. When fixing things up, let's find a better example. There's a reason we have tmux in base -- screen is past due for retirement. rsync leaps into mind, but maybe something with a few dependencies to give a better show... So, if you want to hit this thing before I do...that's where I'd recommend starting. Nick. I'll send a diff with rsync instead of screen. There are two flavours of rsync, so the interactive example can still be used. There is a separate example about dependencies (tin), so I suppose it's not a problem that rsync doesn't have any. I'm not sure about the -v option though. Like Stuart said, "pkg_add -v rsync" doesn't give more output that without -v, but perhaps that could be explained in the text below. Maurice
Re: UPDATE: emulators/sdlmame 0.148u3 => 0.148u4
On Wed, May 1, 2013 at 5:12 PM, Brian Callahan wrote: > Fully rerolled, the real sdlmess diff is identical to this one. > > ~Brian > > untested but diff reads ok. if it works for you ok by me. f.-
Re: Anyone working on Chef by a chance?
On Sat, Apr 27, 2013 at 08:40:27AM +0200, Antoine Jacoutot wrote: > On Fri, Apr 26, 2013 at 07:14:03PM +0100, Mikolaj Kucharski wrote: > > > > jasper@ is > > > -- > > best regards > > q# > > > > -- > Antoine Yep, I've got the basic server bits ready but I'm currently swamped with other stuff. I hope to finish the ports soon. -- Cheers, Jasper "Stay Hungry. Stay Foolish"
Re: UPDATE: Ejabberd-2.1.12
New diff with rcscript request by abieber@
Comments? Ok?
Cheers.-
On Thu, May 02, 2013 at 11:30:42AM -0300, Gonzalo L. R. wrote:
; Anyone?
;
; :)
;
; - Forwarded message from "Gonzalo L. R." -
;
; From: "Gonzalo L. R."
; To: ports@openbsd.org
; Cc: vic...@gmail.com
; Date: Mon, 22 Apr 2013 15:19:01 -0300
; Subject: UPDATE: Ejabberd-2.1.12
;
; Hi,
;
; Update for Ejabberd to 2.1.12:
;
; Mostly bugfixes
;
;
https://github.com/processone/ejabberd/blob/master/doc/release_notes_2.1.12.txt
;
; Comments? Ok?
;
; Thanks.-
;
; --
; Sending from my iFart...
;
; Index: Makefile
; ===
; RCS file: /cvs/ports/net/ejabberd/Makefile,v
; retrieving revision 1.30
; diff -u -p -r1.30 Makefile
; --- Makefile 11 Mar 2013 11:35:46 - 1.30
; +++ Makefile 22 Apr 2013 18:12:04 -
; @@ -2,7 +2,7 @@
;
; COMMENT= jabber server written in Erlang
;
; -V= 2.1.11
; +V= 2.1.12
; DISTNAME=ejabberd-$V
;
; CATEGORIES= net
; @@ -79,4 +79,3 @@ post-install:
; @find ${WRKINST} -type f -name '*.beforesubst' -exec rm {} \;
;
; .include
; -
; Index: distinfo
; ===
; RCS file: /cvs/ports/net/ejabberd/distinfo,v
; retrieving revision 1.12
; diff -u -p -r1.12 distinfo
; --- distinfo 26 Jun 2012 20:23:29 - 1.12
; +++ distinfo 22 Apr 2013 18:12:04 -
; @@ -1,5 +1,2 @@
; -MD5 (ejabberd-2.1.11.tgz) = pwsEDE52AvR3GMiv6HgNUA==
; -RMD160 (ejabberd-2.1.11.tgz) = 1xSqdE9xgbjJbyKHh+ShwyWUvj8=
; -SHA1 (ejabberd-2.1.11.tgz) = rixSHV6T+9W8gmBSxVJLUiLc+uY=
; -SHA256 (ejabberd-2.1.11.tgz) = kdXBDmT5+qYMNFxoMEdG9JPXH4JyMwKVXUDWYZ49h94=
; -SIZE (ejabberd-2.1.11.tgz) = 2014232
; +SHA256 (ejabberd-2.1.12.tgz) = OPCCU0Z3PADIWmazNYbHXy0ZHR6w7Yrgn6FzaNbd/Rk=
; +SIZE (ejabberd-2.1.12.tgz) = 1999224
; Index: patches/patch-src_ejabberdctl_template
; ===
; RCS file: /cvs/ports/net/ejabberd/patches/patch-src_ejabberdctl_template,v
; retrieving revision 1.5
; diff -u -p -r1.5 patch-src_ejabberdctl_template
; --- patches/patch-src_ejabberdctl_template23 Jan 2012 10:54:47 -
1.5
; +++ patches/patch-src_ejabberdctl_template22 Apr 2013 18:12:04 -
; @@ -1,6 +1,6 @@
; $OpenBSD: patch-src_ejabberdctl_template,v 1.5 2012/01/23 10:54:47 ajacoutot
Exp $
; src/ejabberdctl.template.origFri Dec 23 12:27:30 2011
; -+++ src/ejabberdctl.template Sun Jan 22 20:11:03 2012
; +--- src/ejabberdctl.template.origTue Feb 5 09:22:34 2013
; src/ejabberdctl.template Mon Apr 22 12:03:23 2013
; @@ -1,7 +1,7 @@
; #!/bin/sh
;
; @@ -72,7 +72,7 @@ $OpenBSD: patch-src_ejabberdctl_template
;
; # Change to a directory readable by INSTALLUSER to
; # prevent "File operation error: eacces." messages
; -@@ -244,7 +244,7 @@ ctl ()
; +@@ -250,7 +250,7 @@ ctl ()
; # using flock if available. Expects a linux-style
; # flock that can lock a file descriptor.
; MAXCONNID=100
; Index: pkg/PLIST
; ===
; RCS file: /cvs/ports/net/ejabberd/pkg/PLIST,v
; retrieving revision 1.12
; diff -u -p -r1.12 PLIST
; --- pkg/PLIST 26 Jun 2012 20:23:29 - 1.12
; +++ pkg/PLIST 22 Apr 2013 18:12:04 -
; @@ -82,9 +82,7 @@ lib/ejabberd/ebin/jd2ejd.beam
; lib/ejabberd/ebin/jlib.beam
; lib/ejabberd/ebin/mod_adhoc.beam
; lib/ejabberd/ebin/mod_announce.beam
; -lib/ejabberd/ebin/mod_announce_odbc.beam
; lib/ejabberd/ebin/mod_blocking.beam
; -lib/ejabberd/ebin/mod_blocking_odbc.beam
; lib/ejabberd/ebin/mod_caps.beam
; lib/ejabberd/ebin/mod_configure.beam
; lib/ejabberd/ebin/mod_configure2.beam
; @@ -95,21 +93,15 @@ lib/ejabberd/ebin/mod_http_fileserver.be
; lib/ejabberd/ebin/mod_ip_blacklist.beam
; lib/ejabberd/ebin/mod_irc.beam
; lib/ejabberd/ebin/mod_irc_connection.beam
; -lib/ejabberd/ebin/mod_irc_odbc.beam
; lib/ejabberd/ebin/mod_last.beam
; -lib/ejabberd/ebin/mod_last_odbc.beam
; lib/ejabberd/ebin/mod_muc.beam
; lib/ejabberd/ebin/mod_muc_log.beam
; -lib/ejabberd/ebin/mod_muc_odbc.beam
; lib/ejabberd/ebin/mod_muc_room.beam
; lib/ejabberd/ebin/mod_offline.beam
; -lib/ejabberd/ebin/mod_offline_odbc.beam
; lib/ejabberd/ebin/mod_ping.beam
; lib/ejabberd/ebin/mod_pres_counter.beam
; lib/ejabberd/ebin/mod_privacy.beam
; -lib/ejabberd/ebin/mod_privacy_odbc.beam
; lib/ejabberd/ebin/mod_private.beam
; -lib/ejabberd/ebin/mod_private_odbc.beam
; lib/ejabberd/ebin/mod_proxy65.beam
; lib/ejabberd/ebin/mod_proxy65_lib.beam
; lib/ejabberd/ebin/mod_proxy65_service.beam
; @@ -120,19 +112,15 @@ lib/ejabberd/ebin/mod_pubsub_odbc.beam
; lib/ejabberd/ebin/mod_register.beam
; lib/ejabberd/ebin/mod_register_web.beam
; lib/ejabberd/ebin/mod_roster.beam
; -lib/ejabberd/ebin/mod_roster_odbc.beam
; lib/ejabberd/ebin/mod_service_log.beam
; lib/ejabberd/ebin/mod_shared_roster.bea
Re: UPDATE: samba-3.6.14
On 04/30/13 07:28, Ian McWilliam wrote: > Udpate for samba to 3.6.14. > > General bug fix release. > > http://www.samba.org/samba/history/samba-3.6.14.html > > Ian McWilliam > ok giovanni@ Cheers Giovanni
Re: problem with combination of cmake and clang module
On Thursday, May 2, 2013 13:23 CEST, Vadim Zhukov wrote: > 02.05.2013 15:17 пользователь "Sebastian Reitenbach" < > sebas...@l00-bugdead-prods.de> написал: > > > > > > On Wednesday, May 1, 2013 22:48 CEST, Vadim Zhukov > wrote: > > > > > Sorry, I have to run right now, so I could not dive in throughly ATM > > > (but I will be able to do this tomorrow). > > > > > > Could you please test the following patch instead? Policy CMP0017 > defaults > > > to OLD now, I suspect this could be related. > > > > Whatever this policy is doing, it helps, and makes the libobjc2 configure > > stage happy. > > > > > > Below complete patch to LLVM port with REVISION bump. > > > > OK? > > OK zhuk@. Please send this patch upstream then, too. Done, thanks, Sebastian
Re: make plist ignores @rcscript
On 2013/05/02 12:36, Craig Skinner wrote:
> On 01/05/2013 22:36, Craig Skinner wrote:
> >
> >When I remove the @rcscript stuff from the PLIST & run this:
> >
> >
> >make clean=all && \
> >make clean=fake && \
> >make fetch-all && \
> >make checksum && \
> >make build && \
> >make fake && \
> >make plist || { sudo make plist; sudo chmod g+w pkg/PLIST; }
> >
> >I get:
> >
> >...
> >Installing /usr/ports/mystuff/net/vgrd/pkg/vgrd.rc as
> >/usr/ports/pobj/vgrd-1.13/fake-i386/etc/rc.d/vgrd
> >===> Updating plist for vgrd-1.13
> >Subpackage -: Stripping dirs from sysutils/libsysexits
> >Scanning destdir
> >Getting old lists
> >1st pass identifying files
> >Attaching annotations
> >Sorting out destdir files
> >make-plist: Bogus element outside of every prefix: /etc/rc.d/vgrd
> >
> >
> >So 'make plist' fails when the rc script is present in the fake tree,
> >while not mentioned in the PLIST.
> >
> >
>
> Any thoughts on how to get around the bogus element problem?
>
> Is it essential that I run 'make plist' before 'make package', or can
> I use my handwritten PLIST?
Start with what "make plist" produces, and then edit it.
> I see there is a plist database under /usr/ports/plist & those have
> extra @depend, @name & @comment lines not present in generated
> pkg/PLISTs.
These are the lists as written in +CONTENTS files in the packages,
see the bsd.port.mk(5) manual about PLIST_DB.
Re: UPDATE: Ejabberd-2.1.12
Anyone?
:)
- Forwarded message from "Gonzalo L. R." -
From: "Gonzalo L. R."
To: ports@openbsd.org
Cc: vic...@gmail.com
Date: Mon, 22 Apr 2013 15:19:01 -0300
Subject: UPDATE: Ejabberd-2.1.12
Hi,
Update for Ejabberd to 2.1.12:
Mostly bugfixes
https://github.com/processone/ejabberd/blob/master/doc/release_notes_2.1.12.txt
Comments? Ok?
Thanks.-
--
Sending from my iFart...
Index: Makefile
===
RCS file: /cvs/ports/net/ejabberd/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile11 Mar 2013 11:35:46 - 1.30
+++ Makefile22 Apr 2013 18:12:04 -
@@ -2,7 +2,7 @@
COMMENT= jabber server written in Erlang
-V= 2.1.11
+V= 2.1.12
DISTNAME= ejabberd-$V
CATEGORIES=net
@@ -79,4 +79,3 @@ post-install:
@find ${WRKINST} -type f -name '*.beforesubst' -exec rm {} \;
.include
-
Index: distinfo
===
RCS file: /cvs/ports/net/ejabberd/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo26 Jun 2012 20:23:29 - 1.12
+++ distinfo22 Apr 2013 18:12:04 -
@@ -1,5 +1,2 @@
-MD5 (ejabberd-2.1.11.tgz) = pwsEDE52AvR3GMiv6HgNUA==
-RMD160 (ejabberd-2.1.11.tgz) = 1xSqdE9xgbjJbyKHh+ShwyWUvj8=
-SHA1 (ejabberd-2.1.11.tgz) = rixSHV6T+9W8gmBSxVJLUiLc+uY=
-SHA256 (ejabberd-2.1.11.tgz) = kdXBDmT5+qYMNFxoMEdG9JPXH4JyMwKVXUDWYZ49h94=
-SIZE (ejabberd-2.1.11.tgz) = 2014232
+SHA256 (ejabberd-2.1.12.tgz) = OPCCU0Z3PADIWmazNYbHXy0ZHR6w7Yrgn6FzaNbd/Rk=
+SIZE (ejabberd-2.1.12.tgz) = 1999224
Index: patches/patch-src_ejabberdctl_template
===
RCS file: /cvs/ports/net/ejabberd/patches/patch-src_ejabberdctl_template,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_ejabberdctl_template
--- patches/patch-src_ejabberdctl_template 23 Jan 2012 10:54:47 -
1.5
+++ patches/patch-src_ejabberdctl_template 22 Apr 2013 18:12:04 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_ejabberdctl_template,v 1.5 2012/01/23 10:54:47 ajacoutot
Exp $
src/ejabberdctl.template.orig Fri Dec 23 12:27:30 2011
-+++ src/ejabberdctl.template Sun Jan 22 20:11:03 2012
+--- src/ejabberdctl.template.orig Tue Feb 5 09:22:34 2013
src/ejabberdctl.template Mon Apr 22 12:03:23 2013
@@ -1,7 +1,7 @@
#!/bin/sh
@@ -72,7 +72,7 @@ $OpenBSD: patch-src_ejabberdctl_template
# Change to a directory readable by INSTALLUSER to
# prevent "File operation error: eacces." messages
-@@ -244,7 +244,7 @@ ctl ()
+@@ -250,7 +250,7 @@ ctl ()
# using flock if available. Expects a linux-style
# flock that can lock a file descriptor.
MAXCONNID=100
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/ejabberd/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 26 Jun 2012 20:23:29 - 1.12
+++ pkg/PLIST 22 Apr 2013 18:12:04 -
@@ -82,9 +82,7 @@ lib/ejabberd/ebin/jd2ejd.beam
lib/ejabberd/ebin/jlib.beam
lib/ejabberd/ebin/mod_adhoc.beam
lib/ejabberd/ebin/mod_announce.beam
-lib/ejabberd/ebin/mod_announce_odbc.beam
lib/ejabberd/ebin/mod_blocking.beam
-lib/ejabberd/ebin/mod_blocking_odbc.beam
lib/ejabberd/ebin/mod_caps.beam
lib/ejabberd/ebin/mod_configure.beam
lib/ejabberd/ebin/mod_configure2.beam
@@ -95,21 +93,15 @@ lib/ejabberd/ebin/mod_http_fileserver.be
lib/ejabberd/ebin/mod_ip_blacklist.beam
lib/ejabberd/ebin/mod_irc.beam
lib/ejabberd/ebin/mod_irc_connection.beam
-lib/ejabberd/ebin/mod_irc_odbc.beam
lib/ejabberd/ebin/mod_last.beam
-lib/ejabberd/ebin/mod_last_odbc.beam
lib/ejabberd/ebin/mod_muc.beam
lib/ejabberd/ebin/mod_muc_log.beam
-lib/ejabberd/ebin/mod_muc_odbc.beam
lib/ejabberd/ebin/mod_muc_room.beam
lib/ejabberd/ebin/mod_offline.beam
-lib/ejabberd/ebin/mod_offline_odbc.beam
lib/ejabberd/ebin/mod_ping.beam
lib/ejabberd/ebin/mod_pres_counter.beam
lib/ejabberd/ebin/mod_privacy.beam
-lib/ejabberd/ebin/mod_privacy_odbc.beam
lib/ejabberd/ebin/mod_private.beam
-lib/ejabberd/ebin/mod_private_odbc.beam
lib/ejabberd/ebin/mod_proxy65.beam
lib/ejabberd/ebin/mod_proxy65_lib.beam
lib/ejabberd/ebin/mod_proxy65_service.beam
@@ -120,19 +112,15 @@ lib/ejabberd/ebin/mod_pubsub_odbc.beam
lib/ejabberd/ebin/mod_register.beam
lib/ejabberd/ebin/mod_register_web.beam
lib/ejabberd/ebin/mod_roster.beam
-lib/ejabberd/ebin/mod_roster_odbc.beam
lib/ejabberd/ebin/mod_service_log.beam
lib/ejabberd/ebin/mod_shared_roster.beam
lib/ejabberd/ebin/mod_shared_roster_ldap.beam
-lib/ejabberd/ebin/mod_shared_roster_odbc.beam
lib/ejabberd/ebin/mod_sic.beam
lib/ejabberd/ebin/mod_stats.beam
lib/ejabberd/ebin/mod_time.beam
lib/ejabberd/ebin/mod_vcard.beam
lib/ejabberd/ebin/mod_vcard_ldap.beam
-lib/ejabberd/ebin/mod_vcard_odbc.beam
lib/ejabberd/ebin/mod_vcard_xupdate.beam
-lib/ejabberd/eb
Re: xombrero dumps core
On Mon, Apr 01, 2013 at 06:49:46PM +0200, Jan Stary wrote:
> On today's fresh install of current/amd64,
> the freshly installed xombrero crashes as follows:
> (see bottom).
>
> It seems to be caused by something in my ~/.xombrero
> - when I move it away, xombrero starts up just fine.
> My old ~/.xombrero.conf can stay, that's not causing it.
>
> On i386, a fresh current and pkg_add-ui'd xombrero runs fine
> with my old ~?.xombrero present.
>
> Does anybody have a clue what could be causing this?
Please try this patch and let me know if it helps.
Index: Makefile
===
RCS file: /cvs/ports/www/webkit/Makefile,v
retrieving revision 1.83
diff -u -r1.83 Makefile
--- Makefile23 Apr 2013 09:40:58 - 1.83
+++ Makefile2 May 2013 14:00:46 -
@@ -7,7 +7,7 @@
V =2.0.1
DISTNAME = webkitgtk-${V}
PKGNAME = webkit-${V}
-REVISION = 0
+REVISION = 1
EPOCH =0
CATEGORIES = www
DPB_PROPERTIES =parallel
Index: patches/patch-Source_WebKit_gtk_webkit_webkitwebplugin_cpp
===
RCS file: patches/patch-Source_WebKit_gtk_webkit_webkitwebplugin_cpp
diff -N patches/patch-Source_WebKit_gtk_webkit_webkitwebplugin_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Source_WebKit_gtk_webkit_webkitwebplugin_cpp 2 May 2013
14:00:46 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Properly zero-fill the private struct on initialization.
+
+--- Source/WebKit/gtk/webkit/webkitwebplugin.cpp.orig Thu May 2 15:57:59 2013
Source/WebKit/gtk/webkit/webkitwebplugin.cpp Thu May 2 15:56:55 2013
+@@ -122,6 +122,7 @@ static void webkit_web_plugin_init(WebKitWebPlugin *pl
+ {
+ plugin->priv = new WebKitWebPluginPrivate();
+ plugin->priv->mimeTypes = 0;
++plugin->priv->path = 0;
+ }
+
+ namespace WebKit {
Re: problem with combination of cmake and clang module
On Thu, May 2, 2013 at 1:16 PM, Sebastian Reitenbach
wrote:
>
> On Wednesday, May 1, 2013 22:48 CEST, Vadim Zhukov wrote:
>
>> Sorry, I have to run right now, so I could not dive in throughly ATM
>> (but I will be able to do this tomorrow).
>>
>> Could you please test the following patch instead? Policy CMP0017 defaults
>> to OLD now, I suspect this could be related.
>
> Whatever this policy is doing, it helps, and makes the libobjc2 configure
> stage happy.
>
>
> Below complete patch to LLVM port with REVISION bump.
>
> OK?
ok with me
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/llvm/Makefile,v
> retrieving revision 1.61
> diff -u -r1.61 Makefile
> --- Makefile30 Mar 2013 12:10:40 - 1.61
> +++ Makefile2 May 2013 11:15:14 -
> @@ -10,7 +10,7 @@
> LLVM_V = 3.2
> DISTNAME = llvm-${LLVM_V}.src
> PKGNAME = llvm-${LLVM_V}
> -REVISION = 2
> +REVISION = 3
> CATEGORIES = devel
> MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
>
> Index: patches/patch-cmake_modules_LLVMConfig_cmake_in
> ===
> RCS file: patches/patch-cmake_modules_LLVMConfig_cmake_in
> diff -N patches/patch-cmake_modules_LLVMConfig_cmake_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-cmake_modules_LLVMConfig_cmake_in 2 May 2013 11:15:14
> -
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +make it find include file in /usr/local/share/llvm/cmake
> +
> +--- cmake/modules/LLVMConfig.cmake.in.orig Sat Jul 7 05:12:28 2012
> cmake/modules/LLVMConfig.cmake.in Thu May 2 07:38:57 2013
> +@@ -36,6 +36,8 @@ set(LLVM_INCLUDE_DIRS ${LLVM_INSTALL_PREFIX}/include)
> + set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib)
> + set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS")
> +
> ++cmake_policy(SET CMP0017 NEW)
> ++
> + # We try to include using the current setting of CMAKE_MODULE_PATH,
> + # which suppossedly was filled by the user with the directory where
> + # this file was installed:
>
>
>
>>
>> --
>> WBR,
>> Vadim Zhukov
>>
>>
>> $OpenBSD$
>> --- cmake/modules/LLVMConfig.cmake.in.origThu May 2 00:44:02 2013
>> +++ cmake/modules/LLVMConfig.cmake.in Thu May 2 00:43:19 2013
>> @@ -36,6 +36,8 @@ set(LLVM_INCLUDE_DIRS ${LLVM_INSTALL_PREFIX}/include)
>> set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib)
>> set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS")
>>
>> +cmake_policy(SET CMP0017 NEW)
>> +
>> # We try to include using the current setting of CMAKE_MODULE_PATH,
>> # which suppossedly was filled by the user with the directory where
>> # this file was installed:
>
>
>
>
>
Re: [UPDATE] minitube-2.0
On Fri, Feb 8, 2013 at 7:32 AM, Paul Irofti wrote:
> On Tue, Feb 05, 2013 at 10:36:32AM +0100, David Coppa wrote:
>>
>> Hi!
>>
>> Here's an update to minitube-2.0.
>>
>> Lots of bugfixes and enhancements. Seems faster too...
>>
>> See: http://flavio.tordini.org/minitube-2-0
>
> I'll test as soon as my transition to a new harddrive finishes.
>
> It reads okay to me and I'm sure happy to see a lot of patches were
> ditched in the process.
Can I go ahead with this?
>> Ciao,
>> David
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/www/minitube/Makefile,v
>> retrieving revision 1.25
>> diff -u -p -r1.25 Makefile
>> --- Makefile 9 Dec 2012 07:29:57 - 1.25
>> +++ Makefile 5 Feb 2013 09:23:32 -
>> @@ -2,8 +2,7 @@
>>
>> COMMENT =standalone YouTube.com video browser/player
>>
>> -DISTNAME = minitube-1.9
>> -REVISION = 0
>> +DISTNAME = minitube-2.0
>> CATEGORIES = www multimedia
>>
>> HOMEPAGE = http://flavio.tordini.org/minitube
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/www/minitube/distinfo,v
>> retrieving revision 1.14
>> diff -u -p -r1.14 distinfo
>> --- distinfo 27 Sep 2012 20:35:49 - 1.14
>> +++ distinfo 5 Feb 2013 09:23:32 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (minitube-1.9.tar.gz) = i5Q3sQew2K7LyK9GJL4SYxFdRnnMhq489cLOs2rJFnU=
>> -SIZE (minitube-1.9.tar.gz) = 608884
>> +SHA256 (minitube-2.0.tar.gz) = G6HddyXm4MkmU/3ue8+kuDM0bS70wJHZSxgbYLtZJVQ=
>> +SIZE (minitube-2.0.tar.gz) = 713577
>> Index: patches/patch-src_MainWindow_cpp
>> ===
>> RCS file: patches/patch-src_MainWindow_cpp
>> diff -N patches/patch-src_MainWindow_cpp
>> --- patches/patch-src_MainWindow_cpp 27 Sep 2012 20:35:49 - 1.10
>> +++ /dev/null 1 Jan 1970 00:00:00 -
>> @@ -1,14 +0,0 @@
>> -$OpenBSD: patch-src_MainWindow_cpp,v 1.10 2012/09/27 20:35:49 dcoppa Exp $
>> src/MainWindow.cpp.orig Thu Sep 27 12:17:03 2012
>> -+++ src/MainWindow.cpp Thu Sep 27 15:34:50 2012
>> -@@ -828,7 +828,9 @@ void MainWindow::visitSite() {
>> - }
>> -
>> - void MainWindow::donate() {
>> --QUrl url(QString(Constants::WEBSITE) + "#donate");
>> -+QString duh = QString(Constants::WEBSITE);
>> -+duh.append("#donate");
>> -+QUrl url(duh);
>> - statusBar()->showMessage(QString(tr("Opening
>> %1").arg(url.toString(;
>> - QDesktopServices::openUrl(url);
>> - }
>> Index: patches/patch-src_iconloader_qticonloader_cpp
>> ===
>> RCS file: patches/patch-src_iconloader_qticonloader_cpp
>> diff -N patches/patch-src_iconloader_qticonloader_cpp
>> --- patches/patch-src_iconloader_qticonloader_cpp 2 Jan 2012 08:35:48
>> - 1.5
>> +++ /dev/null 1 Jan 1970 00:00:00 -
>> @@ -1,41 +0,0 @@
>> -$OpenBSD: patch-src_iconloader_qticonloader_cpp,v 1.5 2012/01/02 08:35:48
>> dcoppa Exp $
>> -
>> -Use the gnome icon theme unconditionally: fixes a problem with minitube
>> -GUI not having icons under fvwm/cwm/kde3/...
>> -
>> src/iconloader/qticonloader.cpp.orig Fri Oct 28 22:38:22 2011
>> -+++ src/iconloader/qticonloader.cpp Fri Dec 30 11:25:56 2011
>> -@@ -107,7 +107,6 @@ Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoader
>> - QIcon icon;
>> -
>> - #ifdef Q_WS_X11
>> --#if QT_VERSION < 0x040600
>> - QString pngExtension(QLatin1String(".png"));
>> - QList iconSizes;
>> - iconSizes << 16 << 22 << 24 << 32 << 48;
>> -@@ -115,9 +114,6 @@ Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoader
>> - icon.addPixmap(iconLoaderInstance()->findIcon(size, name));
>> - }
>> - #else
>> --icon = QIcon::fromTheme(name);
>> --#endif
>> --#else
>> - icon = Extra::getIcon(name);
>> - #endif
>> -
>> -@@ -178,10 +174,14 @@ void QtIconLoaderImplementation::lookupIconTheme() con
>> - #ifdef Q_WS_X11
>> - QString dataDirs = QFile::decodeName(getenv("XDG_DATA_DIRS"));
>> - if (dataDirs.isEmpty())
>> --dataDirs = QLatin1String("/usr/local/share/:/usr/share/");
>> -+dataDirs = QLatin1String("${LOCALBASE}/share/");
>> -
>> - dataDirs.prepend(QDir::homePath() + QLatin1String("/:"));
>> - iconDirs = dataDirs.split(QLatin1Char(':'));
>> -+
>> -+if (themeName.isEmpty())
>> -+themeName = QLatin1String("gnome");
>> -+return;
>> -
>> - // If we are running GNOME we resolve and use GConf. In all other
>> - // cases we currently use the KDE icon theme
>> Index: patches/patch-src_qtsingleapplication_qtlocalpeer_cpp
>> ===
>> RCS file: patches/patch-src_qtsingleapplication_qtlocalpeer_cpp
>> diff -N patches/patch-src_qtsingleapplication_qtlocalpeer_cpp
>> --- patches/patch-src_qtsingleapplication_qtlocalpeer_cpp 2 Jan 2012
>> 08:39:43 - 1.2
>> +++ /dev/null 1 Jan 1970 00:00:00 -
Re: problem with combination of cmake and clang module
02.05.2013 15:17 пользователь "Sebastian Reitenbach" <
sebas...@l00-bugdead-prods.de> написал:
>
>
> On Wednesday, May 1, 2013 22:48 CEST, Vadim Zhukov
wrote:
>
> > Sorry, I have to run right now, so I could not dive in throughly ATM
> > (but I will be able to do this tomorrow).
> >
> > Could you please test the following patch instead? Policy CMP0017
defaults
> > to OLD now, I suspect this could be related.
>
> Whatever this policy is doing, it helps, and makes the libobjc2 configure
> stage happy.
>
>
> Below complete patch to LLVM port with REVISION bump.
>
> OK?
OK zhuk@. Please send this patch upstream then, too.
> thanks,
> Sebastian
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/llvm/Makefile,v
> retrieving revision 1.61
> diff -u -r1.61 Makefile
> --- Makefile30 Mar 2013 12:10:40 - 1.61
> +++ Makefile2 May 2013 11:15:14 -
> @@ -10,7 +10,7 @@
> LLVM_V = 3.2
> DISTNAME = llvm-${LLVM_V}.src
> PKGNAME = llvm-${LLVM_V}
> -REVISION = 2
> +REVISION = 3
> CATEGORIES = devel
> MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
>
> Index: patches/patch-cmake_modules_LLVMConfig_cmake_in
> ===
> RCS file: patches/patch-cmake_modules_LLVMConfig_cmake_in
> diff -N patches/patch-cmake_modules_LLVMConfig_cmake_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-cmake_modules_LLVMConfig_cmake_in 2 May 2013
11:15:14 -
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +make it find include file in /usr/local/share/llvm/cmake
> +
> +--- cmake/modules/LLVMConfig.cmake.in.orig Sat Jul 7 05:12:28 2012
> cmake/modules/LLVMConfig.cmake.in Thu May 2 07:38:57 2013
> +@@ -36,6 +36,8 @@ set(LLVM_INCLUDE_DIRS ${LLVM_INSTALL_PREFIX}/include)
> + set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib)
> + set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS")
> +
> ++cmake_policy(SET CMP0017 NEW)
> ++
> + # We try to include using the current setting of CMAKE_MODULE_PATH,
> + # which suppossedly was filled by the user with the directory where
> + # this file was installed:
>
>
>
> >
> > --
> > WBR,
> > Vadim Zhukov
> >
> >
> > $OpenBSD$
> > --- cmake/modules/LLVMConfig.cmake.in.origThu May 2 00:44:02 2013
> > +++ cmake/modules/LLVMConfig.cmake.in Thu May 2 00:43:19 2013
> > @@ -36,6 +36,8 @@ set(LLVM_INCLUDE_DIRS ${LLVM_INSTALL_PREFIX}/include)
> > set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib)
> > set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS"
"-D__STDC_CONSTANT_MACROS")
> >
> > +cmake_policy(SET CMP0017 NEW)
> > +
> > # We try to include using the current setting of CMAKE_MODULE_PATH,
> > # which suppossedly was filled by the user with the directory where
> > # this file was installed:
>
>
>
>
>
Re: make plist ignores @rcscript
On 01/05/2013 22:36, Craig Skinner wrote:
When I remove the @rcscript stuff from the PLIST & run this:
make clean=all && \
make clean=fake && \
make fetch-all && \
make checksum && \
make build && \
make fake && \
make plist || { sudo make plist; sudo chmod g+w pkg/PLIST; }
I get:
...
Installing /usr/ports/mystuff/net/vgrd/pkg/vgrd.rc as
/usr/ports/pobj/vgrd-1.13/fake-i386/etc/rc.d/vgrd
===> Updating plist for vgrd-1.13
Subpackage -: Stripping dirs from sysutils/libsysexits
Scanning destdir
Getting old lists
1st pass identifying files
Attaching annotations
Sorting out destdir files
make-plist: Bogus element outside of every prefix: /etc/rc.d/vgrd
So 'make plist' fails when the rc script is present in the fake tree,
while not mentioned in the PLIST.
Any thoughts on how to get around the bogus element problem?
Is it essential that I run 'make plist' before 'make package', or can I
use my handwritten PLIST?
I see there is a plist database under /usr/ports/plist & those have
extra @depend, @name & @comment lines not present in generated pkg/PLISTs.
I've successfully built 29 other packages without rc scripts.
What direction should I proceed in?
Craig.
Re: problem with combination of cmake and clang module
On Wednesday, May 1, 2013 22:48 CEST, Vadim Zhukov wrote:
> Sorry, I have to run right now, so I could not dive in throughly ATM
> (but I will be able to do this tomorrow).
>
> Could you please test the following patch instead? Policy CMP0017 defaults
> to OLD now, I suspect this could be related.
Whatever this policy is doing, it helps, and makes the libobjc2 configure
stage happy.
Below complete patch to LLVM port with REVISION bump.
OK?
thanks,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile30 Mar 2013 12:10:40 - 1.61
+++ Makefile2 May 2013 11:15:14 -
@@ -10,7 +10,7 @@
LLVM_V = 3.2
DISTNAME = llvm-${LLVM_V}.src
PKGNAME = llvm-${LLVM_V}
-REVISION = 2
+REVISION = 3
CATEGORIES = devel
MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
Index: patches/patch-cmake_modules_LLVMConfig_cmake_in
===
RCS file: patches/patch-cmake_modules_LLVMConfig_cmake_in
diff -N patches/patch-cmake_modules_LLVMConfig_cmake_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmake_modules_LLVMConfig_cmake_in 2 May 2013 11:15:14
-
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+make it find include file in /usr/local/share/llvm/cmake
+
+--- cmake/modules/LLVMConfig.cmake.in.orig Sat Jul 7 05:12:28 2012
cmake/modules/LLVMConfig.cmake.in Thu May 2 07:38:57 2013
+@@ -36,6 +36,8 @@ set(LLVM_INCLUDE_DIRS ${LLVM_INSTALL_PREFIX}/include)
+ set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib)
+ set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS")
+
++cmake_policy(SET CMP0017 NEW)
++
+ # We try to include using the current setting of CMAKE_MODULE_PATH,
+ # which suppossedly was filled by the user with the directory where
+ # this file was installed:
>
> --
> WBR,
> Vadim Zhukov
>
>
> $OpenBSD$
> --- cmake/modules/LLVMConfig.cmake.in.origThu May 2 00:44:02 2013
> +++ cmake/modules/LLVMConfig.cmake.in Thu May 2 00:43:19 2013
> @@ -36,6 +36,8 @@ set(LLVM_INCLUDE_DIRS ${LLVM_INSTALL_PREFIX}/include)
> set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib)
> set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS")
>
> +cmake_policy(SET CMP0017 NEW)
> +
> # We try to include using the current setting of CMAKE_MODULE_PATH,
> # which suppossedly was filled by the user with the directory where
> # this file was installed:
Re: xombrero keeps resizing
Please report this upstream Jan Stary escribió: >xombrero-1.4.0p1v1 on a current i386. >Whenevr I open a new tab or start a command with ':', >the xombrero window resizes to what seems to be >the initial size (when xombrero started). > > Jan -- Enviado desde mi teléfono con K-9 Mail.
Re: UPDATE: git-1.8.2.2
On Thu, 02 May 2013, Jérémie Courrèges-Anglas wrote:
>
> It seems that some have problems with my inline diff (I couldn't
> reproduce them), so...:
>
> http://wxcvbn.org/~jca/tmp/git-1.8.2.2-update-jca.diff
Thanks.
Here's the updated diff, including fixes by Jeremie.
Ok to commit it?
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.93
diff -u -p -u -p -r1.93 Makefile
--- Makefile13 Mar 2013 11:58:14 - 1.93
+++ Makefile2 May 2013 09:23:56 -
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V =1.8.1.3
+V =1.8.2.2
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
@@ -53,27 +53,43 @@ LIB_DEPENDS-x11 =
WANTLIB-x11 =
PKG_ARCH-x11 = *
-MAKE_FLAGS = prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
- sysconfdir=${SYSCONFDIR} mandir=man \
+MAKE_FLAGS = V=1 \
gitexecdir=libexec/git \
TCLTK_PATH=${MODTK_BIN} \
TCL_PATH=${MODTCL_BIN}
-MAKE_ENV = REGRESS_SHELL=${LOCALBASE}/bin/bash
+MAKE_ENV = TEST_TAR=${LOCALBASE}/bin/gtar
+
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --sysconfdir=${SYSCONFDIR} \
+ --mandir=${PREFIX}/man \
+ --with-curl=${LOCALBASE} \
+ --with-iconv=${LOCALBASE} \
+ --with-tcltk=${MODTK_BIN} \
+ --with-python=no
+CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ DIFF=diff TAR=tar
+
+.include
+.if ${PROPERTIES:Mno_shared}
+CONFIGURE_ENV += ac_cv_lib_curl_curl_global_init=yes
+MAKE_FLAGS += NEEDS_CRYPTO_WITH_SSL=YesPlease \
+ NEEDS_SSL_WITH_CURL=YesPlease \
+ NEEDS_LIBINTL_BEFORE_LIBICONV=YesPlease
+.endif
USE_GMAKE =Yes
USE_GROFF =Yes
-TEST_DEPENDS = archivers/zip \
+TEST_DEPENDS = archivers/gtar \
+ archivers/unzip \
+ archivers/zip \
devel/cvsps \
- devel/subversion,-perl \
- shells/bash
+ devel/subversion,-perl
GITWEB = README INSTALL git-favicon.png git-logo.png \
gitweb.cgi gitweb.css
-# Skip tests I have to fix.
-SKIP_TESTS = t9502-gitweb-standalone-parse-output.sh
-
post-extract:
@mkdir -p ${WRKSRC}/doc
@cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${DOC_DISTFILE}
@@ -96,8 +112,7 @@ post-install:
${INSTALL_DATA} ${WRKBUILD}/gitweb/README ${PREFIX}/share/gitweb
do-test:
- cd ${WRKSRC}/t && rm -f ${SKIP_TESTS}
cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \
- HOME=${WRKDIST}/t/trash test
+ HOME=${WRKDIST}/t test
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 distinfo
--- distinfo13 Mar 2013 11:58:14 - 1.65
+++ distinfo2 May 2013 09:23:56 -
@@ -1,4 +1,4 @@
-SHA256 (git-1.8.1.3.tar.gz) = N1Mkfb/YAqrxyyyRe46HO27RPACasPpffZCzx1kZX/E=
-SHA256 (git-manpages-1.8.1.3.tar.gz) =
mPYbps9knzx8tipAGUqYb3Vh9kj4GtPZ4OzaZG2QhTk=
-SIZE (git-1.8.1.3.tar.gz) = 4302035
-SIZE (git-manpages-1.8.1.3.tar.gz) = 528587
+SHA256 (git-1.8.2.2.tar.gz) = Ag3jjtowK7bhvkYPdJkhGUgZOzBr6rThpSD/xvcpR5Q=
+SHA256 (git-manpages-1.8.2.2.tar.gz) =
Io3rU4ZUFXKOvXq/GNiMc9PBZg3toNN5cF1G2xBjZus=
+SIZE (git-1.8.2.2.tar.gz) = 4404477
+SIZE (git-manpages-1.8.2.2.tar.gz) = 537739
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 patch-Makefile
--- patches/patch-Makefile 13 Mar 2013 11:58:16 - 1.37
+++ patches/patch-Makefile 2 May 2013 09:23:56 -
@@ -1,33 +1,7 @@
$OpenBSD: patch-Makefile,v 1.37 2013/03/13 11:58:16 benoit Exp $
Makefile.orig Fri Feb 8 01:00:07 2013
-+++ Makefile Wed Mar 13 10:35:45 2013
-@@ -1123,13 +1123,13 @@ ifeq ($(uname_S),FreeBSD)
- HAVE_PATHS_H = YesPlease
- endif
- ifeq ($(uname_S),OpenBSD)
-- NO_STRCASESTR = YesPlease
- NO_MEMMEM = YesPlease
- USE_ST_TIMESPEC = YesPlease
- NEEDS_LIBICONV = YesPlease
-- BASIC_CFLAGS += -I/usr/local/include
-- BASIC_LDFLAGS += -L/usr/local/lib
-+ BASIC_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
-+ BASIC_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
- HAVE_PATHS_H = YesPlease
-+ NO_P
Re: UPDATE: git-1.8.2.2
On 2013/05/02 09:42, Jérémie Courrèges-Anglas wrote:
>
> Hi,
>
> runs fine for me on i386 and macppc; lightly tested on vax, where it
> builds with this updated diff (handles no_shared in Makefile, re-adds
> the ranlib calls in patches/patch-Makefile).
I noticed there are some minor makewhatis problems, but it's the
same for the in-tree version so I don't think this is a blocker for
the update.
No subject found in
/tmp/manpage.jwJmJnNChk//usr/local/man/cat3p/Git::SVN::Editor.0
No subject found in
/tmp/manpage.jwJmJnNChk//usr/local/man/cat3p/Git::SVN::Fetcher.0
No subject found in
/tmp/manpage.jwJmJnNChk//usr/local/man/cat3p/Git::SVN::Prompt.0
No subject found in /tmp/manpage.jwJmJnNChk//usr/local/man/cat3p/Git::SVN::Ra.0
OK with me.
> --
> Jérémie Courrèges-Anglas
> PGP Key fingerprint: 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/git/Makefile,v
> retrieving revision 1.93
> diff -u -p -r1.93 Makefile
> --- Makefile 13 Mar 2013 11:58:14 - 1.93
> +++ Makefile 2 May 2013 07:33:08 -
> @@ -4,7 +4,7 @@ COMMENT-main =GIT - Tree History Storag
> COMMENT-svn =GIT - subversion interoperability tools
> COMMENT-x11 =GIT - graphical tools
>
> -V = 1.8.1.3
> +V = 1.8.2.2
> DISTNAME = git-${V}
> PKGNAME-main = ${DISTNAME}
> PKGNAME-svn =git-svn-${V}
> @@ -53,27 +53,43 @@ LIB_DEPENDS-x11 =
> WANTLIB-x11 =
> PKG_ARCH-x11 = *
>
> -MAKE_FLAGS = prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
> - sysconfdir=${SYSCONFDIR} mandir=man \
> +MAKE_FLAGS = V=1 \
> gitexecdir=libexec/git \
> TCLTK_PATH=${MODTK_BIN} \
> TCL_PATH=${MODTCL_BIN}
> -MAKE_ENV = REGRESS_SHELL=${LOCALBASE}/bin/bash
> +MAKE_ENV = TEST_TAR=${LOCALBASE}/bin/gtar
> +
> +CONFIGURE_STYLE =gnu
> +CONFIGURE_ARGS = --sysconfdir=${SYSCONFDIR} \
> + --mandir=${PREFIX}/man \
> + --with-curl=${LOCALBASE} \
> + --with-iconv=${LOCALBASE} \
> + --with-tcltk=${MODTK_BIN} \
> + --with-python=no
> +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
> + LDFLAGS="-L${LOCALBASE}/lib" \
> + DIFF=diff TAR=tar
> +
> +.include
> +.if ${PROPERTIES:Mno_shared}
> +CONFIGURE_ENV += ac_cv_lib_curl_curl_global_init=yes
> +MAKE_FLAGS +=NEEDS_CRYPTO_WITH_SSL=YesPlease \
> + NEEDS_SSL_WITH_CURL=YesPlease \
> + NEEDS_LIBINTL_BEFORE_LIBICONV=YesPlease
> +.endif
>
> USE_GMAKE = Yes
> USE_GROFF = Yes
>
> -TEST_DEPENDS = archivers/zip \
> +TEST_DEPENDS = archivers/gtar \
> + archivers/unzip \
> + archivers/zip \
> devel/cvsps \
> - devel/subversion,-perl \
> - shells/bash
> + devel/subversion,-perl
>
> GITWEB = README INSTALL git-favicon.png git-logo.png \
> gitweb.cgi gitweb.css
>
> -# Skip tests I have to fix.
> -SKIP_TESTS = t9502-gitweb-standalone-parse-output.sh
> -
> post-extract:
> @mkdir -p ${WRKSRC}/doc
> @cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${DOC_DISTFILE}
> @@ -96,8 +112,7 @@ post-install:
> ${INSTALL_DATA} ${WRKBUILD}/gitweb/README ${PREFIX}/share/gitweb
>
> do-test:
> - cd ${WRKSRC}/t && rm -f ${SKIP_TESTS}
> cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \
> - HOME=${WRKDIST}/t/trash test
> + HOME=${WRKDIST}/t test
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/git/distinfo,v
> retrieving revision 1.65
> diff -u -p -r1.65 distinfo
> --- distinfo 13 Mar 2013 11:58:14 - 1.65
> +++ distinfo 1 May 2013 16:24:06 -
> @@ -1,4 +1,4 @@
> -SHA256 (git-1.8.1.3.tar.gz) = N1Mkfb/YAqrxyyyRe46HO27RPACasPpffZCzx1kZX/E=
> -SHA256 (git-manpages-1.8.1.3.tar.gz) =
> mPYbps9knzx8tipAGUqYb3Vh9kj4GtPZ4OzaZG2QhTk=
> -SIZE (git-1.8.1.3.tar.gz) = 4302035
> -SIZE (git-manpages-1.8.1.3.tar.gz) = 528587
> +SHA256 (git-1.8.2.2.tar.gz) = Ag3jjtowK7bhvkYPdJkhGUgZOzBr6rThpSD/xvcpR5Q=
> +SHA256 (git-manpages-1.8.2.2.tar.gz) =
> Io3rU4ZUFXKOvXq/GNiMc9PBZg3toNN5cF1G2xBjZus=
> +SIZE (git-1.8.2.2.tar.gz) = 4404477
> +SIZE (git-manpages-1.8.2.2.tar.gz) = 537739
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 patch-Makefile
> --- patches/patch-Makefile13 Mar 2013 11:58:16 - 1.37
> +++ patches/patch-Makefile
Re: [NEW] devel/ninja
On Thu, May 2, 2013 at 11:12 AM, Matthew Dempsky wrote: > On Thu, May 2, 2013 at 12:40 AM, David Coppa wrote: >> Python is only needed for building ninja, so I've added MODPY_RUNDEP=No. > > No, it's needed at run time too for the "ninja -t browse" functionality too. Ah... Didn't spot this. Ok then. >> patch-bootstrap_py is not needed, 'cause ninja only wants libc, >> libm and libstdc++ that come all from base. > > Ok by me. For the regress tests, it wants to build/link against > gtest, but I didn't try to wire that up to the Makefile. > >> I've added a patch 'patch-src_util_cc' to get the number of cpus >> on OpenBSD too (just a couple of extra #ifdefs, the code is the >> same as for FreeBSD). > > I don't think that's necessary. We already support > sysconf(_SC_NPROCESSORS_ONLN), which is implemented by just grabbing > the hw.ncpu sysctl anyway. ok. So, ok dcoppa@ to import this. Thanks, David
Re: [NEW] devel/ninja
On Thu, May 2, 2013 at 2:21 AM, David Coppa wrote: > Ah... Didn't spot this. No problem. I almost didn't notice it either until I decided to run "grep python src/*.cc". :) > So, ok dcoppa@ to import this. Thanks, I'll import it tomorrow then. It's too late for me to risk a botched cvs import right now. :)
Re: [NEW] devel/ninja
On Thu, May 2, 2013 at 12:40 AM, David Coppa wrote: > Python is only needed for building ninja, so I've added MODPY_RUNDEP=No. No, it's needed at run time too for the "ninja -t browse" functionality too. > patch-bootstrap_py is not needed, 'cause ninja only wants libc, > libm and libstdc++ that come all from base. Ok by me. For the regress tests, it wants to build/link against gtest, but I didn't try to wire that up to the Makefile. > I've added a patch 'patch-src_util_cc' to get the number of cpus > on OpenBSD too (just a couple of extra #ifdefs, the code is the > same as for FreeBSD). I don't think that's necessary. We already support sysconf(_SC_NPROCESSORS_ONLN), which is implemented by just grabbing the hw.ncpu sysctl anyway.
Re: xombrero keeps resizing
Please report this to the upstream developers. On 2013 May 02 (Thu) at 10:55:24 +0200 (+0200), Jan Stary wrote: :xombrero-1.4.0p1v1 on a current i386. :Whenevr I open a new tab or start a command with ':', :the xombrero window resizes to what seems to be :the initial size (when xombrero started). : : Jan : -- Do not sleep in a eucalyptus tree tonight.
Re: [NEW] devel/ninja
On 2013/05/02 09:40, David Coppa wrote:
> On Wed, 01 May 2013, Matthew Dempsky wrote:
>
> > On Wed, May 01, 2013 at 03:24:25PM -0700, Matthew Dempsky wrote:
> > > Attached is a port of the Ninja build system:
> > > http://martine.github.io/ninja/
> >
> > D'oh, attached for real this time...
>
> Hi!
>
> Just some comments:
>
> Python is only needed for building ninja, so I've added MODPY_RUNDEP=No.
>
> I've fixed some paths to the python interpreter using MODPY_ADJ_FILES.
>
> patch-bootstrap_py is not needed, 'cause ninja only wants libc,
> libm and libstdc++ that come all from base.
>
> I've added a patch 'patch-src_util_cc' to get the number of cpus
> on OpenBSD too (just a couple of extra #ifdefs, the code is the
> same as for FreeBSD).
>
>
> Ciao,
> David
Sigh, another project who don't make proper releases and rely on
on-the-fly generated distfiles... v1.2.0.tar.gz is not suitable as a
filename - if upstream won't make proper releases then either
mirror it or use this hack:
V = 1.2.0
DISTNAME = ninja-$V
MASTER_SITES =
https://github.com/martine/ninja/archive/v$V.tar.gz?bleh=/
(will also need to regen distinfo).
Also it should honour CXX rather than hardcode g++:
MAKE_ENV = CXX="${CXX}"
I don't have a new enough system handy to finish testing right now
but if it works for you with these changes then OK with me.
Re: xombrero keeps resizing
On May 02 10:55:24, h...@stare.cz wrote: > xombrero-1.4.0p1v1 on a current i386. > Whenevr I open a new tab or start a command with ':', or switch to another tab. I don't know if these ar exombrero issues or webkit issues. > the xombrero window resizes to what seems to be > the initial size (when xombrero started). > > Jan >
xombrero keeps resizing
xombrero-1.4.0p1v1 on a current i386. Whenevr I open a new tab or start a command with ':', the xombrero window resizes to what seems to be the initial size (when xombrero started). Jan
Re: [NEW] devel/ninja
On Thu, May 2, 2013 at 9:40 AM, David Coppa wrote: > On Wed, 01 May 2013, Matthew Dempsky wrote: > >> On Wed, May 01, 2013 at 03:24:25PM -0700, Matthew Dempsky wrote: >> > Attached is a port of the Ninja build system: >> > http://martine.github.io/ninja/ >> >> D'oh, attached for real this time... > > Hi! > > Just some comments: > > Python is only needed for building ninja, so I've added MODPY_RUNDEP=No. > > I've fixed some paths to the python interpreter using MODPY_ADJ_FILES. > > patch-bootstrap_py is not needed, 'cause ninja only wants libc, > libm and libstdc++ that come all from base. > > I've added a patch 'patch-src_util_cc' to get the number of cpus > on OpenBSD too (just a couple of extra #ifdefs, the code is the > same as for FreeBSD). P.S.: I've just tested it with "cmake -G Ninja" and it works fine.
Re: UPDATE: git-1.8.2.2
It seems that some have problems with my inline diff (I couldn't reproduce them), so...: http://wxcvbn.org/~jca/tmp/git-1.8.2.2-update-jca.diff -- Jérémie Courrèges-Anglas PGP Key fingerprint: 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Re: UPDATE: git-1.8.2.2
Hi,
runs fine for me on i386 and macppc; lightly tested on vax, where it
builds with this updated diff (handles no_shared in Makefile, re-adds
the ranlib calls in patches/patch-Makefile).
--
Jérémie Courrèges-Anglas
PGP Key fingerprint: 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- Makefile13 Mar 2013 11:58:14 - 1.93
+++ Makefile2 May 2013 07:33:08 -
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V =1.8.1.3
+V =1.8.2.2
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
@@ -53,27 +53,43 @@ LIB_DEPENDS-x11 =
WANTLIB-x11 =
PKG_ARCH-x11 = *
-MAKE_FLAGS = prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
- sysconfdir=${SYSCONFDIR} mandir=man \
+MAKE_FLAGS = V=1 \
gitexecdir=libexec/git \
TCLTK_PATH=${MODTK_BIN} \
TCL_PATH=${MODTCL_BIN}
-MAKE_ENV = REGRESS_SHELL=${LOCALBASE}/bin/bash
+MAKE_ENV = TEST_TAR=${LOCALBASE}/bin/gtar
+
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --sysconfdir=${SYSCONFDIR} \
+ --mandir=${PREFIX}/man \
+ --with-curl=${LOCALBASE} \
+ --with-iconv=${LOCALBASE} \
+ --with-tcltk=${MODTK_BIN} \
+ --with-python=no
+CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ DIFF=diff TAR=tar
+
+.include
+.if ${PROPERTIES:Mno_shared}
+CONFIGURE_ENV += ac_cv_lib_curl_curl_global_init=yes
+MAKE_FLAGS += NEEDS_CRYPTO_WITH_SSL=YesPlease \
+ NEEDS_SSL_WITH_CURL=YesPlease \
+ NEEDS_LIBINTL_BEFORE_LIBICONV=YesPlease
+.endif
USE_GMAKE =Yes
USE_GROFF =Yes
-TEST_DEPENDS = archivers/zip \
+TEST_DEPENDS = archivers/gtar \
+ archivers/unzip \
+ archivers/zip \
devel/cvsps \
- devel/subversion,-perl \
- shells/bash
+ devel/subversion,-perl
GITWEB = README INSTALL git-favicon.png git-logo.png \
gitweb.cgi gitweb.css
-# Skip tests I have to fix.
-SKIP_TESTS = t9502-gitweb-standalone-parse-output.sh
-
post-extract:
@mkdir -p ${WRKSRC}/doc
@cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${DOC_DISTFILE}
@@ -96,8 +112,7 @@ post-install:
${INSTALL_DATA} ${WRKBUILD}/gitweb/README ${PREFIX}/share/gitweb
do-test:
- cd ${WRKSRC}/t && rm -f ${SKIP_TESTS}
cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \
- HOME=${WRKDIST}/t/trash test
+ HOME=${WRKDIST}/t test
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.65
diff -u -p -r1.65 distinfo
--- distinfo13 Mar 2013 11:58:14 - 1.65
+++ distinfo1 May 2013 16:24:06 -
@@ -1,4 +1,4 @@
-SHA256 (git-1.8.1.3.tar.gz) = N1Mkfb/YAqrxyyyRe46HO27RPACasPpffZCzx1kZX/E=
-SHA256 (git-manpages-1.8.1.3.tar.gz) =
mPYbps9knzx8tipAGUqYb3Vh9kj4GtPZ4OzaZG2QhTk=
-SIZE (git-1.8.1.3.tar.gz) = 4302035
-SIZE (git-manpages-1.8.1.3.tar.gz) = 528587
+SHA256 (git-1.8.2.2.tar.gz) = Ag3jjtowK7bhvkYPdJkhGUgZOzBr6rThpSD/xvcpR5Q=
+SHA256 (git-manpages-1.8.2.2.tar.gz) =
Io3rU4ZUFXKOvXq/GNiMc9PBZg3toNN5cF1G2xBjZus=
+SIZE (git-1.8.2.2.tar.gz) = 4404477
+SIZE (git-manpages-1.8.2.2.tar.gz) = 537739
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 patch-Makefile
--- patches/patch-Makefile 13 Mar 2013 11:58:16 - 1.37
+++ patches/patch-Makefile 1 May 2013 18:24:20 -
@@ -1,33 +1,7 @@
$OpenBSD: patch-Makefile,v 1.37 2013/03/13 11:58:16 benoit Exp $
Makefile.orig Fri Feb 8 01:00:07 2013
-+++ Makefile Wed Mar 13 10:35:45 2013
-@@ -1123,13 +1123,13 @@ ifeq ($(uname_S),FreeBSD)
- HAVE_PATHS_H = YesPlease
- endif
- ifeq ($(uname_S),OpenBSD)
-- NO_STRCASESTR = YesPlease
- NO_MEMMEM = YesPlease
- USE_ST_TIMESPEC = YesPlease
- NEEDS_LIBICONV = YesPlease
-- BASIC_CFLAGS += -I/usr/local/include
-- BASIC_LDFLAGS += -L/usr/local/lib
-+ BASIC_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
-+ BASIC_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
- HAVE_PATHS_H = YesPlease
-+ NO_PYTHON = YesPlease
Re: [NEW] devel/ninja
On Wed, 01 May 2013, Matthew Dempsky wrote: > On Wed, May 01, 2013 at 03:24:25PM -0700, Matthew Dempsky wrote: > > Attached is a port of the Ninja build system: > > http://martine.github.io/ninja/ > > D'oh, attached for real this time... Hi! Just some comments: Python is only needed for building ninja, so I've added MODPY_RUNDEP=No. I've fixed some paths to the python interpreter using MODPY_ADJ_FILES. patch-bootstrap_py is not needed, 'cause ninja only wants libc, libm and libstdc++ that come all from base. I've added a patch 'patch-src_util_cc' to get the number of cpus on OpenBSD too (just a couple of extra #ifdefs, the code is the same as for FreeBSD). Ciao, David ninja_2.tar.gz Description: application/tar-gz
Re: UPDATE: sysutils/cfengine 2.2.10 -> 3.4.4 (take 4)
Hi Stuart, > I am working on it. I just saw that it's committed. Thank you very much for all your work. Kind regards, Martijn Rijkeboer
Re: OpenOCD 0.7.0rc2
On Wed, May 1, 2013 at 10:13 PM, Stuart Henderson wrote: > Looks like a new OpenOCD release is around the corner, this may > possibly be useful for those hacking on arms etc.. > > Sylvestre, do you want to remain as maintainer of this? Hi, You can take the maintainership, I have no boards left to try or test this port :/ Cheers, -- Sylvestre Gallon
