summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/bdftopcf/Makefile3
-rw-r--r--x11/fontconfig/Makefile6
-rw-r--r--x11/fontconfig/pkg/PLIST7
-rw-r--r--x11/fonttosfnt/Makefile3
-rw-r--r--x11/iceauth/Makefile3
-rw-r--r--x11/libICE/Makefile3
-rw-r--r--x11/libSM/Makefile3
-rw-r--r--x11/libX11/Makefile2
-rw-r--r--x11/libXScrnSaver/Makefile3
-rw-r--r--x11/libXau/Makefile6
-rw-r--r--x11/libXaw/Makefile4
-rw-r--r--x11/libXcomposite/Makefile3
-rw-r--r--x11/libXcursor/Makefile3
-rw-r--r--x11/libXdamage/Makefile3
-rw-r--r--x11/libXdmcp/Makefile5
-rw-r--r--x11/libXext/Makefile2
-rw-r--r--x11/libXfixes/Makefile3
-rw-r--r--x11/libXfont2/Makefile2
-rw-r--r--x11/libXft/Makefile3
-rw-r--r--x11/libXi/Makefile3
-rw-r--r--x11/libXinerama/Makefile3
-rw-r--r--x11/libXmu/Makefile3
-rw-r--r--x11/libXpm/Makefile3
-rw-r--r--x11/libXpresent/Makefile5
-rw-r--r--x11/libXrandr/Makefile3
-rw-r--r--x11/libXrender/Makefile2
-rw-r--r--x11/libXres/Makefile3
-rw-r--r--x11/libXt/Makefile5
-rw-r--r--x11/libXtst/Makefile3
-rw-r--r--x11/libXv/Makefile3
-rw-r--r--x11/libXxf86vm/Makefile2
-rw-r--r--x11/libfontenc/Makefile2
-rw-r--r--x11/libxcb/Makefile2
-rw-r--r--x11/libxkbfile/Makefile3
-rw-r--r--x11/libxshmfence/Makefile3
-rw-r--r--x11/mkfontscale/Makefile2
-rw-r--r--x11/xauth/Makefile3
-rw-r--r--x11/xbitmaps/Makefile15
-rw-r--r--x11/xcb-util-cursor/Makefile2
-rw-r--r--x11/xcb-util-image/Makefile2
-rw-r--r--x11/xcb-util-keysyms/Makefile2
-rw-r--r--x11/xcb-util-renderutil/Makefile2
-rw-r--r--x11/xcb-util-wm/Makefile2
-rw-r--r--x11/xcb-util-xrm/Makefile2
-rw-r--r--x11/xcb-util/Makefile2
-rw-r--r--x11/xclock/Makefile3
-rw-r--r--x11/xconsole/Makefile3
-rw-r--r--x11/xenodm/Makefile6
-rw-r--r--x11/xf86-input-keyboard/Makefile8
-rw-r--r--x11/xf86-input-ws/Makefile8
-rw-r--r--x11/xinit/Makefile3
-rw-r--r--x11/xkbcomp/Makefile8
-rw-r--r--x11/xkeyboard-config/Makefile5
-rw-r--r--x11/xkeyboard-config/pkg/PLIST154
-rw-r--r--x11/xorg-server/Makefile26
-rw-r--r--x11/xrdb/Makefile3
-rw-r--r--x11/xsetroot/Makefile3
-rw-r--r--x11/xterm/Makefile4
-rw-r--r--x11/xtrans/Makefile2
59 files changed, 128 insertions, 257 deletions
diff --git a/x11/bdftopcf/Makefile b/x11/bdftopcf/Makefile
index 16f7fb8..7aae53b 100644
--- a/x11/bdftopcf/Makefile
+++ b/x11/bdftopcf/Makefile
@@ -15,7 +15,8 @@ WANTLIB = c
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto \
devel/xorg-util-macros
diff --git a/x11/fontconfig/Makefile b/x11/fontconfig/Makefile
index cedc5d1..d28c36c 100644
--- a/x11/fontconfig/Makefile
+++ b/x11/fontconfig/Makefile
@@ -20,6 +20,8 @@ MASTER_SITES = http://fontconfig.org/release/
EXTRACT_SUFX = .tar.gz
+MODULES = xenocara
+
BUILD_DEPENDS = devel/gperf
LIB_DEPENDS = sysutils/e2fsprogs \
@@ -30,8 +32,8 @@ USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --sysconfdir=${SYSCONFDIR} \
- --with-default-fonts=${LOCALBASE}/share/fonts \
- --with-cache-dir=/var/cache/fontconfig
+ --with-default-fonts=${PREFIX}/share/fonts \
+ --with-cache-dir=/var/cache/fontconfig
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fontconfig
diff --git a/x11/fontconfig/pkg/PLIST b/x11/fontconfig/pkg/PLIST
index 39dac05..04db947 100644
--- a/x11/fontconfig/pkg/PLIST
+++ b/x11/fontconfig/pkg/PLIST
@@ -8,7 +8,6 @@
@bin bin/fc-query
@bin bin/fc-scan
@bin bin/fc-validate
-include/fontconfig/
include/fontconfig/fcfreetype.h
include/fontconfig/fcprivate.h
include/fontconfig/fontconfig.h
@@ -242,8 +241,6 @@ lib/pkgconfig/fontconfig.pc
@man man/man3/FcWeightToOpenType.3
@man man/man3/FcWeightToOpenTypeDouble.3
@man man/man5/fonts-conf.5
-share/doc/fontconfig/
-share/doc/fontconfig/fontconfig-devel/
share/doc/fontconfig/fontconfig-devel.pdf
share/doc/fontconfig/fontconfig-devel.txt
share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html
@@ -470,6 +467,7 @@ share/doc/fontconfig/fontconfig-devel/x31.html
share/doc/fontconfig/fontconfig-user.html
share/doc/fontconfig/fontconfig-user.pdf
share/doc/fontconfig/fontconfig-user.txt
+share/examples/
share/examples/fontconfig/
share/examples/fontconfig/fonts/
@sample ${SYSCONFDIR}/fonts/
@@ -569,11 +567,10 @@ share/fontconfig/conf.avail/80-delicious.conf
share/fontconfig/conf.avail/90-synthetic.conf
@exec ln -s %B/%f ${SYSCONFDIR}/fonts/conf.d/%f
@unexec rm -f ${SYSCONFDIR}/fonts/conf.d/%f
+share/gettext/
share/gettext/its/
share/gettext/its/fontconfig.its
share/gettext/its/fontconfig.loc
-share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
-share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
share/xml/
share/xml/fontconfig/
share/xml/fontconfig/fonts.dtd
diff --git a/x11/fonttosfnt/Makefile b/x11/fonttosfnt/Makefile
index df60f54..ed6c222 100644
--- a/x11/fonttosfnt/Makefile
+++ b/x11/fonttosfnt/Makefile
@@ -15,7 +15,8 @@ WANTLIB = fontenc freetype c m
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto
LIB_DEPENDS = print/freetype2 \
x11/libfontenc
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index 889206d..48461a2 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -15,7 +15,8 @@ WANTLIB = ICE c
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto
LIB_DEPENDS = x11/libICE
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 6e3fcc1..c6c26a4 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -15,7 +15,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
x11/xtrans
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 01d1812..1799628 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -17,7 +17,8 @@ WANTLIB = ICE
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
x11/xtrans
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index c322167..8b63468 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -17,6 +17,8 @@ WANTLIB = Xau Xdmcp xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
+MODULES = xenocara
+
BUILD_DEPENDS = x11/xtrans \
devel/xorgproto
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 9fd3e30..4174549 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -17,7 +17,8 @@ WANTLIB = X11 Xau Xdmcp Xext xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 28ce7aa..84a58f1 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -17,6 +17,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
+MODULES = xenocara
+
# Dependencies
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
@@ -24,10 +26,6 @@ BUILD_DEPENDS = devel/xorg-util-macros \
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
-
-
-#NO_BUILD = Yes
NO_TEST = Yes
-
.include <bsd.port.mk>
diff --git a/x11/libXaw/Makefile b/x11/libXaw/Makefile
index 9c0ff87..f22282e 100644
--- a/x11/libXaw/Makefile
+++ b/x11/libXaw/Makefile
@@ -17,7 +17,8 @@ WANTLIB = Xt ICE SM X11 Xau Xdmcp Xext Xmu Xpm X11 xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
@@ -34,7 +35,6 @@ post-install:
-rm -f $(PREFIX)/lib/libXaw.a
(cd $(PREFIX)/lib && ln -s libXaw7.a libXaw.a && \
chown -h $(BINOWN):$(BINGRP) libXaw.a )
- # redo link
-rm -f $(PREFIX)/lib/libXaw.so.15.0
-rm -f $(PREFIX)/lib/libXaw.so.7
(cd $(PREFIX)/lib && ln -s libXaw7.so.15.0 libXaw.so.15.0 && \
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index dd3406a..c60d3aa 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -17,7 +17,8 @@ WANTLIB = X11 Xau Xdmcp xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 1faaaeb..3c7862c 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -17,7 +17,8 @@ WANTLIB = Xrender Xfixes X11 Xau xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index ee46934..642a951 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -17,7 +17,8 @@ WANTLIB = X11 Xau Xfixes xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index e00c02b..1279706 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -13,11 +13,10 @@ SHARED_LIBS= Xdmcp 11.0
# MIT
PERMIT_PACKAGE = Yes
-#WANTLIB = ???
-
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 9795308..146082f 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -17,6 +17,8 @@ WANTLIB = X11 Xau Xdmcp xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
+MODULES = xenocara
+
# Dependencies
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index 71ec616..604a67f 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -17,7 +17,8 @@ WANTLIB = X11 Xau Xdmcp xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
diff --git a/x11/libXfont2/Makefile b/x11/libXfont2/Makefile
index 1c0c14f..849cd31 100644
--- a/x11/libXfont2/Makefile
+++ b/x11/libXfont2/Makefile
@@ -17,6 +17,8 @@ WANTLIB = fontenc freetype m z
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
x11/xtrans
diff --git a/x11/libXft/Makefile b/x11/libXft/Makefile
index b96c080..ae6dfcf 100644
--- a/x11/libXft/Makefile
+++ b/x11/libXft/Makefile
@@ -18,7 +18,8 @@ WANTLIB = Xrender X11 Xau Xdmcp expat fontconfig freetype \
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
x11/xtrans
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index b94aeb3..44601ae 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -17,7 +17,8 @@ WANTLIB = X11 Xau Xdmcp Xext xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 119d3f9..fa96754 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -17,7 +17,8 @@ WANTLIB = X11 Xau Xdmcp Xext xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libXmu/Makefile b/x11/libXmu/Makefile
index fa407c0..c3fdb7b 100644
--- a/x11/libXmu/Makefile
+++ b/x11/libXmu/Makefile
@@ -17,7 +17,8 @@ WANTLIB = SM ICE X11 Xau Xdmcp Xext Xt xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
x11/xtrans
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 752b3aa..905935c 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -17,7 +17,8 @@ WANTLIB = ICE SM X11 Xau Xdmcp Xext Xt xcb c
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
x11/xtrans
diff --git a/x11/libXpresent/Makefile b/x11/libXpresent/Makefile
index 13b7e40..a2924dd 100644
--- a/x11/libXpresent/Makefile
+++ b/x11/libXpresent/Makefile
@@ -17,12 +17,13 @@ WANTLIB = X11 Xau Xdmcp xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
x11/libXrandr
-LIB_DEPENDS = x11/libX11 \
+LIB_DEPENDS = x11/libX11
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 7f5cf25..d92e960 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -17,7 +17,8 @@ WANTLIB = X11 Xau Xext Xrender xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 0c5ee2f..41ff6cf 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -17,6 +17,8 @@ WANTLIB = X11 Xau Xdmcp xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index d6b312c..1bf9968 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -17,7 +17,8 @@ WANTLIB = X11 Xau Xdmcp Xext xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index 7977b28..b8f819c 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -17,7 +17,8 @@ WANTLIB = ICE SM X11 Xau Xdmcp xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
@@ -27,7 +28,7 @@ LIB_DEPENDS = x11/libSM \
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS = --with-appdefaultdir=${LOCALBASE}/share/X11/app-defaults \
+CONFIGURE_ARGS = --with-appdefaultdir=${X11BASE}/share/X11/app-defaults \
--without-xmlto --without-fop \
--without-xsltproc --without-glib
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index df72eeb..800ab03 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -17,7 +17,8 @@ WANTLIB = X11 Xau Xdmcp Xext Xi xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index cd64e5f..ce90cd5 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -17,7 +17,8 @@ WANTLIB = X11 Xau Xdmcp Xext xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index a88bd04..0832445 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -17,6 +17,8 @@ WANTLIB = X11 Xau Xext xcb
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libfontenc/Makefile b/x11/libfontenc/Makefile
index 1dbeb51..7a3d7f0 100644
--- a/x11/libfontenc/Makefile
+++ b/x11/libfontenc/Makefile
@@ -17,6 +17,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 2b19660..eee9cfd 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -38,6 +38,8 @@ MAINTAINER = xenocara@openbsd.org
# MIT
PERMIT_PACKAGE = Yes
+MODULES = xenocara
+
WANTLIB = Xau Xdmcp
MASTER_SITES = https://xcb.freedesktop.org/dist/
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index b6dc7d4..b4053b8 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -17,7 +17,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
x11/libX11
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index d3c5c4a..1d5982d 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -15,7 +15,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto
diff --git a/x11/mkfontscale/Makefile b/x11/mkfontscale/Makefile
index 1519e55..96753f5 100644
--- a/x11/mkfontscale/Makefile
+++ b/x11/mkfontscale/Makefile
@@ -15,6 +15,8 @@ WANTLIB = fontenc freetype z c
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
+MODULES = xenocara
+
LIB_DEPENDS = print/freetype2 \
x11/libfontenc
SEPARATE_BUILD = Yes
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index 2f18ce1..70e7ca7 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -15,7 +15,8 @@ WANTLIB = Xau Xext Xmuu X11 c
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto
LIB_DEPENDS = x11/libX11 \
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
index 5fdbf66..310ed8b 100644
--- a/x11/xbitmaps/Makefile
+++ b/x11/xbitmaps/Makefile
@@ -15,22 +15,11 @@ PERMIT_DISTFILES = Yes
MASTER_SITES = ${MASTER_SITE_XORG:=data/}
-# build/configuration variables
-#
+MODULES = xenocara
+
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
NO_TEST = Yes
-# For ports that use a script or autoreconf to generate autoconf/automake
-# files (where "CONFIGURE_STYLE=autoconf" isn't enough), use some/all of these
-# dependencies, and add a do-gen target:
-#
-#BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
-# ${MODGNU_AUTOMAKE_DEPENDS} \
-# devel/libtool
-#
-#do-gen:
-# cd ${WRKSRC}; ${AUTOCONF_ENV} ./autogen.sh
-
.include <bsd.port.mk>
diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile
index 1261ccb..8a497c3 100644
--- a/x11/xcb-util-cursor/Makefile
+++ b/x11/xcb-util-cursor/Makefile
@@ -18,6 +18,8 @@ WANTLIB = Xau Xdmcp xcb xcb-image xcb-render \
MASTER_SITES = https://xcb.freedesktop.org/dist/
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto \
LIB_DEPENDS = x11/libxcb \
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index 01678d4..48fbe9e 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -13,6 +13,8 @@ SHARED_LIBS= xcb-image 2.0
# MIT
PERMIT_PACKAGE = Yes
+MODULES = xenocara
+
WANTLIB = Xau Xdmcp xcb xcb-shm xcb-util
MASTER_SITES = https://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index 7d6efcc..fd3f83d 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -17,6 +17,8 @@ WANTLIB = Xau Xdmcp xcb
MASTER_SITES = https://xcb.freedesktop.org/dist/
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto
LIB_DEPENDS = x11/libxcb
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index 93d048f..595e91b 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -13,6 +13,8 @@ SHARED_LIBS= xcb-render-util 2.0
# MIT
PERMIT_PACKAGE = Yes
+MODULES = xenocara
+
WANTLIB = Xau Xdmcp xcb xcb-render
MASTER_SITES = https://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index 6473679..2de3cf9 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -17,6 +17,8 @@ WANTLIB = Xau Xdmcp xcb
MASTER_SITES = https://xcb.freedesktop.org/dist/
+MODULES = xenocara
+
LIB_DEPENDS = x11/libxcb
SEPARATE_BUILD = Yes
diff --git a/x11/xcb-util-xrm/Makefile b/x11/xcb-util-xrm/Makefile
index 3495efa..93da5b2 100644
--- a/x11/xcb-util-xrm/Makefile
+++ b/x11/xcb-util-xrm/Makefile
@@ -22,6 +22,8 @@ WANTLIB = Xau Xdmcp m xcb xcb-util
LIB_DEPENDS = x11/libX11 \
x11/xcb-util
+MODULES = xenocara
+
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = autoreconf
CONFIGURE_ARGS = --without-doxygen
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index 5bce874..1aae6d7 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -13,6 +13,8 @@ SHARED_LIBS= xcb-util 0.0
# MIT
PERMIT_PACKAGE = Yes
+MODULES = xenocara
+
WANTLIB = Xau Xdmcp xcb
MASTER_SITES = https://xcb.freedesktop.org/dist/
diff --git a/x11/xclock/Makefile b/x11/xclock/Makefile
index 43f7305..55a7030 100644
--- a/x11/xclock/Makefile
+++ b/x11/xclock/Makefile
@@ -16,7 +16,8 @@ WANTLIB = Xaw7 Xmu Xt X11 Xrender Xft xkbfile m c
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index e4f3b97..a3f09f3 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -15,7 +15,8 @@ WANTLIB = X11 Xaw7 Xmu Xt c util
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto
LIB_DEPENDS = x11/libX11 \
diff --git a/x11/xenodm/Makefile b/x11/xenodm/Makefile
index 288958c..9b4d38f 100644
--- a/x11/xenodm/Makefile
+++ b/x11/xenodm/Makefile
@@ -19,6 +19,8 @@ WANTLIB += uuid xcb z
MASTER_SITES = https://xenocara.org/app/xenodm/
+MODULES = xenocara
+
LIB_DEPENDS = x11/libXaw \
x11/libXft \
x11/libXinerama
@@ -32,6 +34,8 @@ RUN_DEPENDS = sysutils/sessreg \
CONFIGURE_STYLE = gnu
+SEPARATE_BUILD = yes
+
XENODMCONFIGDIR = ${SYSCONFDIR}/X11/xenodm
XENODMLIBDIR = ${PREFIX}/lib/X11/xenodm
PIXMAPDIR = ${XENODMLIBDIR}/pixmaps
@@ -51,6 +55,8 @@ CONFIGURE_ARGS= \
--with-color-pixmap=OpenBSD_15bpp.xpm
do-install:
+ ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
+ ${INSTALL_MAN_DIR} ${PREFIX}/man/man1
${INSTALL_PROGRAM} ${WRKBUILD}/xenodm/xenodm ${PREFIX}/bin
${INSTALL_DATA} ${WRKBUILD}/man/xenodm.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${XENODMLIBDIR}
diff --git a/x11/xf86-input-keyboard/Makefile b/x11/xf86-input-keyboard/Makefile
index 94289d8..11df08b 100644
--- a/x11/xf86-input-keyboard/Makefile
+++ b/x11/xf86-input-keyboard/Makefile
@@ -12,15 +12,13 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_XORG:=driver/}
-#MODULES = ???
+MODULES = xenocara
+
BUILD_DEPENDS = x11/xorg-server
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS+= --with-xorg-module-dir=${LOCALBASE}/lib/modules
-
-#AUTOCONF_VERSION = ??? (defaults to 2.13)
-#AUTOMAKE_VERSION = ??? (defaults to 1.4)
+CONFIGURE_ARGS+= --with-xorg-module-dir=${X11BASE}/lib/modules
NO_TEST = Yes
diff --git a/x11/xf86-input-ws/Makefile b/x11/xf86-input-ws/Makefile
index c5a468c..33a505f 100644
--- a/x11/xf86-input-ws/Makefile
+++ b/x11/xf86-input-ws/Makefile
@@ -12,15 +12,13 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_XENOCARA:=driver/}
-#MODULES = ???
+MODULES = xenocara
+
BUILD_DEPENDS = x11/xorg-server
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS+= --with-xorg-module-dir=${LOCALBASE}/lib/modules
-
-#AUTOCONF_VERSION = ??? (defaults to 2.13)
-#AUTOMAKE_VERSION = ??? (defaults to 1.4)
+CONFIGURE_ARGS+= --with-xorg-module-dir=${X11BASE}/lib/modules
NO_TEST = Yes
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 6c4e0da..cbf35ee 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -15,7 +15,8 @@ WANTLIB = X11 c
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto
LIB_DEPENDS = x11/libX11
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index 83ba887..d439cb7 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -14,6 +14,8 @@ WANTLIB = X11 xkbfile c
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto
RUN_DEPENDS = x11/xkeyboard-config
@@ -21,15 +23,9 @@ RUN_DEPENDS = x11/xkeyboard-config
LIB_DEPENDS = x11/libX11 \
x11/libxkbfile
-#TEST_DEPENDS = ???
-
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
-# for gnu stuff
-#AUTOCONF_VERSION = ??? (defaults to 2.13)
-#AUTOMAKE_VERSION = ??? (defaults to 1.4)
-
NO_TEST = Yes
.include <bsd.port.mk>
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 19e3784..9d0084d 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -12,11 +12,10 @@ MAINTAINER = xenocara@openbsd.org
# MIT
PERMIT_PACKAGE = Yes
-# "make port-lib-depends-check" can help
-#WANTLIB = ???
-
MASTER_SITES = ${MASTER_SITE_XORG:=data/xkeyboard-config/}
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto \
x11/libX11
diff --git a/x11/xkeyboard-config/pkg/PLIST b/x11/xkeyboard-config/pkg/PLIST
index 5b20202..471a70c 100644
--- a/x11/xkeyboard-config/pkg/PLIST
+++ b/x11/xkeyboard-config/pkg/PLIST
@@ -1,7 +1,4 @@
@comment $OpenBSD: PLIST,v$
-share/X11/
-share/X11/xkb/
-share/X11/xkb/compat/
share/X11/xkb/compat/README
share/X11/xkb/compat/accessx
share/X11/xkb/compat/basic
@@ -20,13 +17,11 @@ share/X11/xkb/compat/pc
share/X11/xkb/compat/pc98
share/X11/xkb/compat/xfree86
share/X11/xkb/compat/xtest
-share/X11/xkb/geometry/
share/X11/xkb/geometry/README
share/X11/xkb/geometry/amiga
share/X11/xkb/geometry/ataritt
share/X11/xkb/geometry/chicony
share/X11/xkb/geometry/dell
-share/X11/xkb/geometry/digital_vndr/
share/X11/xkb/geometry/digital_vndr/lk
share/X11/xkb/geometry/digital_vndr/pc
share/X11/xkb/geometry/digital_vndr/unix
@@ -43,7 +38,6 @@ share/X11/xkb/geometry/nokia
share/X11/xkb/geometry/northgate
share/X11/xkb/geometry/pc
share/X11/xkb/geometry/sanwa
-share/X11/xkb/geometry/sgi_vndr/
share/X11/xkb/geometry/sgi_vndr/O2
share/X11/xkb/geometry/sgi_vndr/indigo
share/X11/xkb/geometry/sgi_vndr/indy
@@ -54,12 +48,10 @@ share/X11/xkb/geometry/teck
share/X11/xkb/geometry/thinkpad
share/X11/xkb/geometry/typematrix
share/X11/xkb/geometry/winbook
-share/X11/xkb/keycodes/
share/X11/xkb/keycodes/README
share/X11/xkb/keycodes/aliases
share/X11/xkb/keycodes/amiga
share/X11/xkb/keycodes/ataritt
-share/X11/xkb/keycodes/digital_vndr/
share/X11/xkb/keycodes/digital_vndr/lk
share/X11/xkb/keycodes/digital_vndr/pc
share/X11/xkb/keycodes/empty
@@ -70,7 +62,6 @@ share/X11/xkb/keycodes/ibm
share/X11/xkb/keycodes/jolla
share/X11/xkb/keycodes/macintosh
share/X11/xkb/keycodes/olpc
-share/X11/xkb/keycodes/sgi_vndr/
share/X11/xkb/keycodes/sgi_vndr/indigo
share/X11/xkb/keycodes/sgi_vndr/indy
share/X11/xkb/keycodes/sgi_vndr/iris
@@ -78,7 +69,6 @@ share/X11/xkb/keycodes/sony
share/X11/xkb/keycodes/sun
share/X11/xkb/keycodes/xfree86
share/X11/xkb/keycodes/xfree98
-share/X11/xkb/rules/
share/X11/xkb/rules/README
share/X11/xkb/rules/base
share/X11/xkb/rules/base.extras.xml
@@ -91,7 +81,6 @@ share/X11/xkb/rules/evdev.xml
share/X11/xkb/rules/xfree98
share/X11/xkb/rules/xkb.dtd
share/X11/xkb/rules/xkb.its
-share/X11/xkb/symbols/
share/X11/xkb/symbols/af
share/X11/xkb/symbols/al
share/X11/xkb/symbols/altwin
@@ -120,7 +109,6 @@ share/X11/xkb/symbols/compose
share/X11/xkb/symbols/ctrl
share/X11/xkb/symbols/cz
share/X11/xkb/symbols/de
-share/X11/xkb/symbols/digital_vndr/
share/X11/xkb/symbols/digital_vndr/lk
share/X11/xkb/symbols/digital_vndr/pc
share/X11/xkb/symbols/digital_vndr/us
@@ -137,7 +125,6 @@ share/X11/xkb/symbols/eurosign
share/X11/xkb/symbols/fi
share/X11/xkb/symbols/fo
share/X11/xkb/symbols/fr
-share/X11/xkb/symbols/fujitsu_vndr/
share/X11/xkb/symbols/fujitsu_vndr/jp
share/X11/xkb/symbols/fujitsu_vndr/us
share/X11/xkb/symbols/gb
@@ -146,7 +133,6 @@ share/X11/xkb/symbols/gh
share/X11/xkb/symbols/gn
share/X11/xkb/symbols/gr
share/X11/xkb/symbols/group
-share/X11/xkb/symbols/hp_vndr/
share/X11/xkb/symbols/hp_vndr/us
share/X11/xkb/symbols/hr
share/X11/xkb/symbols/hu
@@ -178,7 +164,6 @@ share/X11/xkb/symbols/lk
share/X11/xkb/symbols/lt
share/X11/xkb/symbols/lv
share/X11/xkb/symbols/ma
-share/X11/xkb/symbols/macintosh_vndr/
share/X11/xkb/symbols/macintosh_vndr/apple
share/X11/xkb/symbols/macintosh_vndr/ch
share/X11/xkb/symbols/macintosh_vndr/de
@@ -206,12 +191,10 @@ share/X11/xkb/symbols/mt
share/X11/xkb/symbols/mv
share/X11/xkb/symbols/my
share/X11/xkb/symbols/nbsp
-share/X11/xkb/symbols/nec_vndr/
share/X11/xkb/symbols/nec_vndr/jp
share/X11/xkb/symbols/ng
share/X11/xkb/symbols/nl
share/X11/xkb/symbols/no
-share/X11/xkb/symbols/nokia_vndr/
share/X11/xkb/symbols/nokia_vndr/rx-44
share/X11/xkb/symbols/nokia_vndr/rx-51
share/X11/xkb/symbols/nokia_vndr/su-8w
@@ -228,9 +211,7 @@ share/X11/xkb/symbols/rs
share/X11/xkb/symbols/ru
share/X11/xkb/symbols/rupeesign
share/X11/xkb/symbols/se
-share/X11/xkb/symbols/sgi_vndr/
share/X11/xkb/symbols/sgi_vndr/jp
-share/X11/xkb/symbols/sharp_vndr/
share/X11/xkb/symbols/sharp_vndr/sl-c3x00
share/X11/xkb/symbols/sharp_vndr/ws003sh
share/X11/xkb/symbols/sharp_vndr/ws007sh
@@ -240,10 +221,8 @@ share/X11/xkb/symbols/shift
share/X11/xkb/symbols/si
share/X11/xkb/symbols/sk
share/X11/xkb/symbols/sn
-share/X11/xkb/symbols/sony_vndr/
share/X11/xkb/symbols/sony_vndr/us
share/X11/xkb/symbols/srvr_ctrl
-share/X11/xkb/symbols/sun_vndr/
share/X11/xkb/symbols/sun_vndr/ara
share/X11/xkb/symbols/sun_vndr/be
share/X11/xkb/symbols/sun_vndr/br
@@ -291,11 +270,9 @@ share/X11/xkb/symbols/ua
share/X11/xkb/symbols/us
share/X11/xkb/symbols/uz
share/X11/xkb/symbols/vn
-share/X11/xkb/symbols/xfree68_vndr/
share/X11/xkb/symbols/xfree68_vndr/amiga
share/X11/xkb/symbols/xfree68_vndr/ataritt
share/X11/xkb/symbols/za
-share/X11/xkb/types/
share/X11/xkb/types/README
share/X11/xkb/types/basic
share/X11/xkb/types/cancel
@@ -309,134 +286,5 @@ share/X11/xkb/types/mousekeys
share/X11/xkb/types/nokia
share/X11/xkb/types/numpad
share/X11/xkb/types/pc
-share/locale/
-share/locale/af/
-share/locale/af/LC_MESSAGES/
-share/locale/af/LC_MESSAGES/xkeyboard-config.mo
-share/locale/az/
-share/locale/az/LC_MESSAGES/
-share/locale/az/LC_MESSAGES/xkeyboard-config.mo
-share/locale/bg/
-share/locale/bg/LC_MESSAGES/
-share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
-share/locale/ca/
-share/locale/ca/LC_MESSAGES/
-share/locale/ca/LC_MESSAGES/xkeyboard-config.mo
-share/locale/crh/
-share/locale/crh/LC_MESSAGES/
-share/locale/crh/LC_MESSAGES/xkeyboard-config.mo
-share/locale/cs/
-share/locale/cs/LC_MESSAGES/
-share/locale/cs/LC_MESSAGES/xkeyboard-config.mo
-share/locale/da/
-share/locale/da/LC_MESSAGES/
-share/locale/da/LC_MESSAGES/xkeyboard-config.mo
-share/locale/de/
-share/locale/de/LC_MESSAGES/
-share/locale/de/LC_MESSAGES/xkeyboard-config.mo
-share/locale/el/
-share/locale/el/LC_MESSAGES/
-share/locale/el/LC_MESSAGES/xkeyboard-config.mo
-share/locale/en_GB/
-share/locale/en_GB/LC_MESSAGES/
-share/locale/en_GB/LC_MESSAGES/xkeyboard-config.mo
-share/locale/eo/
-share/locale/eo/LC_MESSAGES/
-share/locale/eo/LC_MESSAGES/xkeyboard-config.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
-share/locale/es/LC_MESSAGES/xkeyboard-config.mo
-share/locale/fi/
-share/locale/fi/LC_MESSAGES/
-share/locale/fi/LC_MESSAGES/xkeyboard-config.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
-share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
-share/locale/fur/
-share/locale/fur/LC_MESSAGES/
-share/locale/fur/LC_MESSAGES/xkeyboard-config.mo
-share/locale/gl/
-share/locale/gl/LC_MESSAGES/
-share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
-share/locale/hr/
-share/locale/hr/LC_MESSAGES/
-share/locale/hr/LC_MESSAGES/xkeyboard-config.mo
-share/locale/hu/
-share/locale/hu/LC_MESSAGES/
-share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
-share/locale/id/
-share/locale/id/LC_MESSAGES/
-share/locale/id/LC_MESSAGES/xkeyboard-config.mo
-share/locale/it/
-share/locale/it/LC_MESSAGES/
-share/locale/it/LC_MESSAGES/xkeyboard-config.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
-share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
-share/locale/ka/
-share/locale/ka/LC_MESSAGES/
-share/locale/ka/LC_MESSAGES/xkeyboard-config.mo
-share/locale/ko/
-share/locale/ko/LC_MESSAGES/
-share/locale/ko/LC_MESSAGES/xkeyboard-config.mo
-share/locale/ky/
-share/locale/ky/LC_MESSAGES/
-share/locale/ky/LC_MESSAGES/xkeyboard-config.mo
-share/locale/lt/
-share/locale/lt/LC_MESSAGES/
-share/locale/lt/LC_MESSAGES/xkeyboard-config.mo
-share/locale/nb/
-share/locale/nb/LC_MESSAGES/
-share/locale/nb/LC_MESSAGES/xkeyboard-config.mo
-share/locale/nl/
-share/locale/nl/LC_MESSAGES/
-share/locale/nl/LC_MESSAGES/xkeyboard-config.mo
-share/locale/pl/
-share/locale/pl/LC_MESSAGES/
-share/locale/pl/LC_MESSAGES/xkeyboard-config.mo
-share/locale/pt/
-share/locale/pt/LC_MESSAGES/
-share/locale/pt/LC_MESSAGES/xkeyboard-config.mo
-share/locale/pt_BR/
-share/locale/pt_BR/LC_MESSAGES/
-share/locale/pt_BR/LC_MESSAGES/xkeyboard-config.mo
-share/locale/ro/
-share/locale/ro/LC_MESSAGES/
-share/locale/ro/LC_MESSAGES/xkeyboard-config.mo
-share/locale/ru/
-share/locale/ru/LC_MESSAGES/
-share/locale/ru/LC_MESSAGES/xkeyboard-config.mo
-share/locale/rw/
-share/locale/rw/LC_MESSAGES/
-share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sk/
-share/locale/sk/LC_MESSAGES/
-share/locale/sk/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sl/
-share/locale/sl/LC_MESSAGES/
-share/locale/sl/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sq/
-share/locale/sq/LC_MESSAGES/
-share/locale/sq/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sr/
-share/locale/sr/LC_MESSAGES/
-share/locale/sr/LC_MESSAGES/xkeyboard-config.mo
-share/locale/sv/
-share/locale/sv/LC_MESSAGES/
-share/locale/sv/LC_MESSAGES/xkeyboard-config.mo
-share/locale/tr/
-share/locale/tr/LC_MESSAGES/
-share/locale/tr/LC_MESSAGES/xkeyboard-config.mo
-share/locale/uk/
-share/locale/uk/LC_MESSAGES/
-share/locale/uk/LC_MESSAGES/xkeyboard-config.mo
-share/locale/vi/
-share/locale/vi/LC_MESSAGES/
-share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
-share/locale/zh_CN/
-share/locale/zh_CN/LC_MESSAGES/
-share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
-share/locale/zh_TW/
-share/locale/zh_TW/LC_MESSAGES/
-share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
+share/pkgconfig/
share/pkgconfig/xkeyboard-config.pc
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 7e39463..a674d0d 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -23,8 +23,8 @@ WANTLIB += epoxy
MASTER_SITES = ${MASTER_SITE_XORG:=xserver/}
+MODULES = xenocara
-# Dependencies
BUILD_DEPENDS = devel/xorg-util-macros \
devel/xorgproto \
fonts/xorg-font-util \
@@ -47,13 +47,6 @@ LIB_DEPENDS = graphics/pixman \
x11/xcb-util-renderutil \
x11/xcb-util-wm
-#TEST_DEPENDS = ???
-
-#MAKE_FLAGS = ???
-#MAKE_ENV = ???
-#FAKE_FLAGS = ???
-#TEST_FLAGS = ???
-
SEPARATE_BUILD = no
CONFIGURE_STYLE = autoreconf
@@ -61,14 +54,14 @@ GLX_OPTION= --enable-glamor
KDRIVE_OPTION= --enable-kdrive --enable-xephyr
DRI_OPTION= --enable-dri --enable-dri2
-XKB_PATH= ${LOCALBASE}/share/X11/xkb
+XKB_PATH= ${X11BASE}/share/X11/xkb
XKB_RULES= base
CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--with-xkb-path=${XKB_PATH} \
--with-xkb-output=/var/db/xkb \
--with-default-xkb-rules=${XKB_RULES} \
- --with-module-dir=${LOCALBASE}/lib/modules ${GLX_OPTION} \
+ --with-module-dir=${X11BASE}/lib/modules ${GLX_OPTION} \
--disable-install-setuid --enable-privsep \
${KDRIVE_OPTION} \
--enable-xcsecurity --disable-xdm-auth-1 \
@@ -77,22 +70,9 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--disable-unit-tests \
${DRI_OPTION}
-# for gnu stuff
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.12
-#NO_BUILD = Yes
NO_TEST = Yes
-# For ports that use a script or autoreconf to generate autoconf/automake
-# files (where "CONFIGURE_STYLE=autoconf" isn't enough), use some/all of these
-# dependencies, and add a do-gen target:
-#
-#BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
-# ${MODGNU_AUTOMAKE_DEPENDS} \
-# devel/libtool
-#
-#do-gen:
-# cd ${WRKSRC}; ${AUTOCONF_ENV} ./autogen.sh
-
.include <bsd.port.mk>
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
index 241195a..e41a44e 100644
--- a/x11/xrdb/Makefile
+++ b/x11/xrdb/Makefile
@@ -15,7 +15,8 @@ WANTLIB = X11 Xmuu c
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto
LIB_DEPENDS = x11/libX11 \
diff --git a/x11/xsetroot/Makefile b/x11/xsetroot/Makefile
index 4bb76b3..be9b783 100644
--- a/x11/xsetroot/Makefile
+++ b/x11/xsetroot/Makefile
@@ -15,7 +15,8 @@ WANTLIB = X11 Xcursor Xmuu c
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
-# Dependencies
+MODULES = xenocara
+
BUILD_DEPENDS = devel/xorgproto \
x11/xbitmaps
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index e249628..b4a1b9e 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -19,16 +19,16 @@ MASTER_SITES = ftp://ftp.invisible-island.net/xterm/
EXTRACT_SUFX = .tgz
+MODULES = xenocara
+
LIB_DEPENDS = x11/libXaw \
x11/libXft \
x11/libXinerama
RUN_DEPENDS = x11/libXcursor
-
USE_GMAKE = Yes
CONFIGURE_STYLE = simple
-CONFIGURE_ARGS =
.include <bsd.port.mk>
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 68c06ec..7d6a76b 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -14,6 +14,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_XORG:=lib/}
+MODULES = xenocara
+
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu