$NetBSD$

--- modules/libpr0n/decoders/icon/Makefile.in.orig	2008-03-01 08:24:54.000000000 +0900
+++ modules/libpr0n/decoders/icon/Makefile.in
@@ -67,7 +67,7 @@ ifeq ($(OS_ARCH),OS2)
 PLATFORM = os2
 endif
 
-ifeq ($(OS_ARCH),Darwin)
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 PLATFORM = mac
 endif
 
@@ -127,4 +127,12 @@ include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),Darwin)
 EXTRA_DSO_LDOPTS += $(TK_LIBS)
+
+_libs_to_fix = \
+	-lxpcom \
+	-lxpcom_core \
+	-lxul \
+	-lmozjs \
+	$(filter -l%, $(NSS_LIBS))
+EXTRA_DSO_LDOPTS += $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(_libs_to_fix)), -dylib_file $(libdir)/$(MOZILLA_PKG_NAME)/$(library):$(DIST)/bin/$(library))
 endif