6 files changed, 10 insertions, 36 deletions
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 362e4c743b93..dccabadcdc44 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	libXcomposite
-PORTVERSION=	1.0.0.p1
+PORTVERSION=	1.0.1
 CATEGORIES=	x11
-MASTER_SITES=	http://pdx.freedesktop.org/~anholt/dist/
+MASTER_SITES=	http://pdx.freedesktop.org/~xlibs/release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Composite extension library
 
 LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
-		${X11BASE}/libdata/pkgconfig/compositeext.pc:${PORTSDIR}/x11/compositeext \
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/compositeext.pc:${PORTSDIR}/x11/compositeext \
 		${LIB_PC_DEPENDS}
 RUN_DEPENDS=	${LIB_PC_DEPENDS}
 
@@ -26,8 +25,7 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.0.0
-
 INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomehack pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11/libXcomposite/distinfo b/x11/libXcomposite/distinfo
index 7c0fc2e77a1c..052728c5f540 100644
--- a/x11/libXcomposite/distinfo
+++ b/x11/libXcomposite/distinfo
@@ -1 +1 @@
-MD5 (libXcomposite-1.0.0.p1.tar.bz2) = a536193345735628ac9ee2045e53a447
+MD5 (libXcomposite-1.0.1.tar.bz2) = 6d5eb91ab7023fbc5cad3e410fe126df
diff --git a/x11/libXcomposite/files/patch-Makefile.in b/x11/libXcomposite/files/patch-Makefile.in
deleted file mode 100644
index 5568a916fabc..000000000000
--- a/x11/libXcomposite/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Nov 13 13:55:20 2003
-+++ Makefile.in	Thu Nov 13 14:07:16 2003
-@@ -189,7 +189,7 @@
- libXcompositeincludedir = $(includedir)/X11/extensions
- libXcompositeinclude_HEADERS = Xcomposite.h 
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = xcomposite.pc
- 
- EXTRA_DIST = xcomposite.pc.in autogen.sh
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 5f455de592f4..656c5fce7855 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	libXdamage
-PORTVERSION=	1.0.0.p1
+PORTVERSION=	1.0.1
 CATEGORIES=	x11
-MASTER_SITES=	http://pdx.freedesktop.org/~anholt/dist/
+MASTER_SITES=	http://pdx.freedesktop.org/~xlibs/release/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Damage extension library
 
 LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
-		${X11BASE}/libdata/pkgconfig/damageext.pc:${PORTSDIR}/x11/damageext \
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/damageext.pc:${PORTSDIR}/x11/damageext \
 		${LIB_PC_DEPENDS}
 RUN_DEPENDS=	${LIB_PC_DEPENDS}
 
@@ -26,8 +25,7 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CFLAGS+=	-DMALLOC_0_RETURNS_NULL
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.0.0
-
 INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomehack pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11/libXdamage/distinfo b/x11/libXdamage/distinfo
index bb0d57e85a52..f234330c60cc 100644
--- a/x11/libXdamage/distinfo
+++ b/x11/libXdamage/distinfo
@@ -1 +1 @@
-MD5 (libXdamage-1.0.0.p1.tar.bz2) = 80983883a01afc584911c48827c3bce7
+MD5 (libXdamage-1.0.1.tar.bz2) = ee4d344ac70117b6c5d840e543ce5d26
diff --git a/x11/libXdamage/files/patch-Makefile.in b/x11/libXdamage/files/patch-Makefile.in
deleted file mode 100644
index 321acf82a45b..000000000000
--- a/x11/libXdamage/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Nov 13 15:25:50 2003
-+++ Makefile.in	Thu Nov 13 15:33:02 2003
-@@ -189,7 +189,7 @@
- libXdamageincludedir = $(includedir)/X11/extensions
- libXdamageinclude_HEADERS = Xdamage.h 
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = xdamage.pc
- 
- EXTRA_DIST = xdamage.pc.in autogen.sh