summaryrefslogtreecommitdiffstats
path: root/deskutils
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2005-11-14 12:12:10 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2005-11-14 12:12:10 +0800
commit10f20df13d5bb31ba0adee47cca87786f9f55a54 (patch)
tree24a11096e1315f726d54c91b00c153a53dfe79cc /deskutils
parent6aeec1b976e64de14caa674fe7173e5be17e9b23 (diff)
downloadmarcuscom-ports-10f20df13d5bb31ba0adee47cca87786f9f55a54.tar
marcuscom-ports-10f20df13d5bb31ba0adee47cca87786f9f55a54.tar.gz
marcuscom-ports-10f20df13d5bb31ba0adee47cca87786f9f55a54.tar.bz2
marcuscom-ports-10f20df13d5bb31ba0adee47cca87786f9f55a54.tar.lz
marcuscom-ports-10f20df13d5bb31ba0adee47cca87786f9f55a54.tar.xz
marcuscom-ports-10f20df13d5bb31ba0adee47cca87786f9f55a54.tar.zst
marcuscom-ports-10f20df13d5bb31ba0adee47cca87786f9f55a54.zip
- Support Makefile.common in all mozilla ports
- Make all mozilla ports use system nss, nspr, and libm and some mozilla ports use system cairo - Do a bunch of much needed catch-up and sync work on many mozilla ports such as libesd and cups patch, and many other misc patches - This adds WITH_DEBUG/WITH_LOGGING to many mozilla ports that didn't have it before. - Extend EXTRACT_AFTER_ARGS so everything will extract faster. Todo: Sync thunderbird-devel with thunderbird THEN make it use Makefile.common git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5125 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/sunbird/Makefile69
-rw-r--r--deskutils/sunbird/files/mozconfig.in54
-rw-r--r--deskutils/sunbird/files/patch-libm25
-rw-r--r--deskutils/sunbird/files/patch-nsprpub-pr-include-md-_pth.h11
-rw-r--r--deskutils/sunbird/files/patch-nsprpub_pr_include_md_freebsd.cfg11
-rw-r--r--deskutils/sunbird/files/patch-sysnss156
-rw-r--r--deskutils/sunbird/pkg-install.in4
7 files changed, 188 insertions, 142 deletions
diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile
index 4ae00fd72..a2db111c1 100644
--- a/deskutils/sunbird/Makefile
+++ b/deskutils/sunbird/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/sunbird/Makefile,v 1.8 2005/08/19 01:52:37 mezz Exp $
+# $MCom: ports/deskutils/sunbird/Makefile,v 1.9 2005/11/08 05:14:54 ahze Exp $
#
PORTNAME= sunbird
@@ -15,66 +15,25 @@ MASTER_SITE_SUBDIR= ahze
MAINTAINER= gnome@FreeBSD.org
COMMENT= Redesign of the Mozilla Calendar with XUL interface
-LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.5:${PORTSDIR}/graphics/png \
- Xft.2:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
-
USE_GCC= 3.4+
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
-FAKEDIR= ${WRKDIR}/fake
-USE_REINPLACE= yes
HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
-USE_GNOME= gtk20 libidl
-USE_ICONV= yes
-USE_PERL5_BUILD=yes
+WANT_GNOME= yes
USE_X_PREFIX= yes
-WRKSRC= ${WRKDIR}/mozilla
-PLIST= ${WRKDIR}/plist
-PKGINSTALL= ${WRKDIR}/pkg-install
-PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
SUNBIRD= ${PORTNAME}
SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm
SUNBIRD_ICON= ${PORTNAME}.xpm
-PKGCONFIG_FILES=sunbird-gtkmozembed sunbird-js sunbird-xpcom \
- sunbird-nspr sunbird-nss sunbird-plugin
-
-OPTIONS= DEBUG "Build with debugging" off \
- OPTIMIZED_CFLAGS "Enable some additional optimizations" off
-
-EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \
- --exclude */macbuild/*\
- --exclude */package/* \
- --exclude .cvsignore \
- --exclude makefile.win \
- --exclude MANIFEST
.include <bsd.port.pre.mk>
-
-CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include
-CFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${X11BASE}/lib
-LIBS+= ${PTHREAD_LIBS}
+.include "${.CURDIR}/../../www/mozilla/Makefile.common"
.if ${PERL_LEVEL} < 500600
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
.endif
-.if defined(WITH_DEBUG)
-WITH_LOGGING= yes
-CONFIGURE_ENV+= WITH_DEBUG=yes
-.endif
-
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+= -O2
-CONFIGURE_ENV+= WITH_OPTIMIZE=-O2
-.else
-CONFIGURE_ENV+= WITH_OPTIMIZE=-O
-.endif
-
pre-extract::
@${ECHO_MSG}
@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -83,36 +42,14 @@ pre-extract::
post-extract::
@${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \
${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
- @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \
- -e 's|@CFLAGS@|${CFLAGS}|' \
- -e 's|@LDFLAGS@|${LDFLAGS}|' \
- -e 's|@LIBS@|${LIBS}|' \
- -e 's|@X11BASE@|${X11BASE}|' \
- -e 's|@LOCALBASE@|${LOCALBASE}|' \
- -e 's|@FAKEDIR@|${FAKEDIR}|' \
- -e 's|@PERL@|${PERL5}|' \
- <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
post-patch:
- @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${SUNBIRD}|g ; \
- s|%%PREFIX%%|${PREFIX}|g ; \
- s|%%X11BASE%%|${X11BASE}|g' \
- < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
- @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${SUNBIRD}|g' \
- < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/build/unix/run-mozilla.sh
- @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
- s|-lpthread|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/configure \
- ${WRKSRC}/nsprpub/configure
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/nsprpub/config/config.mk \
${WRKSRC}/security/coreconf/FreeBSD.mk \
${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
${WRKSRC}/js/src/Makefile.in
- @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
- ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
embedding/minimo
@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
diff --git a/deskutils/sunbird/files/mozconfig.in b/deskutils/sunbird/files/mozconfig.in
index 6043e31f5..ca5d39483 100644
--- a/deskutils/sunbird/files/mozconfig.in
+++ b/deskutils/sunbird/files/mozconfig.in
@@ -1,64 +1,12 @@
# .mozconfig.in -*-shell-script-*-
# $FreeBSD$
-# $MCom$
+# $MCom: ports/deskutils/sunbird/files/mozconfig.in,v 1.3 2005/06/28 05:39:59 adamw Exp $
######################################################################
# standard opts from README
mk_add_options MOZ_CO_PROJECT=calendar
ac_add_options --enable-application=calendar
-
ac_add_options --enable-plaintext-editor-only
ac_add_options --enable-necko-protocols=about,http,ftp,file,jar,res
-ac_add_options --enable-storage
-ac_add_options --disable-accessibility
-ac_add_options --disable-activex
-ac_add_options --disable-activex-scripting
-ac_add_options --disable-installer
-ac_add_options --disable-jsd
-ac_add_options --disable-mathml
-ac_add_options --disable-necko-disk-cache
-ac_add_options --disable-oji
-ac_add_options --disable-view-source
-ac_add_options --disable-logging
ac_add_options --disable-plugins
ac_add_options --disable-cookies
-ac_add_options --enable-default-toolkit=gtk2
-# Must have xft for gtk2 version.
-ac_add_options --enable-xft
-# Conflicts with xft
-ac_add_options --disable-freetype2
-# See the following URL for approval email for using official branding
-# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
-# !! Not sure about this yet? !!
-#ac_add_options --enable-official-branding
-######################################################################
-# FBSD specific
-export CPPFLAGS="@CPPFLAGS@"
-export CFLAGS="@CFLAGS@"
-export LIBS="@LIBS@"
-export LDFLAGS="@LDFLAGS@"
-export CONFIG_SH=/bin/sh
-export XP_UNIX=1
-mk_add_options XP_UNIX=1
-export PERL="@PERL@"
-mk_add_options PERL=$PERL
-# Configure options for installation
-ac_add_options --prefix=@FAKEDIR@
-ac_add_options --x-includes=@X11BASE@/include
-ac_add_options --x-libraries=@X11BASE@/lib
-######################################################################
-# Use ports for these libraries
-ac_add_options --with-system-jpeg=@LOCALBASE@
-ac_add_options --with-system-png=@LOCALBASE@
-######################################################################
-# set compile/link features
-ac_add_options --with-pthreads
-if test -n "$WITH_DEBUG"; then
- ac_add_options --enable-debug
- ac_add_options --disable-strip
-else
- ac_add_options --disable-debug
- ac_add_options --enable-optimize=${WITH_OPTIMIZE}
- ac_add_options --enable-strip
-fi # test -n "$WITH_DEBUG"
-######################################################################
diff --git a/deskutils/sunbird/files/patch-libm b/deskutils/sunbird/files/patch-libm
new file mode 100644
index 000000000..7de64b2a5
--- /dev/null
+++ b/deskutils/sunbird/files/patch-libm
@@ -0,0 +1,25 @@
+--- js/src/Makefile.in Thu Aug 4 22:26:52 2005
++++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
+@@ -148,5 +148,4 @@
+ endif
+
+-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
+ JSMATH_PRELINK = jsmathtemp.o
+ JS_SAFE_ARENA = 1
+@@ -320,7 +319,4 @@
+ endif
+ @$(RM) -f $(JSMATH_PRELINK)
+-else
+-# Create dependency so we build fdlibm
+-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
+ endif
+
+--- js/Makefile.in Sun Mar 23 14:36:00 2003
++++ js/Makefile.in Thu Aug 4 23:08:06 2005
+@@ -46,5 +46,5 @@
+ #
+
+-DIRS = src/fdlibm src
++DIRS = src
+
+ include $(topsrcdir)/config/rules.mk
diff --git a/deskutils/sunbird/files/patch-nsprpub-pr-include-md-_pth.h b/deskutils/sunbird/files/patch-nsprpub-pr-include-md-_pth.h
deleted file mode 100644
index 8d2749244..000000000
--- a/deskutils/sunbird/files/patch-nsprpub-pr-include-md-_pth.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsprpub/pr/include/md/_pth.h.orig Sun Jan 16 16:09:10 2005
-+++ nsprpub/pr/include/md/_pth.h Sun Jan 16 16:10:06 2005
-@@ -84,7 +84,7 @@
- #define _PT_PTHREAD_MUTEXATTR_DESTROY(x) /* */
- #define _PT_PTHREAD_MUTEX_INIT(m, a) (memset(&(m), 0, sizeof(m)), \
- pthread_mutex_init(&(m), NULL))
--#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m)))
-+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m)))
- #define _PT_PTHREAD_CONDATTR_INIT(x) 0
- #define _PT_PTHREAD_CONDATTR_DESTROY(x) /* */
- #define _PT_PTHREAD_COND_INIT(m, a) (memset(&(m), 0, sizeof(m)), \
diff --git a/deskutils/sunbird/files/patch-nsprpub_pr_include_md_freebsd.cfg b/deskutils/sunbird/files/patch-nsprpub_pr_include_md_freebsd.cfg
deleted file mode 100644
index cb309ac98..000000000
--- a/deskutils/sunbird/files/patch-nsprpub_pr_include_md_freebsd.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsprpub/pr/include/md/_freebsd.cfg.orig Sun Jan 16 16:13:08 2005
-+++ nsprpub/pr/include/md/_freebsd.cfg Sun Jan 16 16:16:34 2005
-@@ -141,7 +141,7 @@
- #define PR_ALIGN_OF_DOUBLE 8
- #define PR_ALIGN_OF_POINTER 8
-
--#elif defined(__sparc__)
-+#elif defined(__sparc64__)
-
- #undef IS_LITTLE_ENDIAN
- #define IS_BIG_ENDIAN 1
diff --git a/deskutils/sunbird/files/patch-sysnss b/deskutils/sunbird/files/patch-sysnss
new file mode 100644
index 000000000..a9154ce9a
--- /dev/null
+++ b/deskutils/sunbird/files/patch-sysnss
@@ -0,0 +1,156 @@
+--- Makefile.in Tue Sep 14 16:59:40 2004
++++ Makefile.in Tue Aug 2 08:26:55 2005
+@@ -102,6 +102,4 @@
+ # tier 1 - 3rd party individual libraries
+ #
+-tier_1_dirs += dbm
+-
+ ifndef MOZ_NATIVE_JPEG
+ tier_1_dirs += jpeg
+--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
++++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
+@@ -117,5 +117,5 @@
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's
+-LOCAL_INCLUDES += -I$(DIST)/public/nss \
++LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
+ $(NULL)
+
+--- config/config.mk Tue Oct 12 00:11:11 2004
++++ config/config.mk Tue Aug 2 09:19:18 2005
+@@ -170,5 +170,4 @@
+ NSS_LIBS = \
+ $(LIBS_DIR) \
+- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+ -lsmime3 \
+ -lssl3 \
+@@ -189,11 +188,5 @@
+ endif
+
+-NSS_DEP_LIBS = \
+- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
+- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
+- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
+- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
+- $(NULL)
++NSS_DEP_LIBS =
+
+ MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
+--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
++++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
+@@ -88,4 +88,8 @@
+ }
+
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <errno.h>
++
+ #ifdef PR_LOGGING
+ PRLogModuleInfo* gPIPNSSLog = nsnull;
+@@ -406,4 +410,5 @@
+ const char *possible_ckbi_locations[] = {
+ NS_GRE_DIR,
++ NS_UNIX_LIB_DIR,
+ NS_XPCOM_CURRENT_PROCESS_DIR
+ };
+@@ -419,5 +424,5 @@
+ }
+
+- char *fullModuleName = nsnull;
++ char *fullModuleName;
+ #ifdef XP_MAC
+ nsCAutoString nativePath;
+@@ -431,4 +436,12 @@
+ fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
+ #endif
++ if (fullModuleName == nsnull)
++ continue;
++ struct stat sb;
++ if (stat(fullModuleName, &sb)) {
++ if (errno != ENOENT)
++ perror(fullModuleName);
++ continue;
++ }
+ /* If a module exists with the same name, delete it. */
+ NS_ConvertUCS2toUTF8 modNameUTF8(modName);
+--- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005
++++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005
+@@ -52,18 +52,9 @@
+ SSL3_LIB \
+ SOFTOKEN3_LIB \
+ SOFTOKEN3_CHK \
+- LOADABLE_ROOT_MODULE \
+ HAVE_FREEBL_MODULES \
+ $(NULL)
+
+-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+-
+-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
+-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
+-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
+-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
+-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
+-
+ ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
+ ifeq (,$(filter i86pc ia64,$(OS_TEST)))
+ ifndef HAVE_64BIT_OS
+@@ -151,11 +142,6 @@
+
+ .nss.cleaned: .nss.checkout
+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+-ifndef SKIP_CHK
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+-endif
+ touch $@
+
+ .nss.checkout:
+@@ -176,10 +162,10 @@
+ else
+ cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+ endif
+- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
++# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
+ ifndef SKIP_CHK
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
++# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
++# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
+ endif
+ $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
+ ifndef SKIP_CHK
+@@ -203,20 +189,6 @@
+ endif
+
+ install::
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
+-ifdef HAVE_FREEBL_MODULES
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
+-endif
+ $(MAKE) -C boot $@
+ $(MAKE) -C ssl $@
+ $(MAKE) -C locales $@
+@@ -232,11 +204,6 @@
+ $(MAKE) -C pki $@
+ endif
+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+-ifndef SKIP_CHK
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+-endif
+
+ echo-requires-recursive::
+ $(MAKE) -C boot $@
diff --git a/deskutils/sunbird/pkg-install.in b/deskutils/sunbird/pkg-install.in
index c62277ff4..88bd2fcc4 100644
--- a/deskutils/sunbird/pkg-install.in
+++ b/deskutils/sunbird/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/deskutils/sunbird/pkg-install.in,v 1.4 2005/06/28 05:39:59 adamw Exp $
#
# Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
@@ -23,4 +23,6 @@ cd ${MOZDIR} || exit 1
./run-mozilla.sh ${REGXPCOM} || true
./run-mozilla.sh ${SUNBIRD} -register > /dev/null 2>&1
+touch -f ${MOZDIR}/chrome/user-skins.rdf ${MOZDIR}/chrome/user-locales.rdf
+
exit 0