summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-06-05 02:23:53 +0800
committerkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-06-05 02:23:53 +0800
commit982399681550b565d85c43c4cd158b4df21d8c69 (patch)
tree190274bfa1feecd99804eae9542cde5ee1522c07
parentde627d61316b854c6fc7c7100f551f4b72dd08a1 (diff)
downloadxorg-devel-ports-982399681550b565d85c43c4cd158b4df21d8c69.tar
xorg-devel-ports-982399681550b565d85c43c4cd158b4df21d8c69.tar.gz
xorg-devel-ports-982399681550b565d85c43c4cd158b4df21d8c69.tar.bz2
xorg-devel-ports-982399681550b565d85c43c4cd158b4df21d8c69.tar.lz
xorg-devel-ports-982399681550b565d85c43c4cd158b4df21d8c69.tar.xz
xorg-devel-ports-982399681550b565d85c43c4cd158b4df21d8c69.tar.zst
xorg-devel-ports-982399681550b565d85c43c4cd158b4df21d8c69.zip
Sync with ports.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@935 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--x11-drivers/xorg-drivers/Makefile2
-rw-r--r--x11/xkeyboard-config/Makefile11
2 files changed, 8 insertions, 5 deletions
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index 2cb28b1..d728e6f 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -10,6 +10,8 @@ EXTRACT_ONLY= # none
MAINTAINER= x11@FreeBSD.org
COMMENT= X.org drivers meta-port
+.MAKE.FreeBSD_UL= yes
+
VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers
INPUTDIR= ${PREFIX}/lib/xorg/modules/input
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 0bd5aff..89a8256 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -30,13 +30,14 @@ MAN7= xkeyboard-config.7
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MNLS}
+# !nls case doesn't work correctly, comment it out.
+#.if ${PORT_OPTIONS:MNLS}
USES+= gettext iconv
PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+#.else
+#CONFIGURE_ARGS+=--disable-nls
+#PLIST_SUB+= NLS="@comment "
+#.endif
post-patch:
@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \