Get rid of X11BASE and a few of X11BASE -> LOCALBASE.

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

5 files changed, 10 insertions, 16 deletions

diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index c8722bdc8..9e52946da 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/audio/goobox/Makefile,v 1.17 2006/07/25 06:20:43 mezz Exp $
+#    $MCom: ports/audio/goobox/Makefile,v 1.23 2007/06/20 19:20:43 ahze Exp $
 #
 
 PORTNAME=	goobox
@@ -28,7 +28,7 @@ USE_GSTREAMER=	cdparanoia gconf core
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	goobox.schemas
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index 15f55e1ca..ca6e6cf50 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/pkgconfig/Makefile,v 1.6 2005/10/14 20:39:57 adamw Exp $
+#   $MCom: ports/devel/pkg-config/Makefile,v 1.8 2007/06/28 14:28:37 ahze Exp $
 #
 
 PORTNAME=	pkg-config
@@ -29,10 +29,6 @@ PC_PATH:=${PC_PATH}:${PREFIX}/lib/pkgconfig
 PC_PATH:=	${PC_PATH}:${LOCALBASE}/libdata/pkgconfig
 PC_PATH:=	${PC_PATH}:${LOCALBASE}/lib/pkgconfig
 .endif
-.if ${X11BASE} != ${PREFIX}
-PC_PATH:=	${PC_PATH}:${X11BASE}/libdata/pkgconfig
-PC_PATH:=	${PC_PATH}:${X11BASE}/lib/pkgconfig
-.endif
 
 CONFIGURE_ARGS=	--disable-threads \
 		--with-pc-path="${PC_PATH}" \
diff --git a/devel/pkg-config/pkg-descr b/devel/pkg-config/pkg-descr
index cbf7c6b4a..6b95074cc 100644
--- a/devel/pkg-config/pkg-descr
+++ b/devel/pkg-config/pkg-descr
@@ -7,9 +7,8 @@ pkg-config retrieves information about packages from special metadata files.
 These files are named after the package, with the extension .pc. By default,
 pkg-config looks for these files in the following directories:
 ${PREFIX}/libdata/pkgconfig, ${PREFIX}/lib/pkgconfig,
-${LOCALBASE}/libdata/pkgconfig, ${LOCALBASE}/lib/pkgconfig,
-${X11BASE}/libdata/pkgconfig, and ${X11BASE}/lib/pkgconfig; it will also look
-in the list of directories specified by the PKG_CONFIG_PATH environment
+${LOCALBASE}/libdata/pkgconfig, and ${LOCALBASE}/lib/pkgconfig; it will also
+look in the list of directories specified by the PKG_CONFIG_PATH environment
 variable.
 
 WWW: http://pkgconfig.freedesktop.org/wiki/
diff --git a/devel/pkg-config/pkg-plist b/devel/pkg-config/pkg-plist
index 5d6a4afdd..273b374e6 100644
--- a/devel/pkg-config/pkg-plist
+++ b/devel/pkg-config/pkg-plist
@@ -2,4 +2,3 @@ bin/pkg-config
 share/aclocal/pkg.m4
 @dirrmtry lib/pkgconfig
 @unexec rmdir %%LOCALBASE%%/lib/pkgconfig 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/lib/pkgconfig 2>/dev/null || true
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 0b8740984..c32a3cf0f 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 marcus@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/poppler/Makefile,v 1.34 2007/06/26 16:08:30 ahze Exp $
+#   $MCom: ports/graphics/poppler/Makefile,v 1.35 2007/06/26 16:33:29 ahze Exp $
 #
 
 PORTNAME=	poppler
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--enable-zlib \
 		--enable-xpdf-headers \
 		--with-html-dir=${DOCSDIR} \
 		--mandir=${PREFIX}/man
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .if !defined(SLAVEPORT)
 OPTIONS=	CAIRO "Enable cairo output backend" on
@@ -74,8 +74,8 @@ LIB_DEPENDS+=		cairo.2:${PORTSDIR}/graphics/cairo
 
 post-patch:
 .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt"
-	@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${X11BASE}/include|; \
-		s|/usr/local/qt/lib|${X11BASE}/lib|' \
+	@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${LOCALBASE}/include|; \
+		s|/usr/local/qt/lib|${LOCALBASE}/lib|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$QTDIR|${QT_PREFIX}|' ${WRKSRC}/configure
 .endif