Re: WIP: FFmpeg 20120428 snapshot
On Mon, May 7, 2012 at 10:21 PM, Brad Smith wrote: > On Wed, May 02, 2012 at 06:30:08PM -0400, Brad Smith wrote: >> Here is a work in progress update to an FFmpeg snaphot dated 20120428 >> but now from the 0.10 branch. This brings us up to date with a modern >> FFmpeg release branch and buys us a whole load of new encoders/decoders, >> bug fixes and varius improvements. As well as some diffs for some of >> the dependent ports. >> >> Most of the ports tree is in good shape to be able to build with this >> update but there are still some ports that need some work. >> >> h323plus - needs patching/testing >> >> http://comstyle.com/ports/ffmpeg/ Can't get to Brad's server. Anyone have the patch files archived elsewhere? --patrick > > I have rolled a new snapshot as of today (0508) to get a bunch of > new security/bug fixes including the security issue with the vqavideo > decoder (CVE-2012-0947). > > Almost all of the ports tree plus the few patches included with the > FFmpeg update leave only h323plus left. > > -- > This message has been scanned for viruses and > dangerous content by MailScanner, and is > believed to be clean. >
Update: devel/node-fibers 0.6.4 -> 0.6.7, requires www/node changes
This updates node-fibers to 0.6.7, the latest version. Doing so
requires some patches to node.
www/node patches:
* Move npm dependencies (including node-gyp) from being private
dependencies of npm to being globally installed modules, by moving the
files to ${LOCALBASE}/lib/node_modules and then symlinking them into
npm's dependencies. If node-gyp is left as a private dependency,
you can't set node-gyp in MODNODE_DEPENDS. For something that
requires node-gyp as a dependency (e.g. node-fibers), you have to
either disable systrace and have npm install node-gyp over the net,
or use this hack. Unless we want to ship a separate node-gyp package,
I think we should use this symlink hack, at least for node-gyp. This
patch does it for all of npm's dependencies, since I don't really see
the downside.
* Don't try to chmod 0755 a file that already has mode 0755. This fixes
a bug when building node-fibers, where npm would call chmod as a regular
user on a file owned by root, and get EPERM.
* Patch node-gyp to recognize openbsd. Without this, node-gyp assumes
you are on linux, which breaks node-fibers as node-fibers uses ucontext
on linux (and that doesn't work on OpenBSD).
devel/node-fibers patches:
* Upgrade to 0.6.7, which uses node-gyp. This eliminates the need for
some local patches.
* Remove the explicit dependency on node-gyp, as it makes the build
fail for reasons I have yet to determine.
* Change the path of the cached node-gyp.js binary, as it is does not
work correctly with our use of npm link.
I haven't tested this enough, it is not yet ready for commit. I'm
sending this early to get feedback from other porters as to whether
these changes make sense.
Thanks,
Jeremy
Index: www/node/Makefile
===
RCS file: /cvs/ports/www/node/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- www/node/Makefile 15 May 2012 17:37:34 - 1.38
+++ www/node/Makefile 22 May 2012 04:44:02 -
@@ -11,6 +11,7 @@ COMMENT= V8 JavaScript for clients and s
NODE_VERSION= v0.6.18
DISTNAME= node-${NODE_VERSION}
PKGNAME= ${DISTNAME:S/v//g}
+REVISION= 0
CATEGORIES=www devel
@@ -67,6 +68,10 @@ post-install:
${PREFIX}/lib/node/wafadmin
${INSTALL_DATA} ${FULLDISTDIR}/${DISTFILES} \
${PREFIX}/lib/node/${DISTFILES}
+ cd ${PREFIX}/lib/node_modules/npm/node_modules && for x in *; do \
+ mv $$x ../..; \
+ ln -s ../../$$x $$x; \
+ done
.include
Index: www/node/patches/patch-deps_npm_lib_utils_cmd-shim_js
===
RCS file: www/node/patches/patch-deps_npm_lib_utils_cmd-shim_js
diff -N www/node/patches/patch-deps_npm_lib_utils_cmd-shim_js
--- /dev/null 1 Jan 1970 00:00:00 -
+++ www/node/patches/patch-deps_npm_lib_utils_cmd-shim_js 22 May 2012
04:55:18 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Don't try to chmod a file to the same mode it already has. The chmod
+fails with a permission error because it attempts to call chmod as a
+regular user on a file owned by root.
+
+--- deps/npm/lib/utils/cmd-shim.js.origMon May 21 21:30:14 2012
deps/npm/lib/utils/cmd-shim.js Mon May 21 21:46:14 2012
+@@ -130,7 +130,16 @@ function writeShim_ (from, to, prog, args, cb) {
+ log.warn("Could not write "+to, "shShim")
+ return cb(er)
+ }
+- fs.chmod(to, 0755, cb)
++ fs.stat(to, function (er, stats) {
++if (er) {
++ log.warn("Could not get stats for "+to, "shShim")
++ return cb(er)
++}
++if (stats.mode == 0755) {
++ return cb(er)
++}
++fs.chmod(to, 0755, cb)
++ })
+ })
+ })
+ }
Index:
www/node/patches/patch-deps_npm_node_modules_node-gyp_legacy_tools_gyp_pylib_gyp_common_py
===
RCS file:
www/node/patches/patch-deps_npm_node_modules_node-gyp_legacy_tools_gyp_pylib_gyp_common_py
diff -N
www/node/patches/patch-deps_npm_node_modules_node-gyp_legacy_tools_gyp_pylib_gyp_common_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++
www/node/patches/patch-deps_npm_node_modules_node-gyp_legacy_tools_gyp_pylib_gyp_common_py
22 May 2012 04:56:13 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Recognize openbsd in node-gyp.
+
+--- deps/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/common.py.orig
Mon May 21 21:20:03 2012
deps/npm/node_modules/node-gyp/legacy/tools/gyp/pylib/gyp/common.py
Mon May 21 21:20:27 2012
+@@ -355,6 +355,7 @@ def GetFlavor(params):
+ 'sunos5': 'solaris',
+ 'freebsd7': 'freebsd',
+ 'freebsd8': 'freebsd',
++'openbsd5': 'openbsd',
+ }
+ flavor = flavors.get(sys.platform, 'linux')
+ return params.get('flavor', flavor)
Index: www/node/pkg/PLIST
===
RCS file: /cvs/ports/www/node/pkg/PLIST,v
re
[WIP] graphics/ImageMagick
Here's a work-in-progress long overdue update to ImageMagick.
Comments while testing dependant ports is in-progress.
Cheers,
Okan
Index: Makefile
===
RCS file: /home/open/anoncvs/cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile21 May 2012 13:29:31 - 1.121
+++ Makefile21 May 2012 20:42:49 -
@@ -4,15 +4,14 @@ SHARED_ONLY= Yes
COMMENT= image processing tools
-VER= 6.6.6
-DASHVER= 10
+VER= 6.7.7
+DASHVER= 0
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
-REVISION= 8
-SHARED_LIBS += Magick++14.0# .1.0
-SHARED_LIBS += MagickCore 2.0 # .1.0
-SHARED_LIBS += MagickWand 2.0 # .1.0
+SHARED_LIBS += Magick++15.0# .1.0
+SHARED_LIBS += MagickCore 3.0 # .1.0
+SHARED_LIBS += MagickWand 3.0 # .1.0
CATEGORIES=graphics
@@ -34,7 +33,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB = c bz2>=10 djvulibre fftw3 jasper>=1 jbig>=1.2 jpeg \
lcms2 lzma ltdl m perl png>=4 pthread stdc++ \
tiff>=36 z ICE SM X11 Xext Xt expat fontconfig \
- freetype wmf-0.2 wmflite-0.2>=7 xcb xml2>=9
+ freetype wmflite-0.2>=7 xcb xml2>=9
MODULES = converters/libiconv
@@ -70,7 +69,7 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
--without-lqr \
--without-modules \
--without-openexr \
- --with-perl=/usr/bin/perl \
+ --with-perl \
--without-rsvg \
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib \
@@ -82,11 +81,12 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE
ac_cv_path_LaunchDelegate=no
post-install:
- @perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
- ${PREFIX}/bin/Magick-config
-.for f in Magick++ MagickCore MagickWand
- @perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
- ${PREFIX}/lib/lib${f}.la
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ImageMagick
+.for i in coder.xml colors.xml delegates.xml log.xml magic.xml \
+ mime.xml policy.xml quantization-table.xml sRGB.icc \
+ thresholds.xml type-dejavu.xml type-ghostscript.xml \
+ type-windows.xml type.xml
+ ${INSTALL_DATA} ${WRKSRC}/config/$i ${PREFIX}/share/examples/ImageMagick
.endfor
.include
Index: distinfo
===
RCS file: /home/open/anoncvs/cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo6 Jul 2011 22:43:00 - 1.18
+++ distinfo21 May 2012 02:17:35 -
@@ -1,5 +1,5 @@
-MD5 (ImageMagick-6.6.6-10.tar.gz) = HurWRTdiEM/kc+vonEobiQ==
-RMD160 (ImageMagick-6.6.6-10.tar.gz) = MZUQ7mjjQuWFvZUh9eUWTdh4uZ8=
-SHA1 (ImageMagick-6.6.6-10.tar.gz) = w+IAi9OonR3xxau315sUC6M/chY=
-SHA256 (ImageMagick-6.6.6-10.tar.gz) =
bvxjtvJ/WBp5pBNVv+OaFeJAODPrg7YNmV6Z6B9rAE0=
-SIZE (ImageMagick-6.6.6-10.tar.gz) = 11319956
+MD5 (ImageMagick-6.7.7-0.tar.gz) = WKfJxpwQeXyYJUizO6KQlA==
+RMD160 (ImageMagick-6.7.7-0.tar.gz) = Amu13BaokBBGysR0ti1MtaQnLzc=
+SHA1 (ImageMagick-6.7.7-0.tar.gz) = os9CcZlw3uH/sYmcgnxGudGl7Oc=
+SHA256 (ImageMagick-6.7.7-0.tar.gz) =
Z/w+0yMv0dWwCliBTx8tC3RqOtWqj2+mPv/bM1cVZgs=
+SIZE (ImageMagick-6.7.7-0.tar.gz) = 12970380
Index: patches/patch-coders_jpeg_c
===
RCS file: patches/patch-coders_jpeg_c
diff -N patches/patch-coders_jpeg_c
--- patches/patch-coders_jpeg_c 27 Apr 2012 08:09:56 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-coders_jpeg_c,v 1.1 2012/04/27 08:09:56 jasper Exp $
-
-Security fix for CVE-2012-0260, Excessive memory use with JPEG restart markers.
-
coders/jpeg.c.orig Fri Apr 27 09:40:28 2012
-+++ coders/jpeg.c Fri Apr 27 09:57:14 2012
-@@ -210,6 +210,8 @@ static MagickBooleanType IsJPEG(const unsigned char *m
-
- static MagickBooleanType EmitMessage(j_common_ptr jpeg_info,int level)
- {
-+#define JPEGExcessiveWarnings 1000
-+
- char
- message[JMSG_LENGTH_MAX];
-
-@@ -224,11 +226,11 @@ static MagickBooleanType EmitMessage(j_common_ptr jpeg
- image=error_manager->image;
- if (level < 0)
- {
-- if ((jpeg_info->err->num_warnings == 0) ||
-+ if ((jpeg_info->err->num_warnings++ > JPEGExcessiveWarnings) ||
-+(jpeg_info->err->num_warnings == 0) ||
- (jpeg_info->err->trace_level >= 3))
- ThrowBinaryException(Corr
Re: Update: net/csup
On Sat, May 19, 2012 at 05:14:05PM +, Christian Weisgerber wrote: > No real changes. > I'm late to the party, but wanted to say that it segfaults even quicker than before. I've tried to debug this in the past, but it somehow stops completely in the weeds, gdb is of no real help. I did play around with gcc instrumentation in order to figure out which function crashed where and what the various threads are doing, and found something that looked like a use after free in the attribute(?) code. I also remember compiling it without -DNDEBUG, which promptly made it trigger an assert(). Anyway, how do you use it? This segfault is so obvious that I suspect I do something wrong here... I'm not saying this should be backed out, btw. The old version was just as broken for me. $ uname -a OpenBSD radon.tmux.org 5.1 GENERIC.MP#294 amd64 $ cat csup.conf *default host=cvsup.de.FreeBSD.org *default prefix=/home/vcs/cvs/freebsd *default base=/home/vcs/cvs/freebsd *default release=cvs delete use-rel-suffix compress cvs-all $ csup csup.conf Connected to 82.98.105.214 Updating collection cvs-all/cvs Append to CVSROOT/checkoutlist Append to CVSROOT/commitinfo Append to CVSROOT/config Append to CVSROOT/cvswrappers Append to CVSROOT/editinfo Append to CVSROOT/loginfo Append to CVSROOT/loglinks.sh Append to CVSROOT/mergemodules.sh Append to CVSROOT/modules Edit CVSROOT/modules,v Segmentation fault (core dumped) $ gdb `which csup` csup.core GNU gdb 6.3 Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type "show copying" to see the conditions. There is absolutely no warranty for GDB. Type "show warranty" for details. This GDB was configured as "amd64-unknown-openbsd5.1"...(no debugging symbols found) Core was generated by `csup'. Program terminated with signal 11, Segmentation fault. Reading symbols from /usr/lib/libpthread.so.15.2...done. Loaded symbols for /usr/lib/libpthread.so.15.2 Reading symbols from /usr/lib/libz.so.4.1...done. Loaded symbols for /usr/lib/libz.so.4.1 Reading symbols from /usr/lib/libcrypto.so.20.1...done. Loaded symbols for /usr/lib/libcrypto.so.20.1 Symbols already loaded for /usr/lib/libpthread.so.15.2 Reading symbols from /usr/lib/libc.so.64.1...done. Loaded symbols for /usr/lib/libc.so.64.1 Reading symbols from /usr/libexec/ld.so...done. Loaded symbols for /usr/libexec/ld.so #0 0x004069f6 in ?? () (gdb) bt #0 0x004069f6 in ?? () #1 0x0040bd8c in fnmatch () #2 0x00416574 in fnmatch () #3 0x000200af068e in _rthread_start (v=Variable "v" is not available. ) at /usr/src/lib/librthread/rthread.c:113 #4 0x00020062d07e in __tfork_thread () from /usr/lib/libc.so.64.1 #5 0x7f997fc07fbf7fbe in ?? () #6 0x7e4a7e497e487fdd in ?? () #7 0x7e4e7e4d7e4c7fa3 in ?? () #8 0x7fe87e517e507e4f in ?? () #9 0x7fec7feb7fea7fe9 in ?? () #10 0x7ff07fef7fee7fed in ?? () #11 0x7ff47ff37ff27ff1 in ?? () #12 0x7ff87ff77ff67ff5 in ?? () #13 0x7ffc7ffb7ffa7ff9 in ?? () #14 0x80007fff7ffe7ffd in ?? () #15 0x7e6e7e6d80028001 in ?? () #16 0x7fe57fe47e707e6f in ?? () #17 0x80047a267e747e73 in ?? () #18 0x7a2b7a2a7a297a28 in ?? () #19 0x7a2f7a2e7a2d7a2c in ?? () #20 0x7f3c7f3b7f3a7f39 in ?? () #21 0x1b2201be7198 in ?? () #22 0x8010800f7f7d in ?? () #23 0x8014801380128011 in ?? () #24 0x8018801780168015 in ?? () #25 0x801c801b801a8019 in ?? () #26 0x8020801f801e801d in ?? () #27 0x8024802380228021 in ?? () #28 0x8028802780268025 in ?? () #29 0x7f9b803380038029 in ?? () #30 0x803e803d803c7f38 in ?? () #31 0x7a3c7f3d803f in ?? () #32 0x7fda7fd97fd8 in ?? () #33 0x7fe01e46 in ?? () #34 0x7fa267a97fe1 in ?? () #35 0x69fd8008 in ?? () ---Type to continue, or q to quit---q Quit (gdb) q $
UPDATE: Pdnsd-1.2.9a-par
Hi,
Here is an update for pdnsd, this is a new version with a couple patch
fixing a problem with the flag --enable-strict-rfc2181 we use by default.
While here, GROFF is not needed. Tested on i386 (rc scripts seems works
fine again), more test are wellcome.
Ok? Comments?
Cheers.
--
Sending from my VCR.
Index: Makefile
===
RCS file: /cvs/ports/net/pdnsd/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile17 Dec 2011 22:01:13 - 1.22
+++ Makefile21 May 2012 19:42:19 -
@@ -2,13 +2,12 @@
COMMENT= threaded DNS daemon, optimized for caching
-DISTNAME= pdnsd-1.2.8-par
+DISTNAME= pdnsd-1.2.9a-par
PKGNAME= ${DISTNAME:S/-par//}
-REVISION= 3
CATEGORIES=net
MASTER_SITES= ${HOMEPAGE}/releases/
-HOMEPAGE= http://www.phys.uu.nl/~rombouts/pdnsd/
+HOMEPAGE= http://members.home.nl/p.a.rombouts/pdnsd/
WRKDIST= ${WRKDIR}/${DISTNAME:S/-par//}
@@ -21,7 +20,6 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += c pthread
USE_GMAKE= yes
-USE_GROFF= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-ipv6 \
--enable-strict-rfc2181 \
Index: distinfo
===
RCS file: /cvs/ports/net/pdnsd/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo2 Mar 2011 23:30:20 - 1.8
+++ distinfo21 May 2012 19:42:19 -
@@ -1,5 +1,5 @@
-MD5 (pdnsd-1.2.8-par.tar.gz) = d5xdGVduVh+/JFXeQ15Vlw==
-RMD160 (pdnsd-1.2.8-par.tar.gz) = InpVC6IQwkVLPMOejY0FaWDUm58=
-SHA1 (pdnsd-1.2.8-par.tar.gz) = U4hJl18pxZsefw3QdWQ1zG8PKzA=
-SHA256 (pdnsd-1.2.8-par.tar.gz) = Xzyt4J5EXwNEMIY7plBHpKsvWBuG8+qw0JgWRufsJE4=
-SIZE (pdnsd-1.2.8-par.tar.gz) = 471303
+MD5 (pdnsd-1.2.9a-par.tar.gz) = Lz5wXVmg+TCK2VBLJEAHaQ==
+RMD160 (pdnsd-1.2.9a-par.tar.gz) = PKFRusZMHV6jxNQAq4o5k+Y3AUU=
+SHA1 (pdnsd-1.2.9a-par.tar.gz) = Vdj9ceLykaPq1TyAl3KfqVJkvqk=
+SHA256 (pdnsd-1.2.9a-par.tar.gz) = u1g10MqoxLMWedb9ahoJC3G99wlQ2zsdDOqc+ct+Kns=
+SIZE (pdnsd-1.2.9a-par.tar.gz) = 516061
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/pdnsd/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in 2 Jan 2009 22:28:21 - 1.5
+++ patches/patch-Makefile_in 21 May 2012 19:42:19 -
@@ -1,21 +1,22 @@
$OpenBSD: patch-Makefile_in,v 1.5 2009/01/02 22:28:21 sthen Exp $
Makefile.in.orig Thu Sep 4 12:20:38 2008
-+++ Makefile.inFri Sep 12 04:41:24 2008
-@@ -546,7 +546,7 @@ info-am:
+--- Makefile.in.orig Fri Mar 2 13:16:52 2012
Makefile.inFri Mar 2 13:18:22 2012
+@@ -626,7 +626,8 @@ info-am:
install-data-am:
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ $(MAKE) $(AM_MAKEFLAGS)
++
+ install-dvi: install-dvi-recursive
- install-exec-am:
-
-@@ -599,7 +599,7 @@ install-data-hook:
- $(mkinstalldirs) $(DESTDIR)$(cachedir)
- test -f $(DESTDIR)$(cachedir)/pdnsd.cache || \
- touch $(DESTDIR)$(cachedir)/pdnsd.cache
+ install-dvi-am:
+@@ -699,7 +700,7 @@ install-data-hook:
+ $(mkinstalldirs) "$(DESTDIR)$(cachedir)"
+ test -f "$(DESTDIR)$(cachedir)/pdnsd.cache" || \
+ touch "$(DESTDIR)$(cachedir)/pdnsd.cache"
- if test `whoami` = "root"; then \
+ if test `userinfo -e _pdnsd`; then \
- chown $(def_id) $(DESTDIR)$(cachedir)/pdnsd.cache; \
- chown $(def_id) $(DESTDIR)$(cachedir); \
+ chown $(def_id) "$(DESTDIR)$(cachedir)/pdnsd.cache"; \
+ chown $(def_id) "$(DESTDIR)$(cachedir)"; \
fi
Index: patches/patch-doc_pdnsd_8_in
===
RCS file: /cvs/ports/net/pdnsd/patches/patch-doc_pdnsd_8_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_pdnsd_8_in
--- patches/patch-doc_pdnsd_8_in23 Mar 2009 09:54:36 - 1.2
+++ patches/patch-doc_pdnsd_8_in21 May 2012 19:42:19 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-doc_pdnsd_8_in,v 1.2 2009/03/23 09:54:36 ajacoutot Exp $
doc/pdnsd.8.in.origMon Aug 20 14:24:51 2007
-+++ doc/pdnsd.8.in Sun Mar 22 20:14:48 2009
+--- doc/pdnsd.8.in.origFri Mar 2 13:08:16 2012
doc/pdnsd.8.in Fri Mar 2 13:11:30 2012
@@ -11,7 +11,7 @@ This man page is an extract of the documentation of \f
For complete, current documentation, refer to the HTML (or plain text)
documentation (which you can find in the \fBdoc/\fP subdirectory of the
@@ -37,7 +37,7 @@ $OpenBSD: patch-doc_pdnsd_8_in,v 1.2 200
.SH AUTHORS
-@@ -301,7 +301,7 @@ and was extensively revised by Paul Rombouts
+@@ -301,7 +301,7 @@ and was extensively revised by Paul A. Rombouts
(for versions 1.1.8b1\-par and later)
Fix x11/lablgtk2 findlib META
The attached diff fixes this error: ocamlfind: While parsing '/usr/local/lib/ocaml/site-lib/lablgtk2/META': Double definition of 'directory' Index: Makefile === RCS file: /cvs/ports/x11/lablgtk2/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile16 Sep 2011 12:29:16 - 1.18 +++ Makefile21 May 2012 17:19:47 - @@ -5,7 +5,7 @@ COMMENT = OCaml interface to GTK+2 V =2.14.2 DISTNAME = lablgtk-$V PKGNAME = lablgtk2-$V -REVISION = 4 +REVISION = 5 CATEGORIES = x11 devel HOMEPAGE = http://lablgtk.forge.ocamlcore.org/ Index: patches/patch-META === RCS file: /cvs/ports/x11/lablgtk2/patches/patch-META,v retrieving revision 1.2 diff -u -p -r1.2 patch-META --- patches/patch-META 27 Oct 2009 09:25:38 - 1.2 +++ patches/patch-META 21 May 2012 17:19:47 - @@ -1,7 +1,7 @@ $OpenBSD: patch-META,v 1.2 2009/10/27 09:25:38 giovanni Exp $ --- META.orig Fri Feb 13 03:39:14 2009 +++ META Wed Oct 21 17:30:00 2009 -@@ -1,8 +1,14 @@ +@@ -1,8 +1,13 @@ requires="" -version="2.12.0" -archive(byte)="lablgtk.cma" @@ -12,7 +12,6 @@ $OpenBSD: patch-META,v 1.2 2009/10/27 09 +version="2.14.0" directory="+lablgtk2" +requires(lablGL)="lablGL" -+directory="+lablgtk2" +archive(byte)="lablgtk.cma lablgnomecanvas.cma gtkInit.cmo" +archive(native)="lablgtk.cmxa lablgnomecanvas.cmxa gtkInit.cmx" +archive(byte,lablGL)="lablgtk.cma lablgtkgl.cma lablgnomecanvas.cma gtkInit.cmo"
Re: UPDATE: devel/ocaml-pcre
Upstream has moved to bitbucket. Here is a new diff.
Christopher
Index: Makefile
===
RCS file: /cvs/ports/devel/ocaml-pcre/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile15 Sep 2011 15:50:23 - 1.1.1.1
+++ Makefile21 May 2012 16:54:04 -
@@ -3,10 +3,9 @@
COMMENT= Objective Caml perl-compatible regexp library
CATEGORIES=devel textproc
-DISTNAME= release-6.2.2
-PKGNAME= ocaml-pcre-6.2.2
-WRKDIST= ${WRKDIR}/pcre-ocaml-${DISTNAME}
-DIST_SUBDIR= ocaml-pcre
+V= 6.2.5
+DISTNAME= pcre-ocaml-$V
+PKGNAME= ocaml-pcre-$V
HOMEPAGE= http://ocaml.info/home/ocaml_sources.html
@@ -18,7 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes
MODULES= lang/ocaml
-MASTER_SITES= http://hg.ocaml.info/release/pcre-ocaml/archive/
+MASTER_SITES= https://bitbucket.org/mmottl/pcre-ocaml/downloads/
RUN_DEPENDS= sysutils/findlib
BUILD_DEPENDS= ${RUN_DEPENDS}
Index: distinfo
===
RCS file: /cvs/ports/devel/ocaml-pcre/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo15 Sep 2011 15:50:23 - 1.1.1.1
+++ distinfo21 May 2012 16:54:04 -
@@ -1,5 +1,5 @@
-MD5 (ocaml-pcre/release-6.2.2.tar.gz) = Nh6o2O0yzGt4r83tzIsjOg==
-RMD160 (ocaml-pcre/release-6.2.2.tar.gz) = tiSMvzXnera+UN5UlEASr1j3CYA=
-SHA1 (ocaml-pcre/release-6.2.2.tar.gz) = J/f9NEjI5drUKzB9BFjPlLgjHTU=
-SHA256 (ocaml-pcre/release-6.2.2.tar.gz) =
ENcvcpzmPadI+5pnEJN3lQQzX5buTkdKjrCvyJwZpqI=
-SIZE (ocaml-pcre/release-6.2.2.tar.gz) = 60365
+MD5 (pcre-ocaml-6.2.5.tar.gz) = pviHO79dLQiXZUzDX6WaQg==
+RMD160 (pcre-ocaml-6.2.5.tar.gz) = PLca5AfhOWq4P6CN+fzUGqy6gX8=
+SHA1 (pcre-ocaml-6.2.5.tar.gz) = khCUunqBCjZMEZ0QmZUlUckNGew=
+SHA256 (pcre-ocaml-6.2.5.tar.gz) = 8XdAKKRSXSLR9M9M4BIcmdhada7XpJjD6KsPXjmIjkc=
+SIZE (pcre-ocaml-6.2.5.tar.gz) = 60724
Re: [WIP] devel/eclipse4/sdk
On Sun, May 20, 2012 at 2:26 PM, Stefan Unterweger wrote: > You have missed a build dependency on 'archivers/unzip'. Good catch, thanks. I'll fix that in the next version I mail out. > However, even if everything seems to build, it still fails at the end > when trying to install it. It seems as if there is some JAR file > missing, but I don't understand the build process well enough to guess > what might be failing here. I've unpacked all the distfiles to see > whether there's just some problem in picking the JAR up, but it isn't > there anywhere in the ports directory. Yeah, for some reason the i386 and amd64 Eclipse distribution jars use slightly different versions of some of the bundled components. I'll make sure the next version handles this correctly. > Thanks in the meantime for your effort. :o) Thanks for testing!
UPDATE: devel/ocaml-pcre
Hi,
straightforward upgrade. At the moment the only MASTER_SITE has
problems, so I got the sources from
http://ftp.de.debian.org/debian/pool/main/p/pcre-ocaml/pcre-ocaml_6.2.5.orig.tar.gz
Upstream author is informed about his server problems.
Commit?
Christopher
Index: Makefile
===
RCS file: /cvs/ports/devel/ocaml-pcre/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile15 Sep 2011 15:50:23 - 1.1.1.1
+++ Makefile21 May 2012 14:18:36 -
@@ -3,8 +3,9 @@
COMMENT= Objective Caml perl-compatible regexp library
CATEGORIES=devel textproc
-DISTNAME= release-6.2.2
-PKGNAME= ocaml-pcre-6.2.2
+V= 6.2.5
+DISTNAME= release-$V
+PKGNAME= ocaml-pcre-$V
WRKDIST= ${WRKDIR}/pcre-ocaml-${DISTNAME}
DIST_SUBDIR= ocaml-pcre
Index: distinfo
===
RCS file: /cvs/ports/devel/ocaml-pcre/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo15 Sep 2011 15:50:23 - 1.1.1.1
+++ distinfo21 May 2012 14:18:36 -
@@ -1,5 +1,5 @@
-MD5 (ocaml-pcre/release-6.2.2.tar.gz) = Nh6o2O0yzGt4r83tzIsjOg==
-RMD160 (ocaml-pcre/release-6.2.2.tar.gz) = tiSMvzXnera+UN5UlEASr1j3CYA=
-SHA1 (ocaml-pcre/release-6.2.2.tar.gz) = J/f9NEjI5drUKzB9BFjPlLgjHTU=
-SHA256 (ocaml-pcre/release-6.2.2.tar.gz) =
ENcvcpzmPadI+5pnEJN3lQQzX5buTkdKjrCvyJwZpqI=
-SIZE (ocaml-pcre/release-6.2.2.tar.gz) = 60365
+MD5 (ocaml-pcre/release-6.2.5.tar.gz) = 48DSBHJcpG8aeLBNh8HiNw==
+RMD160 (ocaml-pcre/release-6.2.5.tar.gz) = 5z4FLe4fGiE6C1zZpId0SemsIMk=
+SHA1 (ocaml-pcre/release-6.2.5.tar.gz) = vGH9C+pIrdjO1yVEdgY+AMMGDts=
+SHA256 (ocaml-pcre/release-6.2.5.tar.gz) =
n1/9f8jqNXzIWpBI3eQePNx5ZJ5Y/gNpzIFDcuzjIO4=
+SIZE (ocaml-pcre/release-6.2.5.tar.gz) = 60714
Fix fonts/anonymous-pro
Oky?
Index: Makefile
===
RCS file: /cvs/ports/fonts/anonymous-pro/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile19 Jul 2011 09:16:06 - 1.1.1.1
+++ Makefile21 May 2012 13:53:26 -
@@ -5,7 +5,7 @@ PKG_ARCH = *
VERSION = 1.002
PKGNAME = anonymous-pro-${VERSION}
DISTNAME = AnonymousPro-${VERSION}
-REVISION = 0
+REVISION = 1
EXTRACT_SUFX = .zip
CATEGORIES = fonts x11
@@ -25,9 +25,9 @@ FONTSDIR =${PREFIX}/lib/X11/fonts/anony
WRKDIST = ${WRKDIR}/${DISTNAME}.001
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/anonymous-pro
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/anonymous-pro
${INSTALL_DATA_DIR} ${FONTSDIR}
cd ${WRKDIST} ; /bin/pax -rw '-s/ //g' *.ttf ${FONTSDIR}
- ${INSTALL_DATA} ${WRKDIST}/*.txt ${PREFIX}/share/anonymous-pro
+ ${INSTALL_DATA} ${WRKDIST}/*.txt ${PREFIX}/share/doc/anonymous-pro
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/fonts/anonymous-pro/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 19 Jul 2011 09:16:06 - 1.1.1.1
+++ pkg/PLIST 21 May 2012 13:53:26 -
@@ -6,8 +6,8 @@ lib/X11/fonts/anonymous-pro/AnonymousPro
lib/X11/fonts/anonymous-pro/AnonymousProB.ttf
lib/X11/fonts/anonymous-pro/AnonymousProBI.ttf
lib/X11/fonts/anonymous-pro/AnonymousProI.ttf
-share/anonymous-pro/
-share/anonymous-pro/FONTLOG.txt
-share/anonymous-pro/OFL-FAQ.txt
-share/anonymous-pro/OFL.txt
-share/anonymous-pro/README.txt
+share/doc/anonymous-pro/
+share/doc/anonymous-pro/FONTLOG.txt
+share/doc/anonymous-pro/OFL-FAQ.txt
+share/doc/anonymous-pro/OFL.txt
+share/doc/anonymous-pro/README.txt
Re: print/mpage will build, but dies in 'make install'
On Sun, May 20, 2012 at 09:25:32PM -0400, Jonathan Thornburg wrote: > Hi, > > I'm using 5.1-release/amd64 (just installed yesterday from the CD). > I'm trying to build the print/mpage package. It builds fine, but dies > during 'make install': > > # env FLAVOR="letter" make install > ===> Faking installation for mpage-2.5.6-letter > install -c -s -o root -g bin -m 555 > /usr/ports/pobj/mpage-2.5.6-letter/mpage-2.5.6/mpage > /usr/ports/pobj/mpage-2.5.6-letter/fake-amd64-letter/usr/local/bin > install -c -o root -g bin -m 444 > /usr/ports/pobj/mpage-2.5.6-letter/mpage-2.5.6/mpage.1 > /usr/ports/pobj/mpage-2.5.6-letter/fake-amd64-letter/usr/local/man/man1 > install -d -o root -g bin -m 755 > /usr/ports/pobj/mpage-2.5.6-letter/fake-amd64-letter/usr/local/share/mpage > install -c -o root -g bin -m 444 > /usr/ports/pobj/mpage-2.5.6-letter/mpage-2.5.6/Encodings/* > /usr/ports/pobj/mpage-2.5.6-letter/fake-amd64-letter/usr/local/share/mpage > ===> Building package for mpage-2.5.6-letter > Create /usr/ports/packages/amd64/all/mpage-2.5.6-letter.tgz > Error:ino|@owner*for*/usr/local/bin/mpage*(bkis)**|162% > Error: modes don't match for /usr/local/bin/mpage > Error:ino|@owner*for*/usr/local/man/cat1/mpage.0*(bkis)** | > 80% Something fucks up your perms on WRKOBJDIR .. is there a "bkis" user ? look for file ownership in WRKOBJDIR/fake*. Landry
