Sync w/ FreeBSD ports. Here's a script to get rid of MD5:

------------------
#!/bin/sh
for blah in `find /path/to/ports -maxdepth 3 -name distinfo`; do
	sed -e 's|MD5.*||g' -e "/^$/d" ${blah} > ${blah}.new
	mv ${blah}.new ${blah}
done
------------------


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16061 df743ca5-7f9a-e211-a948-0013205c9059

16 files changed, 36 insertions, 33 deletions

diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index ef2a5cf70..bc13f4be5 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/epiphany-extensions-2.30.2.tar.bz2) = 4ee9beee4bfd8a588a6821e164c48b3d
 SHA256 (gnome2/epiphany-extensions-2.30.2.tar.bz2) = bdd0aad473262f2ac780d34c09644d0dd0066cb01f2cc66b3d200b946fd2db27
 SIZE (gnome2/epiphany-extensions-2.30.2.tar.bz2) = 1565280
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 89469ba78..c35a5c88c 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/epiphany-2.30.6.tar.bz2) = 0c566b3ffd428d2135e3c8cb65352d64
 SHA256 (gnome2/epiphany-2.30.6.tar.bz2) = 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc
 SIZE (gnome2/epiphany-2.30.6.tar.bz2) = 5927938
diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo
index 741941d9d..764098821 100644
--- a/www/gnome-user-share/distinfo
+++ b/www/gnome-user-share/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-user-share-2.30.1.tar.bz2) = 532f3d310ec9b42bf2dd015ab5b64092
 SHA256 (gnome2/gnome-user-share-2.30.1.tar.bz2) = 30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe
 SIZE (gnome2/gnome-user-share-2.30.1.tar.bz2) = 959747
diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index eded3d9e8..806cd67b0 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,3 +1,2 @@
-MD5 (kazehakase-0.5.8.tar.gz) = 22d831982ebe010338907381caee8fdf
 SHA256 (kazehakase-0.5.8.tar.gz) = 1d461c56b3df86544d123d2a15484a156a6053c4fe2884d773a987d450406943
 SIZE (kazehakase-0.5.8.tar.gz) = 1433099
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 60789970d..f10493227 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/midori/Makefile,v 1.21 2010/04/05 21:56:26 kwm Exp $
+#   $MCom: ports/www/midori/Makefile,v 1.31 2011/05/16 18:04:42 kwm Exp $
 #
 
 PORTNAME=	midori
 PORTVERSION=	0.3.6
+PORTREVISION=	1
 CATEGORIES=	www xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/www/p5-Gtk2-WebKit/distinfo b/www/p5-Gtk2-WebKit/distinfo
index 90f779e4b..1bbbf4ede 100644
--- a/www/p5-Gtk2-WebKit/distinfo
+++ b/www/p5-Gtk2-WebKit/distinfo
@@ -1,3 +1,2 @@
-MD5 (Gtk2-WebKit-0.08.tar.gz) = 5dc7e0ea470754f6e24e40e54da942ee
 SHA256 (Gtk2-WebKit-0.08.tar.gz) = ea76599d14cedc683ea5cc20ccd557677866971212828d5df2a815ac62e066e7
 SIZE (Gtk2-WebKit-0.08.tar.gz) = 68919
diff --git a/www/py-jswebkit/distinfo b/www/py-jswebkit/distinfo
index da9edeb02..2ffab6282 100644
--- a/www/py-jswebkit/distinfo
+++ b/www/py-jswebkit/distinfo
@@ -1,3 +1,2 @@
-MD5 (python-jswebkit-0.0.3.tar.gz) = 514ed4dd5e540d160fcdac9c3c607371
 SHA256 (python-jswebkit-0.0.3.tar.gz) = 688edf66e9da26cfcd83dd4a30242fe1dc732d6fdb84b5923f193ea00e441f81
 SIZE (python-jswebkit-0.0.3.tar.gz) = 55477
diff --git a/www/surf/distinfo b/www/surf/distinfo
index 45568774c..49f4a2f4f 100644
--- a/www/surf/distinfo
+++ b/www/surf/distinfo
@@ -1,3 +1,2 @@
-MD5 (surf-0.4.1.tar.gz) = 28ac7a6d193d25844aa6b1db77fcbafa
 SHA256 (surf-0.4.1.tar.gz) = 93709ba3e84baf2118676e96a5b2e5d4176f28c35c782fffd80a65c0a5bea546
 SIZE (surf-0.4.1.tar.gz) = 10102
diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
index 596972a5d..9c8468447 100644
--- a/www/uzbl/Makefile
+++ b/www/uzbl/Makefile
@@ -15,23 +15,27 @@ MAINTAINER=	aehlig@linta.de
 COMMENT=	Web interface tools which adhere to the unix philosophy
 
 LIB_DEPENDS=	webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
-RUN_DEPENDS=	socat:${PORTSDIR}/net/socat
+RUN_DEPENDS=	socat:${PORTSDIR}/net/socat \
+		${PYTHON_PKGNAMEPREFIX}gtk>=2:${PORTSDIR}/x11-toolkits/py-gtk2
 
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
+USE_PYTHON=	yes
 
-GITDATE=	2010.11.25
-GITVERSION=	5180049
+GITDATE=	2011.04.12
+GITVERSION=	ed8f45d
 
 WRKSRC=		${WRKDIR}/Dieterbe-uzbl-${GITVERSION}
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+MAKE_JOBS_SAFE=	YES
+
 .if !defined(NOPORTDOCS)
 PORTDOCS=	AUTHORS README COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \
-		multiple-instances-management performance url-editing config.h vim README.cookies
+		multiple-instances-management performance url-editing config.h vim
 .endif
 
 .if !defined(NOPORTDATA)
@@ -41,30 +45,28 @@ PORTDATA=	examples
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
 		${WRKSRC}/examples/config/config \
-		${WRKSRC}/src/uzbl-browser \
-		${WRKSRC}/examples/data/scripts/uzbl-event-manager
+		${WRKSRC}/bin/uzbl-browser \
+		${WRKSRC}/bin/uzbl-event-manager
 	@${REINPLACE_CMD} -e "s|share/uzbl|${DATADIR_REL}|" \
 		${WRKSRC}/examples/config/config \
-		${WRKSRC}/src/uzbl-browser \
-		${WRKSRC}/examples/data/scripts/uzbl-event-manager
+		${WRKSRC}/bin/uzbl-browser \
+		${WRKSRC}/bin/uzbl-event-manager
 	@${REINPLACE_CMD} -e "s|/usr/share/uzbl|${DATADIR}|" \
-		${WRKSRC}/examples/data/scripts/uzbl-tabbed
+		${WRKSRC}/bin/uzbl-tabbed
 
 post-build:
 	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/uzbl-core ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/uzbl-cookie-manager ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/src/uzbl-browser ${PREFIX}/bin
-.for f in uzbl-event-manager uzbl-cookie-daemon uzbl-tabbed
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/data/scripts/${f} ${PREFIX}/bin
+.for f in uzbl-event-manager uzbl-browser uzbl-tabbed
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/config.h ${DOCSDIR}
 .for f in COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \
-		multiple-instances-management performance url-editing README.cookies
+		multiple-instances-management performance url-editing
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}/${f}
 .endfor
 .for f in AUTHORS README
@@ -76,7 +78,7 @@ do-install:
 	${MKDIR} ${DATADIR}/examples/data/dforms ${DATADIR}/examples/config
 .for f in data/bookmarks \
 	data/dforms/bbs.archlinux.org \
-	data/style.css data/uzbl.png
+	config/style.css data/uzbl.png
 		${INSTALL_DATA} ${WRKSRC}/examples/${f} ${DATADIR}/examples/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/examples/config/config ${DATADIR}/examples/config/config
diff --git a/www/uzbl/distinfo b/www/uzbl/distinfo
index e43300904..ea29875e2 100644
--- a/www/uzbl/distinfo
+++ b/www/uzbl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (uzbl-0.0.0.2010.11.25.tar.gz) = 715163193b1c15377a1caaf2e993ef56584e356e6e62e74184b0acdb0c76bbd3
-SIZE (uzbl-0.0.0.2010.11.25.tar.gz) = 145473
+SHA256 (uzbl-0.0.0.2011.04.12.tar.gz) = 6d2fb50bf89c94593f258a274f68f44a10d6e1f685dc3f11e1b56282f526d7b5
+SIZE (uzbl-0.0.0.2011.04.12.tar.gz) = 144532
diff --git a/www/uzbl/files/patch-src__events.c b/www/uzbl/files/patch-src__events.c
new file mode 100644
index 000000000..1606f4b86
--- /dev/null
+++ b/www/uzbl/files/patch-src__events.c
@@ -0,0 +1,10 @@
+--- src/events.c.orig	2011-03-15 12:19:22.000000000 +0000
++++ src/events.c	2011-03-15 12:19:36.000000000 +0000
+@@ -3,6 +3,7 @@
+  ** (c) 2009 by Robert Manea
+ */
+ 
++#include <stdarg.h>
+ #include "uzbl-core.h"
+ #include "events.h"
+ #include "util.h"
diff --git a/www/uzbl/files/patch-src__uzbl-browser b/www/uzbl/files/patch-src__uzbl-browser
index 423cf86d0..9f1a96276 100644
--- a/www/uzbl/files/patch-src__uzbl-browser
+++ b/www/uzbl/files/patch-src__uzbl-browser
@@ -1,5 +1,5 @@
---- src/uzbl-browser.orig	2010-12-01 00:06:50.000000000 +0100
-+++ src/uzbl-browser	2010-12-01 00:07:09.000000000 +0100
+--- bin/uzbl-browser.orig	2010-12-01 00:06:50.000000000 +0100
++++ bin/uzbl-browser	2010-12-01 00:07:09.000000000 +0100
 @@ -74,7 +74,7 @@
  DAEMON_SOCKET="$XDG_CACHE_HOME"/uzbl/event_daemon
  #if [ ! -f "$DAEMON_SOCKET".pid ]
diff --git a/www/uzbl/pkg-plist b/www/uzbl/pkg-plist
index 83dbd337d..15510001f 100644
--- a/www/uzbl/pkg-plist
+++ b/www/uzbl/pkg-plist
@@ -1,6 +1,4 @@
 bin/uzbl-core
 bin/uzbl-browser
-bin/uzbl-cookie-daemon
-bin/uzbl-cookie-manager
 bin/uzbl-event-manager
 bin/uzbl-tabbed
diff --git a/www/webkit-sharp/distinfo b/www/webkit-sharp/distinfo
index 5877a8677..47927f7a4 100644
--- a/www/webkit-sharp/distinfo
+++ b/www/webkit-sharp/distinfo
@@ -1,3 +1,2 @@
-MD5 (webkit-sharp-0.3.tar.bz2) = 21482f9d5eafb0ef4acc6e790482f934
 SHA256 (webkit-sharp-0.3.tar.bz2) = 6633630b6e4834b0f93726570d1c97e884470e3c400ae929cca2f1376b7b959a
 SIZE (webkit-sharp-0.3.tar.bz2) = 88972
diff --git a/www/xxxterm/Makefile b/www/xxxterm/Makefile
index a11f6db2d..e7e6fa3a0 100644
--- a/www/xxxterm/Makefile
+++ b/www/xxxterm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xxxterm
-PORTVERSION=	1.303
+PORTVERSION=	1.339
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://opensource.conformal.com/snapshots/xxxterm/
diff --git a/www/xxxterm/distinfo b/www/xxxterm/distinfo
index 85fd0fb76..9e3f33035 100644
--- a/www/xxxterm/distinfo
+++ b/www/xxxterm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xxxterm-1.303.tgz) = c32bf71babc734fa78012c7338d8cc3459955fd31aca157aaa0934908c8de860
-SIZE (xxxterm-1.303.tgz) = 132276
+SHA256 (xxxterm-1.339.tgz) = e60d7d285fec3a1765ddb27b9a61b0789315899b39503270e238e3cf96b15a31
+SIZE (xxxterm-1.339.tgz) = 141695