- Update to 1.1.42

PR:		112242
Submitted by:	Ashish Shukla (maintainer)

3 files changed, 33 insertions, 17 deletions

diff --git a/net/mugshot/Makefile b/net/mugshot/Makefile
index cbe4a95c790..0d02f0b12f7 100644
--- a/net/mugshot/Makefile
+++ b/net/mugshot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mugshot
-PORTVERSION=	1.1.37
+PORTVERSION=	1.1.42
 CATEGORIES=	net
 MASTER_SITES=	http://download.mugshot.org/client/sources/linux/
 
@@ -23,9 +23,10 @@ BUILD_DEPENDS=	${PKGCONFIG_LOCAL_BASE}/dbus-1.pc:${PORTSDIR}/devel/dbus:install
 		${LOCALBASE}/include/firefox/caps/nsIScriptSecurityManager.h:${PORTSDIR}/www/firefox:install \
 		${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre:install \
 		${LOCALBASE}/lib/firefox/xpidl:${PORTSDIR}/www/firefox:install \
-		${X11BASE}/include/X11/extensions/scrnsaver.h:${PORTSDIR}/x11/xorg-libraries:install
+		${X11BASE}/include/X11/extensions/scrnsaver.h:${PORTSDIR}/x11/xorg-libraries:install \
+		dbus>=1.0.2:${PORTSDIR}/devel/dbus:install
 
-USE_GNOME=	gnomehack gconf2 glib20 gtk20 pango
+USE_GNOME=	gnomehack gconf2 glib20 gtk20 pango gnomevfs2 gnomedesktop
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
@@ -45,7 +46,9 @@ mugshot_INSTALL_cmd=	install
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	"--with-gecko-idl=${FIREFOX_IDL_PATH}" \
 		"--with-gecko-headers=${LOCALBASE}/include/firefox" \
-		"--with-xpidl=${LOCALBASE}/lib/firefox/xpidl"
+		"--with-xpidl=${LOCALBASE}/lib/firefox/xpidl" \
+		"--x-includes=${X11BASE}/include" \
+		"--x-libraries=${X11BASE}/lib"
 
 FIREFOX_IDL_PATH!=${SH} -c 'for i in ${LOCALBASE}/share/idl/firefox-*; do [ -f $$i/nsIURI.idl ] && ${ECHO} $$i && break; done; exit 0;'
 BUILD_DEPENDS+=${FIREFOX_IDL_PATH}/nsIURI.idl:${PORTSDIR}/www/firefox:install
diff --git a/net/mugshot/distinfo b/net/mugshot/distinfo
index 64c45b68e66..f99cadef5d7 100644
--- a/net/mugshot/distinfo
+++ b/net/mugshot/distinfo
@@ -1,3 +1,3 @@
-MD5 (mugshot-1.1.37.tar.gz) = a5e6a9c66c56e025c048c1c5c0b126c6
-SHA256 (mugshot-1.1.37.tar.gz) = f5120903f2b5b5b00a281ee460ceb5ab8f731493838333b40b935ff1c8907159
-SIZE (mugshot-1.1.37.tar.gz) = 818664
+MD5 (mugshot-1.1.42.tar.gz) = d8463d08acce69bdcdf11c1f5a413a95
+SHA256 (mugshot-1.1.42.tar.gz) = 0ea8a2fd7b798952d5d1c3487aa2bad5ad85427cc2eb91cc422ec9cb12999acd
+SIZE (mugshot-1.1.42.tar.gz) = 840704
diff --git a/net/mugshot/pkg-plist b/net/mugshot/pkg-plist
index dd0dfa286d6..2ddccce303f 100644
--- a/net/mugshot/pkg-plist
+++ b/net/mugshot/pkg-plist
@@ -16,30 +16,44 @@ lib/mugshot/firefox/chrome/skin/toolbar.css
 lib/mugshot/firefox/components/hippoIControl.xpt
 lib/mugshot/firefox/components/hippoIControlListener.xpt
 lib/mugshot/firefox/components/hippoIExtension.xpt
-lib/mugshot/firefox/components/libhippofirefox.a
 lib/mugshot/firefox/components/libhippofirefox.la
 lib/mugshot/firefox/components/libhippofirefox.so
 lib/mugshot/firefox/defaults/preferences/prefs.js
 lib/mugshot/firefox/install.rdf
+share/applications/mugshot.desktop
 share/autostart/mugshot.desktop
 @unexec %%PREFIX%%/share/mugshot/firefox-update.sh remove
 %%DATADIR%%/firefox-update.sh
 %%DATADIR%%/version
+share/dbus-1/services/org.mugshot.Mugshot.service
 share/icons/hicolor/128x128/apps/mugshot.png
 share/icons/hicolor/16x16/apps/mugshot.png
 share/icons/hicolor/16x16/apps/mugshot_note_off.png
 share/icons/hicolor/16x16/apps/mugshot_note_on.png
 share/icons/hicolor/22x22/apps/mugshot_notification.png
 share/icons/hicolor/22x22/apps/mugshot_notification_disabled.png
-share/icons/hicolor/22x22/apps/mugshot_swarm_1.png
-share/icons/hicolor/22x22/apps/mugshot_swarm_2.png
-share/icons/hicolor/22x22/apps/mugshot_swarm_3.png
-share/icons/hicolor/22x22/apps/mugshot_swarm_4.png
-share/icons/hicolor/22x22/apps/mugshot_swarm_5.png
-share/icons/hicolor/24x24/apps/mugshot.gif
-share/icons/hicolor/32x32/apps/mugshot.gif
-share/icons/hicolor/48x48/apps/mugshot.gif
+share/icons/hicolor/24x24/apps/mugshot.png
+share/icons/hicolor/32x32/apps/mugshot.png
+share/icons/hicolor/48x48/apps/mugshot.png
 @dirrm share/mugshot
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/24x24/apps
+@dirrm share/icons/hicolor/24x24
+@dirrm share/icons/hicolor/22x22/apps
+@dirrm share/icons/hicolor/22x22
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor/128x128/apps
+@dirrm share/icons/hicolor/128x128
+@dirrm share/icons/hicolor
+@dirrm share/icons
+@dirrm share/dbus-1/services
+@dirrm share/dbus-1
+@dirrm share/autostart
+@dirrm share/applications
 @dirrm lib/mugshot/firefox/defaults/preferences
 @dirrm lib/mugshot/firefox/defaults
 @dirrm lib/mugshot/firefox/components
@@ -51,5 +65,4 @@ share/icons/hicolor/48x48/apps/mugshot.gif
 @dirrm lib/mugshot/firefox/chrome/content
 @dirrm lib/mugshot/firefox/chrome
 @dirrm lib/mugshot/firefox
-@dirrm share/autostart
 @dirrm lib/mugshot