From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 25 06:46:05 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CE27106566C for ; Fri, 25 Jun 2010 06:46:05 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4989C8FC08 for ; Fri, 25 Jun 2010 06:46:04 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id o5P6k39j099924 for ; Fri, 25 Jun 2010 06:46:03 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id o5P6jwGH098980 for freebsd-gecko@freebsd.org; Fri, 25 Jun 2010 06:45:58 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 25 Jun 2010 06:45:58 GMT Message-Id: <201006250645.o5P6jwGH098980@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r330 - branches/experimental/mail/thunderbird3 branches/experimental/mail/thunderbird3-devel branches/experimental/mail/thunderbird3-devel/files branches/experimental/mail/thunderbird3/files trunk/mail/thunderbird3 trunk/mail/thunderbird3/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2010 06:46:05 -0000 Author: beat Date: Fri Jun 25 06:45:58 2010 New Revision: 330 Log: - Don't add version information in installation paths. This is needed to unbreak thunderbird-dictionaries with Thunderbird 3. Reported by: Matthew Luckie Added: branches/experimental/mail/thunderbird3-devel/files/patch-config-autoconf.mk.in branches/experimental/mail/thunderbird3/files/patch-config-autoconf.mk.in trunk/mail/thunderbird3/files/patch-config-autoconf.mk.in Modified: branches/experimental/mail/thunderbird3-devel/Makefile branches/experimental/mail/thunderbird3/Makefile trunk/mail/thunderbird3/Makefile Modified: branches/experimental/mail/thunderbird3-devel/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3-devel/Makefile Thu Jun 24 21:35:56 2010 (r329) +++ branches/experimental/mail/thunderbird3-devel/Makefile Fri Jun 25 06:45:58 2010 (r330) @@ -33,8 +33,6 @@ USE_BZIP2= yes USE_GMAKE= yes -MOZILLA= ${PORTNAME}-${PORTVERSION} -MOZILLA_EXEC_NAME= ${PORTNAME} MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ @@ -49,7 +47,7 @@ PORTNAME_ICON= ${PORTNAME}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png -SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js +SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS= @@ -109,7 +107,7 @@ ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ ${FAKEDIR}/bin/thunderbird ${RM} -f ${FAKEDIR}/bin/*.bak - ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults + ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults pre-install: @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} Added: branches/experimental/mail/thunderbird3-devel/files/patch-config-autoconf.mk.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird3-devel/files/patch-config-autoconf.mk.in Fri Jun 25 06:45:58 2010 (r330) @@ -0,0 +1,21 @@ +--- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200 ++++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200 +@@ -57,14 +57,14 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/%%MOZILLA%% + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = $(datadir)/idl/%%MOZILLA%% + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Thu Jun 24 21:35:56 2010 (r329) +++ branches/experimental/mail/thunderbird3/Makefile Fri Jun 25 06:45:58 2010 (r330) @@ -33,8 +33,6 @@ USE_BZIP2= yes USE_GMAKE= yes -MOZILLA= ${PORTNAME}-${PORTVERSION} -MOZILLA_EXEC_NAME= ${PORTNAME} MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ @@ -48,7 +46,7 @@ PORTNAME_ICON= ${PORTNAME}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png -SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js +SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS= @@ -107,7 +105,7 @@ ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ ${FAKEDIR}/bin/thunderbird ${RM} -f ${FAKEDIR}/bin/*.bak - ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults + ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults pre-install: @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} Added: branches/experimental/mail/thunderbird3/files/patch-config-autoconf.mk.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird3/files/patch-config-autoconf.mk.in Fri Jun 25 06:45:58 2010 (r330) @@ -0,0 +1,21 @@ +--- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200 ++++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200 +@@ -57,14 +57,14 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/%%MOZILLA%% + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = $(datadir)/idl/%%MOZILLA%% + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ Modified: trunk/mail/thunderbird3/Makefile ============================================================================== --- trunk/mail/thunderbird3/Makefile Thu Jun 24 21:35:56 2010 (r329) +++ trunk/mail/thunderbird3/Makefile Fri Jun 25 06:45:58 2010 (r330) @@ -33,8 +33,6 @@ USE_BZIP2= yes USE_GMAKE= yes -MOZILLA= ${PORTNAME}-${PORTVERSION} -MOZILLA_EXEC_NAME= ${PORTNAME} MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ @@ -48,7 +46,7 @@ PORTNAME_ICON= ${PORTNAME}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png -SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js +SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS= @@ -107,7 +105,7 @@ ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ ${FAKEDIR}/bin/thunderbird ${RM} -f ${FAKEDIR}/bin/*.bak - ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults + ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults pre-install: @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} Added: trunk/mail/thunderbird3/files/patch-config-autoconf.mk.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird3/files/patch-config-autoconf.mk.in Fri Jun 25 06:45:58 2010 (r330) @@ -0,0 +1,21 @@ +--- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200 ++++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200 +@@ -57,14 +57,14 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/%%MOZILLA%% + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = $(datadir)/idl/%%MOZILLA%% + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@