Override appdefaultdir inherited from pkg-config, so that e.g. with

native X11R7 on NetBSD, the files don't end up in /usr/X111R7.
This commit is contained in:
joerg 2011-09-24 13:14:15 +00:00
parent 5fd80f551e
commit e6249e5ad3
15 changed files with 45 additions and 15 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2008/11/10 17:21:38 wiz Exp $
# $NetBSD: Makefile,v 1.6 2011/09/24 13:14:15 joerg Exp $
#
DISTNAME= beforelight-1.0.3
@ -16,6 +16,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXScrnSaver/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2009/11/09 19:43:31 tnn Exp $
# $NetBSD: Makefile,v 1.5 2011/09/24 13:14:15 joerg Exp $
#
DISTNAME= bitmap-1.0.4
@ -15,6 +15,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/xbitmaps/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2009/11/09 19:41:44 tnn Exp $
# $NetBSD: Makefile,v 1.5 2011/09/24 13:14:15 joerg Exp $
#
DISTNAME= editres-1.0.4
@ -15,5 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2010/09/10 19:22:42 joerg Exp $
# $NetBSD: Makefile,v 1.7 2011/09/24 13:14:15 joerg Exp $
#
DISTNAME= xcalc-1.0.3
@ -18,5 +18,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2009/11/09 19:10:34 tnn Exp $
# $NetBSD: Makefile,v 1.11 2011/09/24 13:14:16 joerg Exp $
#
DISTNAME= xclock-1.0.4
@ -18,6 +18,8 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
LDFLAGS+= ${BUILDLINK_LDADD.iconv}
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../converters/libiconv/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXaw/buildlink3.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2008/11/10 17:21:39 wiz Exp $
# $NetBSD: Makefile,v 1.7 2011/09/24 13:14:16 joerg Exp $
#
DISTNAME= xconsole-1.0.3
@ -18,6 +18,8 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.13 2010/07/12 11:39:57 obache Exp $
# $NetBSD: Makefile,v 1.14 2011/09/24 13:14:16 joerg Exp $
DISTNAME= xdm-1.1.10
CATEGORIES= x11
@ -60,6 +60,8 @@ CONFIGURE_ARGS+= --with-random-device=/dev/urandom
CONFIGURE_ARGS+= --with-default-vt=vt05
.endif
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "options.mk"
.include "../../x11/libXaw/buildlink3.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2008/11/10 17:21:39 wiz Exp $
# $NetBSD: Makefile,v 1.4 2011/09/24 13:14:16 joerg Exp $
#
DISTNAME= xfontsel-1.0.2
@ -16,5 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2008/11/10 17:21:39 wiz Exp $
# $NetBSD: Makefile,v 1.8 2011/09/24 13:14:16 joerg Exp $
#
DISTNAME= xload-1.0.2
@ -18,5 +18,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2010/09/10 19:48:23 joerg Exp $
# $NetBSD: Makefile,v 1.7 2011/09/24 13:14:16 joerg Exp $
#
DISTNAME= xlogo-1.0.2
@ -17,6 +17,8 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2009/11/09 18:44:31 tnn Exp $
# $NetBSD: Makefile,v 1.7 2011/09/24 13:14:16 joerg Exp $
#
DISTNAME= xmag-1.0.3
@ -16,5 +16,7 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 2009/11/09 18:42:22 tnn Exp $
# $NetBSD: Makefile,v 1.9 2011/09/24 13:14:16 joerg Exp $
#
DISTNAME= xman-1.1.0
@ -23,6 +23,8 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1
CONFIGURE_ARGS+= --with-manconfig=/etc/man.conf
.endif
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXprintUtil/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2010/09/10 18:34:28 joerg Exp $
# $NetBSD: Makefile,v 1.7 2011/09/24 13:14:17 joerg Exp $
#
DISTNAME= xmessage-1.0.3
@ -18,5 +18,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2010/09/10 20:00:45 joerg Exp $
# $NetBSD: Makefile,v 1.8 2011/09/24 13:14:17 joerg Exp $
#
DISTNAME= xmore-1.0.2
@ -17,5 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2008/11/10 17:21:40 wiz Exp $
# $NetBSD: Makefile,v 1.7 2011/09/24 13:14:17 joerg Exp $
#
DISTNAME= xsm-1.0.1
@ -25,6 +25,8 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1
CONFIGURE_ENV+= ac_cv_path_RSH=/usr/bin/rsh
.endif
MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults
.include "../../x11/libXaw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"