Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 May 2009 16:38:37 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r22 - in trunk/www/flock: . files
Message-ID:  <200905021638.n42GcbsR064121@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: beat
Date: Sat May  2 16:38:36 2009
New Revision: 22

Log:
- Make flock 2.0 buildable
- Remove unneeded patches files/patch-security-manager-ssl-src_Makefile.in
  and files/patch-security-manager_Makefile.in  
- Remove empty patch files
- Patches files/patch-toolkit_mozapps_installer_packager.mk,
  files/patch-db_sqlite3_src_Makefile.in and most changes in Makefile
  obtained from www/firefox3 port   
- Patches files/patch-flock_base_common_src_flockLuceneImpl.cpp 
  and files/patch-flock_base_common_src_Makefile.in may need some 
  additional review
- Enable multiple make jobs
- Remove BROKEN for ARCH other than i386. Build test on amd64 scheduled
  by miwi

Added:
   trunk/www/flock/files/patch-db_sqlite3_src_Makefile.in
   trunk/www/flock/files/patch-flock_base_common_src_Makefile.in
   trunk/www/flock/files/patch-flock_base_common_src_flockLuceneImpl.cpp
   trunk/www/flock/files/patch-toolkit_mozapps_installer_packager.mk
Deleted:
   trunk/www/flock/files/patch-Double.cpp
   trunk/www/flock/files/patch-allmakefiles.sh
   trunk/www/flock/files/patch-browser_app_mozilla.in
   trunk/www/flock/files/patch-configure
   trunk/www/flock/files/patch-flock_app_mozilla.in
   trunk/www/flock/files/patch-js_src_liveconnect_nsISecureLiveconnect.h
   trunk/www/flock/files/patch-libm
   trunk/www/flock/files/patch-modules_libpref_src_init_all.js
   trunk/www/flock/files/patch-security-manager-ssl-src_Makefile.in
   trunk/www/flock/files/patch-security-manager_Makefile.in
   trunk/www/flock/files/patch-sysnss
   trunk/www/flock/files/patch-toolkit_xre_nsXREDirProvider.cpp
   trunk/www/flock/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
Modified:
   trunk/www/flock/Makefile

Modified: trunk/www/flock/Makefile
==============================================================================
--- trunk/www/flock/Makefile	Thu Apr 30 07:35:38 2009	(r21)
+++ trunk/www/flock/Makefile	Sat May  2 16:38:36 2009	(r22)
@@ -8,7 +8,6 @@
 
 PORTNAME=	flock
 DISTVERSION=	2.0
-PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.osuosl.org/pub/${PORTNAME}/releases/${PORTVERSION}/ \
 		http://flock.vo.llnwd.net/o23/archive/${PORTNAME}/releases/${PORTVERSION}/
@@ -17,10 +16,10 @@
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nss>=3.11.2:${PORTSDIR}/security/nss
 LIB_DEPENDS=	clucene.0:${PORTSDIR}/textproc/clucene \
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 
+USE_GECKO=	gecko
 MOZILLA_NAME=	Flock
 USE_MOZILLA=	-png -nss -dbm -jpeg
 MOZ_TOOLKIT=	cairo-gtk2
@@ -35,7 +34,18 @@
 USE_GMAKE=	yes
 WANT_PERL=	yes
 GECKO_PLIST_PRE_FILES=	lib/${MOZILLA}/chrome/icons/default/default.xpm
-GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons
+GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA} lib/${MOZILLA}/chrome \
+			lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons \
+			lib/${MOZILLA}-devel-${DISTVERSION}/sdk/include \
+			lib/${MOZILLA}-devel-${DISTVERSION}/sdk/idl \
+			lib/${MOZILLA}-devel-${DISTVERSION}/lib \
+			lib/${MOZILLA}-devel-${DISTVERSION}/bin \
+			lib/${MOZILLA}-devel-${DISTVERSION}/include \
+			lib/${MOZILLA}-devel-${DISTVERSION}/idl \
+
+MOZ_PKGCONFIG_FILES=
+MAKE_JOBS_SAFE=	yes
+NO_MOZPKGINSTALL=yes
 
 FLOCK_ICON=	${MOZILLA}.xpm
 FLOCK_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/icons/default.xpm
@@ -44,7 +54,7 @@
 		--enable-system-cairo	\
 		--enable-official-branding \
 		--enable-canvas	\
-		--with-system-nss \
+		--enable-libxul \
 		--with-clucene-prefix=${LOCALBASE} \
 		--with-ffmpeg-prefix=${LOCALBASE}
 
@@ -57,8 +67,17 @@
 
 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
 
-.if ${ARCH} != "i386"
-BROKEN=	does not compile
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+USE_GNOME+=	libgnomeui
+MOZ_OPTIONS+=	--enable-gnomeui
+.else
+MOZ_OPTIONS+=	--disable-gnomeui
+.endif
+
+.if defined(WITHOUT_DBUS)
+MOZ_OPTIONS+=	--disable-dbus
+.else
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 .endif
 
 .if ${ARCH} == "sparc64" && ${OSVERSION} < 601101
@@ -74,7 +93,8 @@
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
-		${WRKSRC}/storage/build/Makefile.in
+		${WRKSRC}/storage/build/Makefile.in \
+		${WRKSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/security/manager/ssl/src/Makefile.in
 	@${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \
@@ -93,5 +113,4 @@
 	${LN} -sf ${FLOCK_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm
 	${LN} -sf ${FLOCK_ICON_SRC} ${PREFIX}/share/pixmaps/${FLOCK_ICON}
 
-.include "${PORTSDIR}/www/mozilla/Makefile.common"
 .include <bsd.port.post.mk>

Deleted: trunk/www/flock/files/patch-Double.cpp
==============================================================================

Deleted: trunk/www/flock/files/patch-allmakefiles.sh
==============================================================================

Deleted: trunk/www/flock/files/patch-browser_app_mozilla.in
==============================================================================

Deleted: trunk/www/flock/files/patch-configure
==============================================================================

Added: trunk/www/flock/files/patch-db_sqlite3_src_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/flock/files/patch-db_sqlite3_src_Makefile.in	Sat May  2 16:38:36 2009	(r22)
@@ -0,0 +1,11 @@
+--- db/sqlite3/src/Makefile.in.orig	2008-06-19 11:03:17.000000000 -0500
++++ db/sqlite3/src/Makefile.in	2008-06-19 11:04:15.000000000 -0500
+@@ -45,6 +45,8 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
++OS_CFLAGS	 = -I../../../dist/include/sqlite3
++OS_LIBS		 = %%PTHREAD_LIBS%%
+ MODULE           = sqlite3
+ LIBRARY_NAME     = sqlite3
+ FORCE_SHARED_LIB = 1

Deleted: trunk/www/flock/files/patch-flock_app_mozilla.in
==============================================================================

Added: trunk/www/flock/files/patch-flock_base_common_src_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/flock/files/patch-flock_base_common_src_Makefile.in	Sat May  2 16:38:36 2009	(r22)
@@ -0,0 +1,13 @@
+--- flock/base/common/src/Makefile.in.orig	2009-04-29 20:37:46.000000000 +0200
++++ flock/base/common/src/Makefile.in	2009-04-29 20:38:02.000000000 +0200
+@@ -104,10 +104,6 @@
+ 
+ EXTRA_DSO_LDOPTS = $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
+ 
+-ifdef MOZ_ENABLE_LIBXUL
+-EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS)
+-else
+ EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
+-endif
+ 
+ include $(topsrcdir)/config/rules.mk

Added: trunk/www/flock/files/patch-flock_base_common_src_flockLuceneImpl.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/flock/files/patch-flock_base_common_src_flockLuceneImpl.cpp	Sat May  2 16:38:36 2009	(r22)
@@ -0,0 +1,10 @@
+--- flock/base/lucene/src/flockLuceneImpl.cpp.orig	2009-05-01 22:20:06.000000000 +0200
++++ flock/base/lucene/src/flockLuceneImpl.cpp	2009-05-01 22:20:26.000000000 +0200
+@@ -283,7 +283,6 @@
+   TokenStream* tokenStream(const TCHAR* fieldName, Reader* reader) {
+     TokenStream* ret = new StandardTokenizer(reader);
+     ret = new StandardFilter(ret, true);
+-    ret = new LowerCaseFilter(ret, true);
+     return ret;
+   }
+ };

Deleted: trunk/www/flock/files/patch-js_src_liveconnect_nsISecureLiveconnect.h
==============================================================================

Deleted: trunk/www/flock/files/patch-libm
==============================================================================

Deleted: trunk/www/flock/files/patch-modules_libpref_src_init_all.js
==============================================================================

Deleted: trunk/www/flock/files/patch-security-manager-ssl-src_Makefile.in
==============================================================================
--- trunk/www/flock/files/patch-security-manager-ssl-src_Makefile.in	Sat May  2 16:38:36 2009	(r21)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,24 +0,0 @@
---- security/manager/ssl/src/Makefile.in.orgi	2009-04-21 01:01:11.000000000 +0200
-+++ security/manager/ssl/src/Makefile.in	2009-04-21 01:03:13.000000000 +0200
-@@ -133,19 +133,18 @@
- 		  pipboot \
- 		  $(NULL)
- 
--EXTRA_DEPS = $(NSS_DEP_LIBS)
--
- DEFINES += -DNSS_ENABLE_ECC
- 
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += $(NSS_CFLAGS)
-+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
- 
- EXTRA_DSO_LDOPTS += \
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(MOZ_COMPONENT_LIBS) \
- 		$(MOZ_JS_LIBS) \
- 		$(NSS_LIBS) \
-+		$(LOCAL_INCLUDES) \
- 		$(NULL)
- 
- include $(topsrcdir)/config/rules.mk

Deleted: trunk/www/flock/files/patch-security-manager_Makefile.in
==============================================================================
--- trunk/www/flock/files/patch-security-manager_Makefile.in	Sat May  2 16:38:36 2009	(r21)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,149 +0,0 @@
---- security/manager/Makefile.in.orig	2008-04-19 15:13:40.000000000 +0200
-+++ security/manager/Makefile.in	2009-04-21 02:28:03.000000000 +0200
-@@ -56,24 +56,13 @@
- 	SOFTOKEN3_LIB \
- 	SOFTOKEN3_CHK \
- 	NSSDBM3_LIB \
--	LOADABLE_ROOT_MODULE \
- 	HAVE_FREEBL_LIBS \
- 	HAVE_FREEBL_LIBS_32 \
- 	HAVE_FREEBL_LIBS_32INT64 \
- 	HAVE_FREEBL_LIBS_64 \
- 	$(NULL)
--
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
- endif
- 
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(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
--NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
--
- ifndef MOZ_NATIVE_NSS
- ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
- SDK_LIBS = \
-@@ -254,10 +243,6 @@
- ifndef MOZ_NATIVE_NSS
- 	$(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 $@
- endif
- 
-@@ -280,50 +265,6 @@
- ifndef MOZ_NATIVE_NSS
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
- 	$(MAKE) -C $(topsrcdir)/security/dbm $(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)
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
--endif
- endif
- ifndef MOZ_NATIVE_NSS
- # NSS installs headers to dist/public and we want them in dist/include
-@@ -345,44 +286,6 @@
- 
- install::
- ifndef MOZ_NATIVE_NSS
--	$(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/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
- endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -398,14 +301,6 @@
- ifdef MOZ_XUL
- 	$(MAKE) -C pki $@
- endif
--ifndef MOZ_NATIVE_NSS
--	$(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
--endif
- 
- echo-requires-recursive::
- 	$(MAKE) -C boot $@

Deleted: trunk/www/flock/files/patch-sysnss
==============================================================================

Added: trunk/www/flock/files/patch-toolkit_mozapps_installer_packager.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/flock/files/patch-toolkit_mozapps_installer_packager.mk	Sat May  2 16:38:36 2009	(r22)
@@ -0,0 +1,20 @@
+--- toolkit/mozapps/installer/packager.mk.orig	2008-04-28 22:30:07.000000000 +0200
++++ toolkit/mozapps/installer/packager.mk	2009-05-02 13:33:13.000000000 +0200
+@@ -418,7 +418,7 @@
+ 	  (cd $(DESTDIR)$(installdir) && tar -xf -)
+ 	$(NSINSTALL) -D $(DESTDIR)$(bindir)
+ 	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
+-	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
++	ln -s $(installdir)/$(MOZ_APP_NAME)-browser $(DESTDIR)$(bindir)
+ ifdef INSTALL_SDK # Here comes the hard part
+ # include directory is stable (dist/sdk/include) and unstable (dist/include)
+ 	$(NSINSTALL) -D $(DESTDIR)$(includedir)/stable
+@@ -426,7 +426,7 @@
+ 	(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
+ # The dist/include has module subdirectories that we need to flatten
+-	find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
++	find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
+ # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
+ 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable 
+ 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable

Deleted: trunk/www/flock/files/patch-toolkit_xre_nsXREDirProvider.cpp
==============================================================================

Deleted: trunk/www/flock/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
==============================================================================



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905021638.n42GcbsR064121>