Remove MAINTAINER
Hello, I would like to be removed from maintaining the following ports: openal cross-platform 3D audio API abuse SDL port of the legendary 2D platform shooter quake quake pktstat network traffic viewer xmoto challenging 2D motocross platform game openxcomopen source reimplementation of the original X-Com yle-dl download videos from YLE Areena chromium-bsufast paced arcade-style space shooter -- Antti Harri
Re: [update] xmoto 0.5.11
On 2.1.2015 20:38, Landry Breuil wrote: On Fri, Jan 02, 2015 at 02:15:12PM +0300, Kirill Bychkov wrote: On Sun, December 14, 2014 23:15, Landry Breuil wrote: Hi, here's an update to the recently released xmoto 0.5.11, seems to work in basic testing.. apparently no real changes, see http://xmoto.tuxfamily.org/dev/ChangeLog Landry Hi, I guess I have the similar patch for a long time. While here I suggest to stop picking up ode includes from xmoto sources. This will unbreak building with newer ode-0.13. OK? ok for me, and i think you can consider that a MAINTAINER timeout too... Landry OK if it works for you. -- Antti Harri
Re: dovecot-mysql broken on my system
Works here too as I'm able to connect with my mail client again. ;-) -- Antti Harri
Re: [UPDATE] yle-dl 2.2.1
On Tue, 20 May 2014 12:52:07 +0100 Stuart Henderson st...@openbsd.org wrote: Antti, OK? Sure. Thanks both! -- Antti Harri
Re: devel/json-c update, unbreak devel/droplet and multimedia/yle-dl
On Mon, 21 Apr 2014 18:49:10 +0200 j...@wxcvbn.org (Jérémie Courrèges-Anglas) wrote: Note: yle-dl could be updated to latest version 2.2.1. Hi, yes quite true the current version isn't working anymore. I sent a patch to some version some time ago, but no one commited it. I suspect that version is now out of date too. I'm too busy at the moment to fix it. -- Antti Harri
UPDATE: multimedia/yle-dl
Update to 2.0.1. http://openbsd.fi/dist/yle-dl.diff -- Antti Harri
UPDATE: games/quake
Update to 0.7.0. Client list has been reduced, -sdl and -x11 select the system and OpenGL rendering is the default now. Launch using +set vid_width X +set vid_height Y to select appropriate resolution. I was unable to test this properly because OpenBSD doesn't support my Radeon and I'm stuck with VESA on X, which sucks. http://openbsd.fi/dist/quake.diff -- Antti Harri
Re: Allow more usb joysticks in SDL
On Tuesday 15 May 2012 19:16:20 Edd Barrett wrote: I have this usb keyboard which uses 3 uhid devices nodes, leaving only one left for SDL to use (SDL has a hardcoded limit of 4 usb devices). Let's bump this. Tested using emulators/dgen. OK? Hi. Why does SDL set keyboards as joysticks in the first place? -- Antti Harri
Re: memory compile sizes
On Thursday 19 April 2012 01:27:01 Marc Espie wrote: Thanks to Ariane's changes, we can now monitor maxrss thru compiles. Here is a full list of a bulk build on amd64, ordered by size. (warning, very long post) note that the number for libreoffice might be a bit small, because I ran out of diskspace and rebuilt it later, but most of the rest is fairly interesting. This is very cheap to compute, this just requires an extra wrapper-process around make to compute those numbers. Does this mean it's going to be at least somewhat dynamic and the list that you attached will be regenerated once in a while? Stuff 30 more or less corresponds to VMEM_WARNING ports. One thing worth doing will be to set a threshold in dpb, and not allow two large ports to build at the same time on a single host (just by looking at the next ports in the queue, plenty of candidates usually) -- Antti Harri
Re: UPDATE: games/quake
On Monday 02 April 2012 19:05:29 Ryan Freeman wrote: works good on i386 cur, no glsl for me though: Didn't work for me either on my radeon with r370 chip. I got a new radeon hd but it's not supported at all in OpenBSD (X uses vesa). The binaries run though, in software rendering. Thought I'd leave it enabled anyway if someone has new enough card with supported acceleration shaders. The renderers can be used to test shader support I think.. -- Antti Harri
UPDATE: games/quake
Update to 0.6.3.
- upstream fixed their sound code
- new shader renderers enabled (nq-glslx and nq-sglsl)
--
Antti Harri
diff --git games/quake/Makefile games/quake/Makefile
index ab9c27b..9900cfc 100644
--- games/quake/Makefile
+++ games/quake/Makefile
@@ -5,9 +5,9 @@ COMMENT-libs = Quake common libs
COMMENT-server = QuakeWorld server
# .so.1.0
-SOMAJOR = 0
+SOMAJOR = 1
SOMINOR = 0
-V =0.6.0
+V =0.6.3
DISTNAME = quakeforge-$V
PKGNAME-main = quake-$V
PKGNAME-libs = quake-libs-$V
@@ -21,15 +21,13 @@ MULTI_PACKAGES =-main -libs -server
SHARED_LIBS += QFcd${SOMAJOR}.${SOMINOR}
SHARED_LIBS += QFconsole ${SOMAJOR}.${SOMINOR}
-SHARED_LIBS += QFgamecode ${SOMAJOR}.${SOMINOR}
SHARED_LIBS += QFgib ${SOMAJOR}.${SOMINOR}
SHARED_LIBS += QFimage ${SOMAJOR}.${SOMINOR}
SHARED_LIBS += QFjs${SOMAJOR}.${SOMINOR}
SHARED_LIBS += QFmodels${SOMAJOR}.${SOMINOR}
SHARED_LIBS += QFmodels_gl ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFmodels_glsl ${SOMAJOR}.${SOMINOR}
SHARED_LIBS += QFmodels_sw ${SOMAJOR}.${SOMINOR}
-SHARED_LIBS += QFrenderer_gl ${SOMAJOR}.${SOMINOR}
-SHARED_LIBS += QFrenderer_sw32 ${SOMAJOR}.${SOMINOR}
SHARED_LIBS += QFruamoko ${SOMAJOR}.${SOMINOR}
SHARED_LIBS += QFsound ${SOMAJOR}.${SOMINOR}
SHARED_LIBS += QFutil ${SOMAJOR}.${SOMINOR}
@@ -46,8 +44,8 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB-main += QFcd QFconsole QFgamecode QFgib QFimage QFjs QFmodels
-WANTLIB-main += QFmodels_gl QFmodels_sw QFrenderer_gl QFrenderer_sw32
+WANTLIB-main += QFcd QFconsole QFgib QFimage QFjs QFmodels
+WANTLIB-main += QFmodels_gl QFmodels_sw QFmodels_glsl
WANTLIB-main += QFruamoko QFsound QFutil SDL X11 Xext Xxf86dga Xxf86vm
WANTLIB-main += c crypto idn m ncurses png pthread sndio ssl usbhid
WANTLIB-main += xcb z curl ${MODGETTEXT_WANTLIB}
@@ -55,7 +53,7 @@ WANTLIB-main += xcb z curl ${MODGETTEXT_WANTLIB}
WANTLIB-libs += FLAC SDL m ncurses ogg png samplerate sndio usbhid
WANTLIB-libs += vorbis vorbisfile z iconv
-WANTLIB-server += QFconsole QFgamecode QFgib QFimage QFmodels QFruamoko
+WANTLIB-server += QFconsole QFgib QFimage QFmodels QFruamoko
WANTLIB-server += QFutil c m ncurses png pthread z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=quake/}
@@ -65,7 +63,6 @@ MODULES = devel/gettext
BUILD_DEPENDS =devel/bison
LIB_DEPENDS-server = ${FULLPKGNAME-libs}:${BUILD_PKGPATH},-libs
LIB_DEPENDS-main = ${FULLPKGNAME-libs}:${BUILD_PKGPATH},-libs \
- audio/flac \
devel/libidn \
devel/sdl \
graphics/png \
@@ -78,9 +75,7 @@ LIB_DEPENDS-libs =audio/flac \
USE_LIBTOOL = Yes
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --with-clients=glx,sdl,sdl32,sgl,x11 \
- --with-gl-driver=libGL.so \
- --with-cd-default=SDL \
+CONFIGURE_ARGS += --with-cd-default=sdl \
--with-sharepath=${PREFIX}/share/quakeforge \
--enable-version-info=${SOMAJOR}:${SOMINOR} \
--disable-asmopt \
diff --git games/quake/distinfo games/quake/distinfo
index 8cfba69..a5d8dc9 100644
--- games/quake/distinfo
+++ games/quake/distinfo
@@ -1,5 +1,5 @@
-MD5 (quakeforge-0.6.0.tar.bz2) = rWDVwttQ0xh0EV+ysCU/Cg==
-RMD160 (quakeforge-0.6.0.tar.bz2) = efr4st5ns8ls6PBvAju+NlT2oQM=
-SHA1 (quakeforge-0.6.0.tar.bz2) = eikQ/v2bJJZX/lfPX57oT+xjJnA=
-SHA256 (quakeforge-0.6.0.tar.bz2) =
xXIK4lcevztUR6LIdkq/MSDKbzlJAx6M7fOFiRmE6uo=
-SIZE (quakeforge-0.6.0.tar.bz2) = 2507190
+MD5 (quakeforge-0.6.3.tar.bz2) = JyI6wle2Gbh2rXt4IKC3mQ==
+RMD160 (quakeforge-0.6.3.tar.bz2) = 1OYR5EmLXd518uUvYP6FeRhjbFw=
+SHA1 (quakeforge-0.6.3.tar.bz2) = O0pUe+C9xIicTRe3wbz91zbPipc=
+SHA256 (quakeforge-0.6.3.tar.bz2) =
/s4nY64ovwjAQE1DTvCGNxkZbxMARzNllH1jaGGNUeg=
+SIZE (quakeforge-0.6.3.tar.bz2) = 2653135
diff --git games/quake/pkg/PFRAG.shared-libs games/quake/pkg/PFRAG.shared-libs
index 5733955..d2a9469 100644
--- games/quake/pkg/PFRAG.shared-libs
+++ games/quake/pkg/PFRAG.shared-libs
@@ -1,15 +1,13 @@
@comment $OpenBSD: ports/games/quake/pkg/PFRAG.shared-libs,v 1.1 2011/07/11
16:33:06 jasper Exp $
@lib lib/libQFcd.so.${LIBQFcd_VERSION}
@lib lib/libQFconsole.so.${LIBQFconsole_VERSION}
-@lib lib/libQFgamecode.so.${LIBQFgamecode_VERSION}
@lib lib/libQFgib.so.${LIBQFgib_VERSION}
@lib lib/libQFimage.so.${LIBQFimage_VERSION}
@lib lib/libQFjs.so.${LIBQFjs_VERSION}
@lib lib/libQFmodels.so.${LIBQFmodels_VERSION}
@lib lib/libQFmodels_gl.so.${LIBQFmodels_gl_VERSION}
+@lib lib/libQFmodels_glsl.so.${LIBQFmodels_glsl_VERSION}
@lib
UPDATE: audio/openal
This updates OpenAL to 1.14 that was released yesterday. Release notes at
http://kcat.strangesoft.net/openal.html
--
Antti Harri
diff --git audio/openal/Makefile audio/openal/Makefile
index 4acb110..9dae287 100644
--- audio/openal/Makefile
+++ audio/openal/Makefile
@@ -2,7 +2,8 @@
COMMENT = cross-platform 3D audio API
-V =20110627
+V =1.14
+EPOCH =0
DISTNAME = openal-soft-$V
PKGNAME = openal-$V
CATEGORIES = audio
@@ -20,20 +21,26 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = c m pthread sndio
-MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,} \
- http://openbsd.fi/dist/
+MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,}
+EXTRACT_SUFX = .tar.bz2
CONFIGURE_ARGS =-DCMAKE_C_FLAGS=${CFLAGS} -DNDEBUG \
-DCMAKE_BUILD_TYPE=OpenBSD \
-DDLOPEN=Off\
+ -DREQUIRE_SNDIO=On \
-DPULSEAUDIO=Off\
-DPORTAUDIO=Off \
-DSOLARIS=Off \
-DALSA=Off \
- -DOSS=Off
+ -DOSS=Off \
+ -DCOREAUDIO=Off \
+ -DDSOUND=Off\
+ -DOPENSL=Off\
+ -DEXAMPLES=Off
MODULES = devel/cmake
+SEPARATE_BUILD =Yes
NO_REGRESS = Yes
pre-build:
diff --git audio/openal/distinfo audio/openal/distinfo
index af7ecc7..c0ec328 100644
--- audio/openal/distinfo
+++ audio/openal/distinfo
@@ -1,5 +1,5 @@
-MD5 (openal-soft-20110627.tar.gz) = dyIlarhDU4oZArAVhNi6Xw==
-RMD160 (openal-soft-20110627.tar.gz) = kWiXzE41A6/+Xvs8PKBCZKpb/Vs=
-SHA1 (openal-soft-20110627.tar.gz) = 22LbnwY5ForaALA6rXGj/QfB7LM=
-SHA256 (openal-soft-20110627.tar.gz) =
/xXT1ihUatrb/4JSCAYYrrTVYbjP6medJwHdInFpS/w=
-SIZE (openal-soft-20110627.tar.gz) = 231964
+MD5 (openal-soft-1.14.tar.bz2) = PYuGwhovh6Kl5g9487PwPQ==
+RMD160 (openal-soft-1.14.tar.bz2) = NbTUbyF5+4R9IqvkwcuNSpdPilo=
+SHA1 (openal-soft-1.14.tar.bz2) = 5tadsT7BVGW4OkXviZeOig9Vvso=
+SHA256 (openal-soft-1.14.tar.bz2) =
h72NYdWUM4eJjJK2oru7JhGOdF3sV1UMgXUmpw+tCRQ=
+SIZE (openal-soft-1.14.tar.bz2) = 221579
diff --git audio/openal/patches/patch-Alc_sndio_c
audio/openal/patches/patch-Alc_sndio_c
deleted file mode 100644
index e24b892..000
--- audio/openal/patches/patch-Alc_sndio_c
+++ /dev/null
@@ -1,36 +0,0 @@
-$OpenBSD: ports/audio/openal/patches/patch-Alc_sndio_c,v 1.2 2011/07/02
07:34:31 jasper Exp $
Alc/sndio.c.orig Mon Jun 27 01:40:15 2011
-+++ Alc/sndio.cThu Jun 30 23:37:31 2011
-@@ -142,25 +142,15 @@ static ALuint sndio_proc(ALvoid *ptr)
-
- while(!data-killNow device-Connected)
- {
--ALsizei len = data-data_size;
--ALubyte *WritePtr = data-mix_data;
--
--aluMixData(device, WritePtr, len/frameSize);
--while(len 0 !data-killNow)
-+aluMixData(device, data-mix_data, data-data_size / frameSize);
-+wrote = sio_write(data-sndHandle, data-mix_data, data-data_size);
-+if(wrote data-data_size)
- {
--wrote = sio_write(data-sndHandle, WritePtr, len);
--if(wrote == 0)
--{
--AL_PRINT(sio_write failed\n);
--aluHandleDisconnect(device);
--break;
--}
--
--len -= wrote;
--WritePtr += wrote;
--}
-+ AL_PRINT(sio_write: short write\n);
-+ aluHandleDisconnect(device);
-+ break;
-+ }
- }
--
- return 0;
- }
-
diff --git audio/openal/pkg/PLIST audio/openal/pkg/PLIST
index 0bbfaeb..fca201e 100644
--- audio/openal/pkg/PLIST
+++ audio/openal/pkg/PLIST
@@ -1,4 +1,5 @@
@comment $OpenBSD: ports/audio/openal/pkg/PLIST,v 1.4 2011/06/25 18:42:02
jasper Exp $
+@bin bin/makehrtf
@bin bin/openal-info
include/AL/
include/AL/al.h
@@ -6,6 +7,7 @@ include/AL/alc.h
include/AL/alext.h
%%SHARED%%
include/AL/efx-creative.h
+include/AL/efx-presets.h
include/AL/efx.h
lib/pkgconfig/
lib/pkgconfig/openal.pc
Static forces analysis tool (for beams/frames)?
Does anyone know a software that can calculate member forces of beams/frames in 2D? Doesn't have to be very sophisticated, something like Engilab's Beam2D (http://www.engilab.com/beam2d_ml.htm) would suffice. I'm interested in porting such software, unless someone has done that already. I know there's JBeam that looks pretty close, but Java software gives me rash. -- Antti Harri
Re: magnet links
On Wednesday 28 March 2012 18:45:45 Kevin Chadwick wrote: Ktorrent supports magnet and DHE. Has many features and so probably bugs but I expect you don't expect this machine getting torrents to be secure? Are you talking about the ktorrent in ports? It didn't seem to support magnets last time I tried. -- Antti Harri
Re: UPDATE games/wesnoth
On Monday 19 March 2012 22:25:50 Kirill Bychkov wrote: Hi! I've updated wesnoth to the latest release 1.10.1. General difference (for ports infrastructure): * upstream switched to cmake build system * they dropped external lua a long time ago and use their own patched variant ( http://svn.gna.org/viewcvs/wesnoth?view=revisionrevision=44911 ) Full changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/tags/1.10.0/changelog (a lot of changes since 1.8.6) I set up SEPARATE_BUILD=flavored to avoid extracting a lot of data for every arch. Also removed superfluous dependency to devel/sdl. tinygui flavor was dropped by upstream about a year ago. Tested on amd64 playing new campaign all night long. (And it must be confessed that I was playing all last week) Already OK from aja@ Maintainer (jasper@) timed out. OK? Works on amd64. -- Antti Harri
UPDATE: games/xmoto
Update to xmoto's newest release.
Switch MAINTAINER, requested by previous maintainer.
--
Antti Harri
diff --git games/xmoto/Makefile games/xmoto/Makefile
index a50e31a..e81c065 100644
--- games/xmoto/Makefile
+++ games/xmoto/Makefile
@@ -2,13 +2,12 @@
COMMENT = challenging 2D motocross platform game
-V =0.5.2
+V =0.5.9
DISTNAME = xmoto-${V}-src
PKGNAME = xmoto-${V}
-REVISION= 0
CATEGORIES = games
-MAINTAINER = Jonathan Armani d...@asystant.net
+MAINTAINER = Antti Harri i...@openbsd.fi
HOMEPAGE = http://xmoto.tuxfamily.org/
MASTER_SITES = http://download.tuxfamily.org/xmoto/xmoto/${V}/
@@ -19,32 +18,44 @@ PERMIT_PACKAGE_FTP =Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB += GL GLU SDL X11 c m pthread pthread-stubs stdc++ xcb z
-WANTLIB += SDL_mixer SDL_net SDL_ttf bz2 curl jpeg ode lua png sqlite3
+WANTLIB += GL GLU SDL SDL_mixer SDL_net SDL_ttf X11 bz2 c curl jpeg
+WANTLIB += lua m ode png pthread sqlite3 stdc++ xdg-basedir xml2 z
MODULES= devel/gettext
-
-LIB_DEPENDS = devel/sdl-mixer \
+BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS}
+LIB_DEPENDS = archivers/bzip2 \
+ databases/sqlite3 \
+ devel/ode \
+ devel/sdl-mixer \
devel/sdl-net \
devel/sdl-ttf \
- archivers/bzip2 \
- net/curl \
graphics/jpeg \
- devel/ode \
- lang/lua \
graphics/png \
- databases/sqlite3
+ lang/lua \
+ net/curl \
+ textproc/libxml \
+ x11/libxdg-basedir
-USE_GMAKE =Yes
+SEPARATE_BUILD = Yes
USE_GROFF =Yes
+
CONFIGURE_STYLE = gnu
-CONFIGURE_ENV =CPPFLAGS=-I${LOCALBASE}/include
-I${X11BASE}/include \
- -I${LOCALBASE}/include/libpng \
- LDFLAGS=-L${LOCALBASE}/lib -L${X11BASE}/lib \
- LIBS=-lGL -lm -pthread
+CONFIGURE_ENV =CPPFLAGS=`pkg-config --cflags libpng sqlite3
sdl` -DSVN_REV='\${V}\' \
+ LDFLAGS=`pkg-config --libs libpng sdl` -lGL
+AUTOMAKE_VERSION = 1.11
+AUTOCONF_VERSION = 2.68
+
+NO_REGRESS = Yes
WRKDIST = ${WRKDIR}/${DISTNAME:S/-src//}
+pre-configure:
+ cd ${WRKSRC} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+ AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ autoreconf -fi
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmoto/
${INSTALL_DATA} ${WRKSRC}/{COPYING,README} ${PREFIX}/share/doc/xmoto/
diff --git games/xmoto/distinfo games/xmoto/distinfo
index 869d5ea..0043f9f 100644
--- games/xmoto/distinfo
+++ games/xmoto/distinfo
@@ -1,5 +1,5 @@
-MD5 (xmoto-0.5.2-src.tar.gz) = HjZ4687KIdYYRO+1PBQCJw==
-RMD160 (xmoto-0.5.2-src.tar.gz) = qDIzNoFCYbDCuwrPE9XmWskukh0=
-SHA1 (xmoto-0.5.2-src.tar.gz) = qoGYcvBr6xFAJcSQzqjiKc2FE10=
-SHA256 (xmoto-0.5.2-src.tar.gz) = qMkTeO1Dm2QBVyZ5gbQj3O6jWEpDnSXuqKooGBRYBY8=
-SIZE (xmoto-0.5.2-src.tar.gz) = 38170502
+MD5 (xmoto-0.5.9-src.tar.gz) = 2Na3pAUTlTBlC4qa4upt8w==
+RMD160 (xmoto-0.5.9-src.tar.gz) = NP29PnsmxnjrTA5aR3tF3gIWd4Y=
+SHA1 (xmoto-0.5.9-src.tar.gz) = B3V6zM54FR3IhzvvgnDfDlYZZ3I=
+SHA256 (xmoto-0.5.9-src.tar.gz) = dNdXRHatMhxD22wN9tN4lUBo4lFOP0rK4cwyLfigM+Q=
+SIZE (xmoto-0.5.9-src.tar.gz) = 40385328
diff --git games/xmoto/patches/patch-bin_Makefile_am
games/xmoto/patches/patch-bin_Makefile_am
new file mode 100644
index 000..841b507
--- /dev/null
+++ games/xmoto/patches/patch-bin_Makefile_am
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- bin/Makefile.am.orig Tue Oct 11 23:19:23 2011
bin/Makefile.amSat Mar 10 13:06:51 2012
+@@ -14,7 +14,7 @@ else
+ if WIN32
+ echo Windows, cannot build xmoto.bin in the src directory ; build it
from the exec directory.
+ else
+- if test -e $; then ../src/xmoto --pack $@ `dirname $`; fi
++ if test -e $@; then ../src/xmoto --pack $@ `dirname $@`; fi
+ endif
+ endif
+
diff --git games/xmoto/patches/patch-configure_in
games/xmoto/patches/patch-configure_in
new file mode 100644
index 000..f658e35
--- /dev/null
+++ games/xmoto/patches/patch-configure_in
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.in.orig Sun Nov 13 22:04:13 2011
configure.in Sat Mar 10 12:53:53 2012
+@@ -32,7 +32,7 @@ AM_PATH_XML2([],
+ [AC_MSG_ERROR([*** cannot find the libxml2 library ])])
+ CPPFLAGS=$CPPFLAGS $XML_CPPFLAGS
+ CFLAGS=$CFLAGS $XML_CPPFLAGS
+-LIBS=$LIBS$XML_LIBS
++LIBS=$LIBS $XML_LIBS
+ fi
+
+ dnl bz2
diff --git games/xmoto/patches/patch-m4_gettext_m4
games/xmoto/patches/patch-m4_gettext_m4
new file mode 100644
index 000..6b3032e
--- /dev/null
+++ games/xmoto/patches/patch-m4_gettext_m4
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/gettext.m4.orig Sat Mar 10 14:06:51 2012
Re: UPDATE: games/abuse
On Wednesday 21 March 2012 02:43:04 Brad Smith wrote:
On 09/03/12 4:18 PM, Antti Harri wrote:
Update to 0.8:
Frabs was reorganized and put into main distribution in
upstream so remove here.
Bundle abuse-free-sounds-20120309 that has free sounds
we can package. Most of the sounds that matter are available.
Working fine on amd64.
Thanks.
Data was restructured upstream and I noticed there is a potential problem when
upgrading from a previous version because the game writes default user config
on initial startup having datapath enabled. I commented this out in the config
template so it won't happen in future versions, but people upgrading from 0.7.x
might need to tweak their ~/.abuse/abuserc file and comment out the entry.
Fixed diff attached. Could someone commit this please?
--
Antti Harri
diff --git games/abuse/Makefile games/abuse/Makefile
index f22cf3d..37be9a6 100644
--- games/abuse/Makefile
+++ games/abuse/Makefile
@@ -2,61 +2,73 @@
COMMENT = SDL port of the legendary 2D platform shooter
-DISTNAME = abuse-0.7.1
-REVISION = 1
+DISTNAME = abuse-free-0.8
+PKGNAME = abuse-0.8
EPOCH =0
-ABUSE_FRABS = abuse-frabs-2.11
+ABUSE_SFX =abuse-free-sounds-20120309
CATEGORIES = games x11
HOMEPAGE = http://abuse.zoy.org/
MAINTAINER = Antti Harri i...@openbsd.fi
-# GPLv2 and public domain
+# Abuse: GPLv2 and public domain
+# Abuse-free-sounds: various free licenses
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = c m pthread GL stdc++ usbhid SDL sndio X11 Xau Xdamage \
- Xdmcp Xext Xfixes Xxf86vm drm pthread-stubs xcb
+WANTLIB += FLAC GL SDL SDL_mixer X11 Xdamage Xext Xfixes Xrandr
+WANTLIB += Xrender Xxf86vm c drm iconv m mikmod ogg pthread smpeg
+WANTLIB += sndio stdc++ usbhid vorbis vorbisfile xcb
-MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/Downloads/
+MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/download/
+MASTER_SITES0 =http://openbsd.fi/dist/
MODULES = converters/libiconv
# Needs AC_PROG_LIBTOOL
BUILD_DEPENDS =devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
-LIB_DEPENDS = devel/sdl
-
-DISTFILES =${DISTNAME}.tar.gz ${ABUSE_FRABS}.tar.gz
-EXTRACT_ONLY = ${DISTNAME}.tar.gz
-
+RUN_DEPENDS = audio/timidity
+LIB_DEPENDS = devel/sdl-mixer \
+ devel/smpeg \
+ audio/flac \
+ audio/libogg \
+ audio/libmikmod \
+ audio/libvorbis
+
+DISTFILES =${DISTNAME}.tar.gz \
+ ${ABUSE_SFX}.tar.gz:0
+
+SEPARATE_BUILD =Yes
USE_LIBTOOL = Yes
-AUTOCONF_VERSION = 2.61
-AUTOMAKE_VERSION = 1.10
CONFIGURE_STYLE = gnu
-
-CONFIGURE_ENV =CPPFLAGS=-I${X11BASE}/include \
- LDFLAGS=-L${X11BASE}/lib
+CONFIGURE_ARGS = --enable-release \
+ --disable-nonfree \
+ --with-assetdir=${PREFIX}/share/abuse \
+ --datadir=${PREFIX}/share/abuse
+AUTOMAKE_VERSION = 1.11
+AUTOCONF_VERSION = 2.68
NO_REGRESS = Yes
-DATADIR = ${PREFIX}/share/abuse/frabs
-SUBST_VARS = DATADIR
+
+post-patch:
+ cd ${WRKSRC} \
+ find ${WRKDIR}/${ABUSE_SFX}/patches/ -name 'patch-*' \
+ -exec patch -z .afs-orig -i {} \;
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/src/sdlport/setup.cpp
- cd ${WRKSRC}; \
+ cd ${WRKSRC} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
autoreconf -fi
post-install:
- cd ${PREFIX}/share/abuse \
- gzip -dc ${FULLDISTDIR}/${ABUSE_FRABS}.tar.gz | \
- tar xf - \
- mv ${ABUSE_FRABS} frabs
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/abuse/sfx
+ cd ${WRKDIR}/${ABUSE_SFX}/sfx find . -type f -exec \
+ ${INSTALL_DATA} {} ${PREFIX}/share/abuse/sfx/ \;
.include bsd.port.mk
diff --git games/abuse/distinfo games/abuse/distinfo
index 8e287f9..46e44922 100644
--- games/abuse/distinfo
+++ games/abuse/distinfo
@@ -1,10 +1,10 @@
-MD5 (abuse-0.7.1.tar.gz) = Q5tgfykVYKj5aYovCc/6Yw==
-MD5 (abuse-frabs-2.11.tar.gz) = Bob5USif5RSEaQO6s2ogeQ==
-RMD160 (abuse-0.7.1.tar.gz) = ZgLXcVcGTgpyjlXKpjsEX3E755A=
-RMD160 (abuse-frabs-2.11.tar.gz) = lupu8DHRC6AuBw630qzbyFAlAk8=
-SHA1 (abuse-0.7.1.tar.gz) = B8IrMGlU6rHgv0qKdEGuAPwQdyk=
-SHA1 (abuse-frabs-2.11.tar.gz) = Jpny9M78XlKe7ICOggiq15beNt4=
-SHA256 (abuse-0.7.1.tar.gz) = FRahnvwbiXFahUkQmg2HtxUC2U/Yt4KULjNbZ4Kh3Vc=
-SHA256 (abuse-frabs-2.11.tar.gz) = bMvfSnVLus18B7CfTwyAW+8506U3qtuwzU0GrVCs/bg=
-SIZE (abuse-0.7.1.tar.gz) = 719285
-SIZE (abuse-frabs-2.11.tar.gz) = 4819133
+MD5 (abuse-free-0.8.tar.gz) = BZ3n6JHxo041yc5bBUAz0g==
+MD5 (abuse-free-sounds-20120309.tar.gz) = Qkaum3uwnyLc1g/7QCvJ0g==
+RMD160 (abuse-free-0.8.tar.gz) = ZhwF/H
Re: getdelim/getline fallout
Hi.
On Sunday 18 March 2012 23:36:46 Christian Weisgerber wrote:
Antti Harri:
Makes sense. Can someone check the attached tarball? I'm sure it has room
for improvement as I did it pretty hastily. I'm going to call it a day so
I'm submitting it now. :-)
Can some of the pkgpath/conflict markers be combined and are they
correct?
They look fine to me. I think we'll also need quirk entries, won't
we?
These ports will need to have their dependencies updated:
editors/libreoffice
graphics/makehuman
sysutils/backintime/common
Added these. Makehuman still builds with the new coreutils,
don't know how to use backintime so I didn't try that and
libreoffice takes too long to build here.
Does the .so in libexec need special handling?
Theoretically, this and the rest of the (g)stdbuf command should
go into PFRAG.shared. In practice, I can't find any provisions for
platforms without dynamic linking. We could disable the port for
NO_SHARED_ARCHS, but I think it's better to allow building it there
and accept that some parts won't work. The sole affected arch,
vax, can't uncompress the tarball anyway.
Some further comments:
I think the port should go into sysutils. That's probably sufficient
for CATEGORIES, too.
OK, but what's the point in CATEGORIES anyway? Manual says it should contain
at least one descriptive category, but everyone just puts main category in
it. The ports framework could get that info automatically, couldn't it? So it
feels kind of redundant variable to me.
Why did you add NO_REGRESS? This is wrong.
Fixed, thanks.
The configure script tries to pick up gmp. I have no particular
opinion whether we want this, it only affects the factor and expr
commands, but we should either fully enable it (LIB_DEPENDS,
CPPFLAGS/LDFLAGS) or disable it (--without-gmp).
I left it out and added --without-gmp.
Attached a new tarball of sysutils/coreutils and the rest follows as
a diff.
--
Antti Harri
diff --git devel/quirks/Makefile devel/quirks/Makefile
index d23e988..5e596b2 100644
--- devel/quirks/Makefile
+++ devel/quirks/Makefile
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-1.63
+PKGNAME = quirks-1.64
PKG_ARCH = *
MAINTAINER = Marc Espie es...@openbsd.org
diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
index 564820c..d8394c8 100644
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -283,7 +283,11 @@ my $stem_extensions = {
'gpsbabel-gui' = 'gpsbabel-tk',
'gnome-extras' = 'gnome-extra',
'maatkit' = 'percona-toolkit',
- 'scrotwm' = 'spectrwm'
+ 'scrotwm' = 'spectrwm',
+ 'gnuls' = 'coreutils',
+ 'sh-utils' = 'coreutils',
+ 'fileutils' = 'coreutils',
+ 'textutils' = 'coreutils'
};
# -is_base_system($handle, $state):
diff --git editors/libreoffice/Makefile editors/libreoffice/Makefile
index 30aadf0..dfc0fe7 100644
--- editors/libreoffice/Makefile
+++ editors/libreoffice/Makefile
@@ -128,9 +128,8 @@ BUILD_DEPENDS+= archivers/zip \
archivers/p5-Archive-Zip \
print/cups \
boost-=1.41.0:devel/boost \
- misc/fileutils \
misc/findutils \
- textproc/textutils
+ sysutils/coreutils
MODULES+= lang/python \
devel/gettext
diff --git graphics/makehuman/Makefile graphics/makehuman/Makefile
index 91285b7..1889764 100644
--- graphics/makehuman/Makefile
+++ graphics/makehuman/Makefile
@@ -23,7 +23,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=makehuman/}
# gtar(1), PaxHeaders
# gcp(1), see pre-configure
TAR= ${LOCALBASE}/bin/gtar
-BUILD_DEPENDS= misc/fileutils \
+BUILD_DEPENDS= sysutils/coreutils \
archivers/gtar
diff --git misc/Makefile misc/Makefile
index e80901d..80d69f4 100644
--- misc/Makefile
+++ misc/Makefile
@@ -24,7 +24,6 @@
SUBDIR += dvtm
SUBDIR += ent
SUBDIR += figlet
- SUBDIR += fileutils
SUBDIR += findutils
SUBDIR += ftdi-eeprom
SUBDIR += garmin-utils
@@ -87,7 +86,6 @@
SUBDIR += screen
SUBDIR += screen,shm
SUBDIR += screen,static
- SUBDIR += sh-utils
SUBDIR += shared-desktop-ontologies
SUBDIR += shared-mime-info
SUBDIR += spdrs60
diff --git sysutils/Makefile sysutils/Makefile
index 8a9a513..fada571 100644
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -31,6 +31,7 @@
SUBDIR += conky,no_x11
SUBDIR += conky,xmms2
SUBDIR += consolekit
+ SUBDIR += coreutils
SUBDIR += crashme
SUBDIR += cyphertite
SUBDIR += d-feet
diff --git sysutils/backintime/common/Makefile
sysutils/backintime/common/Makefile
index e45a8aa..6fb4b42 100644
--- sysutils/backintime/common/Makefile
+++ sysutils/backintime/common/Makefile
@@ -3,12 +3,12 @@
COMMENT= simple backup tool -- common files
PKGNAME= backintime-common-${V}
-REVISION
Re: UPDATE: games/openarena
On Monday 12 March 2012 21:01:44 Ryan Freeman wrote: On Sun, Mar 11, 2012 at 06:16:37PM +0200, Antti Harri wrote: On Sunday 11 March 2012 17:41:03 Kirill Bychkov wrote: Hi. patches/patch-code_sys_sys_unix_c was killed 3 days ago, and you still have this in your diff. Anyway playing with bots on localhost is fine on amd64 On Sunday 11 March 2012 16:12:47 Stuart Henderson wrote: REVISION-data should be zapped, rest reads OK but untested Fixed diff attached. PS. It might be enough on macppc to package this and run openarena-server. Then load any map, for example: map aggressor. That should show if it's using the VM or the interpreter just like openarena-client. Please send me a log of the output to my personal mail if anyone tests this. works good on i386-current built yesterday. played a few matches with bots, and played a match online without issue. Thanks. Anyone willing to commit this? -- Antti Harri
Re: getdelim/getline fallout
On Friday 16 March 2012 23:41:47 Christian Weisgerber wrote: Adding support for getdelim() and getline() causes build failures in 33 ports. Once these are fixed, a few additional failures may appear in dependent ports. There are three groups: [..] (3) GNU software that includes the same broken version of gnulib: misc/fileutils gnulib misc/sh-utils gnulib net/wol gnulib textproc/textutils gnulib Fileutils, sh-utils and textutils have been combined into coreutils package in 2003 according to http://www.gnu.org/software/fileutils/ fileutils. Should those three ports be replaced with a single coreutils or gnucoreutils package instead of fixing those three separately? -- Antti Harri
Re: getdelim/getline fallout
On Saturday 17 March 2012 19:02:46 Christian Weisgerber wrote: Antti Harri i...@openbsd.fi wrote: Fileutils, sh-utils and textutils have been combined into coreutils package in 2003 according to http://www.gnu.org/software/fileutils/ fileutils. Should those three ports be replaced with a single coreutils or gnucoreutils package instead of fixing those three separately? Yes. I also think we should use this opportunity to kill the gnuls subpackage. If people want ls with colors, they are better off with colorls, and if they really insist, they can still install coreutils. Makes sense. Can someone check the attached tarball? I'm sure it has room for improvement as I did it pretty hastily. I'm going to call it a day so I'm submitting it now. :-) Does the .so in libexec need special handling? Can some of the pkgpath/conflict markers be combined and are they correct? Didn't have time to build libc with the getline patch, but I hope the gnu folks have gotten it right in a decade.. -- Antti Harri coreutils.tar.gz Description: application/tgz
Re: NEW: games/chromium-bsu
On Sunday 11 March 2012 23:49:00 Landry Breuil wrote: On Sun, Mar 11, 2012 at 08:57:48PM +0200, Antti Harri wrote: This has been sitting in my tree for almost 2 years, maybe it's time to submit this? :-) Reads good, but lacks run depends on desktop-file-utils for the update-desktop-database lines (which should go at the bottom of PLIST) and no need to add sdl when there's already sdl-image in depends.. same for freealut which depends on openal. With that fixed, ok for me to import. Landry Thanks. Fixed tarball attached. -- Antti Harri chromium-bsu.tar.gz Description: application/tgz
UPDATE: games/openarena
Update to 0.8.8.
I've switched the VM on and tested it succesfully on amd64 and i386. Network
play worked too on amd64. It didn't look like the gethostnameinfo-patch was
needed anymore but I'd appreciate some test reports about networking and if OA
works on macppc.
The two vm patches are from Toni Spets and actually for ioquake3 but they apply
for OA as well, thanks!
The site containing the engine tarball didn't seem too reliable so I decided to
mirror
it myself too.
--
Antti Harri
diff --git games/openarena/Makefile games/openarena/Makefile
index 8e7d2f7..33ccfcb 100644
--- games/openarena/Makefile
+++ games/openarena/Makefile
@@ -10,8 +10,8 @@ MULTI_PACKAGES = -main -server -data
CATEGORIES = games x11
-V =0.8.5
-E_V = 0.8.1 # engine version
+V =0.8.8
+E_V = ${V}# engine version
PKGNAME = openarena-${V}
PKGNAME-main = openarena-${V}
@@ -21,13 +21,14 @@ PKGNAME-data = openarena-data-${V}
PKG_ARCH-data =*
REVISION-data= 0
-DISTNAME = oa${V:S/.//g}
-DISTFILES =${DISTNAME}.zip openarena-engine-${E_V}-1.tar.bz2
+DISTNAME = openarena-${V}
+DISTFILES =${DISTNAME}.zip openarena-engine-source-${E_V}.tar.bz2:0
-MS_PREFIX =http://download.tuxfamily.org/openarena/rel/
HOMEPAGE = http://www.openarena.ws/
-MASTER_SITES = ${MS_PREFIX}/${V:S/.//g}/ \
- ${MS_PREFIX}/${E_V:S/.//g}/source/ \
+MS_PREFIX =http://download.tuxfamily.org/openarena/rel/
+MASTER_SITES = ${MS_PREFIX}${V:S/.//g}/ \
+ ${MS_PREFIX}${E_V:S/.//g}/source/
+MASTER_SITES0 =
http://files.poulsander.com/~poul19/public_files/oa/dev088/ \
http://openbsd.fi/distfiles/
# GPLv2 but contains software with other (free) licenses as well
@@ -37,22 +38,25 @@ PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB-main = GL c m pthread sndio ogg=5 SDL=7 vorbis=7 \
- vorbisfile=5
+ vorbisfile=5 curl
WANTLIB-server = c m
LIB_DEPENDS-main = audio/libogg \
+ audio/libvorbis \
devel/sdl \
- audio/libvorbis
+ net/curl
RUN_DEPENDS-main = ${BASE_PKGPATH},-data
RUN_DEPENDS-server = ${BASE_PKGPATH},-data
-ALL_TARGET = release
USE_GMAKE =Yes
MAKE_FLAGS = USE_OPENAL=0 \
- BINEXT='' \
+ FULLBINEXT='' \
+ V=1 \
DEFAULT_BASEDIR=${LOCALBASE}/share/openarena
-WRKDIST = ${WRKDIR}/openarena-engine-${E_V}
+NO_REGRESS = Yes
+WRKDIST = ${WRKDIR}/openarena-engine-source-${E_V}
+ALL_TARGET = release
post-extract:
find ${WRKDIR} -name '*.orig' -print0 | xargs -0r rm -f
diff --git games/openarena/distinfo games/openarena/distinfo
index fa891e0..dfad2d2 100644
--- games/openarena/distinfo
+++ games/openarena/distinfo
@@ -1,10 +1,10 @@
-MD5 (oa085.zip) = NrxQRfKfzfOBENoPD1kpkw==
-MD5 (openarena-engine-0.8.1-1.tar.bz2) = TuaW6sxLA1D527VYjc10og==
-RMD160 (oa085.zip) = SH1bw959W+u4LB5/rvW4r9F9QfQ=
-RMD160 (openarena-engine-0.8.1-1.tar.bz2) = Ej6fcGIf2FY4XGynrQWAuBRU1oc=
-SHA1 (oa085.zip) = NOn0OMPBjXmMELKwZprU04qKTtY=
-SHA1 (openarena-engine-0.8.1-1.tar.bz2) = beNFwL69h+FAbLBxiVN9uZpCKAg=
-SHA256 (oa085.zip) = +NSSnwa9+LI8k098FFPzsxBuhRaS/eQHlUXmfFiOnEg=
-SHA256 (openarena-engine-0.8.1-1.tar.bz2) =
QwuptpHICFuUbgBPDMiQmVx/gpVJi9jIznRCk6hydNI=
-SIZE (oa085.zip) = 356536552
-SIZE (openarena-engine-0.8.1-1.tar.bz2) = 2951703
+MD5 (openarena-0.8.8.zip) = nzU9lteInDdzSdaSw5BeWw==
+MD5 (openarena-engine-source-0.8.8.tar.bz2) = ypsjm0d61njr94HhTObteg==
+RMD160 (openarena-0.8.8.zip) = 3sfEPCcnI16Xvhqzlo2IA/3XElE=
+RMD160 (openarena-engine-source-0.8.8.tar.bz2) = 6CPBhO/6y0Lp7NKq94nZVwIh6JY=
+SHA1 (openarena-0.8.8.zip) = N6tBmQs3RZgizowv5ZBgdhbh9tE=
+SHA1 (openarena-engine-source-0.8.8.tar.bz2) = ZPMzwpCxW2sOOBncEgs+yiZTNA4=
+SHA256 (openarena-0.8.8.zip) = Wo+vf1tR81GwoWGMBra5il8aZ1jx05gY3iyH3yoLrEo=
+SHA256 (openarena-engine-source-0.8.8.tar.bz2) =
lapQDLfkLlf7H223uXolQWj0+i42dtbNwzGAtp/eDnc=
+SIZE (openarena-0.8.8.zip) = 425189255
+SIZE (openarena-engine-source-0.8.8.tar.bz2) = 3777830
diff --git games/openarena/patches/patch-Makefile
games/openarena/patches/patch-Makefile
index e0fdec2..58b35ab 100644
--- games/openarena/patches/patch-Makefile
+++ games/openarena/patches/patch-Makefile
@@ -1,7 +1,7 @@
$OpenBSD: ports/games/openarena/patches/patch-Makefile,v 1.3 2010/05/27
03:47:28 jakemsr Exp $
Makefile.orig Sat Aug 9 13:22:37 2008
-+++ Makefile Mon May 3 04:26:35 2010
-@@ -143,13 +143,14 @@ endif
+--- Makefile.orig Tue Dec 13 00:48:49 2011
Makefile Wed Mar 7 11:21:26
Re: UPDATE: games/openarena
On Sunday 11 March 2012 17:41:03 Kirill Bychkov wrote:
Hi. patches/patch-code_sys_sys_unix_c was killed 3 days ago, and you still
have this in your diff.
Anyway playing with bots on localhost is fine on amd64
On Sunday 11 March 2012 16:12:47 Stuart Henderson wrote:
REVISION-data should be zapped, rest reads OK but untested
Fixed diff attached.
PS. It might be enough on macppc to package this and run openarena-server.
Then load any map, for example: map aggressor. That should show if it's
using the VM or the interpreter just like openarena-client. Please send
me a log of the output to my personal mail if anyone tests this.
--
Antti Harri
diff --git games/openarena/Makefile games/openarena/Makefile
index b290974..592ba81 100644
--- games/openarena/Makefile
+++ games/openarena/Makefile
@@ -10,27 +10,24 @@ MULTI_PACKAGES =-main -server -data
CATEGORIES = games x11
-V =0.8.5
-E_V = 0.8.1 # engine version
+V =0.8.8
+E_V = ${V}# engine version
PKGNAME = openarena-${V}
PKGNAME-main = openarena-${V}
PKGNAME-server = openarena-server-${V}
PKGNAME-data = openarena-data-${V}
-REVISION-main =0
-REVISION-server = 0
-REVISION-data =0
-
PKG_ARCH-data =*
-DISTNAME = oa${V:S/.//g}
-DISTFILES =${DISTNAME}.zip openarena-engine-${E_V}-1.tar.bz2
+DISTNAME = openarena-${V}
+DISTFILES =${DISTNAME}.zip openarena-engine-source-${E_V}.tar.bz2:0
-MS_PREFIX =http://download.tuxfamily.org/openarena/rel/
HOMEPAGE = http://www.openarena.ws/
-MASTER_SITES = ${MS_PREFIX}/${V:S/.//g}/ \
- ${MS_PREFIX}/${E_V:S/.//g}/source/ \
+MS_PREFIX =http://download.tuxfamily.org/openarena/rel/
+MASTER_SITES = ${MS_PREFIX}${V:S/.//g}/ \
+ ${MS_PREFIX}${E_V:S/.//g}/source/
+MASTER_SITES0 =
http://files.poulsander.com/~poul19/public_files/oa/dev088/ \
http://openbsd.fi/distfiles/
# GPLv2 but contains software with other (free) licenses as well
@@ -40,22 +37,25 @@ PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB-main = GL c m pthread sndio ogg=5 SDL=7 vorbis=7 \
- vorbisfile=5
+ vorbisfile=5 curl
WANTLIB-server = c m
LIB_DEPENDS-main = audio/libogg \
+ audio/libvorbis \
devel/sdl \
- audio/libvorbis
+ net/curl
RUN_DEPENDS-main = ${BASE_PKGPATH},-data
RUN_DEPENDS-server = ${BASE_PKGPATH},-data
-ALL_TARGET = release
USE_GMAKE =Yes
MAKE_FLAGS = USE_OPENAL=0 \
- BINEXT='' \
+ FULLBINEXT='' \
+ V=1 \
DEFAULT_BASEDIR=${LOCALBASE}/share/openarena
-WRKDIST = ${WRKDIR}/openarena-engine-${E_V}
+NO_REGRESS = Yes
+WRKDIST = ${WRKDIR}/openarena-engine-source-${E_V}
+ALL_TARGET = release
post-extract:
find ${WRKDIR} -name '*.orig' -print0 | xargs -0r rm -f
diff --git games/openarena/distinfo games/openarena/distinfo
index fa891e0..dfad2d2 100644
--- games/openarena/distinfo
+++ games/openarena/distinfo
@@ -1,10 +1,10 @@
-MD5 (oa085.zip) = NrxQRfKfzfOBENoPD1kpkw==
-MD5 (openarena-engine-0.8.1-1.tar.bz2) = TuaW6sxLA1D527VYjc10og==
-RMD160 (oa085.zip) = SH1bw959W+u4LB5/rvW4r9F9QfQ=
-RMD160 (openarena-engine-0.8.1-1.tar.bz2) = Ej6fcGIf2FY4XGynrQWAuBRU1oc=
-SHA1 (oa085.zip) = NOn0OMPBjXmMELKwZprU04qKTtY=
-SHA1 (openarena-engine-0.8.1-1.tar.bz2) = beNFwL69h+FAbLBxiVN9uZpCKAg=
-SHA256 (oa085.zip) = +NSSnwa9+LI8k098FFPzsxBuhRaS/eQHlUXmfFiOnEg=
-SHA256 (openarena-engine-0.8.1-1.tar.bz2) =
QwuptpHICFuUbgBPDMiQmVx/gpVJi9jIznRCk6hydNI=
-SIZE (oa085.zip) = 356536552
-SIZE (openarena-engine-0.8.1-1.tar.bz2) = 2951703
+MD5 (openarena-0.8.8.zip) = nzU9lteInDdzSdaSw5BeWw==
+MD5 (openarena-engine-source-0.8.8.tar.bz2) = ypsjm0d61njr94HhTObteg==
+RMD160 (openarena-0.8.8.zip) = 3sfEPCcnI16Xvhqzlo2IA/3XElE=
+RMD160 (openarena-engine-source-0.8.8.tar.bz2) = 6CPBhO/6y0Lp7NKq94nZVwIh6JY=
+SHA1 (openarena-0.8.8.zip) = N6tBmQs3RZgizowv5ZBgdhbh9tE=
+SHA1 (openarena-engine-source-0.8.8.tar.bz2) = ZPMzwpCxW2sOOBncEgs+yiZTNA4=
+SHA256 (openarena-0.8.8.zip) = Wo+vf1tR81GwoWGMBra5il8aZ1jx05gY3iyH3yoLrEo=
+SHA256 (openarena-engine-source-0.8.8.tar.bz2) =
lapQDLfkLlf7H223uXolQWj0+i42dtbNwzGAtp/eDnc=
+SIZE (openarena-0.8.8.zip) = 425189255
+SIZE (openarena-engine-source-0.8.8.tar.bz2) = 3777830
diff --git games/openarena/patches/patch-Makefile
games/openarena/patches/patch-Makefile
index e0fdec2..58b35ab 100644
--- games/openarena/patches/patch-Makefile
+++ games/openarena/patches/patch-Makefile
@@ -1,7 +1,7 @@
$OpenBSD: ports/games/openarena/patches/patch
NEW: games/chromium-bsu
This has been sitting in my tree for almost 2 years, maybe it's time to submit this? :-) Comment: fast paced arcade-style space shooter Description: You are captain of the cargo ship Chromium B.S.U., responsible for delivering supplies to our troops on the front line. Your ship has a small fleet of robotic fighters which you control from the relative safety of the Chromium vessel. http://reptilelabour.com/software/chromium/screen0.htm http://reptilelabour.com/software/chromium/screen1.htm http://reptilelabour.com/software/chromium/screen2.htm -- Antti Harri chromium-bsu.tar.gz Description: application/tgz
Re: NEW: games/duke3ddata
On Friday 09 March 2012 12:27:24 Ryan Freeman wrote: here is a a port to fetch and install the duke3d shareware episode, for use with the eduke32 port. thanks edd! Typo here: SEPERATE_BUILD =concurrent You didn't import my Makefile patch. -- Antti Harri
UPDATE: games/abuse
Update to 0.8:
Frabs was reorganized and put into main distribution in
upstream so remove here.
Bundle abuse-free-sounds-20120309 that has free sounds
we can package. Most of the sounds that matter are available.
--
Antti Harri
diff --git games/abuse/Makefile games/abuse/Makefile
index f22cf3d..815593d 100644
--- games/abuse/Makefile
+++ games/abuse/Makefile
@@ -2,61 +2,73 @@
COMMENT = SDL port of the legendary 2D platform shooter
-DISTNAME = abuse-0.7.1
-REVISION = 1
+DISTNAME = abuse-free-0.8
+PKGNAME = abuse-0.8
EPOCH =0
-ABUSE_FRABS = abuse-frabs-2.11
+ABUSE_SFX =abuse-free-sounds-20120309
CATEGORIES = games x11
HOMEPAGE = http://abuse.zoy.org/
MAINTAINER = Antti Harri i...@openbsd.fi
-# GPLv2 and public domain
+# Abuse: GPLv2 and public domain
+# Abuse-free-sounds: various free licenses
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = c m pthread GL stdc++ usbhid SDL sndio X11 Xau Xdamage \
- Xdmcp Xext Xfixes Xxf86vm drm pthread-stubs xcb
+WANTLIB += FLAC GL SDL SDL_mixer X11 Xext Xrandr Xrender c iconv
+WANTLIB += m mikmod ogg pthread smpeg sndio stdc++ usbhid vorbis
+WANTLIB += vorbisfile xcb
-MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/Downloads/
+MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/download/
+MASTER_SITES0 =http://openbsd.fi/dist/
MODULES = converters/libiconv
# Needs AC_PROG_LIBTOOL
BUILD_DEPENDS =devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
-LIB_DEPENDS = devel/sdl
-
-DISTFILES =${DISTNAME}.tar.gz ${ABUSE_FRABS}.tar.gz
-EXTRACT_ONLY = ${DISTNAME}.tar.gz
+RUN_DEPENDS = audio/timidity
+LIB_DEPENDS = devel/sdl \
+ devel/sdl-mixer \
+ devel/smpeg \
+ audio/flac \
+ audio/libogg \
+ audio/libmikmod \
+ audio/libvorbis
+
+DISTFILES =${DISTNAME}.tar.gz \
+ ${ABUSE_SFX}.tar.gz:0
USE_LIBTOOL = Yes
-AUTOCONF_VERSION = 2.61
-AUTOMAKE_VERSION = 1.10
CONFIGURE_STYLE = gnu
-
-CONFIGURE_ENV =CPPFLAGS=-I${X11BASE}/include \
- LDFLAGS=-L${X11BASE}/lib
+CONFIGURE_ARGS = --enable-release \
+ --disable-nonfree \
+ --with-assetdir=${PREFIX}/share/abuse \
+ --datadir=${PREFIX}/share/abuse
+AUTOMAKE_VERSION = 1.11
+AUTOCONF_VERSION = 2.68
NO_REGRESS = Yes
-DATADIR = ${PREFIX}/share/abuse/frabs
-SUBST_VARS = DATADIR
+
+post-patch:
+ cd ${WRKSRC} \
+ find ${WRKDIR}/${ABUSE_SFX}/patches/ -name 'patch-*' \
+ -exec patch -z .afs-orig -i {} \;
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/src/sdlport/setup.cpp
- cd ${WRKSRC}; \
+ cd ${WRKSRC} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
autoreconf -fi
post-install:
- cd ${PREFIX}/share/abuse \
- gzip -dc ${FULLDISTDIR}/${ABUSE_FRABS}.tar.gz | \
- tar xf - \
- mv ${ABUSE_FRABS} frabs
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/abuse/sfx
+ cd ${WRKDIR}/${ABUSE_SFX}/sfx find . -type f -exec \
+ ${INSTALL_DATA} {} ${PREFIX}/share/abuse/sfx/ \;
.include bsd.port.mk
diff --git games/abuse/distinfo games/abuse/distinfo
index 8e287f9..46e44922 100644
--- games/abuse/distinfo
+++ games/abuse/distinfo
@@ -1,10 +1,10 @@
-MD5 (abuse-0.7.1.tar.gz) = Q5tgfykVYKj5aYovCc/6Yw==
-MD5 (abuse-frabs-2.11.tar.gz) = Bob5USif5RSEaQO6s2ogeQ==
-RMD160 (abuse-0.7.1.tar.gz) = ZgLXcVcGTgpyjlXKpjsEX3E755A=
-RMD160 (abuse-frabs-2.11.tar.gz) = lupu8DHRC6AuBw630qzbyFAlAk8=
-SHA1 (abuse-0.7.1.tar.gz) = B8IrMGlU6rHgv0qKdEGuAPwQdyk=
-SHA1 (abuse-frabs-2.11.tar.gz) = Jpny9M78XlKe7ICOggiq15beNt4=
-SHA256 (abuse-0.7.1.tar.gz) = FRahnvwbiXFahUkQmg2HtxUC2U/Yt4KULjNbZ4Kh3Vc=
-SHA256 (abuse-frabs-2.11.tar.gz) = bMvfSnVLus18B7CfTwyAW+8506U3qtuwzU0GrVCs/bg=
-SIZE (abuse-0.7.1.tar.gz) = 719285
-SIZE (abuse-frabs-2.11.tar.gz) = 4819133
+MD5 (abuse-free-0.8.tar.gz) = BZ3n6JHxo041yc5bBUAz0g==
+MD5 (abuse-free-sounds-20120309.tar.gz) = Qkaum3uwnyLc1g/7QCvJ0g==
+RMD160 (abuse-free-0.8.tar.gz) = ZhwF/H/nkMmwn8b9cNS9nGKjZKo=
+RMD160 (abuse-free-sounds-20120309.tar.gz) = xK314/twqQxu5zTJYs1gboj9GFg=
+SHA1 (abuse-free-0.8.tar.gz) = TWGDEgY5r97XxhZvbi6vNuQb0oU=
+SHA1 (abuse-free-sounds-20120309.tar.gz) = 4Lsa9x6pTiiUs/fMZFiTSO1QTNw=
+SHA256 (abuse-free-0.8.tar.gz) = dOG/00l9WhfYvp9QhmY8k5vO7lGxHFhhA1D5pwwv1cc=
+SHA256 (abuse-free-sounds-20120309.tar.gz) =
rpXLao8feB0gUXghLRutdrPWRrJ8akGYUPYeY2Z9Dl0=
+SIZE (abuse-free-0.8.tar.gz) = 4347621
+SIZE (abuse-free-sounds-20120309.tar.gz) = 3256805
diff --git games/abuse/patches/patch-Makefile_am
games/abuse/patches/patch-Makefile_am
deleted file mode 100644
index 0c5f3ae
Re: NEW: games/eduke32 (again)
On Wednesday 07 March 2012 01:15:30 Ryan Freeman wrote:
Attached is the still-building port of eduke32 that I have
been sitting on for far too long. Antti Harri did most of
the initial work of getting fixes pushed upstream.
I have pulled a recent snapshot from their repos, and
as those are done daily, we may wish to wait for a real
release, if those happen. Here you go, Edd!
-ryan
Hi, I took a quick look at this. Was the port honoring CC for you?
Didn't seem to work for me. Anyway using MAKE_FLAGS is cleaner.
Removed the hard-coded optimizations and disabled debugging.
PS. The entry pointing to my dist site isn't working anymore because
it only contains the previous snapshot. Let me know if it's still needed
and I'll put the new one on my server where I have all the other distfiles.
--
Antti Harri
diff -uNr eduke32/Makefile /usr/ports/games/eduke32/Makefile
--- eduke32/MakefileWed Mar 7 01:01:18 2012
+++ /usr/ports/games/eduke32/Makefile Wed Mar 7 09:44:39 2012
@@ -41,7 +41,7 @@
3dduke13.zip:0
SEPERATE_BUILD = concurrent
-MAKE_FLAGS = PRETTY_OUTPUT=0 DEBUGANYWAY=1
+MAKE_FLAGS = PRETTY_OUTPUT=0 CC=${CC} CXX=${CXX}
USE_GMAKE =Yes
NO_REGRESS = Yes
diff -uNr eduke32/patches/patch-Makefile_common
/usr/ports/games/eduke32/patches/patch-Makefile_common
--- eduke32/patches/patch-Makefile_common Thu May 26 00:44:16 2011
+++ /usr/ports/games/eduke32/patches/patch-Makefile_common Wed Mar 7
09:48:33 2012
@@ -1,15 +1,11 @@
$OpenBSD$
-
-Make build honor CC
-
Makefile.common.orig Wed May 25 10:52:37 2011
-+++ Makefile.commonWed May 25 10:53:18 2011
-@@ -56,8 +56,6 @@ endif
+--- Makefile.common.orig Wed Mar 7 09:48:09 2012
Makefile.commonWed Mar 7 09:48:29 2012
+@@ -89,7 +89,6 @@ endif
-
- # Tools
--CC=gcc
--CXX=g++
- AS=nasm
- AR=ar
- RC=windres
+ ifneq (0,$(RELEASE))
+ # Debugging disabled
+-debug+= -O$(OPTLEVEL)
+ ifneq ($(CC),clang)
+ debug+= -funswitch-loops
+ endif
diff -uNr eduke32/patches/patch-build_src_glbuild_c
/usr/ports/games/eduke32/patches/patch-build_src_glbuild_c
--- eduke32/patches/patch-build_src_glbuild_c Thu May 26 00:45:35 2011
+++ /usr/ports/games/eduke32/patches/patch-build_src_glbuild_c Wed Mar 7
09:45:40 2012
@@ -3,9 +3,9 @@
allow dlopen to find our libGL.so, falling back to libGL.so.1 for
linux or others.
build/src/glbuild.c.orig Sat Jan 15 18:50:27 2011
-+++ build/src/glbuild.cWed May 25 11:28:36 2011
-@@ -330,6 +330,8 @@ int32_t loadgldriver(const char *driver)
+--- build/src/glbuild.c.orig Tue Oct 11 19:52:53 2011
build/src/glbuild.cWed Mar 7 09:45:03 2012
+@@ -338,6 +338,8 @@ int32_t loadgldriver(const char *driver)
driver = opengl32.dll;
#elif defined __APPLE__
driver = /System/Library/Frameworks/OpenGL.framework/OpenGL;
@@ -14,7 +14,7 @@
#else
driver = libGL.so.1;
#endif
-@@ -921,6 +923,8 @@ int32_t loadglulibrary(const char *driver)
+@@ -936,6 +938,8 @@ int32_t loadglulibrary(const char *driver)
driver = glu32.dll;
#elif defined __APPLE__
driver = /System/Library/Frameworks/OpenGL.framework/OpenGL; //
FIXME: like I know anything about Apple. Hah.
Re: make sdl dlopen the correct libraries
On Saturday 03 March 2012 11:25:17 Jonathan Gray wrote: The configure script for sdl selects the wrong libraries to dlopen, ie it picked libX11.so.10.0 on a system with libX11.so.9 - 15 With the following diff sdl programs no longer segfault here. [snip] I started seeing this too when I updated to the newer sdl today. This fixes it for me on amd64, thanks. -- Antti Harri
Re: UPDATE: games/openxcom
On Friday 17 February 2012 21:24:18 Antti Harri wrote: Update to 2012-02-17 snapshot Hilights: - cleaner cmake based build - data paths implemented correctly in upstream - simple AI in battlescape Improved diff at http://openbsd.fi/dist/openxcom-r0.diff (one that shouldn't be mangled by my MUA). Changes to previous: - turn development build off - don't recurse into docs to build API documentation - mention other alternatives for data in readme Thanks to Kirill Bychkov for pointing some issues. I'd appreciate some test reports how the new data handling works. -- Antti Harri
UPDATE: devel/yaml-cpp
Update to 0.3.0. -- Antti Harri diff --git devel/yaml-cpp/Makefile devel/yaml-cpp/Makefile index 7797272..b343061 100644 --- devel/yaml-cpp/Makefile +++ devel/yaml-cpp/Makefile @@ -1,9 +1,9 @@ # $OpenBSD: ports/devel/yaml-cpp/Makefile,v 1.1.1.1 2011/05/11 16:55:30 ajacoutot Exp $ COMMENT = YAML parser and emitter in C++ -DISTNAME = yaml-cpp-0.2.6 +DISTNAME = yaml-cpp-0.3.0 -SHARED_LIBS = yaml-cpp0.0 # 0.2 +SHARED_LIBS = yaml-cpp1.0 # 0.3 CATEGORIES = devel diff --git devel/yaml-cpp/distinfo devel/yaml-cpp/distinfo index e93847d..f44ce04 100644 --- devel/yaml-cpp/distinfo +++ devel/yaml-cpp/distinfo @@ -1,5 +1,5 @@ -MD5 (yaml-cpp-0.2.6.tar.gz) = 3fpejUCdna++ttGQzWjbyw== -RMD160 (yaml-cpp-0.2.6.tar.gz) = t/TnYmeuFeMg6ojORUnu03UPOlY= -SHA1 (yaml-cpp-0.2.6.tar.gz) = UUHFo77svoDmdy09ns4dZolAkG8= -SHA256 (yaml-cpp-0.2.6.tar.gz) = ct2fvHVJ53dWoTWHKeV4n0rHE0mcN1hW9kk/SYoditw= -SIZE (yaml-cpp-0.2.6.tar.gz) = 74708 +MD5 (yaml-cpp-0.3.0.tar.gz) = mqUZIFpUP5Nyv0F5BxyKxg== +RMD160 (yaml-cpp-0.3.0.tar.gz) = C3d/ldhY2ehAr6n5Lu/+937KJLU= +SHA1 (yaml-cpp-0.3.0.tar.gz) = KHZu+pXxsPaXxLShWAqZcr58nEE= +SHA256 (yaml-cpp-0.3.0.tar.gz) = LNA4taFYO2dF6UnhlvulJfbQ1f00BWZYX94k/H4Re4I= +SIZE (yaml-cpp-0.3.0.tar.gz) = 82674 diff --git devel/yaml-cpp/pkg/PLIST devel/yaml-cpp/pkg/PLIST index 6dc5b32..1edfa6d 100644 --- devel/yaml-cpp/pkg/PLIST +++ devel/yaml-cpp/pkg/PLIST @@ -3,7 +3,10 @@ include/yaml-cpp/ include/yaml-cpp/aliasmanager.h include/yaml-cpp/anchor.h -include/yaml-cpp/anchordict.h +include/yaml-cpp/binary.h +include/yaml-cpp/contrib/ +include/yaml-cpp/contrib/anchordict.h +include/yaml-cpp/contrib/graphbuilder.h include/yaml-cpp/conversion.h include/yaml-cpp/dll.h include/yaml-cpp/emitfromevents.h @@ -11,7 +14,6 @@ include/yaml-cpp/emitter.h include/yaml-cpp/emittermanip.h include/yaml-cpp/eventhandler.h include/yaml-cpp/exceptions.h -include/yaml-cpp/graphbuilder.h include/yaml-cpp/iterator.h include/yaml-cpp/ltnode.h include/yaml-cpp/mark.h
UPDATE: games/openxcom
Update to 2012-02-17 snapshot Hilights: - cleaner cmake based build - data paths implemented correctly in upstream - simple AI in battlescape -- Antti Harri
Re: UPDATE: games/openxcom
On Friday 17 February 2012 21:24:18 Antti Harri wrote:
Update to 2012-02-17 snapshot
Hilights:
- cleaner cmake based build
- data paths implemented correctly in upstream
- simple AI in battlescape
Forgot to attach the patch.
--
Antti Harri
diff --git games/openxcom/Makefile games/openxcom/Makefile
index f2e2d50..fd10bd3 100644
--- games/openxcom/Makefile
+++ games/openxcom/Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: ports/games/openxcom/Makefile,v 1.2 2011/07/18 10:57:01 jasper Exp
$
COMMENT = open source reimplementation of the original X-Com
-DISTNAME = openxcom-20110716
+DISTNAME = openxcom-20120217
CATEGORIES = games x11
HOMEPAGE = http://openxcom.ninex.info/
@@ -17,28 +17,21 @@ WANTLIB = SDL SDL_gfx SDL_mixer c m pthread
stdc++ yaml-cpp
MASTER_SITES = http://openbsd.fi/dist/
+MODULES = devel/cmake
+
RUN_DEPENDS = audio/timidity
LIB_DEPENDS = devel/sdl-gfx \
devel/sdl-mixer \
devel/yaml-cpp
-MAKE_ENV = CXX=${CXX} CXXFLAGS=${CXXFLAGS} \
- OPENXCOMDATA=${PREFIX}/share/openxcom/DATA
-
-USE_GMAKE =Yes
NO_REGRESS = Yes
-WRKSRC = ${WRKDIST}/src
-
-post-extract:
- ${SUBST_CMD} -c ${FILESDIR}/wrapper ${WRKDIST}/bin/wrapper
+VMEM_WARNING = Yes
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/Makefile
+ ${SUBST_CMD} ${WRKSRC}/src/Engine/CrossPlatform.cpp
-do-install:
- ${INSTALL_PROGRAM} ${WRKDIST}/bin/openxcom ${PREFIX}/bin/openxcom-bin
- ${INSTALL_SCRIPT} ${WRKDIST}/bin/wrapper ${PREFIX}/bin/openxcom
+post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/openxcom
- cd ${WRKDIST}/bin find DATA | pax -rw ${PREFIX}/share/openxcom
+ cd ${WRKDIST}/bin/data find . | pax -rw ${PREFIX}/share/openxcom
.include bsd.port.mk
diff --git games/openxcom/distinfo games/openxcom/distinfo
index ceaee9d..5fd99d4 100644
--- games/openxcom/distinfo
+++ games/openxcom/distinfo
@@ -1,5 +1,5 @@
-MD5 (openxcom-20110716.tar.gz) = +S9cofV1dyP0akxFj9cPtw==
-RMD160 (openxcom-20110716.tar.gz) = 3djvZpkRYMs/mPeVuPDEgRpvhSQ=
-SHA1 (openxcom-20110716.tar.gz) = +jTG6QV4MkKm2SRJD7z1QtgPIQo=
-SHA256 (openxcom-20110716.tar.gz) =
xbk9RTItTYsAngNzrdrG99pY4Ulw/DEu/bQT/icae+k=
-SIZE (openxcom-20110716.tar.gz) = 495766
+MD5 (openxcom-20120217.tar.gz) = WKSqCfA1H+qa5f1HKZpPnQ==
+RMD160 (openxcom-20120217.tar.gz) = 1YyeawdWv4ZtoMxVbOzxCoTHoUA=
+SHA1 (openxcom-20120217.tar.gz) = rM7YTjcHdmyUujbU0VdRd58240o=
+SHA256 (openxcom-20120217.tar.gz) =
6w+v4FL2wSHVolPJpo19nX8wV1lIhsy52faasM+WbfA=
+SIZE (openxcom-20120217.tar.gz) = 778431
diff --git games/openxcom/files/wrapper games/openxcom/files/wrapper
deleted file mode 100755
index df3aa2c..000
--- games/openxcom/files/wrapper
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# Wrapper for running OpenXcom.
-
-# Test case-insensitively and pick the first one.
-dir=$(find \
- ${HOME}/.openxcom/DATA \
- ${TRUEPREFIX}/share/openxcom/DATA \
- -mindepth 1 -maxdepth 1 -iname geodata 2/dev/null | head -n 1)
-dir=${dir%/*/*}
-
-if [ -z $dir ]; then
- echo Error: no data available.
- echo Look in ${TRUEPREFIX}/share/doc/pkg-readmes for extra
documentation.
- exit 1
-fi
-
-cd $dir openxcom-bin $@
diff --git games/openxcom/patches/patch-src_CMakeLists_txt
games/openxcom/patches/patch-src_CMakeLists_txt
new file mode 100644
index 000..20d0eed
--- /dev/null
+++ games/openxcom/patches/patch-src_CMakeLists_txt
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- src/CMakeLists.txt.origThu Feb 16 17:24:58 2012
src/CMakeLists.txt Fri Feb 17 20:54:58 2012
+@@ -530,10 +530,10 @@ if ( WIN32 )
+ endif ()
+ target_link_libraries ( openxcom ${system_libs} ${SDLMIXER_LIBRARY}
${SDLGFX_LIBRARY} ${SDL_LIBRARY} ${YAMLCPP_LIBRARY} )
+
+-add_custom_command ( TARGET openxcom
+- POST_BUILD
+- COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/data
${EXECUTABLE_OUTPUT_PATH}/data )
+-install ( DIRECTORY ${CMAKE_SOURCE_DIR}/bin/data DESTINATION bin )
++#add_custom_command ( TARGET openxcom
++# POST_BUILD
++# COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/data
${EXECUTABLE_OUTPUT_PATH}/data )
++#install ( DIRECTORY ${CMAKE_SOURCE_DIR}/bin/data DESTINATION bin )
+
+ # Copy Windows DLL to bin folder
+ if ( WIN32 )
diff --git games/openxcom/patches/patch-src_Engine_CrossPlatform_cpp
games/openxcom/patches/patch-src_Engine_CrossPlatform_cpp
new file mode 100644
index 000..d62f006
--- /dev/null
+++ games/openxcom/patches/patch-src_Engine_CrossPlatform_cpp
@@ -0,0 +1,27 @@
+$OpenBSD$
+--- src/Engine/CrossPlatform.cpp.orig Thu Feb 16 17:24:58 2012
src/Engine/CrossPlatform.cpp Fri Feb 17 21:17:42 2012
+@@ -145,6 +145,11 @@ std::vectorstd::string findDataFolders()
+ snprintf(path, MAXPATHLEN, %s/Library/Application
Support
Re: mplayer: fix and complete sndio backend
On Wednesday 25 January 2012 00:32:58 Alexandre Ratchov wrote: Below is an update of mplayer sndio backend: - use sndiod volume knob if available, rather than chaining two soft volume knobs (consumes less CPU) - stop audio during pause, consumes less CPU - remove unnecessary checks - honour AOPLAY_FINAL_CHUNK flag, fixes playback of very short files comments? ok? [diff] Tested on amd64, I can confirm it fixes the playback of short files and it also seems transition to another file a lot more smooth, thanks! There is still the (non audio) issue with stream playlists. It should be fixed in upstream already so the best way probably is to update the whole package at some point. For test urls go to digitally imported radio and use the url on the command line, it works when the playlist is fetched to a local file. -- Antti Harri
Re: New port - need help
On Wednesday 11 January 2012 21:25:34 Brian Callahan wrote: I can 'make build' and 'make fake' successfully, however when I issue 'make plist' like the Porter's Handbook says, no PLIST is generated. Not having a PLIST makes 'make package' fail. Is there something I'm missing? The port probably doesn't install anything or the install-target in the software is called something else. Add do-install target to your port and install them yourself directly in the port. Take a look at existing ports for examples. Another possibility is that it installs the software incorrectly, it might not support DESTDIR or something like that. Try adding USE_SYSTRACE=Yes to your port, so it will fail until you fix it to install the files correctly. Try to get this fix into upstream as well. -- Antti Harri
UPDATE: games/quake
Hi, trivial update to 0.6.0 which was just released. -- Antti Harri diff --git games/quake/Makefile games/quake/Makefile index fee95a9..313dbd1 100644 --- games/quake/Makefile +++ games/quake/Makefile @@ -7,13 +7,12 @@ COMMENT-server = QuakeWorld server # .so.1.0 SOMAJOR = 0 SOMINOR = 0 -V =0.5.99beta2 +V =0.6.0 DISTNAME = quakeforge-$V PKGNAME-main = quake-$V PKGNAME-libs = quake-libs-$V FULLPKGNAME-server = quakeworld-server-$V FULLPKGPATH-server = games/quake,-server -REVISION-main =0 EPOCH-main = 0 EPOCH-libs = 0 EPOCH-server = 1 diff --git games/quake/distinfo games/quake/distinfo index 69a9e47..8cfba69 100644 --- games/quake/distinfo +++ games/quake/distinfo @@ -1,5 +1,5 @@ -MD5 (quakeforge-0.5.99beta2.tar.bz2) = DGQHZKirTK5m2YEtvWBB2A== -RMD160 (quakeforge-0.5.99beta2.tar.bz2) = VsZKaRhsf27dKsj98sJ51x2bg6k= -SHA1 (quakeforge-0.5.99beta2.tar.bz2) = yFQUS3ZsT7Udtis3W5A9NasAo3o= -SHA256 (quakeforge-0.5.99beta2.tar.bz2) = AUeUpaOTjceLXYVzfZl/CzGjl0HvjcpdDD8HVeZOS9c= -SIZE (quakeforge-0.5.99beta2.tar.bz2) = 2501755 +MD5 (quakeforge-0.6.0.tar.bz2) = rWDVwttQ0xh0EV+ysCU/Cg== +RMD160 (quakeforge-0.6.0.tar.bz2) = efr4st5ns8ls6PBvAju+NlT2oQM= +SHA1 (quakeforge-0.6.0.tar.bz2) = eikQ/v2bJJZX/lfPX57oT+xjJnA= +SHA256 (quakeforge-0.6.0.tar.bz2) = xXIK4lcevztUR6LIdkq/MSDKbzlJAx6M7fOFiRmE6uo= +SIZE (quakeforge-0.6.0.tar.bz2) = 2507190
Re: update: devel/rats 2.3
On Tuesday 20 December 2011 00:02:58 Jan Klemkow wrote: What do I have to do to get this thing into the ports tree? Don't know but remove the maintainer too. I have a mail somewhere where he says it should be removed (as well as in other ports he is marked as maintainer). Also see my diff for rats: http://marc.info/?l=openbsd-portsm=126923881404060w=2 -- Antti Harri
Re: [update] zsh 4.3.14
On Thursday 15 December 2011 16:58:42 Pierre-Emmanuel André wrote:
Hi,
Little diff to update zsh to it's latest version. It
also includes a diff from Antti Harri to fix pgrep completion.
Tested on @amd64.
Comments, OK ?
Works on amd64.
Would it be nicer to remove @comment lines for .orig and add this to the
post-install:
find ${WRKINST} -type f -name '*.orig' -print0 | xargs -0r rm
--
Antti Harri
UPDATE: multimedia/yle-dl
Bugfix update to 1.4.6.
--
Antti Harri
diff --git multimedia/yle-dl/Makefile multimedia/yle-dl/Makefile
index 81045ba..85a10c4 100644
--- multimedia/yle-dl/Makefile
+++ multimedia/yle-dl/Makefile
@@ -1,6 +1,6 @@
# $OpenBSD: ports/multimedia/yle-dl/Makefile,v 1.1.1.1 2011/10/19 09:16:08
sthen Exp $
-V =1.4.4
+V =1.4.6
COMMENT = download videos from YLE Areena
DISTNAME = rtmpdump-yle-$V
PKGNAME = yle-dl-$V
diff --git multimedia/yle-dl/distinfo multimedia/yle-dl/distinfo
index 1ed2d54..bf12f14 100644
--- multimedia/yle-dl/distinfo
+++ multimedia/yle-dl/distinfo
@@ -1,5 +1,5 @@
-MD5 (rtmpdump-yle-1.4.4.tar.gz) = aSvgJe+rjjNE2fIYM9Kv8Q==
-RMD160 (rtmpdump-yle-1.4.4.tar.gz) = 0PVaCZZw9plY12kdIbmje+JG3kM=
-SHA1 (rtmpdump-yle-1.4.4.tar.gz) = 3vk86LQ0Y9WUMfgALqo4j0baZFo=
-SHA256 (rtmpdump-yle-1.4.4.tar.gz) =
SaqI4JLz3iXSU8J+hvNdi5fLxoQj+6F0EImQPEqlc+A=
-SIZE (rtmpdump-yle-1.4.4.tar.gz) = 166434
+MD5 (rtmpdump-yle-1.4.6.tar.gz) = QbpF5vZIL1XrXkwF935+6w==
+RMD160 (rtmpdump-yle-1.4.6.tar.gz) = NPpj07B0OGkZRSDaNAgIW6XCLus=
+SHA1 (rtmpdump-yle-1.4.6.tar.gz) = Z05W38TpGCz1uTkXaq2mF+1qrN4=
+SHA256 (rtmpdump-yle-1.4.6.tar.gz) =
BVlsnBGf2u7y8JuCxPCIK4HJhyb0p7twoGFWuQCLVnY=
+SIZE (rtmpdump-yle-1.4.6.tar.gz) = 167441
diff --git multimedia/yle-dl/patches/patch-yle-dl_py
multimedia/yle-dl/patches/patch-yle-dl_py
index 770c604..f97c97a 100644
--- multimedia/yle-dl/patches/patch-yle-dl_py
+++ multimedia/yle-dl/patches/patch-yle-dl_py
@@ -1,13 +1,13 @@
$OpenBSD: ports/multimedia/yle-dl/patches/patch-yle-dl_py,v 1.1.1.1 2011/10/19
09:16:08 sthen Exp $
yle-dl.py.orig Tue Oct 11 21:39:25 2011
-+++ yle-dl.py Tue Oct 18 18:04:21 2011
+--- yle-dl.py.orig Tue Nov 29 21:41:58 2011
yle-dl.py Mon Dec 12 18:52:45 2011
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!${MODPY_BIN}
yle-dl - Frontend for rtmpdump-yle, the YLE Areena stream downloader
-@@ -21,11 +21,11 @@ import htmlentitydefs
+@@ -21,8 +21,8 @@ import htmlentitydefs
import json
import string
@@ -17,8 +17,4 @@ $OpenBSD: ports/multimedia/yle-dl/patches/patch-yle-dl_py,v
1.1.1.1 2011/10/19 0
+AREENA_RTMP = 'rtmp://flashu.yle.fi/AreenaServer'
AREENA_SWF = 'http://areena.yle.fi/player/Application.swf?build=2'
RTMPDUMPYLE_OPTIONS = ['-r', AREENA_RTMP, '-s', AREENA_SWF, '-m', '60']
--ARKISTO_RTMP = 'rtmp://flashk.yle.fi/ElavaArkisto'
-+ARKISTO_RTMP = 'rtmp://flashu.yle.fi/ElavaArkisto'
- ARKISTO_SWF =
'http://www.yle.fi/elavaarkisto/flowplayer/flowplayer.commercial-3.2.2-dev2.swf'
- RTMPDUMPYLE_OPTIONS_ARKISTO = \
- ['-r', ARKISTO_RTMP, '-s', ARKISTO_SWF, '-m', '60']
+ ARKISTO_SWF =
'http://yle.fi/elavaarkisto/flowplayer/flowplayer.commercial-3.2.7.swf?0.739011391531676'
Re: Abiword support for .docx
On Thursday 08 December 2011 07:33:03 Brett wrote:
Hi,
I'm using Abiword built from ports, and recently noticed that it cannot
load/import docx files. There is plugin support for loading docx, but
it is not enabled in the ports version. After I
installed /usr/ports/devel/boost and added the line
--enable-plugins=openxml \ to the Makefile, it built fine, but there
is still no plugin in /usr/local/lib/abiword-2.8/plugins. Is there a
known way to get this plugin to build? The documentation on the Abiword
site is a bit sparse.
Thanks, Brett.
Can you try the following patch? I didn't have time to test it, but at least now
it packages the lib you need. Also, maybe there's a good reason why it was not
enabled?
- ffi missing from WANTLIB
- configure didn't recognize --without-gucharmap - removed
- added openxml support
--
Antti Harri
diff --git editors/abiword/Makefile editors/abiword/Makefile
index 2ff7567..ecb027c 100644
--- editors/abiword/Makefile
+++ editors/abiword/Makefile
@@ -6,7 +6,7 @@ VERSION=2.8.6
MAJORVER= ${VERSION:C/..$//}
DISTNAME= abiword-${VERSION}
-REVISION= 3
+REVISION= 4
# Merge a patch from Fedora to change default font from Times Roman to
# DejaVu Serif.: fixes font corruption issue on machines where
@@ -23,6 +23,7 @@ HOMEPAGE= http://www.abisource.com/
MODULES= devel/gettext
RUN_DEPENDS= devel/desktop-file-utils
+BUILD_DEPENDS= devel/boost
LIB_DEPENDS= devel/fribidi \
converters/wv \
textproc/enchant \
@@ -35,14 +36,14 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 bz2 c cairo
-WANTLIB += croco-0.6 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsf-1
-WANTLIB += gthread-2.0 gtk-x11-2.0 jpeg m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
-WANTLIB += stdc++ xcb xml2 z xcb-render wmf-0.2 wmflite-0.2
-WANTLIB += fribidi enchant rsvg-2 wv-1.2 GL Xxf86vm drm xcb-shm
+WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 bz2 c cairo
+WANTLIB += croco-0.6 drm enchant expat ffi fontconfig freetype
+WANTLIB += fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 gsf-1 gthread-2.0 gtk-x11-2.0
+WANTLIB += jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += png pthread pthread-stubs rsvg-2 stdc++ wmf-0.2 wmflite-0.2
+WANTLIB += wv-1.2 xcb xcb-render xcb-shm xml2 z
MASTER_SITES= ${HOMEPAGE}/downloads/abiword/${VERSION}/source/
@@ -52,6 +53,7 @@ USE_GROFF = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS=${CONFIGURE_SHARED} \
+ --enable-plugins=openxml \
--enable-templates \
--enable-clipart \
--enable-collab-backend-fake=no \
@@ -60,8 +62,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-collab-backend-xmpp \
--enable-collab-backend-sugar \
--without-goffice \
- --without-gnomevfs \
- --without-gucharmap
+ --without-gnomevfs
# broken configure checks (i.e. no makes it think we want to enable them)
# --disable-collab-backend-tcp
# --disable-collab-backend-service
diff --git editors/abiword/pkg/PFRAG.shared editors/abiword/pkg/PFRAG.shared
index 9d3f434..b8d9fa6 100644
--- editors/abiword/pkg/PFRAG.shared
+++ editors/abiword/pkg/PFRAG.shared
@@ -1,3 +1,4 @@
@comment $OpenBSD: ports/editors/abiword/pkg/PFRAG.shared,v 1.1 2010/03/21
10:55:04 ajacoutot Exp $
lib/abiword-${MAJORVER}/plugins/opendocument.so
+lib/abiword-${MAJORVER}/plugins/openxml.so
@lib lib/libabiword-${MAJORVER}.so.${LIBabiword-2.8_VERSION}
diff --git editors/abiword/pkg/PLIST editors/abiword/pkg/PLIST
index d22fe11..9b1c426 100644
--- editors/abiword/pkg/PLIST
+++ editors/abiword/pkg/PLIST
@@ -10,6 +10,8 @@ lib/abiword-${MAJORVER}/
lib/abiword-${MAJORVER}/plugins/
@comment lib/abiword-${MAJORVER}/plugins/opendocument.a
@comment lib/abiword-${MAJORVER}/plugins/opendocument.la
+lib/abiword-${MAJORVER}/plugins/openxml.a
+lib/abiword-${MAJORVER}/plugins/openxml.la
lib/libabiword-${MAJORVER}.a
lib/libabiword-${MAJORVER}.la
lib/pkgconfig/
Re: Update: mozilla-firefox 7.0.1 - 8.0
On Friday 11 November 2011 14:11:34 Christian Weisgerber wrote: It's calling home on first start, i.e., goes to some Mozilla info page. Hadn't we disabled that? Wasn't the whining about SSL certs patched as well to suck less than it does by default? -- Antti Harri
Re: Update: mozilla-firefox 7.0.1 - 8.0
On Friday 11 November 2011 17:14:29 Nigel Taylor wrote: On 11/11/11 14:04, Antti Harri wrote: On Friday 11 November 2011 14:11:34 Christian Weisgerber wrote: It's calling home on first start, i.e., goes to some Mozilla info page. Hadn't we disabled that? Wasn't the whining about SSL certs patched as well to suck less than it does by default? Hi, SSL to the pages I selected worked. I can only verify specific examples have or haven't changed. If you would like to send the url which you think have changed I can check for differences between 7.0.1 and 8.0. Nigel I mean This Connection is Untrusted and a half a dozen clicks to get through. Either that behaviour has even more buttons to click by default, or that has regressed back to the original way. -- Antti Harri
Re: NEW: fonts/ubuntu-fonts
On Tuesday 08 November 2011 13:15:45 David Coppa wrote: On Tue, Nov 8, 2011 at 12:07 PM, Dmitrij D. Czarkoff czark...@gmail.com wrote: P.S.: uppercases in COMMENT are also OK for me, it's a name. I meant: Ubuntu Font Family - Ubuntu font family The authors of the software use Ubuntu Font Family. -- Antti Harri
Re: NEW: multimedia/yle-dl
On Friday 07 October 2011 22:49:16 Stuart Henderson wrote: I can't connect to their RTMP servers to test but when the above is fixed this port is basically ok with me. Upstream rolled a new release, the attached port uses it. New version includes the patches in my previous tarball so I removed them. I changed the script to use different server, so it should work for users outside Finland now. Although the content probably makes only sense for Finnish and Swedish people. :-) OK on this version? Someone willing to commit it? -- Antti Harri yle-dl.tar.gz Description: application/tgz
Re: NEW: multimedia/yle-dl
On Friday 07 October 2011 22:49:16 Stuart Henderson wrote: On 2011-10-06, Antti Harri i...@openbsd.fi wrote: --Boundary-00=_UMcjOp3FHRupy54 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 7bit yle-dl is a tool to download videos from YLE Areena. RTMPDump-YLE is a command-line program for downloading media files from the two video streaming services of the Finnish national broadcasting company Yle. Some content is only available to users connecting from Finnish addresses. Bunch of these from rtmpdump-yle: /usr/include/arpa/inet.h:74: warning: 'struct in_addr' declared inside parameter list This is because headers are included in the wrong order, please make sure netinet/in.h comes before arpa/inet.h. (This is fixed in rtmpdump upstream amongst other things which might also want to be carried over to this modified version). I can't connect to their RTMP servers to test but when the above is fixed this port is basically ok with me. Thanks for the hints. Fixed the header inclusion and took some other patches from the rtmpdump repo that seemed good. These should be fixed in the next release of yle-dl, so they can probably be removed then. -- Antti Harri yle-dl.tar.gz Description: application/tgz
Re: NEW: games/megaglest
On Tuesday 11 October 2011 19:54:38 Kirill Bychkov wrote: Hi. All three games I've sent to ports@ freeze on ATI Radeon HD 3450 AGP (with radeondrm) i386 and starts to eat 99% of CPU. Should I blacklist ATI cards in ports README? I tried megaglest on my r300 radeon and amd64. It worked but it was too slow on my system to be playable. I also experienced lots of crashing when I tweaked the graphics to a lower setting and launched basic tutorial. Too bad, it looked pretty nice. :-/ -- Antti Harri
Re: /usr/bin/env shebangs and Co.
On Wednesday 12 October 2011 02:12:19 Vadim Zhukov wrote: Maybe I wasn't clear: I propose single python-run package, which depends on default Python version in ports, and sets up symlink to it as /usr/local/bin/python. Packages with only RUN_DEPENDS are not allowed in ports. Just setting up a symlink and packaging that doesn't change it in my opinion. I recently had to adjust a port's shebang to match the python version, I agree with Stuart that the current mechanism works well. -- Antti Harri
NEW: multimedia/yle-dl
yle-dl is a tool to download videos from YLE Areena. RTMPDump-YLE is a command-line program for downloading media files from the two video streaming services of the Finnish national broadcasting company Yle. Some content is only available to users connecting from Finnish addresses. -- Antti Harri yle-dl.tar.gz Description: application/tgz
PATCH: graphics/ftgl
Hi.
This patch adds 3 header files that were in the previous release, but not in
2.13.
Adding those makes a port I'm working on build so at least one program
depends on those.
I talked with the port maintainer about this and he's fine with it.
--
Antti Harri
diff --git graphics/ftgl/Makefile graphics/ftgl/Makefile
index 2c236bc..aeb2c15 100644
--- graphics/ftgl/Makefile
+++ graphics/ftgl/Makefile
@@ -5,6 +5,7 @@ COMMENT = font rendering library for OpenGL
applications
V =2.1.3
DISTNAME = ftgl-$V-rc5
PKGNAME = ftgl-$Vrc5
+REVISION = 0
EPOCH =0
SHARED_LIBS = ftgl0.0 # 2.1
CATEGORIES = graphics
@@ -36,4 +37,11 @@ CONFIGURE_ENV += ac_cv_path_DOXYGEN=no
pre-configure:
perl -pi -e 's,\@PACKAGE_VERSION\@,${V},' ${WRKSRC}/ftgl.pc.in
+post-install:
+ ${INSTALL_DATA} \
+ ${WRKSRC}/src/FTLibrary.h \
+ ${WRKSRC}/src/FTFace.h \
+ ${WRKSRC}/src/FTSize.h \
+ ${PREFIX}/include/FTGL/
+
.include bsd.port.mk
diff --git graphics/ftgl/pkg/PLIST graphics/ftgl/pkg/PLIST
index 0112bcf..b723f76 100644
--- graphics/ftgl/pkg/PLIST
+++ graphics/ftgl/pkg/PLIST
@@ -7,6 +7,7 @@ include/FTGL/FTBuffer.h
include/FTGL/FTBufferFont.h
include/FTGL/FTBufferGlyph.h
include/FTGL/FTExtrdGlyph.h
+include/FTGL/FTFace.h
include/FTGL/FTFont.h
include/FTGL/FTGLBitmapFont.h
include/FTGL/FTGLExtrdFont.h
@@ -16,11 +17,13 @@ include/FTGL/FTGLPolygonFont.h
include/FTGL/FTGLTextureFont.h
include/FTGL/FTGlyph.h
include/FTGL/FTLayout.h
+include/FTGL/FTLibrary.h
include/FTGL/FTOutlineGlyph.h
include/FTGL/FTPixmapGlyph.h
include/FTGL/FTPoint.h
include/FTGL/FTPolyGlyph.h
include/FTGL/FTSimpleLayout.h
+include/FTGL/FTSize.h
include/FTGL/FTTextureGlyph.h
include/FTGL/ftgl.h
lib/libftgl.a
Re: [Update] Xmoto 0.5.7
On Tuesday 13 September 2011 23:18:04 Jonathan Armani wrote: I will sent a corrected diff later. Thanks. And the diff. Tested on amd64. Ok for me. -- Antti Harri
Re: maintainer wanted
On Wednesday 07 September 2011 13:28:24 Jasper Lievisse Adriaanse wrote:
Anyone interested in maintaining one or more of the following ports?
[..]
net/pktstat
[..]
- Take maintainership
- Remove defunc homepage and fix master site
- Mirror distfile
--
Antti Harri
diff --git net/pktstat/Makefile net/pktstat/Makefile
index f03fa5a..1af7bf7 100644
--- net/pktstat/Makefile
+++ net/pktstat/Makefile
@@ -2,12 +2,10 @@
COMMENT= network traffic viewer
DISTNAME= pktstat-1.8.4
-REVISION= 1
+REVISION= 2
CATEGORIES=net
-HOMEPAGE=
http://www.adaptive-enterprises.com.au/~d/software/pktstat/
-
-MAINTAINER=Rui Reis r...@openbsd.org
+MAINTAINER=Antti Harri i...@openbsd.fi
# Public Domain
PERMIT_PACKAGE_CDROM= Yes
@@ -17,7 +15,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m pcap termlib
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= http://openbsd.fi/dist/
CONFIGURE_STYLE= gnu
USE_GROFF =Yes
Re: [NEW] net/epic5
On Tuesday 09 August 2011 00:36:01 David Hill wrote: Here is a port for epic5, the IRC client. I use it locally, but others have wanted a copy of it. I am sure it needs editing.. - David Hi, there's net/epic4 already, is it still useful? Why not make an update, and put it into net/epic ? -- Antti Harri
Re: png busted?
I replied to this thread because I don't have the original png update thread around anymore. I'm seeing this in terminal when playing pokerth: libpng warning: Interlace handling should be turned on when using png_read_image Seemed harmless though; I didn't see any graphics missing. -- Antti Harri
[PATCH] reconfigure target
Hi,
patch below implements reconfigure for ports.
--
Antti Harri
diff --git infrastructure/mk/bsd.port.mk infrastructure/mk/bsd.port.mk
index eb58694..74e282d 100644
--- infrastructure/mk/bsd.port.mk
+++ infrastructure/mk/bsd.port.mk
@@ -3391,6 +3391,10 @@ rebuild:
@rm -f ${_BUILD_COOKIE}
@${_MAKE} build
+reconfigure:
+ @rm -f ${_CONFIGURE_COOKIE}
+ @${_MAKE} configure
+
uninstall deinstall:
@${ECHO_MSG} === Deinstalling for ${FULLPKGNAME${SUBPACKAGE}}
@${SUDO} ${_PKG_DELETE} ${FULLPKGNAME${SUBPACKAGE}}
diff --git share/man/man5/bsd.port.mk.5 share/man/man5/bsd.port.mk.5
index 96a6d05..60005b6 100644
--- share/man/man5/bsd.port.mk.5
+++ share/man/man5/bsd.port.mk.5
@@ -505,6 +505,8 @@ so that the packing-list is complete.
.It Ar readmes
Create an html description of packages, including comments, description,
and dependencies.
+.It Ar reconfigure
+Force reconfigure of the port.
.It Ar rebuild
Force rebuild of the port.
.It Ar regress
Re: NEW: games/violetland
On Tuesday 05 July 2011 14:04:19 Kirill Bychkov wrote: Some tweaks attached. I experienced some texture glitches, but I'm pretty certain it's because of radeon drivers. Hi. I've merged your tweaks, thanks. I have no problems with graphics on my amd64 with inteldrm (965). IIRC, you also had some problems with ufoai. M.b. it's really a problem with your videocard or drivers? It was different in UFO:AI, it happened when swapping started. -- Antti Harri
Re: NEW: games/violetland
On Friday 01 July 2011 20:50:59 Kirill Bychkov wrote:
Hello.
Attached is a port of violetland 0.4.2, game similar to Crimsonland.
In this game the player should help a girl by name of Violet to struggle
with hordes of monsters. For this purpose the various weapon and also the
special abilities which are opening with experience can be used.
Please test and commit.
Hi.
Some tweaks attached. I experienced some texture glitches, but I'm pretty
certain it's because of radeon drivers.
--
Antti Harri
diff --git a/games/violetland/Makefile b/games/violetland/Makefile
index da8e98d..dd7af4f 100644
--- a/games/violetland/Makefile
+++ b/games/violetland/Makefile
@@ -1,11 +1,11 @@
# $OpenBSD$
-COMMENT = game similar to Crimsonland
+COMMENT = top view shooting game
DISTNAME = violetland-v0.4.2-src
PKGNAME = violetland-0.4.2
-CATEGORIES = games
+CATEGORIES = games x11
HOMEPAGE = http://code.google.com/p/violetland/
@@ -31,7 +31,7 @@ LIB_DEPENDS = devel/boost \
devel/sdl-ttf
RUN_DEPENDS = devel/desktop-file-utils
-CONFIGURE_ARGS += -DDATA_INSTALL_DIR=${PREFIX}/share/violetland
+CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=${PREFIX}
SEPARATE_BUILD = concurrent
Re: using dlopen() instead of -lmylib
On Saturday 25 June 2011 13:52:02 Alexandre Ratchov wrote: There's code (eg. audio/openal, but not only) that does: dlopen(libsndio.so, ...); and then calls dlsym() for each function and so on. What's the point of doing this instead of simply linking the binary with -lsndio and using functions normally? hints? -- Alexandre Extending the same subject a little: I'm interested in knowing how to handle these with ports? Is there a real good rule of thumb here and is this documented in the ports faq? For example xvidcore adds some libs to WANTLIB even though check-lib-depends doesn't want them. But devel/sdl depends on libGL that it opens with dlopen() and there is no GL in WANTLIB. -- Antti Harri
Re: FETCH_PACKAGES has no effect
On Tuesday 21 June 2011 20:36:25 Marc Espie wrote: I use this in my .profile files, maybe it'll be useful to others too: local _test=$(grep ^installpath = /etc/pkg.conf | cut -f 2 -d '=' | sed -e 's/ //') test -n _test export PKG_PATH=$_test Well, if you're going to use sed anyways: sed -ne '/^installpath = */s///p' /etc/pkg.conf Thanks for the shorter version. I used the syntax from Alexander's mail that is more familiar to me. Someone else noticed that the test-part was not correct. Here's a better version. It works in ksh and zsh: # tail -n 3 /etc/profile _test=$(sed -ne 's/^installpath = *//p' /etc/pkg.conf) test -n $_test export PKG_PATH=$_test unset _test -- Antti Harri
UPDATE: games/quake
Hi,
here's an update to get Quakeforge updated to a ~11 years newer code base.
Some major changes include:
- Working sound via SDL
- Binaries renamed (see pkg_info -L)
- Data directory handled better (see DESCR)
- Common -libs package for -main and -server
- GGI renderer got removed, renderers now available:
glx, sdl, sdl32 (32b bit depth) and sgl (SDL GL) and x11
- Lots of patches removed and all of the generic new ones have been fed to
upstream
- All binaries can be compiled at once now, so this should reduce build times a
little
I'm hosting the distfile until upstream rolls a proper release.
I also added myself as maintainer. Tested on i386 and amd64.
Some minor bugs exist, but I think it's worth updating the port
so other people can work on this too instead of putting their effort
into a lost cause with the in-tree version.
Thanks to Jacob Meuser and Alexandre Ratchov for their help with the audio
stuff.
So many things here, I hope I didn't forgot any, at least the games/Makefile
will need to
be adjusted like below. Are the vanishing FLAVORS handled correctly?
--
Antti Harri
diff --git games/Makefile games/Makefile
index 32354a8..960b95d 100644
--- games/Makefile
+++ games/Makefile
@@ -131,7 +131,6 @@
SUBDIR += qgo
SUBDIR += qstat
SUBDIR += quake
- SUBDIR += quake,gl
SUBDIR += quake2
SUBDIR += rftg
SUBDIR += ri-li
diff --git games/quake/Makefile games/quake/Makefile
index f491713..d0be848 100644
--- games/quake/Makefile
+++ games/quake/Makefile
@@ -1,83 +1,123 @@
# $OpenBSD: ports/games/quake/Makefile,v 1.34 2011/06/10 19:49:11 naddy Exp $
-COMMENT-main= Quake/Quake-world client
-COMMENT-server=Quake world server
-CATEGORIES=games
-
-FULLPKGNAME-server=quakeworld-server-2101
+SHARED_ONLY = Yes
+
+COMMENT-main = Quake/QuakeWorld client
+COMMENT-libs = Quake common libs
+COMMENT-server = QuakeWorld server
+
+# .so.1.0
+SOMAJOR = 0
+SOMINOR = 0
+V =20110621
+DISTNAME = quakeforge-$V
+PKGNAME-main = quake-$V
+PKGNAME-libs = quake-libs-$V
+FULLPKGNAME-server=quakeworld-server-$V
FULLPKGPATH-server=games/quake,-server
EPOCH-server= 0
-PKGNAME-main= quake-2101
-REVISION-main= 10
+MULTI_PACKAGES=-main -libs -server
+
+SHARED_LIBS += QFcd${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFconsole ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFgamecode ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFgib ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFimage ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFjs${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFmodels${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFmodels_gl ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFmodels_sw ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFrenderer_gl ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFrenderer_sw32 ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFruamoko ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFsound ${SOMAJOR}.${SOMINOR}
+SHARED_LIBS += QFutil ${SOMAJOR}.${SOMINOR}
-DISTNAME= quake-v6-bsd-kame
-PATCHFILES=quake6-00-v6-2202b.diff.gz:0
-PATCH_DIST_STRIP= -p1
+CATEGORIES = games x11
-HOMEPAGE= http://www.viagenie.qc.ca/en/ipv6-quake.shtml
-MASTER_SITES= ${MASTER_SITE_BACKUP}
-MASTER_SITES0= ftp://ftp.kame.net/pub/kame/misc/
+HOMEPAGE = http://www.quakeforge.net/
+
+MAINTAINER = Antti Harri i...@openbsd.fi
# GPLv2
-PERMIT_DISTFILES_CDROM=Yes
-PERMIT_DISTFILES_FTP= Yes
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP=Yes
-
-WANTLIB= c m
-
-USE_GMAKE= Yes
-
-MULTI_PACKAGES=-main -server
-FLAVORS= sdl ggi x11 gl
-FLAVOR?= sdl
-
-CONFIGURE_ENV=LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
-CONFIGURE_ENV+=CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include'
-CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS = --bindir=/bin \
- --with-opengl=no --with-opengl-includes=no
-
-WANTLIB-main= ${WANTLIB} sndio
-.if ${FLAVOR:L} == sdl
-WANTLIB+= pthread
-LIB_DEPENDS-main= devel/sdl
-WANTLIB-main +=SDL
-CONFIGURE_ARGS+= --with-sdl=${LOCALBASE} --without-ggi
-MAKE_FLAGS=HAS_X11=no
-CFLAGS+= -pthread
-.elif ${FLAVOR:L} == ggi
-WANTLIB+= pthread
-LIB_DEPENDS-main= graphics/ggi
-WANTLIB-main +=ggi
-CONFIGURE_ARGS+= --with-ggi=${LOCALBASE} --without-sdl
-MAKE_FLAGS=HAS_X11=no
-CFLAGS+= -pthread
-.elif ${FLAVOR:L} == x11
-CONFIGURE_ARGS+= --without-sdl --without-ggi
-MAKE_FLAGS=
-WANTLIB-main= X11
Re: FETCH_PACKAGES has no effect
On Tuesday 21 June 2011 13:45:44 Jan Stary wrote: On Jun 21 08:44:59, Antoine Jacoutot wrote: On Tue, 21 Jun 2011, Jan Stary wrote: # pkg_a -i findutils findutils-4.4.2|* | 98% findutils-4.4.2: ok So, findutils-4.4.2 *is* in $PKG_PATH. We don't know, you didn't provide your PKG_PATH. Why is it that pkg_add sees the required package in $PKG_PATH (and installs it), yet the port build does not? pkg_add(1) also uses /etc/pkg.conf. Ah, that's right, pkg.conf specifies an installpath, which is not PKG_PATH; so findutils is indeed not in $PKG_PATH. Thanks, and sorry for the confusion. Jan I use this in my .profile files, maybe it'll be useful to others too: local _test=$(grep ^installpath = /etc/pkg.conf | cut -f 2 -d '=' | sed -e 's/ //') test -n _test export PKG_PATH=$_test It sets PKG_PATH on login to the same value that pkg.conf has. -- Antti Harri
Re: NEW: cyphertite
On Thursday 02 June 2011 06:17:25 David Hill wrote: Round #2 reorganized according to Makefile.template updated DESCR removed VERSION added @sample For those willing to test, grab an account at https://www.cyphertite.com Hi, your changes look wrong. What happened to the tarball I sent you? Longer DESCR is good though. I wasn't able to get a nice paragraph from their website with a quick glance. -- Antti Harri
Re: NEW: cyphertite
On Tuesday 31 May 2011 23:37:13 David Hill wrote: Hello - This a new port for Cyphertite, a tar-like secure remote deduplicating archiver. Cyphertite deduplicates, compresses and encrypts data prior to transmission providing total privacy while keeping chattering down on the wire. It seamlessly supports IPv6 and IPv4 on a variety of platforms. - David Some tweaks: - reorganize according to Makefile.template - update WANTLIB, should there be support for archivers? - DESCR tweak - remove VERSION, it is only used in 1 place - @sample -- Antti Harri cyphertite.tgz Description: application/tgz
Re: can't make opera work anymore
On Saturday 28 May 2011 15:56:44 frantisek holop wrote: hi there, i'd like to ask my fellow opera users: can you run opera? since the last linux emul changes i am an ex-opera user on openbsd. latest snapshot, bsd.sp, bsd.mp, old profile, new profile, proxy, no proxy, no matter what i do, opera just hangs. as noone else is complaining, i guess others have no problems, and i must me doing something wrong. could anyone share their positive experiences with me please? -f I've seen that too on i386. It made the whole computer hang. -- Antti Harri
Re: NEW (sort of, or maybe UPDATE): warmux (was: wormux)
On Wednesday 25 May 2011 16:46:50 Landry Breuil wrote: On Wed, May 25, 2011 at 03:22:14PM +0200, LEVAI Daniel wrote: Hi! Attached is a *new* port for warmux-11.04.1, because of the name change (wormux - warmux). Isn't it simpler to just update the existing port ? Landry Hi, what is the point in leaving the old name hanging around (in ports tree)? -- Antti Harri
Re: NEW: games/eduke32
On Monday 23 May 2011 11:24:22 Stuart Henderson wrote: On 2011-05-22, Antti Harri i...@openbsd.fi wrote: I personally don't like the extra games directory. Looks like some software gets installed under apps/ too. I'd like to know what the consensus is, any developers got an opinion? Looking at pkglocate share/apps/|cut -d: -f2|sort -fu it looks very much like share/apps/ is for KDE. I don't see much point in grouping things under /usr/local/share/games at this point, maybe if it was done years ago it would have made sense, but moving the existing games there would just be a huge make-work project now, and having some in share/games/ and others in share/ just seems inconsistent. Yes that makes sense, thanks. -- Antti Harri
Re: NEW: games/eduke32
On Sunday 22 May 2011 01:12:31 Brynet wrote: Cool, thanks for looking at this Ryan and Antti for sending it to him, my patches made revision 1879-1881 so anything newer than that is cool. They rejected my change for OpenGL support though, this project dlopen's libGL.so.1 and libGLU.so.1. The following patch is needed for that, other things that might be worth fixing is the GTK+ frontend, and POLYMER. I think NEDMALLOC can be avoided. Good luck, -Bryan. diff -Nru /dev/null eduke32/build/src/glbuild.c --- /dev/null Thu Jan 1 00:00:00 1970 +++ eduke32/build/src/glbuild.c Fri Dec 10 23:21:54 2010 @@ -329,8 +329,10 @@ driver = opengl32.dll; #elif defined __APPLE__ driver = /System/Library/Frameworks/OpenGL.framework/OpenGL; +#elif defined __linux__ +driver = libGL.so.1 #else -driver = libGL.so.1; +driver = libGL.so; #endif } @@ -918,8 +920,10 @@ driver = glu32.dll; #elif defined __APPLE__ driver = /System/Library/Frameworks/OpenGL.framework/OpenGL; // FIXME: like I know anything about Apple. Hah. -#else +#elif defined __linux__ driver = libGLU.so.1; +#else +driver = libGLU.so; #endif } Ask them to add: #elif defined __OpenBSD__ driver = libGL.so -- Antti Harri
Re: NEW: games/eduke32
On Sunday 22 May 2011 03:46:55 Ryan Freeman wrote: On Sat, May 21, 2011 at 06:12:31PM -0400, Brynet wrote: Cool, thanks for looking at this Ryan and Antti for sending it to him, my patches made revision 1879-1881 so anything newer than that is cool. They rejected my change for OpenGL support though, this project dlopen's libGL.so.1 and libGLU.so.1. The following patch is needed for that, other things that might be worth fixing is the GTK+ frontend, and POLYMER. I think NEDMALLOC can be avoided. Good luck, -Bryan. Thanks, I've added that patch in. I also made additions to astub.c and game.c for addsearchdir to check /usr/local/share/games/duke3d which makes the shareware data pulled in with several of Antti's other Makefile entries. I personally don't like the extra games directory. Looks like some software gets installed under apps/ too. I'd like to know what the consensus is, any developers got an opinion? I'm not entirely sure if including shareware data with the port is a good idea though, and perhaps it would be best served by a seperate games/duke3ddata port akin to the current games/doomdata. thoughts? I disagree. The non-free original data can be installed elsewhere by the user, there cannot be a port for that anyway so why split shareware out of the main port? attached is an updated version of my port with heavy influence from Antti's Makefile, thanks ;) all original patches outside of the libGL changes Bryan sent me have been removed as Bryan's original patches have been merged upstream. Come get some. -- Antti Harri
Re: NEW: games/eduke32
On Sunday 22 May 2011 05:35:17 Brynet wrote: I was talking to one of the developers in eduke32, according to him redistributing packages for the binaries is fine. I wouldn't be so sure about this. http://eduke32.svn.sf.net/viewvc/eduke32/polymer/eduke32/buildlic.txt Maybe PERMIT_PACKAGE_FTP. I would be very careful to even add that. That license sucks. It's too bad Ken Silverman botched 3drealm's otherwisely nice open source release with his own restrictive license. The shareware data apparently has some further restrictions.. you have to distribute not only the GRP file but all the files including the DOS executables. Having a seperate port for installing the shareware/retail data files is a good idea, users can either build that.. or grab the .GRP file for themselves. Maybe a message explaining that after installing? Hmm. Not sure. :-) Yes there's a list of files that must be distributed, which I did in my original work. -- Antti Harri
Re: NEW: games/tyrquake
On Saturday 21 May 2011 21:05:25 Jacob Meuser wrote:
On Sat, May 21, 2011 at 02:56:36AM -0700, Ryan Freeman wrote:
- sound is slightly modified snd_sndio.c from the games/quake port
(works actually better than existing quake port which has dreadful
audio sounding like its being overdriven by 100dB) i blame something
in the old ver of quakeforge over Jacob's snd_sndio.c ;)
wtf? sound is indeed majorly mangled. this used to work perfectly.
hmm, cc -O2 -pipe -pthread -Wall -Did386=0 -O2 -pipe -pthread -Wall -Wall
-DQUAKEWORLD -Wall -O6 -ffast-math -funroll-loops -fomit-frame-pointer
-fexpensive-optimizations ...
maybe gcc4 does something different with those switches than gcc3 did?
My hardware has changed but yeah last time I checked too it was working fine.
The attached diff makes quake honour CFLAGS again. The --enable-release
didn't seem to be linked to anything else than enabling some GCC optimization
flags. The extra flags don't seem to be the fault here though.
Adjusted also the license marker. There are lots of other stuff I could
do with the port, but I'm waiting to see what happens with tyr-quake first.
--
Antti Harri
--- games/quake/Makefile
+++ games/quake/Makefile
@@ -19,7 +19,7 @@ HOMEPAGE=
http://www.viagenie.qc.ca/en/ipv6-quake.shtml
MASTER_SITES= ${MASTER_SITE_BACKUP}
MASTER_SITES0= ftp://ftp.kame.net/pub/kame/misc/
-# GPL
+# GPLv2
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
@@ -36,8 +36,7 @@ FLAVOR?= sdl
CONFIGURE_ENV=LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
CONFIGURE_ENV+=CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include'
CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS=--enable-release
-CONFIGURE_ARGS+= --bindir=/bin \
+CONFIGURE_ARGS = --bindir=/bin \
--with-opengl=no --with-opengl-includes=no
WANTLIB-main= ${WANTLIB} sndio
Re: NEW: games/eduke32
On Sunday 22 May 2011 00:36:06 Ryan Freeman wrote: yes, yes i have. see attached ;) (i know some things need to be fixed though so if anyone could help me figure out why i can't get port-lib-depends-check to work when i include the mapster32 binary in the install target, please comment) Don't know, I'm not probably going to look in further. You can compare to mine which is attached. -- Antti Harri eduke32.tar.gz Description: application/tgz
Re: UPDATE: openarena
I just tested the sdl patch and brightness switch works just fine in Openarena now. I also tested UFO:AI in fullscreen and windowed modes without problems. -- Antti Harri
Re: UPDATE: openarena
On Monday 02 May 2011 14:53:55 Jasper Lievisse Adriaanse wrote: Hi, Here's an update for openarena to the latest patch release. Any testers? ;-) OK? Lightly tested on amd64. Display-brightness is not working, the screen is very dark by default. I experience sound stuttering when aucat is on. Tried default buffer size and -b 2048. Same thing with the 0.8.1p1 though. -- Antti Harri OpenBSD 4.9-current (GENERIC.MP) #77: Wed Apr 20 23:40:23 MDT 2011 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP real mem = 3747110912 (3573MB) avail mem = 3633319936 (3465MB) mainbus0 at root bios0 at mainbus0: SMBIOS rev. 2.3 @ 0xf0450 (73 entries) bios0: vendor Dell Inc. version A11 date 11/30/2006 bios0: Dell Inc. OptiPlex GX620 acpi0 at bios0: rev 2 acpi0: sleep states S0 S1 S3 S4 S5 acpi0: tables DSDT FACP SSDT APIC BOOT ASF! MCFG HPET acpi0: wakeup devices VBTN(S4) PCI0(S5) PCI4(S5) PCI2(S5) PCI3(S5) PCI1(S5) PCI5(S5) PCI6(S5) MOU_(S3) USB0(S3) USB1(S3) USB2(S3) USB3(S3) acpitimer0 at acpi0: 3579545 Hz, 24 bits acpimadt0 at acpi0 addr 0xfee0: PC-AT compat cpu0 at mainbus0: apid 0 (boot processor) cpu0: Intel(R) Pentium(R) D CPU 2.80GHz, 2793.48 MHz cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,DS-CPL,CNXT-ID,CX16,xTPR,NXE,LONG cpu0: 1MB 64b/line 8-way L2 cache cpu0: apic clock running at 199MHz cpu1 at mainbus0: apid 1 (application processor) cpu1: Intel(R) Pentium(R) D CPU 2.80GHz, 2793.08 MHz cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,DS-CPL,CNXT-ID,CX16,xTPR,NXE,LONG cpu1: 1MB 64b/line 8-way L2 cache ioapic0 at mainbus0: apid 8 pa 0xfec0, version 20, 24 pins ioapic0: misconfigured as apic 0, remapped to apid 8 acpimcfg0 at acpi0 addr 0xf000, bus 0-63 acpihpet0 at acpi0: 14318179 Hz acpiprt0 at acpi0: bus 4 (PCI4) acpiprt1 at acpi0: bus 2 (PCI2) acpiprt2 at acpi0: bus 3 (PCI3) acpiprt3 at acpi0: bus 1 (PCI1) acpiprt4 at acpi0: bus -1 (PCI5) acpiprt5 at acpi0: bus -1 (PCI6) acpiprt6 at acpi0: bus 0 (PCI0) acpicpu0 at acpi0 acpicpu1 at acpi0 acpibtn0 at acpi0: VBTN pci0 at mainbus0 bus 0 pchb0 at pci0 dev 0 function 0 Intel 82945G Host rev 0x02 ppb0 at pci0 dev 1 function 0 Intel 82945G PCIE rev 0x02: apic 8 int 16 (irq 11) pci1 at ppb0 bus 1 vga1 at pci0 dev 2 function 0 Intel 82945G Video rev 0x02 wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation) wsdisplay0: screen 1-5 added (80x25, vt100 emulation) intagp0 at vga1 agp0 at intagp0: aperture at 0xe000, size 0x1000 inteldrm0 at vga1: apic 8 int 16 (irq 11) drm0 at inteldrm0 Intel 82945G Video rev 0x02 at pci0 dev 2 function 1 not configured ppb1 at pci0 dev 28 function 0 Intel 82801GB PCIE rev 0x01: apic 8 int 16 (irq 11) pci2 at ppb1 bus 2 bge0 at pci2 dev 0 function 0 Broadcom BCM5751 rev 0x01, BCM5750 A1 (0x4001): apic 8 int 16 (irq 11), address 00:13:72:d8:c9:e3 brgphy0 at bge0 phy 1: BCM5750 10/100/1000baseT PHY, rev. 0 ppb2 at pci0 dev 28 function 1 Intel 82801GB PCIE rev 0x01: apic 8 int 17 (irq 10) pci3 at ppb2 bus 3 uhci0 at pci0 dev 29 function 0 Intel 82801GB USB rev 0x01: apic 8 int 21 (irq 9) uhci1 at pci0 dev 29 function 1 Intel 82801GB USB rev 0x01: apic 8 int 22 (irq 5) uhci2 at pci0 dev 29 function 2 Intel 82801GB USB rev 0x01: apic 8 int 18 (irq 3) uhci3 at pci0 dev 29 function 3 Intel 82801GB USB rev 0x01: apic 8 int 23 (irq 10) ehci0 at pci0 dev 29 function 7 Intel 82801GB USB rev 0x01: apic 8 int 21 (irq 9) usb0 at ehci0: USB revision 2.0 uhub0 at usb0 Intel EHCI root hub rev 2.00/1.00 addr 1 ppb3 at pci0 dev 30 function 0 Intel 82801BA Hub-to-PCI rev 0xe1 pci4 at ppb3 bus 4 auich0 at pci0 dev 30 function 2 Intel 82801GB AC97 rev 0x01: apic 8 int 23 (irq 10), ICH7 AC97 ac97: codec id 0x41445374 (Analog Devices AD1981B) ac97: codec features headphone, 20 bit DAC, No 3D Stereo audio0 at auich0 pcib0 at pci0 dev 31 function 0 Intel 82801GB LPC rev 0x01 pciide0 at pci0 dev 31 function 1 Intel 82801GB IDE rev 0x01: DMA, channel 0 configured to compatibility, channel 1 configured to compatibility atapiscsi0 at pciide0 channel 0 drive 0 scsibus0 at atapiscsi0: 2 targets cd0 at scsibus0 targ 0 lun 0: PHILIPS, DVD-ROM SDR089, TD36 ATAPI 5/cdrom removable cd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 2 pciide0: channel 1 ignored (disabled) pciide1 at pci0 dev 31 function 2 Intel 82801GB SATA rev 0x01: DMA, channel 0 configured to native-PCI, channel 1 configured to native-PCI pciide1: using apic 8 int 20 (irq 5) for native-PCI interrupt wd0 at pciide1 channel 0 drive 0: WDC WD5000AAKS-75TMA0 wd0: 16-sector PIO, LBA48, 476940MB, 976773168 sectors wd0(pciide1:0:0): using PIO mode 4, Ultra-DMA mode 6 ichiic0 at pci0 dev 31 function 3 Intel 82801GB SMBus rev 0x01: SMI iic0 at ichiic0 spdmem0 at iic0 addr 0x50: 512MB DDR2 SDRAM non-parity PC2-5300CL5 spdmem1 at iic0 addr 0x51: 512MB DDR2 SDRAM non
Re: ld.so speedup for large binaries with many shared libraries
Hi, seems to work on amd64. Not sure if it made things quicker, but it sure didn't make them slower either. -- Antti Harri
Replace games/abuse with abuse-sdl
Hi, the current version of Abuse is pretty troublesome and dead in upstream. It doesn't build on many architectures and on those that it builds it requires a very archaid X to work. It cannot be linked to the build because of copyright issues with the sfx files. So I'd suggest it to be removed from the tree and replace with Abuse-sdl: COMMENT = SDL port of the legendary 2D platform shooter HOMEPAGE = http://abuse.zoy.org/ Tested on amd64. Thanks to sthen@ and Lasse Collin for help. abuse-sdl-0.7.1.tar.gz Description: application/tgz
Re: Replace games/abuse with abuse-sdl
On Tuesday 05 April 2011 01:28:17 Brad wrote: On 04/04/11 6:14 PM, Antti Harri wrote: Hi, the current version of Abuse is pretty troublesome and dead in upstream. It doesn't build on many architectures and on those that it builds it requires a very archaid X to work. It cannot be linked to the build because of copyright issues with the sfx files. So I'd suggest it to be removed from the tree and replace with Abuse-sdl: COMMENT = SDL port of the legendary 2D platform shooter HOMEPAGE = http://abuse.zoy.org/ Tested on amd64. Thanks to sthen@ and Lasse Collin for help. Don't make it a new port. Just replace the existing one. I have thought about that for a very long time. I think having separate directories is better. It's fork of the same thing but it's called something else. Can you elaborate why it should be in the same directory, and did you mean to use the same name also? -- Antti Harri
NEW: devel/yaml-cpp
Hi. YAML parser and emitter in C++ matching the YAML 1.2 spec. yaml-cpp is needed by openxcom, which will follow shortly. devel_yaml-cpp.tar.gz Description: application/tgz
NEW: games/openxcom
Hi. open source reimplementation of the original X-Com Homepage: http://openxcom.ninex.info/ Screenshots: http://openxcom.ninex.info/index.php/screenshots/?album=1gallery=5 Requires yaml-cpp that I just sent and original UFO/X-com data sets. This is still very early development version and not much to play, but the work is very promising. The look and feel is pretty much identical to the original game title. I'm willing to maintain and update to newer versions once they become available. games_openxcom.tar.gz Description: application/tgz
Re: resurrect games/blobwars
On Friday 01 April 2011 02:12:31 Matthias Kilian wrote:
On Fri, Apr 01, 2011 at 01:25:17AM +0300, Antti Harri wrote:
I compiled this from ports on amd64 and every time when I exit the game I
get:
% blobwars
blobwars in free(): error: chunk is already free 0x2101d7b80
zsh: abort (core dumped) blobwars
Could you please rebuild it with debugging symbols?
$ amke clean=package bulk update
$ env DEBUG=-g make update-or-install
After this, you should be able to get a backtrace with gdb.
Ciao,
Kili
(gdb) bt
#0 0x0002079e33fa in kill () from /usr/lib/libc.so.58.0
#1 0x000207a3e4a1 in abort () at /usr/src/lib/libc/stdlib/abort.c:68
#2 0x000207a3bf65 in wrterror (msg=Variable msg is not available.) at
/usr/src/lib/libc/stdlib/malloc.c:387
#3 0x000207a3d48d in free (ptr=0x20e5e5d00) at
/usr/src/lib/libc/stdlib/malloc.c:1328
#4 0x00020625178c in SDL_JoystickClose () from /usr/local/lib/libSDL.so.8.0
#5 0x0042824c in cleanup () at src/init.cpp:467
#6 0x000207a351e9 in __cxa_finalize (dso=0x0) at
/usr/src/lib/libc/stdlib/atexit.c:153
#7 0x000207a1809a in exit (status=0) at /usr/src/lib/libc/stdlib/exit.c:57
#8 0x0043ad14 in title () at src/title.cpp:424
#9 0x0043e1d3 in main (argc=1, argv=0x7f7d5dd8) at src/main.cpp:203
The fault seems to be that it tries to close joysticks that I don't have at
src/init.cpp:467.
This debug
for(int i=0;iSDL_NumJoysticks();i++)
printf(%s\n, SDL_JoystickName(i));
prints this:
/dev/uhid0
/dev/uhid1
/dev/uhid2
I have logitech's keyboard, so is this SDL's bug?
uhidev0 at uhub2 port 1 configuration 1 interface 0 BTC USB Multimedia
Keyboard rev 1.10/1.30 addr 2
uhidev0: iclass 3/1
ukbd0 at uhidev0: 8 modifier keys, 6 key codes
wskbd1 at ukbd0 mux 1
wskbd1: connecting to wsdisplay0
uhidev1 at uhub2 port 1 configuration 1 interface 1 BTC USB Multimedia
Keyboard rev 1.10/1.30 addr 2
uhidev1: iclass 3/0, 3 report ids
uhid0 at uhidev1 reportid 1: input=1, output=0, feature=0
uhid1 at uhidev1 reportid 2: input=3, output=0, feature=0
uhid2 at uhidev1 reportid 3: input=3, output=0, feature=4
Attached is a patch that fixed the abort trap for me.
diff --git games/blobwars/Makefile games/blobwars/Makefile
index 43f9925..c65d04a 100644
--- games/blobwars/Makefile
+++ games/blobwars/Makefile
@@ -3,7 +3,7 @@
COMMENT = 2D arcade game
DISTNAME = blobwars-1.18
-REVISION = 0
+REVISION = 1
CATEGORIES = games
diff --git games/blobwars/patches/patch-src_init_cpp
games/blobwars/patches/patch-src_init_cpp
new file mode 100644
index 000..0675ced
--- /dev/null
+++ games/blobwars/patches/patch-src_init_cpp
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- src/init.cpp.orig Fri Apr 1 03:03:11 2011
src/init.cpp Fri Apr 1 03:29:23 2011
+@@ -461,9 +461,11 @@ void cleanup()
+ if (SDL_NumJoysticks() 0)
+ {
+ SDL_JoystickEventState(SDL_DISABLE);
+- for (int i = 0 ; i SDL_NumJoysticks() ; i++)
++ // Blobwars tries to open only the first joystick,
++ // so test only the first here as well.
++ if (SDL_JoystickOpened(0))
+ {
+- debug((Closing Joystick #%d - %s...\n, i,
SDL_JoystickName(i)));
++ debug((Closing Joystick #%d - %s...\n, 0,
SDL_JoystickName(0)));
+ SDL_JoystickClose(config.sdlJoystick);
+ }
+ }
Re: LordsAWar! port (new)
On Sunday 20 March 2011 22:07:03 Dmitrij D. Czarkoff wrote: Hello! I made a port for LordsAWar! game (http://www.nongnu.org/lordsawar;). This is my first attemp at ports, so, please comment. :-) Thanks in advance. You are missing $OpenBSD$ from the top and '' from MAINTAINER. Do you have any reason for using multiple packages? -- Antti Harri
Re: CVS: cvs.openbsd.org: ports
On Saturday 26 March 2011 21:30:41 Kevin Chadwick wrote:
On Sat, 26 Mar 2011 04:58:36 -0600 (MDT)
Landry Breuil wrote:
www/firefox36 from the Attic, installing 3.6.16 in
${LOCALBASE}/firefox36 with firefox36 binary. Needed for archs
firefox 4 doesn't support (yet?).
I've heard firefox 4 removes the status bar, something people may wish
to consider when choosing. Theres a plugin!!! to restore it apparently.
I don't mind a toggle on, instead of off but I'm really starting to
worry about some of mozilla's recent decisions.
I wonder what a firebird developer would have said to the idea of no
status bar.
The 4 betas had it removed and while hovering over a link the target would
appear inside the address bar. However it changed again in the 4 release, the
link target (and other loading info as well) will appear where statusbar was
and will disappear when not needed. The latest behaviour works for me.
--
Antti Harri
[PATCH] Unbreak ark
Hi,
- make LZW archives work (list/view file/extract)
- make gzip archives work (view file/extract)
- modify bzip and bzip2 codes similarly for the sake of uniformity
- bump package and add automake to silence a warning during build
adding into archive or deleting file inside archive doesn't work.
I think it is not worth the trouble. Deleting isn't working
because ark calls tar with --delete that OpenBSD doesn't
support at all (ark/tar.cpp:682).
--
Antti Harri
diff --git x11/kde/utils3/Makefile x11/kde/utils3/Makefile
index 59e9537..103046f 100644
--- x11/kde/utils3/Makefile
+++ x11/kde/utils3/Makefile
@@ -13,6 +13,8 @@ SHARED_LIBS +=ksimcore 2.0 # .1.0
MODULES = x11/kde devel/gettext
+CONFIGURE_STYLE = autoconf automake
+
RUN_DEPENDS += devel/desktop-file-utils
LIB_DEPENDS = x11/kde/libs3 \
net/net-snmp \
@@ -24,7 +26,7 @@ LIB_DEPENDS = x11/kde/libs3 \
SEPARATE_BUILD = flavored
-REVISION = 7
+REVISION = 8
WANTLIB = ICE SM X11 Xau Xdmcp Xext Xi Xrender Xss Xtst art_lgpl_2 c crypto \
fam gdk glib gmodule gmp gtk idn jpeg kvm lib/kde3/DCOP lib/kde3/kabc \
lib/kde3/kdecore=6 lib/kde3/kdefx lib/kde3/kdeprint lib/kde3/kdesu \
diff --git x11/kde/utils3/patches/patch-ark_compressedfile_cpp
x11/kde/utils3/patches/patch-ark_compressedfile_cpp
new file mode 100644
index 000..8c2982b
--- /dev/null
+++ x11/kde/utils3/patches/patch-ark_compressedfile_cpp
@@ -0,0 +1,47 @@
+$OpenBSD$
+--- ark/compressedfile.cpp.origWed Feb 13 11:38:15 2008
ark/compressedfile.cpp Mon Mar 21 13:01:55 2011
+@@ -108,19 +108,19 @@ void CompressedFile::initData()
+
+ if ( mimeType == application/x-gzip )
+ {
+-m_unarchiver_program = gunzip;
++m_unarchiver_program = gzip;
+ m_archiver_program = gzip;
+ m_defaultExtensions .gz -gz .z -z _z .Z;
+ }
+ if ( mimeType == application/x-bzip )
+ {
+-m_unarchiver_program = bunzip;
++m_unarchiver_program = bzip;
+ m_archiver_program = bzip;
+ m_defaultExtensions .bz;
+ }
+ if ( mimeType == application/x-bzip2 )
+ {
+-m_unarchiver_program = bunzip2;
++m_unarchiver_program = bzip2;
+ m_archiver_program = bzip2;
+ m_defaultExtensions .bz2 .bz;
+ }
+@@ -131,7 +131,7 @@ void CompressedFile::initData()
+ }
+ if ( mimeType == application/x-compress )
+ {
+-m_unarchiver_program = KGlobal::dirs()-findExe( uncompress
).isNull()? gunzip : uncompress;
++m_unarchiver_program = KGlobal::dirs()-findExe( compress
).isNull()? gzip : compress;
+ m_archiver_program = compress;
+ m_defaultExtensions = .Z;
+ }
+@@ -174,10 +174,9 @@ void CompressedFile::open()
+
+ KProcess *kp = m_currentProcess = new KProcess;
+ kp-clearArguments();
+- *kp m_unarchiver_program -f ;
++ *kp m_unarchiver_program -f -d;
+ if ( m_unarchiver_program == lzop)
+ {
+-*kp -d;
+ // lzop hack, see comment in tar.cpp createTmp()
+ kp-setUsePty( KProcess::Stdin, false );
+ }
diff --git x11/kde/utils3/patches/patch-ark_tar_cpp
x11/kde/utils3/patches/patch-ark_tar_cpp
index 18ea2cb..305af61 100644
--- x11/kde/utils3/patches/patch-ark_tar_cpp
+++ x11/kde/utils3/patches/patch-ark_tar_cpp
@@ -1,6 +1,6 @@
$OpenBSD: ports/x11/kde/utils3/patches/patch-ark_tar_cpp,v 1.1 2007/02/02
12:09:36 espie Exp $
ark/tar.cpp.orig Mon May 22 20:08:38 2006
-+++ ark/tar.cppFri Feb 2 02:12:52 2007
+--- ark/tar.cpp.orig Mon May 22 21:08:38 2006
ark/tar.cppMon Mar 21 02:23:41 2011
@@ -50,6 +50,7 @@
// Qt includes
@@ -9,6 +9,23 @@ $OpenBSD: ports/x11/kde/utils3/patches/patch-ark_tar_cpp,v 1.1
2007/02/02 12:09:
#include qregexp.h
#include qeventloop.h
+@@ -218,13 +219,13 @@ QString TarArch::getCompressor()
+ QString TarArch::getUnCompressor()
+ {
+ if ( m_fileMimeType == application/x-tarz )
+-return QString( uncompress );
++return QString( compress );
+
+ if ( m_fileMimeType == application/x-tgz )
+-return QString( gunzip );
++return QString( gzip );
+
+ if ( m_fileMimeType == application/x-tbz )
+-return QString( bunzip2 );
++return QString( bzip2 );
+
+ if( m_fileMimeType == application/x-tzo )
+ return QString( lzop );
@@ -247,13 +248,17 @@ TarArch::open()
// tar archive are plain or start with ./
KProcess *kp = m_currentProcess = new KProcess;
@@ -30,6 +47,15 @@ $OpenBSD: ports/x11/kde/utils3/patches/patch-ark_tar_cpp,v
1.1 2007/02/02 12:09:
*kp -tvf m_filename;
m_buffer = ;
+@@ -361,7 +366,7 @@ void TarArch::createTmp()
+ QString strUncompressor = getUnCompressor();
+ // at least lzop doesn't want to pipe zerosize/nonexistent files
+ QFile originalFile( m_filename );
+-if ( strUncompressor != gunzip strUncompressor !=bunzip2
Re: update tor to 0.2.1.30
On Tuesday 08 March 2011 20:09:02 Pascal Stumpf wrote:
On Mon, Mar 07, 2011 at 03:40:59PM +0100, Pascal Stumpf wrote:
On Mon, Mar 07, 2011 at 02:25:46PM +, Stuart Henderson wrote:
On 2011/03/07 15:14, Pascal Stumpf wrote:
Fixes Tor in Iran. Manpages are all ok with mandoc.
Also, can we add an rc.d script?
cvs add this file (and add it to PLIST), then 'cvs diff -uNp'.
Index: Makefile
===
[snip]
Following advice from ajacoutot@: Yes, I've tested all actions
(including reload), and they all work as expected. Also, including
Anttis suggestion:
Works on amd64 but see below.
Index: Makefile
===
RCS file: /cvs/ports/net/tor/Makefile,v
retrieving revision 1.49
diff -u -u -p -r1.49 Makefile
--- Makefile 18 Jan 2011 19:59:17 - 1.49
+++ Makefile 7 Mar 2011 15:22:47 -
@@ -2,7 +2,7 @@
COMMENT= anonymity service using onion routing
-DISTNAME=tor-0.2.1.29
+DISTNAME=tor-0.2.1.30
CATEGORIES= net
HOMEPAGE=http://www.torproject.org/
@@ -22,7 +22,6 @@ CONFIGURE_ARGS= --with-ssl-dir=/usr
DB_DIR= /var/tor
SUBST_VARS= DB_DIR
-USE_GROFF = Yes
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples
Index: distinfo
===
RCS file: /cvs/ports/net/tor/distinfo,v
retrieving revision 1.45
diff -u -u -p -r1.45 distinfo
--- distinfo 18 Jan 2011 19:59:17 - 1.45
+++ distinfo 7 Mar 2011 15:22:47 -
@@ -1,5 +1,5 @@
-MD5 (tor-0.2.1.29.tar.gz) = HNT+6oTysGZxe1ANCQvPZQ==
-RMD160 (tor-0.2.1.29.tar.gz) = JYf8kWKFJDSjlex5br3O4Zctmqk=
-SHA1 (tor-0.2.1.29.tar.gz) = zVNLmckQcFBPTnAAiriUCoFrW8Y=
-SHA256 (tor-0.2.1.29.tar.gz) =
Bw0xTv/WwI+LWooeu09cOvZE1IqeOOnLo0/T8umB7GQ= -SIZE (tor-0.2.1.29.tar.gz) =
2521399
+MD5 (tor-0.2.1.30.tar.gz) = bG1h4FOvWWmiRdAlxM/OnQ==
+RMD160 (tor-0.2.1.30.tar.gz) = BeShRDpUlJgu943GGgiNomoJ6c8=
+SHA1 (tor-0.2.1.30.tar.gz) = 8luJ2MZ3yD7gVZA21bE9SbJys7A=
+SHA256 (tor-0.2.1.30.tar.gz) =
81KhqP+kaa4lEyT4k4YHQHS8/+8afGpyyqfkwtEs4Qk= +SIZE (tor-0.2.1.30.tar.gz) =
2447447
Index: patches/patch-src_config_torrc_sample_in
===
RCS file: /cvs/ports/net/tor/patches/patch-src_config_torrc_sample_in,v
retrieving revision 1.9
diff -u -u -p -r1.9 patch-src_config_torrc_sample_in
--- patches/patch-src_config_torrc_sample_in 25 Mar 2010 05:35:38 -
1.9
+++ patches/patch-src_config_torrc_sample_in 7 Mar 2011 15:22:47 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_config_torrc_sample_in,v 1.9 2010/03/25 05:35:38
benoit Exp $ src/config/torrc.sample.in.orig Mon May 25 19:38:04 2009
-+++ src/config/torrc.sample.in Mon Aug 10 23:02:40 2009
+--- src/config/torrc.sample.in.orig Wed Feb 23 09:25:40 2011
src/config/torrc.sample.in Mon Mar 7 16:21:17 2011
@@ -37,18 +37,18 @@ SocksListenAddress 127.0.0.1 # accept connections only
## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log
#Log debug file @LOCALSTATEDIR@/log/tor/debug.log
@@ -23,10 +23,9 @@ $OpenBSD: patch-src_config_torrc_sample_
## The port on which Tor will listen for local connections from Tor
## controller applications, as documented in control-spec.txt.
-@@ -154,3 +154,6 @@ SocksListenAddress 127.0.0.1 # accept connections only
+@@ -154,3 +154,5 @@ SocksListenAddress 127.0.0.1 # accept connections only
#BridgeRelay 1
#ExitPolicy reject *:*
+## Revoke privileges
+User _tor
-+Group _tor
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/tor/pkg/PLIST,v
retrieving revision 1.5
diff -u -u -p -r1.5 PLIST
--- pkg/PLIST 19 Sep 2008 21:51:00 - 1.5
+++ pkg/PLIST 7 Mar 2011 15:22:47 -
@@ -24,3 +24,4 @@ share/examples/tor/torrc.sample
@group
share/tor/
share/tor/geoip
+@rcscript ${RCDIR}/tor
Index: pkg/tor.rc
===
RCS file: pkg/tor.rc
diff -N pkg/tor.rc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/tor.rc7 Mar 2011 15:22:47 -
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# $OpenBSD
Missing $ from above.
+
+daemon=${TRUEPREFIX}/bin/tor
+
+. /etc/rc.d/rc.subr
+
+rc_cmd $1
--
Antti Harri
Re: update tor to 0.2.1.30
Hi, I sent this to the maintainer earlier today, but it seems appropriate to mention it here as well: Mar 07 13:17:03.767 [warn] Skipping obsolete configuration option 'Group' The documentation says that User is sufficient: User UID On startup, setuid to this user and setgid to their primary group. -- Antti Harri Index: Makefile === RCS file: /cvs/ports/net/tor/Makefile,v retrieving revision 1.49 diff -u -r1.49 Makefile --- Makefile 18 Jan 2011 19:59:17 - 1.49 +++ Makefile 7 Mar 2011 11:23:35 - @@ -3,6 +3,7 @@ COMMENT= anonymity service using onion routing DISTNAME= tor-0.2.1.29 +REVISION= 0 CATEGORIES= net HOMEPAGE= http://www.torproject.org/ Index: patches/patch-src_config_torrc_sample_in === RCS file: /cvs/ports/net/tor/patches/patch-src_config_torrc_sample_in,v retrieving revision 1.9 diff -u -r1.9 patch-src_config_torrc_sample_in --- patches/patch-src_config_torrc_sample_in 25 Mar 2010 05:35:38 - 1.9 +++ patches/patch-src_config_torrc_sample_in 7 Mar 2011 11:23:35 - @@ -1,6 +1,6 @@ $OpenBSD: patch-src_config_torrc_sample_in,v 1.9 2010/03/25 05:35:38 benoit Exp $ src/config/torrc.sample.in.orig Mon May 25 19:38:04 2009 -+++ src/config/torrc.sample.in Mon Aug 10 23:02:40 2009 +--- src/config/torrc.sample.in.orig Sun Jan 16 04:11:21 2011 src/config/torrc.sample.in Mon Mar 7 13:22:26 2011 @@ -37,18 +37,18 @@ SocksListenAddress 127.0.0.1 # accept connections only ## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log #Log debug file @LOCALSTATEDIR@/log/tor/debug.log @@ -23,10 +23,9 @@ ## The port on which Tor will listen for local connections from Tor ## controller applications, as documented in control-spec.txt. -@@ -154,3 +154,6 @@ SocksListenAddress 127.0.0.1 # accept connections only +@@ -154,3 +154,5 @@ SocksListenAddress 127.0.0.1 # accept connections only #BridgeRelay 1 #ExitPolicy reject *:* +## Revoke privileges +User _tor -+Group _tor
Re: OpenArena package 0.8.1p1
On Thursday 17 February 2011 23:45:34 patsy wrote: Hello list, I've just updated to the latest snapshot, and pkg_add -u 'd openarena et. al. When I run openarena, my screen goes blank (as it does when the resolution changes) and nothing else happens, even waiting for a couple of minutes. I am able to Ctrl-Alt-Fn away and kill it (as well as Ctrl-Alt-Del, which gives me a glimpse of my desktop with a resolution of 640x480, rather than my usual 1366x768). I've attached my dmesg and the output from running openarena-client It's not a vital port by any means, but it seemed worth mentioning. Patsy Hi, I think the fault is in your video driver. The R600 driver in OpenBSD can only do some very basic acceleration. I just tested OA here on amd64 and intel and it works. -- Antti Harri
Re: more about EPOCH
On Sunday 16 January 2011 21:27:26 Marc Espie wrote: I now have two normally bright guys asking weird questions about it works. EPOCH is stupid, it's awfully simple. A port that gets EPOCH means the version numbering got fucked up. So it starts anew. From scratch ! if you set EPOCH=0, that will append a v0 to the pkgname. ANYTHING with v0 is more recent than ANYTHING without, always. That's just some new numbering, you start anew, pkgtools won't peek, they won't care, it's just newer. so, e.g., $ pkg_info -r py-qt4-1.0v0 'py-qt4-=4.8' Pkgspec py-qt4-1.0v0 matched (and if you fuck up again, you go to v1, then v2...) That's totally simple. If you can avoid it, you don't want EPOCH. But you can't predict the future. So if you fuck up your numbers, EPOCH is for you. Don't hesitate to experiment with -current pkg_info -r until you get it ! Hi, I read about this variable just now. You described well how to use it, but I am curious, how or when does it go away from the Makefile if v0 is newer than anything else? -- Antti Harri
NEW: audio/aucatvol
Hi, pkg/DESCR: The aucatvol utility sends MIDI volume controller messages to adjust the volume of any MIDI software or hardware connected to the output MIDI port. It's is primarily useful for adjusting aucat(1) client volumes. -- Antti Harri ports_aucatvol.tar.gz Description: application/tgz
Re: minitube 1.1 to 1.2
On Monday 06 December 2010 04:39:24 j...@aol.cl wrote: Guys. I want to uninstall Minitube 1.1 tu install Minitube 1.2 but when I run command: $ sudo make uninstall The correct target is deinstall. And you can use update target too, no need to separately deinstall+install. However I would advise you to use binary packages instead. -- Antti Harri
Re: NEW games/ufoai
On Thursday 28 October 2010 06:53:49 Kirill Bychkov wrote: LANG=C is a valid LANG. In that case, it should default to the default language (most commonly English). It SHOULD, but it doesn't. It's ignoring .mo files with translations. Setting env LANG=en_EN makes it work. env LANG=ru_RU works too. The game works like it is supposed to work. The problem is how the upstream handled the translations. The (english) strings are right inside the code, however long strings like the intro are handled differently. I'm not sure if it's worth fixing. I would just mention something in Readme.OpenBSD about setting $LANG and get on with it. -- Antti Harri
Re: NEW games/ufoai
On Tuesday 26 October 2010 01:53:17 Edd Barrett wrote: Also start a single play campaign: intro sentance 1 intro sentance 2 ... Seems wrong? You probably don't have $LANG set, am I correct? -- Antti Harri
Re: [UPDATE] minitube-1.2
On Wednesday 20 October 2010 16:06:59 David Coppa wrote: Second revision of this diff attached. Please try this, it fixes missing icons problem for me. Cool! This works. -- Antti Harri
Re: [UPDATE] minitube-1.2
On Tuesday 19 October 2010 12:22:41 David Coppa wrote:
Hi all,
the following diff updates minitube to version 1.2.
It should also fix the problem reported by Antti Harri with minitube not
having icons under KDE3.
Please test
Hi.
I did a similar diff myself, but without the iconloader part. The mute
button's icon is still missing, although the button works. It's the same with
your diff and mine. Am I remembering correctly that the problem was that it
tries to load an icon that isn't available in the kde3's theme?
--
Antti Harri
cheers,
david
Index: Makefile
===
RCS file: /cvs/ports/www/minitube/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 26 Aug 2010 21:30:42 - 1.5
+++ Makefile 19 Oct 2010 09:13:28 -
@@ -2,8 +2,7 @@
COMMENT =standalone YouTube.com video browser/player
-DISTNAME = minitube-1.1
-REVISION = 1
+DISTNAME = minitube-1.2
CATEGORIES = www multimedia
HOMEPAGE = http://flavio.tordini.org/minitube
Index: distinfo
===
RCS file: /cvs/ports/www/minitube/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 2 Aug 2010 07:23:04 - 1.2
+++ distinfo 19 Oct 2010 09:13:28 -
@@ -1,5 +1,5 @@
-MD5 (minitube-1.1.tar.gz) = B1hBMiYxSGqLtpV17AX1yg==
-RMD160 (minitube-1.1.tar.gz) = onwuY7j8B/O6Th2iiGGuV7a7oMs=
-SHA1 (minitube-1.1.tar.gz) = RTHkIda63h6EIqqAQaEwBbHqXns=
-SHA256 (minitube-1.1.tar.gz) =
E+6kefz032cJK4j3UlILHzmdFHd+skkBiyM1ZnXKYFg= -SIZE (minitube-1.1.tar.gz) =
206135
+MD5 (minitube-1.2.tar.gz) = wOK643zoT6xQWVDtGysfNg==
+RMD160 (minitube-1.2.tar.gz) = Idf9LzhyR3eqHNW5H+wHzD+heVg=
+SHA1 (minitube-1.2.tar.gz) = +LHf8cuPJHsSChft8xPzBNryDtw=
+SHA256 (minitube-1.2.tar.gz) =
V7au4U3T5WNI2Pm8HDkg2MhxLkMtAG0TvQgfE5/R24w= +SIZE (minitube-1.2.tar.gz) =
231768
Index: patches/patch-src_MainWindow_cpp
===
RCS file: /cvs/ports/www/minitube/patches/patch-src_MainWindow_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_MainWindow_cpp
--- patches/patch-src_MainWindow_cpp 2 Aug 2010 07:23:04 - 1.2
+++ patches/patch-src_MainWindow_cpp 19 Oct 2010 09:13:28 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_MainWindow_cpp,v 1.2 2010/08/02 07:23:04 dcoppa Exp $
src/MainWindow.cpp.orig Tue Jul 27 00:39:16 2010
-+++ src/MainWindow.cpp Thu Jul 29 19:26:37 2010
-@@ -478,7 +478,9 @@ void MainWindow::visitSite() {
+--- src/MainWindow.cpp.orig Mon Oct 11 23:44:46 2010
src/MainWindow.cpp Tue Oct 19 09:34:23 2010
+@@ -559,7 +559,9 @@ void MainWindow::visitSite() {
}
void MainWindow::donate() {
Index: patches/patch-src_iconloader_qticonloader_cpp
===
RCS file: patches/patch-src_iconloader_qticonloader_cpp
diff -N patches/patch-src_iconloader_qticonloader_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_iconloader_qticonloader_cpp 19 Oct 2010 09:13:28
- @@ -0,0 +1,30 @@
+$OpenBSD$
+
+Use the gnome icon theme unconditionally: fixes a problem with minitube
+appearing without icons under KDE3
+
+--- src/iconloader/qticonloader.cpp.orig Tue Oct 19 10:44:32 2010
src/iconloader/qticonloader.cpp Tue Oct 19 10:48:34 2010
+@@ -85,8 +85,10 @@ class QtIconLoaderImplementation (private)
+ mutable QHash QString, QIconTheme themeList;
+ };
+
++#if QT_VERSION 0x040600
+ Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoaderInstance)
+ #endif
++#endif
+
+ /*!
+
+@@ -183,6 +185,11 @@ void QtIconLoaderImplementation::lookupIconTheme()
con +
+ 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: pkg/PLIST
===
RCS file: /cvs/ports/www/minitube/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 2 Aug 2010 07:23:04 - 1.2
+++ pkg/PLIST 19 Oct 2010 09:13:28 -
@@ -34,6 +34,7 @@ share/minitube/locale/bg_BG.qm
share/minitube/locale/cs_CZ.qm
share/minitube/locale/de_DE.qm
share/minitube/locale/el_GR.qm
+share/minitube/locale/en_US.qm
share/minitube/locale/es.qm
share/minitube/locale/fi_FI.qm
share/minitube/locale/fr_FR.qm
Re: return to castle wolfenstein port
On Thursday 19 August 2010 20:55:50 Jolan Luff wrote: On Thu, Aug 19, 2010 at 03:46:30PM +0200, Sebastian Reitenbach wrote: Haven't tried yet to run this version, but I think you should probably use INSTALL_PROGRAM in the do-install step. I purposely changed it from INSTALL_PROGRAM so the debugging symbols don't get stripped. I'll change it back if no one reports any more problems. Doesn't DEBUG='-g' INSTALL_STRIP='' work when you build the port? Also I am not sure whether the SHARED_ONLY is superfluous since its only for i386 anyways. I should be able to get it running on some other archs. There appears to be some bits for at least alpha/powerpc. -- Antti Harri
Re: gwenview broken
On Wednesday 04 August 2010 00:02:23 Brad wrote: Yes. I can reproduce that error message when I go to save the rotated image. I did some more digging. It appears it is the libjpeg update that has broken it. I couldn't find any working fixes yet. From what I read it is plausible that other programs are affected as well. Gwenview seems to be using jpeg6 stuff internally while linking to jpeg8 externally. See these for more information: http://chakra-project.org/bbs/viewtopic.php?pid=15632 http://bugs.gentoo.org/show_bug.cgi?id=306297 -- Antti Harri
gwenview broken
Hi, recently gwenview's image rotating has become broken. When I try to rotate an image I get this on the terminal: gwenview: WARNING: [static void ImageUtils::JPEGErrorManager::errorExitCallBack(jpeg_common_struct*)] Bogus virtual array access gwenview: ERROR: [void ImageUtils::JPEGContent::applyPendingTransformation()] libjpeg error in src Does that happen to other gwenview users? I'm on a i386 snapshot having this kernel: OpenBSD 4.8-beta (GENERIC) #55: Wed Jul 28 18:18:16 MDT 2010 -- Antti Harri
Re: gwenview broken
On Tuesday 03 August 2010 23:42:39 Brad wrote: On Tuesday 03 August 2010 16:31:17 Antti Harri wrote: Hi, recently gwenview's image rotating has become broken. When I try to rotate an image I get this on the terminal: gwenview: WARNING: [static void ImageUtils::JPEGErrorManager::errorExitCallBack(jpeg_common_struct*)] Bogus virtual array access gwenview: ERROR: [void ImageUtils::JPEGContent::applyPendingTransformation()] libjpeg error in src Does that happen to other gwenview users? I'm on a i386 snapshot having this kernel: OpenBSD 4.8-beta (GENERIC) #55: Wed Jul 28 18:18:16 MDT 2010 -- Antti Harri Works fine for me on amd64. Does it actually save the file too? I might have been too vague in the posting. It rotates it on screen but doesn't save to disc. It resets the image on the screen to its original setting once I advance to another file. Looking at the error the real problem is probably the saving procedure. -- Antti Harri
Re: fix cad/qcad
On Sun, 6 Jun 2010, Matthias Kilian wrote: Fix build with gcc4. Hello, I would like to propose these things to be patched as well: - Better license marker - Use of SUBST* - @bin for the PLIST - Fix the order of recent files menu I must warn though, looks like those changes have been in my mystuff/ for two years, so they could use some double-checking to make sure they are up-to-date. And for the menu fix, I was unable to get it into upstream back then and it had done no good anyway, there have been no new releases. So in my opinion it could be committed as well. The diff is at: http://openbsd.fi/iku/tmp/qcad2.diff -- Antti Harri
Re: N.B. mysql -current snapshot packages
On Wed, 2 Jun 2010, Stuart Henderson wrote: On 2010/06/02 16:23, Antti Harri wrote: On Wed, 2 Jun 2010, Stuart Henderson wrote: Apply or update, then rebuild libc (cd /usr/src/lib/libc make obj make sudo make install). No need to rebuild mysql. Because the fault was in libc I would assume that reboot is required too? You might want to do that to ensure everything that uses libc is using the rebuilt one, but mysql runs ok without that. OK. btw, this problem is only likely to affect anything doing strnlen(foo, -1). Yep that was my concern, mysql alone would be simple to restart. I would like to thank all who participated in fixing this. -- Antti Harri
Re: Upgrade MySql to 5.1: skip-bdb is deadly
Hi,
On Mon, 31 May 2010, Uwe Dippel wrote:
2. I wasn't aware of the need to run mysql_upgrade after an(y) upgrade.
Actually, the man page says it should be done after any upgrade.
Should this eventually be mentioned in the install message?
I wasn't aware either and I had some weird problems when I
upgraded from 5.0 to 5.1. I recall they were mostly procedure/trigger
related. I don't think I ever had any problems with minor
updates with the 5.0 series though.
I just updated to 5.1.47 from .45 and now mysqldump is segfaulting,
mysql_upgrade ran fine but it didn't help:
mysqldump --quick --lock-all-tables --force --routines --triggers \
--all-databases --add-drop-table --add-drop-database -u $user -p$pass \
${dir}/all_databases.sql
mysqldump: Couldn't execute '': (1064)
Segmentation fault (core dumped)
#0 0x0124088c in mysql_fetch_row () from
/usr/local/lib/mysql/libmysqlclient.so.20.0
--
Antti Harri
Updating MySQL (Was: Upgrade MySql to 5.1: skip-bdb is deadly)
On Tue, 1 Jun 2010, Antti Harri wrote: I just updated to 5.1.47 from .45 and now mysqldump is segfaulting, mysql_upgrade ran fine but it didn't help: I would like to warn other users, that update totally broke mysql here, I'm getting this also: General error: 1548 Cannot load from mysql.. The table is probably corrupted -- Antti Harri
PATCH: games/quake2
Hi,
fixes crash when selecting software renderer (= svgalib) from
options by disabling the driver in the list. Also remove 3dfx wrapper
driver that is nonexisting and doesn't make sense.
--
Antti Harri
Index: Makefile
===
RCS file: /cvs/ports/games/quake2/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile26 Apr 2010 16:37:24 - 1.16
+++ Makefile21 May 2010 19:10:57 -
@@ -6,7 +6,7 @@
COMMENT= first person shooter
DISTNAME= quake2-0.3
-PKGNAME= ${DISTNAME}p10
+PKGNAME= ${DISTNAME}p11
CATEGORIES=games
HOMEPAGE= http://www.quakeforge.net/
@@ -31,7 +31,7 @@
USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --with-opengl=${X11BASE}
+CONFIGURE_ARGS+= --with-opengl=${X11BASE} --without-svgalib
NO_REGRESS=Yes
CFLAGS+=-pthread -g
Index: patches/patch-src_vid_menu_c
===
RCS file: /cvs/ports/games/quake2/patches/patch-src_vid_menu_c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_vid_menu_c
--- patches/patch-src_vid_menu_c25 May 2008 02:54:58 - 1.1
+++ patches/patch-src_vid_menu_c21 May 2010 19:10:57 -
@@ -1,7 +1,34 @@
$OpenBSD: patch-src_vid_menu_c,v 1.1 2008/05/25 02:54:58 jsg Exp $
src/vid_menu.c.origSat May 24 21:12:38 2008
-+++ src/vid_menu.c Sat May 24 21:13:15 2008
-@@ -164,21 +164,21 @@ static void ApplyChanges( void *unused )
+--- src/vid_menu.c.origTue Mar 9 13:59:00 2004
src/vid_menu.c Fri May 21 22:08:02 2010
+@@ -23,12 +23,10 @@
+ #include qmenu.h
+
+ /* irix/vid_menu.c defines only REF_SOFT and REF_OPENGL, we'll use REF_GLX */
+-#define REF_SOFT 0
+-#define REF_SOFTX11 1
+-#define REF_SOFTSDL 2
+-#define REF_GLX 3
+-#define REF_SDLGL 4
+-#define REF_FXGL 5
++#define REF_SOFTX11 0
++#define REF_SOFTSDL 1
++#define REF_GLX 2
++#define REF_SDLGL 3
+
+ #define GL_REF_START REF_GLX
+
+@@ -152,9 +150,6 @@ static void ApplyChanges( void *unused )
+
+ switch ( s_ref_list[s_current_menu_index].curvalue )
+ {
+- case REF_SOFT:
+- Cvar_Set( vid_ref, soft );
+- break;
+ case REF_SOFTX11:
+ Cvar_Set( vid_ref, softx );
+ break;
+@@ -164,24 +159,17 @@ static void ApplyChanges( void *unused )
case REF_GLX:
Cvar_Set( vid_ref, glx );
/* below is wrong if we use different libs for different GL
reflibs */
@@ -18,15 +45,30 @@
if (gl_driver-modified)
vid_ref-modified = true;
break;
- case REF_FXGL:
- Cvar_Set(vid_ref, tdfx);
- /* below is wrong if we use different libs for different GL
reflibs */
+- case REF_FXGL:
+- Cvar_Set(vid_ref, tdfx);
+- /* below is wrong if we use different libs for different GL
reflibs */
- Cvar_Set( gl_driver, libGL.so.1 );
-+ Cvar_Set( gl_driver, libGL.so );
- if (gl_driver-modified)
- vid_ref-modified = true;
+- if (gl_driver-modified)
+- vid_ref-modified = true;
+- break;
+ default:
+ Com_Printf(No video refresher\n);
break;
-@@ -260,7 +260,7 @@ void VID_MenuInit( void )
+@@ -243,12 +231,10 @@ void VID_MenuInit( void )
+ };
+ static const char *refs[] =
+ {
+- [software ],
+ [software X11 ],
+ [software SDL ],
+ [OpenGL GLX],
+ [SDL OpenGL],
+- [3DFX OpenGL ],
+ 0
+ };
+ static const char *yesno_names[] =
+@@ -260,7 +246,7 @@ void VID_MenuInit( void )
int i;
if ( !gl_driver )
@@ -35,3 +77,17 @@
if ( !gl_picmip )
gl_picmip = Cvar_Get( gl_picmip, 0, 0 );
if ( !gl_mode )
+@@ -285,12 +271,7 @@ void VID_MenuInit( void )
+ s_screensize_slider[SOFTWARE_MENU].curvalue = scr_viewsize-value/10;
+ s_screensize_slider[OPENGL_MENU].curvalue = scr_viewsize-value/10;
+
+- if ( strcmp( vid_ref-string, soft ) == 0)
+- {
+- s_current_menu_index = SOFTWARE_MENU;
+- s_ref_list[0].curvalue = s_ref_list[1].curvalue = REF_SOFT;
+- }
+- else if (strcmp( vid_ref-string, softx ) == 0 )
++ if (strcmp( vid_ref-string, softx ) == 0 )
+ {
+ s_current_menu_index = SOFTWARE_MENU;
+ s_ref_list[0].curvalue = s_ref_list[1].curvalue = REF_SOFTX11;
