Re: UPDATE: rdesktop 1.6.0
Giovanni Bechis [2008-06-18, 12:53:39]:
It works well @i386, PLIST updated and PKGNAME removed.
seems to work on amd64 too.
however, it picks up libsamplerate if it's installed. others reported that
it does not make a difference, so maybe the configure script needs some
tweaking to avoid picking it up.
and don't forget lib-depends-check.
Cheers
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/x11/rdesktop/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 15 Sep 2007 20:04:24 - 1.25
+++ Makefile 18 Jun 2008 10:46:36 -
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.25 2007/09/15 20:04:24 merdely Exp $
COMMENT= open source client for Windows Terminal Server
-DISTNAME=rdesktop-1.5.0
-PKGNAME= ${DISTNAME}p1
+DISTNAME=rdesktop-1.6.0
CATEGORIES= x11 net
MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=rdesktop/}
Index: distinfo
===
RCS file: /cvs/ports/x11/rdesktop/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 5 Apr 2007 17:36:24 - 1.13
+++ distinfo 18 Jun 2008 10:46:36 -
@@ -1,5 +1,5 @@
-MD5 (rdesktop-1.5.0.tar.gz) = QzVG9g/A8gHpkwe6GINp7Q==
-RMD160 (rdesktop-1.5.0.tar.gz) = NQ4IFm0LdiC07ZxllK3a5+xT0Vo=
-SHA1 (rdesktop-1.5.0.tar.gz) = 4whr+GUZHu1BYxgTEl9ILiecfz0=
-SHA256 (rdesktop-1.5.0.tar.gz) = Xq0Xw9KcsQKK7KSF7nqMZWlMGwKhtwFMPakgsmWkOKo=
-SIZE (rdesktop-1.5.0.tar.gz) = 245137
+MD5 (rdesktop-1.6.0.tar.gz) = xvy+1/CtfmCsX8stMk2LFg==
+RMD160 (rdesktop-1.6.0.tar.gz) = z2BM0bwHB7SF3rZT76PkfiH6vEw=
+SHA1 (rdesktop-1.6.0.tar.gz) = uL/QPUZA0oWgruWz+xmaR8tCJfI=
+SHA256 (rdesktop-1.6.0.tar.gz) = NQJuqo4UyovQujcwkm8UIi+EUvKsZiYju/GQnYsGCXk=
+SIZE (rdesktop-1.6.0.tar.gz) = 284728
Index: patches/patch-rdpsnd_sun_c
===
RCS file: patches/patch-rdpsnd_sun_c
diff -N patches/patch-rdpsnd_sun_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-rdpsnd_sun_c18 Jun 2008 10:46:36 -
@@ -0,0 +1,40 @@
+$OpenBSD$
+
+2 changes are here:
+- Change all uint_t to unsigned int. On Linux a uint_t is just a typedef
+ to unsigned int. We don't have a uint_t.
+
+- In sun_open rdesktop will also check that a device is in full duplex
+ mode before opening the device successfully. I didn't add code to check
+ if a device is in full duplex mode, I just removed the check.
+
+--- rdpsnd_sun.c.origSat May 10 23:14:38 2008
rdpsnd_sun.c Tue Jun 17 16:08:59 2008
+@@ -54,7 +54,7 @@ static uint32 snd_rate;
+ static short samplewidth;
+ static char *dsp_dev;
+
+-static uint_t written_samples;
++static unsigned int written_samples;
+
+ void sun_play(void);
+ void sun_record(void);
+@@ -147,8 +147,7 @@ sun_open(int mode)
+ {
+ AUDIO_INITINFO(info);
+
+-if ((ioctl(dsp_fd, AUDIO_GETINFO, info) == -1)
+-|| !(info.hw_features AUDIO_HWFEATURE_DUPLEX))
++if (ioctl(dsp_fd, AUDIO_GETINFO, info) == -1)
+ {
+ close(dsp_fd);
+ dsp_fd = -1;
+@@ -440,7 +439,7 @@ sun_play(void)
+ if (out-p == out-end)
+ {
+ audio_info_t info;
+-uint_t delay_samples;
++unsigned int delay_samples;
+ unsigned long delay_us;
+
+ if (ioctl(dsp_fd, AUDIO_GETINFO, info) != -1)
Index: patches/patch-xwin_c
===
RCS file: patches/patch-xwin_c
diff -N patches/patch-xwin_c
--- patches/patch-xwin_c 17 May 2007 17:31:33 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-xwin_c,v 1.4 2007/05/17 17:31:33 ckuethe Exp $
xwin.c.orig Wed Apr 25 12:03:29 2007
-+++ xwin.c Wed Apr 25 12:04:54 2007
-@@ -3221,6 +3221,10 @@ ui_desktop_restore(uint32 offset, int x, int y, int cx
- image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
- (char *) data, cx, cy, BitmapPad(g_display), cx *
g_bpp / 8);
-
-+if (image == NULL)
-+image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
-+ (char *) data, cx, cy, BitmapPad(g_display), 0);
-+
- if (g_ownbackstore)
- {
- XPutImage(g_display, g_backstore, g_gc, image, 0, 0, x, y, cx,
cy);
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/rdesktop/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 25 Mar 2007 19:38:39 - 1.6
+++ pkg/PLIST 18 Jun 2008 10:46:36 -
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2007/03/25 19:38:39 aanriot Exp $
-bin/rdesktop
[EMAIL PROTECTED] bin/rdesktop
@man man/man1/rdesktop.1
share/rdesktop/
Re: [devel/bzr] make failed
Hi, On Wed, 18.06.2008 at 15:34:55 -0500, Will Maier [EMAIL PROTECTED] wrote: Specifically, you need the Subst.pm stuff (see above). of course... but which side effect will it have? I recently ran a diff between the 4.3 and the -current stuff in OpenBSD's Perl modules, and found the diff to be too large to simply transplant the newer into a 4.3 system (ie, no time to really understand the difference right now). OTOH, it would be really nice to be able to create backports... Kind regards, --Toni++
Re: [devel/bzr] make failed
On Sat, Jun 21, 2008 at 11:34:33AM +0200, Toni Mueller wrote:
On Wed, 18.06.2008 at 15:34:55 -0500, Will Maier [EMAIL PROTECTED] wrote:
Specifically, you need the Subst.pm stuff (see above).
of course... but which side effect will it have? I recently ran a
diff between the 4.3 and the -current stuff in OpenBSD's Perl
modules, and found the diff to be too large to simply transplant
the newer into a 4.3 system (ie, no time to really understand the
difference right now).
That's a good thing, right? I mean, you do want improvements in the
code from release to release -- don't you? And as those improvements
occur in the base system, we should use them to make the ports tree
cleaner/better, right?
OTOH, it would be really nice to be able to create backports...
There's a reason why the FAQ is so clear about mixing versions...
If you're clever enough, you can either backport the relevant
Subst.pm bits in perl or hack the port so that it uses some other
method (most commonly perl -pi -e '...'). I'm sure there are better
uses of your time, though.
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*-[ BSD: Live Free or Die ]*
Re: RESUBMIT: games/armagetronad
Hi, Antti Harri schrieb: You don't need to quote COMMENTs. Otherwise works fine on i386 and local play against the AI. Thanks, changed that for all of my ports. Hoping for some more feedback before resubmitting it again though, if at all needed..? Anyway, who would be the best person to talk to about getting it, and the other two ports, into the official tree? Michael
Re: mpg123
Wohoo, so many answers. As soon as I got some time at hand I'll try out all those suggestions. Music formats I'm interested in are mainly mp3 and ogg. And yes playlist support aswell as volume control would be cool indeed :-) As I'm not a programmer I can't really help making an update for mpg123 but I'm willing to test a possible update though. Regards
Re: UPDATE: mozilla-firefox-3.0
On Wed, Jun 18, 2008 at 01:19:41AM +0300, Martynas Venckus wrote: As kili and ian pointed out, it doesn't apply because patch-mozilla_nsprpub_pr_include_private_primpl_h has been removed. FYI: armish looks a little bit broken (even after Martynas sent me some more patches), and macppc segfaults on installation (regxpcom). I don't have enough disk space on my PowerOffBook for a debug build of firefox, so I'd appreciate if someone else steps in and help Martynas debugging firefox-3.0 on macppc. Ciao, Kili
update: net/kismet
Update to kismet 2008-05-R1. I've tested kismet on ny zaurus, and
gpsnap on an i386.
Tests on other platforms are welcome.
Index: Makefile
===
RCS file: /cvs/ports/net/kismet/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile12 Jun 2008 21:58:12 - 1.20
+++ Makefile21 Jun 2008 17:12:55 -
@@ -8,7 +8,7 @@ COMMENT-gpsmap= reads GPS and Network XM
# No wireless capabilities
NOT_FOR_ARCHS=m68k m88k vax
-V= 2007-10-R1
+V= 2008-05-R1
DISTNAME= kismet-${V}
PKGNAME-main= kismet-${V:S,-,,g}
PKGNAME-gpsmap=kismet-gpsmap-${V:S,-,,g}p0
@@ -32,7 +32,8 @@ CONFDIR= ${SYSCONFDIR}/kismet
SUBST_VARS+= CONFDIR
CONFIGURE_ARGS=--sysconfdir=${CONFDIR} \
- --mandir=${PREFIX}/man
+ --mandir=${PREFIX}/man \
+ --disable-dbus
CONFIGURE_ENV= CPPFLAGS=-I${X11BASE}/include -I${LOCALBASE}/include \
LDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib
Index: distinfo
===
RCS file: /cvs/ports/net/kismet/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo10 Nov 2007 21:10:42 - 1.6
+++ distinfo21 Jun 2008 17:12:55 -
@@ -1,5 +1,5 @@
-MD5 (kismet-2007-10-R1.tar.gz) = IQDGZ+adsM3jX6LQbIUW4g==
-RMD160 (kismet-2007-10-R1.tar.gz) = fLYqP9lkye5+Tsa+8FBVjIBqtJU=
-SHA1 (kismet-2007-10-R1.tar.gz) = ocaCeXrWhCtT+eDwOCVKqDJuD7Q=
-SHA256 (kismet-2007-10-R1.tar.gz) =
Aj5/RwOcGthhUFLkZPdqPNSWpCNEm5MQNtEnxW1Ysrk=
-SIZE (kismet-2007-10-R1.tar.gz) = 646452
+MD5 (kismet-2008-05-R1.tar.gz) = buNl02NUtN7klF5n+BSSlA==
+RMD160 (kismet-2008-05-R1.tar.gz) = VhMge0X4X6ctFGAJQ035hPchzNw=
+SHA1 (kismet-2008-05-R1.tar.gz) = g1WusDdKOVSd/cDHMWASXq3XxuI=
+SHA256 (kismet-2008-05-R1.tar.gz) =
opjUT4puyXcCHNSSpyCYfe2BtcS69faLNvEoKiPJ99M=
+SIZE (kismet-2008-05-R1.tar.gz) = 655362
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/kismet/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in 10 Nov 2007 21:10:42 - 1.5
+++ patches/patch-Makefile_in 21 Jun 2008 17:12:55 -
@@ -3,20 +3,18 @@ $OpenBSD: patch-Makefile_in,v 1.5 2007/1
# Don't hard code -O2 -Wall.
# Use BSD_INSTALL_* macros for installation.
Makefile.in.orig Sun Sep 9 23:01:20 2007
-+++ Makefile.inWed Sep 12 22:02:32 2007
-@@ -21,8 +21,8 @@ LD = @CXX@
- LDFLAGS = @LDFLAGS@
+--- Makefile.in.orig Thu May 29 21:18:26 2008
Makefile.inSun Jun 1 13:16:18 2008
+@@ -22,7 +22,7 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
CLIBS = @CLIBS@
--CFLAGS= @CPPFLAGS@
+ CFLAGS= @CFLAGS@
-CXXFLAGS = -O2 -Wall -DVERSION_MAJOR=\$(VERSION_MAJOR)\
-DVERSION_MINOR=\$(VERSION_MINOR)\ -DVERSION_TINY=\$(VERSION_TINY)\
-DTIMESTAMP=\`cat TIMESTAMP`\ @CXXFLAGS@
-+CFLAGS= @CFLAGS@
+CXXFLAGS = -DVERSION_MAJOR=\$(VERSION_MAJOR)\
-DVERSION_MINOR=\$(VERSION_MINOR)\ -DVERSION_TINY=\$(VERSION_TINY)\
-DTIMESTAMP=\`cat TIMESTAMP`\ @CXXFLAGS@
CPPFLAGS = @CPPFLAGS@
SUID = @suid@
-@@ -137,53 +137,55 @@ checkuiconfig:
+@@ -138,53 +138,55 @@ checkuiconfig:
echo latest version is `grep version= conf/kismet_ui.conf |
cut -f 2 -d=`; \
fi
@@ -107,7 +105,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2007/1
@if test -f $(BIN)/kismet_curses; then \
echo Removing old kismet_curses binary. The panels frontend
is now kismet_client.; \
-@@ -196,22 +198,22 @@ suidinstall: $(PS) $(DRONE) $(NC) $(GPSLBUILD) $(ZAURU
+@@ -197,22 +199,22 @@ suidinstall: $(PS) $(DRONE) $(WRAP) $(NC) $(GPSLBUILD)
@if test -f $(ETC)/kismet.conf; then \
$(MAKE) -e checkconfig; \
else \
@@ -136,7 +134,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2007/1
echo Installed UI config into $(ETC)/kismet_ui.conf.; \
fi
@echo Installed kismet into $(BIN)/.
-@@ -229,22 +231,22 @@ install: $(PS) $(DRONE) $(NC) $(GPSLBUILD) $(ZAURUSBUI
+@@ -230,22 +232,22 @@ install: $(PS) $(DRONE) $(NC) $(WRAP) $(GPSLBUILD) $(Z
@if test -f $(ETC)/kismet.conf; then \
$(MAKE) -e checkconfig; \
else \
@@ -165,7 +163,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2007/1
echo Installed UI config into $(ETC)/kismet_ui.conf.; \
fi
@echo Installed kismet into $(BIN)/.
-@@ -260,11 +262,11 @@ install: $(PS) $(DRONE) $(NC) $(GPSLBUILD) $(ZAURUSBUI
+@@ -261,11 +263,11 @@ install: $(PS) $(DRONE) $(NC) $(WRAP) $(GPSLBUILD) $(Z
forceinstall: $(PS)
$(MAKE) -e commoninstall
$(MAKE) -e binuserinstall
@@ -180,7 +178,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2007/1
echo Installed UI config into $(ETC)/kismet_ui.conf.;
