Tue Aug 25 07:21:00 2015 UTC ()
prefer gsed and use '.' instead of 'source'


(richard)
diff -r1.11 -r1.12 pkgsrc/graphics/cogl/Makefile
diff -r1.9 -r1.10 pkgsrc/graphics/cogl/distinfo
diff -r0 -r1.1 pkgsrc/graphics/cogl/patches/patch-tests_unit_Makefile.in
cvs diff -r1.11 -r1.12 pkgsrc/graphics/cogl/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cogl/Makefile 2015/07/25 15:52:25 1.11
+++ pkgsrc/graphics/cogl/Makefile 2015/08/25 07:21:00 1.12
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.11 2015/07/25 15:52:25 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.12 2015/08/25 07:21:00 richard Exp $
2 2
3DISTNAME= cogl-1.20.0 3DISTNAME= cogl-1.20.0
4CATEGORIES= graphics gnome 4CATEGORIES= graphics gnome
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cogl/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cogl/${PKGVERSION_NOREV:R}/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://cogl3d.org/ 9HOMEPAGE= http://cogl3d.org/
10COMMENT= Modern 3D graphics API 10COMMENT= Modern 3D graphics API
11LICENSE= mit AND sgi-free-software-b-v2.0 AND modified-bsd 11LICENSE= mit AND sgi-free-software-b-v2.0 AND modified-bsd
12# if --standalone 12# if --standalone
13# LICENSE += AND gnu-lgpl-v2.1 13# LICENSE += AND gnu-lgpl-v2.1
14 14
15CONFLICTS+= clutter<1.8 15CONFLICTS+= clutter<1.8
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= gmake pkg-config msgfmt 19USE_TOOLS+= gmake gsed pkg-config msgfmt
20USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
21 21
22PKGCONFIG_OVERRIDE+= cogl-gles2/cogl-gles2-experimental.pc.in 22PKGCONFIG_OVERRIDE+= cogl-gles2/cogl-gles2-experimental.pc.in
23PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango-1.0.pc.in 23PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango-1.0.pc.in
24PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango-2.0-experimental.pc.in 24PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango-2.0-experimental.pc.in
25PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango.pc.in 25PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango.pc.in
26PKGCONFIG_OVERRIDE+= cogl/cogl-1.0.pc.in 26PKGCONFIG_OVERRIDE+= cogl/cogl-1.0.pc.in
27PKGCONFIG_OVERRIDE+= cogl/cogl-2.0-experimental.pc.in 27PKGCONFIG_OVERRIDE+= cogl/cogl-2.0-experimental.pc.in
28 28
29PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango2.pc.in 29PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango2.pc.in
30PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango.pc.in 30PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango.pc.in
31PKGCONFIG_OVERRIDE+= cogl/cogl2.pc.in 31PKGCONFIG_OVERRIDE+= cogl/cogl2.pc.in
32PKGCONFIG_OVERRIDE+= cogl-gles2/cogl-gles2-experimental.pc.in 32PKGCONFIG_OVERRIDE+= cogl-gles2/cogl-gles2-experimental.pc.in
cvs diff -r1.9 -r1.10 pkgsrc/graphics/cogl/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/cogl/distinfo 2015/07/25 15:52:25 1.9
+++ pkgsrc/graphics/cogl/distinfo 2015/08/25 07:21:00 1.10
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.9 2015/07/25 15:52:25 prlw1 Exp $ 1$NetBSD: distinfo,v 1.10 2015/08/25 07:21:00 richard Exp $
2 2
3SHA1 (cogl-1.20.0.tar.xz) = 46a0bfca30c440ad4b6a7b07ed7aa3e643d57401 3SHA1 (cogl-1.20.0.tar.xz) = 46a0bfca30c440ad4b6a7b07ed7aa3e643d57401
4RMD160 (cogl-1.20.0.tar.xz) = 271518c1b07eddb2b117ba4c3ef2770ac28f4bb3 4RMD160 (cogl-1.20.0.tar.xz) = 271518c1b07eddb2b117ba4c3ef2770ac28f4bb3
5Size (cogl-1.20.0.tar.xz) = 1669620 bytes 5Size (cogl-1.20.0.tar.xz) = 1669620 bytes
6SHA1 (patch-cogl-winsys-cogl-winsys-glx.c) = 52be226fb3c62a3275ebec470597937e0b017f96 6SHA1 (patch-cogl-winsys-cogl-winsys-glx.c) = 52be226fb3c62a3275ebec470597937e0b017f96
7SHA1 (patch-cogl_driver_gl_gl_cogl-driver-gl.c) = 41d0010a6e2a6a1fb03b6fb23f34db59cb867e14 7SHA1 (patch-cogl_driver_gl_gl_cogl-driver-gl.c) = 41d0010a6e2a6a1fb03b6fb23f34db59cb867e14
8SHA1 (patch-configure) = aee31057c06af64ec04bcd1b5750ed9a62658661 8SHA1 (patch-configure) = aee31057c06af64ec04bcd1b5750ed9a62658661
 9SHA1 (patch-tests_unit_Makefile.in) = bd06a307637ca9746c8168926796031fd2b24850
File Added: pkgsrc/graphics/cogl/patches/Attic/patch-tests_unit_Makefile.in
$NetBSD: patch-tests_unit_Makefile.in,v 1.1 2015/08/25 07:21:00 richard Exp $

* The keyword '.' is an alias for 'source', and all Bourne compatible
* shells including bash, AT&T ksh, and pdksh understand '.'

--- tests/unit/Makefile.in.orig	2014-12-01 07:18:23.025351870 +0000
+++ tests/unit/Makefile.in
@@ -788,7 +788,7 @@ wrappers: stamp-test-unit
 	@true
 stamp-test-unit: Makefile test-unit$(EXEEXT)
 	@mkdir -p wrappers
-	source $(top_builddir)/cogl/libcogl.la ; \
+	. $(top_builddir)/cogl/libcogl.la ; \
 	  $(NM) $(top_builddir)/cogl/.libs/"$$dlname"| \
 	  grep '[DR] _\?unit_test_'|sed 's/.\+ [DR] _\?//' > unit-tests
 	@chmod +x $(top_srcdir)/tests/test-launcher.sh