[SVN-Commit] r247 - in branches/experimental/deskutils/lightning: . files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Fri Jan 22 20:12:56 UTC 2010


Author: beat
Date: Fri Jan 22 20:12:48 2010
New Revision: 247

Log:
- Fix installation (taken from mail/enigmail)
- Add pkg-message (taken from mail/enigmail)
- Update pkg-descr
- Remove old sunbird cruft

Added:
   branches/experimental/deskutils/lightning/pkg-message
Deleted:
   branches/experimental/deskutils/lightning/files/sunbird.desktop.in
Modified:
   branches/experimental/deskutils/lightning/Makefile
   branches/experimental/deskutils/lightning/pkg-descr

Modified: branches/experimental/deskutils/lightning/Makefile
==============================================================================
--- branches/experimental/deskutils/lightning/Makefile	Fri Jan 22 15:39:15 2010	(r246)
+++ branches/experimental/deskutils/lightning/Makefile	Fri Jan 22 20:12:48 2010	(r247)
@@ -13,7 +13,7 @@
 DISTNAME=	${PORTNAME}-sunbird-${DISTVERSION}.source
 
 MAINTAINER=	gecko at FreeBSD.org
-COMMENT=	Redesign of the Mozilla Calendar with XUL interface
+COMMENT=	An integrated calendar for Thunderbird and SeaMonkey
 
 USE_AUTOTOOLS=	libtool:22
 ALL_TARGET=	default
@@ -27,9 +27,6 @@
 WANT_PERL=	yes
 USE_MOZILLA=	-png -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
-SUNBIRD=	${PORTNAME}
-SUNBIRD_ICON_SRC=	${PREFIX}/lib/sunbird/chrome/icons/default/default.xpm
-SUNBIRD_ICON=		${PORTNAME}.xpm
 LIBS=		-Wl,-Bsymbolic -lc
 MOZ_PKGCONFIG_FILES=	${PORTNAME}-js ${PORTNAME}-xpcom ${PORTNAME}-plugin
 PKGCONFIG_FILES=	${MOZ_PKG_CONFIG_FILES}
@@ -37,14 +34,18 @@
 		--enable-system-cairo \
 		--enable-canvas
 MOZ_MK_OPTIONS=	MOZ_CO_PROJECT=calendar
-
-GECKO_PLIST_PRE_FILES=	lib/sunbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest \
-			lib/sunbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
+NOGECKO_PLIST=		yes
+NOGECKO_INSTALL=	yes
+OPTIONS=
 
 .include <bsd.init.mk>
 .include <bsd.libnames.mk>
 .include <bsd.port.pre.mk>
 
+XPI_FILE=	${DISTNAME}-${GECKO}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi
+PLIST_FILES=	%%DATADIR%%/${XPI_FILE}
+PLIST_DIRS=	%%DATADIR%%
+
 WRKSRC=		${WRKDIR}/comm-1.9.1
 MOZSRC:=	${WRKSRC}/mozilla
 
@@ -57,13 +58,6 @@
 
 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
 
-.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
@@ -74,8 +68,6 @@
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
 		${MOZSRC}/storage/build/Makefile.in \
 		${MOZSRC}/db/sqlite3/src/Makefile.in
-	@${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \
-		${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${MOZSRC}/security/manager/ssl/src/Makefile.in \
 		${MOZSRC}/js/src/config/mkdepend/Makefile.in \
@@ -100,18 +92,11 @@
 post-build:
 	@(cd ${MOZSRC}/xpfe/components/autocomplete/src && ${GMAKE})
 
-pre-install:
-	${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
-	${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
-	${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
-	${ECHO_CMD} '@dirrmtry lib/sunbird/plugins' >> ${PLIST}
-	${ECHO_CMD} '@dirrmtry lib/sunbird' >> ${PLIST}
-
 do-install:
-	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKDIR}/sunbird.desktop ${PREFIX}/share/applications
-	${LN} -sf ${SUNBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${SUNBIRD_ICON}
-	${TOUCH} ${PREFIX}/lib/sunbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
-	${TOUCH} ${PREFIX}/lib/sunbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/${PORTNAME}.xpi ${DATADIR}/${XPI_FILE}
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Deleted: branches/experimental/deskutils/lightning/files/sunbird.desktop.in
==============================================================================
--- branches/experimental/deskutils/lightning/files/sunbird.desktop.in	Fri Jan 22 20:12:48 2010	(r246)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Mozilla Calendar
-Comment=Mozilla Sunbird Calendar
-Icon=@SUNBIRD_ICON@
-Exec=sunbird
-Terminal=false
-Type=Application
-Categories=Application;Office;

Modified: branches/experimental/deskutils/lightning/pkg-descr
==============================================================================
--- branches/experimental/deskutils/lightning/pkg-descr	Fri Jan 22 15:39:15 2010	(r246)
+++ branches/experimental/deskutils/lightning/pkg-descr	Fri Jan 22 20:12:48 2010	(r247)
@@ -1,5 +1,6 @@
-The Sunbird Project is a redesign of the Mozilla Calendar component. The goal
-is to produce a cross platform standalone calendar application based on
-Mozilla's XUL user interface language.
+Lightning brings the Sunbird calendar to the popular email client, Mozilla
+Thunderbird and the SeaMonkey  internet application suite. Since it's an
+extension, Lightning is tightly integrated with Thunderbird or SeaMonkey,
+allowing it to easily perform email-related calendaring tasks. 
 
-WWW:	http://www.mozilla.org/projects/calendar/sunbird.html
+WWW:	http://www.mozilla.org/projects/calendar/lightning/

Added: branches/experimental/deskutils/lightning/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/deskutils/lightning/pkg-message	Fri Jan 22 20:12:48 2010	(r247)
@@ -0,0 +1,9 @@
+*****************************************************************************
+In order to activate the Lightning extension, every user should install the 
+XPI file into his own profile via the menu:
+
+Tools -> Add-ons -> Install (for Thunderbird)
+- or -
+File -> Open file (for Seamonkey)
+
+*****************************************************************************


More information about the freebsd-gecko mailing list