Re: NEW: lang/pure
On 12 Jun 2014, at 4:30 pm, Sebastien Marie wrote: > On Thu, Jun 12, 2014 at 03:25:37PM +1000, Anders Jensen-Waud wrote: >> On 12 Jun 2014, at 1:35 pm, Anders Jensen-Waud wrote: >> >>> Hello, >>> >>> I have written a new port for Pure -- a functional programming language >>> with term rewriting (http://purelang.bitbucket.org/). >>> >>> The port is attached as a tarball. >>> >>> Could I kindly ask you to test and provide feedback? >>> >> >> I just realised that there was a make test target available in the base >> distribution. It has been included in the attached tarball, so please use >> that one instead. >> >> -- >> Anders Jensen-Waud > > Hi, > > Some notes about Makefile: Thank you for your feedback. > >> SHARED_LIBS += pure 8.0 > > If I remember well, a new port should use 0.0 for version numbering. This version numbering was advised by make when I was running make package. I will try and change it. > >> WANTLIB += iconv gmp mpfr pthread readline stdc++ termcap z c m >> >> LIB_DEPENDS=devel/gmp devel/mpfr devel/llvm > > portcheck(1) complains: > LIB_DEPENDS devel/llvm not needed for lang/pure ? > > Sure it is LIB_DEPENDS ? and not a BUILD_ and/or RUN_DEPENDS ? Excuse my ignorance, but I thought everything was included as a library for llvm dependencies. I will try to do BUILD/RUN_DEPENDS and follow up accordingly. > > > Else, under i386 the build fail: > > ===> Building for pure-0.60 > c++ -O2 -pipe -I/usr/local/include -I/usr/local/include > -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I. > -I/usr/obj/pobj/pure-0.60/pure-0.60 -DLIBDIR='"/usr/local/lib"' > -DLIBPURE='"libpure.so.8"' -c -o interpreter.o > /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc > /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc: In member function 'void > interpreter::init()': > /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc:285: error: no matching > function for call to > 'llvm::legacy::FunctionPassManager::add(llvm::DataLayout*)' > /usr/local/include/llvm/IR/LegacyPassManager.h:83: note: candidates are: > virtual void llvm::legacy::FunctionPassManager::add(llvm::Pass*) > /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc: In member function 'bool > interpreter::LoadBitcode(bool, const char*, std::string*)': > /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc:2427: error: request for > member 'empty' in 'M-> llvm::Module::getDataLayout()', which is of non-class > type 'const llvm::DataLayout*' > /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc:2427: error: no match for > 'operator!=' in 'M-> llvm::Module::getDataLayout() != layout' > /usr/local/include/llvm/ADT/StringRef.h:532: note: candidates are: bool > llvm::operator!=(llvm::StringRef, llvm::StringRef) > /usr/local/include/llvm/Target/TargetOptions.h:226: note: > bool llvm::operator!=(const llvm::TargetOptions&, const llvm::TargetOptions&) > /usr/local/include/llvm/ADT/APInt.h:1715: note: bool > llvm::operator!=(uint64_t, const llvm::APInt&) > /usr/local/include/llvm/Support/system_error.h:808: note: > bool llvm::operator!=(const llvm::error_code&, const llvm::error_code&) > /usr/local/include/llvm/Support/system_error.h:812: note: > bool llvm::operator!=(const llvm::error_code&, const llvm::error_condition&) > /usr/local/include/llvm/Support/system_error.h:816: note: > bool llvm::operator!=(const llvm::error_condition&, const llvm::error_code&) > /usr/local/include/llvm/Support/system_error.h:820: note: > bool llvm::operator!=(const llvm::error_condition&, const > llvm::error_condition&) > /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc:2435: error: invalid > operands of types 'const char [26]' and 'const llvm::DataLayout*' to binary > 'operator+' > /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc: In member function 'int > interpreter::compiler(std::string, std::list std::char_traits, std::allocator >, > std::allocator, > std::allocator > > >)': > /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc:10521: error: 'F_Binary' is > not a member of 'llvm::sys::fs' > Makefile:249: recipe for target 'interpreter.o' failed > gmake: *** [interpreter.o] Error 1 > *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2695 > '/usr/obj/pobj/pure-0.60/build-i386/.build_done') > *** Error 1 in /usr/ports/mystuff/lang/pure > (/usr/ports/infrastructure/mk/bsd.port.mk:2423 'all') > > > -- > Sébastien Marie -- Anders Jensen-Waud
Re: NEW: lang/pure
On Thu, Jun 12, 2014 at 03:25:37PM +1000, Anders Jensen-Waud wrote: > On 12 Jun 2014, at 1:35 pm, Anders Jensen-Waud wrote: > > > Hello, > > > > I have written a new port for Pure -- a functional programming language > > with term rewriting (http://purelang.bitbucket.org/). > > > > The port is attached as a tarball. > > > > Could I kindly ask you to test and provide feedback? > > > > I just realised that there was a make test target available in the base > distribution. It has been included in the attached tarball, so please use > that one instead. > > -- > Anders Jensen-Waud Hi, Some notes about Makefile: > SHARED_LIBS += pure 8.0 If I remember well, a new port should use 0.0 for version numbering. > WANTLIB += iconv gmp mpfr pthread readline stdc++ termcap z c m > > LIB_DEPENDS=devel/gmp devel/mpfr devel/llvm portcheck(1) complains: LIB_DEPENDS devel/llvm not needed for lang/pure ? Sure it is LIB_DEPENDS ? and not a BUILD_ and/or RUN_DEPENDS ? Else, under i386 the build fail: ===> Building for pure-0.60 c++ -O2 -pipe -I/usr/local/include -I/usr/local/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I. -I/usr/obj/pobj/pure-0.60/pure-0.60 -DLIBDIR='"/usr/local/lib"' -DLIBPURE='"libpure.so.8"' -c -o interpreter.o /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc: In member function 'void interpreter::init()': /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc:285: error: no matching function for call to 'llvm::legacy::FunctionPassManager::add(llvm::DataLayout*)' /usr/local/include/llvm/IR/LegacyPassManager.h:83: note: candidates are: virtual void llvm::legacy::FunctionPassManager::add(llvm::Pass*) /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc: In member function 'bool interpreter::LoadBitcode(bool, const char*, std::string*)': /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc:2427: error: request for member 'empty' in 'M-> llvm::Module::getDataLayout()', which is of non-class type 'const llvm::DataLayout*' /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc:2427: error: no match for 'operator!=' in 'M-> llvm::Module::getDataLayout() != layout' /usr/local/include/llvm/ADT/StringRef.h:532: note: candidates are: bool llvm::operator!=(llvm::StringRef, llvm::StringRef) /usr/local/include/llvm/Target/TargetOptions.h:226: note: bool llvm::operator!=(const llvm::TargetOptions&, const llvm::TargetOptions&) /usr/local/include/llvm/ADT/APInt.h:1715: note: bool llvm::operator!=(uint64_t, const llvm::APInt&) /usr/local/include/llvm/Support/system_error.h:808: note: bool llvm::operator!=(const llvm::error_code&, const llvm::error_code&) /usr/local/include/llvm/Support/system_error.h:812: note: bool llvm::operator!=(const llvm::error_code&, const llvm::error_condition&) /usr/local/include/llvm/Support/system_error.h:816: note: bool llvm::operator!=(const llvm::error_condition&, const llvm::error_code&) /usr/local/include/llvm/Support/system_error.h:820: note: bool llvm::operator!=(const llvm::error_condition&, const llvm::error_condition&) /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc:2435: error: invalid operands of types 'const char [26]' and 'const llvm::DataLayout*' to binary 'operator+' /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc: In member function 'int interpreter::compiler(std::string, std::list, std::allocator >, std::allocator, std::allocator > > >)': /usr/obj/pobj/pure-0.60/pure-0.60/interpreter.cc:10521: error: 'F_Binary' is not a member of 'llvm::sys::fs' Makefile:249: recipe for target 'interpreter.o' failed gmake: *** [interpreter.o] Error 1 *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2695 '/usr/obj/pobj/pure-0.60/build-i386/.build_done') *** Error 1 in /usr/ports/mystuff/lang/pure (/usr/ports/infrastructure/mk/bsd.port.mk:2423 'all') -- Sébastien Marie
Re: NEW: lang/pure
On 12 Jun 2014, at 1:35 pm, Anders Jensen-Waud wrote: > Hello, > > I have written a new port for Pure -- a functional programming language > with term rewriting (http://purelang.bitbucket.org/). > > The port is attached as a tarball. > > Could I kindly ask you to test and provide feedback? > I just realised that there was a make test target available in the base distribution. It has been included in the attached tarball, so please use that one instead. -- Anders Jensen-Waud pure-0.60.tar.gz Description: GNU Zip compressed data
Re: sysutils/cdrtools HOMEPAGE/MATSER_SITES fix
ping, forgotten or low priority?
On Mon Jun 09, 2014 at 05:32:33PM +0200, Rafael Sadowski wrote:
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/cdrtools/Makefile,v
> retrieving revision 1.20
> diff -u -p -u -r1.20 Makefile
> --- Makefile 11 Mar 2013 11:41:29 - 1.20
> +++ Makefile 9 Jun 2014 15:30:38 -
> @@ -3,16 +3,15 @@
> COMMENT= ISO 9660 filesystem and CD/DVD/BD creation tools
>
> DISTNAME=cdrtools-3.00
> +REVISION=0
> CATEGORIES= sysutils
> -HOMEPAGE=http://cdrecord.berlios.de/private/cdrecord.html
> +HOMEPAGE=http://cdrtools.sourceforge.net/private/cdrtools.html
>
> # mostly CDDL, some components GPL (see COPYING)
> PERMIT_PACKAGE_CDROM=Yes
> WANTLIB= c ossaudio
>
> -MASTER_SITES=ftp://ftp.berlios.de/pub/cdrecord/ \
> - http://spacehopper.org/mirrors/berlios/cdrecord/
> -
> +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=cdrtools/}
>
> USE_GMAKE= Yes
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/cdrtools/distinfo,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 distinfo
> --- distinfo 7 Dec 2011 07:56:12 - 1.8
> +++ distinfo 9 Jun 2014 15:30:38 -
> @@ -1,5 +1,2 @@
> -MD5 (cdrtools-3.00.tar.gz) = uyHO/vz7t2zySRIOiXj/3Q==
> -RMD160 (cdrtools-3.00.tar.gz) = nDIjluU6k8q3BaUPEMI9rDuOGSc=
> -SHA1 (cdrtools-3.00.tar.gz) = LNfRcl4NoiZ7egM8x0QpXW4rxrk=
> SHA256 (cdrtools-3.00.tar.gz) = YyZ2Lai4KByakQxm/mmM1NG8XzPDe1no8cgzQ8JfPpg=
> SIZE (cdrtools-3.00.tar.gz) = 2479860
>
NEW: lang/pure
Hello, I have written a new port for Pure -- a functional programming language with term rewriting (http://purelang.bitbucket.org/). The port is attached as a tarball. Could I kindly ask you to test and provide feedback? Regards, -- Anders pure-0.60.tar.gz Description: GNU Zip compressed data
Re: Error compiling LLVM from ports on OpenBSD 5.5 (amd64)
On 11/06/14 7:18 PM, Anders Jensen-Waud wrote: I receive an error when trying to build LLVM from ports on OpenBSD 5.5. The error happens during the make configure stage: # uname -a OpenBSD tool.my.domain 5.5 GENERIC.MP#315 amd64 # pwd /usr/ports/devel/llvm # make build ===> llvm-3.3p3 depends on: py-sphinx-* -> py-sphinx-1.1.3p0 ===> llvm-3.3p3 depends on: cmake->=2.8.11.1p0 -> cmake-2.8.12.1p1 ===> llvm-3.3p3 depends on: ninja-* -> ninja-1.4.0 ===> llvm-3.3p3 depends on: python->=2.7,<2.8 -> python-2.7.6p0 ===> Verifying specs: c m pthread stdc++ z c m pthread stdc++ z ===> found c.73.1 m.9.0 pthread.18.0 stdc++.57.0 z.5.0 ===> Checking files for llvm-3.3p3 `/usr/ports/distfiles/llvm-3.3.src.tar.gz' is up to date. `/usr/ports/distfiles/cfe-3.3.src.tar.gz' is up to date. (SHA256) llvm-3.3.src.tar.gz: OK (SHA256) cfe-3.3.src.tar.gz: OK ===> Extracting for llvm-3.3p3 ===> Patching for llvm-3.3p3 ===> Configuring for llvm-3.3p3 Floating point exception (core dumped) *** Error 136 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2650 '/usr/ports/pobj/llvm-3.3/build-amd64/.configure_done') *** Error 1 in /usr/ports/devel/llvm (/usr/ports/infrastructure/mk/bsd.port.mk:2406 'build') Anyone else experiencing this problem? With an error like that you should try searching under ports/pobj/llvm-3.3 to see if there are any core files. See if that is CMake crashing or something else. But either way why are you building from the port when there are pre-built packages? -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Error compiling LLVM from ports on OpenBSD 5.5 (amd64)
I receive an error when trying to build LLVM from ports on OpenBSD 5.5. The error happens during the make configure stage: # uname -a OpenBSD tool.my.domain 5.5 GENERIC.MP#315 amd64 # pwd /usr/ports/devel/llvm # make build ===> llvm-3.3p3 depends on: py-sphinx-* -> py-sphinx-1.1.3p0 ===> llvm-3.3p3 depends on: cmake->=2.8.11.1p0 -> cmake-2.8.12.1p1 ===> llvm-3.3p3 depends on: ninja-* -> ninja-1.4.0 ===> llvm-3.3p3 depends on: python->=2.7,<2.8 -> python-2.7.6p0 ===> Verifying specs: c m pthread stdc++ z c m pthread stdc++ z ===> found c.73.1 m.9.0 pthread.18.0 stdc++.57.0 z.5.0 ===> Checking files for llvm-3.3p3 `/usr/ports/distfiles/llvm-3.3.src.tar.gz' is up to date. `/usr/ports/distfiles/cfe-3.3.src.tar.gz' is up to date. >> (SHA256) llvm-3.3.src.tar.gz: OK >> (SHA256) cfe-3.3.src.tar.gz: OK ===> Extracting for llvm-3.3p3 ===> Patching for llvm-3.3p3 ===> Configuring for llvm-3.3p3 Floating point exception (core dumped) *** Error 136 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2650 '/usr/ports/pobj/llvm-3.3/build-amd64/.configure_done') *** Error 1 in /usr/ports/devel/llvm (/usr/ports/infrastructure/mk/bsd.port.mk:2406 'build') Anyone else experiencing this problem? Regards, Anders -- Anders Jensen-Waud
Re: NEW: hexchat
On 2014/06/11 21:30, Florian Stinglmayr wrote:
> Now with 100% more attachment.
Looking pretty good - one last thing, it should be MODPY_BUILDDEP
not MODPY_BUILD_DEP. Apart from that it's OK with me to import (or I can
do it if somebody will give me an ok).
...I would add MODPY_{BUILD,RUN}_DEP{,ENDS} to the .poison lines in the
mk.conf.template file (that can be .include'd from /etc/mk.conf), but a
few other ports have a problem with the spelling of these and need
fixing before that can be done (net/centerim, textproc/ruby-pygments.rb,
x11/kde4/dev-script).
Re: UPDATE: libass 0.11.2
On Wed, Jun 11, 2014 at 01:08:52AM -0400, Brad Smith wrote: > Here is an update to libass 0.11.2. It seems to work fine on i386 with both mplayer and with ffmpeg built with --enable-libass.
UPDATE: Xine-lib
- Reducing the external dependencies a bit by utilizing FFmpeg instead
of the reference decoders for AAC, AC3 and DTS.
- A build fix for LLVM.
Looking for any additional testing with the AAC, AC3 and DTS codecs.
OK?
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.113
diff -u -p -u -p -r1.113 Makefile
--- Makefile2 Jun 2014 22:26:10 - 1.113
+++ Makefile9 Jun 2014 00:18:39 -
@@ -9,7 +9,7 @@ CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.xz
-REVISION= 3
+REVISION= 4
SHARED_LIBS= xine31.0
@@ -21,22 +21,18 @@ MAINTAINER= Brad Smith =5 wavpack xcb-shape xcb-shm xcb-xv xcb xdg-basedir \
- xml2 z
+WANTLIB= FLAC GL GLU ICE SDL SM X11 Xext Xinerama Xv XvMCW avcodec \
+ avformat avutil bluray c cdio dvdnav dvdread expat fontconfig \
+ freetype iso9660 jpeg m mad modplug mpcdec mng ogg postproc \
+ pthread pthread-stubs sndio speex theora usbhid vcdinfo vorbis \
+ vpx>=5 wavpack xcb-shape xcb-shm xcb-xv xcb xdg-basedir xml2 z
XINEAPI_REV= 2.4
SUBST_VARS+= XINEAPI_REV
MODULES= devel/gettext
-LIB_DEPENDS= audio/faad \
- audio/flac \
- audio/liba52 \
+LIB_DEPENDS= audio/flac \
audio/libcdio \
- audio/libdca \
audio/libmad \
audio/libmodplug \
audio/libogg \
@@ -66,7 +62,10 @@ USE_LIBTOOL= gnu
USE_GROFF= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
-CONFIGURE_ARGS+=--disable-aalib \
+CONFIGURE_ARGS+=--disable-a52dec \
+ --disable-aalib \
+ --disable-dts \
+ --disable-faad \
--disable-gdkpixbuf \
--disable-gnomevfs \
--disable-optimizations \
Index: patches/patch-src_combined_ffmpeg_ff_audio_decoder_c
===
RCS file: patches/patch-src_combined_ffmpeg_ff_audio_decoder_c
diff -N patches/patch-src_combined_ffmpeg_ff_audio_decoder_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_combined_ffmpeg_ff_audio_decoder_c7 Jun 2014
00:43:55 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Enable parser for AC3.
+
+--- src/combined/ffmpeg/ff_audio_decoder.c.origWed Feb 26 10:49:10 2014
src/combined/ffmpeg/ff_audio_decoder.c Fri Jun 6 20:29:22 2014
+@@ -196,13 +196,14 @@ static void ff_audio_init_codec(ff_audio_decoder_t *th
+ this->context->codec_type = this->codec->type;
+ this->context->codec_tag = _x_stream_info_get(this->stream,
XINE_STREAM_INFO_AUDIO_FOURCC);
+
+- /* Use parser for EAC3, AAC LATM and MPEG.
++ /* Use parser for AC3, EAC3, AAC LATM and MPEG.
+* Fixes:
+* - DVB streams where multiple AAC LATM frames are packed to single PES
+* - DVB streams where MPEG audio frames do not follow PES packet
boundaries
+*/
+ #if AVPARSE > 1
+ if (codec_type == BUF_AUDIO_AAC_LATM ||
++ codec_type == BUF_AUDIO_A52 ||
+ codec_type == BUF_AUDIO_EAC3 ||
+ codec_type == BUF_AUDIO_MPEG) {
+
Index: patches/patch-src_combined_ffmpeg_xine_audio_list
===
RCS file:
/home/cvs/ports/multimedia/xine-lib/patches/patch-src_combined_ffmpeg_xine_audio_list,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_combined_ffmpeg_xine_audio_list
--- patches/patch-src_combined_ffmpeg_xine_audio_list 21 May 2014 23:41:03
- 1.1
+++ patches/patch-src_combined_ffmpeg_xine_audio_list 7 Jun 2014 00:44:43
-
@@ -1,14 +1,24 @@
$OpenBSD: patch-src_combined_ffmpeg_xine_audio_list,v 1.1 2014/05/21 23:41:03
brad Exp $
-Enable Opus decoder.
+Enable Opus, AC3 and DTS decoder.
src/combined/ffmpeg/xine_audio.list.orig Wed May 21 09:37:06 2014
-+++ src/combined/ffmpeg/xine_audio.listWed May 21 09:37:32 2014
-@@ -46,6 +46,7 @@ AAC AAC MPEG4
+--- src/combined/ffmpeg/xine_audio.list.orig Wed Feb 26 10:49:10 2014
src/combined/ffmpeg/xine_audio.listFri Jun 6 19:54:13 2014
+@@ -41,14 +41,16 @@ FLVADPCM ADPCM_SWF Flash ADPCM
+ WAVPACK WAVPACK WavPack
+ AMR_NBAMR_NB AMR narrow band
+ AMR_WBAMR_WB AMR wide band
++A52 AC3 AC-3
+ EAC3 EAC3E-AC-3
+ AAC AAC MPEG4
AAC_LATM AAC_LATMAAC LATM
ADPCM_G726ADPCM_G726 ADPCM G726
QCLP QCELP QualComm Purevoice
+OPUS OPUSOpus Audio
++DTS
Re: NEW: hexchat
Now with 100% more attachment. hexchat.tar.gz Description: application/tar-gz
Re: NEW: hexchat
On Mon, Jun 09, 2014 at 07:59:05PM +0100, Stuart Henderson wrote: > This PLIST is missing some directories; it creates files in > directories which are neither listed in the PLIST nor come from a > dependent port, e.g. share/appdata, share/locale/ja_JP, lib/hexchat / > lib/hexchat/plugins. > Fixed. > It would be better to avoid building the static-library version of > the plugins by using LIBTOOL_FLAGS = --tag=disable-static (then the > @comment'ed .a lines can go), and there's a hidden dependency on > at least libpci (sysinfo is built if it's present at configure > time, so this will fail sporadically in bulk builds), but check for > others - there are things like iso-codes in there too which may get > picked up. > sysinfo plugin is disabled. It is not needed. > There's also a missing library (LIB_DEPENDS and WANTLIB) on python, > use the appropriate variables shown in the lang/python section of > port-modules(5) to set these rather than hardcoding these. > > something's wrong with the --enable-socks, it doesn't pick up an > installed libsocks? if it's not doing anything useful should it just > be disabled? > - empty PFRAG.shared; but because you use loadable modules it should be > SHARED_ONLY so there shouldn't be a PFRAG.shared Also fixed. Thanks again, for all your helpful suggestions and comments. Attached is a new version of the port with all those fixes. Regards, Florian
GPLv2+ vs. GPLv2 only
Hi Marc, [ moving to ports in order to not start a discussion on ports-changes@ ] Marc Espie wrote on Wed, Jun 11, 2014 at 01:08:59PM +0200: > On Tue, Jun 10, 2014 at 08:42:33PM -0600, Anthony J. Bentley wrote: >> CVSROOT: /cvs >> Module name: ports >> Changes by: bent...@cvs.openbsd.org 2014/06/10 20:42:33 >> >> Modified files: >> infrastructure/templates: Makefile.template >> >> Log message: >> Since lots of people incorrectly mark GPLv2+ ports as "GPLv2", suggest >> actual GPLv2 ports be described "GPLv2 only" (already somewhat common). > I would say it's almost a political choice on our part. Not really. The comment line in the Makefile is informative, not political. It tells people what *is*, not what they should do. It should be accurate without being overly verbose. That criterion is satisfied by using "GPLv2+" and "GPLv2 only", but it is violated by using "GPLv2" for GPLv2+ ports. Accuracy in this particular case may now and then be helpful because GPLv2 only and GPLv3 only are incompatible, that is, GPLv2 only code cannot be incorporated into GPLv3 only software and vice versa. So knowing whether some software is GPLv2+ or GPLv2 only may occasionally be relevant. > From a BSD point of view, a GPLv2+ is effectively a GPLv2 port. > I would never dream to use it as the obnoxious GPLv3 licence. I guess you didn't really think that through. Suppose somebody provides a library under GPLv2+ (yeah, they shouldn't do that, but people actually do a lot of strange things) and somebody else provides a program using the library under GPLv3+. I bet you *are* going to use the library under GPLv3, not under GPLv2. Another example. Someone publishes a program under GPLv2+. Someone else publishes substantial extensions you need under GPLv3+. I bet you are going to use the whole thing under GPLv3. Yet another example. You are using some GPLv3+ program. Somebody provides patches saying "you may use these patches under a BSD license or under GPLv1+, at your choice". I bet you will use them under GPLv3. > Heck, I wonder about the legality, but if I had local patches, > I would definitely consider making them GPLv2-only. Gah. What a terrible idea. Don't try to enforce policy through clever manipulation of licensing. That's exactly what the GPL tries to do, fails so badly at, and causes all kinds of license compatibility issues in the process. Trying to do that, you usually end up making your code less free and still don't reach your political goals anyway. Even though i would consider GPLv2 relatively more free than GPLv3 (relatively less strings attached, though i consider none of them free licenses in any absolute sense), i clearly consider GPLv2+ relatively more free than GPLv2 because it provides *more* options to use the code: GPLv2+ attaches *less* strings and causes less license incompatibility issues than GPLv2 only. Hence, when i provide substantial patches to any kind of GPL software, no matter whether the software is GPLv1, GPLv2, GPLv3 or anything with a plus, i usually provide the patches under dual licensing "ISC or GPLv1+ at your choice". That doesn't make the software itself free, but at least my patches won't get in the way if the author(s) ever consider moving from GPL to BSD, or from GPLv3 to GPLv2, or if somebody does a BSD rewrite and tries to re-use as much of the existing code as possible, orn ...(insert you favourite code-reuse scenario here)... Yes, it also helps the upstream authors if they want to change from GPLv2 only to GPLv3+, and you may well consider that (politically) undesirable. But i wouldn't dream of attempting to prevent that by playing mostly ineffective licensing games at the expense of hindering potential code reuse in other scenarios, like reusing the files i touched in other software that is GPLv3+ anyway. My patches to non-free software need a compatible restrictive license - in the case of GPLv2+ software, GPLv2+ - but even though that software as whole is not free, at least my patches should be, hence ISC/GPLv1+ as a superset of GPLv2+. Yours, Ingo
luaposix update
this bumps luaposix up to version 32.
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/luaposix/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile11 Mar 2013 10:50:11 - 1.19
+++ Makefile11 Jun 2014 07:01:55 -
@@ -3,29 +3,26 @@
SHARED_ONLY= Yes
COMMENT= posix library for the lua language
-DISTNAME= luaposix-5.1.4
+V= 32
+DISTNAME= luaposix-release-v${V}
EPOCH= 0
REVISION= 1
+PKGNAME= luaposix-${V}
CATEGORIES=devel
-MASTER_SITES= http://luaforge.net/frs/download.php/3572/
+MASTER_SITES= https://github.com/luaposix/luaposix/archive/
-HOMEPAGE= http://luaforge.net/projects/luaposix/
+HOMEPAGE= https://github.com/luaposix/luaposix/
# Public domain
PERMIT_PACKAGE_CDROM= Yes
MODULES= lang/lua
-TEST_DEPENDS=${BUILD_PKGPATH}
+MODLUA_RUN_DEPENDS=devel/luabitop
-do-build:
- ${CC} ${CFLAGS} -fPIC -I${MODLUA_INCL_DIR} -shared \
- ${WRKDIST}/lposix.c -o ${WRKDIST}/posix.so
-
-do-install:
- ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR}
- ${INSTALL_DATA} ${WRKSRC}/posix.so ${MODLUA_LIBDIR}
-
-do-test:
- cd ${WRKSRC} && ${MODLUA_BIN} *.lua
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS+=--libdir=${MODLUA_LIBDIR}
+CONFIGURE_ENV+=LUA=${MODLUA_BIN} \
+ LUA_VERSION=${MODLUA_VERSION} \
+ LUA_INCLUDE=-I${MODLUA_INCL_DIR}
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/luaposix/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo6 Sep 2009 15:39:21 - 1.6
+++ distinfo11 Jun 2014 07:01:55 -
@@ -1,5 +1,2 @@
-MD5 (luaposix-5.1.4.tar.gz) = BzAZsaUr/duU4lIVU7R+9Q==
-RMD160 (luaposix-5.1.4.tar.gz) = 68sjazNi952yy60Or2cFEzE+iik=
-SHA1 (luaposix-5.1.4.tar.gz) = Q0RqnLkSRz6C07UWI4PdehB46cU=
-SHA256 (luaposix-5.1.4.tar.gz) = D3j+nIisdZWSKaWdqw2IZbP1xXMHBag+dMJG9HUigWc=
-SIZE (luaposix-5.1.4.tar.gz) = 13390
+SHA256 (luaposix-release-v32.tar.gz) =
Cdu96CX9m3aoofaoCSBDT4Ypo5LNGEACHtS5WyH88HM=
+SIZE (luaposix-release-v32.tar.gz) = 552641
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure 11 Jun 2014 07:01:55 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.orig Wed Jun 11 15:20:40 2014
configure Wed Jun 11 15:21:08 2014
+@@ -14077,7 +14077,7 @@ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+ax_cv_lua_header_version=`./conftest$EXEEXT p | \
+ sed "s|^Lua \(.*\)|\1|" | \
+-grep -o "^[0-9]\+\\.[0-9]\+"`
++egrep -o "^[0-9]+.[0-9]+"`
+
+ else
+ ax_cv_lua_header_version='unknown'
Index: patches/patch-ext_posix_posix_c
===
RCS file: patches/patch-ext_posix_posix_c
diff -N patches/patch-ext_posix_posix_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-ext_posix_posix_c 11 Jun 2014 07:01:55 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- ext/posix/posix.c.orig Wed Jun 11 15:24:32 2014
ext/posix/posix.c Wed Jun 11 15:25:06 2014
+@@ -2594,8 +2594,7 @@ static int Ptimes(lua_State *L)
+ MENTRY( _DATA ) \
+ MENTRY( _FSIZE ) \
+ MENTRY( _NOFILE ) \
+- MENTRY( _STACK ) \
+- MENTRY( _AS )
++ MENTRY( _STACK )
+
+ static const int Krlimit[] =
+ {
Index: patches/patch-test_lua
===
RCS file: patches/patch-test_lua
diff -N patches/patch-test_lua
--- patches/patch-test_lua 6 Sep 2009 15:39:21 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-test_lua,v 1.1 2009/09/06 15:39:21 jolan Exp $
test.lua.orig Thu Jan 24 08:15:06 2008
-+++ test.lua Sun Sep 6 10:36:17 2009
-@@ -83,7 +83,7 @@ if pid==0 then
- ppid=ox.getpid"ppid"
- io.write("in child process ",pid," from ",ppid,".\nnow executing
date... ")
- io.flush()
-- assert(ox.exec("date","+[%c]"))
-+ assert(ox.exec("/bin/date","+[%c]"))
- print"should not get here"
- else
- io.write("process ",ox.getpid"pid"," forked child process ",pid,".
waiting...\n")
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/luaposix/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 11 May 2012 20:51:04 - 1.3
+++ pkg/PLIST 11 Jun 2014 07:01:55 -
@@ -1,2 +1,34 @@
@comment $OpenBSD: PLIST,v 1.3 2012/05/11 20:51:04 jasper Exp $
-lib/lua/${MODLUA_VERSION}/posix.so
+lib/lua/${MODLUA_VERSION}/curses_c.a
+lib/lua/${MODLUA_VERSION}/curses_c.la
+lib/lua/${MODLUA_VERSION}/curses_c.so
+lib/lua/${MODLUA_VERSION}/posix_c.a
+lib/lua/${MODLUA_VERSION}/posix
