- Update to 0.6

3 files changed, 41 insertions, 30 deletions

diff --git a/deskutils/gbirthday/Makefile b/deskutils/gbirthday/Makefile
index 96b51b83ae37..2ca5726e17ae 100644
--- a/deskutils/gbirthday/Makefile
+++ b/deskutils/gbirthday/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	gbirthday
-PORTVERSION=	0.5.2
+PORTVERSION=	0.6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	A birthday reminder for Evolution and some others
 
-OPTIONS=	EVO	"Evolution support"	on \
-		THUNDER	"Thunderbird/Sunbird support"	off \
-		MYSQL	"MySQL database support"	off
+OPTIONS=	EVO	"Enable Evolution support"	on \
+		THUNDER	"Enable Thunderbird/Sunbird support"	off \
+		MYSQL	"Enable MySQL database support"	off \
+		NOTIFY	"Enable libnotify support"	off
 
 NO_WRKSUBDIR=	yes
 USE_PYTHON_RUN=	yes
@@ -45,19 +46,25 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/MySQLdb/__init__.py:${PORTSDIR}/databases/py-MySQLdb
 .endif
 
+.if defined(WITH_NOTIFY)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/share/${PORTNAME}|${DATADIR}|g ;  \
-		s|/usr/share/pixmaps|${PREFIX}/share/pixmaps|g ; \
-		s|.mozilla-thunderbird|.thunderbird|g' \
-		${WRKSRC}/src/${PORTNAME}.py ${WRKSRC}/gbirthday.desktop.in
+	@${REINPLACE_CMD} -e 's|.mozilla.thunderbird|.thunderbird|g' \
+		${WRKSRC}/src/${PORTNAME}/databases.py
+	@${REINPLACE_CMD} -e 's|@VER@|${PORTVERSION}|g' \
+		${WRKSRC}/src/${PORTNAME}/__init__.py
+	@${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \
+		${WRKSRC}/src/gb
 .if defined(WITHOUT_NLS)
-	@${REINPLACE_CMD} -e 's|_Comment|Comment|' ${WRKSRC}/gbirthday.desktop.in
+	@${REINPLACE_CMD} -e 's|_Comment|Comment|' ${WRKSRC}/${PORTNAME}.desktop.in
 .endif
 
 do-build:
 .if !defined(WITHOUT_NLS)
-	@-intltool-merge -d ${WRKSRC}/po ${WRKSRC}/gbirthday.desktop.in \
-		${WRKSRC}/gbirthday.desktop
+	@-intltool-merge -d ${WRKSRC}/po ${WRKSRC}/${PORTNAME}.desktop.in \
+		${WRKSRC}/${PORTNAME}.desktop
 	@(for lang in ${LANGUAGES} ; do \
 		cd ${WRKSRC}/po ; \
 		${LOCALBASE}/bin/msgfmt $$lang.po -o $$lang.mo ; \
@@ -65,11 +72,11 @@ do-build:
 .endif
 
 do-install:
-	@${MKDIR} ${DATADIR}
-	@${MKDIR} ${PREFIX}/share/pixmaps/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/pics/* ${PREFIX}/share/pixmaps/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/src/${PORTNAME}.py ${DATADIR}
-	${LN} -fs ${DATADIR}/${PORTNAME}.py ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/pics/${PORTNAME}.png ${PREFIX}/share/pixmaps
+	${INSTALL_SCRIPT} ${WRKSRC}/src/gb ${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/pics
+	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/*.py ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/pics/*.png ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/pics
 	@${MKDIR} ${PREFIX}/share/applications
 .if !defined(WITHOUT_NLS)
 	@(for lang in ${LANGUAGES} ; do \
diff --git a/deskutils/gbirthday/distinfo b/deskutils/gbirthday/distinfo
index 088be9cdc533..9334e0a469fc 100644
--- a/deskutils/gbirthday/distinfo
+++ b/deskutils/gbirthday/distinfo
@@ -1,3 +1,3 @@
-MD5 (gbirthday-0.5.2.tar.gz) = d4774395d0f6a6cf7f7a880fb279ccb1
-SHA256 (gbirthday-0.5.2.tar.gz) = c35488c055260b53ded54be843f8ed9d4c2641527c2fa8d4e580845c1e3ed44f
-SIZE (gbirthday-0.5.2.tar.gz) = 55726
+MD5 (gbirthday-0.6.tar.gz) = 0fc5c084549619ff3c6300402d3a5c87
+SHA256 (gbirthday-0.6.tar.gz) = 2a40b1bacff8a3f5c6775c15d6b3d1b409c6f57267d93e8f7a8c027999cf50d2
+SIZE (gbirthday-0.6.tar.gz) = 65356
diff --git a/deskutils/gbirthday/pkg-plist b/deskutils/gbirthday/pkg-plist
index f59f71f2669d..4e590e3214ca 100644
--- a/deskutils/gbirthday/pkg-plist
+++ b/deskutils/gbirthday/pkg-plist
@@ -1,14 +1,18 @@
 bin/gbirthday
 share/applications/gbirthday.desktop
-%%DATADIR%%/gbirthday.py
-share/pixmaps/gbirthday/birthday.png
-share/pixmaps/gbirthday/birthdaylost.png
-share/pixmaps/gbirthday/birthdaynext.png
-share/pixmaps/gbirthday/birthdaytoday.png
-share/pixmaps/gbirthday/gbirthday.png
-share/pixmaps/gbirthday/gbirthday.svg
-share/pixmaps/gbirthday/nobirthday.png
-share/pixmaps/gbirthday/pie.svg
+share/pixmaps/gbirthday.png
+%%PYTHON_SITELIBDIR%%/gbirthday/__init__.py
+%%PYTHON_SITELIBDIR%%/gbirthday/addressbook.py
+%%PYTHON_SITELIBDIR%%/gbirthday/databases.py
+%%PYTHON_SITELIBDIR%%/gbirthday/gtk_funcs.py
+%%PYTHON_SITELIBDIR%%/gbirthday/pics/birthday.png
+%%PYTHON_SITELIBDIR%%/gbirthday/pics/birthdaylost.png
+%%PYTHON_SITELIBDIR%%/gbirthday/pics/birthdaynext.png
+%%PYTHON_SITELIBDIR%%/gbirthday/pics/birthdayred.png
+%%PYTHON_SITELIBDIR%%/gbirthday/pics/birthdaytoday.png
+%%PYTHON_SITELIBDIR%%/gbirthday/pics/gbirthday.png
+%%PYTHON_SITELIBDIR%%/gbirthday/pics/nobirthday.png
+%%PYTHON_SITELIBDIR%%/gbirthday/status_icon.py
 %%NLS%%share/locale/de/LC_MESSAGES/gbirthday.mo
 %%NLS%%share/locale/en/LC_MESSAGES/gbirthday.mo
 %%NLS%%share/locale/es/LC_MESSAGES/gbirthday.mo
@@ -21,6 +25,6 @@ share/pixmaps/gbirthday/pie.svg
 %%NLS%%share/locale/sk/LC_MESSAGES/gbirthday.mo
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry %%DATADIR%%
-@dirrmtry share/pixmaps/gbirthday
+@dirrm %%PYTHON_SITELIBDIR%%/gbirthday/pics
+@dirrm %%PYTHON_SITELIBDIR%%/gbirthday
 @dirrmtry share/applications