From nobody@FreeBSD.org  Fri Jul  5 23:51:31 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id DC82C392
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  5 Jul 2013 23:51:31 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id B55101B38
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  5 Jul 2013 23:51:31 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r65NpVlx012781
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 5 Jul 2013 23:51:31 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r65NpV0j012778;
	Fri, 5 Jul 2013 23:51:31 GMT
	(envelope-from nobody)
Message-Id: <201307052351.r65NpV0j012778@oldred.freebsd.org>
Date: Fri, 5 Jul 2013 23:51:31 GMT
From: "O. Hartmann" <ohartman@zedat.fu-berlin.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: devel/opencl: new hashes (distinfo), minor changes
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         180338
>Category:       ports
>Synopsis:       devel/opencl: new hashes (distinfo), minor changes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marino
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 06 00:00:01 UTC 2013
>Closed-Date:    Sun Sep 01 14:33:11 UTC 2013
>Last-Modified:  Sun Sep 01 14:33:11 UTC 2013
>Originator:     O. Hartmann
>Release:        
>Organization:
FU Berlin
>Environment:
>Description:
Khronos has done some minor changes in the header files, so the hashes doesn't match anymore. The patch attached fixes this.

According to possible patchfiles in "files" I also added some lines doing extraction first in the WRKSRC folder and install the header from there instead doing it directly from the DISTDIR/DIST_SUBDIR folder. This offers the opportunity having patches applied if necessary before installing.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Nur opencl.orig/Makefile opencl/Makefile
--- opencl.orig/Makefile	2013-05-24 16:02:12.000000000 +0200
+++ opencl/Makefile	2013-07-06 01:45:39.000000000 +0200
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencl
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.khronos.org/registry/cl/api/${PORTVERSION}/
 DISTFILES=	opencl.h cl_platform.h cl.h cl_ext.h cl_dx9_media_sharing.h \
@@ -12,21 +12,27 @@
 EXTRACT_ONLY=
 
 MAINTAINER=	ohartman@zedat.fu-berlin.de
-COMMENT=	Open Computing Language (OpenCL) specifications V1.2
+COMMENT=	Open Computing Language (OpenCL) specifications V1.2 (header files)
 
 CONFLICTS=	opencl-1.[0-1]
 
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
 
-PLIST_DIRS=	include/CL
+PLIST_DIRS+=	include/CL
 .for f in ${DISTFILES}
 PLIST_FILES+=include/CL/$f
 .endfor
 
+pre-patch:
+		@${MKDIR} ${WRKSRC}
+.for f in ${DISTFILES}
+		@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$f ${WRKSRC}/
+.endfor
+
 do-install:
-		${MKDIR} ${PREFIX}/include/CL
-		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.h  ${PREFIX}/include/CL
-		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.hpp  ${PREFIX}/include/CL
+		@${MKDIR} ${PREFIX}/include/CL
+.for f in ${DISTFILES}
+		@${INSTALL_DATA} ${WRKSRC}/$f  ${PREFIX}/include/CL
+.endfor
 
 .include <bsd.port.mk>
diff -Nur opencl.orig/pkg-message opencl/pkg-message
--- opencl.orig/pkg-message	1970-01-01 01:00:00.000000000 +0100
+++ opencl/pkg-message	2013-05-26 02:04:29.000000000 +0200
@@ -0,0 +1,5 @@
+OpenCL is the first open, royalty-free standard for cross-platform, 
+parallel programming of modern processors.
+
+Header files will reside in PREFIX/CL, with PREFIX usually 
+set to /usr/local/include.


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: change-request->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Sat Jul 6 00:00:14 UTC 2013 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180338 

From: "O. Hartmann" <ohartman@zedat.fu-berlin.de>
To: bug-followup@FreeBSD.org, ohartman@zedat.fu-berlin.de
Cc:  
Subject: Re: ports/180338: devel/opencl: new hashes (distinfo), minor
 changes
Date: Sun, 28 Jul 2013 10:31:04 +0200

 --Sig_/vYo/=6xkOeV.XVso6/owgkY
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 
 By PR ports/180338 I requested an update/change of the port (review implied=
 ) since Khronos changed some headers and the checksum doesn't match anymore=
 . People contacted me on that subject (checksum mismatch). The change is mi=
 nor (distinfo).
 
 Since I had trouble of patching the sources (in the previous out port the p=
 atch is applied to files residing in /usr/ports/distfiles/opencl/) and I fe=
 lt it wans't the clean way, I now try to introduce one hop more: copying al=
 l the files into work/opencl-1.2 and patch them there (if any patch has to =
 be applied) and the copy the files into their final place.
 
 Please be so kind and review and commit. Otherwise port devel/opencl is con=
 sidered broken due to checksum mismatch.
 
 If someone takes care of this PR and commit, please be so kind and close th=
 e following PRs, they are rendered obsolete by this one if it gets committe=
 d:
 
 
 ports/175107
 ports/178982
 
 Somehow, to apply cleanly, someone needs to "make distclean" first. Can
 this be "forced" somehow by the Makefile itself in a clean and
 compatible way?
 
 Thanks in advance,
 
 Oliver
 
 --Sig_/vYo/=6xkOeV.XVso6/owgkY
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (FreeBSD)
 
 iQEcBAEBAgAGBQJR9NbIAAoJEOgBcD7A/5N8qWIH/R/I3DwdKeSBtCNRvjEbikEe
 jhXpjvK8GHBIwPkNDBIK/tcbv6OefXRAGMjAnPexWGqQpxIZ3Sd+ANnoFSJ3+r4e
 o6LfSEml+OERj54bbi9Q6bFFGV2lv0pL4R2pDv4xg3Scb67cHPkh+X+nxms0Xn52
 FFkAv1rtK3NyPAZmYfjTY/hV4ugfjJih3taQBSW401CUw5PtxzSomy5J41NQpJhR
 cGV7s+lp62mcOxmaCSanTeEmD5cNKOQbwmCu4W2f2VBK7A+oYfy51icXVBHmBfLh
 CKqqMa5qQxWhcwuHsDuZlE7xHmvyzaykXVxtadAhKcXOjxaoM39k645txp5eud8=
 =7Niq
 -----END PGP SIGNATURE-----
 
 --Sig_/vYo/=6xkOeV.XVso6/owgkY--

From: "O. Hartmann" <ohartman@zedat.fu-berlin.de>
To: bug-followup@FreeBSD.org, ohartman@zedat.fu-berlin.de
Cc:  
Subject: Re: ports/180338: devel/opencl: new hashes (distinfo), minor
 changes
Date: Sun, 28 Jul 2013 10:56:02 +0200

 --Sig_/oTY7=jFdIXNIwqg2O7BQnaD
 Content-Type: multipart/mixed; boundary="MP_/G8mB5PxR/Czu1_MmdfCByAt"
 
 --MP_/G8mB5PxR/Czu1_MmdfCByAt
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 
 Too late, I realized that there is a mismatch in the patch itself I
 sent over to the PR system, so find attached another patch that cleans
 up the mess. I'm sorry for the noise.
 
 I checked the following patch against the official port devel/opencl
 which exists in the port's system and it worked for me on FreeBSD
 10.0-CURRENT and 9.2-PRE.
 
 Regards,
 
 Oliver
 
 --MP_/G8mB5PxR/Czu1_MmdfCByAt
 Content-Type: text/plain
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename=opencl_patch_2.txt
 
 diff -Nur opencl.orig/Makefile opencl/Makefile
 --- opencl.orig/Makefile	2013-07-28 10:47:31.257914535 +0200
 +++ opencl/Makefile	2013-07-28 10:51:56.373477017 +0200
 @@ -3,7 +3,7 @@
 =20
  PORTNAME=3D	opencl
  PORTVERSION=3D	1.2
 -PORTREVISION=3D	2
 +PORTREVISION=3D	4
  CATEGORIES=3D	devel
  MASTER_SITES=3D	http://www.khronos.org/registry/cl/api/${PORTVERSION}/
  DISTFILES=3D	opencl.h cl_platform.h cl.h cl_ext.h cl_dx9_media_sharing.h \
 @@ -12,21 +12,27 @@
  EXTRACT_ONLY=3D
 =20
  MAINTAINER=3D	ohartman@zedat.fu-berlin.de
 -COMMENT=3D	Open Computing Language (OpenCL) specifications V1.2
 +COMMENT=3D	Open Computing Language (OpenCL) specifications V1.2 (header fi=
 les)
 =20
  CONFLICTS=3D	opencl-1.[0-1]
 =20
  NO_BUILD=3D	yes
 -NO_WRKSUBDIR=3D	yes
 =20
 -PLIST_DIRS=3D	include/CL
 +PLIST_DIRS+=3D	include/CL
  .for f in ${DISTFILES}
  PLIST_FILES+=3Dinclude/CL/$f
  .endfor
 =20
 +pre-patch:
 +		@${MKDIR} ${WRKSRC}
 +.for f in ${DISTFILES}
 +		@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$f ${WRKSRC}/
 +.endfor
 +
  do-install:
 -		${MKDIR} ${PREFIX}/include/CL
 -		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.h  ${PREFIX}/include/CL
 -		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.hpp  ${PREFIX}/include/CL
 +		@${MKDIR} ${PREFIX}/include/CL
 +.for f in ${DISTFILES}
 +		@${INSTALL_DATA} ${WRKSRC}/$f  ${PREFIX}/include/CL
 +.endfor
 =20
  .include <bsd.port.mk>
 diff -Nur opencl.orig/distinfo opencl/distinfo
 --- opencl.orig/distinfo	2013-07-28 10:47:31.257914535 +0200
 +++ opencl/distinfo	2013-07-28 10:48:11.710573608 +0200
 @@ -4,8 +4,8 @@
  SIZE (opencl/cl_platform.h) =3D 41127
  SHA256 (opencl/cl.h) =3D a5465c2ed1a0687878c8f7aa25f94626d7cd3a3868163ecaa=
 6e8b36d6ed52368
  SIZE (opencl/cl.h) =3D 61545
 -SHA256 (opencl/cl_ext.h) =3D 3eafb74bc1b9456fd0e12393bfe65e48c9b3246d3c36b=
 9f69ac253f73e0b50c7
 -SIZE (opencl/cl_ext.h) =3D 11540
 +SHA256 (opencl/cl_ext.h) =3D d23a11d1daebe39c6f5a9743f356bb58cdf0bf5a2019c=
 723a6e2dc1e7dcb0360
 +SIZE (opencl/cl_ext.h) =3D 13646
  SHA256 (opencl/cl_dx9_media_sharing.h) =3D 26fb40bac8e229747bdc27b350b836e=
 3703c1e946cb40893f4c8ab2289203920
  SIZE (opencl/cl_dx9_media_sharing.h) =3D 5157
  SHA256 (opencl/cl_d3d10.h) =3D c7adb38a19663ee240977afc64903f4638d9c5c03ca=
 478793c9f7a15c1c6ac2b
 @@ -16,5 +16,5 @@
  SIZE (opencl/cl_gl.h) =3D 7343
  SHA256 (opencl/cl_gl_ext.h) =3D 4d663bbfc932ab405623e5f5d1bba3f438351d0ead=
 65e1ccdd9bb769caf7a7d0
  SIZE (opencl/cl_gl_ext.h) =3D 2630
 -SHA256 (opencl/cl.hpp) =3D 006671ee638a29a95c19bf37fbbf71ec8df445d2ea46df8=
 1f65faaff2d8a5133
 -SIZE (opencl/cl.hpp) =3D 272297
 +SHA256 (opencl/cl.hpp) =3D d7c8f5c17f88e098dc9f71d80e4b7408fab353e2828b0ba=
 4d4bb55adaa427e83
 +SIZE (opencl/cl.hpp) =3D 277155
 diff -Nur opencl.orig/pkg-message opencl/pkg-message
 --- opencl.orig/pkg-message	1970-01-01 01:00:00.000000000 +0100
 +++ opencl/pkg-message	2013-07-28 10:50:18.318603859 +0200
 @@ -0,0 +1,2 @@
 +OpenCL is the first open, royalty-free standard for cross-platform,=20
 +parallel programming of modern processors.
 
 --MP_/G8mB5PxR/Czu1_MmdfCByAt--
 
 --Sig_/oTY7=jFdIXNIwqg2O7BQnaD
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (FreeBSD)
 
 iQEcBAEBAgAGBQJR9NyjAAoJEOgBcD7A/5N83xYIAILNjsqHCLcr168z7NTLhteU
 bYlRggGxjoNCaNglOZ6kJ0zyYs2qWSOz4g5pV2bkONZUPUWQqiw67onjvF8BOPGI
 k7ilCnJLBNe8ZJxxK/y2l85BJayJxvUnuMIRnKPwaDRVFlMSLoEzg2ER8SFOM+PP
 7EH0T579dULCCTLiOWM74kvwQCkC8xXSNgwPjg6V6kM3iW4pK5kTOzjIKEqFGxae
 AL89i7diEs76+ZXDmbenqnhz2Xp+o0Og1okErdvFwucQlPtYuNUoV/B5C1IpQGsG
 Q1aDVzUvuJqIqhjLwHxUZ74DdEjVOgIuEJTZS0R+793wxEUSrw5MvVwLpJYiWmg=
 =J1xA
 -----END PGP SIGNATURE-----
 
 --Sig_/oTY7=jFdIXNIwqg2O7BQnaD--

From: "O. Hartmann" <ohartman@zedat.fu-berlin.de>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180338: devel/opencl: new hashes (distinfo), minor
 changes
Date: Tue, 20 Aug 2013 13:49:19 +0200

 --Sig_/QXYobXZYt2oouuWNaRgxLih
 Content-Type: multipart/mixed; boundary="MP_/kXekT4_4lw8HcFgK.XIWt5w"
 
 --MP_/kXekT4_4lw8HcFgK.XIWt5w
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 
 Find attached a revision of the port devel/opencl.
 
 It is tagged PORTREVISION =3D 5 as it does in my internal SVN.=20
 
 If someone could be so kind to review, eventually correct and commit
 the patches? The hash in distinfo of the recent port devel/opencl is
 outdated, I mentioned that before and there were reports of that fact
 - but nobody seems to take care of that. I can not commit.
 
 oh =20
 
 --MP_/kXekT4_4lw8HcFgK.XIWt5w
 Content-Type: text/plain
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename=patch-opencl.txt
 
 diff -Nur opencl.orig/Makefile opencl/Makefile
 --- opencl.orig/Makefile	2013-08-20 13:42:43.000000000 +0200
 +++ opencl/Makefile	2013-08-20 13:46:51.000000000 +0200
 @@ -3,7 +3,7 @@
 =20
  PORTNAME=3D	opencl
  PORTVERSION=3D	1.2
 -PORTREVISION=3D	2
 +PORTREVISION=3D	5
  CATEGORIES=3D	devel
  MASTER_SITES=3D	http://www.khronos.org/registry/cl/api/${PORTVERSION}/
  DISTFILES=3D	opencl.h cl_platform.h cl.h cl_ext.h cl_dx9_media_sharing.h \
 @@ -12,21 +12,27 @@
  EXTRACT_ONLY=3D
 =20
  MAINTAINER=3D	ohartman@zedat.fu-berlin.de
 -COMMENT=3D	Open Computing Language (OpenCL) specifications V1.2
 +COMMENT=3D	Open Computing Language (OpenCL) specifications V1.2 (header fi=
 les)
 =20
  CONFLICTS=3D	opencl-1.[0-1]
 =20
  NO_BUILD=3D	yes
 -NO_WRKSUBDIR=3D	yes
 =20
 -PLIST_DIRS=3D	include/CL
 +PLIST_DIRS+=3D	include/CL
  .for f in ${DISTFILES}
  PLIST_FILES+=3Dinclude/CL/$f
  .endfor
 =20
 +pre-patch:
 +		@${MKDIR} ${WRKSRC}
 +.for f in ${DISTFILES}
 +		@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$f ${WRKSRC}/
 +.endfor
 +
  do-install:
 -		${MKDIR} ${PREFIX}/include/CL
 -		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.h  ${PREFIX}/include/CL
 -		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.hpp  ${PREFIX}/include/CL
 +		@${MKDIR} ${PREFIX}/include/CL
 +.for f in ${DISTFILES}
 +		@${INSTALL_DATA} ${WRKSRC}/$f  ${PREFIX}/include/CL
 +.endfor
 =20
  .include <bsd.port.mk>
 diff -Nur opencl.orig/distinfo opencl/distinfo
 --- opencl.orig/distinfo	2013-08-20 13:42:43.000000000 +0200
 +++ opencl/distinfo	2013-08-20 13:30:58.000000000 +0200
 @@ -4,8 +4,8 @@
  SIZE (opencl/cl_platform.h) =3D 41127
  SHA256 (opencl/cl.h) =3D a5465c2ed1a0687878c8f7aa25f94626d7cd3a3868163ecaa=
 6e8b36d6ed52368
  SIZE (opencl/cl.h) =3D 61545
 -SHA256 (opencl/cl_ext.h) =3D 3eafb74bc1b9456fd0e12393bfe65e48c9b3246d3c36b=
 9f69ac253f73e0b50c7
 -SIZE (opencl/cl_ext.h) =3D 11540
 +SHA256 (opencl/cl_ext.h) =3D d23a11d1daebe39c6f5a9743f356bb58cdf0bf5a2019c=
 723a6e2dc1e7dcb0360
 +SIZE (opencl/cl_ext.h) =3D 13646
  SHA256 (opencl/cl_dx9_media_sharing.h) =3D 26fb40bac8e229747bdc27b350b836e=
 3703c1e946cb40893f4c8ab2289203920
  SIZE (opencl/cl_dx9_media_sharing.h) =3D 5157
  SHA256 (opencl/cl_d3d10.h) =3D c7adb38a19663ee240977afc64903f4638d9c5c03ca=
 478793c9f7a15c1c6ac2b
 @@ -16,5 +16,5 @@
  SIZE (opencl/cl_gl.h) =3D 7343
  SHA256 (opencl/cl_gl_ext.h) =3D 4d663bbfc932ab405623e5f5d1bba3f438351d0ead=
 65e1ccdd9bb769caf7a7d0
  SIZE (opencl/cl_gl_ext.h) =3D 2630
 -SHA256 (opencl/cl.hpp) =3D 006671ee638a29a95c19bf37fbbf71ec8df445d2ea46df8=
 1f65faaff2d8a5133
 -SIZE (opencl/cl.hpp) =3D 272297
 +SHA256 (opencl/cl.hpp) =3D d7c8f5c17f88e098dc9f71d80e4b7408fab353e2828b0ba=
 4d4bb55adaa427e83
 +SIZE (opencl/cl.hpp) =3D 277155
 diff -Nur opencl.orig/files/patch-cl.hpp opencl/files/patch-cl.hpp
 --- opencl.orig/files/patch-cl.hpp	1970-01-01 01:00:00.000000000 +0100
 +++ opencl/files/patch-cl.hpp	2013-08-20 13:35:55.000000000 +0200
 @@ -0,0 +1,51 @@
 +--- cl.hpp.orig	2013-08-20 13:33:04.000000000 +0200
 ++++ cl.hpp	2013-08-20 13:35:49.000000000 +0200
 +@@ -210,11 +210,9 @@
 + #include <string>
 + #endif=20
 +=20
 +-#if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
 ++#if defined(__FreeBSD__) || defined(linux) || defined(__APPLE__) || defin=
 ed(__MACOSX)
 + #include <alloca.h>
 +=20
 +-#include <emmintrin.h>
 +-#include <xmmintrin.h>
 + #endif // linux
 +=20
 + #include <cstring>
 +@@ -1037,7 +1035,7 @@
 + #endif // !_WIN32
 +     }
 +=20
 +-    inline void fence() { _mm_mfence(); }
 ++    inline void fence() { __sync_synchronize(); }
 + }; // namespace detail
 +=20
 +    =20
 +@@ -2037,6 +2035,26 @@
 + #endif // #if defined(CL_VERSION_1_1)
 + };
 +=20
 ++template <typename Func>
 ++cl_int detail::GetInfoHelper<Func, VECTOR_CLASS<cl::Device> >::
 ++    get(Func f, cl_uint name, VECTOR_CLASS<cl::Device>* param)
 ++    {
 ++        ::size_t required;
 ++        cl_int err =3D f(name, 0, NULL, &required);
 ++        if (err !=3D CL_SUCCESS) {
 ++            return err;
 ++        }
 ++
 ++        cl_device_id* value =3D (cl_device_id*) alloca(required);
 ++        err =3D f(name, required, value, NULL);
 ++        if (err !=3D CL_SUCCESS) {
 ++            return err;
 ++        }
 ++
 ++        param->assign(&value[0], &value[required/sizeof(cl_device_id)]);
 ++        return CL_SUCCESS;
 ++    }
 ++
 + /*! \brief Class interface for cl_platform_id.
 +  *
 +  *  \note Copies of these objects are inexpensive, since they don't 'own'
 diff -Nur opencl.orig/pkg-message opencl/pkg-message
 --- opencl.orig/pkg-message	1970-01-01 01:00:00.000000000 +0100
 +++ opencl/pkg-message	2013-08-20 13:37:36.000000000 +0200
 @@ -0,0 +1,4 @@
 +OpenCL is the first open, royalty-free standard for cross-platform,=20
 +parallel programming of modern processors.
 +
 +Patchset provided by POCL developers for cl.hpp applied.
 
 --MP_/kXekT4_4lw8HcFgK.XIWt5w--
 
 --Sig_/QXYobXZYt2oouuWNaRgxLih
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (FreeBSD)
 
 iQEcBAEBAgAGBQJSE1fFAAoJEOgBcD7A/5N8ihcIAKXXowfpdGHW4el7sFy+AjJ4
 Gp7Ms4IkaYCgsltAB8mfjRX8ndVc6ZmJsKXiRblBo5ZM/QhTA4QNR6i+rsDherHM
 Yd9JG4gWD1yDO4GnktbA+IH6/SpFXbjTFd1ASplzekob4lppSX5+7eUvc20AGYRg
 MFcAIUqYvNMDhIYzs3apx+AgOP4e7BE7Bi4HBaqlxhb5T+9BaF62s6jYYMU/S2Bz
 IYQg7RefFQUneIdUX0bGXCmTAOwgbSgBp9lq49evVHrWmIAehtI1jJ3C8El0biC3
 qERgDiHLjMkz1Zm362JOwi5BxtenRtxdbQvblZpD7/Zm4kGAifHL0yfQkSKS9Tg=
 =ziHZ
 -----END PGP SIGNATURE-----
 
 --Sig_/QXYobXZYt2oouuWNaRgxLih--

From: John Marino <freebsd.contact@marino.st>
To: bug-followup@FreeBSD.org, ohartman@zedat.fu-berlin.de
Cc:  
Subject: Re: ports/180338: devel/opencl: new hashes (distinfo), minor changes
Date: Wed, 28 Aug 2013 16:26:45 +0200

 What does "eventually correct" mean?
 Is this diff ready to go as it is or not?
 
 If I take the PR, I'll put it through redports after applying patch to
 see if it builds clean, but it's got to be ready to go.
 
 John
Responsible-Changed-From-To: freebsd-ports-bugs->marino 
Responsible-Changed-By: marino 
Responsible-Changed-When: Sun Sep 1 13:24:37 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180338 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180338: commit references a PR
Date: Sun,  1 Sep 2013 14:25:19 +0000 (UTC)

 Author: marino
 Date: Sun Sep  1 14:25:11 2013
 New Revision: 325857
 URL: http://svnweb.freebsd.org/changeset/ports/325857
 
 Log:
   devel/opencl: Unbreak fetch
   
   This port has been unfetchable for some time due to a checksum mismatch.
   
   PR:		ports/180338
   Submitted by:	Oliver Hartmann (maintainer)
 
 Added:
   head/devel/opencl/files/
   head/devel/opencl/files/patch-cl.hpp   (contents, props changed)
   head/devel/opencl/pkg-message   (contents, props changed)
 Modified:
   head/devel/opencl/Makefile
   head/devel/opencl/distinfo
 
 Modified: head/devel/opencl/Makefile
 ==============================================================================
 --- head/devel/opencl/Makefile	Sun Sep  1 13:42:47 2013	(r325856)
 +++ head/devel/opencl/Makefile	Sun Sep  1 14:25:11 2013	(r325857)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	opencl
  PORTVERSION=	1.2
 -PORTREVISION=	2
 +PORTREVISION=	5
  CATEGORIES=	devel
  MASTER_SITES=	http://www.khronos.org/registry/cl/api/${PORTVERSION}/
  DISTFILES=	opencl.h cl_platform.h cl.h cl_ext.h cl_dx9_media_sharing.h \
 @@ -12,21 +12,27 @@ DIST_SUBDIR=	${PORTNAME}
  EXTRACT_ONLY=
  
  MAINTAINER=	ohartman@zedat.fu-berlin.de
 -COMMENT=	Open Computing Language (OpenCL) specifications V1.2
 +COMMENT=	Open Computing Language (OpenCL) specifications V1.2 (header files)
  
  CONFLICTS=	opencl-1.[0-1]
  
  NO_BUILD=	yes
 -NO_WRKSUBDIR=	yes
  
 -PLIST_DIRS=	include/CL
 +PLIST_DIRS+=	include/CL
  .for f in ${DISTFILES}
  PLIST_FILES+=include/CL/$f
  .endfor
  
 +pre-patch:
 +		@${MKDIR} ${WRKSRC}
 +.for f in ${DISTFILES}
 +		@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$f ${WRKSRC}/
 +.endfor
 +
  do-install:
 -		${MKDIR} ${PREFIX}/include/CL
 -		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.h  ${PREFIX}/include/CL
 -		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.hpp  ${PREFIX}/include/CL
 +		@${MKDIR} ${PREFIX}/include/CL
 +.for f in ${DISTFILES}
 +		@${INSTALL_DATA} ${WRKSRC}/$f  ${PREFIX}/include/CL
 +.endfor
  
  .include <bsd.port.mk>
 
 Modified: head/devel/opencl/distinfo
 ==============================================================================
 --- head/devel/opencl/distinfo	Sun Sep  1 13:42:47 2013	(r325856)
 +++ head/devel/opencl/distinfo	Sun Sep  1 14:25:11 2013	(r325857)
 @@ -4,8 +4,8 @@ SHA256 (opencl/cl_platform.h) = e212b89b
  SIZE (opencl/cl_platform.h) = 41127
  SHA256 (opencl/cl.h) = a5465c2ed1a0687878c8f7aa25f94626d7cd3a3868163ecaa6e8b36d6ed52368
  SIZE (opencl/cl.h) = 61545
 -SHA256 (opencl/cl_ext.h) = 3eafb74bc1b9456fd0e12393bfe65e48c9b3246d3c36b9f69ac253f73e0b50c7
 -SIZE (opencl/cl_ext.h) = 11540
 +SHA256 (opencl/cl_ext.h) = d23a11d1daebe39c6f5a9743f356bb58cdf0bf5a2019c723a6e2dc1e7dcb0360
 +SIZE (opencl/cl_ext.h) = 13646
  SHA256 (opencl/cl_dx9_media_sharing.h) = 26fb40bac8e229747bdc27b350b836e3703c1e946cb40893f4c8ab2289203920
  SIZE (opencl/cl_dx9_media_sharing.h) = 5157
  SHA256 (opencl/cl_d3d10.h) = c7adb38a19663ee240977afc64903f4638d9c5c03ca478793c9f7a15c1c6ac2b
 @@ -16,5 +16,5 @@ SHA256 (opencl/cl_gl.h) = aa49d380177ac5
  SIZE (opencl/cl_gl.h) = 7343
  SHA256 (opencl/cl_gl_ext.h) = 4d663bbfc932ab405623e5f5d1bba3f438351d0ead65e1ccdd9bb769caf7a7d0
  SIZE (opencl/cl_gl_ext.h) = 2630
 -SHA256 (opencl/cl.hpp) = 006671ee638a29a95c19bf37fbbf71ec8df445d2ea46df81f65faaff2d8a5133
 -SIZE (opencl/cl.hpp) = 272297
 +SHA256 (opencl/cl.hpp) = d7c8f5c17f88e098dc9f71d80e4b7408fab353e2828b0ba4d4bb55adaa427e83
 +SIZE (opencl/cl.hpp) = 277155
 
 Added: head/devel/opencl/files/patch-cl.hpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/opencl/files/patch-cl.hpp	Sun Sep  1 14:25:11 2013	(r325857)
 @@ -0,0 +1,52 @@
 +--- cl.hpp.orig	2013-09-01 13:35:56.642641000 +0000
 ++++ cl.hpp
 +@@ -210,11 +210,10 @@
 + #include <string>
 + #endif 
 + 
 +-#if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
 ++#if defined(linux) || defined(__APPLE__) || defined(__MACOSX) \
 ++ || defined(__FreeBSD__) || defined(__DragonFly__)
 + #include <alloca.h>
 + 
 +-#include <emmintrin.h>
 +-#include <xmmintrin.h>
 + #endif // linux
 + 
 + #include <cstring>
 +@@ -1037,7 +1036,7 @@ namespace detail {
 + #endif // !_WIN32
 +     }
 + 
 +-    inline void fence() { _mm_mfence(); }
 ++    inline void fence() { __sync_synchronize(); }
 + }; // namespace detail
 + 
 +     
 +@@ -2037,6 +2036,26 @@ public:
 + #endif // #if defined(CL_VERSION_1_1)
 + };
 + 
 ++template <typename Func>
 ++cl_int detail::GetInfoHelper<Func, VECTOR_CLASS<cl::Device> >::
 ++    get(Func f, cl_uint name, VECTOR_CLASS<cl::Device>* param)
 ++    {
 ++        ::size_t required;
 ++        cl_int err = f(name, 0, NULL, &required);
 ++        if (err != CL_SUCCESS) {
 ++            return err;
 ++        }
 ++
 ++        cl_device_id* value = (cl_device_id*) alloca(required);
 ++        err = f(name, required, value, NULL);
 ++        if (err != CL_SUCCESS) {
 ++            return err;
 ++        }
 ++
 ++        param->assign(&value[0], &value[required/sizeof(cl_device_id)]);
 ++        return CL_SUCCESS;
 ++    }
 ++
 + /*! \brief Class interface for cl_platform_id.
 +  *
 +  *  \note Copies of these objects are inexpensive, since they don't 'own'
 
 Added: head/devel/opencl/pkg-message
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/opencl/pkg-message	Sun Sep  1 14:25:11 2013	(r325857)
 @@ -0,0 +1,4 @@
 +OpenCL is the first open, royalty-free standard for cross-platform, 
 +parallel programming of modern processors.
 +
 +Patchset provided by POCL developers for cl.hpp applied.
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: marino 
State-Changed-When: Sun Sep 1 14:33:10 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180338 
>Unformatted:
