CVS commit: pkgsrc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Oct 23 12:33:04 UTC 2018

Modified Files:
        pkgsrc/security/tor-browser: Makefile
        pkgsrc/www/firefox45: mozilla-common.mk
        pkgsrc/www/firefox52: mozilla-common.mk
        pkgsrc/www/firefox60: mozilla-common.mk

Log Message:
mozilla: Don't --enable-pie on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/security/tor-browser/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/firefox45/mozilla-common.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/firefox52/mozilla-common.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox60/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/tor-browser/Makefile
diff -u pkgsrc/security/tor-browser/Makefile:1.29 pkgsrc/security/tor-browser/Makefile:1.30
--- pkgsrc/security/tor-browser/Makefile:1.29   Wed Aug 22 09:46:30 2018
+++ pkgsrc/security/tor-browser/Makefile        Tue Oct 23 12:33:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/08/22 09:46:30 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2018/10/23 12:33:04 jperkin Exp $
 
 TORBVER=       6.0.8
 
@@ -30,6 +30,8 @@ SUBST_SED.fix-build-dir+=     -e 's,mk_add_o
 
 MOZILLA_DIR=   # empty
 
+.include "../../mk/bsd.prefs.mk"
+
 CONFIGURE_ARGS+=       --enable-application=browser
 CONFIGURE_ARGS+=       --disable-tor-browser-update
 CONFIGURE_ARGS+=       --disable-webrtc
@@ -37,7 +39,9 @@ CONFIGURE_ARGS+=      --disable-gio
 CONFIGURE_ARGS+=       --disable-dbus
 CONFIGURE_ARGS+=       --disable-gnomeui
 CONFIGURE_ARGS+=        --disable-libnotify
+.if ${OPSYS} != "SunOS"
 CONFIGURE_ARGS+=        --enable-pie
+.endif
 CONFIGURE_ARGS+=        --enable-tor-data-in-home-dir
 CFLAGS+=               -DTOR_BROWSER_DATA_IN_HOME_DIR=1
 CFLAGS+=               -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1

Index: pkgsrc/www/firefox45/mozilla-common.mk
diff -u pkgsrc/www/firefox45/mozilla-common.mk:1.8 pkgsrc/www/firefox45/mozilla-common.mk:1.9
--- pkgsrc/www/firefox45/mozilla-common.mk:1.8  Tue Jul  3 05:03:38 2018
+++ pkgsrc/www/firefox45/mozilla-common.mk      Tue Oct 23 12:33:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.8 2018/07/03 05:03:38 adam Exp $
+# $NetBSD: mozilla-common.mk,v 1.9 2018/10/23 12:33:03 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -41,7 +41,9 @@ CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}in
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
 
+.if ${OPSYS} != "SunOS"
 CONFIGURE_ARGS+=       --enable-pie
+.endif
 CONFIGURE_ARGS+=       --disable-tests
 CONFIGURE_ARGS+=       --disable-pedantic
 CONFIGURE_ARGS+=       --enable-crypto

Index: pkgsrc/www/firefox52/mozilla-common.mk
diff -u pkgsrc/www/firefox52/mozilla-common.mk:1.2 pkgsrc/www/firefox52/mozilla-common.mk:1.3
--- pkgsrc/www/firefox52/mozilla-common.mk:1.2  Wed Jul 12 01:49:34 2017
+++ pkgsrc/www/firefox52/mozilla-common.mk      Tue Oct 23 12:33:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.2 2017/07/12 01:49:34 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.3 2018/10/23 12:33:04 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -45,7 +45,9 @@ CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}in
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
 
+.if ${OPSYS} != "SunOS"
 CONFIGURE_ARGS+=       --enable-pie
+.endif
 CONFIGURE_ARGS+=       --disable-tests
 CONFIGURE_ARGS+=       --with-pthreads
 CONFIGURE_ARGS+=       --enable-system-cairo

Index: pkgsrc/www/firefox60/mozilla-common.mk
diff -u pkgsrc/www/firefox60/mozilla-common.mk:1.1 pkgsrc/www/firefox60/mozilla-common.mk:1.2
--- pkgsrc/www/firefox60/mozilla-common.mk:1.1  Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/mozilla-common.mk      Tue Oct 23 12:33:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.2 2018/10/23 12:33:04 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -51,7 +51,9 @@ CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}br
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
 
 CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
+.if ${OPSYS} != "SunOS"
 CONFIGURE_ARGS+=       --enable-pie
+.endif
 CONFIGURE_ARGS+=       --disable-tests
 CONFIGURE_ARGS+=       --with-pthreads
 # Mozilla Bug 1432751