Change PKGDIR from pkg/ to . Also fix places where ${PKGDIR} is

spelled out (many of which are ${PKGDIR}/MESSAGE -> ${PKGMESSAGE} type
fixes that shouldn't have been necessary) and the string "/pkg/"
appear.

29 files changed, 29 insertions, 29 deletions

diff --git a/x11-servers/XttXF86srv-3DLabs/Makefile b/x11-servers/XttXF86srv-3DLabs/Makefile
index 2672bc45345d..ceeb2e27bf10 100644
--- a/x11-servers/XttXF86srv-3DLabs/Makefile
+++ b/x11-servers/XttXF86srv-3DLabs/Makefile
@@ -16,6 +16,6 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 SERVER=		XF86_3DLabs
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-8514/Makefile b/x11-servers/XttXF86srv-8514/Makefile
index 49e7a9fcac9e..7f10e2dd0ad8 100644
--- a/x11-servers/XttXF86srv-8514/Makefile
+++ b/x11-servers/XttXF86srv-8514/Makefile
@@ -18,6 +18,6 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF86_8514
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-AGX/Makefile b/x11-servers/XttXF86srv-AGX/Makefile
index 1d194656cc66..ebcd4cb00ed0 100644
--- a/x11-servers/XttXF86srv-AGX/Makefile
+++ b/x11-servers/XttXF86srv-AGX/Makefile
@@ -18,6 +18,6 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF86_AGX
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-I128/Makefile b/x11-servers/XttXF86srv-I128/Makefile
index 5053db964bd6..54bc5aba2bd4 100644
--- a/x11-servers/XttXF86srv-I128/Makefile
+++ b/x11-servers/XttXF86srv-I128/Makefile
@@ -16,6 +16,6 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 SERVER=		XF86_I128
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-Mach32/Makefile b/x11-servers/XttXF86srv-Mach32/Makefile
index 9aaa7d8559b3..4fdc4e27543e 100644
--- a/x11-servers/XttXF86srv-Mach32/Makefile
+++ b/x11-servers/XttXF86srv-Mach32/Makefile
@@ -18,6 +18,6 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF86_Mach32
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-Mach64/Makefile b/x11-servers/XttXF86srv-Mach64/Makefile
index 091af00266e5..c9612169d007 100644
--- a/x11-servers/XttXF86srv-Mach64/Makefile
+++ b/x11-servers/XttXF86srv-Mach64/Makefile
@@ -16,6 +16,6 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 SERVER=		XF86_Mach64
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-Mach8/Makefile b/x11-servers/XttXF86srv-Mach8/Makefile
index ff9f71971b93..759d9d14575f 100644
--- a/x11-servers/XttXF86srv-Mach8/Makefile
+++ b/x11-servers/XttXF86srv-Mach8/Makefile
@@ -18,6 +18,6 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF86_Mach8
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-Mono/Makefile b/x11-servers/XttXF86srv-Mono/Makefile
index 9744771fade0..84ff53e9a059 100644
--- a/x11-servers/XttXF86srv-Mono/Makefile
+++ b/x11-servers/XttXF86srv-Mono/Makefile
@@ -16,6 +16,6 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 SERVER=		XF86_Mono
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-P9000/Makefile b/x11-servers/XttXF86srv-P9000/Makefile
index 7e9f62e55eb9..fde989073719 100644
--- a/x11-servers/XttXF86srv-P9000/Makefile
+++ b/x11-servers/XttXF86srv-P9000/Makefile
@@ -16,6 +16,6 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 SERVER=		XF86_P9000
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-S3/Makefile b/x11-servers/XttXF86srv-S3/Makefile
index c4e371fe21c7..2331fb6a781a 100644
--- a/x11-servers/XttXF86srv-S3/Makefile
+++ b/x11-servers/XttXF86srv-S3/Makefile
@@ -16,6 +16,6 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 SERVER=		XF86_S3
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-S3V/Makefile b/x11-servers/XttXF86srv-S3V/Makefile
index 35eecc308d7b..61182bc83389 100644
--- a/x11-servers/XttXF86srv-S3V/Makefile
+++ b/x11-servers/XttXF86srv-S3V/Makefile
@@ -16,6 +16,6 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 SERVER=		XF86_S3V
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-SVGA/Makefile b/x11-servers/XttXF86srv-SVGA/Makefile
index 89a473ac7ec5..6e0a12f2643f 100644
--- a/x11-servers/XttXF86srv-SVGA/Makefile
+++ b/x11-servers/XttXF86srv-SVGA/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 SERVER=		XF86_SVGA
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
 
diff --git a/x11-servers/XttXF86srv-VGA16/Makefile b/x11-servers/XttXF86srv-VGA16/Makefile
index 9f93541acffe..04f7e217dade 100644
--- a/x11-servers/XttXF86srv-VGA16/Makefile
+++ b/x11-servers/XttXF86srv-VGA16/Makefile
@@ -18,6 +18,6 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF86_VGA16
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-W32/Makefile b/x11-servers/XttXF86srv-W32/Makefile
index ef504914a07f..3850593034e3 100644
--- a/x11-servers/XttXF86srv-W32/Makefile
+++ b/x11-servers/XttXF86srv-W32/Makefile
@@ -18,6 +18,6 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF86_W32
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-xfs/Makefile b/x11-servers/XttXF86srv-xfs/Makefile
index bca9f0e991c4..eeb975d6d13d 100644
--- a/x11-servers/XttXF86srv-xfs/Makefile
+++ b/x11-servers/XttXF86srv-xfs/Makefile
@@ -16,6 +16,6 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 SERVER=		xfs
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF98srv-EGC/Makefile b/x11-servers/XttXF98srv-EGC/Makefile
index a02f64311eda..8686c88c85b3 100644
--- a/x11-servers/XttXF98srv-EGC/Makefile
+++ b/x11-servers/XttXF98srv-EGC/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_EGC
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-GA968/Makefile b/x11-servers/XttXF98srv-GA968/Makefile
index 3ff22a32b411..c6eb4b1f8332 100644
--- a/x11-servers/XttXF98srv-GA968/Makefile
+++ b/x11-servers/XttXF98srv-GA968/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_GA968
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-GANBWAP/Makefile b/x11-servers/XttXF98srv-GANBWAP/Makefile
index 0e861c77cfad..5df0bd3b109f 100644
--- a/x11-servers/XttXF98srv-GANBWAP/Makefile
+++ b/x11-servers/XttXF98srv-GANBWAP/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_GANBWAP
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-MGA/Makefile b/x11-servers/XttXF98srv-MGA/Makefile
index 734736a8a52b..9fe4a872f288 100644
--- a/x11-servers/XttXF98srv-MGA/Makefile
+++ b/x11-servers/XttXF98srv-MGA/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_MGA
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-NEC480/Makefile b/x11-servers/XttXF98srv-NEC480/Makefile
index e2f326658aee..c3777b58ee0f 100644
--- a/x11-servers/XttXF98srv-NEC480/Makefile
+++ b/x11-servers/XttXF98srv-NEC480/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_NEC480
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-NECS3/Makefile b/x11-servers/XttXF98srv-NECS3/Makefile
index be5ad73c9bf3..a29174f1dad0 100644
--- a/x11-servers/XttXF98srv-NECS3/Makefile
+++ b/x11-servers/XttXF98srv-NECS3/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_NECS3
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-NKVNEC/Makefile b/x11-servers/XttXF98srv-NKVNEC/Makefile
index b7807b1069b9..1c0f2cd2512e 100644
--- a/x11-servers/XttXF98srv-NKVNEC/Makefile
+++ b/x11-servers/XttXF98srv-NKVNEC/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_NKVNEC
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-PWLB/Makefile b/x11-servers/XttXF98srv-PWLB/Makefile
index 19e1376cc2a4..e4421addcfa1 100644
--- a/x11-servers/XttXF98srv-PWLB/Makefile
+++ b/x11-servers/XttXF98srv-PWLB/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_PWLB
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-PWSKB/Makefile b/x11-servers/XttXF98srv-PWSKB/Makefile
index 74ba0a9ea083..7a89ee05ac44 100644
--- a/x11-servers/XttXF98srv-PWSKB/Makefile
+++ b/x11-servers/XttXF98srv-PWSKB/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_PWSKB
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-SVGA/Makefile b/x11-servers/XttXF98srv-SVGA/Makefile
index 17d0bbbb6b1d..74a0d635ccc6 100644
--- a/x11-servers/XttXF98srv-SVGA/Makefile
+++ b/x11-servers/XttXF98srv-SVGA/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_SVGA
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-TGUI/Makefile b/x11-servers/XttXF98srv-TGUI/Makefile
index 88dc2254c430..eccd8efd0310 100644
--- a/x11-servers/XttXF98srv-TGUI/Makefile
+++ b/x11-servers/XttXF98srv-TGUI/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_TGUI
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-WABEP/Makefile b/x11-servers/XttXF98srv-WABEP/Makefile
index b4a5355c5fe5..f8e95dc99467 100644
--- a/x11-servers/XttXF98srv-WABEP/Makefile
+++ b/x11-servers/XttXF98srv-WABEP/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_WABEP
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-WABS/Makefile b/x11-servers/XttXF98srv-WABS/Makefile
index 549840c25380..cb9855c70dfe 100644
--- a/x11-servers/XttXF98srv-WABS/Makefile
+++ b/x11-servers/XttXF98srv-WABS/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_WABS
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes
 
diff --git a/x11-servers/XttXF98srv-WSNA/Makefile b/x11-servers/XttXF98srv-WSNA/Makefile
index d3871d11a4b5..e08bda096e68 100644
--- a/x11-servers/XttXF98srv-WSNA/Makefile
+++ b/x11-servers/XttXF98srv-WSNA/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 SERVER=		XF98_WSNA
 
 MASTERDIR=	${.CURDIR}/../XttXF86srv-common
-PKGDIR=		${.CURDIR}/pkg
+PKGDIR=		${.CURDIR}
 
 X98SERVER=	yes