aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrafan <rafan@FreeBSD.org>2006-12-10 00:30:59 +0800
committerrafan <rafan@FreeBSD.org>2006-12-10 00:30:59 +0800
commit9f6e2e77a3ed1a0617bf0d108248110ae1658d81 (patch)
tree7979533f7ea48bb83babf2470847a7f0c1132784
parent3dade447698626784b017faf12f80d06e3adf5ab (diff)
downloadfreebsd-ports-gnome-9f6e2e77a3ed1a0617bf0d108248110ae1658d81.tar.gz
freebsd-ports-gnome-9f6e2e77a3ed1a0617bf0d108248110ae1658d81.tar.zst
freebsd-ports-gnome-9f6e2e77a3ed1a0617bf0d108248110ae1658d81.zip
- Respect X11BASE
Approved by: portmgr (linimon)
-rw-r--r--devel/root/Makefile7
-rw-r--r--devel/root/files/patch-asimage-Module.mk10
2 files changed, 17 insertions, 0 deletions
diff --git a/devel/root/Makefile b/devel/root/Makefile
index c091278f9ad0..bc928fb896df 100644
--- a/devel/root/Makefile
+++ b/devel/root/Makefile
@@ -258,6 +258,13 @@ post-patch:
's|auxcflags=\"PTHREAD-CFLAGS|auxcflags=\"${PTHREAD_CFLAGS}|;\
s|auxlibs=\"PTHREAD-LIBS|auxlibs=\"${PTHREAD_LIBS}|' \
${WRKSRC}/config/root-config.in
+ @${REINPLACE_CMD} -e \
+ 's|/usr/X11R6|${X11BASE}|g' \
+ ${WRKSRC}/configure \
+ ${WRKSRC}/cint/lib/gl/setup \
+ ${WRKSRC}/cint/lib/xlib/setup \
+ ${WRKSRC}/config/Makefile.freebsd* \
+ ${WRKSRC}/test/Makefile.arch
.if defined(MAINTAINER_MODE)
test: install
diff --git a/devel/root/files/patch-asimage-Module.mk b/devel/root/files/patch-asimage-Module.mk
new file mode 100644
index 000000000000..dc39ede59357
--- /dev/null
+++ b/devel/root/files/patch-asimage-Module.mk
@@ -0,0 +1,10 @@
+--- asimage/Module.mk.orig Sat Dec 9 23:53:19 2006
++++ asimage/Module.mk Sat Dec 9 23:55:36 2006
+@@ -167,6 +167,7 @@
+ --with-ttf $$TTFINCDIR \
+ --with-afterbase=no \
+ --disable-glx \
++ --x-libraries=$(X11BASE)/lib --x-includes=$(X11BASE)/include \
+ $$MMX \
+ $(ASTEPDBG) \
+ --with-builtin-ungif \