Sync with FreeBSD ports.

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

7 files changed, 17 insertions, 19 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index b949bd759..2ffb66a32 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/cairo/Makefile,v 1.75 2008/04/13 16:44:59 ahze Exp $
+#   $MCom: ports/graphics/cairo/Makefile,v 1.76 2008/04/19 14:28:29 ahze Exp $
 #
 
 PORTNAME=	cairo
@@ -31,7 +31,7 @@ USE_GNOME=	gnometarget gnomehack ltverhack referencehack
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
 
 .if defined(WITHOUT_X11)
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index c7922eb85..cae0bc5f5 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/cairomm/Makefile,v 1.7 2008/03/21 21:48:49 kwm Exp $
+#   $MCom: ports/graphics/cairomm/Makefile,v 1.9 2008/03/24 15:59:24 ahze Exp $
 #
 
 PORTNAME=	cairomm
@@ -22,8 +22,8 @@ USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget ltverhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
 		AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
 
 .if defined(NOPORTDOCS)
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index 95273f9f2..1a7d6db83 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -24,8 +24,8 @@ INSTALLS_ICONS=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 intlhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 0428ee65f..1c11b6f68 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/evince/Makefile,v 1.101 2008/04/07 19:34:24 ahze Exp $
+#   $MCom: ports/graphics/evince/Makefile,v 1.102 2008/04/08 21:37:55 ahze Exp $
 #
 
 PORTNAME=	evince
 PORTVERSION=	2.22.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -25,7 +25,6 @@ USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui desktopfileutils \
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 34f7018b5..cd78042a0 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp-app-devel/Makefile,v 1.20 2008/04/15 14:38:14 ahze Exp $
+#   $MCom: ports/graphics/gimp-app-devel/Makefile,v 1.21 2008/04/15 18:36:36 ahze Exp $
 #
 
 PORTNAME=	gimp-app
 DISTVERSION=	2.5.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -40,7 +40,7 @@ CONFLICTS=	gimp-app-[0-9]*
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_XPM=	yes
+USE_XORG=	xpm xmu xext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME+=	gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack desktopfileutils
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index c16327430..8f27e3e8e 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp-app/Makefile,v 1.20 2008/03/24 14:24:58 ahze Exp $
+#   $MCom: ports/graphics/gimp-app/Makefile,v 1.21 2008/04/15 18:36:35 ahze Exp $
 #
 
 PORTNAME=	gimp-app
 DISTVERSION=	2.4.5
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -38,7 +38,7 @@ CONFLICTS=	gimp-app-devel-[0-9]*
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_XPM=	yes
+USE_XORG=	xpm xmu xext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME+=	gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack desktopfileutils
diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile
index f692174f3..baaec603d 100644
--- a/graphics/p5-Cairo/Makefile
+++ b/graphics/p5-Cairo/Makefile
@@ -3,15 +3,14 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD: ports/graphics/p5-Cairo/Makefile,v 1.15 2008/03/25 14:38:25 ahze Exp $
-#    $MCom: ports/graphics/p5-Cairo/Makefile,v 1.8 2007/02/16 18:14:25 mezz Exp $
+#    $MCom: ports/graphics/p5-Cairo/Makefile,v 1.10 2008/03/30 02:13:35 marcus Exp $
 #
 
 PORTNAME=	Cairo
 PORTVERSION=	1.053
 PORTREVISION=	2
 CATEGORIES=	graphics perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtk2-perl
+MASTER_SITES=	SF/gtk2-perl
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ahze@FreeBSD.org