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

settings of INSTALL_UNSTRIPPED=yes for Darwin in individual packages.

29 files changed, 32 insertions, 149 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 934a8a6d63f..edfdddc36d3 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2015/04/25 14:20:25 tnn Exp $
+# $NetBSD: Makefile,v 1.79 2015/09/07 12:02:07 jperkin Exp $
 #
 
 .include "Makefile.common"
@@ -11,9 +11,7 @@ CONFIGURE_ARGS+=	--disable-esd
 
 PLIST_VARS+=		cdaudio
 
-.if ${OPSYS} == "Darwin"
-_INSTALL_UNSTRIPPED=	yes
-.else
+.if ${OPSYS} != "Darwin"
 PLIST.cdaudio=		yes
 .endif
 
diff --git a/chat/irssi/Makefile.common b/chat/irssi/Makefile.common
index 80576e9fec4..6cedc0b28de 100644
--- a/chat/irssi/Makefile.common
+++ b/chat/irssi/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2015/01/06 12:40:06 mef Exp $ -*- Makefile -*-
+# $NetBSD: Makefile.common,v 1.15 2015/09/07 12:02:07 jperkin Exp $ -*- Makefile -*-
 # used by chat/irssi-icb/Makefile
 # used by chat/irssi-xmpp/Makefile
 
@@ -13,7 +13,3 @@ SITES.${IRSSI_DISTFILE}=	http://www.irssi.org/files/
 # plugins to compile properly.
 IRSSI_CONFIG=		${PREFIX}/share/irssi/irssi-config
 IRSSI_CONFIG_H=		${PREFIX}/include/irssi/irssi-config.h
-
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=YES
-.endif
diff --git a/chat/licq-core/Makefile b/chat/licq-core/Makefile
index 7beb30c4b24..b437952902a 100644
--- a/chat/licq-core/Makefile
+++ b/chat/licq-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/03 00:02:40 asau Exp $
+# $NetBSD: Makefile,v 1.16 2015/09/07 12:02:07 jperkin Exp $
 #
 
 DISTNAME=	licq-1.3.5
@@ -18,13 +18,6 @@ GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--disable-nls
 
-.include "../../mk/bsd.prefs.mk"
-
-# Make sure modules can link correctly
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-4.[6-9].*)
 CFLAGS.SunOS+=		-std=c99 -D_XOPEN_SOURCE=600
diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile
index 2f3986d1d49..d4418a3c8f1 100644
--- a/chat/unrealircd/Makefile
+++ b/chat/unrealircd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2015/01/17 15:24:22 bsiegert Exp $
+# $NetBSD: Makefile,v 1.42 2015/09/07 12:02:06 jperkin Exp $
 
 DISTNAME=	Unreal3.2.10.4
 PKGNAME=	${DISTNAME:tl:S/l/lircd-/1}
@@ -100,10 +100,6 @@ OWN_DIRS_PERMS+=	${UIRCD_HOME:Q}/tmp ${UIRCD_USER:Q} \
 INSTALLATION_DIRS=	sbin ${IRCD_DOCS} ${IRCD_EG} ${IRCD_SHARE}/aliases \
 			${IRCD_SHARE}/modules
 
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=YES
-.endif
-
 CFLAGS.Darwin+=	-DUSE_LOCALE
 CFLAGS.SunOS+=	-DUSE_LOCALE
 
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 6cbf96a88c2..59429605d2b 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2015/06/12 10:48:29 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2015/09/07 12:02:06 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -28,8 +28,6 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.20.0
 .include "../../x11/gtk2/buildlink3.mk"
 
 .if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	YES
-
 .  if empty(PKG_BUILD_OPTIONS.gtk2:Mquartz)
 CONFIGURE_ARGS+=	--enable-xft
 LDFLAGS.Darwin+=	-L${PREFIX}/lib -lX11
diff --git a/databases/openldap-server/options.mk b/databases/openldap-server/options.mk
index 08d9b5d04c5..7178c4ec229 100644
--- a/databases/openldap-server/options.mk
+++ b/databases/openldap-server/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2014/10/06 14:31:33 adam Exp $
+# $NetBSD: options.mk,v 1.19 2015/09/07 12:02:06 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openldap-server
 PKG_SUPPORTED_OPTIONS=	bdb dso inet6 sasl slapi slp smbk5pwd
@@ -88,11 +88,6 @@ PKG_FAIL_REASON+=	"smbk5pwd option to openldap-server is now " \
 ###
 .if !empty(PKG_OPTIONS:Mdso)
 CONFIGURE_ARGS+=	--enable-modules
-# dynamic linking won't work on Darwin when slapd gets stripped
-.include "../../mk/bsd.prefs.mk"
-.  if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.  endif
 .include "../../devel/libltdl/buildlink3.mk"
 .endif
 
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index d9a4d55f49a..9da87d83273 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/04/03 07:38:35 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2015/09/07 12:02:06 jperkin Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
@@ -16,7 +16,6 @@ BUILDLINK_TRANSFORM+=	rm:-ldl
 .if ${OPSYS} == "Darwin"
 BUILDLINK_TRANSFORM+=	rm:-Wl,-soname=libdconf-dbus-1.so.0
 BUILDLINK_TRANSFORM+=	rm:-Wl,-soname=libdconf.so.1
-INSTALL_UNSTRIPPED=	yes
 .endif
 
 BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
diff --git a/editors/emacs23/Makefile.common b/editors/emacs23/Makefile.common
index 349787bc182..c1265df8de4 100644
--- a/editors/emacs23/Makefile.common
+++ b/editors/emacs23/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2014/12/03 13:58:57 joerg Exp $
+# $NetBSD: Makefile.common,v 1.6 2015/09/07 12:02:05 jperkin Exp $
 #
 # used by editors/emacs23/Makefile
 # used by editors/emacs23-nox11/Makefile
@@ -58,10 +58,6 @@ CHECK_WRKREF_SKIP+=	bin/emacs-${EMACS_VERSION}
 # upstream bug #8395.  Details in:
 # http://lists.gnu.org/archive/html/emacs-bug-tracker/2011-07/msg00445.html
 CFLAGS+=		-fno-pie
-# Avoid 'malformed object' errors with older Xcode.
-.  if ${OS_VERSION:R} < 11
-INSTALL_UNSTRIPPED=	yes
-.  endif
 .endif
 
 .if (${OPSYS} == "NetBSD") && \
diff --git a/editors/emacs24/Makefile.common b/editors/emacs24/Makefile.common
index fba2653045c..860bf12c6be 100644
--- a/editors/emacs24/Makefile.common
+++ b/editors/emacs24/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2014/10/28 12:45:57 wiz Exp $
+# $NetBSD: Makefile.common,v 1.12 2015/09/07 12:02:05 jperkin Exp $
 #
 # used by editors/emacs24/Makefile
 # used by editors/emacs24-nox11/Makefile
@@ -52,13 +52,6 @@ CHECK_WRKREF_SKIP+=	bin/emacs-${EMACS_VERSION}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == "Darwin")
-# Avoid 'malformed object' errors with older Xcode.
-.  if ${OS_VERSION:R} < 11
-INSTALL_UNSTRIPPED=	yes
-.  endif
-.endif
-
 .if (${OPSYS} == "NetBSD") && \
     !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)
 # NetBSD with native Clang doesn't provide libgcc, everything is in libc.
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index f0471b9b7f5..723fd26c655 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2015/08/18 07:31:06 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2015/09/07 12:02:05 jperkin Exp $
 
 DISTNAME=	nvi-1.81.6
 PKGREVISION=	10
@@ -33,7 +33,6 @@ CONFIGURE_ENV+=		vi_cv_sys5_pty=no
 .elif ${OPSYS} == "Darwin"
 CONFIGURE_ENV+=		vi_cv_sys5_pty=no
 LDFLAGS+=		-flat_namespace
-INSTALL_UNSTRIPPED=	yes
 .endif
 
 # Use of db1 is not officially supported.
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)
diff --git a/mail/imap-uw/buildlink3.mk b/mail/imap-uw/buildlink3.mk
index a88b8dfecb7..0058c3ae1ca 100644
--- a/mail/imap-uw/buildlink3.mk
+++ b/mail/imap-uw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2014/02/12 23:18:08 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2015/09/07 12:02:06 jperkin Exp $
 
 BUILDLINK_TREE+=	imap-uw
 
@@ -12,9 +12,6 @@ BUILDLINK_ABI_DEPENDS.imap-uw+=	imap-uw>=2007fnb2
 BUILDLINK_PKGSRCDIR.imap-uw?=	../../mail/imap-uw
 . if ${OPSYS} == "Darwin"
 BUILDLINK_LDFLAGS.imap-uw+=	-flat_namespace
-# install will strip the c-client library callback
-# function symbols from the executable unless we do this:
-INSTALL_UNSTRIPPED?=	yes
 . endif
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/mbone/dbeacon/Makefile b/mbone/dbeacon/Makefile
index 077669af24a..d6c06e2c34f 100644
--- a/mbone/dbeacon/Makefile
+++ b/mbone/dbeacon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/01 09:22:20 he Exp $
+# $NetBSD: Makefile,v 1.8 2015/09/07 12:02:06 jperkin Exp $
 #
 
 DISTNAME=	dbeacon-0.3.9.1
@@ -19,8 +19,6 @@ BUILD_DEFS+=	IPV6_READY
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/dbeacon
 INSTALLATION_DIRS+=	share/doc/dbeacon
 
-#INSTALL_UNSTRIPPED=	yes
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dbeacon ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/docs/dbeacon.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index f34eb0b6ab8..6abe188cbe7 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2015/06/12 10:50:38 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2015/09/07 12:02:06 jperkin Exp $
 
 DISTNAME=	kdenlive-0.9.6
 PKGREVISION=	8
@@ -14,7 +14,6 @@ LICENSE=	gnu-gpl-v2
 BUILD_DEPENDS+=	automoc4>=0.9.83:../../devel/automoc4
 DEPENDS+=	dvdauthor>=0.6.18:../../multimedia/dvdauthor
 
-# INSTALL_UNSTRIPPED=no
 # LDFLAGS=-g
 # CFLAGS+=-g
 # CXXFLAGS+=-g
diff --git a/net/ettercap-NG/Makefile b/net/ettercap-NG/Makefile
index af4a95abd51..95ac9854958 100644
--- a/net/ettercap-NG/Makefile
+++ b/net/ettercap-NG/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2015/08/18 07:31:14 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2015/09/07 12:02:06 jperkin Exp $
 
 DISTNAME=	ettercap-NG-0.7.3
 PKGREVISION=	12
@@ -38,12 +38,6 @@ SUBST_SED.conf+=	-e "s|@@LN_INC@@|${BUILDLINK_PREFIX.libnet11}/include/libnet11|
 SUBST_SED.conf+=	-e "s|@@LN_LIB@@|${BUILDLINK_PREFIX.libnet11}/lib/libnet11|g"
 SUBST_MESSAGE.conf=	Fixing configuration script.
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	YES
-.endif
-
 CONF_FILES=	${PREFIX}/share/examples/ettercap-NG/etter.conf \
 		${PKG_SYSCONFDIR}/etter.conf
 
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 07b18b84ad4..1b84f2d701f 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2015/08/28 22:06:18 wiedi Exp $
+# $NetBSD: Makefile,v 1.114 2015/09/07 12:02:06 jperkin Exp $
 
 DISTNAME=	lftp-4.6.3a
 PKGREVISION=	1
@@ -29,9 +29,6 @@ SHLIBTOOL_OVERRIDE=	# empty
 .include "options.mk"
 
 LDFLAGS.Darwin+=	-flat_namespace
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
 
 EGDIR=			${PREFIX}/share/examples/lftp
 CONF_FILES=		${EGDIR}/lftp.conf.default ${PKG_SYSCONFDIR}/lftp.conf
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 29ff21882f9..954c1908883 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2015/04/25 14:23:47 tnn Exp $
+# $NetBSD: Makefile,v 1.94 2015/09/07 12:02:06 jperkin Exp $
 
 DISTNAME=	ntop-4.1.0
 PKGREVISION=	23
@@ -31,12 +31,6 @@ BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.3
 CONFIGURE_ARGS+=	--disable-mt
 .endif
 
-.if ${OPSYS} == "Darwin"
-# This package uses "-flat_namespace -undefined suppress" and exports
-# symbols from the executable that get stripped unless we set this:
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 .if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-4].*))
 USE_BUILTIN.libevent=	no
 .endif
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index 0224f856919..45dfbfecf06 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.77 2015/09/02 11:08:15 szptvlfn Exp $
+# $NetBSD: Makefile.common,v 1.78 2015/09/07 12:02:06 jperkin Exp $
 # used by shells/zsh/Makefile
 
 DISTNAME=	zsh-${ZSH_VERSION}
@@ -21,11 +21,6 @@ TEXINFO_REQD=		4.0
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-#CONFIGURE_ENV+=		INSTALL_PROGRAM=${INSTALL_LIB:Q}
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD"
 # These can't be detected automagically in cross-builds.
 CONFIGURE_ENV+=		zsh_cv_shared_environ=yes
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index b0ff7295179..a5eeada452f 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2015/08/31 15:26:18 sevan Exp $
+# $NetBSD: Makefile,v 1.99 2015/09/07 12:02:06 jperkin Exp $
 
 DISTNAME=	icu4c-55_1-src
 PKGNAME=	${DISTNAME:S/4c//:S/-src//:S/_/./g}
@@ -89,7 +89,7 @@ PLIST_SUBST+=		MH_NAME=mh-qnx
 PLIST_SUBST+=		MH_NAME=mh-unknown
 .endif
 
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "Cygwin"
+.if ${OPSYS} == "Cygwin"
 INSTALL_UNSTRIPPED=	yes
 .endif
 
diff --git a/www/php-fpm/Makefile b/www/php-fpm/Makefile
index 512c351489f..8c798df02f7 100644
--- a/www/php-fpm/Makefile
+++ b/www/php-fpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/03/16 09:09:19 taca Exp $
+# $NetBSD: Makefile,v 1.14 2015/09/07 12:02:06 jperkin Exp $
 
 PKGNAME=	${PHP_PKG_PREFIX}-fpm-${PHP_VERSION}
 CATEGORIES=	www
@@ -41,11 +41,6 @@ RCD_SCRIPTS=		php_fpm
 MESSAGE_SUBST+=		CGIDIR=${CGIDIR}
 MESSAGE_SUBST+=		VARBASE=${VARBASE}
 
-# Make sure modules can link correctly
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sapi/fpm/php-fpm ${DESTDIR}${PREFIX}/sbin/php-fpm
 	${INSTALL_MAN} ${WRKSRC}/sapi/fpm/php-fpm.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/