1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00

Respect X11BASE

PR:		88044
Submitted by:	Nguyen Tam Chinh <chinhngt@sectorb.msk.ru> (maintainer)
This commit is contained in:
Marcus Alves Grando 2005-10-26 19:11:57 +00:00
parent 07fbbe5aa6
commit 1ea24e4e5c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=146435
3 changed files with 26 additions and 11 deletions

View File

@ -22,6 +22,8 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" X11BASE="${X11BASE}"
.if defined(WITHOUT_XFT)
CONFIGURE_ARGS+= --no-xft
.else

View File

@ -0,0 +1,24 @@
--- config/configure.orig Tue Jan 6 10:55:26 2004
+++ config/configure Wed Oct 26 17:04:29 2005
@@ -28,10 +28,8 @@
}
xcc=$CC
-#prefix=/usr/local
-x_dirs="/usr/X11R6 /usr/X11 /usr/include \
- /usr/local/X11R6 /usr/local/X11 /usr/local/include \
- /opt/X11R6 /opt/X11 /opt/include"
+prefix=${LOCALBASE}
+x_dirs=${X11BASE}
if [ ! -f VERSION ]; then
echo
@@ -228,7 +226,7 @@
fi
echo "VERSION=$version" > Makefile.cfg
-#echo "PREFIX=$prefix" >> Makefile.cfg
+echo "PREFIX=$prefix" >> Makefile.cfg
echo "XLIB_DIR=$xlib_dir" >> Makefile.cfg
if [ "$vk_opt" != "" ]; then
echo "VK_OPT=$vk_opt" >> Makefile.cfg

View File

@ -1,11 +0,0 @@
--- configure.orig Fri Jan 16 23:19:17 2004
+++ configure Wed Dec 29 00:11:23 2004
@@ -228,7 +228,7 @@
fi
echo "VERSION=$version" > Makefile.cfg
-#echo "PREFIX=$prefix" >> Makefile.cfg
+echo "PREFIX=$prefix" >> Makefile.cfg
echo "XLIB_DIR=$xlib_dir" >> Makefile.cfg
if [ "$vk_opt" != "" ]; then
echo "VK_OPT=$vk_opt" >> Makefile.cfg