- Update to 0.2.1.2

Note:	you may have to remove ~/.mozilla/sunbird if you have old calendars.
	also this thing is still not QUITE ready for ports, but it's getting
	there.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4069 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 13 insertions, 20 deletions

diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile
index 9be70de70..d03355ca4 100644
--- a/deskutils/sunbird/Makefile
+++ b/deskutils/sunbird/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sunbird
-PORTVERSION=	0.2.1.1
+PORTVERSION=	0.2.1.2
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
@@ -19,6 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		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
@@ -34,11 +35,9 @@ WRKSRC=		${WRKDIR}/mozilla
 PLIST=		${WRKDIR}/plist
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-
 SUNBIRD=	${PORTNAME}
-
-SUNBIRD_ICON=	${PREFIX}/lib/sunbird/icons/default.xpm
-
+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
 
@@ -120,17 +119,14 @@ post-patch:
 		${WRKSRC}/${ii}/all.js
 .endfor
 
-post-build:
-# Bug fix, from http://www.mozilla.org/projects/calendar/sunbird_build.html
-	cd ${WRKSRC}/xpfe/communicator && ${SETENV} ${MAKE_ENV} ${GMAKE} \
-		${MAKE_FLAGS} Makefile ${MAKE_ARGS}
-
 pre-install:
 	@${RM} -rf ${FAKEDIR} ${PLIST}
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		Makefile ${MAKE_ARGS} 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} '@unexec ${RMDIR} %D/share/pixmaps 2>/dev/null || ${TRUE}' >> ${PLIST}
 	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
 		${FAKEDIR}/bin/sunbird \
 		${FAKEDIR}/bin/sunbird-config
@@ -168,8 +164,9 @@ do-install:
 		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${SUNBIRD}
 	cd ${FAKEDIR}/lib/${SUNBIRD} && ${FIND} . | \
 		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${SUNBIRD}
-	${MKDIR} ${PREFIX}/share/applications
+	${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}
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
diff --git a/deskutils/sunbird/distinfo b/deskutils/sunbird/distinfo
index b6cb75824..19646a732 100644
--- a/deskutils/sunbird/distinfo
+++ b/deskutils/sunbird/distinfo
@@ -1,2 +1,2 @@
-MD5 (sunbird-0.2.1.1.tar.bz2) = 05541dff8cfd5e8e93e84d81098493e0
-SIZE (sunbird-0.2.1.1.tar.bz2) = 33981774
+MD5 (sunbird-0.2.1.2.tar.bz2) = c1041246680da6582cde16cd99203c35
+SIZE (sunbird-0.2.1.2.tar.bz2) = 33153362
diff --git a/deskutils/sunbird/pkg-deinstall.in b/deskutils/sunbird/pkg-deinstall.in
index e34d4052f..91c152971 100644
--- a/deskutils/sunbird/pkg-deinstall.in
+++ b/deskutils/sunbird/pkg-deinstall.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/www/firefox/pkg-deinstall.in,v 1.3 2004/10/28 21:37:53 marcus Exp $
+# $FreeBSD$
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -22,6 +22,7 @@ rm -f ${MOZDIR}/components.ini
 rm -f ${MOZDIR}/defaults.ini
 rm -f ${MOZDIR}/components/*.dat
 rm -rf ${MOZDIR}/extensions
+rm -rf ${MOZDIR}/updates
 rm -f ${MOZDIR}/extensions.ini
 
 exit 0
diff --git a/deskutils/sunbird/pkg-install.in b/deskutils/sunbird/pkg-install.in
index 89d564b8c..737377bb4 100644
--- a/deskutils/sunbird/pkg-install.in
+++ b/deskutils/sunbird/pkg-install.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/www/firefox/pkg-install.in,v 1.9 2004/12/04 09:47:27 marcus Exp $
+# $FreeBSD$
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -17,11 +17,6 @@ REGXPCOM=${MOZDIR}/regxpcom
 SUNBIRD=${MOZDIR}/sunbird-bin
 
 echo "===> Building Chrome's registry..."
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-mkdir -p ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/component.reg
-rm -rf ${MOZDIR}/extensions
 
 cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGXPCOM} || true