2 files changed, 38 insertions, 10 deletions

diff --git a/net-im/emesene/Makefile b/net-im/emesene/Makefile
index 6824fdcb6b80..cf2a663b66bd 100644
--- a/net-im/emesene/Makefile
+++ b/net-im/emesene/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	emesene
-PORTVERSION=	1.5.1
-PORTREVISION=	3
+PORTVERSION=	1.6.3
 CATEGORIES=	net-im python
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+#MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \
+		${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	A MSN Messenger client writen in python
@@ -18,14 +19,17 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+PROJECTHOST=	bsdistfiles
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	pygtk2
+USE_GNOME=	pygtk2 desktopfileutils
 USE_GSTREAMER=	python
 REINPLACE_ARGS=	-i ""
 
 PLIST=		${WRKDIR}/pkg-plist
 
+MAN1=		emesene.1
+
 DESKTOP_ENTRIES="${PORTNAME}" \
 		"${COMMENT}" \
 		"${DATADIR}/themes/default/userPanel.png" \
@@ -35,7 +39,9 @@ DESKTOP_ENTRIES="${PORTNAME}" \
 
 post-extract:
 	@cd ${WRKSRC} && \
-		${RM} -f GPL LGPL README
+		${RM} -fr GPL LGPL README pygif pyisf docs && \
+			${MV} misc ${WRKDIR} && \
+				${MV} po ${WRKDIR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/${PORTNAME}
@@ -46,23 +52,45 @@ do-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}
 
+	@${ECHO_CMD} "#!/bin/sh" >> ${WRKDIR}/run.sh
+	@${ECHO_CMD} "" >> ${WRKDIR}/run.sh
 	@${ECHO_CMD} "cd ${DATADIR} || exit 1" >> ${WRKDIR}/run.sh
 	@${ECHO_CMD} "exec ${PYTHON_CMD} ./${PORTNAME}" >> ${WRKDIR}/run.sh
 
 pre-install:
-	@${RM} -fr ${PLIST} ${WRKSRC}/build ${WRKSRC}/libmimic
+	@${RM} -fr ${PLIST} ${WRKSRC}/build ${WRKSRC}/libmimic ${WRKSRC}/libmimic.so
+
+	@${ECHO_CMD} "share/icons/hicolor/scalable/apps/emesene.svg" >> ${PLIST}
+	@${ECHO_CMD} "share/pixmaps/emesene.png" >> ${PLIST}
+	@${ECHO_CMD} "share/pixmaps/emesene-big.png" >> ${PLIST}
+	@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
+
+	@cd ${WRKDIR}/po && \
+		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|share/locale/|' >> ${PLIST}
 	@cd ${WRKSRC} && \
 		${FIND}  * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
 			${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
+
 	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}
-	@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
+	@${ECHO_CMD} "@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true" >> ${PLIST}
+	@${ECHO_CMD} "@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true" >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${DATADIR}
+
+	cd ${WRKDIR}/po && \
+		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/locale/{}" \;
 	cd ${WRKSRC} && \
 		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
 
 	${INSTALL_SCRIPT} ${WRKDIR}/run.sh ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_MAN} ${WRKDIR}/misc/${MAN1} ${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKDIR}/misc/emesene.svg ${PREFIX}/share/icons/hicolor/scalable/apps
+	${INSTALL_DATA} ${WRKDIR}/misc/emesene.png ${WRKDIR}/misc/emesene-big.png \
+		${PREFIX}/share/pixmaps
+
+post-install:
+	-@update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/net-im/emesene/distinfo b/net-im/emesene/distinfo
index 1dc2ec78b708..6c6a3bfdca27 100644
--- a/net-im/emesene/distinfo
+++ b/net-im/emesene/distinfo
@@ -1,3 +1,3 @@
-MD5 (emesene-1.5.1.tar.gz) = 2f0a3c8af864a21cb2e6a00b51c997ab
-SHA256 (emesene-1.5.1.tar.gz) = a62ea7153328f4cc00c14e9ef229c3a324c709e569b70ed63eca9a5c5784386e
-SIZE (emesene-1.5.1.tar.gz) = 2245737
+MD5 (emesene-1.6.3.tar.gz) = 2bd304b8b03e8b4867042f61df51fa00
+SHA256 (emesene-1.6.3.tar.gz) = 6516b9e73dea68b0cd97b0ffeee5a826e8b61465dd5819676d81ea1ea040832c
+SIZE (emesene-1.6.3.tar.gz) = 3466357