aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAde Lovett <ade@FreeBSD.org>2001-06-05 12:59:15 +0800
committerAde Lovett <ade@FreeBSD.org>2001-06-05 12:59:15 +0800
commitb935812233cc7f1016e4898f5c10abf5cf8492ee (patch)
tree8200f755663bfa6a3b2d8e374e130c3689f15a83
parent5a25039fa8b6e7c24b59badf4b271513fd599f28 (diff)
downloadfreebsd-ports-gnome-b935812233cc7f1016e4898f5c10abf5cf8492ee.tar.gz
freebsd-ports-gnome-b935812233cc7f1016e4898f5c10abf5cf8492ee.tar.zst
freebsd-ports-gnome-b935812233cc7f1016e4898f5c10abf5cf8492ee.zip
Hack around some oddities when header files conflicting with glib-2.0
headers are present.
-rw-r--r--x11-toolkits/pango/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 1a14cef86659..1c4c082d8cd4 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pango
PORTVERSION= 0.16
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.3/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
@@ -24,7 +25,13 @@ USE_X_PREFIX= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-qt=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+
+# Hmm.. tough one. Found this one when I had graphics/hdf installed
+# (which installs glist.h) which is picked up before the glib-2.0
+# stuff, with Bad Results[tm]
+#
+GLIB2_CFLAGS= `pkg-config glib-2.0 --cflags`
+CONFIGURE_ENV= CPPFLAGS="${GLIB2_CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
.include <bsd.port.pre.mk>