Re: Proposed change to build libstdc++-v3 as part of devel/arm-none-eabi
On Tue, Jan 12, 2016 at 03:05:05PM +, Brandon Mercer wrote:
> I'm somehow missing the initial email that Daniel wrote that proposes
> building libstdc++ as part of arm-none-eabi, however, that bit me while
> working on some stuff last week. I think the toolchain is not very useful
> without it.
OK, I generated a diff to apply to devel/arm-none-eabi.
I removed the python files conflicts with lang/gcc/4.9 by adding these
to ${PREFIX}/arm-none-eabi/share instead of ${PREFIX}/share.
Running portcheck gives the usual
Python module without compiled version, consider using ${MODPY_BIN} ...
but I didn't add python. lang/gcc/4.9 also has .py files but doesn't add
it either.
patch needs -p0 to apply correctly.
> I don't think that a FLAVOR is the right way to go, in this case I feel it
> should be built by default.
Yes.
Any other suggestions?
Index: gcc-linaro/Makefile
===
RCS file: /cvs/ports/devel/arm-none-eabi/gcc-linaro/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- gcc-linaro/Makefile 28 May 2015 23:28:25 - 1.1.1.1
+++ gcc-linaro/Makefile 13 Jan 2016 02:44:04 -
@@ -13,7 +13,7 @@ SUBST_VARS+= VERSION
WANTLIB= c m stdc++ gmp mpfr mpc
DIST_SUBDIR= gcc
-MAKE_GXX= No
+MAKE_GXX= Yes
MAKE_FORTRAN= No
MAKE_OBJC= No
MAKE_JAVA= No
@@ -24,27 +24,33 @@ MAKE_ADA= No
MASTER_SITE_BASE=http://releases.linaro.org/15.03/components
MASTER_SITES= ${MASTER_SITE_BASE}/toolchain/gcc-linaro/4.9/
-BUILD_DEPENDS+=devel/autoconf/2.13 \
- devel/bison \
- devel/metaauto \
- devel/arm-none-eabi/binutils
+BUILD_DEPENDS+=devel/autoconf/2.13 \
+ devel/bison \
+ devel/metaauto \
+ devel/arm-none-eabi/binutils \
+ devel/arm-none-eabi/newlib
LIB_DEPENDS= devel/mpfr devel/libmpc
-RUN_DEPENDS= devel/arm-none-eabi/binutils
+RUN_DEPENDS= devel/arm-none-eabi/binutils \
+ devel/arm-none-eabi/newlib
LANGS= c,c++
CC=/usr/bin/gcc
CFLAGS=-O2 -g
-CONFIGURE_ARGS+=--enable-languages=${LANGS}\
- --enable-multilib \
- --enable-interwork \
- --with-newlib \
- --disable-lto \
- --enable-cpp
+CONFIGURE_ARGS+=--enable-languages=${LANGS} \
+ --enable-multilib \
+ --enable-interwork \
+ --with-newlib \
+ --disable-lto \
+ --enable-cpp \
+ --datarootdir=${PREFIX}/arm-none-eabi/share
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+ALL_TARGET=all-gcc all-target-libgcc all-target-libstdc++-v3
+INSTALL_TARGET=install-gcc install-target-libgcc
install-target-libstdc++-v3
# cope with user settings in /etc/mk.conf
MAKE_FLAGS=LANGUAGES="c c++" CFLAGS="-I${LOCALBASE}/include"
Index: gcc-linaro/pkg/PLIST
===
RCS file: /cvs/ports/devel/arm-none-eabi/gcc-linaro/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- gcc-linaro/pkg/PLIST28 May 2015 23:28:26 - 1.1.1.1
+++ gcc-linaro/pkg/PLIST13 Jan 2016 02:44:04 -
@@ -1,4 +1,896 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/05/28 23:28:26 bmercer Exp $
+@comment $OpenBSD$
+arm-none-eabi/include/c++/
+arm-none-eabi/include/c++/4.9.3/
+arm-none-eabi/include/c++/4.9.3/algorithm
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/atomic_word.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/basic_file.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/c++allocator.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/c++config.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/c++io.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/c++locale.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/cpu_defines.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/ctype_base.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/ctype_inline.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/cxxabi_tweaks.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/error_constants.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/extc++.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/gthr-default.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/gthr-posix.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/gthr-single.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/gthr.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/messages_members.h
+arm-none-eabi/include/c++/4.9.3/arm-none-eabi/bits/opt_random.h
+arm-none-eabi/include
Re: Proposed change to build libstdc++-v3 as part of devel/arm-none-eabi
On 2016/01/13 10:15, Daniel Bolgheroni wrote:
> On Tue, Jan 12, 2016 at 03:05:05PM +, Brandon Mercer wrote:
> > I'm somehow missing the initial email that Daniel wrote that proposes
> > building libstdc++ as part of arm-none-eabi, however, that bit me while
> > working on some stuff last week. I think the toolchain is not very useful
> > without it.
>
> OK, I generated a diff to apply to devel/arm-none-eabi.
>
> I removed the python files conflicts with lang/gcc/4.9 by adding these
> to ${PREFIX}/arm-none-eabi/share instead of ${PREFIX}/share.
>
> Running portcheck gives the usual
>
> Python module without compiled version, consider using ${MODPY_BIN} ...
>
> but I didn't add python. lang/gcc/4.9 also has .py files but doesn't add
> it either.
>
> patch needs -p0 to apply correctly.
>
> > I don't think that a FLAVOR is the right way to go, in this case I feel it
> > should be built by default.
>
> Yes.
>
> Any other suggestions?
The idea seems reasonable but I don't know these ports well.
I would suggest setting some variable like GCC_V=4.9.3 and using
SUBST_VARS+=GCC_V and substituting it in the PLIST files, so that it's
easier to see what is happening with any future update diffs.
Bump REVISION in everything you touch. I noticed it's missing in
newlib/Makefile but I haven't checked the other files.
> -@comment @man man/man7/fsf-funding.7
> -@comment @man man/man7/gfdl.7
> -@comment @man man/man7/gpl.7
> +@man man/man7/fsf-funding.7
> +@man man/man7/gfdl.7
> +@man man/man7/gpl.7
remove this chunk, it conflicts with lang/gcc.
add py3 flavor py-backports-abc
* add python3 flavor
* enable test
OK ?
--
Alexandr Shadchin
Index: Makefile
===
RCS file: /cvs/ports/devel/py-backports-abc/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile15 Nov 2015 08:22:47 - 1.1.1.1
+++ Makefile13 Jan 2016 12:39:49 -
@@ -5,6 +5,7 @@ COMMENT = backport of the 'collections.
DISTNAME = backports_abc-${MODPY_EGG_VERSION}
PKGNAME = py-backports-abc-${MODPY_EGG_VERSION}
+REVISION = 0
CATEGORIES = devel
@@ -17,5 +18,11 @@ MODPY_PI = Yes
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
+
+FLAVORS = python3
+FLAVOR ?=
+
+do-test:
+ cd ${WRKSRC} && ${MODPY_BIN} -m unittest discover
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-backports-abc/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 15 Nov 2015 08:22:47 - 1.1.1.1
+++ pkg/PLIST 13 Jan 2016 12:39:49 -
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/11/15 08:22:47 rpointel Exp $
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}backports_abc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/backports_abc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/backports_abc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/backports_abc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/backports_abc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/backports_abc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/backports_abc.py
-lib/python${MODPY_VERSION}/site-packages/backports_abc.pyc
Re: UPDATE: www/p5-Plack to 1.0039
On Wed, Jan 13, 2016 at 1:14 AM, Cesare Gargano wrote:
> On 01/06, Cesare Gargano wrote:
>> On 01/04, Nigel Taylor wrote:
>> > On 01/04/16 21:02, Cesare Gargano wrote:
>> > > Hi!
>> > > This updates www/p5-Plack to 1.0039. Attached 2 new deps.
>> > >
>> > > We have OK from MAINTAINER.
>> > >
>> > > www/p5-Cookie-Baker:
>> > > Cookie::Baker provides simple cookie string generator and parser.
>> > >
>> > > devel/p5-Test-Time:
>> > > Test::Time can be used to test modules that deal with time.
>> > > Once you use this module, all references to time and sleep will be
>> > > internalized.
>> > >
>> > > All tests passed.
>> > >
>> > > Comments, OK?
>> > >
>> > p5-Test-Time - should be modinst style. Your need the Module::Install
>> > extensions to switch to using modinst. See Makefile.PL
>> >
>> > Module::Install::AuthorTests
>> > Module::Install::Repository
>> > Module::Install::ReadmeFromPod
>> > Module::Install::TestBase
>> >
>> > I have the new ports for these extensions, so can switch port to modinst
>> > later.
>> >
>> > Upstream source file is wrong, it has included core perl modules within
>> > the source, normally wrong unless a good reason, may break on moving to
>> > newer perl versions. Should try to use OpenBSD supplied perl modules
>> > that have been tested and may include patches.
>> >
>> > Includes Spiffy 0.30 within the source, the version in ports is 0.46,
>> > from Spiffy change log...
>> >
>> > 0.40 Wed Aug 6 10:29:46 PDT 2014
>> > - Fix a bug that was causing lots of warnings in Test::Base on perl 5.21
>> >
>> > Moving to perl 5.22, will hit this bug, if modinst with modified
>> > bsd.perl.mk isn't used, Only affects testing in this case...
>> >
>> > Should be no problem for this release, does need fixing for next release
>> > / move to perl 5.22.
>> >
>> >
>> > p5-Cookie-Baker - using correct modbuild style.
>> >
>> >
>> > p5-Plack - Can't see any issue from scanning.
>> >
>>
>> Hi,
>> after some more words with nigel@ (about changes after perl 5.22 in tree),
>> attached the p5-Plack diff and its new 2 deps. I modified p5-Test-Time
>> to include devel/p5-File-Slurp in TEST_DEPENDS, as suggested by nigel@.
>>
>> OK from MAINTAINER, OK from nigel@ (thank you!)
>>
>> --
>> C.
>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/www/p5-Plack/Makefile,v
>> retrieving revision 1.8
>> diff -u -p -r1.8 Makefile
>> --- Makefile 18 Jan 2015 13:13:37 - 1.8
>> +++ Makefile 20 Dec 2015 10:49:13 -
>> @@ -3,7 +3,7 @@
>> COMMENT =interface between perl web frameworks and web servers
>>
>> MODULES =cpan
>> -DISTNAME = Plack-1.0033
>> +DISTNAME = Plack-1.0039
>> CATEGORIES = www
>> MAINTAINER = Abel Abraham Camarillo Ojeda
>>
>> @@ -21,7 +21,9 @@ RUN_DEPENDS = devel/p5-Devel-StackTrace>
>> net/p5-Test-TCP>=2.00 \
>> sysutils/p5-Filesys-Notify-Simple>=0 \
>> www/p5-Apache-LogFormat-Compiler>=0.12 \
>> + www/p5-Cookie-Baker>=0.05 \
>> www/p5-HTTP-Body>=1.06 \
>> + www/p5-HTTP-Headers-Fast>=0.18 \
>> www/p5-HTTP-Message>=5.814 \
>> www/p5-URI>=1.59
>>
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/www/p5-Plack/distinfo,v
>> retrieving revision 1.4
>> diff -u -p -r1.4 distinfo
>> --- distinfo 18 Jan 2015 13:13:37 - 1.4
>> +++ distinfo 20 Dec 2015 10:49:13 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (Plack-1.0033.tar.gz) = vNh4S4JjvW1oR26dUub5iBm9TzMxRVytEu/+1jp4MiA=
>> -SIZE (Plack-1.0033.tar.gz) = 239206
>> +SHA256 (Plack-1.0039.tar.gz) = 0kpXLohkTH05x+b/GvAFtyjeyUqHjPBtkCerfRov0Kk=
>> +SIZE (Plack-1.0039.tar.gz) = 176711
>> Index: pkg/PLIST
>> ===
>> RCS file: /cvs/ports/www/p5-Plack/pkg/PLIST,v
>> retrieving revision 1.3
>> diff -u -p -r1.3 PLIST
>> --- pkg/PLIST 18 Jan 2015 13:13:37 - 1.3
>> +++ pkg/PLIST 20 Dec 2015 10:49:13 -
>> @@ -1,5 +1,6 @@
>> @comment $OpenBSD: PLIST,v 1.3 2015/01/18 13:13:37 benoit Exp $
>> bin/plackup
>> +${P5SITE}/HTTP/
>> ${P5SITE}/HTTP/Message/
>> ${P5SITE}/HTTP/Message/PSGI.pm
>> ${P5SITE}/HTTP/Server/
>> @@ -86,6 +87,9 @@ ${P5SITE}/Plack/Test/Suite.pm
>> ${P5SITE}/Plack/Util/
>> ${P5SITE}/Plack/Util.pm
>> ${P5SITE}/Plack/Util/Accessor.pm
>> +${P5SITE}/auto/
>> +${P5SITE}/auto/share/
>> +${P5SITE}/auto/share/dist/
>> ${P5SITE}/auto/share/dist/Plack/
>> ${P5SITE}/auto/share/dist/Plack/#foo
>> ${P5SITE}/auto/share/dist/Plack/baybridge.jpg
>
> Ping.
>
> --
> C.
>
I think you should get dependencies commited independently, so
this would go in easier
ps - i still think the PLIST chunk is unnecesary
or can anyone commit this - including deps?
thanks!
Re: UPDATE: www/p5-Plack to 1.0039
On 2016/01/13 06:57, Abel Abraham Camarillo Ojeda wrote: > I think you should get dependencies commited independently, so > this would go in easier OK for p5-Test-Time. p5-Cookie-Baker should have p5-URI in TEST_DEPENDS as well shouldn't it?
add py3 flavor py-tornado
* add python3 flavor
* simplify test
Need devel/py-backports-abc (on ports@)
OK ?
--
Alexandr Shadchin
Index: Makefile
===
RCS file: /cvs/ports/www/py-tornado/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile15 Nov 2015 08:40:42 - 1.14
+++ Makefile13 Jan 2016 14:10:07 -
@@ -5,6 +5,7 @@ COMMENT = scalable, non-blocking web se
MODPY_EGG_VERSION =4.3
DISTNAME = tornado-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
+REVISION = 0
CATEGORIES = www
@@ -16,23 +17,31 @@ PERMIT_PACKAGE_CDROM = Yes
MODPY_PI = Yes
MODULES = lang/python
-RUN_DEPENDS += devel/py-backports-ssl-match-hostname \
- devel/py-singledispatch \
- devel/py-backports-abc
+RUN_DEPENDS = devel/py-backports-abc${MODPY_FLAVOR}
+TEST_DEPENDS = ${RUN_DEPENDS} \
+ net/py-curl${MODPY_FLAVOR}
+
WANTLIB += pthread ${MODPY_WANTLIB}
MODPY_SETUPTOOLS = Yes
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/runtests.sh
+FLAVORS = python3
+FLAVOR ?=
-TEST_DEPENDS +=${RUN_DEPENDS} \
- devel/py-twisted/names \
- devel/py-twisted/web \
+.if !${FLAVOR:Mpython3}
+RUN_DEPENDS += devel/py-backports-ssl-match-hostname \
+ devel/py-singledispatch
+TEST_DEPENDS +=devel/py-futures \
devel/py-mock \
- net/py-curl \
- devel/py-futures
+ devel/py-twisted/core \
+ devel/py-twisted/names \
+ devel/py-twisted/web
+.endif
+
+pre-test:
+ ${MODPY_CMD} build_ext --inplace
+
do-test:
- @cd ${WRKSRC} && sh runtests.sh
+ @cd ${WRKSRC} && ${MODPY_BIN} -m tornado.test.runtests
.include
Index: patches/patch-runtests_sh
===
RCS file: patches/patch-runtests_sh
diff -N patches/patch-runtests_sh
--- patches/patch-runtests_sh 28 Apr 2014 20:52:13 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-$OpenBSD: patch-runtests_sh,v 1.1 2014/04/28 20:52:13 edd Exp $
runtests.sh.orig Sun Apr 27 15:31:04 2014
-+++ runtests.shSun Apr 27 15:31:21 2014
-@@ -15,4 +15,4 @@ cd $(dirname $0)
- # while "python file.py" uses the directory containing "file.py" (which is
- # not what you want if file.py appears within a package you want to import
- # from)
--python -m tornado.test.runtests "$@"
-+${MODPY_BIN} -m tornado.test.runtests "$@"
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-tornado/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 15 Nov 2015 08:40:42 - 1.6
+++ pkg/PLIST 13 Jan 2016 14:10:07 -
@@ -7,142 +7,160 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/tornado/__init__.py
-lib/python${MODPY_VERSION}/site-packages/tornado/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}_locale_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}autoreload.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}concurrent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}curl_httpclient.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}escape.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}gen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}http1connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}httpclient.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}httpserver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}httputil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}ioloop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}iostream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODP
quake2 update
cje...@openbsd.org
Cc:
Bcc:
Subject: games/quake2 update
Reply-To:
Inspired by the recent dhewm3 work, I decided to try quake2 again only
to find that it does not work. There was some dialogue by folks earlier
to get the existing port, that has been broken for the better part of
two years, replaced with yquake2. Because yquake2 is different than
quake2, I propose we import this new, working version and then delete
the existing port. This diff was sent out by jsg@ some time ago before a
fun bikeshedding session. Looking for OK's to import this:
bmercer@
Index: yquake2/Makefile
===
RCS file: yquake2/Makefile
diff -N yquake2/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ yquake2/Makefile13 Jan 2016 16:51:48 -
@@ -0,0 +1,34 @@
+# $OpenBSD$
+
+COMMENT= Yamagi Quake II
+N= yquake2
+V= 5.32
+PKGNAME= ${N}-${V}
+DISTNAME= quake2-${V}
+CATEGORIES=games
+
+HOMEPAGE= http://www.yamagi.org/quake2/
+MASTER_SITES= http://deponie.yamagi.org/quake2/
+EXTRACT_SUFX= .tar.xz
+
+# GPLv2
+PERMIT_PACKAGE_CDROM= Yes
+
+WANTLIB += GL SDL2 c jpeg m ogg pthread vorbis vorbisfile z
+
+LIB_DEPENDS= audio/libvorbis \
+ graphics/jpeg \
+ devel/sdl2
+
+MAKE_ENV+= VERBOSE=1
+USE_GMAKE= Yes
+
+do-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/${N}
+ ${INSTALL_PROGRAM} ${WRKBUILD}/release/{quake2,q2ded} \
+ ${PREFIX}/share/${N}/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/${N}/baseq2
+ ${INSTALL_PROGRAM} ${WRKBUILD}/release/baseq2/game.so \
+ ${PREFIX}/share/${N}/baseq2/
+
+.include
Index: yquake2/distinfo
===
RCS file: yquake2/distinfo
diff -N yquake2/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -
+++ yquake2/distinfo13 Jan 2016 16:26:47 -
@@ -0,0 +1,2 @@
+SHA256 (quake2-5.32.tar.xz) = v8eAMlSp0iiIVU1a8lL//iEts9qwYxY3u5BFhhuOUIw=
+SIZE (quake2-5.32.tar.xz) = 1692720
Index: yquake2/pkg/DESCR
===
RCS file: yquake2/pkg/DESCR
diff -N yquake2/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -
+++ yquake2/pkg/DESCR 13 Jan 2016 16:26:47 -
@@ -0,0 +1,7 @@
+Yamagi Quake II is an enhanced client for id Software's Quake II. The
+main focus is an unchanged single player experience like back in 1997,
+thus the gameplay and the graphics are unaltered. Over 1000 bugs were
+fixed and an extensive code audit done, making Yamagi Quake II one of
+the most solid Quake II implementations available. Other than most ports
+Yamagi Quake II is full 64 bit clean, so it works perfectly on modern 64
+bit processors and operating systems.
Index: yquake2/pkg/PFRAG.shared
===
RCS file: yquake2/pkg/PFRAG.shared
diff -N yquake2/pkg/PFRAG.shared
--- /dev/null 1 Jan 1970 00:00:00 -
+++ yquake2/pkg/PFRAG.shared13 Jan 2016 16:26:47 -
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+share/yquake2/baseq2/game.so
Index: yquake2/pkg/PLIST
===
RCS file: yquake2/pkg/PLIST
diff -N yquake2/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -
+++ yquake2/pkg/PLIST 13 Jan 2016 16:26:47 -
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+%%SHARED%%
+share/yquake2/
+share/yquake2/baseq2/
+@bin share/yquake2/q2ded
+@bin share/yquake2/quake2
NEW: textproc/py-snowballstemmer and textproc/py-stemmer
Hi, ok to import textproc/py-snowballstemmer and textproc/py-stemmer ? textproc/py-snowballstemmer: This is a pure Python stemming library. If PyStemmer is available, this module uses it to accelerate. textproc/py-stemmer: PyStemmer provides access to efficient algorithms for calculating a "stemmed" form of a word. This is a form with most of the common morphological endings removed; hopefully representing a common linguistic base form. This is most useful in building search engines and information retrieval software; for example, a search with stemming enabled should be able to find a document containing "cycling" given the query "cycles". PyStemmer provides algorithms for several (mainly european) languages, by wrapping the libstemmer library from the Snowball project in a Python module. It also provides access to the classic Porter stemming algorithm for english: although this has been superceded by an improved algorithm, the original algorithm may be of interest to information retrieval researchers wishing to reproduce results of earlier experiments. -- Alexandr Shadchin py-stemmer.tgz Description: application/tar-gz py-snowballstemmer.tgz Description: application/tar-gz
Re: UPDATE: wkhtmltopdf with patched QT
On 01/06/16 17:25, Stuart Henderson wrote:
It seems the library does still get linked to system qt4 if present
(make port-lib-depends-check) - this doesn't seem quite correct but now
that the runtime warnings are gone and things seem to be working I'd
like to get this in, so I'm going to commit what I have (I've added
the various LIB_DEPENDS/WANTLIB needed), I'm happy to look at any more
diffs on top of this:)
I've fixed this problem in the attached diff. This also means qt4 is no
longer a depedency of the port, so I removed that from the Makefile as
well. Could you verify and commit this?
Thanks!
Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile6 Jan 2016 17:13:48 - 1.5
+++ Makefile13 Jan 2016 18:54:32 -
@@ -8,7 +8,7 @@ COMMENT = convert HTML to PDF using Web
GH_ACCOUNT = wkhtmltopdf
GH_PROJECT = wkhtmltopdf
GH_TAGNAME = 0.12.2.4
-REVISION = 1
+REVISION = 2
QT_COMMIT =7e48a1fac7e0f9aefccd01e9871f987da3a62fda
MASTER_SITES0 =https://github.com/wkhtmltopdf/qt/archive/
DISTFILES =${DISTNAME}.tar.gz \
@@ -26,11 +26,8 @@ MAINTAINER = Frank Groeneveld
Re: Proposed change to build libstdc++-v3 as part of devel/arm-none-eabi
Somebody claiming to be Brandon Mercer wrote: > On Sat, Jan 9, 2016 at 4:21 PM Dave Vandervies wrote: > > One issue with separating out the bootstrap compiler (that's quite > > relevant on ARM, but I don't know enough about AVR32 to comment there) > > is that the newlib build uses the bootstrap GCC multilib configuration > > to configure itself, and the main GCC package expects newlib's multilib > > configuration to match its own. So anything that changes that (like > > my local patch that I need to clean up and get merged at some point) > > > > I don't think that a FLAVOR is the right way to go, in this case I feel it > should be built by default. The only way I can make sense of your objection is if you're reading my suggestion as making with-C++ and without-C++ flavours of the main compiler package, which isn't what I thought I was saying (and wouldn't address the problem that motivated my suggestion). Let me try again... Would making gcc-linaro-bootstrap a FLAVOR of gcc-linaro, and therefore keeping the patches and the configuration for the bootstrap compiler in the same place as for the main one, be feasible? (The build process would then need to build both flavors of gcc-linaro, one to build newlib with and one to get the package people will actually use that depends on newlib.) dave -- Dave Vandervies dj3va...@terse.ca / dj3va...@uwaterloo.ca Plan your future! Make God laugh!
Re: Update ansible to 2.0.0.1
On Wed, 13 Jan 2016 21:39:16 +0100, Frank Groeneveld
wrote:
Just a quick look,
> share/examples/ansible/
> -@sample ${SYSCONFDIR}/ansible/
> share/examples/ansible/ansible.cfg
> -@sample ${SYSCONFDIR}/ansible/ansible.cfg
> share/examples/ansible/hosts
> -@sample ${SYSCONFDIR}/ansible/hosts
I don't think that should change.
Cheers,
Daniel
Re: Proposed change to build libstdc++-v3 as part of devel/arm-none-eabi
On Wed, Jan 13, 2016 at 03:15:32PM -0500, Dave Vandervies wrote: > Would making gcc-linaro-bootstrap a FLAVOR of gcc-linaro, and therefore > keeping the patches and the configuration for the bootstrap compiler in > the same place as for the main one, be feasible? > (The build process would then need to build both flavors of gcc-linaro, > one to build newlib with and one to get the package people will actually > use that depends on newlib.) I think the reasoning is the same as for devel/avr32, as seen here: http://marc.info/?l=openbsd-ports&m=138987178409779&w=2 Would this make sense? -- db
Re: Proposed change to build libstdc++-v3 as part of devel/arm-none-eabi
On Wed, Jan 13, 2016 at 4:01 PM Daniel Bolgheroni wrote: > On Wed, Jan 13, 2016 at 03:15:32PM -0500, Dave Vandervies wrote: > > Would making gcc-linaro-bootstrap a FLAVOR of gcc-linaro, and therefore > > keeping the patches and the configuration for the bootstrap compiler in > > the same place as for the main one, be feasible? > > (The build process would then need to build both flavors of gcc-linaro, > > one to build newlib with and one to get the package people will actually > > use that depends on newlib.) > > I think the reasoning is the same as for devel/avr32, as seen here: > > http://marc.info/?l=openbsd-ports&m=138987178409779&w=2 > > Would this make sense? > Sorry for the vague reply. This is the direction that I think makes sense for this as well. Is it feasible?
Re: Update ansible to 2.0.0.1
On 2016/01/13 21:39, Frank Groeneveld wrote:
> Yesterday a new major Ansible release was done. Attached a diff that updates
> the port to it's latest version. I tested this lightly, so please test this
> on various playbooks and hosts.
>
> Any comments, suggestions or bugs?
Please CC rpe@ (maintainer) :)
> Index: patches/patch-lib_ansible_plugins_action_copy_py
> ===
> RCS file: patches/patch-lib_ansible_plugins_action_copy_py
> diff -N patches/patch-lib_ansible_plugins_action_copy_py
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-lib_ansible_plugins_action_copy_py 13 Jan 2016 19:35:30
> -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- lib/ansible/plugins/action/copy.py.orig Wed Jan 13 21:13:56 2016
> lib/ansible/plugins/action/copy.py Wed Jan 13 21:14:39 2016
> +@@ -299,6 +299,8 @@ class ActionModule(ActionBase):
> + content = to_bytes(content)
> + try:
> + f.write(content)
> ++if not content.endswith('\n'):
> ++ f.write('\n')
> + except Exception as err:
> + os.remove(content_tempfile)
> + raise Exception(err)
And since this just moved from the following patch, please copy across the
comment:
> -$OpenBSD: patch-lib_ansible_runner_action_plugins_copy_py,v 1.1 2014/09/10
> 20:21:43 rpe Exp $
> -
> -https://github.com/adamchainz/ansible/commit/842a1b976d650b2c3117a6e0ed1329e5d0d62873
> -
> -'copy' write new line at end of file if 'content' passed without newline
^^
Re: quake2 update
On Wed, Jan 13, 2016 at 12:08:54PM -0500, Brandon Mercer wrote:
> cje...@openbsd.org
> Cc:
> Bcc:
> Subject: games/quake2 update
> Reply-To:
>
> Inspired by the recent dhewm3 work, I decided to try quake2 again only
> to find that it does not work. There was some dialogue by folks earlier
> to get the existing port, that has been broken for the better part of
> two years, replaced with yquake2. Because yquake2 is different than
> quake2, I propose we import this new, working version and then delete
> the existing port. This diff was sent out by jsg@ some time ago before a
> fun bikeshedding session. Looking for OK's to import this:
>
> bmercer@
I can't test the port but please add "SHARED_ONLY=Yes", remove
PFRAG.shared and update PLIST.
>
> Index: yquake2/Makefile
> ===
> RCS file: yquake2/Makefile
> diff -N yquake2/Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ yquake2/Makefile 13 Jan 2016 16:51:48 -
> @@ -0,0 +1,34 @@
> +# $OpenBSD$
> +
> +COMMENT= Yamagi Quake II
> +N= yquake2
> +V= 5.32
> +PKGNAME= ${N}-${V}
> +DISTNAME=quake2-${V}
> +CATEGORIES= games
> +
> +HOMEPAGE=http://www.yamagi.org/quake2/
> +MASTER_SITES=http://deponie.yamagi.org/quake2/
> +EXTRACT_SUFX=.tar.xz
> +
> +# GPLv2
> +PERMIT_PACKAGE_CDROM= Yes
> +
> +WANTLIB += GL SDL2 c jpeg m ogg pthread vorbis vorbisfile z
> +
> +LIB_DEPENDS= audio/libvorbis \
> + graphics/jpeg \
> + devel/sdl2
> +
> +MAKE_ENV+= VERBOSE=1
> +USE_GMAKE= Yes
> +
> +do-install:
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/${N}
> + ${INSTALL_PROGRAM} ${WRKBUILD}/release/{quake2,q2ded} \
> + ${PREFIX}/share/${N}/
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/${N}/baseq2
> + ${INSTALL_PROGRAM} ${WRKBUILD}/release/baseq2/game.so \
> + ${PREFIX}/share/${N}/baseq2/
> +
> +.include
> Index: yquake2/distinfo
> ===
> RCS file: yquake2/distinfo
> diff -N yquake2/distinfo
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ yquake2/distinfo 13 Jan 2016 16:26:47 -
> @@ -0,0 +1,2 @@
> +SHA256 (quake2-5.32.tar.xz) = v8eAMlSp0iiIVU1a8lL//iEts9qwYxY3u5BFhhuOUIw=
> +SIZE (quake2-5.32.tar.xz) = 1692720
> Index: yquake2/pkg/DESCR
> ===
> RCS file: yquake2/pkg/DESCR
> diff -N yquake2/pkg/DESCR
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ yquake2/pkg/DESCR 13 Jan 2016 16:26:47 -
> @@ -0,0 +1,7 @@
> +Yamagi Quake II is an enhanced client for id Software's Quake II. The
> +main focus is an unchanged single player experience like back in 1997,
> +thus the gameplay and the graphics are unaltered. Over 1000 bugs were
> +fixed and an extensive code audit done, making Yamagi Quake II one of
> +the most solid Quake II implementations available. Other than most ports
> +Yamagi Quake II is full 64 bit clean, so it works perfectly on modern 64
> +bit processors and operating systems.
> Index: yquake2/pkg/PFRAG.shared
> ===
> RCS file: yquake2/pkg/PFRAG.shared
> diff -N yquake2/pkg/PFRAG.shared
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ yquake2/pkg/PFRAG.shared 13 Jan 2016 16:26:47 -
> @@ -0,0 +1,2 @@
> +@comment $OpenBSD$
> +share/yquake2/baseq2/game.so
> Index: yquake2/pkg/PLIST
> ===
> RCS file: yquake2/pkg/PLIST
> diff -N yquake2/pkg/PLIST
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ yquake2/pkg/PLIST 13 Jan 2016 16:26:47 -
> @@ -0,0 +1,6 @@
> +@comment $OpenBSD$
> +%%SHARED%%
> +share/yquake2/
> +share/yquake2/baseq2/
> +@bin share/yquake2/q2ded
> +@bin share/yquake2/quake2
>
--
Juan Francisco Cantero Hurtado http://juanfra.info
Re: quake2 update
Brandon Mercer wrote: > Inspired by the recent dhewm3 work, I decided to try quake2 again only > to find that it does not work. There was some dialogue by folks earlier > to get the existing port, that has been broken for the better part of > two years, replaced with yquake2. Because yquake2 is different than > quake2, I propose we import this new, working version and then delete > the existing port. This diff was sent out by jsg@ some time ago before a > fun bikeshedding session. Looking for OK's to import this: missing openal dependency?
UPDATE: net/py-zmq 15.2.0
Hi,
This diff updates py-zmq to the latest release.
Tested on amd64.
Need www/py-tornado on ports@.
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile
===
RCS file: /cvs/ports/net/py-zmq/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile13 Jan 2016 07:23:03 - 1.12
+++ Makefile14 Jan 2016 06:44:34 -
@@ -2,7 +2,7 @@
COMMENT = Python bindings for ZeroMQ
-MODPY_EGG_VERSION =15.1.0
+MODPY_EGG_VERSION =15.2.0
DISTNAME = pyzmq-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}
@@ -12,7 +12,7 @@ HOMEPAGE =https://github.com/zeromq/py
MAINTAINER = Alexandr Shadchin
-# LGPLv3
+# LGPLv3/BSD
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = ${MODPY_WANTLIB} pthread zmq
@@ -34,14 +34,14 @@ MODPY_DISTUTILS_BUILDARGS = --zmq=${LOCA
TEST_IS_INTERACTIVE = Yes
TEST_TARGET = build_ext --inplace test
TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR} \
- math/py-numpy${MODPY_FLAVOR}
+ math/py-numpy${MODPY_FLAVOR} \
+ www/py-tornado${MODPY_FLAVOR}
FLAVORS = python3
FLAVOR ?=
.if !${FLAVOR:Mpython3}
-TEST_DEPENDS +=net/py-czmq \
- www/py-tornado
+TEST_DEPENDS +=net/py-czmq
.endif
do-test:
Index: distinfo
===
RCS file: /cvs/ports/net/py-zmq/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo13 Jan 2016 07:23:03 - 1.8
+++ distinfo14 Jan 2016 06:44:34 -
@@ -1,2 +1,2 @@
-SHA256 (pyzmq-15.1.0.tar.gz) = vVsnmZhTi7GXuvWcgVhFUNcTsbF3YeimOLtvvanl0I0=
-SIZE (pyzmq-15.1.0.tar.gz) = 1072983
+SHA256 (pyzmq-15.2.0.tar.gz) = La+jImcKlOICg6uipEuSE01CW9MmQZtorU240IMaJuw=
+SIZE (pyzmq-15.2.0.tar.gz) = 1078561
Index: patches/patch-zmq_sugar_context_py
===
RCS file: /cvs/ports/net/py-zmq/patches/patch-zmq_sugar_context_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-zmq_sugar_context_py
--- patches/patch-zmq_sugar_context_py 13 Jan 2016 07:23:03 - 1.1
+++ patches/patch-zmq_sugar_context_py 14 Jan 2016 06:44:34 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-zmq_sugar_context_py,v 1.1 2016/01/13 07:23:03 shadchin Exp $
zmq/sugar/context.py.orig Mon Jan 11 23:27:41 2016
-+++ zmq/sugar/context.py Mon Jan 11 23:28:00 2016
-@@ -81,6 +81,7 @@ class Context(ContextBase, AttributeSetter):
+--- zmq/sugar/context.py.orig Tue Jan 12 19:31:19 2016
zmq/sugar/context.py Thu Jan 14 11:16:31 2016
+@@ -77,6 +77,7 @@ class Context(ContextBase, AttributeSetter):
.. versionadded:: 14.1
"""
from pyczmq import zctx
Index: patches/patch-zmq_tests_test_future_py
===
RCS file: patches/patch-zmq_tests_test_future_py
diff -N patches/patch-zmq_tests_test_future_py
--- patches/patch-zmq_tests_test_future_py 13 Jan 2016 07:23:03 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-zmq_tests_test_future_py,v 1.1 2016/01/13 07:23:03 shadchin
Exp $
zmq/tests/test_future.py.orig Wed Nov 25 14:46:56 2015
-+++ zmq/tests/test_future.py Tue Jan 12 00:15:20 2016
-@@ -2,7 +2,11 @@
- # Distributed under the terms of the Modified BSD License.
-
- import zmq
--from tornado import gen
-+from zmq.tests import SkipTest
-+try:
-+from tornado import gen
-+except ImportError:
-+raise SkipTest("Requires tornado")
- from zmq.eventloop import future
- from zmq.eventloop.ioloop import IOLoop
-
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/py-zmq/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 13 Jan 2016 07:23:03 - 1.7
+++ pkg/PLIST 14 Jan 2016 06:44:34 -
@@ -4,17 +4,19 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zmq/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}asyncio.${MODPY_PYC_MAGIC_TAG}pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}asyncio.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/asyncio.py
lib/python${MODPY_VERSION}/site-packages/zmq/auth/
lib/python${MODPY_VERSION}/site-packages/zmq/auth/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zmq/auth/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/zmq/auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_
[update] lang/go 1.5.3
Update lang/go to 1.5.3.
Passes regress on amd64, will test i386 shortly.
This release addresses CVE-2015-8618.
ok?
Index: Makefile
===
RCS file: /cvs/ports/lang/go/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile5 Dec 2015 05:01:24 - 1.27
+++ Makefile14 Jan 2016 07:48:35 -
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS =${GO_ARCHS}
COMMENT = Go programming language
-VERSION = 1.5.2
+VERSION = 1.5.3
EXTRACT_SUFX = .src.tar.gz
DISTNAME = go${VERSION}
PKGNAME = go-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/lang/go/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo5 Dec 2015 05:01:24 - 1.14
+++ distinfo14 Jan 2016 07:48:35 -
@@ -1,2 +1,2 @@
-SHA256 (go1.5.2.src.tar.gz) = 893WJMAEYWQc49Oo2OPGIjkjhMp2mekBs3Ck6sWYenQ=
-SIZE (go1.5.2.src.tar.gz) = 12056199
+SHA256 (go1.5.3.src.tar.gz) = dU4G2rHDGrFo/J254yWWc0AV6p4kvETK5/I39BfOTv4=
+SIZE (go1.5.3.src.tar.gz) = 12057623
