Sync w/ FreeBSD ports.

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

5 files changed, 58 insertions, 22 deletions

diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index ce6044c9f..d2e4abe42 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -4,14 +4,14 @@
 # Whom:				ijliao
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/swfdec/Makefile,v 1.25 2008/09/11 01:13:27 marcus Exp $
+#   $MCom: ports/graphics/swfdec/Makefile,v 1.26 2008/10/25 18:49:00 kwm Exp $
 
 PORTNAME=	swfdec
 PORTVERSION=	0.8.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec/0.8/
 
-MAINTAINER=	alexbl@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flash Rendering Library
 
 LIB_DEPENDS=	oil-0.3.0:${PORTSDIR}/devel/liboil \
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 68bc14561..04be3726d 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -3,26 +3,40 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/www/midori/Makefile,v 1.8 2008/06/06 21:38:54 marcus Exp $
+#   $MCom: ports/www/midori/Makefile,v 1.3 2008/03/21 18:31:39 ahze Exp $
+#
 
 PORTNAME=	midori
-PORTVERSION=	0.0.18
-PORTREVISION=	3
+PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://software.twotoasts.de/media/${PORTNAME}/
+MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Lightweight web browser using WebKit browser engine
 
-LIB_DEPENDS=	webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2 \
-		sexy.2:${PORTSDIR}/x11-toolkits/libsexy
+LIB_DEPENDS=	webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
+		rsvg-convert:${PORTSDIR}/graphics/librsvg2
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/WebKit/webkit -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--disable-unique \
+		--disable-gio \
+		--disable-sqlite
+
+HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	glib20 gtk20 intltool libxml2 pkgconfig
+INSTALLS_ICONS=	yes
 
-pre-install:
-	${CHMOD} +x ${WRKSRC}/install-sh
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 4894cdfb3..63231f64b 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,3 +1,3 @@
-MD5 (midori-0.0.18.tar.gz) = aa9c10bbf6fe3502a65633c4fac0fb80
-SHA256 (midori-0.0.18.tar.gz) = 36c20ca7c59e6c35deb04a9febde8aa8040c78c6ba21f595442b94ab78ec137c
-SIZE (midori-0.0.18.tar.gz) = 430852
+MD5 (midori-0.1.0.tar.bz2) = b0316a886dc22c766ff680324b59b994
+SHA256 (midori-0.1.0.tar.bz2) = 41d613014aa183874477fc3d0bd44e7b66fb399e6cd971431933a2ee51647029
+SIZE (midori-0.1.0.tar.bz2) = 273058
diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist
index 96fc33dd8..4a04b9b82 100644
--- a/www/midori/pkg-plist
+++ b/www/midori/pkg-plist
@@ -1,9 +1,31 @@
 bin/midori
-share/applications/midori.desktop
-share/locale/de/LC_MESSAGES/midori.mo
-share/locale/fr/LC_MESSAGES/midori.mo
-share/locale/pl/LC_MESSAGES/midori.mo
-share/locale/sv/LC_MESSAGES/midori.mo
+%%NLS%%share/applications/midori.desktop
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/README
+share/icons/hicolor/16x16/apps/midori.png
+share/icons/hicolor/16x16/categories/extension.png
+share/icons/hicolor/16x16/status/news-feed.png
+share/icons/hicolor/22x22/apps/midori.png
+share/icons/hicolor/22x22/categories/extension.png
+share/icons/hicolor/22x22/status/news-feed.png
+share/icons/hicolor/32x32/apps/midori.png
+share/icons/hicolor/32x32/categories/extension.png
+share/icons/hicolor/32x32/status/news-feed.png
+share/icons/hicolor/48x48/apps/midori.png
+share/icons/hicolor/48x48/categories/extension.png
+share/icons/hicolor/48x48/status/news-feed.png
+%%NLS%%share/locale/de/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/es/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/et/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/midori.mo
+share/midori/logo-shade.png
+@dirrm share/midori
 @dirrmtry share/applications
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrm %%DOCSDIR%%
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 3caae5ba4..6ec3bff11 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/
 DISTNAME=	swfdec-mozilla-${PORTVERSION}
 
-MAINTAINER=	alexbl@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flash rendering plugin
 
 LIB_DEPENDS=	swfdec-0.8:${PORTSDIR}/graphics/swfdec