Mon Sep 12 09:19:06 2011 UTC ()
PR pkg/45346: Pierre Allegraud:  Be more consistent about which configure
settings we want / do not want with the debug option.


(tnn)
diff -r1.9 -r1.10 pkgsrc/devel/xulrunner/options.mk
diff -r1.8 -r1.9 pkgsrc/mail/thunderbird/options.mk
diff -r1.87 -r1.88 pkgsrc/www/firefox/Makefile
diff -r1.19 -r1.20 pkgsrc/www/seamonkey/options.mk
cvs diff -r1.9 -r1.10 pkgsrc/devel/xulrunner/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/options.mk 2011/04/26 14:16:36 1.9
+++ pkgsrc/devel/xulrunner/Attic/options.mk 2011/09/12 09:19:06 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.9 2011/04/26 14:16:36 tnn Exp $ 1# $NetBSD: options.mk,v 1.10 2011/09/12 09:19:06 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.xulrunner 3PKG_OPTIONS_VAR= PKG_OPTIONS.xulrunner
4PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome pulseaudio 4PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome pulseaudio
5 5
6PLIST_VARS+= jit gnome debug 6PLIST_VARS+= jit gnome debug
7 7
8.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" 8.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
9PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc 9PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc
10.endif 10.endif
11 11
12.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \ 12.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \
13 !empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64) 13 !empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64)
14PKG_SUPPORTED_OPTIONS+= mozilla-jit 14PKG_SUPPORTED_OPTIONS+= mozilla-jit
@@ -30,31 +30,32 @@ CONFIGURE_ARGS+= --enable-libnotify @@ -30,31 +30,32 @@ CONFIGURE_ARGS+= --enable-libnotify
30PLIST.gnome= yes 30PLIST.gnome= yes
31.else 31.else
32CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui 32CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui
33CONFIGURE_ARGS+= --disable-libnotify 33CONFIGURE_ARGS+= --disable-libnotify
34.endif 34.endif
35 35
36.if !empty(PKG_OPTIONS:Mmozilla-jemalloc) 36.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
37CONFIGURE_ARGS+= --enable-jemalloc 37CONFIGURE_ARGS+= --enable-jemalloc
38.else 38.else
39CONFIGURE_ARGS+= --disable-jemalloc 39CONFIGURE_ARGS+= --disable-jemalloc
40.endif 40.endif
41 41
42.if !empty(PKG_OPTIONS:Mdebug) 42.if !empty(PKG_OPTIONS:Mdebug)
43CONFIGURE_ARGS+= --enable-debug 43CONFIGURE_ARGS+= --enable-debug --enable-debug-symbols
44CONFIGURE_ARGS+= --disable-install-strip 44CONFIGURE_ARGS+= --disable-install-strip
45PLIST.debug= yes 45PLIST.debug= yes
46.else 46.else
47CONFIGURE_ARGS+= --disable-debug 47CONFIGURE_ARGS+= --disable-debug --disable-debug-symbols
 48CONFIGURE_ARGS+= --enable-install-strip
48.endif 49.endif
49 50
50.if !empty(PKG_OPTIONS:Mmozilla-jit) 51.if !empty(PKG_OPTIONS:Mmozilla-jit)
51PLIST.jit= yes 52PLIST.jit= yes
52PLIST_SUBST+= NANOJIT_ARCH=${NANOJIT_ARCH.${MACHINE_ARCH}} 53PLIST_SUBST+= NANOJIT_ARCH=${NANOJIT_ARCH.${MACHINE_ARCH}}
53CONFIGURE_ARGS+= --enable-tracejit 54CONFIGURE_ARGS+= --enable-tracejit
54.else 55.else
55CONFIGURE_ARGS+= --disable-tracejit 56CONFIGURE_ARGS+= --disable-tracejit
56.endif 57.endif
57 58
58.if !empty(PKG_OPTIONS:Mpulseaudio) 59.if !empty(PKG_OPTIONS:Mpulseaudio)
59.include "../../audio/pulseaudio/buildlink3.mk" 60.include "../../audio/pulseaudio/buildlink3.mk"
60ALL_ENV+= PKGSRC_PULSEAUDIO=1 61ALL_ENV+= PKGSRC_PULSEAUDIO=1
cvs diff -r1.8 -r1.9 pkgsrc/mail/thunderbird/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/options.mk 2011/08/23 18:04:17 1.8
+++ pkgsrc/mail/thunderbird/options.mk 2011/09/12 09:19:06 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.8 2011/08/23 18:04:17 tnn Exp $ 1# $NetBSD: options.mk,v 1.9 2011/09/12 09:19:06 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.thunderbird 3PKG_OPTIONS_VAR= PKG_OPTIONS.thunderbird
4PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome official-mozilla-branding mozilla-lightning mozilla-enigmail 4PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome official-mozilla-branding mozilla-lightning mozilla-enigmail
5PKG_SUGGESTED_OPTIONS= mozilla-lightning 5PKG_SUGGESTED_OPTIONS= mozilla-lightning
6 6
7PLIST_VARS+= branding nobranding debug gnome jit 7PLIST_VARS+= branding nobranding debug gnome jit
8 8
9.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" 9.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
10PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc 10PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc
11.endif 11.endif
12 12
13.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \ 13.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \
14 !empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64) 14 !empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64)
@@ -28,30 +28,32 @@ NANOJIT_ARCH.x86_64= X64 @@ -28,30 +28,32 @@ NANOJIT_ARCH.x86_64= X64
28CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui 28CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui
29PLIST.gnome= yes 29PLIST.gnome= yes
30.else 30.else
31CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui 31CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui
32.endif 32.endif
33 33
34.if !empty(PKG_OPTIONS:Mmozilla-jemalloc) 34.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
35CONFIGURE_ARGS+= --enable-jemalloc 35CONFIGURE_ARGS+= --enable-jemalloc
36.else 36.else
37CONFIGURE_ARGS+= --disable-jemalloc 37CONFIGURE_ARGS+= --disable-jemalloc
38.endif 38.endif
39 39
40.if !empty(PKG_OPTIONS:Mdebug) 40.if !empty(PKG_OPTIONS:Mdebug)
41CONFIGURE_ARGS+= --enable-debug 41CONFIGURE_ARGS+= --enable-debug --enable-debug-symbols
 42CONFIGURE_ARGS+= --disable-install-strip
42PLIST.debug= yes 43PLIST.debug= yes
43.else 44.else
44CONFIGURE_ARGS+= --disable-debug 45CONFIGURE_ARGS+= --disable-debug --disable-debug-symbols
 46CONFIGURE_ARGS+= --enable-install-strip
45.endif 47.endif
46 48
47.if !empty(PKG_OPTIONS:Mmozilla-jit) 49.if !empty(PKG_OPTIONS:Mmozilla-jit)
48PLIST.jit= yes 50PLIST.jit= yes
49PLIST_SUBST+= NANOJIT_ARCH=${NANOJIT_ARCH.${MACHINE_ARCH}} 51PLIST_SUBST+= NANOJIT_ARCH=${NANOJIT_ARCH.${MACHINE_ARCH}}
50CONFIGURE_ARGS+= --enable-tracejit 52CONFIGURE_ARGS+= --enable-tracejit
51.else 53.else
52CONFIGURE_ARGS+= --disable-tracejit 54CONFIGURE_ARGS+= --disable-tracejit
53.endif 55.endif
54 56
55.if !empty(PKG_OPTIONS:Mmozilla-lightning) 57.if !empty(PKG_OPTIONS:Mmozilla-lightning)
56CONFIGURE_ARGS+= --enable-calendar 58CONFIGURE_ARGS+= --enable-calendar
57PLIST_SRC+= PLIST.lightning 59PLIST_SRC+= PLIST.lightning
cvs diff -r1.87 -r1.88 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2011/08/18 18:31:10 1.87
+++ pkgsrc/www/firefox/Makefile 2011/09/12 09:19:06 1.88
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.87 2011/08/18 18:31:10 tnn Exp $ 1# $NetBSD: Makefile,v 1.88 2011/09/12 09:19:06 tnn Exp $
2 2
3.include "../../devel/xulrunner/dist.mk" 3.include "../../devel/xulrunner/dist.mk"
4PKGNAME= firefox-${FIREFOX_VER} 4PKGNAME= firefox-${FIREFOX_VER}
5CATEGORIES= www 5CATEGORIES= www
6 6
7MAINTAINER= tnn@NetBSD.org 7MAINTAINER= tnn@NetBSD.org
8HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 8HOMEPAGE= http://www.mozilla.com/en-US/firefox/
9COMMENT= Web browser with support for extensions 9COMMENT= Web browser with support for extensions
10LICENSE= mpl-1.1 10LICENSE= mpl-1.1
11 11
12MOZILLA_DIR= # empty 12MOZILLA_DIR= # empty
13 13
14CONFIGURE_ARGS+= --enable-application=browser 14CONFIGURE_ARGS+= --enable-application=browser
@@ -51,15 +51,22 @@ post-install: @@ -51,15 +51,22 @@ post-install:
51 rm -f ${DESTDIR}${PREFIX}/bin/firefox 51 rm -f ${DESTDIR}${PREFIX}/bin/firefox
52 ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin 52 ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
53 53
54BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 54BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
55BUILD_DEPENDS+= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}{,nb*}:../../devel/xulrunner 55BUILD_DEPENDS+= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}{,nb*}:../../devel/xulrunner
56.include "../../devel/xulrunner/buildlink3.mk" 56.include "../../devel/xulrunner/buildlink3.mk"
57PLIST_VARS+= gnome 57PLIST_VARS+= gnome
58.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome) 58.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)
59CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui 59CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui
60PLIST.gnome= yes 60PLIST.gnome= yes
61.else 61.else
62CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui 62CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui
63.endif 63.endif
 64.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mdebug)
 65CONFIGURE_ARGS+= --enable-debug --enable-debug-symbols
 66CONFIGURE_ARGS+= --disable-install-strip
 67.else
 68CONFIGURE_ARGS+= --disable-debug --disable-debug-symbols
 69CONFIGURE_ARGS+= --enable-install-strip
 70.endif
64.include "../../sysutils/desktop-file-utils/desktopdb.mk" 71.include "../../sysutils/desktop-file-utils/desktopdb.mk"
65.include "../../mk/bsd.pkg.mk" 72.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/www/seamonkey/options.mk (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/options.mk 2011/08/23 16:38:01 1.19
+++ pkgsrc/www/seamonkey/options.mk 2011/09/12 09:19:06 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.19 2011/08/23 16:38:01 tnn Exp $ 1# $NetBSD: options.mk,v 1.20 2011/09/12 09:19:06 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.seamonkey 3PKG_OPTIONS_VAR= PKG_OPTIONS.seamonkey
4PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome 4PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome
5 5
6PLIST_VARS+= gnome 6PLIST_VARS+= gnome
7 7
8.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" 8.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
9PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc 9PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc
10.endif 10.endif
11 11
12.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \ 12.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \
13 !empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64) 13 !empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64)
14PKG_SUPPORTED_OPTIONS+= mozilla-jit 14PKG_SUPPORTED_OPTIONS+= mozilla-jit
@@ -23,23 +23,25 @@ PKG_SUGGESTED_OPTIONS+= mozilla-jit @@ -23,23 +23,25 @@ PKG_SUGGESTED_OPTIONS+= mozilla-jit
23CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui 23CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui
24PLIST.gnome= yes 24PLIST.gnome= yes
25.else 25.else
26CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui 26CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui
27.endif 27.endif
28 28
29.if !empty(PKG_OPTIONS:Mmozilla-jemalloc) 29.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
30CONFIGURE_ARGS+= --enable-jemalloc 30CONFIGURE_ARGS+= --enable-jemalloc
31.else 31.else
32CONFIGURE_ARGS+= --disable-jemalloc 32CONFIGURE_ARGS+= --disable-jemalloc
33.endif 33.endif
34 34
35.if !empty(PKG_OPTIONS:Mdebug) 35.if !empty(PKG_OPTIONS:Mdebug)
36CONFIGURE_ARGS+= --enable-debug 36CONFIGURE_ARGS+= --enable-debug --enable-debug-symbols
 37CONFIGURE_ARGS+= --disable-install-strip
37.else 38.else
38CONFIGURE_ARGS+= --disable-debug 39CONFIGURE_ARGS+= --disable-debug --disable-debug-symbols
 40CONFIGURE_ARGS+= --enable-install-strip
39.endif 41.endif
40 42
41.if !empty(PKG_OPTIONS:Mmozilla-jit) 43.if !empty(PKG_OPTIONS:Mmozilla-jit)
42CONFIGURE_ARGS+= --enable-tracejit 44CONFIGURE_ARGS+= --enable-tracejit
43.else 45.else
44CONFIGURE_ARGS+= --disable-tracejit 46CONFIGURE_ARGS+= --disable-tracejit
45.endif 47.endif