ports/124079: [maintainer update] Update port: net/mugshot The official client for Mugshot network

Ashish Shukla wahjava at gmail.com
Wed May 28 20:20:03 UTC 2008 

>Number:         124079
>Category:       ports
>Synopsis:       [maintainer update] Update port: net/mugshot The official client for Mugshot network
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 28 20:20:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Ashish Shukla
>Release:        FreeBSD 7.0-RELEASE-p1
>Organization:
N/A
>Environment:
FreeBSD monte-cristo.france 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #1: Sun Apr 27 23:45:30 IST 2008     root at monte-cristo.fr:/usr/obj/usr/src/sys/ULE  amd64

>Description:
Update to version 1.1.95.

Following files are changed in this port:

* Makefile
* pkg-plist
* distinfo
* files/patch-firefox-update.sh
>How-To-Repeat:

>Fix:
diff -urN /usr/ports/net/mugshot/Makefile mugshot/Makefile
--- /usr/ports/net/mugshot/Makefile	2008-04-19 23:22:46.000000000 +0530
+++ mugshot/Makefile	2008-05-28 12:04:30.000000000 +0530
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mugshot
-PORTVERSION=	1.1.58
-PORTREVISION=	1
+PORTVERSION=	1.1.95
 CATEGORIES=	net
 MASTER_SITES=	http://download.mugshot.org/client/sources/linux/
 
@@ -15,17 +14,23 @@
 COMMENT=	The official client for Mugshot network
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg:install \
-		Xss.1:${PORTSDIR}/x11/xorg-libraries:install
+		Xss.1:${PORTSDIR}/x11/xorg-libraries:install \
+		dbus-1.3:${PORTSDIR}/devel/dbus \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		cairo.2:${PORTSDIR}/graphics/cairo \
+		hippocanvas-1.0:${PORTSDIR}/x11-toolkits/hippo-canvas \
+		ddm-1.0:${PORTSDIR}/net/desktop-data-model
 BUILD_DEPENDS=	${PKGCONFIG_LOCAL_BASE}/dbus-1.pc:${PORTSDIR}/devel/dbus:install \
 		${PKGCONFIG_LOCAL_BASE}/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib:install \
 		${PKGCONFIG_LOCAL_BASE}/loudmouth-1.0.pc:${PORTSDIR}/net-im/loudmouth:install \
 		${PKGCONFIG_LOCAL_BASE}/cairo.pc:${PORTSDIR}/graphics/cairo:install \
 		${PKGCONFIG_LOCAL_BASE}/libcurl.pc:${PORTSDIR}/ftp/curl: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 \
 		${LOCALBASE}/include/X11/extensions/scrnsaver.h:${PORTSDIR}/x11/xorg-libraries:install \
-		dbus>=1.0.2:${PORTSDIR}/devel/dbus:install
+		dbus>=1.0.2:${PORTSDIR}/devel/dbus:install \
+		${PKGCONFIG_LOCAL_BASE}/hippo-canvas-1.pc:${PORTSDIR}/x11-toolkits/hippo-canvas:install \
+		${PKGCONFIG_LOCAL_BASE}/ddm-1.pc:${PORTSDIR}/net/desktop-data-model:install
 
 USE_GNOME=	gnomehack gconf2 glib20 gtk20 pango gnomevfs2 gnomedesktop
 GNU_CONFIGURE=	yes
diff -urN /usr/ports/net/mugshot/distinfo mugshot/distinfo
--- /usr/ports/net/mugshot/distinfo	2008-02-13 04:52:35.000000000 +0530
+++ mugshot/distinfo	2008-05-28 11:09:47.000000000 +0530
@@ -1,3 +1,3 @@
-MD5 (mugshot-1.1.58.tar.gz) = 3506a6873bd24b339abd6d2fc44218fb
-SHA256 (mugshot-1.1.58.tar.gz) = 66ea50317589ac2a165c9d4c8020ddade486775e6b5826227910abba3207b864
-SIZE (mugshot-1.1.58.tar.gz) = 1013131
+MD5 (mugshot-1.1.95.tar.gz) = 474dd21d52600d2130be479f4a79843e
+SHA256 (mugshot-1.1.95.tar.gz) = 13b33f46371a504b34bc7bafa68b801b01944542025a6acf5522272e68491351
+SIZE (mugshot-1.1.95.tar.gz) = 657088
diff -urN /usr/ports/net/mugshot/files/patch-firefox-update.sh mugshot/files/patch-firefox-update.sh
--- /usr/ports/net/mugshot/files/patch-firefox-update.sh	2006-12-30 01:50:32.000000000 +0530
+++ mugshot/files/patch-firefox-update.sh	2008-04-27 22:48:05.000000000 +0530
@@ -1,30 +1,30 @@
---- firefox-update.sh.orig	Sun Dec 24 22:31:37 2006
-+++ firefox-update.sh	Sun Dec 24 22:34:38 2006
-@@ -6,7 +6,7 @@
- # Firefox is installed into versioned directories in /usr/lib[64]/firefox
- #
+--- firefox-update.sh.pristine	2008-04-27 22:42:09.000000000 +0530
++++ firefox-update.sh	2008-04-27 22:46:58.000000000 +0530
+@@ -8,7 +8,7 @@
+ 
+ EXT_ID=firefox at mugshot.org
  if [ "$1" = "install" ] ; then
 -    for libdir in /usr/lib /usr/lib64 ; do
 +	libdir=%%PREFIX%%/lib
  	# Add symlinks to any firefox directory that looks like it is part of a
  	# currently installed package
- 	for d in $libdir/firefox* ; do
-@@ -19,9 +19,8 @@
- 		ln -s $target $link
- 	    fi
- 	done
+ 	for d in $libdir/firefox* $libdir/iceweasel*; do
+@@ -25,9 +25,8 @@
+         if [ -d $libdir/mozilla/extensions -a ! -L "$link" ]; then
+             ln -s $libdir/mugshot/firefox "$link"
+         fi
 -    done
  elif [ "$1" = "remove" ] ; then
 -    for libdir in /usr/lib /usr/lib64 ; do
 +	libdir=%%PREFIX%%/lib
  	# Remove any symlinks we've created into any firefox directory
- 	for d in $libdir/firefox* ; do
- 	    if [ d = "$libdir/firefox*" ] ; then
-@@ -32,7 +31,6 @@
+ 	for d in $libdir/firefox* $libdir/iceweasel*; do
+ 	    if [ "$d" = "$libdir/firefox*" -o "$d" = "$libdir/iceweasel*" ] ; then
+@@ -38,7 +37,6 @@
  		rm $link
  	    fi
  	done
 -     done
- else
-     echo "Usage firefox-update.sh [install/remove]"
- fi
+      if [ -d $libdir/mozilla/extensions ]; then
+         rm $libdir/mozilla/extensions/$EXT_ID
+      fi
diff -urN /usr/ports/net/mugshot/pkg-plist mugshot/pkg-plist
--- /usr/ports/net/mugshot/pkg-plist	2008-02-13 04:52:35.000000000 +0530
+++ mugshot/pkg-plist	2008-05-28 12:14:08.000000000 +0530
@@ -1,20 +1,6 @@
 @unexec killall mugshot 2>/dev/null >/dev/null || exit 0
 bin/mugshot
 bin/mugshot-uri-handler
-include/ddm-1/ddm/ddm-data-fetch.h
-include/ddm-1/ddm/ddm-data-model-backend.h
-include/ddm-1/ddm/ddm-data-model-dbus.h
-include/ddm-1/ddm/ddm-data-model.h
-include/ddm-1/ddm/ddm-data-query.h
-include/ddm-1/ddm/ddm-data-resource.h
-include/ddm-1/ddm/ddm-notification-set.h
-include/ddm-1/ddm/ddm-qname.h
-include/ddm-1/ddm/ddm-client.h
-include/ddm-1/ddm/ddm-feed.h
-include/ddm-1/ddm/ddm.h
-lib/libddm-1.la
-lib/libddm-1.so
-lib/libddm-1.so.0
 lib/mugshot/firefox/chrome.manifest
 lib/mugshot/firefox/chrome/content/chatWindow.js
 lib/mugshot/firefox/chrome/content/chatWindow.xul
@@ -37,14 +23,10 @@
 lib/mugshot/firefox/components/libhippofirefox.so
 lib/mugshot/firefox/defaults/preferences/prefs.js
 lib/mugshot/firefox/install.rdf
-libdata/pkgconfig/ddm-1.pc
+libexec/mugshot-autostart-check
 share/applications/mugshot.desktop
 share/gnome/autostart/mugshot-autostart.desktop
- at unexec %%PREFIX%%/share/mugshot/firefox-update.sh remove
-%%DATADIR%%/firefox-update.sh
-%%DATADIR%%/version
-share/dbus-1/services/com.dumbhippo.Client.service
-share/dbus-1/services/org.freedesktop.od.Engine.service
+ at unexec %%PREFIX%%/%%DATADIR%%/firefox-update.sh remove
 share/icons/hicolor/128x128/apps/mugshot.png
 share/icons/hicolor/16x16/apps/mugshot.png
 share/icons/hicolor/16x16/apps/mugshot_note_off.png
@@ -55,8 +37,10 @@
 share/icons/hicolor/32x32/apps/mugshot.png
 share/icons/hicolor/48x48/apps/mugshot.png
 share/icons/hicolor/64x64/apps/mugshot.png
+%%DATADIR%%/firefox-update.sh
+%%DATADIR%%/stacker.css
+%%DATADIR%%/version
 @dirrm %%DATADIR%%
- at dirrmtry share/applications
 @dirrm lib/mugshot/firefox/defaults/preferences
 @dirrm lib/mugshot/firefox/defaults
 @dirrm lib/mugshot/firefox/components
@@ -69,5 +53,3 @@
 @dirrm lib/mugshot/firefox/chrome
 @dirrm lib/mugshot/firefox
 @dirrm lib/mugshot
- at dirrm include/ddm-1/ddm
- at dirrm include/ddm-1


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list