CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2013/12/17 01:01:14 Modified files: graphics/gdk-pixbuf2: Makefile distinfo graphics/gdk-pixbuf2/pkg: PLIST Log message: Bugfix update to gdk-pixbuf-2.30.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2013/12/17 01:14:35 Modified files: security/p5-IO-Socket-SSL: Makefile distinfo Log message: Update to IO-Socket-SSL-1.962 OK bluhm@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2013/12/17 01:19:02 Modified files: www/youtube-dl : Makefile distinfo www/youtube-dl/pkg: PLIST Log message: Update to 2013.12.17.1 New extractors for academicearth and radiofrance.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2013/12/17 01:20:04 Modified files: sysutils/accountsservice: Makefile sysutils/accountsservice/patches: patch-src_user-classify_c Log message: Fix path to false(1).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2013/12/17 01:46:45 Modified files: net/icinga/core: Makefile distinfo net/icinga/core/patches: patch-Changelog net/icinga/core/pkg: PLIST-main Removed files: net/icinga/core/patches: patch-include_config_h_in Log message: SECURITY update to icinga 1.10.2; (note for -stable, 1.9.4 fixes same issues) CVE-2013-7106, CVE-2013-7107 https://dev.icinga.org/issues/5250 The icinga web gui is susceptible to several buffer overflow flaws, which can be triggered as a logged on user. A remote attacker may utilize a CSRF (cross site request forgery) attack vector against a logged in user to exploit this flaw remotely. CVE-2013-7108 https://dev.icinga.org/issues/5251 The icinga web gui are susceptible to an off-by-one read error resulting from an improper assumption in the handling of user submitted CGI parameters. [..] by sending a specially crafted cgi parameter, the check routine can be forced to skip the terminating null pointer and read the heap address right after the end of the parameter list. Depending on the memory layout, this may result in a memory corruption condition/crash or reading of sensitive memory locations.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2013/12/17 03:17:28 Modified files: lang/node-java : Makefile lang/node-java/pkg: DESCR Log message: remove bogus ^M from DESCR
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2013/12/17 04:55:59 Modified files: x11/kmplayer : Makefile x11/kmplayer/pkg: PLIST Log message: Does not require desktop-file-utils, mimelnk is KDE-specific directory which is handled by ksycoca. Zap extra whitespace at the end of WANTLIB while there. Both nits pointed out by portcheck.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2013/12/17 07:15:24 Modified files: multimedia/gstreamer1/plugins-bad: Makefile Log message: g-ir-scanner(1) does not have support for CPPFLAGS so pass the X11 include dir to CFLAGS to make sure EGL/egl.h gets found. breakage reported by naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2013/12/17 08:39:42 Log message: import curlftpfs CurlFtpFS is a filesystem for acessing ftp hosts based on FUSE and libcurl. ok aja@ syl@ (who also fixed an issue with 'create', thanks) Status: Vendor Tag: jasper Release Tags: jasper_20131712 N ports/sysutils/curlftpfs/distinfo N ports/sysutils/curlftpfs/Makefile N ports/sysutils/curlftpfs/pkg/DESCR N ports/sysutils/curlftpfs/pkg/PLIST N ports/sysutils/curlftpfs/patches/patch-ftpfs_c N ports/sysutils/curlftpfs/patches/patch-cache_c N ports/sysutils/curlftpfs/patches/patch-ftpfs-ls_c N ports/sysutils/curlftpfs/patches/patch-ftpfs_h No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2013/12/17 08:41:21 Modified files: sysutils : Makefile Log message: +curlftpfs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2013/12/17 11:48:25 Modified files: print/poppler : Makefile distinfo print/poppler/patches: patch-aclocal_m4 Log message: Update to poppler-0.24.4. ok aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2013/12/17 14:09:53 Modified files: www/youtube-dl : Makefile distinfo Log message: Update to youtube-dl-2013.12.17.2
Starting kde4
OK, I am dumb. Too dumb to figure out how to start KDE 4.11.4, apparently. I installed the kde4 meta package and saw an error for kde-workspace, so I added that manually. But I can't figure out how to start kde4. I don't see startkde. Am I missing something, stupid, or is there is build problem? I'm up way to late on this. Thanks, STeve Andre'
UPDATE: Warzone 2100 3.1.1
Here is an update to Warzone 2100 3.1.1.
OK?
Index: Makefile
===
RCS file: /home/cvs/ports/games/warzone2100/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile4 Jun 2013 18:41:45 - 1.22
+++ Makefile17 Dec 2013 09:00:56 -
@@ -4,8 +4,7 @@ ONLY_FOR_ARCHS= amd64 i386
COMMENT= 3D realtime strategy on a future earth
-DISTNAME= warzone2100-3.1.0
-REVISION= 0
+DISTNAME= warzone2100-3.1.1
CATEGORIES=games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
EXTRACT_SUFX= .tar.xz
@@ -15,9 +14,9 @@ HOMEPAGE= http://wz2100.net/
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += GL GLEW GLU QtNetwork QtScript SDL X11 Xrandr c expat
-WANTLIB += fontconfig freetype fribidi m ogg openal physfs png
-WANTLIB += pthread stdc++ theora vorbis vorbisfile z
+WANTLIB += GL GLEW GLU QtNetwork QtScript SDL X11 Xrandr c fontconfig
+WANTLIB += freetype fribidi m ogg openal physfs png pthread stdc++
+WANTLIB += theora vorbis vorbisfile z
MODULES= devel/gettext \
x11/qt4
@@ -31,20 +30,16 @@ LIB_DEPENDS=audio/libogg \
graphics/png \
multimedia/libtheora
BUILD_DEPENDS= archivers/unzip \
- archivers/zip \
- devel/bison \
- devel/flex
+ archivers/zip
RUN_DEPENDS= devel/desktop-file-utils
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.69
+AUTOCONF_VERSION= 2.68
CONFIGURE_ARGS+= --with-distributor=OpenBSD
CONFIGURE_ENV+=CPPFLAGS=-I${X11BASE}/include -I${LOCALBASE}/include \
LDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib \
PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:${X11BASE}/lib/pkgconfig:${LOCALBASE}/lib/pkgconfig:${LOCALBASE}/lib/qt4/pkgconfig
\
- YACC=bison -y \
- ac_cv_prog_LEX=flex \
ac_cv_path_MOC4=${LOCALBASE}/bin/moc4 \
ac_cv_path_UIC4=${LOCALBASE}/bin/uic4
Index: distinfo
===
RCS file: /home/cvs/ports/games/warzone2100/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo21 Jan 2013 16:37:41 - 1.6
+++ distinfo17 Dec 2013 09:01:57 -
@@ -1,2 +1,2 @@
-SHA256 (warzone2100-3.1.0.tar.xz) =
w+JLCicD/+WxcUAeDrney+mxMNZHjmQwDM+3OmD2HAM=
-SIZE (warzone2100-3.1.0.tar.xz) = 67316000
+SHA256 (warzone2100-3.1.1.tar.xz) =
yTei4sev2tALAHZ2NiNLvsTYsY77AIBzRFQ50y7bds8=
+SIZE (warzone2100-3.1.1.tar.xz) = 85749512
Index: patches/patch-build_tools_autorevision
===
RCS file: patches/patch-build_tools_autorevision
diff -N patches/patch-build_tools_autorevision
--- patches/patch-build_tools_autorevision 21 Jan 2013 16:37:41 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,27 +0,0 @@
-$OpenBSD: patch-build_tools_autorevision,v 1.1 2013/01/21 16:37:41 pascal Exp $
build_tools/autorevision.orig Tue Jan 15 00:54:06 2013
-+++ build_tools/autorevision Mon Jan 21 00:34:28 2013
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- # Copyright (c) 2012 dak180
- # See http://opensource.org/licenses/bsd-license.php for licence terms
-@@ -577,7 +577,7 @@ EOF
- # Detect and collect repo data.
- if [[ -f ${CACHEFILE} ]] [[ ${CACHEFORCE} = 1 ]]; then
- # When requested only read from the cache to populate our symbols.
-- source ${CACHEFILE}
-+ . ${CACHEFILE}
- elif [[ ! -z $(git rev-parse HEAD 2/dev/null) ]]; then
- gitRepo
- elif [[ ! -z $(hg root 2/dev/null) ]]; then
-@@ -588,7 +588,7 @@ elif [[ ! -z $(svn info 2/dev/null) ]]; then
- svnRepo
- elif [[ -f ${CACHEFILE} ]]; then
- # We are not in a repo; try to use a previously generated cache to
populate our symbols.
-- source ${CACHEFILE}
-+ . ${CACHEFILE}
- else
- echo error: No repo or cache detected. 12
- exit 1
Index: patches/patch-configure_ac
===
RCS file: /home/cvs/ports/games/warzone2100/patches/patch-configure_ac,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure_ac
--- patches/patch-configure_ac 30 Jan 2013 01:40:49 - 1.7
+++ patches/patch-configure_ac 5 Dec 2013 21:21:11 -
@@ -1,33 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.7 2013/01/30 01:40:49 brad Exp $
configure.ac.orig Mon Jan 14 18:54:06 2013
-+++ configure.ac Tue Jan 22 22:04:29 2013
-@@ -81,7 +81,7 @@ AX_CHECK_STRLCAT
- AX_STACK_PROTECT_CC
- AX_STACK_PROTECT_CXX
-
--AC_CHECK_HEADERS(alloca.h)
-+AC_CHECK_HEADERS(alloca.h sys/ucontext.h)
-
- # Check for gettext
- AM_GNU_GETTEXT([external])
-@@ -135,15 +135,11 @@ case ${host_os} in
- AC_SUBST([WIN32_LIBS], [${WIN32_LIBS}])
- LDFLAGS=-Wl,-subsystem,windows ${LDFLAGS}
- ;;
-- *openbsd*)
--
Re: Starting kde4
2013/12/17 STeve Andre' and...@msu.edu: OK, I am dumb. Too dumb to figure out how to start KDE 4.11.4, apparently. I installed the kde4 meta package and saw an error for kde-workspace, so I added that manually. What error? But I can't figure out how to start kde4. I don't see startkde. There should present /usr/local/bin/startkde after installing kde-workspace. So something went wrong. Did you install from official packages, or by building yourself? In the latter case, could you, please, send me log of kde-workspace build? Am I missing something, stupid, or is there is build problem? I'm up way to late on this. Thanks, STeve Andre' -- WBR, Vadim Zhukov
irssi 0.8.16-rc1 for testing
Here is an initial diff to update irssi to the 0.8.16-rc1 release
for testing. This doesn't bring in much over what was already in
the port/package since I had already backported practically everything
from SVN.
Stuart,
It looks like patch-src_fe-common_core_fe-core-commands_c might
need to be modified since the time_t bump?
Any irssi users?
Index: Makefile
===
RCS file: /home/cvs/ports/net/irssi/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile21 Mar 2013 08:46:34 - 1.55
+++ Makefile17 Dec 2013 11:46:47 -
@@ -4,9 +4,10 @@ SHARED_ONLY= Yes
COMMENT= modular IRC client with many features (ipv6,socks,proxy)
-DISTNAME= irssi-0.8.15
-REVISION= 3
+DISTNAME= irssi-0.8.16-rc1
CATEGORIES=net
+MASTER_SITES= ${HOMEPAGE}files/
+EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.irssi.org/
@@ -15,9 +16,8 @@ MAINTAINER= Wiktor Izdebski vicviq@gmai
# GPL
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${HOMEPAGE}files/
-
-WANTLIB= c crypto m ncurses perl ssl util pcre glib-2.0 gmodule-2.0
+WANTLIB+= c crypto glib-2.0 gmodule-2.0 m ncurses pcre perl pthread ssl
+WANTLIB+= util
MODULES= devel/gettext
Index: distinfo
===
RCS file: /home/cvs/ports/net/irssi/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo19 May 2010 15:04:28 - 1.18
+++ distinfo17 Dec 2013 11:37:12 -
@@ -1,5 +1,2 @@
-MD5 (irssi-0.8.15.tar.gz) = hw244xn2QMK/RGww0MJO9g==
-RMD160 (irssi-0.8.15.tar.gz) = 3U7IDntAxNESGxid+4UZ4urevU4=
-SHA1 (irssi-0.8.15.tar.gz) = t83L0DmfrG4d0U1WBMQ1o9Lj6xg=
-SHA256 (irssi-0.8.15.tar.gz) = wVlXzYmMxx7q44m1pxBVaTuVeUZn5jfaMydVNmHkxt4=
-SIZE (irssi-0.8.15.tar.gz) = 1298691
+SHA256 (irssi-0.8.16-rc1.tar.bz2) =
ZNPty14A9jx5JsD1lAPVqx3MQUqFObhg4VLz+4fTFnQ=
+SIZE (irssi-0.8.16-rc1.tar.bz2) = 980941
Index: patches/patch-src_core_commands_c
===
RCS file: patches/patch-src_core_commands_c
diff -N patches/patch-src_core_commands_c
--- patches/patch-src_core_commands_c 16 Nov 2011 10:16:57 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_core_commands_c,v 1.1 2011/11/16 10:16:57 sthen Exp $
src/core/commands.c.orig Sun Nov 6 04:50:28 2011
-+++ src/core/commands.cSun Nov 6 04:50:42 2011
-@@ -325,7 +325,7 @@ void command_runsub(const char *cmd, const char *data,
-
- subcmd = g_strconcat(command , newcmd, NULL);
-
-- g_strdown(subcmd);
-+ ascii_strdown(subcmd);
- if (!signal_emit(subcmd, 3, args, server, item)) {
- defcmd = g_strdup_printf(default command %s, cmd);
- if (!signal_emit(defcmd, 3, data, server, item)) {
-@@ -891,7 +891,7 @@ static void parse_command(const char *command, int exp
- }
-
- cmd = g_strconcat(command , newcmd, NULL);
-- g_strdown(cmd);
-+ ascii_strdown(cmd);
-
- oldcmd = current_command;
- current_command = cmd+8;
Index: patches/patch-src_core_misc_c
===
RCS file: patches/patch-src_core_misc_c
diff -N patches/patch-src_core_misc_c
--- patches/patch-src_core_misc_c 16 Nov 2011 10:16:57 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,57 +0,0 @@
-$OpenBSD: patch-src_core_misc_c,v 1.1 2011/11/16 10:16:57 sthen Exp $
src/core/misc.c.orig Sun Nov 6 04:51:36 2011
-+++ src/core/misc.cSun Nov 6 04:51:50 2011
-@@ -756,17 +756,22 @@ int expand_escape(const char **data)
- /* control character (\cA = ^A) */
- (*data)++;
- return i_toupper(**data) - 64;
-- default:
-- if (!i_isdigit(**data))
-- return -1;
--
-+ case '0': case '1': case '2': case '3':
-+ case '4': case '5': case '6': case '7':
- /* octal */
-+ digit[1] = digit[2] = digit[3] = '\0';
- digit[0] = (*data)[0];
--digit[1] = (*data)[1];
-- digit[2] = (*data)[2];
--digit[3] = '\0';
-- *data += 2;
-+ if ((*data)[1] = '0' (*data)[1] = '7') {
-+ ++*data;
-+ digit[1] = **data;
-+ if ((*data)[1] = '0' (*data)[1] = '7') {
-+ ++*data;
-+ digit[2] = **data;
-+ }
-+ }
- return strtol(digit, NULL, 8);
-+ default:
-+ return -1;
- }
- }
-
-@@ -942,4 +947,22 @@ int parse_size(const char *size, int *bytes)
- }
-
- return TRUE;
-+}
-+
-+char *ascii_strup(char *str)
-+{
-+ char *s;
-+
-+ for (s = str; *s; s++)
-+ *s = g_ascii_toupper (*s);
-+
Re: [update] security/p5-Digest-HMAC
On Sat, Dec 14, 2013 at 06:09:45PM -0500, David Hill wrote: On Sat, Dec 14, 2013 at 05:04:22PM +0800, Kevin Lo wrote: David Hill wrote: update security/p5-Digest-HMAC to 1.03. This version changed dependency to Digest::SHA, which is part of base, and documented blocksize. regress tests pass. Please review. Ok. Tested on i386 and amd64, thanks. Kevin Anyone want to commit this? Ping
Re: UPDATE: www/phpmyadmin (hints needed)
On 12/14/13 23:31, Stuart Henderson wrote: On 2013/12/14 18:14, Giovanni Bechis wrote: Hi, quiet trivial update to phpmyadmin, when installed on a clean machine, phpmyadmin.conf is installed under www/conf/moduls.sample but there no message to create the link as php does. Is it worth to add a [UN]MESSAGE file similar to the php one ? This is mentioned in README anyway. I would prefer to get rid of the MESSAGE files in php rather than add any more ;) ok with the diff as-is then ? Cheers Giovanni
Re: NEW: sysutils/kyua
kyua-cli updated to 0.8, kyua-testers to 0.2 + many fixes On 15:45 Mon 09 Dec , Sergey Bronnikov wrote: ports were updated OK? On 18:20 Wed 27 Nov , Sergey Bronnikov wrote: Hi finally port for kyua is done. Attached port for kyua-cli itself and depenences: kyua-testers, atf, lutok. Port is also available in openbsd-wip tree - https://github.com/jasperla/openbsd-wip On 09:50 Sun 30 Jun , Sergey Bronnikov wrote: Kyua (pronounced Q.A.) is a testing framework for both developers and users. Kyua is different from most other testing frameworks in that it puts the end user experience before anything else. There are multiple reasons for users to run the tests themselves, and Kyua ensures that they can do so in the most convenient way. https://code.google.com/p/kyua/ Kyua is now in base of NetBSD and FreeBSD and using to run regression testing on both OSes. -- sergeyb@ lutok.tgz Description: application/tar-gz atf.tgz Description: application/tar-gz kyua-cli.tgz Description: application/tar-gz kyua-testers.tgz Description: application/tar-gz
Update print/ghostscript/gnu (to 9.07 for now)
Intermediate update to ghostscript-9.07. Yes, I know gs-9.10 is
already out, but I'd like to do this in smaller steps.
Please note that this version lacks JPX support (because the patched
jasper had been removed and I didn't yet manage to get gs built
with openjpeg).
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v
retrieving revision 1.100
diff -u -p -r1.100 Makefile
--- Makefile22 Aug 2013 09:14:32 - 1.100
+++ Makefile17 Dec 2013 21:10:37 -
@@ -2,11 +2,10 @@
COMMENT= GNU PostScript interpreter
-VERSION= 9.06
+VERSION= 9.07
DISTNAME= ghostscript-${VERSION}
CATEGORIES=print lang
SHARED_LIBS= gs 15.0
-REVISION= 4
MASTER_SITES= http://downloads.ghostscript.com/public/
@@ -150,7 +149,8 @@ post-extract:
find ${WRKDIST} -name '*.orig' -type f | xargs -r rm
ln -s base/unix-gcc.mak ${WRKDIST}/Makefile
cd ${WRKSRC} mkdir junk \
- mv freetype ijs jasper jpeg libpng jbig2dec tiff zlib junk
+ mv expat freetype ijs jpeg lcms lcms2 libpng jbig2dec \
+ openjpeg tiff zlib junk
pre-build:
mkdir -p ${WRKDIST}/obj
Index: distinfo
===
RCS file: /cvs/ports/print/ghostscript/gnu/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo22 Aug 2012 06:24:17 - 1.16
+++ distinfo27 Oct 2013 17:49:24 -
@@ -1,2 +1,2 @@
-SHA256 (ghostscript-9.06.tar.gz) = wzZyHDtpFhiTTyqFgtGb5IX3asEXNKPEDBFgV0kVHvs=
-SIZE (ghostscript-9.06.tar.gz) = 33552015
+SHA256 (ghostscript-9.07.tar.gz) = RIANAExT8TGS0bXbQTEZGY3fyKEcTSoDCqwvL9qCLr8=
+SIZE (ghostscript-9.07.tar.gz) = 31911560
Index: patches/patch-base_devs_mak
===
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-base_devs_mak,v
retrieving revision 1.8
diff -u -p -r1.8 patch-base_devs_mak
--- patches/patch-base_devs_mak 22 Aug 2013 09:14:32 - 1.8
+++ patches/patch-base_devs_mak 27 Oct 2013 17:49:24 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-base_devs_mak,v 1.8 2013/08/22 09:14:32 ajacoutot Exp $
base/devs.mak.orig Wed Aug 8 10:01:36 2012
-+++ base/devs.mak Thu Feb 14 19:52:13 2013
-@@ -1831,14 +1831,11 @@ $(DD)plibk.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $
+--- base/devs.mak.orig Thu Feb 14 08:58:13 2013
base/devs.mak Tue Sep 17 19:58:33 2013
+@@ -1841,14 +1841,11 @@ $(DD)plibk.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $
$(SETPDEV2) $(DD)plibk $(plib_)
### --- CUPS --- ###
Index: patches/patch-base_jasper_mak
===
RCS file: patches/patch-base_jasper_mak
diff -N patches/patch-base_jasper_mak
--- patches/patch-base_jasper_mak 22 Aug 2012 06:24:17 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-base_jasper_mak,v 1.2 2012/08/22 06:24:17 ajacoutot Exp $
base/jasper.mak.orig Wed Aug 8 10:01:36 2012
-+++ base/jasper.makFri Aug 17 15:12:56 2012
-@@ -161,7 +161,7 @@ JAS_EXCF_=\
- $(D_)EXCLUDE_PNG_SUPPORT$(_D_)1$(_D)
-
- # define our specific compiler
--JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_)
-+JAS_CC=$(CC) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(CCFLAGS)
$(JAS_EXCF_)
- JASO_=$(O_)$(JASOBJ)
-
- # switch in the selected .dev
Index: patches/patch-base_unix-dll_mak
===
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-base_unix-dll_mak,v
retrieving revision 1.5
diff -u -p -r1.5 patch-base_unix-dll_mak
--- patches/patch-base_unix-dll_mak 22 Aug 2012 06:24:17 - 1.5
+++ patches/patch-base_unix-dll_mak 27 Oct 2013 17:49:24 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-base_unix-dll_mak,v 1.5 2012/08/22 06:24:17 ajacoutot Exp $
base/unix-dll.mak.orig Wed Aug 8 10:01:36 2012
-+++ base/unix-dll.mak Fri Aug 17 15:12:56 2012
+--- base/unix-dll.mak.orig Thu Feb 14 08:58:13 2013
base/unix-dll.mak Tue Sep 17 20:11:00 2013
@@ -24,10 +24,6 @@
# export LD_LIBRARY_PATH=/insert-path-here/sobin
# export GS_LIB=/insert-path-here/lib
@@ -71,7 +71,7 @@ $OpenBSD: patch-base_unix-dll_mak,v 1.5
# - Recursive make targets - #
-@@ -100,6 +94,13 @@ SODEFS=\
+@@ -105,6 +99,13 @@ SODEFS_FINAL=\
STDIO_IMPLEMENTATION=c\
BUILDDIRPREFIX=$(BUILDDIRPREFIX)
@@ -85,7 +85,7 @@ $OpenBSD: patch-base_unix-dll_mak,v 1.5
# This is a bit nasty; because of the directory name rewriting that happens
# on a recursive build, we have to recurse twice before we are sure that
# all the targets are correct.
-@@ -118,19 +119,27 @@ sodebug:
+@@ -123,19 +124,27 @@ sodebug:
Re: WIP: LLVM 3.4
On Mon, Dec 16, 2013 at 06:26:30PM -0500, Brad Smith wrote:
On Sun, Dec 15, 2013 at 12:26:21AM -0500, Brad Smith wrote:
On Fri, Dec 13, 2013 at 11:34:44PM -0500, Brad Smith wrote:
On Sat, Dec 07, 2013 at 05:40:32AM -0500, Brad Smith wrote:
On Thu, Dec 05, 2013 at 03:35:56AM -0500, Brad Smith wrote:
Here is a work in progress update to LLVM 3.4. This has only been
lightly
tested on amd64. I need this build tested on i386, powerpc, sparc64
and
mips64 to start off. If you have such an arch please try building it
as
soon as possible as I'd like to report any issues upstream if there
are
any. Any runtime testing feedback would also be appreciated.
An updated diff merging with the up to date port. No functional change
with the 3.4 update itself.
Added a diff from matthew@ to allow Clang to deal with the driver command
line paramter -R /some/dir which 3.3 was previously just ignoring but
warning about the unused command line paramater and 3.4 will now exit with
an error.
An updated diff adding a patch to fix some unit test code building on 32-bit
archs, .e.g. i386, powerpc, to allow the regrssion test suite to build as
well
as run on 32-bit archs.
An updated diff after adding the bash dependency for the test framework.
And rc3...
Index: Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile16 Dec 2013 20:34:46 - 1.70
+++ Makefile17 Dec 2013 12:13:54 -
@@ -8,14 +8,13 @@ DPB_PROPERTIES = parallel
COMMENT = modular, fast C/C++/ObjC compiler, static analyzer and tools
-LLVM_V = 3.3
-REVISION = 3
-DISTNAME = llvm-${LLVM_V}.src
-PKGNAME = llvm-${LLVM_V}
+LLVM_V = 3.4
+DISTNAME = llvm-${LLVM_V}rc3.source
+PKGNAME = llvm-${LLVM_V}rc3
CATEGORIES = devel
-MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+MASTER_SITES = http://llvm.org/pre-releases/${LLVM_V}/rc3/
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} cfe-${LLVM_V}.src${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX}
cfe-${LLVM_V}rc3.source${EXTRACT_SUFX}
SHARED_LIBS = clang 0.0 # 3.2
@@ -25,9 +24,9 @@ HOMEPAGE =http://www.llvm.org/
# BSD
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c m pthread stdc++ z
+WANTLIB = c curses m pthread stdc++ z
-WRKDIST = ${WRKDIR}/llvm-${LLVM_V}.src
+WRKDIST = ${WRKDIR}/llvm.src
MODULES = devel/cmake \
lang/python
@@ -40,8 +39,7 @@ SEPARATE_BUILD = Yes
CONFIGURE_ARGS = -DLLVM_ENABLE_FFI:Bool=False \
-DLLVM_REQUIRES_RTTI:Bool=True \
-DCMAKE_BUILD_TYPE:String=Release \
- -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True \
- -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:String=R600
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True
# Workaround relocation overflow
.if ${MACHINE_ARCH} == powerpc
@@ -54,7 +52,8 @@ CLANG_INCLUDE_PATH = lib/clang/${LLVM_V}
SUBST_VARS += CLANG_INCLUDE_PATH LLVM_V
post-extract:
- @mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKDIST}/tools/clang
+ @rm ${WRKDIST}/tools/clang
+ @mv ${WRKDIR}/cfe.src ${WRKDIST}/tools/clang
pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
Index: distinfo
===
RCS file: /home/cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo21 Jun 2013 22:09:12 - 1.12
+++ distinfo17 Dec 2013 12:12:36 -
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.3.src.tar.gz) = sbVd5Ks6V9PgMxqD4ChGEBkcd9kk40RkmNkRPQjfuZY=
-SHA256 (llvm-3.3.src.tar.gz) = aHZrHnDQWiXi9QLpl6PLOTcYejKWWVz24Jd9XNZydXg=
-SIZE (cfe-3.3.src.tar.gz) = 9425539
-SIZE (llvm-3.3.src.tar.gz) = 13602421
+SHA256 (cfe-3.4rc3.source.tar.gz) =
YjAKwyVR7jM+8h6HX43R0vcnXK/BOtNbfi34XShPpsA=
+SHA256 (llvm-3.4rc3.source.tar.gz) =
YGtjLgG9V3GPKkYHy95koRMhnmSbVUOTVUBChb6D+cs=
+SIZE (cfe-3.4rc3.source.tar.gz) = 10440545
+SIZE (llvm-3.4rc3.source.tar.gz) = 15561407
Index: patches/patch-CMakeLists_txt
===
RCS file: /home/cvs/ports/devel/llvm/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 Jun 2013 22:09:12 - 1.3
+++ patches/patch-CMakeLists_txt14 Dec 2013 04:25:54 -
@@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
Don't confuse scripts who want the version with appended 'svn' goo.
CMakeLists.txt.origMon May 6 12:23:07 2013
-+++ CMakeLists.txt Tue Jun 18 23:00:44 2013
-@@ -13,7 +13,7 @@ set(CMAKE_MODULE_PATH
- set(LLVM_VERSION_MAJOR 3)
- set(LLVM_VERSION_MINOR 3)
+--- CMakeLists.txt.orig
Re: WIP: LLVM 3.4
On Tue, Dec 17, 2013 at 07:10:43PM -0500, Brad Smith wrote:
On Mon, Dec 16, 2013 at 06:26:30PM -0500, Brad Smith wrote:
On Sun, Dec 15, 2013 at 12:26:21AM -0500, Brad Smith wrote:
On Fri, Dec 13, 2013 at 11:34:44PM -0500, Brad Smith wrote:
On Sat, Dec 07, 2013 at 05:40:32AM -0500, Brad Smith wrote:
On Thu, Dec 05, 2013 at 03:35:56AM -0500, Brad Smith wrote:
Here is a work in progress update to LLVM 3.4. This has only been
lightly
tested on amd64. I need this build tested on i386, powerpc, sparc64
and
mips64 to start off. If you have such an arch please try building
it as
soon as possible as I'd like to report any issues upstream if there
are
any. Any runtime testing feedback would also be appreciated.
An updated diff merging with the up to date port. No functional change
with the 3.4 update itself.
Added a diff from matthew@ to allow Clang to deal with the driver
command
line paramter -R /some/dir which 3.3 was previously just ignoring but
warning about the unused command line paramater and 3.4 will now exit
with
an error.
An updated diff adding a patch to fix some unit test code building on
32-bit
archs, .e.g. i386, powerpc, to allow the regrssion test suite to build as
well
as run on 32-bit archs.
An updated diff after adding the bash dependency for the test framework.
And rc3...
And enable the integrated assembler on PowerPC..
Index: Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile16 Dec 2013 20:34:46 - 1.70
+++ Makefile17 Dec 2013 12:13:54 -
@@ -8,14 +8,13 @@ DPB_PROPERTIES = parallel
COMMENT = modular, fast C/C++/ObjC compiler, static analyzer and tools
-LLVM_V = 3.3
-REVISION = 3
-DISTNAME = llvm-${LLVM_V}.src
-PKGNAME = llvm-${LLVM_V}
+LLVM_V = 3.4
+DISTNAME = llvm-${LLVM_V}rc3.source
+PKGNAME = llvm-${LLVM_V}rc3
CATEGORIES = devel
-MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+MASTER_SITES = http://llvm.org/pre-releases/${LLVM_V}/rc3/
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} cfe-${LLVM_V}.src${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX}
cfe-${LLVM_V}rc3.source${EXTRACT_SUFX}
SHARED_LIBS = clang 0.0 # 3.2
@@ -25,9 +24,9 @@ HOMEPAGE =http://www.llvm.org/
# BSD
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c m pthread stdc++ z
+WANTLIB = c curses m pthread stdc++ z
-WRKDIST = ${WRKDIR}/llvm-${LLVM_V}.src
+WRKDIST = ${WRKDIR}/llvm.src
MODULES = devel/cmake \
lang/python
@@ -40,8 +39,7 @@ SEPARATE_BUILD = Yes
CONFIGURE_ARGS = -DLLVM_ENABLE_FFI:Bool=False \
-DLLVM_REQUIRES_RTTI:Bool=True \
-DCMAKE_BUILD_TYPE:String=Release \
- -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True \
- -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:String=R600
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True
# Workaround relocation overflow
.if ${MACHINE_ARCH} == powerpc
@@ -54,7 +52,8 @@ CLANG_INCLUDE_PATH = lib/clang/${LLVM_V}
SUBST_VARS += CLANG_INCLUDE_PATH LLVM_V
post-extract:
- @mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKDIST}/tools/clang
+ @rm ${WRKDIST}/tools/clang
+ @mv ${WRKDIR}/cfe.src ${WRKDIST}/tools/clang
pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
Index: distinfo
===
RCS file: /home/cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo21 Jun 2013 22:09:12 - 1.12
+++ distinfo17 Dec 2013 12:12:36 -
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.3.src.tar.gz) = sbVd5Ks6V9PgMxqD4ChGEBkcd9kk40RkmNkRPQjfuZY=
-SHA256 (llvm-3.3.src.tar.gz) = aHZrHnDQWiXi9QLpl6PLOTcYejKWWVz24Jd9XNZydXg=
-SIZE (cfe-3.3.src.tar.gz) = 9425539
-SIZE (llvm-3.3.src.tar.gz) = 13602421
+SHA256 (cfe-3.4rc3.source.tar.gz) =
YjAKwyVR7jM+8h6HX43R0vcnXK/BOtNbfi34XShPpsA=
+SHA256 (llvm-3.4rc3.source.tar.gz) =
YGtjLgG9V3GPKkYHy95koRMhnmSbVUOTVUBChb6D+cs=
+SIZE (cfe-3.4rc3.source.tar.gz) = 10440545
+SIZE (llvm-3.4rc3.source.tar.gz) = 15561407
Index: patches/patch-CMakeLists_txt
===
RCS file: /home/cvs/ports/devel/llvm/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 Jun 2013 22:09:12 - 1.3
+++ patches/patch-CMakeLists_txt18 Dec 2013 02:04:40 -
@@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
Don't confuse scripts who want the version with appended 'svn' goo.
CMakeLists.txt.origMon May 6 12:23:07 2013
-+++
NEW (again): x11/worker
Hi ports -- Looking through my backlog, I noticed that x11/worker from a few months back was never committed. So here's an update port, bringing in the latest version of Worker. Sadly, Worker needs a c++11 compiler, so MODULES=gcc4 was turned on. Eivind: I left you as MAINTAINER. Do you still want it? Tests good on amd64. Tests elsewhere appreciated. OK? ~Brian worker.tgz Description: Binary data
Re: WIP: LLVM 3.4
On Tue, Dec 17, 2013 at 09:45:32PM -0500, Brad Smith wrote: On Tue, Dec 17, 2013 at 07:10:43PM -0500, Brad Smith wrote: On Mon, Dec 16, 2013 at 06:26:30PM -0500, Brad Smith wrote: On Sun, Dec 15, 2013 at 12:26:21AM -0500, Brad Smith wrote: On Fri, Dec 13, 2013 at 11:34:44PM -0500, Brad Smith wrote: On Sat, Dec 07, 2013 at 05:40:32AM -0500, Brad Smith wrote: On Thu, Dec 05, 2013 at 03:35:56AM -0500, Brad Smith wrote: Here is a work in progress update to LLVM 3.4. This has only been lightly tested on amd64. I need this build tested on i386, powerpc, sparc64 and mips64 to start off. If you have such an arch please try building it as soon as possible as I'd like to report any issues upstream if there are any. Any runtime testing feedback would also be appreciated. An updated diff merging with the up to date port. No functional change with the 3.4 update itself. Added a diff from matthew@ to allow Clang to deal with the driver command line paramter -R /some/dir which 3.3 was previously just ignoring but warning about the unused command line paramater and 3.4 will now exit with an error. An updated diff adding a patch to fix some unit test code building on 32-bit archs, .e.g. i386, powerpc, to allow the regrssion test suite to build as well as run on 32-bit archs. An updated diff after adding the bash dependency for the test framework. And rc3... And enable the integrated assembler on PowerPC.. What's the point, is it backporting an upstream change, and how has this been tested ? Landry
