UPDATE: audio/openal
This updates OpenAL to 1.14 that was released yesterday. Release notes at
http://kcat.strangesoft.net/openal.html
--
Antti Harri
diff --git audio/openal/Makefile audio/openal/Makefile
index 4acb110..9dae287 100644
--- audio/openal/Makefile
+++ audio/openal/Makefile
@@ -2,7 +2,8 @@
COMMENT = cross-platform 3D audio API
-V =20110627
+V =1.14
+EPOCH =0
DISTNAME = openal-soft-$V
PKGNAME = openal-$V
CATEGORIES = audio
@@ -20,20 +21,26 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = c m pthread sndio
-MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,} \
- http://openbsd.fi/dist/
+MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,}
+EXTRACT_SUFX = .tar.bz2
CONFIGURE_ARGS =-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" \
-DCMAKE_BUILD_TYPE=OpenBSD \
-DDLOPEN=Off\
+ -DREQUIRE_SNDIO=On \
-DPULSEAUDIO=Off\
-DPORTAUDIO=Off \
-DSOLARIS=Off \
-DALSA=Off \
- -DOSS=Off
+ -DOSS=Off \
+ -DCOREAUDIO=Off \
+ -DDSOUND=Off\
+ -DOPENSL=Off\
+ -DEXAMPLES=Off
MODULES = devel/cmake
+SEPARATE_BUILD =Yes
NO_REGRESS = Yes
pre-build:
diff --git audio/openal/distinfo audio/openal/distinfo
index af7ecc7..c0ec328 100644
--- audio/openal/distinfo
+++ audio/openal/distinfo
@@ -1,5 +1,5 @@
-MD5 (openal-soft-20110627.tar.gz) = dyIlarhDU4oZArAVhNi6Xw==
-RMD160 (openal-soft-20110627.tar.gz) = kWiXzE41A6/+Xvs8PKBCZKpb/Vs=
-SHA1 (openal-soft-20110627.tar.gz) = 22LbnwY5ForaALA6rXGj/QfB7LM=
-SHA256 (openal-soft-20110627.tar.gz) =
/xXT1ihUatrb/4JSCAYYrrTVYbjP6medJwHdInFpS/w=
-SIZE (openal-soft-20110627.tar.gz) = 231964
+MD5 (openal-soft-1.14.tar.bz2) = PYuGwhovh6Kl5g9487PwPQ==
+RMD160 (openal-soft-1.14.tar.bz2) = NbTUbyF5+4R9IqvkwcuNSpdPilo=
+SHA1 (openal-soft-1.14.tar.bz2) = 5tadsT7BVGW4OkXviZeOig9Vvso=
+SHA256 (openal-soft-1.14.tar.bz2) =
h72NYdWUM4eJjJK2oru7JhGOdF3sV1UMgXUmpw+tCRQ=
+SIZE (openal-soft-1.14.tar.bz2) = 221579
diff --git audio/openal/patches/patch-Alc_sndio_c
audio/openal/patches/patch-Alc_sndio_c
deleted file mode 100644
index e24b892..000
--- audio/openal/patches/patch-Alc_sndio_c
+++ /dev/null
@@ -1,36 +0,0 @@
-$OpenBSD: ports/audio/openal/patches/patch-Alc_sndio_c,v 1.2 2011/07/02
07:34:31 jasper Exp $
Alc/sndio.c.orig Mon Jun 27 01:40:15 2011
-+++ Alc/sndio.cThu Jun 30 23:37:31 2011
-@@ -142,25 +142,15 @@ static ALuint sndio_proc(ALvoid *ptr)
-
- while(!data->killNow && device->Connected)
- {
--ALsizei len = data->data_size;
--ALubyte *WritePtr = data->mix_data;
--
--aluMixData(device, WritePtr, len/frameSize);
--while(len > 0 && !data->killNow)
-+aluMixData(device, data->mix_data, data->data_size / frameSize);
-+wrote = sio_write(data->sndHandle, data->mix_data, data->data_size);
-+if(wrote < data->data_size)
- {
--wrote = sio_write(data->sndHandle, WritePtr, len);
--if(wrote == 0)
--{
--AL_PRINT("sio_write failed\n");
--aluHandleDisconnect(device);
--break;
--}
--
--len -= wrote;
--WritePtr += wrote;
--}
-+ AL_PRINT("sio_write: short write\n");
-+ aluHandleDisconnect(device);
-+ break;
-+ }
- }
--
- return 0;
- }
-
diff --git audio/openal/pkg/PLIST audio/openal/pkg/PLIST
index 0bbfaeb..fca201e 100644
--- audio/openal/pkg/PLIST
+++ audio/openal/pkg/PLIST
@@ -1,4 +1,5 @@
@comment $OpenBSD: ports/audio/openal/pkg/PLIST,v 1.4 2011/06/25 18:42:02
jasper Exp $
+@bin bin/makehrtf
@bin bin/openal-info
include/AL/
include/AL/al.h
@@ -6,6 +7,7 @@ include/AL/alc.h
include/AL/alext.h
%%SHARED%%
include/AL/efx-creative.h
+include/AL/efx-presets.h
include/AL/efx.h
lib/pkgconfig/
lib/pkgconfig/openal.pc
Re: UPDATE: audio/openal
On 2012/03/29 14:03, Antti Harri wrote: > This updates OpenAL to 1.14 that was released yesterday. Release notes at > http://kcat.strangesoft.net/openal.html Looks good but two questions - - what's this been tested with so far? - have you checked for ABI/API changes? > diff --git audio/openal/Makefile audio/openal/Makefile Whatever your opinion of version control systems, the OpenBSD trees are kept in CVS, so we really want CVS diffs rather than diffs against a 3rd-party CVS<>git conversion - the one you're using messes up keyword expansion btw.
SEPARATE_BUILD=(simple|concurrent) -> Yes
Documentation for SEPARATE_BUILD=concurrent was removed in 2003 and there's no code for it, it's just handled the same as 'anything other than "flavored" or no'. Any OKs to change all of (simple|concurrent) to just 'Yes' to simplify things?
Re: SEPARATE_BUILD=(simple|concurrent) -> Yes
On Thu, Mar 29, 2012 at 3:17 PM, Stuart Henderson wrote: > Documentation for SEPARATE_BUILD=concurrent was removed in 2003 and > there's no code for it, it's just handled the same as 'anything other > than "flavored" or no'. > > Any OKs to change all of (simple|concurrent) to just 'Yes' to > simplify things? > yes, simplification is always a good thing.
Re: new: lang/go - take 2
Go 1 was released yesterday - the attached is an updated port. Any further comments? Any oks? On Monday 26 March 2012, Joel Sing wrote: > A new version - this updates the port to the 2012-03-22 weekly release > (effectively Go v1 RC2) and fixes the issue with the regress path for > the "go" binary. > > ok? > > On Friday 23 March 2012, Joel Sing wrote: > > Attached is an updated version of the port for Go: > > > > - Version numbering is now 1.0preMMDD as suggested by sthen. > > > > - Fixed PLIST issue so that the port now works correctly on both amd64 > > and i386. > > > > - Fixed issue with USE_SYSTRACE - for the time being a Go binary needs to > > be able to use the sysarch() syscall in order to setup TLS. > > > > ok? > > > > On Thursday 22 March 2012, Joel Sing wrote: > > > The attached is an initial port for the Go programming language > > > (www.golang.org). A little background - Go is approaching a "Go > > > version1" release and at that point it will have a stable API. > > > Unfortunately, for several reasons Go version 1 will not be officially > > > supported on OpenBSD, however there are only a few issues that prevent > > > this - the diffs included in the port address known outstanding issues > > > for the OpenBSD runtime, which will let us provide a working port. > > > > > > Open questions: > > > > > > 1. Version numbering - in some ways once Go version 1 is release the > > > versioning will be somewhat like Python and in the future you may want > > > to install Go version 1 and Go version 2 on the same machine (different > > > APIs for example). However, during the development phase there are > > > weekly tagged releases that are simply -MM-DD versioned. For this > > > reason I'm thinking that the version numbering should be 0.MMDD for > > > now and 1.0 for the version 1 release. Continued development could then > > > follow on the 0.MMDD releases. Or should we have two packages - a > > > "go-weekly" package and a "go" package? > > > > > > 2. The installation locations is going to get somewhat messy - due to > > > some of the internals of Go's design everything except a few user > > > binaries (so documentaiton, libraries, source code, etc) needs to be > > > under a single directory. For now I've used the "recommended" default > > > of /usr/local/go, however this is not really acceptable for OpenBSD. > > > Suggestions as to what would be the closest suitable location? I plan > > > on talking with upstream re being able to split this so that we at > > > least have tool/libexec type binaries and libraries separated out from > > > the docs/source. > > > > > > 3. License - Go is released under a BSD-style license, however some > > > parts (like the documentation) are under other licenses (Creative > > > Commons Attribution 3.0 License). How do we handle this? -- "Reason is not automatic. Those who deny it cannot be conquered by it. Do not count on them. Leave them alone." -- Ayn Rand go-port.tar.gz Description: application/tgz
Re: new: lang/go - take 2
I got following error on any Go example from http://golang.org ~/tmp/go$ go build pi.go # runtime /usr/local/go/src/pkg/runtime/extern.go:121: undefined: defaultGoroot /usr/local/go/src/pkg/runtime/extern.go:130: undefined: theVersion /usr/local/go/src/pkg/runtime/extern.go:135: undefined: theGoos /usr/local/go/src/pkg/runtime/extern.go:135: cannot use theGoos as type string in const initializer /usr/local/go/src/pkg/runtime/extern.go:139: undefined: theGoarch /usr/local/go/src/pkg/runtime/extern.go:139: cannot use theGoarch as type string in const initializer ~/tmp/go$ On 01:05 Fri 30 Mar , Joel Sing wrote: > Go 1 was released yesterday - the attached is an updated port. > > Any further comments? Any oks? > > On Monday 26 March 2012, Joel Sing wrote: > > A new version - this updates the port to the 2012-03-22 weekly release > > (effectively Go v1 RC2) and fixes the issue with the regress path for > > the "go" binary. > > > > ok? > > > > On Friday 23 March 2012, Joel Sing wrote: > > > Attached is an updated version of the port for Go: > > > > > > - Version numbering is now 1.0preMMDD as suggested by sthen. > > > > > > - Fixed PLIST issue so that the port now works correctly on both amd64 > > > and i386. > > > > > > - Fixed issue with USE_SYSTRACE - for the time being a Go binary needs to > > > be able to use the sysarch() syscall in order to setup TLS. > > > > > > ok? > > > > > > On Thursday 22 March 2012, Joel Sing wrote: > > > > The attached is an initial port for the Go programming language > > > > (www.golang.org). A little background - Go is approaching a "Go > > > > version1" release and at that point it will have a stable API. > > > > Unfortunately, for several reasons Go version 1 will not be officially > > > > supported on OpenBSD, however there are only a few issues that prevent > > > > this - the diffs included in the port address known outstanding issues > > > > for the OpenBSD runtime, which will let us provide a working port. > > > > > > > > Open questions: > > > > > > > > 1. Version numbering - in some ways once Go version 1 is release the > > > > versioning will be somewhat like Python and in the future you may want > > > > to install Go version 1 and Go version 2 on the same machine (different > > > > APIs for example). However, during the development phase there are > > > > weekly tagged releases that are simply -MM-DD versioned. For this > > > > reason I'm thinking that the version numbering should be 0.MMDD for > > > > now and 1.0 for the version 1 release. Continued development could then > > > > follow on the 0.MMDD releases. Or should we have two packages - a > > > > "go-weekly" package and a "go" package? > > > > > > > > 2. The installation locations is going to get somewhat messy - due to > > > > some of the internals of Go's design everything except a few user > > > > binaries (so documentaiton, libraries, source code, etc) needs to be > > > > under a single directory. For now I've used the "recommended" default > > > > of /usr/local/go, however this is not really acceptable for OpenBSD. > > > > Suggestions as to what would be the closest suitable location? I plan > > > > on talking with upstream re being able to split this so that we at > > > > least have tool/libexec type binaries and libraries separated out from > > > > the docs/source. > > > > > > > > 3. License - Go is released under a BSD-style license, however some > > > > parts (like the documentation) are under other licenses (Creative > > > > Commons Attribution 3.0 License). How do we handle this? > -- > > "Reason is not automatic. Those who deny it cannot be conquered by it. > Do not count on them. Leave them alone." -- Ayn Rand
Re: new: lang/go - take 2
On Friday 30 March 2012, Sergey Bronnikov wrote: > I got following error on any Go example from http://golang.org > > ~/tmp/go$ go build pi.go > # runtime > /usr/local/go/src/pkg/runtime/extern.go:121: undefined: defaultGoroot > /usr/local/go/src/pkg/runtime/extern.go:130: undefined: theVersion > /usr/local/go/src/pkg/runtime/extern.go:135: undefined: theGoos > /usr/local/go/src/pkg/runtime/extern.go:135: cannot use theGoos as type > string in const initializer /usr/local/go/src/pkg/runtime/extern.go:139: > undefined: theGoarch > /usr/local/go/src/pkg/runtime/extern.go:139: cannot use theGoarch as type > string in const initializer ~/tmp/go$ Ugh, looks like I messed up the PLIST. Try the attached version instead :) > On 01:05 Fri 30 Mar , Joel Sing wrote: > > Go 1 was released yesterday - the attached is an updated port. > > > > Any further comments? Any oks? > > > > On Monday 26 March 2012, Joel Sing wrote: > > > A new version - this updates the port to the 2012-03-22 weekly release > > > (effectively Go v1 RC2) and fixes the issue with the regress path for > > > the "go" binary. > > > > > > ok? > > > > > > On Friday 23 March 2012, Joel Sing wrote: > > > > Attached is an updated version of the port for Go: > > > > > > > > - Version numbering is now 1.0preMMDD as suggested by sthen. > > > > > > > > - Fixed PLIST issue so that the port now works correctly on both > > > > amd64 and i386. > > > > > > > > - Fixed issue with USE_SYSTRACE - for the time being a Go binary > > > > needs to be able to use the sysarch() syscall in order to setup TLS. > > > > > > > > ok? > > > > > > > > On Thursday 22 March 2012, Joel Sing wrote: > > > > > The attached is an initial port for the Go programming language > > > > > (www.golang.org). A little background - Go is approaching a "Go > > > > > version1" release and at that point it will have a stable API. > > > > > Unfortunately, for several reasons Go version 1 will not be > > > > > officially supported on OpenBSD, however there are only a few > > > > > issues that prevent this - the diffs included in the port address > > > > > known outstanding issues for the OpenBSD runtime, which will let us > > > > > provide a working port. > > > > > > > > > > Open questions: > > > > > > > > > > 1. Version numbering - in some ways once Go version 1 is release > > > > > the versioning will be somewhat like Python and in the future you > > > > > may want to install Go version 1 and Go version 2 on the same > > > > > machine (different APIs for example). However, during the > > > > > development phase there are weekly tagged releases that are simply > > > > > -MM-DD versioned. For this reason I'm thinking that the version > > > > > numbering should be 0.MMDD for now and 1.0 for the version 1 > > > > > release. Continued development could then follow on the 0.MMDD > > > > > releases. Or should we have two packages - a "go-weekly" package > > > > > and a "go" package? > > > > > > > > > > 2. The installation locations is going to get somewhat messy - due > > > > > to some of the internals of Go's design everything except a few > > > > > user binaries (so documentaiton, libraries, source code, etc) needs > > > > > to be under a single directory. For now I've used the "recommended" > > > > > default of /usr/local/go, however this is not really acceptable for > > > > > OpenBSD. Suggestions as to what would be the closest suitable > > > > > location? I plan on talking with upstream re being able to split > > > > > this so that we at least have tool/libexec type binaries and > > > > > libraries separated out from the docs/source. > > > > > > > > > > 3. License - Go is released under a BSD-style license, however some > > > > > parts (like the documentation) are under other licenses (Creative > > > > > Commons Attribution 3.0 License). How do we handle this? > > > > -- > > > > "Reason is not automatic. Those who deny it cannot be conquered by > > it. Do not count on them. Leave them alone." -- Ayn Rand -- "Reason is not automatic. Those who deny it cannot be conquered by it. Do not count on them. Leave them alone." -- Ayn Rand go-port.tar.gz Description: application/tgz
Re: new: lang/go - take 2
On 2012/03/30 01:05, Joel Sing wrote:
> Go 1 was released yesterday - the attached is an updated port.
>
> Any further comments? Any oks?
The diff below rolls the files which are common between i386/amd64
(just with a different directory name) into PLIST using a substituted
variable for the dir name, this should make it a bit simpler to fix
up the plists after running "make update-plist" when updating the
port.
--- Makefile
+++ Makefile
@@ -28,6 +28,7 @@ BUILD_DEPENDS = shells/bash
SEPARATE_BUILD = simple
CONFIGURE_STYLE = None
+SUBST_VARS = GOCFG
WRKDIST = ${WRKDIR}/go
WRKSRC = ${WRKDIST}/src
@@ -45,6 +46,7 @@ GOARCH = 386
PKG_ARGS +=-Damd64=0
PKG_ARGS +=-Di386=1
.endif
+GOCFG =/${GOOS}_${GOARCH}
do-configure:
. if ${GOARCH} == "unknown"
--- pkg/PFRAG.amd64
+++ pkg/PFRAG.amd64
@@ -1,182 +1,16 @@
@comment $OpenBSD$
-go/pkg/obj/openbsd_amd64/
-go/pkg/obj/openbsd_amd64/lib9.a
-go/pkg/obj/openbsd_amd64/libbio.a
-go/pkg/obj/openbsd_amd64/libcc.a
-go/pkg/obj/openbsd_amd64/libgc.a
-go/pkg/obj/openbsd_amd64/libmach.a
-go/pkg/openbsd_amd64/
-go/pkg/openbsd_amd64/archive/
-go/pkg/openbsd_amd64/archive/tar.a
-go/pkg/openbsd_amd64/archive/zip.a
-go/pkg/openbsd_amd64/bufio.a
-go/pkg/openbsd_amd64/bytes.a
-go/pkg/openbsd_amd64/cgocall.h
-go/pkg/openbsd_amd64/compress/
-go/pkg/openbsd_amd64/compress/bzip2.a
-go/pkg/openbsd_amd64/compress/flate.a
-go/pkg/openbsd_amd64/compress/gzip.a
-go/pkg/openbsd_amd64/compress/lzw.a
-go/pkg/openbsd_amd64/compress/zlib.a
-go/pkg/openbsd_amd64/container/
-go/pkg/openbsd_amd64/container/heap.a
-go/pkg/openbsd_amd64/container/list.a
-go/pkg/openbsd_amd64/container/ring.a
-go/pkg/openbsd_amd64/crypto/
-go/pkg/openbsd_amd64/crypto.a
-go/pkg/openbsd_amd64/crypto/aes.a
-go/pkg/openbsd_amd64/crypto/cipher.a
-go/pkg/openbsd_amd64/crypto/des.a
-go/pkg/openbsd_amd64/crypto/dsa.a
-go/pkg/openbsd_amd64/crypto/ecdsa.a
-go/pkg/openbsd_amd64/crypto/elliptic.a
-go/pkg/openbsd_amd64/crypto/hmac.a
-go/pkg/openbsd_amd64/crypto/md5.a
-go/pkg/openbsd_amd64/crypto/rand.a
-go/pkg/openbsd_amd64/crypto/rc4.a
-go/pkg/openbsd_amd64/crypto/rsa.a
-go/pkg/openbsd_amd64/crypto/sha1.a
-go/pkg/openbsd_amd64/crypto/sha256.a
-go/pkg/openbsd_amd64/crypto/sha512.a
-go/pkg/openbsd_amd64/crypto/subtle.a
-go/pkg/openbsd_amd64/crypto/tls.a
-go/pkg/openbsd_amd64/crypto/x509/
-go/pkg/openbsd_amd64/crypto/x509.a
-go/pkg/openbsd_amd64/crypto/x509/pkix.a
-go/pkg/openbsd_amd64/database/
-go/pkg/openbsd_amd64/database/sql/
-go/pkg/openbsd_amd64/database/sql.a
-go/pkg/openbsd_amd64/database/sql/driver.a
-go/pkg/openbsd_amd64/debug/
-go/pkg/openbsd_amd64/debug/dwarf.a
-go/pkg/openbsd_amd64/debug/elf.a
-go/pkg/openbsd_amd64/debug/gosym.a
-go/pkg/openbsd_amd64/debug/macho.a
-go/pkg/openbsd_amd64/debug/pe.a
-go/pkg/openbsd_amd64/encoding/
-go/pkg/openbsd_amd64/encoding/ascii85.a
-go/pkg/openbsd_amd64/encoding/asn1.a
-go/pkg/openbsd_amd64/encoding/base32.a
-go/pkg/openbsd_amd64/encoding/base64.a
-go/pkg/openbsd_amd64/encoding/binary.a
-go/pkg/openbsd_amd64/encoding/csv.a
-go/pkg/openbsd_amd64/encoding/gob.a
-go/pkg/openbsd_amd64/encoding/hex.a
-go/pkg/openbsd_amd64/encoding/json.a
-go/pkg/openbsd_amd64/encoding/pem.a
-go/pkg/openbsd_amd64/encoding/xml.a
-go/pkg/openbsd_amd64/errors.a
-go/pkg/openbsd_amd64/expvar.a
-go/pkg/openbsd_amd64/flag.a
-go/pkg/openbsd_amd64/fmt.a
-go/pkg/openbsd_amd64/go/
-go/pkg/openbsd_amd64/go/ast.a
-go/pkg/openbsd_amd64/go/build.a
-go/pkg/openbsd_amd64/go/doc.a
-go/pkg/openbsd_amd64/go/parser.a
-go/pkg/openbsd_amd64/go/printer.a
-go/pkg/openbsd_amd64/go/scanner.a
-go/pkg/openbsd_amd64/go/token.a
-go/pkg/openbsd_amd64/hash/
-go/pkg/openbsd_amd64/hash.a
-go/pkg/openbsd_amd64/hash/adler32.a
-go/pkg/openbsd_amd64/hash/crc32.a
-go/pkg/openbsd_amd64/hash/crc64.a
-go/pkg/openbsd_amd64/hash/fnv.a
-go/pkg/openbsd_amd64/html/
-go/pkg/openbsd_amd64/html.a
-go/pkg/openbsd_amd64/html/template.a
-go/pkg/openbsd_amd64/image/
-go/pkg/openbsd_amd64/image.a
-go/pkg/openbsd_amd64/image/color.a
-go/pkg/openbsd_amd64/image/draw.a
-go/pkg/openbsd_amd64/image/gif.a
-go/pkg/openbsd_amd64/image/jpeg.a
-go/pkg/openbsd_amd64/image/png.a
-go/pkg/openbsd_amd64/index/
-go/pkg/openbsd_amd64/index/suffixarray.a
-go/pkg/openbsd_amd64/io/
-go/pkg/openbsd_amd64/io.a
-go/pkg/openbsd_amd64/io/ioutil.a
-go/pkg/openbsd_amd64/log/
-go/pkg/openbsd_amd64/log.a
-go/pkg/openbsd_amd64/log/syslog.a
-go/pkg/openbsd_amd64/math/
-go/pkg/openbsd_amd64/math.a
-go/pkg/openbsd_amd64/math/big.a
-go/pkg/openbsd_amd64/math/cmplx.a
-go/pkg/openbsd_amd64/math/rand.a
-go/pkg/openbsd_amd64/mime/
-go/pkg/openbsd_amd64/mime.a
-go/pkg/openbsd_amd64/mime/multipart.a
-go/pkg/openbsd_amd64/net/
-go/pkg/openbsd_amd64/net.a
-go/pkg/openbsd_amd64/net/http/
-go/pkg/openbsd_amd64/net/http.a
-go/pkg/openbsd_amd64/net/http/cgi.a
-go/pkg/openbsd_amd64/net/http/fcgi.a
-go/pkg/openbsd_amd64/net/http/httptest.a
-go/pkg/openbsd_amd64/net/http/
UPDATE: graphics/openjpeg
This updates OpenJPEG to 1.5.0, needed for forthcoming MuPDF update.
Tested all dependent ports on amd64.
I considered removing the -1.5 from the include dir, but came to
the conclusion this would be pointless.
OK?
todd, are you still interested in maintaining this?
Index: Makefile
===
RCS file: /cvs/ports/graphics/openjpeg/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile14 Jul 2009 15:35:24 - 1.5
+++ Makefile29 Mar 2012 15:33:57 -
@@ -2,10 +2,9 @@
COMMENT= open-source JPEG 2000 codec library
-DISTNAME= openjpeg_v1_3
-PKGNAME= openjpeg-1.3
+DISTNAME= openjpeg-1.5.0
-SHARED_LIBS= openjpeg4.0
+SHARED_LIBS += openjpeg 5.0 # 6.0
CATEGORIES=graphics
@@ -19,15 +18,20 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${HOMEPAGE}
+WANTLIB += c m z
-MAKE_ENV= LIBopenjpeg_VERSION=${LIBopenjpeg_VERSION}
-MAKE_FLAGS=CC="${CC}" COMPILERFLAGS="${CFLAGS}"
-WRKDIST= ${WRKDIR}/${DISTNAME:S/openjpeg/OpenJPEG/}
+MASTER_SITES= http://openjpeg.googlecode.com/files/
-NO_REGRESS=Yes
+CONFIGURE_STYLE= gnu
+SEPARATE_BUILD=Yes
+USE_LIBTOOL= Yes
-pre-patch:
- cd ${WRKSRC}/libopenjpeg; perl -i -pe 's/\r$$//' `find . -type f`
+# static linked
+BUILD_DEPENDS= graphics/lcms2 \
+ graphics/png \
+ graphics/tiff
+
+post-install:
+ cd ${PREFIX}/share/doc/ && mv openjpeg-* openjpeg
.include
Index: distinfo
===
RCS file: /cvs/ports/graphics/openjpeg/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo14 Jul 2009 15:35:24 - 1.5
+++ distinfo29 Mar 2012 15:33:57 -
@@ -1,5 +1,5 @@
-MD5 (openjpeg_v1_3.tar.gz) = +aPM+pGsNLWJ6b91d86P+Q==
-RMD160 (openjpeg_v1_3.tar.gz) = KiLMEjBYsZdM0b84mARKyrzromw=
-SHA1 (openjpeg_v1_3.tar.gz) = jWhw2VAOoJ4LHTC5gb6hyN5TTeQ=
-SHA256 (openjpeg_v1_3.tar.gz) = O8ouHgQPncu8seBifxenbuuV4VO/Zj0IIHDARKISAr0=
-SIZE (openjpeg_v1_3.tar.gz) = 1004678
+MD5 (openjpeg-1.5.0.tar.gz) = 5dZhk936Wah9oesI6oYpOw==
+RMD160 (openjpeg-1.5.0.tar.gz) = /6hduwo7oVRbxpdPSVD0ZnicBO8=
+SHA1 (openjpeg-1.5.0.tar.gz) = 3OcFrkXxN+RpiozznR+/IrxDT6g=
+SHA256 (openjpeg-1.5.0.tar.gz) = yZCPq0RDKi7SVQxFfLfnNtptfDJvEgPSPRCC2ZI2Ss4=
+SIZE (openjpeg-1.5.0.tar.gz) = 2117572
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 14 Jul 2009 15:35:24 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,66 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.4 2009/07/14 15:35:24 sthen Exp $
Makefile.orig Fri Dec 21 10:39:41 2007
-+++ Makefile Tue Jul 14 13:51:57 2009
-@@ -11,7 +11,7 @@ INCLUDE = -Ilibopenjpeg
- CC = gcc
- AR = ar
-
--PREFIX = /usr
-+PREFIX ?= /usr
- INSTALL_LIBDIR = $(PREFIX)/lib
- INSTALL_INCLUDE = $(PREFIX)/include
-
-@@ -19,14 +19,15 @@ INSTALL_INCLUDE = $(PREFIX)/include
- DOS2UNIX = dos2unix
-
- COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
--LIBRARIES = -lstdc++
-+LIBRARIES =
-
- MODULES = $(SRCS:.c=.o)
-+SOMODULES = $(SRCS:.c=.so)
- CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
-
- TARGET = openjpeg
- STATICLIB = lib$(TARGET).a
--SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
-+SHAREDLIB = lib$(TARGET).so.$(LIBopenjpeg_VERSION)
- LIBNAME = lib$(TARGET).so.$(VER_MAJOR)
-
-
-@@ -47,23 +48,26 @@ dos2unix:
-
- OpenJPEG: $(STATICLIB) $(SHAREDLIB)
-
-+.SUFFIXES: .c .o .so
-+
- .c.o:
- $(CC) $(CFLAGS) -c $< -o $@
-
-+.c.so:
-+ $(CC) $(CFLAGS) -fPIC -c $< -o $@
-+
- $(STATICLIB): $(MODULES)
- $(AR) r $@ $(MODULES)
-
--$(SHAREDLIB): $(MODULES)
-- $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+$(SHAREDLIB): $(SOMODULES)
-+ $(CC) -shared -fPIC -o $@ $(SOMODULES) $(LIBRARIES)
-
- install: OpenJPEG
-- install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
-- install -m 644 -o root -g root $(STATICLIB)
'$(DESTDIR)$(INSTALL_LIBDIR)'
-- ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'
-- install -m 755 -o root -g root $(SHAREDLIB)
'$(DESTDIR)$(INSTALL_LIBDIR)'
-- ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'
-- install -m 644 -o root -g root libopenjpeg/openjpeg.h
'$(DESTDIR)$(INSTALL_INCLUDE)'
-- -ldconfig
-+ ${BSD_INSTALL_DATA_DIR} '$(INSTALL_LIBDIR)' '$(INSTALL_INCLUDE)'
-+ ${BSD_INSTALL_DATA} $(STATICLIB) '$(INSTALL_LIBDIR)'
-+ ranlib '$(INSTALL_LIBDIR)/$(STATICLIB)'
-+ ${BSD_INSTALL_DATA} $(SHAREDLIB) '$(INSTALL_LIBDIR)'
-+ ${BSD_INSTALL_DATA} libopenjpeg/openjpeg.h '$(INSTALL_INCLUDE)'
-
-
freedt rc.d script
Hello,
stock rc.d script:
#!/bin/sh
#
# $OpenBSD: svscan.rc,v 1.1 2012/01/01 16:16:24 sthen Exp $
daemon="/usr/local/bin/svscan"
daemon_flags="/service/"
. /etc/rc.d/rc.subr
rc_bg=YES
rc_reload=NO
rc_cmd $1
downside: freedt is a super-server, this script does not stop the real
services, nor the supervisor (supervise), just svscan. And it forces the
``service'' directory to be under ``/''.
my version
#!/bin/sh
#
# $OpenBSD: freedt.rc,v 1.2 2012/03/29 14:50:24 whoever Exp $
daemon="/usr/local/bin/svscan"
daemon_flags=${daemon_flags:-"/service/"}
. /etc/rc.d/rc.subr
rc_start() {
type rc_pre >/dev/null && rc_pre
${rcexec} "/bin/csh -cf \"env PATH=${PATH}:/usr/local/bin/ \
/usr/local/bin/svscan ${freedt_flags} &\"" > /dev/null
}
rc_reload() {
/usr/local/bin/svc -h ${freedt_flags}/*
/usr/local/bin/svc -h ${freedt_flags}/*/log
}
rc_stop() {
pkill -f "^${pexp}"
sleep 1
/usr/local/bin/svc -d ${freedt_flags}/*
/usr/local/bin/svc -d ${freedt_flags}/*/log
sleep 1
/usr/local/bin/svc -t ${freedt_flags}/*
/usr/local/bin/svc -t ${freedt_flags}/*/log
sleep 1
/usr/local/bin/svc -X ${freedt_flags}/*
/usr/local/bin/svc -X ${freedt_flags}/*/log
sleep 1
pkill -f "^supervise .*"
type rc_post >/dev/null && rc_post || return 0
}
rc_cmd $1
downside: longer, uglier.
bye, Marcus
TESTING: textproc/mupdf rc
This requires the graphics/openjpeg update in my previous email.
It has various widespread internal changes, many bugfixes, and
a new memory manager.
If you use MuPDF, please test this. More info at http://mupdf.com/news
Index: Makefile
===
RCS file: /cvs/ports/textproc/mupdf/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile5 Sep 2011 13:24:39 - 1.28
+++ Makefile29 Mar 2012 15:43:06 -
@@ -2,7 +2,7 @@
COMMENT = graphic library, pdf parser, viewer and utilities
-V =0.9
+V =1.0rc1
DISTNAME = mupdf-$V-source
PKGNAME = mupdf-$V
WRKDIST = ${WRKDIR}/mupdf-$V
@@ -28,7 +28,7 @@ MASTER_SITES =${HOMEPAGE}download/ \
RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS = graphics/jbig2dec \
graphics/jpeg \
- graphics/openjpeg
+ graphics/openjpeg>=1.5.0
USE_GMAKE =Yes
USE_GROFF =Yes
@@ -37,7 +37,9 @@ VMEM_WARNING =Yes
NO_REGRESS = Yes
-MAKE_ENV += CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=${CC} CXX=${CXX} \
+# -I flags prepend mupdf's own, to allow building with previous ver installed
+MAKE_ENV +=CFLAGS="${CFLAGS} -I$(WRKSRC)/fitz -I$(WRKSRC)/pdf
-I$(WRKSRC)/xps" \
+ LDFLAGS="${LDFLAGS}" CC=${CC} CXX=${CXX} \
MANDIR="${WRKINST}${PREFIX}/man/man1" build= verbose=1
FAKE_FLAGS = prefix=${WRKINST}${PREFIX} mandir=${WRKINST}${PREFIX}/man
@@ -46,8 +48,6 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/debian/mupdf.pc
post-install:
- # don't conflict with xpdf's pdfinfo
- mv ${PREFIX}/bin/pdfinfo ${PREFIX}/bin/pdfinfo_mupdf
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ \
${PREFIX}/share/application-registry/ ${PREFIX}/share/pixmaps \
${PREFIX}/lib/pkgconfig/
Index: distinfo
===
RCS file: /cvs/ports/textproc/mupdf/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo5 Sep 2011 13:24:39 - 1.13
+++ distinfo29 Mar 2012 15:43:06 -
@@ -1,5 +1,5 @@
-MD5 (mupdf-0.9-source.tar.gz) = dmQO4Wp5eif+ScwOqofOOg==
-RMD160 (mupdf-0.9-source.tar.gz) = m6HfIF+flcf/Swo74iR4atWmXZk=
-SHA1 (mupdf-0.9-source.tar.gz) = OjukLRnjIRGZEQ58eCJjJBzeqKA=
-SHA256 (mupdf-0.9-source.tar.gz) = q+2CXLHXPg4o8KfucrXXpFG6QdIbDFWDftKiEvOxay0=
-SIZE (mupdf-0.9-source.tar.gz) = 3917075
+MD5 (mupdf-1.0rc1-source.tar.gz) = wZW95RjKgJxZrOiwFfO/pQ==
+RMD160 (mupdf-1.0rc1-source.tar.gz) = WN3CTci5cq0oJXLBbWZM0ptjseE=
+SHA1 (mupdf-1.0rc1-source.tar.gz) = aFDBVTJMDkMe3UkafwS/wrOWLH4=
+SHA256 (mupdf-1.0rc1-source.tar.gz) =
Fnb230BO3D+5ZdSK2IXifdBfvsprpi2scRi6umLArzk=
+SIZE (mupdf-1.0rc1-source.tar.gz) = 4262574
Index: patches/patch-Makerules
===
RCS file: /cvs/ports/textproc/mupdf/patches/patch-Makerules,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makerules
--- patches/patch-Makerules 13 Jul 2011 21:48:48 - 1.4
+++ patches/patch-Makerules 29 Mar 2012 15:43:06 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makerules,v 1.4 2011/07/13 21:48:48 sthen Exp $
Makerules.orig Fri Apr 29 20:06:09 2011
-+++ Makerules Wed Jul 13 21:37:52 2011
+--- Makerules.orig Thu Mar 29 11:46:53 2012
Makerules Thu Mar 29 14:18:57 2012
@@ -5,6 +5,7 @@ OS := $(OS:MINGW%=MINGW)
CFLAGS += -Wall
@@ -9,7 +9,7 @@ $OpenBSD: patch-Makerules,v 1.4 2011/07/
ifeq "$(build)" "debug"
CFLAGS += -pipe -g
else ifeq "$(build)" "profile"
-@@ -17,6 +18,7 @@ CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -mar
+@@ -19,6 +20,7 @@ CFLAGS += -pipe -g -DMEMENTO
else
$(error unknown build setting: '$(build)')
endif
@@ -17,7 +17,7 @@ $OpenBSD: patch-Makerules,v 1.4 2011/07/
ifeq "$(OS)" "Linux"
SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
-@@ -27,6 +29,13 @@ ifeq "$(OS)" "FreeBSD"
+@@ -29,6 +31,13 @@ ifeq "$(OS)" "FreeBSD"
SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
LDFLAGS += -L/usr/local/lib
X11_LIBS := -lX11 -lXext
Index: patches/patch-debian_mupdf_pc
===
RCS file: /cvs/ports/textproc/mupdf/patches/patch-debian_mupdf_pc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-debian_mupdf_pc
--- patches/patch-debian_mupdf_pc 3 Jun 2010 19:38:34 - 1.1
+++ patches/patch-debian_mupdf_pc 29 Mar 2012 15:43:06 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-debian_mupdf_pc,v 1.1 2010/06/03 19:38:34 sthen Exp $
debian/mupdf.pc.orig Thu Jun 3 06:56:21 2010
-+++ debian/mupdf.pcThu Jun 3 06:56:30 2010
+--- debian/mupdf.pc.orig Thu Mar 29 11:46:53 2012
debian/mupdf.pcThu Mar 29 14:19:12 2012
@@ -1,4 +1,4 @@
-prefix=/usr
+prefix=${PREFIX}
Index: pkg/PLIST
===
RCS file: /cvs/ports/textp
Re: new: lang/go - take 2
On Friday 30 March 2012, Stuart Henderson wrote: > On 2012/03/30 01:05, Joel Sing wrote: > > Go 1 was released yesterday - the attached is an updated port. > > > > Any further comments? Any oks? > > The diff below rolls the files which are common between i386/amd64 > (just with a different directory name) into PLIST using a substituted > variable for the dir name, this should make it a bit simpler to fix > up the plists after running "make update-plist" when updating the > port. Ah, that's neat and shrinks the PFRAG files considerably. Thanks! Updated port attached which combines this with the corrected PLIST. -- "Reason is not automatic. Those who deny it cannot be conquered by it. Do not count on them. Leave them alone." -- Ayn Rand go-port.tar.gz Description: application/tgz
Re: freedt rc.d script
On 2012/03/29 17:36, MERIGHI Marcus wrote:
> Hello,
>
> stock rc.d script:
>
> #!/bin/sh
> #
> # $OpenBSD: svscan.rc,v 1.1 2012/01/01 16:16:24 sthen Exp $
>
> daemon="/usr/local/bin/svscan"
> daemon_flags="/service/"
>
> . /etc/rc.d/rc.subr
>
> rc_bg=YES
> rc_reload=NO
>
> rc_cmd $1
>
> downside: freedt is a super-server, this script does not stop the real
> services, nor the supervisor (supervise), just svscan.
It might make some sense to do something like this.
> And it forces the ``service'' directory to be under ``/''.
Not correct, you missed the ENVIRONMENT section in rc.d(8).
> rc_start() {
> type rc_pre >/dev/null && rc_pre
> ${rcexec} "/bin/csh -cf \"env PATH=${PATH}:/usr/local/bin/ \
> /usr/local/bin/svscan ${freedt_flags} &\"" > /dev/null
Why?
> rc_reload() {
> /usr/local/bin/svc -h ${freedt_flags}/*
> /usr/local/bin/svc -h ${freedt_flags}/*/log
> }
We can't assume that the daemons run under supervise will reload
config on a HUP signal, some might just exit/restart. So this should
not be included and rc_reload=NO should stay.
> rc_stop() {
> pkill -f "^${pexp}"
> sleep 1
> /usr/local/bin/svc -d ${freedt_flags}/*
> /usr/local/bin/svc -d ${freedt_flags}/*/log
> sleep 1
> /usr/local/bin/svc -t ${freedt_flags}/*
> /usr/local/bin/svc -t ${freedt_flags}/*/log
> sleep 1
> /usr/local/bin/svc -X ${freedt_flags}/*
> /usr/local/bin/svc -X ${freedt_flags}/*/log
> sleep 1
> pkill -f "^supervise .*"
svc -X should be enough, surely?
> type rc_post >/dev/null && rc_post || return 0
> }
>
> rc_cmd $1
>
> downside: longer, uglier.
>
> bye, Marcus
>
Re: new: lang/go - take 2
On 03:10 Fri 30 Mar , Joel Sing wrote: > > Updated port attached which combines this with the corrected PLIST. same errors for me: ~/tmp/go$ go build pi.go # runtime /usr/local/go/src/pkg/runtime/extern.go:121: undefined: defaultGoroot /usr/local/go/src/pkg/runtime/extern.go:130: undefined: theVersion /usr/local/go/src/pkg/runtime/extern.go:135: undefined: theGoos /usr/local/go/src/pkg/runtime/extern.go:135: cannot use theGoos as type string in const initializer /usr/local/go/src/pkg/runtime/extern.go:139: undefined: theGoarch /usr/local/go/src/pkg/runtime/extern.go:139: cannot use theGoarch as type string in const initializer ~/tmp/go$
Re: new: lang/go - take 2
On 2012/03/29 20:55, Sergey Bronnikov wrote:
> On 03:10 Fri 30 Mar , Joel Sing wrote:
> >
> > Updated port attached which combines this with the corrected PLIST.
>
> same errors for me:
>
> ~/tmp/go$ go build pi.go
> # runtime
> /usr/local/go/src/pkg/runtime/extern.go:121: undefined: defaultGoroot
> /usr/local/go/src/pkg/runtime/extern.go:130: undefined: theVersion
> /usr/local/go/src/pkg/runtime/extern.go:135: undefined: theGoos
> /usr/local/go/src/pkg/runtime/extern.go:135: cannot use theGoos as type
> string in const initializer
> /usr/local/go/src/pkg/runtime/extern.go:139: undefined: theGoarch
> /usr/local/go/src/pkg/runtime/extern.go:139: cannot use theGoarch as type
> string in const initializer
> ~/tmp/go$
>
Check that you actually built new packages and didn't trip into
PLIST_DB checks and that you actually updated the installed
packages; this works fine for me.
$ cat pi.go
// Concurrent computation of pi.
// See http://goo.gl/ZuTZM.
//
// This demonstrates Go's ability to handle
// large numbers of concurrent processes.
// It is an unreasonable way to calculate pi.
package main
import (
"fmt"
"math"
)
func main() {
fmt.Println(pi(5000))
}
// pi launches n goroutines to compute an
// approximation of pi.
func pi(n int) float64 {
ch := make(chan float64)
for k := 0; k <= n; k++ {
go term(ch, float64(k))
}
f := 0.0
for k := 0; k <= n; k++ {
f += <-ch
}
return f
}
func term(ch chan float64, k float64) {
ch <- 4 * math.Pow(-1, k) / (2*k + 1)
}
$ go build pi.go
$ ./pi
3.1417926135957908
Re: freedt rc.d script
Hello Stuart,
s...@spacehopper.org (Stuart Henderson), 2012.03.29 (Thu) 18:26 (CEST):
> On 2012/03/29 17:36, MERIGHI Marcus wrote:
> > stock rc.d script:
> >
> > #!/bin/sh
> > #
> > # $OpenBSD: svscan.rc,v 1.1 2012/01/01 16:16:24 sthen Exp $
> >
> > daemon="/usr/local/bin/svscan"
> > daemon_flags="/service/"
> >
> > . /etc/rc.d/rc.subr
> >
> > rc_bg=YES
> > rc_reload=NO
> >
> > rc_cmd $1
> >
> > downside: freedt is a super-server, this script does not stop the real
> > services, nor the supervisor (supervise), just svscan.
>
> It might make some sense to do something like this.
> > And it forces the ``service'' directory to be under ``/''.
> Not correct, you missed the ENVIRONMENT section in rc.d(8).
Sure you are right once more, starting to hate that ;-)
> > rc_start() {
> > type rc_pre >/dev/null && rc_pre
> > ${rcexec} "/bin/csh -cf \"env PATH=${PATH}:/usr/local/bin/ \
> > /usr/local/bin/svscan ${freedt_flags} &\"" > /dev/null
> Why?
Actually I do not remember; the ``type rc_pre'' thing is surely just
stolen from rc.subr; the csh stuff most likely comes from using the
original djb daemontools some time ago. And I'm not sure ``rc_bg=YES''
already existed when I wrote my script.
> > rc_reload() {
> > /usr/local/bin/svc -h ${freedt_flags}/*
> > /usr/local/bin/svc -h ${freedt_flags}/*/log
> > }
>
> We can't assume that the daemons run under supervise will reload
> config on a HUP signal, some might just exit/restart. So this should
> not be included and rc_reload=NO should stay.
+1 (should I think more before I hit send?)
> > rc_stop() {
> > pkill -f "^${pexp}"
> > sleep 1
> > /usr/local/bin/svc -d ${freedt_flags}/*
> > /usr/local/bin/svc -d ${freedt_flags}/*/log
> > sleep 1
> > /usr/local/bin/svc -t ${freedt_flags}/*
> > /usr/local/bin/svc -t ${freedt_flags}/*/log
> > sleep 1
> > /usr/local/bin/svc -X ${freedt_flags}/*
> > /usr/local/bin/svc -X ${freedt_flags}/*/log
> > sleep 1
> > pkill -f "^supervise .*"
>
> svc -X should be enough, surely?
Couldn't tell; depends on what ``Bring service down, then end
supervise'' means. If it means "svc -d" then I would keep -t (and even
-k), to make sure they're gone.
So, the remains are:
rc_stop() {
pkill -f "^${pexp}"
sleep 1
/usr/local/bin/svc -X ${freedt_flags}/*
/usr/local/bin/svc -X ${freedt_flags}/*/log
}
That is indeed more elegant to add and should suffice, according to the
scarce docs.
What about the name, though? Is ``svscan'' still appropriate?
bye, Marcus
Update: CIL
Hello,
I've been using CIL 1.4.0 for a while and thought I'd also
update the port.
* Needs findlib now
* Perl module magic is partially handled in Makefile.in patch
* ARCHOS is used the same way in configure
Tested on i386 and macppc.
Thanx!
Lazaros.
Index: Makefile
===
RCS file: /cvs/ports/devel/cil/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile7 Dec 2010 14:57:19 - 1.20
+++ Makefile29 Mar 2012 17:11:06 -
@@ -5,11 +5,11 @@ ONLY_FOR_ARCHS= i386 amd64 powerpc
COMMENT= framework for analysis and transformation of C
-DISTNAME= cil-1.3.6
-REVISION= 3
+DISTNAME= cil-1.4.0
+REVISION= 0
CATEGORIES=devel lang
-HOMEPAGE= http://www.eecs.berkeley.edu/~necula/cil/
-MASTER_SITES= ${HOMEPAGE}/distrib/
+HOMEPAGE= http://cil.sourceforge.net/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cil/}
# BSD license
PERMIT_PACKAGE_CDROM= Yes
@@ -19,12 +19,13 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c curses m pthread
MODULES= lang/ocaml
-WRKDIST= ${WRKDIR}/cil
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= sysutils/findlib
OURFILES= nullint kerneltrace randomvars
CONFIGURE_STYLE= autoconf no-autoheader
-AUTOCONF_VERSION= 2.61
+AUTOCONF_VERSION= 2.68
USE_GMAKE= yes
ALL_TARGET= setup
CONFIGURE_ARGS= EXTRAFEATURES="${OURFILES}"
@@ -33,32 +34,23 @@ P5INST= ${PREFIX}/${P5SITE}
SUBST_VARS+= P5SITE
GCC=/usr/bin/gcc # cant use CC in case it's set to cilly
+FAKE_ENV= OCAMLFIND_DESTDIR=${PREFIX}/lib/ocaml/site-lib/cil
+
post-extract:
.for i in ${OURFILES}
@cp ${FILESDIR}/$i.ml ${WRKSRC}/src/ext
.endfor
pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/libexec/cil
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/site-lib/cil
${INSTALL_DATA_DIR} ${P5INST}/CIL
post-install:
sed -e 's,@CILHOME@,${LOCALBASE},g' \
--e 's,@CILLIBDIR@,${LOCALBASE}/${P5SITE}/CIL,g' \
--e 's,@ARCHOS@,libexec/cil,g' \
- -e 's,@DEFAULT_CIL_MODE@,GNUCC,g' \
--e 's,@CC@,${GCC},g' < \
+ -e 's,@CILLIBDIR@,${LOCALBASE}/${P5SITE}/CIL,g' \
+ -e 's,@ARCHOS@,libexec/cil,g' \
+ -e 's,@DEFAULT_CIL_MODE@,GNUCC,g' \
+ -e 's,@CC@,${GCC},g' < \
${WRKSRC}/bin/CilConfig.pm.in > ${P5INST}/CilConfig.pm
-
- ${INSTALL_SCRIPT} ${WRKBUILD}/bin/cilly ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKBUILD}/bin/patcher ${PREFIX}/bin
-
-.for i in Cilly KeptFile OutputFile TempFile
- ${INSTALL_DATA} ${WRKSRC}/lib/${i}.pm ${P5INST}/CIL
-.endfor
-
-.for i in machdep.exe cilly.byte.exe cilly.asm.exe
- ${INSTALL_PROGRAM} ${WRKBUILD}/obj/x86_LINUX/${i} ${PREFIX}/libexec/cil
-.endfor
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/cil/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo11 Mar 2009 21:20:27 - 1.7
+++ distinfo29 Mar 2012 17:11:06 -
@@ -1,5 +1,5 @@
-MD5 (cil-1.3.6.tar.gz) = ES37q90OEoCADWK6REmrRQ==
-RMD160 (cil-1.3.6.tar.gz) = 5Q9Kt6rGI6rbWcHlHhKAIm4uteA=
-SHA1 (cil-1.3.6.tar.gz) = tXsI+tJrVKheY8D7be14WDdpOeI=
-SHA256 (cil-1.3.6.tar.gz) = Ocx0Y5hVG0g7PStNkNW9Wq0yb5RrdPzdZ9VDT3x/hU8=
-SIZE (cil-1.3.6.tar.gz) = 1368573
+MD5 (cil-1.4.0.tar.gz) = phsyn2bnZGFjraVgRlRa9Q==
+RMD160 (cil-1.4.0.tar.gz) = LghUdKC4ScHGrQuw0vBcg/bu7sE=
+SHA1 (cil-1.4.0.tar.gz) = c8S/OKDf5oim1LV+HPvLZmGIYZw=
+SHA256 (cil-1.4.0.tar.gz) = yFJPBcoECaO8GkmP1P0JHUI/nBw3j6mew52VJZp71Jo=
+SIZE (cil-1.4.0.tar.gz) = 1790014
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/cil/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 7 Dec 2010 14:57:19 - 1.2
+++ patches/patch-Makefile_in 29 Mar 2012 17:11:06 -
@@ -1,24 +1,39 @@
$OpenBSD: patch-Makefile_in,v 1.2 2010/12/07 14:57:19 dcoppa Exp $
Makefile.in.orig Mon Feb 5 22:10:29 2007
-+++ Makefile.inWed Nov 10 17:15:22 2010
-@@ -115,7 +115,7 @@ $(OBJDIR)/cilly$(EXE) : $(CILLY_MODULES:%=$(OBJDIR)/%.
- @$(NARRATIVE) "Linking $(COMPILETOWHAT) $@ $(LINKMSG)"
- $(AT)$(CAMLLINK) -verbose -o $@ \
- $(CILLY_LIBS:%=%.$(CMXA)) \
--$(CILLY_LIBS:%=-cclib -l%) \
-+$(unix camlstr -l%) \
- $^
+--- Makefile.in.orig Fri Nov 4 20:20:53 2011
Makefile.inThu Mar 29 18:42:05 2012
+@@ -215,10 +215,10 @@
+ lib/Cilly.pm: lib/Cilly.pm.in src/machdep-ml.c configure.in Makefile.in
+ cp lib/Cilly.pm.in lib/Cilly.pm
+ if $(MACHDEPCC) -m32 src/machdep-ml.c -o $(OBJDIR)/machdep-ml32.exe
;then \
+-sed -i -e "s|nogcc32model|`$(EMUL) $(OBJDIR)/machdep-ml32.exe
--env`|" lib/Cilly.pm; \
++perl -pi -e "s|nogcc32model|
Re: Update: CIL
New version doesn't need REVISION line El 03/29/12 14:55, Lazaros Koromilas escribió: > +REVISION=0 -- Sending from my Computer.
Update: net/transmission 2.50
This updates net/transmission to 2.50. New in this version:
* Overhauled web client.
* Various bug fixes.
The port now uses the external miniupnp client library from the
ports tree. We can't do the same for natpmp because the included
version has a different API.
I'm especially interested in feedback from people who use the GTK+
and Qt clients, because I don't.
Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile1 Jan 2012 09:04:13 - 1.73
+++ Makefile29 Mar 2012 19:33:56 -
@@ -4,7 +4,7 @@ COMMENT-main= BitTorrent command line an
COMMENT-gtk= BitTorrent client with GTK+ interface
COMMENT-qt=BitTorrent client with Qt interface
-VER= 2.42
+VER= 2.50
DISTNAME= transmission-${VER}
PKGNAME-main= transmission-${VER}
PKGNAME-gtk= transmission-gtk-${VER}
@@ -12,8 +12,6 @@ PKGNAME-qt= transmission-qt-${VER}
CATEGORIES=net
HOMEPAGE= http://www.transmissionbt.com/
-REVISION-gtk= 1
-
MAINTAINER=Christian Weisgerber
# GPLv2
@@ -36,7 +34,8 @@ FLAVOR?=
# MODULES adds to WANTLIB and LIB_DEPENDS
# WANTLIB-main and LIB_DEPENDS-main default to WANTLIB and LIB_DEPENDS
-WANTLIB= c crypto curl event_core event_extra idn m pthread ssl z
+WANTLIB= c crypto curl event_core event_extra idn m miniupnpc \
+ pthread ssl z
WANTLIB-gtk= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender Xxf86vm GL atk-1.0 cairo \
cairo-gobject drm expat ffi fontconfig freetype \
@@ -44,13 +43,15 @@ WANTLIB-gtk=${WANTLIB} X11 Xau Xcomposi
gobject-2.0 gthread-2.0 gtk-3 pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs stdc++ xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} QtCore QtDBus QtGui QtNetwork QtXml \
+WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
+ X11 Xext Xi Xinerama Xrender \
expat fontconfig freetype stdc++
MODULES= devel/gettext textproc/intltool
LIB_DEPENDS= devel/libevent2 \
- net/curl
+ net/curl \
+ net/miniupnp/miniupnpc
LIB_DEPENDS-gtk=${LIB_DEPENDS} \
x11/gtk+3
LIB_DEPENDS-qt=${LIB_DEPENDS} \
@@ -72,7 +73,12 @@ CONFIGURE_ARGS= --disable-shared
# unaligned accesses throughout
CONFIGURE_ARGS+=--disable-utp
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+# header and API conflict with net/miniupnp/natpmp
+INCLUDE_PATH= -I${WRKSRC}/third-party/libnatpmp
+# configure fails to set this if it finds an external miniupnp
+INCLUDE_PATH+= -I${WRKSRC}/third-party
+
+CONFIGURE_ENV= CPPFLAGS="${INCLUDE_PATH} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.include
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo15 Nov 2011 16:05:19 - 1.36
+++ distinfo29 Mar 2012 19:33:56 -
@@ -1,5 +1,5 @@
-MD5 (transmission-2.42.tar.xz) = UPbddsXAH0XV7SB4PGhoFQ==
-RMD160 (transmission-2.42.tar.xz) = x0aIphwqhIn4eDYwRqxwXxzj8AU=
-SHA1 (transmission-2.42.tar.xz) = eJAwlYQv4TMcC2riFKnpmw8RKVE=
-SHA256 (transmission-2.42.tar.xz) =
ypTY3lM4F4wiEOhuMapSL1WcrIfaM6hRmfvYG36LBOs=
-SIZE (transmission-2.42.tar.xz) = 2629072
+MD5 (transmission-2.50.tar.xz) = B2Bnifqy+XMPpFTPx6BLLQ==
+RMD160 (transmission-2.50.tar.xz) = cpn3QQr1j7utKk5XcfM7ySPyod4=
+SHA1 (transmission-2.50.tar.xz) = 3wwZwDgPKLOeY5HKsodfz3IKxws=
+SHA256 (transmission-2.50.tar.xz) =
wnHI9LZJWcKxuhJFxGXj7Ce1RQEo9A4VwH/y8Tbp+QA=
+SIZE (transmission-2.50.tar.xz) = 2766300
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/transmission/patches/patch-configure,v
retrieving revision 1.26
diff -u -p -r1.26 patch-configure
--- patches/patch-configure 15 Nov 2011 16:05:19 - 1.26
+++ patches/patch-configure 29 Mar 2012 19:33:56 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.26 2011/11/15 16:05:19 naddy Exp $
configure.orig Thu Oct 20 04:02:58 2011
-+++ configure Sun Nov 6 19:06:37 2011
-@@ -11648,8 +11648,8 @@ if test 0 = "0"; then
+--- configure.orig Wed Feb 15 03:02:06 2012
configure Thu Mar 29 17:30:45 2012
+@@ -11753,8 +11753,8 @@ if test 0 = "0"; then
else
supported_build=no
if test "x$GCC" = "xyes" ; then
@@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.26 2011/11
fi
fi
if test "x$supported_build" = "xno"; then
-@@ -16049,7 +16049,7 @@ esac
+@@ -16153,7 +16153,7 @@ esac
if test "x$GCC" = "xyes" ; then
@@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.26 2011/11
{ $as_echo "$as_me:${as_lineno-$LINENO}: c
Re: TESTING: textproc/mupdf rc
On Mar 29, 2012 16:43, Stuart Henderson wrote: > This requires the graphics/openjpeg update in my previous email. > It has various widespread internal changes, many bugfixes, and > a new memory manager. > > If you use MuPDF, please test this. More info at http://mupdf.com/news > Works fine for me on amd64. Tested with quite a lot of different files.
Re: 5.0 i386 powerdns-mysql: undefined symbol
On 2012/02/19 16:33, mailingl...@modernbiztonsag.org wrote:
> OPENBSD_5_0_BASE is at version 2.9.22 just as the pre-compiled package (no
> wonder). And it compiles and works fine. The one tagged as OPENBSD_5_0 is
> version 2.9.22.6 and it shows the undefined symbol problem. I hope i got
> it clear this time. :)
Brad pointed out a likely problem. Please try this diff.
Index: Makefile
===
RCS file: /cvs/ports/net/powerdns/Makefile,v
retrieving revision 1.14.2.2
diff -u -p -r1.14.2.2 Makefile
--- Makefile28 Jan 2012 10:49:34 - 1.14.2.2
+++ Makefile30 Mar 2012 00:45:04 -
@@ -10,6 +10,7 @@ COMMENT-sqlite3= SQLite3 database access
COMMENT-ldap= LDAP module for PowerDNS
V= 2.9.22.6
+REVISION= 0
DISTNAME= pdns-${V}
PKGNAME= powerdns-${V}
PKGNAME-main= powerdns-${V}
Index: patches/patch-configure_in
===
RCS file: /cvs/ports/net/powerdns/patches/patch-configure_in,v
retrieving revision 1.1.10.1
diff -u -p -r1.1.10.1 patch-configure_in
--- patches/patch-configure_in 11 Jan 2012 02:01:18 - 1.1.10.1
+++ patches/patch-configure_in 30 Mar 2012 00:45:04 -
@@ -1,16 +1,14 @@
$OpenBSD: patch-configure_in,v 1.1.10.1 2012/01/11 02:01:18 sthen Exp $
configure.in.orig Sun Jan 25 12:25:37 2009
-+++ configure.in Fri Oct 21 08:16:12 2011
-@@ -87,12 +87,6 @@ linux*)
- THREADFLAGS="-pthread"
- CXXFLAGS="-D_GNU_SOURCE $CXXFLAGS"
+--- configure.in.orig Mon Jan 16 08:30:30 2012
configure.in Fri Mar 30 01:43:30 2012
+@@ -89,8 +89,8 @@ linux*)
;;
--openbsd*)
-- AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
+ openbsd*)
+ AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
- DYNLINKFLAGS="-rdynamic"
- LDFLAGS="-lc_r $LDFLAGS"
-- CXXFLAGS="-pthread $CXXFLAGS"
-- ;;
++ DYNLINKFLAGS="-Wl,-export-dynamic"
++ LDFLAGS="-pthread $LDFLAGS"
+ CXXFLAGS="-pthread $CXXFLAGS"
+ ;;
*)
- AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
- DYNLINKFLAGS="-rdynamic"
Re: new: lang/go - take 2
On Fri, Mar 30, 2012 at 03:10:45AM +1100, Joel Sing wrote: > On Friday 30 March 2012, Stuart Henderson wrote: > > On 2012/03/30 01:05, Joel Sing wrote: > > > Go 1 was released yesterday - the attached is an updated port. > > > > > > Any further comments? Any oks? > > > > The diff below rolls the files which are common between i386/amd64 > > (just with a different directory name) into PLIST using a substituted > > variable for the dir name, this should make it a bit simpler to fix > > up the plists after running "make update-plist" when updating the > > port. > > Ah, that's neat and shrinks the PFRAG files considerably. Thanks! > > Updated port attached which combines this with the corrected PLIST. Tested on i386, with and without systrace. ALL TESTS PASSED :) -- Juan Francisco Cantero Hurtado http://juanfra.info
Re: [NEW] devel/py-wbem
On Mon, Jan 2, 2012 at 11:23 PM, Mark Peoples wrote: > On Sun, Dec 18, 2011 at 08:04:40PM -0500, Mark Peoples wrote: >> PyWBEM is a Python library for making CIM operations over HTTP using the >> WBEM CIM-XML protocol >> >> (speaking CIM through this is a first step to pulling vsphere 5 data into >> nagios. helpful if you don't want to drop $495 just to be able to do snmp >> gets) >> >> patch to setup.py forces setuptools over distutils (ala x11/py-kiwi) > > re-rolled with sthen's Makefile tweaks Stu: This is OK with me. Please commit. This works with the port I'm about to forward to the list for OK (check_esxi_hardware). -ME
[new] check_esxi_hardware
Attached is a port to check the general health of of an ESX/i server. Tested on a Dell PE 840 running ESXi 5 with the py-wbem port submitted by Mark Peoples. I've also attached the distfile as a tarball since the author releases the script as an unversioned Python script on his website. I'm hoping Stu (or someone) can host the distfile. check_esxi_hardware.tgz = port check_esxi_hardware-20111003.tar.gz = distfile OK? -ME check_esxi_hardware.tgz Description: GNU Zip compressed data check_esxi_hardware-20111003.tar.gz Description: GNU Zip compressed data
