From owner-svn-ports-head@FreeBSD.ORG Sat Jan 18 18:49:17 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74DCBA09; Sat, 18 Jan 2014 18:49:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 54ECD16F1; Sat, 18 Jan 2014 18:49:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IInHFZ086899; Sat, 18 Jan 2014 18:49:17 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IInG87086897; Sat, 18 Jan 2014 18:49:16 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201401181849.s0IInG87086897@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Sat, 18 Jan 2014 18:49:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340201 - head/deskutils/gbirthday X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 18:49:17 -0000 Author: rm Date: Sat Jan 18 18:49:16 2014 New Revision: 340201 URL: http://svnweb.freebsd.org/changeset/ports/340201 QAT: https://qat.redports.org/buildarchive/r340201/ Log: - add stage support - rename options EVO and THUNDER to EVOLUTION and THUNDERBIRD - convert to options helpers and add NLS to available options list - turn off EVOLUTION option by default for those who just using this app with simple csv-file - drop dependency on desktop-file-utils, since .desktop file defines no mime-types - bump PORTREVISION Modified: head/deskutils/gbirthday/Makefile head/deskutils/gbirthday/pkg-plist Modified: head/deskutils/gbirthday/Makefile ============================================================================== --- head/deskutils/gbirthday/Makefile Sat Jan 18 17:59:23 2014 (r340200) +++ head/deskutils/gbirthday/Makefile Sat Jan 18 18:49:16 2014 (r340201) @@ -3,6 +3,7 @@ PORTNAME= gbirthday PORTVERSION= 0.6.7 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= SF @@ -11,43 +12,24 @@ COMMENT= Birthday reminder for Evolution LICENSE= GPLv2 -OPTIONS_DEFINE= EVO THUNDER MYSQL NOTIFY -OPTIONS_DEFAULT=EVO -EVO_DESC= Evolution support -THUNDER_DESC= Thunderbird/Sunbird support +OPTIONS_DEFINE= EVOLUTION MYSQL NLS NOTIFY THUNDERBIRD +OPTIONS_SUB= yes +EVOLUTION_DESC= Evolution support +THUNDERBIRD_DESC= Thunderbird/Sunbird support +EVOLUTION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb +EVOLUTION_USE= GNOME=evolutiondataserver +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb +NLS_USES= gettext +NLS_USE= GNOME=intltool +NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>0:${PORTSDIR}/devel/py-notify +THUNDERBIRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 USE_XZ= yes USE_PYTHON_RUN= 2 -USE_GNOME= pygtk2 desktopfileutils - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -USE_GNOME+= intltool +USE_GNOME= pygtk2 LANGUAGES= de en es fr gl it pl pt ru sk -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MEVO} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb -USE_GNOME+= evolutiondataserver -.endif -.if ${PORT_OPTIONS:MTHUNDER} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 -.endif - -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb -.endif - -.if ${PORT_OPTIONS:MNOTIFY} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}notify>0:${PORTSDIR}/devel/py-notify -.endif +.include post-patch: @${REINPLACE_CMD} -e 's|.mozilla-thunderbird|.thunderbird|g' \ @@ -71,26 +53,23 @@ do-build: .endif do-install: - ${INSTALL_DATA} ${WRKSRC}/pics/${PORTNAME}.png ${PREFIX}/share/pixmaps - ${INSTALL_SCRIPT} ${WRKSRC}/src/gb ${PREFIX}/bin/${PORTNAME} - @${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/databases - @${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/pics - ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/*.py ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/databases/*.py ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/databases - ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/pics/*.png ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/pics + ${INSTALL_DATA} ${WRKSRC}/pics/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_SCRIPT} ${WRKSRC}/src/gb ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/databases + @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/pics + ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/*.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/databases/*.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/databases + ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/pics/*.png ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/pics .if ${PORT_OPTIONS:MNLS} @(for lang in ${LANGUAGES} ; do \ - ${MKDIR} ${PREFIX}/share/locale/$$lang/LC_MESSAGES ; \ + ${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/$$lang/LC_MESSAGES ; \ ${INSTALL_DATA} ${WRKSRC}/po/$$lang.mo \ - ${PREFIX}/share/locale/$$lang/LC_MESSAGES/${PORTNAME}.mo ; \ + ${STAGEDIR}${PREFIX}/share/locale/$$lang/LC_MESSAGES/${PORTNAME}.mo ; \ done) - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications .else ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop.in \ - ${PREFIX}/share/applications/${PORTNAME}.desktop + ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop .endif -post-install: - @-update-desktop-database - .include Modified: head/deskutils/gbirthday/pkg-plist ============================================================================== --- head/deskutils/gbirthday/pkg-plist Sat Jan 18 17:59:23 2014 (r340200) +++ head/deskutils/gbirthday/pkg-plist Sat Jan 18 18:49:16 2014 (r340201) @@ -30,8 +30,6 @@ share/applications/gbirthday.desktop %%NLS%%share/locale/pt/LC_MESSAGES/gbirthday.mo %%NLS%%share/locale/ru/LC_MESSAGES/gbirthday.mo %%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 share/pixmaps/gbirthday.png @dirrm %%PYTHON_SITELIBDIR%%/gbirthday/pics @dirrm %%PYTHON_SITELIBDIR%%/gbirthday/databases