Sun Jul 3 22:59:46 2011 UTC ()
Fix the value of "appdefaultdir" that ends up in native X .pc files.
(It should be "app-defaults" but was "app-default", probably because
of a typo; it's been wrong ever since this logic was put in two and a
half years ago, and as app-defaults files are a legacy mechanism it
took this long for anyone to notice.) Should be pulled up to -5.


(dholland)
diff -r1.97 -r1.98 src/share/mk/bsd.x11.mk
cvs diff -r1.97 -r1.98 src/share/mk/bsd.x11.mk (expand / switch to unified diff)

--- src/share/mk/bsd.x11.mk 2011/04/11 23:03:38 1.97
+++ src/share/mk/bsd.x11.mk 2011/07/03 22:59:46 1.98
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.x11.mk,v 1.97 2011/04/11 23:03:38 joerg Exp $ 1# $NetBSD: bsd.x11.mk,v 1.98 2011/07/03 22:59:46 dholland Exp $
2 2
3.include <bsd.init.mk> 3.include <bsd.init.mk>
4 4
5BINDIR= ${X11BINDIR} 5BINDIR= ${X11BINDIR}
6LIBDIR= ${X11USRLIBDIR} 6LIBDIR= ${X11USRLIBDIR}
7MANDIR= ${X11MANDIR} 7MANDIR= ${X11MANDIR}
8 8
9COPTS+= -fno-strict-aliasing 9COPTS+= -fno-strict-aliasing
10 10
11.include <bsd.sys.mk> 11.include <bsd.sys.mk>
12 12
13.if defined(USE_SSP) && (${USE_SSP} != "no") 13.if defined(USE_SSP) && (${USE_SSP} != "no")
14CPPFLAGS+= -DNO_ALLOCA 14CPPFLAGS+= -DNO_ALLOCA
@@ -263,27 +263,27 @@ pkgconfig-install: ${_PKGDEST.${_pkg}} @@ -263,27 +263,27 @@ pkgconfig-install: ${_PKGDEST.${_pkg}}
263 _pkg_version='${PKGCONFIG_VERSION.${.PREFIX}}'; \ 263 _pkg_version='${PKGCONFIG_VERSION.${.PREFIX}}'; \
264 else \ 264 else \
265 _pkg_version=$$(${PRINT_PACKAGE_VERSION} \ 265 _pkg_version=$$(${PRINT_PACKAGE_VERSION} \
266 ${PKGDIST.${.PREFIX}}/configure); \ 266 ${PKGDIST.${.PREFIX}}/configure); \
267 fi; \ 267 fi; \
268 ${TOOL_SED} \ 268 ${TOOL_SED} \
269 -e "s,@prefix@,${X11ROOTDIR},; \ 269 -e "s,@prefix@,${X11ROOTDIR},; \
270 s,@INSTALL_DIR@,${X11ROOTDIR},; \ 270 s,@INSTALL_DIR@,${X11ROOTDIR},; \
271 s,@exec_prefix@,\\$$\{prefix\},; \ 271 s,@exec_prefix@,\\$$\{prefix\},; \
272 s,@libdir@,\\$$\{prefix\}/lib,; \ 272 s,@libdir@,\\$$\{prefix\}/lib,; \
273 s,@includedir@,\\$$\{prefix\}/include,; \ 273 s,@includedir@,\\$$\{prefix\}/include,; \
274 s,@datarootdir@,\\$$\{prefix\}/share,; \ 274 s,@datarootdir@,\\$$\{prefix\}/share,; \
275 s,@datadir@,\\$$\{datarootdir\},; \ 275 s,@datadir@,\\$$\{datarootdir\},; \
276 s,@appdefaultdir@,\\$$\{libdir}/X11/app-default,; \ 276 s,@appdefaultdir@,\\$$\{libdir}/X11/app-defaults,; \
277 s,@MAPDIR@,\\$$\{libdir\}/X11/fonts/util,; \ 277 s,@MAPDIR@,\\$$\{libdir\}/X11/fonts/util,; \
278 s,@ICONDIR@,\\$$\{datarootdir\}/icons,; \ 278 s,@ICONDIR@,\\$$\{datarootdir\}/icons,; \
279 s,@PACKAGE_VERSION@,$${_pkg_version},; \ 279 s,@PACKAGE_VERSION@,$${_pkg_version},; \
280 s,@VERSION@,$${_pkg_version},; \ 280 s,@VERSION@,$${_pkg_version},; \
281 s,@COMPOSITEEXT_VERSION@,$${_pkg_version%.*},; \ 281 s,@COMPOSITEEXT_VERSION@,$${_pkg_version%.*},; \
282 s,@DAMAGEEXT_VERSION@,$${_pkg_version%.*},; \ 282 s,@DAMAGEEXT_VERSION@,$${_pkg_version%.*},; \
283 s,@FIXESEXT_VERSION@,$${_pkg_version%.*},; \ 283 s,@FIXESEXT_VERSION@,$${_pkg_version%.*},; \
284 s,@RANDR_VERSION@,$${_pkg_version%.*},; \ 284 s,@RANDR_VERSION@,$${_pkg_version%.*},; \
285 s,@RENDER_VERSION@,$${_pkg_version%.*}," \ 285 s,@RENDER_VERSION@,$${_pkg_version%.*}," \
286 -e "s,@LIBS@,,; \ 286 -e "s,@LIBS@,,; \
287 s,@Z_LIBS@,-lz,; \ 287 s,@Z_LIBS@,-lz,; \
288 s,@xkb_base@,\\$$\{libdir\}/X11/xkb,; \ 288 s,@xkb_base@,\\$$\{libdir\}/X11/xkb,; \
289 s,@xcbincludedir@,\\$$\{prefix\}/include/xcb,; \ 289 s,@xcbincludedir@,\\$$\{prefix\}/include/xcb,; \