aboutsummaryrefslogtreecommitdiff
path: root/vietnamese
diff options
context:
space:
mode:
authorMarcus Alves Grando <mnag@FreeBSD.org>2005-10-26 19:11:57 +0000
committerMarcus Alves Grando <mnag@FreeBSD.org>2005-10-26 19:11:57 +0000
commit1ea24e4e5c1318855bdcf1787eba498ae50a25de (patch)
tree692e79f4cb57023d8c65f999d386887939f19190 /vietnamese
parent07fbbe5aa6270ee7c8b0b53b2eac565ec30bb51a (diff)
downloadports-1ea24e4e5c1318855bdcf1787eba498ae50a25de.tar.gz
ports-1ea24e4e5c1318855bdcf1787eba498ae50a25de.zip
Notes
Diffstat (limited to 'vietnamese')
-rw-r--r--vietnamese/xvnkb/Makefile2
-rw-r--r--vietnamese/xvnkb/files/patch-config__configure24
-rw-r--r--vietnamese/xvnkb/files/patch-configure11
3 files changed, 26 insertions, 11 deletions
diff --git a/vietnamese/xvnkb/Makefile b/vietnamese/xvnkb/Makefile
index 2f425689ba8d..5d3193ba7f69 100644
--- a/vietnamese/xvnkb/Makefile
+++ b/vietnamese/xvnkb/Makefile
@@ -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
diff --git a/vietnamese/xvnkb/files/patch-config__configure b/vietnamese/xvnkb/files/patch-config__configure
new file mode 100644
index 000000000000..35f443c05db2
--- /dev/null
+++ b/vietnamese/xvnkb/files/patch-config__configure
@@ -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
diff --git a/vietnamese/xvnkb/files/patch-configure b/vietnamese/xvnkb/files/patch-configure
deleted file mode 100644
index 7decdda243d3..000000000000
--- a/vietnamese/xvnkb/files/patch-configure
+++ /dev/null
@@ -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