Sun Feb 27 15:54:03 2011 UTC ()
add a "curl" module.


(chs)
diff -r1.1.1.1 -r1.2 pkgsrc/emulators/suse113_linux/emulator.mk
diff -r1.7 -r1.8 pkgsrc/mk/emulator/linux.mk
cvs diff -r1.1.1.1 -r1.2 pkgsrc/emulators/suse113_linux/Attic/emulator.mk (expand / switch to unified diff)

--- pkgsrc/emulators/suse113_linux/Attic/emulator.mk 2010/09/24 01:28:06 1.1.1.1
+++ pkgsrc/emulators/suse113_linux/Attic/emulator.mk 2011/02/27 15:54:03 1.2
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: emulator.mk,v 1.1.1.1 2010/09/24 01:28:06 chs Exp $ 1# $NetBSD: emulator.mk,v 1.2 2011/02/27 15:54:03 chs Exp $
2# 2#
3# This file is included by linux-suse.mk in the emulator framework. 3# This file is included by linux-suse.mk in the emulator framework.
4# 4#
5# Variables set by this file: 5# Variables set by this file:
6# 6#
7# EMUL_DISTRO 7# EMUL_DISTRO
8# The SuSE Linux distribution. 8# The SuSE Linux distribution.
9# 9#
10# DEPENDS_${EMUL_DISTRO}.* 10# DEPENDS_${EMUL_DISTRO}.*
11# A table that maps "modules" to SuSE package dependencies. 11# A table that maps "modules" to SuSE package dependencies.
12# 12#
13 13
14EMUL_DISTRO= suse-11.3 14EMUL_DISTRO= suse-11.3
15 15
16.if defined(SUSE_PKG) 16.if defined(SUSE_PKG)
17_SUSE_VERSION_REQD= -${SUSE_VERSION_REQD}{,nb*} 17_SUSE_VERSION_REQD= -${SUSE_VERSION_REQD}{,nb*}
18.else 18.else
19_SUSE_VERSION_REQD= >=${SUSE_VERSION_REQD} 19_SUSE_VERSION_REQD= >=${SUSE_VERSION_REQD}
20.endif 20.endif
21 21
22# DEPENDS_suse-11.3.* maps Linux "modules" to SuSE package dependencies. 22# DEPENDS_suse-11.3.* maps Linux "modules" to SuSE package dependencies.
23DEPENDS_suse-11.3.alsa?= suse_alsa${_SUSE_VERSION_REQD}:../../emulators/suse113_alsa 23DEPENDS_suse-11.3.alsa?= suse_alsa${_SUSE_VERSION_REQD}:../../emulators/suse113_alsa
24DEPENDS_suse-11.3.aspell?= suse_aspell${_SUSE_VERSION_REQD}:../../emulators/suse113_aspell 24DEPENDS_suse-11.3.aspell?= suse_aspell${_SUSE_VERSION_REQD}:../../emulators/suse113_aspell
25DEPENDS_suse-11.3.base?= suse_base${_SUSE_VERSION_REQD}:../../emulators/suse113_base 25DEPENDS_suse-11.3.base?= suse_base${_SUSE_VERSION_REQD}:../../emulators/suse113_base
26DEPENDS_suse-11.3.compat?= suse_compat${_SUSE_VERSION_REQD}:../../emulators/suse113_compat 26DEPENDS_suse-11.3.compat?= suse_compat${_SUSE_VERSION_REQD}:../../emulators/suse113_compat
27DEPENDS_suse-11.3.cups?= suse_libcups${_SUSE_VERSION_REQD}:../../emulators/suse113_libcups 27DEPENDS_suse-11.3.cups?= suse_libcups${_SUSE_VERSION_REQD}:../../emulators/suse113_libcups
 28DEPENDS_suse-11.3.curl?= suse_libcurl${_SUSE_VERSION_REQD}:../../emulators/suse113_libcurl
28DEPENDS_suse-11.3.expat?= suse_expat${_SUSE_VERSION_REQD}:../../emulators/suse113_expat 29DEPENDS_suse-11.3.expat?= suse_expat${_SUSE_VERSION_REQD}:../../emulators/suse113_expat
29DEPENDS_suse-11.3.fontconfig?= suse_fontconfig${_SUSE_VERSION_REQD}:../../emulators/suse113_fontconfig 30DEPENDS_suse-11.3.fontconfig?= suse_fontconfig${_SUSE_VERSION_REQD}:../../emulators/suse113_fontconfig
30DEPENDS_suse-11.3.freetype2?= suse_freetype2${_SUSE_VERSION_REQD}:../../emulators/suse113_freetype2 31DEPENDS_suse-11.3.freetype2?= suse_freetype2${_SUSE_VERSION_REQD}:../../emulators/suse113_freetype2
31DEPENDS_suse-11.3.glx?= suse_glx${_SUSE_VERSION_REQD}:../../emulators/suse113_glx 32DEPENDS_suse-11.3.glx?= suse_glx${_SUSE_VERSION_REQD}:../../emulators/suse113_glx
32DEPENDS_suse-11.3.gtk2?= suse_gtk2${_SUSE_VERSION_REQD}:../../emulators/suse113_gtk2 33DEPENDS_suse-11.3.gtk2?= suse_gtk2${_SUSE_VERSION_REQD}:../../emulators/suse113_gtk2
33DEPENDS_suse-11.3.jpeg?= suse_libjpeg${_SUSE_VERSION_REQD}:../../emulators/suse113_libjpeg 34DEPENDS_suse-11.3.jpeg?= suse_libjpeg${_SUSE_VERSION_REQD}:../../emulators/suse113_libjpeg
34DEPENDS_suse-11.3.krb5?= suse_krb5${_SUSE_VERSION_REQD}:../../emulators/suse113_krb5 35DEPENDS_suse-11.3.krb5?= suse_krb5${_SUSE_VERSION_REQD}:../../emulators/suse113_krb5
35DEPENDS_suse-11.3.libsigc++2?= suse_libsigc++2${_SUSE_VERSION_REQD}:../../emulators/suse113_libsigc++2 36DEPENDS_suse-11.3.libsigc++2?= suse_libsigc++2${_SUSE_VERSION_REQD}:../../emulators/suse113_libsigc++2
36DEPENDS_suse-11.3.locale?= suse_locale${_SUSE_VERSION_REQD}:../../emulators/suse113_locale 37DEPENDS_suse-11.3.locale?= suse_locale${_SUSE_VERSION_REQD}:../../emulators/suse113_locale
37DEPENDS_suse-11.3.motif?= suse_openmotif${_SUSE_VERSION_REQD}:../../emulators/suse113_openmotif 38DEPENDS_suse-11.3.motif?= suse_openmotif${_SUSE_VERSION_REQD}:../../emulators/suse113_openmotif
38DEPENDS_suse-11.3.openssl?= suse_openssl${_SUSE_VERSION_REQD}:../../emulators/suse113_openssl 39DEPENDS_suse-11.3.openssl?= suse_openssl${_SUSE_VERSION_REQD}:../../emulators/suse113_openssl
39DEPENDS_suse-11.3.png?= suse_libpng${_SUSE_VERSION_REQD}:../../emulators/suse113_libpng 40DEPENDS_suse-11.3.png?= suse_libpng${_SUSE_VERSION_REQD}:../../emulators/suse113_libpng
40DEPENDS_suse-11.3.qt4?= suse_qt4${_SUSE_VERSION_REQD}:../../emulators/suse113_qt4 41DEPENDS_suse-11.3.qt4?= suse_qt4${_SUSE_VERSION_REQD}:../../emulators/suse113_qt4
cvs diff -r1.7 -r1.8 pkgsrc/mk/emulator/linux.mk (expand / switch to unified diff)

--- pkgsrc/mk/emulator/linux.mk 2010/09/24 17:08:35 1.7
+++ pkgsrc/mk/emulator/linux.mk 2011/02/27 15:54:03 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: linux.mk,v 1.7 2010/09/24 17:08:35 chs Exp $ 1# $NetBSD: linux.mk,v 1.8 2011/02/27 15:54:03 chs Exp $
2# 2#
3# Linux binary emulation framework 3# Linux binary emulation framework
4# 4#
5 5
6.if ${OPSYS} == "Linux" 6.if ${OPSYS} == "Linux"
7EMUL_TYPE.linux?= native 7EMUL_TYPE.linux?= native
8.else 8.else
9EMUL_TYPE.linux?= suse-${SUSE_PREFER} 9EMUL_TYPE.linux?= suse-${SUSE_PREFER}
10.endif 10.endif
11EMUL_MODULES.linux?= # empty 11EMUL_MODULES.linux?= # empty
12 12
13.if ((${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")) || \ 13.if ((${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")) || \
14 ((${EMUL_ARCH} == "sparc") && (${MACHINE_ARCH} == "sparc64")) 14 ((${EMUL_ARCH} == "sparc") && (${MACHINE_ARCH} == "sparc64"))
@@ -32,26 +32,27 @@ _EMUL_TYPES= builtin @@ -32,26 +32,27 @@ _EMUL_TYPES= builtin
32_EMUL_TYPES+= native 32_EMUL_TYPES+= native
33_EMUL_TYPES+= suse 33_EMUL_TYPES+= suse
34 34
35.if !empty(EMUL_TYPE.linux:Msuse-*) 35.if !empty(EMUL_TYPE.linux:Msuse-*)
36_EMUL_TYPE?= suse 36_EMUL_TYPE?= suse
37.endif 37.endif
38_EMUL_TYPE?= ${EMUL_TYPE.linux} 38_EMUL_TYPE?= ${EMUL_TYPE.linux}
39 39
40_EMUL_MODULES= alsa 40_EMUL_MODULES= alsa
41_EMUL_MODULES+= aspell 41_EMUL_MODULES+= aspell
42_EMUL_MODULES+= base 42_EMUL_MODULES+= base
43_EMUL_MODULES+= compat 43_EMUL_MODULES+= compat
44_EMUL_MODULES+= cups 44_EMUL_MODULES+= cups
 45_EMUL_MODULES+= curl
45_EMUL_MODULES+= expat 46_EMUL_MODULES+= expat
46_EMUL_MODULES+= fontconfig 47_EMUL_MODULES+= fontconfig
47_EMUL_MODULES+= freetype2 48_EMUL_MODULES+= freetype2
48_EMUL_MODULES+= gdk-pixbuf 49_EMUL_MODULES+= gdk-pixbuf
49_EMUL_MODULES+= glx 50_EMUL_MODULES+= glx
50_EMUL_MODULES+= gtk 51_EMUL_MODULES+= gtk
51_EMUL_MODULES+= gtk2 52_EMUL_MODULES+= gtk2
52_EMUL_MODULES+= jpeg 53_EMUL_MODULES+= jpeg
53_EMUL_MODULES+= krb5 54_EMUL_MODULES+= krb5
54_EMUL_MODULES+= libsigc++2 55_EMUL_MODULES+= libsigc++2
55_EMUL_MODULES+= locale 56_EMUL_MODULES+= locale
56_EMUL_MODULES+= motif 57_EMUL_MODULES+= motif
57_EMUL_MODULES+= openssl 58_EMUL_MODULES+= openssl