Fix packaging under OpenBSD

* It create .so.1.0 libraries instead of .so
* Use bsdtar as tar forcibly under OpenBSD
* Fix tremor/vorbis conditional, but it is not used now

2 files changed, 19 insertions, 11 deletions

diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 3917d74d9b3..f7fa07b9780 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.79 2014/04/30 15:07:17 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.80 2014/05/05 20:47:14 ryoon Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/blocklist.xml
@@ -835,7 +835,7 @@ lib/firefox/browser/components/components.manifest
 lib/firefox/browser/components/devtools-clhandler.js
 lib/firefox/browser/components/fuelApplication.js
 lib/firefox/browser/components/interfaces.xpt
-lib/firefox/browser/components/libbrowsercomps.so
+lib/firefox/browser/components/libbrowsercomps${DLL_SUFFIX}
 lib/firefox/browser/components/nsBrowserContentHandler.js
 lib/firefox/browser/components/nsBrowserGlue.js
 lib/firefox/browser/components/nsSessionStartup.js
@@ -1797,9 +1797,9 @@ lib/firefox/components/contentSecurityPolicy.js
 lib/firefox/components/crypto-SDR.js
 lib/firefox/components/interfaces.xpt
 lib/firefox/components/jsconsole-clhandler.js
-${PLIST.gnome}lib/firefox/components/libdbusservice.so
-lib/firefox/components/libmozgnome.so
-${PLIST.gnome}lib/firefox/components/libnkgnomevfs.so
+${PLIST.gnome}lib/firefox/components/libdbusservice${DLL_SUFFIX}
+lib/firefox/components/libmozgnome${DLL_SUFFIX}
+${PLIST.gnome}lib/firefox/components/libnkgnomevfs${DLL_SUFFIX}
 lib/firefox/components/marionettecomponent.js
 lib/firefox/components/messageWakeupService.js
 lib/firefox/components/nsBlocklistService.js
@@ -1881,9 +1881,9 @@ lib/firefox/hyphenation/hyph_sl.dic
 lib/firefox/hyphenation/hyph_sv.dic
 lib/firefox/hyphenation/hyph_tr.dic
 lib/firefox/hyphenation/hyph_uk.dic
-lib/firefox/libmozalloc.so
-lib/firefox/libmozjs.so
-lib/firefox/libxul.so
+lib/firefox/libmozalloc${DLL_SUFFIX}
+lib/firefox/libmozjs${DLL_SUFFIX}
+lib/firefox/libxul${DLL_SUFFIX}
 lib/firefox/modules/ActivitiesService.jsm
 lib/firefox/modules/ActivitiesServiceFilter.jsm
 lib/firefox/modules/AddonLogging.jsm
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 139a3490cc7..68732dc5a53 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.31 2014/05/05 05:04:46 obache Exp $
+# $NetBSD: mozilla-common.mk,v 1.32 2014/05/05 20:47:14 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -13,6 +13,7 @@ UNLIMIT_RESOURCES+=	datasize
 .include "../../mk/bsd.prefs.mk"
 # tar(1) of OpenBSD 5.5 has no --exclude command line option.
 .if ${OPSYS} == "OpenBSD"
+TOOLS_PLATFORM.tar=	${TOOLS_PREFIX.bsdtar}/bin/bsdtar
 USE_TOOLS+=		bsdtar
 .endif
 # gcc45-4.5.3 of lang/gcc45 does not generate proper binary,
@@ -143,8 +144,7 @@ PLIST.throwwrapper=	yes
 PLIST.sps=	yes
 .endif
 
-.if !empty(MACHINE_PLATFORM:MLinux-*-arm*) || ${OPSYS} == "DragonFly" \
-    || ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
+.if !empty(MACHINE_PLATFORM:MLinux-*-arm*)
 PLIST.tremor=	yes
 .else
 PLIST.vorbis=	yes
@@ -179,6 +179,14 @@ CONFIGURE_ENV+=	ac_cv_thread_keyword=no
 PREFER.bzip2?=	pkgsrc
 .endif
 
+.if ${OPSYS} == "OpenBSD"
+PLIST_SUBST+=	DLL_SUFFIX=".so.1.0"
+.elif ${OPSYS} == "Darwin"
+PLIST_SUBST+=	DLL_SUFFIX=".dylib"
+.else
+PLIST_SUBST+=	DLL_SUFFIX=".so"
+.endif
+
 .include "../../archivers/bzip2/buildlink3.mk"
 #.include "../../audio/libopus/buildlink3.mk"
 #.include "../../audio/tremor/buildlink3.mk"