Sync with FreeBSD ports.

Reported by:	Romain Tartière <romain@blogreen.org>


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

6 files changed, 39 insertions, 14 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 3d865c4dc..27e9eac52 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/audio/sound-juicer/Makefile,v 1.93 2009/07/19 08:54:49 kwm Exp $
 #
 
 PORTNAME=	sound-juicer
 PORTVERSION=	2.26.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index d2d2ca5e3..a8ebddb18 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	pdf2djvu
-PORTVERSION=	0.4.12
-PORTREVISION=	4
+PORTVERSION=	0.5.10
+PORTREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX}
@@ -17,13 +17,14 @@ COMMENT=	Pdf2djvu creates DjVu files from PDF files
 
 BUILD_DEPENDS=	${LOCALBASE}/include/pstreams/pstream.h:${PORTSDIR}/devel/pstreams
 LIB_DEPENDS=	poppler.5:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+=	djvulibre.22:${PORTSDIR}/graphics/djvulibre-nox11
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LIBS=${PTHREAD_LIBS}
 USE_GMAKE=	yes
-PLIST_FILES=	bin/pdf2djvu
-
-LIB_DEPENDS+=	djvulibre.21:${PORTSDIR}/graphics/djvulibre-nox11
 
-MAN1=	pdf2djvu.1
+PLIST_FILES=	bin/pdf2djvu
+MAN1=		pdf2djvu.1
 MANCOMPRESSED=	no
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/converters/pdf2djvu/distinfo b/converters/pdf2djvu/distinfo
index 174385016..f531bbd28 100644
--- a/converters/pdf2djvu/distinfo
+++ b/converters/pdf2djvu/distinfo
@@ -1,3 +1,3 @@
-MD5 (pdf2djvu_0.4.12.tar.gz) = af325766614f58e7373c26c6d45f04e4
-SHA256 (pdf2djvu_0.4.12.tar.gz) = 819b1427a74d90ebda8971b670a9f03d6fd5d8a9ae03dbf48c91ebaf5a769a19
-SIZE (pdf2djvu_0.4.12.tar.gz) = 55798
+MD5 (pdf2djvu_0.5.10.tar.gz) = 83f43a712a7c560d484045c3e791b104
+SHA256 (pdf2djvu_0.5.10.tar.gz) = dde12c8f4af0c7cc78eef28fcc810b055ca1c74761786bce482a307a9b1dce70
+SIZE (pdf2djvu_0.5.10.tar.gz) = 213490
diff --git a/converters/pdf2djvu/files/patch-configure b/converters/pdf2djvu/files/patch-configure
new file mode 100644
index 000000000..38ea1c8e1
--- /dev/null
+++ b/converters/pdf2djvu/files/patch-configure
@@ -0,0 +1,24 @@
+--- configure.orig	2009-07-12 12:59:06.000000000 +0200
++++ configure	2009-07-26 09:04:22.000000000 +0200
+@@ -2971,9 +2971,9 @@
+ printf 'P1 3 3 0 0 0 0 0 0 0 0 0 0' > conftest.458086.pbm
+ "$djvulibre_bin_path/cjb2" conftest.458086.pbm conftest.458086.p1.djvu
+ "$djvulibre_bin_path/cjb2" conftest.458086.pbm conftest.458086.p2.djvu
+-printf 'AT&TFORM\0\0\0\x35DJVMDIRM\0\0\0\x29\x01\0\x02\xff\xff\xc6\xbf\x8a' > conftest.458086.djvu
+-printf '\x1f\xeb\x4b\xff\x40\x8e\x37\x86\x3f\x6c\xbe\x78\x02\x3c\x93\x9b' >> conftest.458086.djvu
+-printf '\x17\x57\x16\x67\x1d\x7a\xeb\x57\xf8\xf3\x7e\x64\x32\x42\x88\xd2\x4f' >> conftest.458086.djvu
++printf 'AT&TFORM\0\0\0\065DJVMDIRM\0\0\0\051\001\0\002\377\377\306\277\212' > conftest.458086.djvu
++printf '\037\353\113\377\100\216\067\206\077\154\276\170\002\074\223\233' >> conftest.458086.djvu
++printf '\027\127\026\147\035\172\353\127\370\363\176\144\062\102\210\322\117' >> conftest.458086.djvu
+ printf '(bookmarks ("" ""))' > conftest.458086.outline
+ "$djvulibre_bin_path/djvused" -s -e 'set-outline conftest.458086.outline' conftest.458086.djvu
+ if ! "$djvulibre_bin_path/djvused" -e print-outline conftest.458086.djvu | grep '(bookmarks' > /dev/null
+@@ -3173,7 +3173,7 @@
+ fi
+ 
+ 
+-
++pkg_failed=untried; echo "disabled"
+ if test $pkg_failed = yes; then
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
diff --git a/graphics/p5-clutter/Makefile b/graphics/p5-clutter/Makefile
index ce12d414a..951ab669f 100644
--- a/graphics/p5-clutter/Makefile
+++ b/graphics/p5-clutter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clutter
 PORTVERSION=	0.8.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.clutter-project.org/sources/clutter-perl/0.8/
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index b588af968..35f7fc48b 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.50 2009/05/27 18:27:52 kwm Exp $
 #
 
 PORTNAME=	gnome
 PORTVERSION=	2.25.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}