Re: UPDATE: geo/gpsbabel-1.4.4
Just checked patch with my Holux M-241. Downloading of tracks works fine. uslcom0 at uhub5 port 1 "Silicon Labs CP2102 USB to UART Bridge Controller" rev 1.10/1.00 addr 2 ucom0 at uslcom0 portno 0 On 22:21 Wed 26 Dec , SASANO Takayoshi wrote: > Hello, > > Here is the update for geo/gpsbabel-1.4.3 -> gpsbabel-1.4.4. > And new file, patches/patch-gbser_posix_c fixes the stuck problem when > downloading log data from GPS logger via serial port. > > I tested with CanMore's GP-101, it contains PL-2303 USB-UART converter. > > Regards, > -- > SASANO Takayoshi > > Index: Makefile > === > RCS file: /cvs/ports/geo/gpsbabel/Makefile,v > retrieving revision 1.23 > diff -u -p -r1.23 Makefile > --- Makefile 27 Sep 2012 17:26:05 - 1.23 > +++ Makefile 25 Dec 2012 18:55:11 - > @@ -4,7 +4,7 @@ COMMENT-main= GPS waypoint, track, and > COMMENT-tk= Tk front-end to gpsbabel > COMMENT-qt= Qt front-end to gpsbabel > > -VERSION= 1.4.3 > +VERSION= 1.4.4 > DISTNAME=gpsbabel-${VERSION} > PKGNAME-main=gpsbabel-${VERSION} > REVISION-main= 0 > @@ -23,7 +23,7 @@ PERMIT_PACKAGE_FTP= Yes > PERMIT_DISTFILES_CDROM= Yes > PERMIT_DISTFILES_FTP=Yes > > -MASTER_SITES=http://www.linklevel.net/distfiles/ > +MASTER_SITES=https://secure.ohos.nl/downloads/ > > AUTOCONF_VERSION=2.61 > CONFIGURE_STYLE= autoconf > Index: distinfo > === > RCS file: /cvs/ports/geo/gpsbabel/distinfo,v > retrieving revision 1.7 > diff -u -p -r1.7 distinfo > --- distinfo 18 Feb 2012 22:04:07 - 1.7 > +++ distinfo 25 Dec 2012 18:55:11 - > @@ -1,5 +1,5 @@ > -MD5 (gpsbabel-1.4.3.tar.gz) = kW9+Ek9t+RGiTh6jI+nFKQ== > -RMD160 (gpsbabel-1.4.3.tar.gz) = n/L+4X6Xj+ckjRwNRf8cf/43ddE= > -SHA1 (gpsbabel-1.4.3.tar.gz) = vWJm7u84dV1J5twXMwtYxo5aMtc= > -SHA256 (gpsbabel-1.4.3.tar.gz) = ybgeu9ZaNOf+dBwYmFwerWUSP9CfoOy/iCvEeofE9dg= > -SIZE (gpsbabel-1.4.3.tar.gz) = 5616398 > +MD5 (gpsbabel-1.4.4.tar.gz) = bEyPDLn8+fgwJYUUiHjxdA== > +RMD160 (gpsbabel-1.4.4.tar.gz) = laBC+wNaWqoty1DUMONvOEpXX08= > +SHA1 (gpsbabel-1.4.4.tar.gz) = 1/9A8ESg7l2BxVVNpROUIE51WZw= > +SHA256 (gpsbabel-1.4.4.tar.gz) = ndKgboh8sobJoHFkqPLt4RrtEUfmQZAHNwxShBIyGUQ= > +SIZE (gpsbabel-1.4.4.tar.gz) = 7811264 > Index: patches/patch-configure_in > === > RCS file: /cvs/ports/geo/gpsbabel/patches/patch-configure_in,v > retrieving revision 1.5 > diff -u -p -r1.5 patch-configure_in > --- patches/patch-configure_in18 Feb 2012 22:04:07 - 1.5 > +++ patches/patch-configure_in25 Dec 2012 18:55:11 - > @@ -1,7 +1,6 @@ > -$OpenBSD: patch-configure_in,v 1.5 2012/02/18 22:04:07 sthen Exp $ > configure.in.origSun Jan 29 01:59:29 2012 > -+++ configure.in Thu Feb 2 13:03:10 2012 > -@@ -63,15 +63,20 @@ if test "$cet" = "default"; then > +--- configure.in.origTue Sep 4 07:09:52 2012 > configure.in Tue Dec 25 21:50:38 2012 > +@@ -62,15 +62,20 @@ if test "$cet" = "default"; then > fi > > AC_MSG_CHECKING(whether to support shapefiles) > @@ -29,7 +28,7 @@ $OpenBSD: patch-configure_in,v 1.5 2012/ > > AC_MSG_CHECKING(whether to support Palm/OS pdb formats) > AC_ARG_ENABLE(pdb, > -@@ -224,32 +229,8 @@ AC_SUBST(USB_LIBS) > +@@ -223,32 +228,8 @@ AC_SUBST(USB_LIBS) > AC_SUBST(USB_CFLAGS) > AC_SUBST(OSJEEPS) > AC_SUBST(GBSER) > Index: patches/patch-gbser_posix_c > === > RCS file: patches/patch-gbser_posix_c > diff -N patches/patch-gbser_posix_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-gbser_posix_c 25 Dec 2012 18:55:11 - > @@ -0,0 +1,11 @@ > +--- gbser_posix.c.orig Tue Jul 26 10:56:33 2011 > gbser_posix.cTue Dec 25 21:52:11 2012 > +@@ -142,7 +142,7 @@ void* gbser_init(const char* port_name) > + if (0 == strcmp(port_name, "-")) { > + h->fd = 0; > + return h; > +- } else if (h->fd = open(port_name, O_RDWR | O_NOCTTY), h->fd == -1) { > ++ } else if (h->fd = open(port_name, O_RDWR | O_NOCTTY | O_NDELAY), h->fd > == -1) { > + warning("Failed to open port (%s)\n", strerror(errno)); > + goto failed; > + } > > > > -- sergeyb@
Re: [UPDATE] www/py-django
Hi, On Wed, Dec 19, 2012 at 7:08 AM, Ryan Boggs wrote: > Hi, > > On Wed, Dec 19, 2012 at 12:28 AM, Remi Pointel wrote: >> Hi, >> >> this is the diff to update django to last release: 1.4.3. >> >> Are you ok? > It looks straight forward. Did you run regression on this? If > regression passed then I am ok with this. Just tested Remi's diff on latest i386/amd64 snapshots. Passed regressions on both. I'm ok with getting this committed if everyone else is. Please let us know if anything else is needed to get this committed. Thanks, Ryan > > Thanks for getting to this. I was planning on doing this during the > week but you beat me to it. :) > > Thanks, > Ryan >> >> Cheers, >> >> Remi.
UPDATE x11/terminator
The version in ports has more than two years. I've updated the port to the last version (0.96 2011/09/23). The former maintainer agrees with the change of maintainer: "you're welcome to take over maintainership". Changelog: terminator 0.96: - Unity support for opening new windows (Lucian Adrian Grijincu) - Fix searching with infinite scrollback (Julien Thewys #755077) - Fix searching on Ubuntu 10.10 and 11.04, and implement searching by regular expression (Roberto Aguilar #709018) - Optimise various low level components so they are dramatically faster (Stephen Boddy) - Fix various bugs (Stephen Boddy) - Fix cursor colours (#700969) and a cursor blink issue (Tony Baker) - Improve and extend drag&drop support to include more sources of text, e.g. Gtk file chooser path buttons (#643425) - Add a plugin to watch a terminal for inactvity (i.e. silence) - Fix loading layouts with more than two tabs (#646826) - Fix order of tabs created from saved layouts (#615930) - Add configuration to remove terminal dimensions from titlebars (patch from Joo Pinto #691213) - Restore split positions more accurately (patch from Glenn Moss #797953) - Fix activity notification in active terminals. (patch from Chris Newton #748681) - Stop leaking child processes if terminals are closed using the context menu (#308025) - Don't forget tab order and custom labels when closing terminals in them (#711356) - Each terminal is assigned a unique identifier and this is exposed to the processes inside the terminal via the environment variable TERMINATOR_UUID - Expand dbus support to start covering useful methods. Also add a commandline tool called 'remotinator' that can be used to control Terminator from a terminal running inside it. - Fix terminal font settings for users of older Linux distributions Index: Makefile === RCS file: /cvs/ports/x11/terminator/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile15 Jun 2012 08:30:24 - 1.7 +++ Makefile28 Dec 2012 01:51:22 - @@ -2,15 +2,14 @@ COMMENT= GTK2 terminal emulator with split-window and tabs support -MODPY_EGG_VERSION= 0.95 +MODPY_EGG_VERSION= 0.96 DISTNAME= terminator-${MODPY_EGG_VERSION} -REVISION= 5 CATEGORIES=x11 HOMEPAGE= http://www.tenshu.net/terminator/ -MAINTAINER=Jochem Kossen +MAINTAINER=Juan Francisco Cantero Hurtado # GPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -25,13 +24,13 @@ MODULES=lang/python \ RUN_DEPENDS= devel/vte,-python \ devel/py-notify \ devel/desktop-file-utils \ - x11/gtk+2,-guic + x11/py-gtk2 NO_REGRESS=Yes MODPY_SETUPTOOLS= Yes MODPY_SETUP= setup.py --without-icon-cache -# --single-version-externally-managed option used by MODPY doesn't exist (from audio/picard) +# --single-version-externally-managed option used by MODPY doesn't exist MODPY_DISTUTILS_INSTALL=install --prefix=${LOCALBASE} --root=${DESTDIR} .include Index: distinfo === RCS file: /cvs/ports/x11/terminator/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo23 May 2011 20:36:20 - 1.1.1.1 +++ distinfo28 Dec 2012 01:51:22 - @@ -1,5 +1,2 @@ -MD5 (terminator-0.95.tar.gz) = zq5ciZxxucgOSAg8F6YxrQ== -RMD160 (terminator-0.95.tar.gz) = YJZFTJsnGD7/NCLWGgG0pNKHP2E= -SHA1 (terminator-0.95.tar.gz) = v3ZBVtax9RFqFSmLDWnyy+rQYLo= -SHA256 (terminator-0.95.tar.gz) = BReHhbDs2qoUlJ/SP7v341XWWCvRG2vCmWkp8pK+HhM= -SIZE (terminator-0.95.tar.gz) = 222782 +SHA256 (terminator-0.96.tar.gz) = 1wjHg8NiM/yvvQE5qRRiR4rkD1z2lu9Kz8r1iRqEMgE= +SIZE (terminator-0.96.tar.gz) = 264226 Index: pkg/PLIST === RCS file: /cvs/ports/x11/terminator/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 15 Jun 2012 08:30:24 - 1.3 +++ pkg/PLIST 28 Dec 2012 01:51:22 - @@ -94,9 +94,13 @@ share/icons/hicolor/24x24/apps/terminato share/icons/hicolor/32x32/apps/terminator.png share/icons/hicolor/48x48/apps/terminator.png share/icons/hicolor/scalable/apps/terminator.svg +share/locale/af/LC_MESSAGES/terminator.mo share/locale/ar/LC_MESSAGES/terminator.mo +share/locale/ast/LC_MESSAGES/terminator.mo share/locale/bg/LC_MESSAGES/terminator.mo +share/locale/bn/LC_MESSAGES/terminator.mo share/locale/ca/LC_MESSAGES/terminator.mo +share/locale/ca@valencia/LC_MESSAGES/terminator.mo share/locale/cs/LC_MESSAGES/terminator.mo share/locale/da/LC_MESSAGES/terminator.mo share/locale/de/LC_MESSAGES/terminator.mo @@ -159,6 +163,9 @@ share/locale/ta/LC_MESSAGES/terminator.m share/locale/te/LC_MESSAGE
Re: UPDATE: rxvt-unicode -> 9.16
On Thu, Dec 27, 2012 at 10:23:34PM +, Stuart Henderson wrote: > On 2012/12/27 22:35, LEVAI Daniel wrote: > > Hi! > > > > Update for rxvt-unicode. Use patch -E, one file from patches/ is gone. > > Also regenerated WANTLIBs. > > > > A few changes worth noting (at least in my opinion) from the changelog: > > - perl extensions now have their own manpages, installed as urxvt-NAME(1) > > - completely redone background pixmap support - users can now specify > > arbitrary expressions (And programs) that calculate new terminal > > backgrounds. > > - perl extensions can now provide commandline switches and resources > > which show up in -help etc. > > - remove support for libafterimage. (we didn't use it, however) > > - update to CVS version of libev > > Seems fine to me so far (amd64 and macppc); I'm OK with it but would > like to hear from one or two other people who use this before committing. > OK here - amd64.
Re: UPDATE: rxvt-unicode -> 9.16
On 2012/12/27 22:35, LEVAI Daniel wrote: > Hi! > > Update for rxvt-unicode. Use patch -E, one file from patches/ is gone. > Also regenerated WANTLIBs. > > A few changes worth noting (at least in my opinion) from the changelog: > - perl extensions now have their own manpages, installed as urxvt-NAME(1) > - completely redone background pixmap support - users can now specify > arbitrary expressions (And programs) that calculate new terminal > backgrounds. > - perl extensions can now provide commandline switches and resources > which show up in -help etc. > - remove support for libafterimage. (we didn't use it, however) > - update to CVS version of libev Seems fine to me so far (amd64 and macppc); I'm OK with it but would like to hear from one or two other people who use this before committing.
UPDATE: rxvt-unicode -> 9.16
Hi! Update for rxvt-unicode. Use patch -E, one file from patches/ is gone. Also regenerated WANTLIBs. A few changes worth noting (at least in my opinion) from the changelog: - perl extensions now have their own manpages, installed as urxvt-NAME(1) - completely redone background pixmap support - users can now specify arbitrary expressions (And programs) that calculate new terminal backgrounds. - perl extensions can now provide commandline switches and resources which show up in -help etc. - remove support for libafterimage. (we didn't use it, however) - update to CVS version of libev Index: Makefile === RCS file: /cvs/ports/x11/rxvt-unicode/Makefile,v retrieving revision 1.20 diff -p -u -r1.20 Makefile --- Makefile29 Aug 2012 14:45:36 - 1.20 +++ Makefile27 Dec 2012 21:27:29 - @@ -2,8 +2,7 @@ COMMENT = clone of rxvt with Unicode and Xft support -DISTNAME = rxvt-unicode-9.15 -REVISION = 1 +DISTNAME = rxvt-unicode-9.16 CATEGORIES = x11 EXTRACT_SUFX = .tar.bz2 @@ -20,11 +19,9 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = X11 Xau Xdmcp Xft Xrender c expat ffi \ - fontconfig freetype gdk_pixbuf-2.0 gio-2.0 \ - glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ - m pcre perl png pthread-stubs pthread \ - startup-notification-1 util xcb z +WANTLIB = X11 Xft Xrender c expat fontconfig freetype \ + gdk_pixbuf-2.0 glib-2.0 gobject-2.0 m perl \ + pthread startup-notification-1 util z MODULES = devel/gettext @@ -36,8 +33,8 @@ CONFIGURE_ARGS = --enable-256-color \ --enable-perl \ --enable-pixbuf \ --enable-startup-notification \ - --with-term=rxvt-256color \ - --disable-afterimage + --with-term=rxvt-256color + # missing locale support CONFIGURE_ARGS += --disable-xim Index: distinfo === RCS file: /cvs/ports/x11/rxvt-unicode/distinfo,v retrieving revision 1.7 diff -p -u -r1.7 distinfo --- distinfo23 Jan 2012 08:10:40 - 1.7 +++ distinfo27 Dec 2012 21:27:29 - @@ -1,5 +1,2 @@ -MD5 (rxvt-unicode-9.15.tar.bz2) = FVlaoyYWesXraMKNlUMvrw== -RMD160 (rxvt-unicode-9.15.tar.bz2) = gLM8Ej7e5JjyZxR7XCNhqBxC8WA= -SHA1 (rxvt-unicode-9.15.tar.bz2) = 5v3wkYYOy0WHMNxosBdvZ/IHovc= -SHA256 (rxvt-unicode-9.15.tar.bz2) = 7Bqiky2oRJee2BQL2SIj3vsSBCql6HfgWsMROcqB8rE= -SIZE (rxvt-unicode-9.15.tar.bz2) = 894764 +SHA256 (rxvt-unicode-9.16.tar.bz2) = drsVzcjMdwmwE4lyf32Bjx9AG2YWEh8CFhZaTLXnSHQ= +SIZE (rxvt-unicode-9.16.tar.bz2) = 898089 Index: patches/patch-doc_Makefile_in === RCS file: /cvs/ports/x11/rxvt-unicode/patches/patch-doc_Makefile_in,v retrieving revision 1.5 diff -p -u -r1.5 patch-doc_Makefile_in --- patches/patch-doc_Makefile_in 23 Jan 2012 08:10:41 - 1.5 +++ patches/patch-doc_Makefile_in 27 Dec 2012 21:27:29 - @@ -1,10 +1,10 @@ $OpenBSD: patch-doc_Makefile_in,v 1.5 2012/01/23 08:10:41 dcoppa Exp $ doc/Makefile.in.orig Wed Dec 28 03:31:26 2011 -+++ doc/Makefile.inSun Jan 22 18:04:25 2012 -@@ -102,7 +102,7 @@ install: all +--- doc/Makefile.in.orig Tue Nov 6 21:54:10 2012 doc/Makefile.inThu Dec 27 15:24:07 2012 +@@ -96,7 +96,7 @@ install: all + $(INSTALL_DATA) rxvtc.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)c.$(man1ext) + $(INSTALL_DATA) rxvtd.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)d.$(man1ext) $(INSTALL_DATA) rxvt.7.man $(DESTDIR)$(man7dir)/$(RXVTNAME).$(man7ext) - @IF_PERL@ $(INSTALL) -d $(DESTDIR)$(man3dir) - @IF_PERL@ $(INSTALL_DATA) rxvtperl.3.man $(DESTDIR)$(man3dir)/$(RXVTNAME)perl.$(man3ext) - @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo + @TIC@ -o $(DESTDIR)$(prefix)/share/terminfo $(srcdir)/etc/rxvt-unicode.terminfo Index: patches/patch-libev_ev_c === RCS file: patches/patch-libev_ev_c diff -N patches/patch-libev_ev_c --- patches/patch-libev_ev_c29 Aug 2012 14:45:36 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,18 +0,0 @@ -$OpenBSD: patch-libev_ev_c,v 1.3 2012/08/29 14:45:36 dcoppa Exp $ libev/ev.c.origThu Jan 19 18:55:00 2012 -+++ libev/ev.c Wed Aug 29 10:04:02 2012 -@@ -562,6 +562,14 @@ struct signalfd_siginfo - #define ECB_MEMORY_FENCE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad | " : : : "memory") - #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") - #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") -+#e
Re: x11/e17: mark SHARED_ONLY
On Thu, Dec 27, 2012 at 07:10:02PM +0100, Stefan Sperling wrote: > On Thu, Dec 27, 2012 at 05:51:13PM +, Christian Weisgerber wrote: > > The .a files should not be built at all. There is no point in > > compiling everything twice and then throwing one set away. > > Just passing --disable-static to the configure script has no effect. > The build system seems to ignore that option entirely. If it uses libtool you need to set: LIBTOOL_FLAGS= --tag=disable-static > I'm starting to think that making e17 SHARED_ONLY isn't worth the bother. > It seems to be more involved than I have time for. > I'll leave this to someone else who cares more about e17 than I do. You quit easily :) -- Antoine
Re: x11/e17: mark SHARED_ONLY
On Thu, Dec 27, 2012 at 05:51:13PM +, Christian Weisgerber wrote: > The .a files should not be built at all. There is no point in > compiling everything twice and then throwing one set away. Just passing --disable-static to the configure script has no effect. The build system seems to ignore that option entirely. I'm starting to think that making e17 SHARED_ONLY isn't worth the bother. It seems to be more involved than I have time for. I'll leave this to someone else who cares more about e17 than I do.
Re: x11/e17: mark SHARED_ONLY
Antoine Jacoutot wrote: > On Thu, Dec 27, 2012 at 03:55:44PM +0100, Stefan Sperling wrote: > > > > > > Then you should also remove the .la and .a files from the modules. > > > > You mean @comment them? > > No, just rm them in post-install. The .a files should not be built at all. There is no point in compiling everything twice and then throwing one set away. The .la files are harmless. > > Why remove .la files? > > Aren't they required to link against libs, even shared ones? > > These are modules (see my former mail); they are not meant to be linked to. .la files are needed if the modules are loaded with libltdl; they are not needed for modules directly loaded with dlopen(). -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: x11/e17: mark SHARED_ONLY
Antoine Jacoutot wrote: > > e17 ports require shared libs so mark the whole bunch SHARED_ONLY > > and roll PFRAG.shared into PLIST. Suggested by sthen. ok? > > Then you should also remove the .la and .a files from the modules. The .a files shouldn't be built in the first place. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: x11/e17: mark SHARED_ONLY
On Thu, Dec 27, 2012 at 03:55:44PM +0100, Stefan Sperling wrote: > On Thu, Dec 27, 2012 at 02:10:08PM +0100, Antoine Jacoutot wrote: > > On Thu, Dec 27, 2012 at 02:01:48PM +0100, Stefan Sperling wrote: > > > e17 ports require shared libs so mark the whole bunch SHARED_ONLY > > > and roll PFRAG.shared into PLIST. Suggested by sthen. ok? > > > > Then you should also remove the .la and .a files from the modules. > > You mean @comment them? No, just rm them in post-install. > Why remove .la files? > Aren't they required to link against libs, even shared ones? These are modules (see my former mail); they are not meant to be linked to. -- Antoine
update: games/stone-soup 0.11.0
Update stone-soup to the latest release. ok? Index: Makefile === RCS file: /cvs/ports/games/stone-soup/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile19 Sep 2012 08:15:09 - 1.17 +++ Makefile27 Dec 2012 14:38:16 - @@ -5,21 +5,19 @@ CATEGORIES = games HOMEPAGE = http://crawl.develz.org/ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=crawl-ref/} -VERSION = 0.9.1 +VERSION = 0.11.0 DISTNAME= stone_soup-${VERSION}-nodeps -EXTRACT_SUFX= .tar.bz2 +EXTRACT_SUFX= .tar.xz PKGNAME= stone-soup-${VERSION} -REVISION = 3 BROKEN-arm=tilegen.elf loops burning cpu WRKDIST = ${WRKDIR}/stone_soup-${VERSION} WRKSRC = ${WRKDIST}/source -MAKE_FILE =${WRKSRC}/makefile USE_GMAKE =Yes +CFLAGS += "-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/SDL" +CXXFLAGS +="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/SDL" MAKE_FLAGS = CC="${CC}" CXX="${CXX}" \ - CFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/SDL" \ - CXXFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/SDL" \ LUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \ LUA_LIB=${MODLUA_LIB} \ SQLITE_INCLUDE_DIR=/usr/include \ @@ -29,6 +27,7 @@ MAKE_FLAGS = CC="${CC}" CXX="${CXX}" \ SAVEDIR="~/.crawl" \ V=1 +MAKE_ENV +=MODLUA_DEP_VERSION=${MODLUA_DEP_VERSION} MODULES = lang/lua WANTLIB = c m stdc++ ${MODLUA_WANTLIB} sqlite3 @@ -46,16 +45,19 @@ FLAVORS = no_x11 FLAVOR ?= .if ${FLAVOR:Mno_x11} -WANTLIB += ncursesw +WANTLIB += ncursesw pthread z MAKE_FLAGS += USE_UNICODE=y UNICODE_LOCALE=y .else +# This should be automatically set during "gmake -C rltiles..." but isn't... +CFLAGS += -DUSE_TILE +CXXFLAGS +=-DUSE_TILE + MAKE_FLAGS += TILES=y \ YACC=yacc \ LDFLAGS="-L${LOCALBASE}/lib -lSDL -lSDL_image -lpng -pthread" WANTLIB += GL GLU SDL SDL_image freetype png pthread z LIB_DEPENDS += devel/sdl \ devel/sdl-image \ - print/freetype \ graphics/png .endif Index: distinfo === RCS file: /cvs/ports/games/stone-soup/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo2 Jan 2012 11:26:18 - 1.2 +++ distinfo27 Dec 2012 11:48:46 - @@ -1,5 +1,2 @@ -MD5 (stone_soup-0.9.1-nodeps.tar.bz2) = ub77gXdhjZQylVRsPR4deA== -RMD160 (stone_soup-0.9.1-nodeps.tar.bz2) = gDvB2ughEK1bfSwGjacaV8CnQY0= -SHA1 (stone_soup-0.9.1-nodeps.tar.bz2) = esWluA8lETKC0ZAAtX24MT3dXmo= -SHA256 (stone_soup-0.9.1-nodeps.tar.bz2) = yh/tGNJB3LjZIB4fJMSTD/dhbfTECvRXAQWLlcHMyWE= -SIZE (stone_soup-0.9.1-nodeps.tar.bz2) = 6540169 +SHA256 (stone_soup-0.11.0-nodeps.tar.xz) = KjkwfJ+IYI7ioz07gxxR2RkMkcze2t7OzaXtrm3WkAI= +SIZE (stone_soup-0.11.0-nodeps.tar.xz) = 7516360 Index: patches/patch-source_Makefile === RCS file: patches/patch-source_Makefile diff -N patches/patch-source_Makefile --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-source_Makefile 27 Dec 2012 14:18:37 - @@ -0,0 +1,48 @@ +$OpenBSD$ +--- source/Makefile.orig Sun Sep 30 23:25:31 2012 source/MakefileThu Dec 27 15:18:32 2012 +@@ -533,7 +533,7 @@ ifndef BUILD_LUA + endif + endif + ifndef BUILD_LUA +- ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),) ++ ifneq ($(shell $(PKGCONFIG) lua${MODLUA_DEP_VERSION} --exists || echo no),) + ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),) + BUILD_LUA = yes + else +@@ -544,7 +544,7 @@ ifndef BUILD_LUA + endif + endif + else +-LUA_PACKAGE = lua5.1 ++LUA_PACKAGE = lua${MODLUA_DEP_VERSION} + endif + endif + ifndef BUILD_LUA +@@ -831,7 +831,7 @@ ifdef PROPORTIONAL_FONT + INSTALL_FONTS += $(PROPORTIONAL_FONT) + endif + else +- SYS_PROPORTIONAL_FONT = $(shell find /usr/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) ++ SYS_PROPORTIONAL_FONT = ${X11BASE}/lib/X11/fonts/TTF/$(OUR_PROPORTIONAL_FONT) + ifeq (,$(SYS_PROPORTIONAL_FONT)) + SYS_PROPORTIONAL_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) + endif +@@ -854,7 +854,7 @@ ifdef MONOSPACED_FONT + INSTALL_FONTS += $(MONOSPACED_FONT) + endif + else +- SYS_MONOSPACED_FONT = $(shell find /usr/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1) ++ SYS_MONOSPACED_FONT = ${X11BASE}/lib/X11/fonts/TTF/$(OUR_MONOSPACED_FONT) + ifeq (,$(SYS_MONOSPACED_FONT)) + SYS_MONOSPACED_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1) + endif +@@ -1150,7 +1150,7 @@ endif + # This information is
Re: emulators/mupen64plus extra plugins + meta port
On Mon, Dec 24, 2012 at 03:36:13AM -0700, Anthony J. Bentley wrote: > Hi Ryan, > > Ryan Freeman writes: > > On Thu, Dec 20, 2012 at 05:40:41PM -0700, Anthony J. Bentley wrote: > > > "Anthony J. Bentley" writes: > > > > Hi, > > > > > > > > Attached are two tarballs. One contains more plugins for > > > > emulators/mupen64plus. > > > > cd /usr/ports/emulators && tar xzf mupen64plus-plugins.tar.gz > > > > > > > > The other contains a meta port with two packages, one containing the > > > > default plugins and the other with all plugins. > > > > cd /usr/ports/meta && tar xzf mupen64plus.tar.gz > > > > > > > > All plugins tested and working on i386/amd64 (mupen64plus is marked > > > > ONLY_ > > FOR > > > > these architectures). > > > > > > Any oks? > > > > > > If there are no objections I would like to commit these and > > > http://marc.info/?l=openbsd-ports&m=135288072515947&w=2 > > > next week. > > > > I tested this awhile ago and forgot to report, crap. I tested them > > all again, and I believe the results are the same. > > Thanks for testing. > > > video-glide64 : works well, better than rice for some games > > video-arachnoid : crashes with mesa error > > video-z64 : segfault > > rsp-z64 : crashes with mesa error (using rice video known to work) > > I noticed the mesa assertion failure, but only with arachnoid: > http://marc.info/?l=openbsd-x11&m=135288609218114&w=2 > > Does the video-z64 segfault print a mesa error as well? If not, can you > build with debugging symbols and provide a backtrace? it doesn't, but after running z64 in software mesa, i realized games didn't load until i was also using z64 rsp plugin in tandem. once doing this, mesa software z64 worked fine as well. Naturally running both in hardware mode gives the usual mesa error :) (same as seen above) > I do think the mesa issue is strictly a problem with X, not the port. The > question is how to fix it :) > > Also, can you test again with software rendering (i.e., export > LIBGL_ALWAYS_SOFTWARE=1 in your environment)? with software rendering, both z64 and arachnoid work nicely in that slow kinda way. let me know if i can get you any other info. -ryan
Re: [update] audacious+plugins 3.3.3
On Thu, Dec 27, 2012 at 03:53:59AM -0700, David Coppa wrote: > > Hi! > > A bugfixing update to 3.3.3. Works fine here. ok.
[update] audacious+plugins 3.3.3
Hi! A bugfixing update to 3.3.3. Ciao, David Index: audacious/Makefile === RCS file: /cvs/ports/audio/audacious/Makefile,v retrieving revision 1.40 diff -u -p -r1.40 Makefile --- audacious/Makefile 21 Dec 2012 12:13:35 - 1.40 +++ audacious/Makefile 27 Dec 2012 10:37:14 - @@ -4,8 +4,7 @@ SHARED_ONLY = Yes COMMENT = Gtk+3 media player based on BMP and XMMS -DISTNAME = audacious-3.3.2 -REVISION = 0 +DISTNAME = audacious-3.3.3 SHARED_LIBS = audclient 3.0 # 2.0 SHARED_LIBS += audcore 2.0 # 1.0 Index: audacious/distinfo === RCS file: /cvs/ports/audio/audacious/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- audacious/distinfo 1 Oct 2012 07:56:11 - 1.15 +++ audacious/distinfo 27 Dec 2012 10:37:14 - @@ -1,2 +1,2 @@ -SHA256 (audacious-3.3.2.tar.bz2) = 7hLgjSSGzEM8mQbziEQzMd1vWG9ju19q19V6iYrztwQ= -SIZE (audacious-3.3.2.tar.bz2) = 466951 +SHA256 (audacious-3.3.3.tar.bz2) = vaEHTJgoRHG43tHKpfZAzd5uhyP6iz9P1oXelyKPfJQ= +SIZE (audacious-3.3.3.tar.bz2) = 470286 Index: audacious/pkg/PLIST === RCS file: /cvs/ports/audio/audacious/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- audacious/pkg/PLIST 25 Aug 2012 11:30:19 - 1.15 +++ audacious/pkg/PLIST 27 Dec 2012 10:37:14 - @@ -90,6 +90,7 @@ share/locale/id_ID/LC_MESSAGES/audacious share/locale/it/LC_MESSAGES/audacious.mo share/locale/ja/LC_MESSAGES/audacious.mo share/locale/ko/LC_MESSAGES/audacious.mo +share/locale/ky/LC_MESSAGES/audacious.mo share/locale/lt/LC_MESSAGES/audacious.mo share/locale/lv/LC_MESSAGES/audacious.mo share/locale/nl/LC_MESSAGES/audacious.mo Index: audacious-plugins/Makefile === RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v retrieving revision 1.54 diff -u -p -r1.54 Makefile --- audacious-plugins/Makefile 21 Dec 2012 12:13:35 - 1.54 +++ audacious-plugins/Makefile 27 Dec 2012 10:37:14 - @@ -4,8 +4,7 @@ SHARED_ONLY = Yes COMMENT = input and output plugins for Audacious -V =3.3.2 -REVISION = 0 +V =3.3.3 DISTNAME = audacious-plugins-$V Index: audacious-plugins/distinfo === RCS file: /cvs/ports/audio/audacious-plugins/distinfo,v retrieving revision 1.16 diff -u -p -r1.16 distinfo --- audacious-plugins/distinfo 1 Oct 2012 07:56:40 - 1.16 +++ audacious-plugins/distinfo 27 Dec 2012 10:37:14 - @@ -1,2 +1,2 @@ -SHA256 (audacious-plugins-3.3.2.tar.bz2) = 8cPC5dp6GqXmrCRvRuvat3ZghHjaZkZKWkMMKp+e/aw= -SIZE (audacious-plugins-3.3.2.tar.bz2) = 1687043 +SHA256 (audacious-plugins-3.3.3.tar.bz2) = OQanAJDtsJuUUE+jfII2NbdStAjhKfwBVihtQJ01D48= +SIZE (audacious-plugins-3.3.3.tar.bz2) = 1740185 Index: audacious-plugins/pkg/PLIST === RCS file: /cvs/ports/audio/audacious-plugins/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- audacious-plugins/pkg/PLIST 1 Oct 2012 07:56:40 - 1.6 +++ audacious-plugins/pkg/PLIST 27 Dec 2012 10:37:14 - @@ -197,6 +197,7 @@ share/locale/be/LC_MESSAGES/audacious-pl share/locale/ca/LC_MESSAGES/audacious-plugins.mo share/locale/cs/LC_MESSAGES/audacious-plugins.mo share/locale/de/LC_MESSAGES/audacious-plugins.mo +share/locale/el/LC_MESSAGES/audacious-plugins.mo share/locale/es/LC_MESSAGES/audacious-plugins.mo share/locale/es_AR/LC_MESSAGES/audacious-plugins.mo share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo @@ -205,9 +206,11 @@ share/locale/eu/LC_MESSAGES/audacious-pl share/locale/fr/LC_MESSAGES/audacious-plugins.mo share/locale/gl/LC_MESSAGES/audacious-plugins.mo share/locale/hu/LC_MESSAGES/audacious-plugins.mo +share/locale/id_ID/LC_MESSAGES/audacious-plugins.mo share/locale/it/LC_MESSAGES/audacious-plugins.mo share/locale/ja/LC_MESSAGES/audacious-plugins.mo share/locale/ko/LC_MESSAGES/audacious-plugins.mo +share/locale/ky/LC_MESSAGES/audacious-plugins.mo share/locale/lt/LC_MESSAGES/audacious-plugins.mo share/locale/lv/LC_MESSAGES/audacious-plugins.mo share/locale/pl/LC_MESSAGES/audacious-plugins.mo