Now that _STRIPFLAG_INSTALL is disabled by default on Darwin, remove manual

settings of INSTALL_UNSTRIPPED=yes for Darwin in individual packages.

10 files changed, 11 insertions, 60 deletions

diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index 09ec9fb21c9..597b9095546 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2015/08/07 11:20:34 jaapb Exp $
+# $NetBSD: Makefile,v 1.83 2015/09/07 12:02:05 jperkin Exp $
 #
 
 DISTNAME=	coq-8.4pl6
@@ -43,14 +43,6 @@ PLIST.natdynlink=	yes
 .  endif
 .endif
 
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-# See PR# 28772 as the above should work but it appears to be ignored
-# so we set it explicitly below not to stip installed binaries.
-_STRIPFLAG_CC=
-_STRIPFLAG_INSTALL=
-.endif
-
 REPLACE_SH=	configure install.sh
 INSTALL_ENV+=	COQINSTALLPREFIX=${DESTDIR}
 
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 4d4bc54c745..a28b92a3485 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2015/08/30 12:30:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.71 2015/09/07 12:02:05 jperkin Exp $
 
 DISTNAME=		otp_src_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}
 PKGNAME=		${DISTNAME:S/otp_src_/erlang-/}
@@ -25,11 +25,6 @@ CONFIGURE_ARGS+=	--enable-threads
 
 .include "../../mk/bsd.prefs.mk"
 
-# Fails trying to strip dyntrace.o
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 # have gcc without the necessary atomic ops?
 .if !empty(MACHINE_PLATFORM:MNetBSD-[56].*)
 
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 9cf9f6c8efe..8ec8fa6bbbf 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.44 2015/08/22 10:45:13 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.45 2015/09/07 12:02:05 jperkin Exp $
 
 # used by x11/labltk/Makefile
 # used by x11/ocaml-graphics/Makefile
@@ -28,7 +28,7 @@ PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
+.if ${OPSYS} == "Linux"
 INSTALL_UNSTRIPPED=	yes
 .endif
 
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index 529924dd865..6cb26ce0789 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2015/08/07 11:16:30 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2015/09/07 12:02:05 jperkin Exp $
 
 BUILDLINK_TREE+=	ocaml
 
@@ -12,11 +12,6 @@ BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 
 BUILDLINK_PASSTHRU_DIRS+=     ${BUILDLINK_PREFIX.ocaml}/lib/ocaml
 
-.include "../../mk/bsd.fast.prefs.mk"
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=		yes
-.endif
-
 BUILDLINK_TARGETS+=	ocaml-wrappers
 OCAML_WRAPPERS=		ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \
 			ocamlopt ocamlopt.opt
diff --git a/lang/php54/Makefile b/lang/php54/Makefile
index 8c8159c902b..d7446a7ed85 100644
--- a/lang/php54/Makefile
+++ b/lang/php54/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/07/11 00:29:17 taca Exp $
+# $NetBSD: Makefile,v 1.31 2015/09/07 12:02:05 jperkin Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -41,11 +41,6 @@ SUBST_SED.path+=	-e 's,@PREFIX@,${PREFIX},g'
 
 INSTALLATION_DIRS+=	${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 
-# Make sure modules can link correctly
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 post-extract:
 	cd ${WRKSRC} && \
 		${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \;
diff --git a/lang/php55/Makefile b/lang/php55/Makefile
index d325c5f1d15..9610ef86d10 100644
--- a/lang/php55/Makefile
+++ b/lang/php55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2015/07/11 00:30:11 taca Exp $
+# $NetBSD: Makefile,v 1.23 2015/09/07 12:02:05 jperkin Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -33,7 +33,6 @@ MAKE_ENV+=		INSTALL_ROOT=${DESTDIR}
 CFLAGS+=		-DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
 .endif
 
-
 CONF_FILES=		${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
 PLIST_SUBST+=		PHPEXTDIR="${PHP_EXTENSION_DIR}"
 
@@ -48,11 +47,6 @@ SUBST_SED.path+=	-e 's,@PREFIX@,${PREFIX},g'
 
 INSTALLATION_DIRS+=	${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 
-# Make sure modules can link correctly
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 post-extract:
 	cd ${WRKSRC} && \
 		${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \;
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index 1400aedca6e..807ca54c927 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/11 00:31:01 taca Exp $
+# $NetBSD: Makefile,v 1.8 2015/09/07 12:02:05 jperkin Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -41,11 +41,6 @@ SUBST_SED.path+=	-e 's,@PREFIX@,${PREFIX},g'
 
 INSTALLATION_DIRS+=	${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 
-# Make sure modules can link correctly
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 # Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
 # and lacks the zone memory allocator
 .if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index af4a759955b..3ce11551b65 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2015/05/24 07:44:07 adam Exp $
+# $NetBSD: Makefile,v 1.50 2015/09/07 12:02:05 jperkin Exp $
 
 .include "dist.mk"
 
@@ -102,11 +102,6 @@ PLIST_VARS+=	extra-so
 PLIST.extra-so=	yes
 .endif
 
-# Make sure python modules can link correctly
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 # For Xcode 5 we need to search the SDK path for headers, otherwise certain
 # modules will not be built.
 .if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH}/usr/include)
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index a69636f7bc0..703bd30b44e 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/03/16 13:53:05 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2015/09/07 12:02:05 jperkin Exp $
 
 .include "dist.mk"
 
@@ -70,11 +70,6 @@ PLIST_VARS+=	oss
 PLIST.oss=	yes
 .endif
 
-# Make sure python modules can link correctly
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 # For Xcode 5 and up, we need to search the SDK path for headers, otherwise
 # certain modules will not be built.
 .if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH}/usr/include)
diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index 78ce231ef3a..8d47ac096ec 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/02/26 06:23:06 adam Exp $
+# $NetBSD: Makefile,v 1.10 2015/09/07 12:02:06 jperkin Exp $
 
 .include "dist.mk"
 
@@ -71,11 +71,6 @@ PLIST_VARS+=	oss
 PLIST.oss=	yes
 .endif
 
-# Make sure python modules can link correctly
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 # For Xcode 5 and up, we need to search the SDK path for headers, otherwise
 # certain modules will not be built.
 .if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include)