- Take this over as x11@ maintainership.

- Put .pc file in the right location.
- Update pkg-descr for new website and description.
- Fix up pkg-plist a little.
- Use GNU_CONFIGURE and CONFIGURE_TARGET.
- Rename to match naming scheme of other ports (and CVS)

8 files changed, 54 insertions, 38 deletions

diff --git a/x11-toolkits/xrender/Makefile b/x11-toolkits/xrender/Makefile
index 0fdfea6..d0d3ed3 100644
--- a/x11-toolkits/xrender/Makefile
+++ b/x11-toolkits/xrender/Makefile
@@ -5,23 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xrender
+PORTNAME=	libXrender
 PORTVERSION=	0.8.3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://fontconfig.org/release/
+MASTER_SITES=	http://pdx.freedesktop.org/~xlibs/release/
+DISTNAME=	xrender-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XRender extension for XFree86
 
-BUILD_DEPENDS=	${X11BASE}/lib/pkgconfig/render.pc:${PORTSDIR}/x11-toolkits/render
+LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/xextensions
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
+		${X11BASE}/libdata/pkgconfig/render.pc:${PORTSDIR}/x11-toolkits/render \
+		${LIB_PC_DEPENDS}
+RUN_DEPENDS=	${LIB_PC_DEPENDS}
 
-USE_X_PREFIX=	yes
-CONFIGURE_ARGS=	--prefix=${X11BASE}
-CONFIGURE_ENV+=	PKG_CONFIG_PATH=${X11BASE}/lib/pkgconfig
+PREFIX?=	${X11BASE}
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GMAKE=	yes
+CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 
 INSTALLS_SHLIB=	yes
 
-pre-build:
-	@(cd ${WRKSRC}; ./configure ${CONFIGURE_ARGS} ${CONFIGURE_ENV})
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/xrender/files/patch-Makefile.in b/x11-toolkits/xrender/files/patch-Makefile.in
new file mode 100644
index 0000000..2aed38d
--- /dev/null
+++ b/x11-toolkits/xrender/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Dec 21 17:53:15 2003
++++ Makefile.in	Sun Dec 21 17:53:25 2003
+@@ -177,7 +177,7 @@
+ libXrenderincludedir = $(includedir)/X11/extensions
+ libXrenderinclude_HEADERS = Xrender.h 
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = xrender.pc
+ 
+ EXTRA_DIST = xrender.pc.in autogen.sh
diff --git a/x11-toolkits/xrender/pkg-descr b/x11-toolkits/xrender/pkg-descr
index c88a369..67a5c22 100644
--- a/x11-toolkits/xrender/pkg-descr
+++ b/x11-toolkits/xrender/pkg-descr
@@ -1,6 +1,3 @@
 This package contains X render library and server implementations for XFree86.
 
-Keith Packard
-keithp@keithp.com
-
-WWW: http://www.fontconfig.org
+WWW: http://www.freedesktop.org/Software/xlibs
diff --git a/x11-toolkits/xrender/pkg-plist b/x11-toolkits/xrender/pkg-plist
index 2eef54f..08f3673 100644
--- a/x11-toolkits/xrender/pkg-plist
+++ b/x11-toolkits/xrender/pkg-plist
@@ -3,8 +3,4 @@ lib/libXrender.a
 lib/libXrender.la
 lib/libXrender.so
 lib/libXrender.so.1
-lib/pkgconfig/xrender.pc
-@exec mkdir -p %D/lib/pkgconfig
-@exec mkdir -p %D/include/X11/extensions
-@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
-@unexec rmdir %D/share/lib/pkgconfig 2>/dev/null || true
+libdata/pkgconfig/xrender.pc
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 0fdfea6..d0d3ed3 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -5,23 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xrender
+PORTNAME=	libXrender
 PORTVERSION=	0.8.3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://fontconfig.org/release/
+MASTER_SITES=	http://pdx.freedesktop.org/~xlibs/release/
+DISTNAME=	xrender-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XRender extension for XFree86
 
-BUILD_DEPENDS=	${X11BASE}/lib/pkgconfig/render.pc:${PORTSDIR}/x11-toolkits/render
+LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/xextensions
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
+		${X11BASE}/libdata/pkgconfig/render.pc:${PORTSDIR}/x11-toolkits/render \
+		${LIB_PC_DEPENDS}
+RUN_DEPENDS=	${LIB_PC_DEPENDS}
 
-USE_X_PREFIX=	yes
-CONFIGURE_ARGS=	--prefix=${X11BASE}
-CONFIGURE_ENV+=	PKG_CONFIG_PATH=${X11BASE}/lib/pkgconfig
+PREFIX?=	${X11BASE}
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GMAKE=	yes
+CFLAGS+=	-DMALLOC_0_RETURNS_NULL
 
 INSTALLS_SHLIB=	yes
 
-pre-build:
-	@(cd ${WRKSRC}; ./configure ${CONFIGURE_ARGS} ${CONFIGURE_ENV})
-
 .include <bsd.port.mk>
diff --git a/x11/libXrender/files/patch-Makefile.in b/x11/libXrender/files/patch-Makefile.in
new file mode 100644
index 0000000..2aed38d
--- /dev/null
+++ b/x11/libXrender/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Dec 21 17:53:15 2003
++++ Makefile.in	Sun Dec 21 17:53:25 2003
+@@ -177,7 +177,7 @@
+ libXrenderincludedir = $(includedir)/X11/extensions
+ libXrenderinclude_HEADERS = Xrender.h 
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = xrender.pc
+ 
+ EXTRA_DIST = xrender.pc.in autogen.sh
diff --git a/x11/libXrender/pkg-descr b/x11/libXrender/pkg-descr
index c88a369..67a5c22 100644
--- a/x11/libXrender/pkg-descr
+++ b/x11/libXrender/pkg-descr
@@ -1,6 +1,3 @@
 This package contains X render library and server implementations for XFree86.
 
-Keith Packard
-keithp@keithp.com
-
-WWW: http://www.fontconfig.org
+WWW: http://www.freedesktop.org/Software/xlibs
diff --git a/x11/libXrender/pkg-plist b/x11/libXrender/pkg-plist
index 2eef54f..08f3673 100644
--- a/x11/libXrender/pkg-plist
+++ b/x11/libXrender/pkg-plist
@@ -3,8 +3,4 @@ lib/libXrender.a
 lib/libXrender.la
 lib/libXrender.so
 lib/libXrender.so.1
-lib/pkgconfig/xrender.pc
-@exec mkdir -p %D/lib/pkgconfig
-@exec mkdir -p %D/include/X11/extensions
-@unexec rmdir %D/include/X11/extensions 2>/dev/null || true
-@unexec rmdir %D/share/lib/pkgconfig 2>/dev/null || true
+libdata/pkgconfig/xrender.pc