diff options
Diffstat (limited to 'x11')
98 files changed, 226 insertions, 551 deletions
diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile index 014012dbe4c..6b41889cfac 100644 --- a/x11/Xfixes/Makefile +++ b/x11/Xfixes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2014/10/09 14:07:13 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2016/02/26 11:27:14 jperkin Exp $ DISTNAME= libXfixes-2.0.1 PKGNAME= ${DISTNAME:S/libX/X/} @@ -25,9 +25,7 @@ PKGCONFIG_OVERRIDE+= xfixes.pc.in PKG_FAIL_REASON+="This package is for native X11 only; use libXfixes instead." .endif -.if (${OPSYS} == "Darwin") -CFLAGS+= -fno-common -.endif +CFLAGS.Darwin+= -fno-common .include "../../x11/fixesproto4/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile index f771eae36df..cf5681b6e0c 100644 --- a/x11/enlightenment/Makefile +++ b/x11/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2016/01/24 16:14:45 jperkin Exp $ +# $NetBSD: Makefile,v 1.38 2016/02/26 11:27:14 jperkin Exp $ # DISTNAME= enlightenment-0.17.3 @@ -35,14 +35,12 @@ BUILD_DEFS+= PKG_SYSCONFBASE INSTALLATION_DIRS= ${EGDIR} -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -SUBST_CLASSES+= solhost +SUBST_CLASSES.SunOS+= solhost SUBST_STAGE.solhost= pre-configure SUBST_FILES.solhost= configure SUBST_SED.solhost= -e '/^MODULE_ARCH=/s/.host_os/solaris/' -.endif + +.include "../../mk/bsd.prefs.mk" .if ${X11_TYPE} == "modular" CPPFLAGS+= -DPKGSRC_X11BASE=\"${X11BASE:Q}\" diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index ec6654e8ee0..e5fb795ef89 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.273 2015/12/30 10:15:07 prlw1 Exp $ +# $NetBSD: Makefile,v 1.274 2016/02/26 11:27:14 jperkin Exp $ DISTNAME= gtk+-2.24.29 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -53,12 +53,10 @@ REQD_DIRS+= ${PREFIX}/libdata/gtk-2.0 BUILD_DIRS= . demos/gtk-demo -.include "../../mk/bsd.prefs.mk" - # fix for 'only weak aliases are supported on darwin' error -.if ${OPSYS} == "Darwin" -CONFIGURE_ARGS+= --disable-visibility -.endif +CONFIGURE_ARGS.Darwin+= --disable-visibility + +.include "../../mk/bsd.prefs.mk" # gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms # which do not have it. diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile index 2bcf3fa9cbc..e602899e5d5 100644 --- a/x11/gtk3/Makefile +++ b/x11/gtk3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2015/11/17 22:57:58 prlw1 Exp $ +# $NetBSD: Makefile,v 1.72 2016/02/26 11:27:14 jperkin Exp $ DISTNAME= gtk+-3.16.7 PKGNAME= ${DISTNAME:S/gtk/gtk3/} @@ -57,10 +57,8 @@ TOOLS_PATH.grep= ${LOCALBASE}/bin/ggrep .endif # isnan and isinf are part of libc, not libm on DragonFly # conf tests fail detection due to conflicting definitions, just skip them -.if ${OPSYS} == "DragonFly" -CONFIGURE_ENV+= ac_cv_func_isnan=yes -CONFIGURE_ENV+= ac_cv_func_isinf=yes -.endif +CONFIGURE_ENV.DragonFly+= ac_cv_func_isinf=yes +CONFIGURE_ENV.DragonFly+= ac_cv_func_isnan=yes CFLAGS.SunOS+= -std=gnu99 diff --git a/x11/kde-runtime4/options.mk b/x11/kde-runtime4/options.mk index cf229e9bb41..c676d597a21 100644 --- a/x11/kde-runtime4/options.mk +++ b/x11/kde-runtime4/options.mk @@ -1,12 +1,10 @@ -# $NetBSD: options.mk,v 1.4 2013/04/30 20:51:54 markd Exp $ +# $NetBSD: options.mk,v 1.5 2016/02/26 11:27:14 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.kde-runtime4 PKG_SUPPORTED_OPTIONS= samba alsa pulseaudio PKG_SUGGESTED_OPTIONS= samba -.if ${OPSYS} == "Linux" -PKG_SUGGESTED_OPTIONS+= alsa -.endif +PKG_SUGGESTED_OPTIONS.Linux+= alsa .include "../../mk/bsd.options.mk" diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 02b4e39efd2..be74cb7448d 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.190 2015/07/04 16:18:42 joerg Exp $ +# $NetBSD: Makefile,v 1.191 2016/02/26 11:27:14 jperkin Exp $ DISTNAME= kdebase-${_KDE_VERSION} PKGREVISION= 38 @@ -194,12 +194,10 @@ post-install: CONFIGURE_ENV+= ac_cv_func_getutxent='no' .endif -.if ${OPSYS} == "NetBSD" # We always use pkg-config for detecting the fontconfig version, since there # may exist an old version of fontconfig-config on systems that have been # updated from NetBSD 1.x. -CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE' -.endif +CONFIGURE_ENV.NetBSD+= kde_cv_path_fontconfig_config='NONE' .include "../../meta-pkgs/kde3/kde3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index bd250e2fef1..19acb98f12e 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.182 2015/06/12 10:52:18 wiz Exp $ +# $NetBSD: Makefile,v 1.183 2016/02/26 11:27:14 jperkin Exp $ DISTNAME= kdelibs-${_KDE_VERSION} PKGREVISION= 38 @@ -62,6 +62,10 @@ SPECIAL_PERMS+= ${PREFIX}/bin/kpac_dhcp_helper ${SETUID_ROOT_PERMS} # find the path to the kgrantpty expects it to have read permissions set. SPECIAL_PERMS+= ${PREFIX}/bin/kgrantpty ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4555 +# We require use of a recent enough libbz2 to have the BZ2_ prefixes +# so force this as configure gets this wrong on Solaris 9 +CONFIGURE_ENV.SunOS+= ac_cv_lib_bzip2='no' + .include "options.mk" PLIST_VARS+= kded @@ -140,9 +144,3 @@ CONFIGURE_ENV+= ac_cv_func_getservbyname_r='no' CONFIGURE_ENV+= ac_cv_func_getservbyport_r='no' CONFIGURE_ENV+= ac_cv_func_getprotobyname_r='no' .endif - -.if ${OPSYS} == "SunOS" -# We require use of a recent enough libbz2 to have the BZ2_ prefixes -# so force this as configure gets this wrong on Solaris 9 -CONFIGURE_ENV+= ac_cv_lib_bzip2='no' -.endif diff --git a/x11/libFS/Makefile b/x11/libFS/Makefile index 74e23886a24..f0838f6465c 100644 --- a/x11/libFS/Makefile +++ b/x11/libFS/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2015/05/01 08:34:56 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2016/02/26 11:27:14 jperkin Exp $ DISTNAME= libFS-1.0.7 CATEGORIES= x11 devel @@ -15,11 +15,7 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= libfs.pc.in -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 52375ea1758..1a04e035313 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2015/03/10 07:16:26 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2016/02/26 11:27:14 jperkin Exp $ DISTNAME= libX11-1.6.3 CATEGORIES= x11 devel @@ -21,11 +21,7 @@ PKGCONFIG_OVERRIDE+= x11.pc.in CONFIGURE_ENV+= FILE_MAN_SUFFIX=5 -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../mk/pthread.buildlink3.mk" CPPFLAGS.OSF1+= ${PTHREAD_CFLAGS} # Required by compiler if including pthread.h @@ -39,6 +35,8 @@ BUILDLINK_API_DEPENDS.xproto+=xproto>=7.0.17 TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" +.include "../../mk/bsd.prefs.mk" + .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile index 8ed921750cd..05c9e626f9c 100644 --- a/x11/libXScrnSaver/Makefile +++ b/x11/libXScrnSaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2014/10/09 14:07:14 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2016/02/26 11:27:14 jperkin Exp $ # DISTNAME= libXScrnSaver-1.2.2 @@ -18,11 +18,7 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= xscrnsaver.pc.in -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile index f72b1db924f..353484ecc4c 100644 --- a/x11/libXevie/Makefile +++ b/x11/libXevie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/10/09 14:07:14 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2016/02/26 11:27:14 jperkin Exp $ # DISTNAME= libXevie-1.0.3 @@ -16,11 +16,7 @@ USE_TOOLS+= pkg-config autoconf PKGCONFIG_OVERRIDE+= xevie.pc.in -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull pre-configure: cd ${WRKSRC} && autoconf -f diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile index df788b57e1d..845944ca45a 100644 --- a/x11/libXext/Makefile +++ b/x11/libXext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2014/10/09 14:07:14 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2016/02/26 11:27:14 jperkin Exp $ DISTNAME= libXext-1.3.3 CATEGORIES= x11 devel @@ -15,11 +15,7 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= xext.pc.in -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../mk/compiler.mk" diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile index e1df1a6e8f6..af9ca3869db 100644 --- a/x11/libXi/Makefile +++ b/x11/libXi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2015/12/27 11:31:35 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2016/02/26 11:27:15 jperkin Exp $ DISTNAME= libXi-1.7.6 CATEGORIES= x11 devel @@ -22,11 +22,7 @@ SUBST_STAGE.sosubdir= pre-configure SUBST_FILES.sosubdir= man/*.man SUBST_SED.sosubdir= -e 's|\.so X|.so manlibmansuffix/X|' -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.3 BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile index f48b52b8601..f6bfa6f7b55 100644 --- a/x11/libXinerama/Makefile +++ b/x11/libXinerama/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/10/09 14:07:14 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2016/02/26 11:27:15 jperkin Exp $ DISTNAME= libXinerama-1.1.3 CATEGORIES= x11 @@ -16,11 +16,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 PKGCONFIG_OVERRIDE+= xinerama.pc.in -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile index ab62550f942..3f662f70ee1 100644 --- a/x11/libXp/Makefile +++ b/x11/libXp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2015/02/23 07:33:40 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2016/02/26 11:27:15 jperkin Exp $ DISTNAME= libXp-1.0.3 CATEGORIES= x11 print @@ -16,11 +16,9 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 PKGCONFIG_OVERRIDE+= xp.pc.in -.include "../../mk/bsd.prefs.mk" +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +.include "../../mk/bsd.prefs.mk" .if ${X11_TYPE} == "native" XPRINT_CFLAGS= -I${X11BASE}/include diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index 13fd1097a49..d3bee6d7f53 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2015/05/27 06:44:09 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:15 jperkin Exp $ DISTNAME= libXrandr-1.5.0 CATEGORIES= x11 devel @@ -18,11 +18,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 PKGCONFIG_OVERRIDE+= xrandr.pc.in -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 .include "../../x11/libX11/buildlink3.mk" diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile index 4a0530233b2..b38dfd86638 100644 --- a/x11/libXrender/Makefile +++ b/x11/libXrender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2015/12/29 04:54:39 dholland Exp $ +# $NetBSD: Makefile,v 1.13 2016/02/26 11:27:15 jperkin Exp $ DISTNAME= libXrender-0.9.9 CATEGORIES= x11 devel @@ -18,11 +18,7 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= xrender.pc.in -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile index 100f89828d5..f020b5d068f 100644 --- a/x11/libXres/Makefile +++ b/x11/libXres/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2013/05/31 08:25:43 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2016/02/26 11:27:15 jperkin Exp $ DISTNAME= libXres-1.0.7 CATEGORIES= x11 @@ -15,11 +15,7 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= xres.pc.in -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile index 4bbb8e494e7..9047c916480 100644 --- a/x11/libXt/Makefile +++ b/x11/libXt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2015/05/01 08:44:16 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2016/02/26 11:27:15 jperkin Exp $ DISTNAME= libXt-1.1.5 CATEGORIES= x11 devel @@ -18,11 +18,9 @@ CONFIGURE_ARGS+= --with-appdefaultdir=${PREFIX}/lib/X11/app-defaults CONFIGURE_ENV+= APP_MAN_SUFFIX=1 LIB_MAN_SUFFIX=3 PKGCONFIG_OVERRIDE+= xt.pc.in -.include "../../mk/bsd.prefs.mk" +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +.include "../../mk/bsd.prefs.mk" .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile index 24ce503e3c1..56881b8512e 100644 --- a/x11/libXv/Makefile +++ b/x11/libXv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/10/09 14:07:15 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2016/02/26 11:27:15 jperkin Exp $ DISTNAME= libXv-1.0.10 CATEGORIES= x11 @@ -14,11 +14,7 @@ PKGCONFIG_OVERRIDE+= xv.pc.in GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile index eed179cc7de..543c45dd461 100644 --- a/x11/libXvMC/Makefile +++ b/x11/libXvMC/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2015/03/15 20:44:12 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2016/02/26 11:27:15 jperkin Exp $ DISTNAME= libXvMC-1.0.9 CATEGORIES= x11 @@ -16,11 +16,7 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= xvmc.pc.in -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile index a4fc4c0d7bd..5e7b223c908 100644 --- a/x11/libXxf86dga/Makefile +++ b/x11/libXxf86dga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/05/31 08:28:47 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2016/02/26 11:27:15 jperkin Exp $ DISTNAME= libXxf86dga-1.1.4 CATEGORIES= x11 @@ -17,11 +17,7 @@ CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 PKGCONFIG_OVERRIDE+= xxf86dga.pc.in -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile index b525a20fd19..e227d9b17d2 100644 --- a/x11/libXxf86misc/Makefile +++ b/x11/libXxf86misc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/29 05:06:36 asau Exp $ +# $NetBSD: Makefile,v 1.8 2016/02/26 11:27:15 jperkin Exp $ # DISTNAME= libXxf86misc-1.0.3 @@ -17,11 +17,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../x11/xproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile index 16ff13e9689..de3a739ba5a 100644 --- a/x11/libXxf86vm/Makefile +++ b/x11/libXxf86vm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2015/02/24 08:46:04 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2016/02/26 11:27:15 jperkin Exp $ DISTNAME= libXxf86vm-1.1.4 CATEGORIES= x11 @@ -17,11 +17,7 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= xxf86vm.pc.in CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --disable-malloc0returnsnull -.endif +CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile index b492ff25d39..0b1f636b2a7 100644 --- a/x11/mkcomposecache/Makefile +++ b/x11/mkcomposecache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2015/07/04 06:29:05 richard Exp $ +# $NetBSD: Makefile,v 1.3 2016/02/26 11:27:16 jperkin Exp $ # DISTNAME= mkcomposecache-1.2.1 @@ -14,10 +14,7 @@ COMMENT= Used for creating global (system-wide) Compose cache files GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= ADMIN_MAN_SUFFIX=8 -.endif +CONFIGURE_ENV.SunOS+= ADMIN_MAN_SUFFIX=8 .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common index 8fac754dbad..adeaa8fa018 100644 --- a/x11/modular-xorg-server/Makefile.common +++ b/x11/modular-xorg-server/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2016/02/09 01:18:15 wiz Exp $ +# $NetBSD: Makefile.common,v 1.7 2016/02/26 11:27:16 jperkin Exp $ # used by x11/modular-xorg-server/Makefile # used by x11/modular-xorg-xephyr/Makefile @@ -97,9 +97,7 @@ PLIST.sparc= yes # Workaround for PR#41556. # Avoid to use bsd_kqueue_apm, force to use bsd_apm instead. -.if ${OPSYS} == "NetBSD" -CONFIGURE_ENV+= ac_cv_header_sys_event_h=no -.endif +CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input diff --git a/x11/modular-xorg-server112/Makefile b/x11/modular-xorg-server112/Makefile index ee469f045d1..f99795a0484 100644 --- a/x11/modular-xorg-server112/Makefile +++ b/x11/modular-xorg-server112/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2015/11/08 15:08:00 sevan Exp $ +# $NetBSD: Makefile,v 1.9 2016/02/26 11:27:16 jperkin Exp $ DISTNAME= xorg-server-1.12.4 PKGNAME= modular-${DISTNAME} @@ -106,9 +106,7 @@ PLIST.sparc= yes # Workaround for PR#41556. # Avoid to use bsd_kqueue_apm, force to use bsd_apm instead. -.if ${OPSYS} == "NetBSD" -CONFIGURE_ENV+= ac_cv_header_sys_event_h=no -.endif +CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input diff --git a/x11/motif/Makefile b/x11/motif/Makefile index 8aa7b845971..72b9becff10 100644 --- a/x11/motif/Makefile +++ b/x11/motif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/10/09 14:07:15 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2016/02/26 11:27:16 jperkin Exp $ PKGVER= 2.3.4 PKGREVISION= 7 @@ -49,9 +49,7 @@ BUILDLINK_TRANSFORM+= l:Xft:Xft:fontconfig # Don't compress manual pages as they include each other. .undef MANZ -.if ${OPSYS} == "NetBSD" -CONFIGURE_ENV+= ac_cv_func_setpgrp_void=no -.endif +CONFIGURE_ENV.NetBSD+= ac_cv_func_setpgrp_void=no CONFIGURE_ARGS+= --enable-xft CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile index 56967422a93..2b366a5ba27 100644 --- a/x11/mrxvt/Makefile +++ b/x11/mrxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2015/02/08 18:12:49 tnn Exp $ +# $NetBSD: Makefile,v 1.34 2016/02/26 11:27:16 jperkin Exp $ # DISTNAME= mrxvt-0.5.4 @@ -21,11 +21,7 @@ CONFIGURE_ARGS+= --enable-text-shadow CONFIGURE_ARGS+= --enable-24bits CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "HPUX" -CONFIGURE_ARGS+= --disable-lastlog --disable-utmp --disable-wtmp -.endif +CONFIGURE_ARGS.HPUX+= --disable-lastlog --disable-utmp --disable-wtmp EGDIR= ${PREFIX}/share/examples MAKE_DIRS+= ${PKG_SYSCONFDIR}/mrxvt diff --git a/x11/pixman/hacks.mk b/x11/pixman/hacks.mk index 2bd5d332079..1d3cba1d78c 100644 --- a/x11/pixman/hacks.mk +++ b/x11/pixman/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.11 2015/09/19 17:11:35 tnn Exp $ +# $NetBSD: hacks.mk,v 1.12 2016/02/26 11:27:16 jperkin Exp $ # .if !defined(PIXMAN_HACKS_MK) PIXMAN_HACKS_MK= # empty @@ -19,9 +19,7 @@ CONFIGURE_ARGS+= --disable-sse2 --disable-ssse3 CONFIGURE_ARGS+= --disable-sse2 --disable-mmx --disable-ssse3 .endif -.if ${OPSYS} == "MirBSD" -CONFIGURE_ARGS+= PTHREAD_LIBS=-pthread -.endif +CONFIGURE_ARGS.MirBSD+= PTHREAD_LIBS=-pthread .if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*-*) CONFIGURE_ENV+= ac_cv_tls=none diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile index 530d4a401ee..c2142ec49da 100644 --- a/x11/py-gnome2/Makefile +++ b/x11/py-gnome2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.104 2015/12/05 21:26:08 adam Exp $ +# $NetBSD: Makefile,v 1.105 2016/02/26 11:27:16 jperkin Exp $ DISTNAME= gnome-python-2.28.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/} @@ -20,10 +20,7 @@ USE_TOOLS+= pkg-config gmake PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-ORBit, py-gtk2 -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= rm:-std=c9x -.endif +BUILDLINK_TRANSFORM.SunOS+= rm:-std=c9x .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile index f674e63d21a..9de5d317d7a 100644 --- a/x11/py-qt4/Makefile +++ b/x11/py-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2016/01/31 08:09:22 dbj Exp $ +# $NetBSD: Makefile,v 1.79 2016/02/26 11:27:16 jperkin Exp $ PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION} PYQT_VERSION= 4.11.4 @@ -62,20 +62,18 @@ DISTNAME= PyQt-x11-gpl-${PYQT_VERSION} .include "../../lang/python/extension.mk" -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Darwin" # configure-ng.py has Darwin specific code to avoid using sys.executable # that assumes the builtin python when configuring the path in pyuic/pyuic4. # Instead of patching that out, just do a manual replace-interpreter # on the configured result -SUBST_CLASSES+= fix-pyuic4 -SUBST_STAGE.fix-pyuic4= post-configure -SUBST_MESSAGE.fix-pyuic4= Fixing python interpreter path in pyuic4 -SUBST_FILES.fix-pyuic4= pyuic/pyuic4 -SUBST_SED.fix-pyuic4= -e 's,python[^ ]*,${PYTHONBIN},' -.endif +SUBST_CLASSES.Darwin+= fix-pyuic4 +SUBST_STAGE.fix-pyuic4= post-configure +SUBST_MESSAGE.fix-pyuic4= Fixing python interpreter path in pyuic4 +SUBST_FILES.fix-pyuic4= pyuic/pyuic4 +SUBST_SED.fix-pyuic4= -e 's,python[^ ]*,${PYTHONBIN},' CONFIGURE_ARGS+= --verbose + do-configure: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${PYTHONBIN} configure.py ${CONFIGURE_ARGS}) diff --git a/x11/py-sip/Makefile b/x11/py-sip/Makefile index 9368184e4d8..12ec902ec36 100644 --- a/x11/py-sip/Makefile +++ b/x11/py-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2015/10/26 21:40:01 adam Exp $ +# $NetBSD: Makefile,v 1.46 2016/02/26 11:27:16 jperkin Exp $ DISTNAME= sip-4.17 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,20 +15,17 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= gmake -.include "../../mk/bsd.prefs.mk" - CONFIGURE_ARGS+= -b ${PREFIX}/bin CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB} CONFIGURE_ARGS+= -e ${PREFIX}/${PYINC} CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX} -.if ${OPSYS} == "DragonFly" -CONFIGURE_ARGS+= -p freebsd-g++ -.endif CONFIGURE_ARGS+= CFLAGS=${CFLAGS:Q} CONFIGURE_ARGS+= CXXFLAGS=${CXXFLAGS:Q} CONFIGURE_ARGS+= INCDIR=${PREFIX}/include CONFIGURE_ARGS+= LIBDIR=${PREFIX}/lib +CONFIGURE_ARGS.DragonFly+= -p freebsd-g++ + PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} diff --git a/x11/qt3/application.mk b/x11/qt3/application.mk index 81e84e67c4c..0b326442998 100644 --- a/x11/qt3/application.mk +++ b/x11/qt3/application.mk @@ -1,4 +1,4 @@ -# $NetBSD: application.mk,v 1.3 2007/06/15 17:33:40 joerg Exp $ +# $NetBSD: application.mk,v 1.4 2016/02/26 11:27:16 jperkin Exp $ # # This file provides useful definitions for packages that contain # QT applications. @@ -13,12 +13,10 @@ .if !defined(QT3_APPLICATION_MK) QT3_APPLICATION_MK= # defined -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Linux" # work-around bug noted in PR #25402 -BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined -.endif +BUILDLINK_TRANSFORM.Linux+= rm:-Wl,--no-undefined + +.include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" GCC_REQD+= 3.3 diff --git a/x11/qt4-tools/hacks.mk b/x11/qt4-tools/hacks.mk index 2782d35d410..1d4f012d7cc 100644 --- a/x11/qt4-tools/hacks.mk +++ b/x11/qt4-tools/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.2 2013/10/22 14:27:24 jperkin Exp $ +# $NetBSD: hacks.mk,v 1.3 2016/02/26 11:27:16 jperkin Exp $ ### [Sat Sep 22 11:21:06 UTC 2012 : apb] ### g++-4.5.3 and 4.5.4 on NetBSD/i386 fails with an internal compiler error @@ -17,6 +17,4 @@ SUBST_SED.pr46978= -e '/^CXXFLAGS/s/-O2/-O1/' .endif # QTBUG-5986 -.if ${OPSYS} == "Darwin" -BUILDLINK_TRANSFORM+= rm:-O[23] -.endif +BUILDLINK_TRANSFORM.Darwin+= rm:-O[23] diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common index d664022f179..1034252a996 100644 --- a/x11/qt5-qtbase/Makefile.common +++ b/x11/qt5-qtbase/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2016/01/28 17:00:29 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.19 2016/02/26 11:27:16 jperkin Exp $ # used by x11/qt5-mysql/Makefile # used by x11/qt5-odbc/Makefile # used by x11/qt5-psql/Makefile @@ -42,10 +42,8 @@ CFLAGS.NetBSD+= -D_NETBSD_SOURCE BUILDLINK_TRANSFORM+= rm:-Wundef # SunOS ld doesn't support -rpath-link -.if ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= rm:-Wl,-rpath-link,${PREFIX}/qt5/lib -BUILDLINK_TRANSFORM+= rm:-Wl,-rpath-link,${WRKSRC}/lib -.endif +BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${PREFIX}/qt5/lib +BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${WRKSRC}/lib MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} PLIST_VARS+= mac unix diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 57bde0eed6f..b0a508feb06 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2015/07/04 16:18:42 joerg Exp $ +# $NetBSD: Makefile,v 1.58 2016/02/26 11:27:17 jperkin Exp $ DISTNAME= rxvt-2.7.10 PKGREVISION= 6 @@ -47,9 +47,7 @@ CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib SPECIAL_PERMS= ${PREFIX}/bin/rxvt ${SETUID_ROOT_PERMS} .endif -.if ${OPSYS} == "SunOS" -CFLAGS+= -DSunOS -.endif +CFLAGS.SunOS+= -DSunOS post-patch: ${MV} ${WRKSRC}/src/feature.h ${WRKSRC}/src/feature.h.orig diff --git a/x11/tint2/Makefile b/x11/tint2/Makefile index 2746232c4dc..91231196aaf 100644 --- a/x11/tint2/Makefile +++ b/x11/tint2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2015/12/05 21:26:09 adam Exp $ +# $NetBSD: Makefile,v 1.36 2016/02/26 11:27:17 jperkin Exp $ DISTNAME= tint2-0.11 PKGREVISION= 24 @@ -23,6 +23,7 @@ CONF_FILES= ${PREFIX}/share/examples/tint2/tint2rc \ REPLACE_PYTHON+= src/tint2conf/tintwizard.py PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2 +# XXX: why not use normal CMAKE_ARGS infrastructure? CMAKE_OPTS+= -DCMAKE_INSTALL_PREFIX=${PREFIX} CMAKE_OPTS+= -DSYSCONFDIR=${PKG_SYSCONFDIR} CMAKE_OPTS+= -DMANDIR=${PKGMANDIR} @@ -32,12 +33,9 @@ CMAKE_OPTS+= -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \ CMAKE_OPTS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \ CMAKE_OPTS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Linux" -CMAKE_OPTS+= -DENABLE_BATTERY=ON -.else -CMAKE_OPTS+= -DENABLE_BATTERY=OFF -.endif +OPSYSVARS+= CMAKE_OPTS +CMAKE_OPTS.Linux= -DENABLE_BATTERY=ON +CMAKE_OPTS.*= -DENABLE_BATTERY=OFF do-configure: cd ${WRKSRC} && ${PREFIX}/bin/cmake ${CMAKE_OPTS} . diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile index 1f8a396c36a..6b800a017a1 100644 --- a/x11/wxGTK30/Makefile +++ b/x11/wxGTK30/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2016/02/17 10:16:05 dbj Exp $ +# $NetBSD: Makefile,v 1.15 2016/02/26 11:27:17 jperkin Exp $ VERSION= 3.0.2 PKGREVISION= 5 @@ -73,9 +73,7 @@ PLIST_SRC+= PLIST.gtk2 CONFIGURE_ARGS+= --with-gtk=2 .endif -.if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --disable-xlocale -.endif +CONFIGURE_ARGS.SunOS+= --disable-xlocale post-configure: echo 'install_qadll: install_xmldll' >> ${WRKSRC}/Makefile diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 2d26bc616ab..cde8793875e 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2015/04/22 19:49:09 tnn Exp $ +# $NetBSD: Makefile,v 1.30 2016/02/26 11:27:17 jperkin Exp $ DISTNAME= xdm-1.1.11 PKGREVISION= 5 @@ -46,11 +46,7 @@ OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm \ TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --with-random-device=/dev/urandom -.endif +CONFIGURE_ARGS.NetBSD+= --with-random-device=/dev/urandom # The following forces the X server to start on the 5th virtual terminal. # This is suboptimal but matches the defaults for the xdm configuration, @@ -65,6 +61,7 @@ CONFIGURE_ARGS+= --with-random-device=/dev/urandom # same terminal X used (the first one). As a result, only one of them # will receive key presses. And on slow machines, X will have lost access # to the keyboard. +.include "../../mk/bsd.prefs.mk" .if (${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") && \ (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") CONFIGURE_ARGS+= --with-default-vt=vt05 diff --git a/x11/xf86-input-acecad/Makefile b/x11/xf86-input-acecad/Makefile index 12b2369ea27..2ed7f38f8f1 100644 --- a/x11/xf86-input-acecad/Makefile +++ b/x11/xf86-input-acecad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/01/05 13:11:42 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2016/02/26 11:27:17 jperkin Exp $ DISTNAME= xf86-input-acecad-1.5.0 PKGREVISION= 4 @@ -15,11 +15,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../x11/inputproto/buildlink3.mk" diff --git a/x11/xf86-input-elographics/Makefile b/x11/xf86-input-elographics/Makefile index 144410120e9..89ec8b3bbe1 100644 --- a/x11/xf86-input-elographics/Makefile +++ b/x11/xf86-input-elographics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/01/05 13:11:42 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2016/02/26 11:27:17 jperkin Exp $ DISTNAME= xf86-input-elographics-1.4.1 PKGREVISION= 1 @@ -15,11 +15,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/xproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-input-fpit/Makefile b/x11/xf86-input-fpit/Makefile index e9323cd11b2..d8282bbdc89 100644 --- a/x11/xf86-input-fpit/Makefile +++ b/x11/xf86-input-fpit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/01/05 13:11:42 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2016/02/26 11:27:17 jperkin Exp $ DISTNAME= xf86-input-fpit-1.4.0 PKGREVISION= 1 @@ -15,11 +15,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../devel/xorg-util-macros/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" diff --git a/x11/xf86-input-hyperpen/Makefile b/x11/xf86-input-hyperpen/Makefile index c10682c75e5..7e207583861 100644 --- a/x11/xf86-input-hyperpen/Makefile +++ b/x11/xf86-input-hyperpen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/01/05 13:11:42 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2016/02/26 11:27:17 jperkin Exp $ DISTNAME= xf86-input-hyperpen-1.4.1 PKGREVISION= 1 @@ -16,11 +16,7 @@ USE_LIBTOOL= yes USE_TOOLS+= pkg-config USE_LANGUAGES+= c99 -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/xproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-input-joystick/Makefile b/x11/xf86-input-joystick/Makefile index c501b6ed7b9..64bf7e14ed9 100644 --- a/x11/xf86-input-joystick/Makefile +++ b/x11/xf86-input-joystick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/01/05 13:11:42 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2016/02/26 11:27:17 jperkin Exp $ DISTNAME= xf86-input-joystick-1.6.2 PKGREVISION= 1 @@ -17,11 +17,7 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= xorg-joystick.pc.in -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/kbproto/buildlink3.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" diff --git a/x11/xf86-input-keyboard/Makefile b/x11/xf86-input-keyboard/Makefile index 12c3d5e5c9a..c141576f545 100644 --- a/x11/xf86-input-keyboard/Makefile +++ b/x11/xf86-input-keyboard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2016/01/05 13:11:42 tnn Exp $ +# $NetBSD: Makefile,v 1.22 2016/02/26 11:27:17 jperkin Exp $ DISTNAME= xf86-input-keyboard-1.8.1 PKGREVISION= 2 @@ -14,11 +14,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/inputproto/buildlink3.mk" .include "../../x11/libxkbfile/buildlink3.mk" diff --git a/x11/xf86-input-mouse/Makefile b/x11/xf86-input-mouse/Makefile index 3194e1f4ace..d12ec3c8d92 100644 --- a/x11/xf86-input-mouse/Makefile +++ b/x11/xf86-input-mouse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2016/01/05 13:11:42 tnn Exp $ +# $NetBSD: Makefile,v 1.26 2016/02/26 11:27:17 jperkin Exp $ DISTNAME= xf86-input-mouse-1.9.1 PKGREVISION= 3 @@ -14,11 +14,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/randrproto/buildlink3.mk" .include "../../x11/inputproto/buildlink3.mk" diff --git a/x11/xf86-input-mutouch/Makefile b/x11/xf86-input-mutouch/Makefile index 0ce1a8e5bf0..ee66b10d602 100644 --- a/x11/xf86-input-mutouch/Makefile +++ b/x11/xf86-input-mutouch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/01/05 13:11:42 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2016/02/26 11:27:17 jperkin Exp $ DISTNAME= xf86-input-mutouch-1.3.0 PKGREVISION= 1 @@ -12,15 +12,11 @@ COMMENT= Microtouch input driver for the Xorg X server #LICENSE= # TODO: (see mk/license.mk) GNU_CONFIGURE= yes +USE_LANGUAGES= c99 USE_LIBTOOL= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -USE_LANGUAGES=+ c99 -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/xproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-input-penmount/Makefile b/x11/xf86-input-penmount/Makefile index c41c59fa75a..83e1b4fa75c 100644 --- a/x11/xf86-input-penmount/Makefile +++ b/x11/xf86-input-penmount/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/01/05 13:11:42 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2016/02/26 11:27:18 jperkin Exp $ DISTNAME= xf86-input-penmount-1.5.0 PKGREVISION= 4 @@ -15,11 +15,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/xproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-input-vmmouse/Makefile b/x11/xf86-input-vmmouse/Makefile index d6fe655f4dd..2f3f5f052d0 100644 --- a/x11/xf86-input-vmmouse/Makefile +++ b/x11/xf86-input-vmmouse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2016/01/05 13:11:42 tnn Exp $ +# $NetBSD: Makefile,v 1.21 2016/02/26 11:27:18 jperkin Exp $ DISTNAME= xf86-input-vmmouse-13.1.0 PKGREVISION= 1 @@ -15,11 +15,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/randrproto/buildlink3.mk" .include "../../x11/inputproto/buildlink3.mk" diff --git a/x11/xf86-input-void/Makefile b/x11/xf86-input-void/Makefile index 87b9d552f94..340f35daa4e 100644 --- a/x11/xf86-input-void/Makefile +++ b/x11/xf86-input-void/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2016/01/05 13:11:42 tnn Exp $ +# $NetBSD: Makefile,v 1.16 2016/02/26 11:27:18 jperkin Exp $ DISTNAME= xf86-input-void-1.4.1 PKGREVISION= 1 @@ -14,11 +14,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/inputproto/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-video-amdgpu/Makefile b/x11/xf86-video-amdgpu/Makefile index ae9173421a4..3bad5dda4e3 100644 --- a/x11/xf86-video-amdgpu/Makefile +++ b/x11/xf86-video-amdgpu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/02/19 09:58:48 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2016/02/26 11:27:18 jperkin Exp $ DISTNAME= xf86-video-amdgpu-1.0.1 CATEGORIES= x11 @@ -13,11 +13,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-apm/Makefile b/x11/xf86-video-apm/Makefile index 8ffc3eac712..1835dce042d 100644 --- a/x11/xf86-video-apm/Makefile +++ b/x11/xf86-video-apm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2016/01/05 13:11:43 tnn Exp $ +# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:18 jperkin Exp $ # DISTNAME= xf86-video-apm-1.2.5 @@ -15,11 +15,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-ark/Makefile b/x11/xf86-video-ark/Makefile index 740a663377a..d72cbf256de 100644 --- a/x11/xf86-video-ark/Makefile +++ b/x11/xf86-video-ark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2016/01/05 13:11:43 tnn Exp $ +# $NetBSD: Makefile,v 1.17 2016/02/26 11:27:18 jperkin Exp $ # DISTNAME= xf86-video-ark-0.7.5 @@ -15,11 +15,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-ast/Makefile b/x11/xf86-video-ast/Makefile index 60c6fa61ea6..2073d1b93e4 100644 --- a/x11/xf86-video-ast/Makefile +++ b/x11/xf86-video-ast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2016/01/05 13:11:43 tnn Exp $ +# $NetBSD: Makefile,v 1.21 2016/02/26 11:27:18 jperkin Exp $ DISTNAME= xf86-video-ast-1.1.5 PKGREVISION= 1 @@ -14,11 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile index 740f7f07208..51f8b07a6c3 100644 --- a/x11/xf86-video-ati/Makefile +++ b/x11/xf86-video-ati/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2016/02/09 01:20:44 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2016/02/26 11:27:18 jperkin Exp $ DISTNAME= xf86-video-ati-7.6.1 PKGREVISION= 3 @@ -18,13 +18,9 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake pkg-config -.include "../../mk/bsd.prefs.mk" - CONFIGURE_ARGS+= --enable-glamor -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.18.1 .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-video-ati6/Makefile b/x11/xf86-video-ati6/Makefile index 13614a61f47..33b1ad094a9 100644 --- a/x11/xf86-video-ati6/Makefile +++ b/x11/xf86-video-ati6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2016/01/05 13:11:43 tnn Exp $ +# $NetBSD: Makefile,v 1.13 2016/02/26 11:27:18 jperkin Exp $ DISTNAME= xf86-video-ati-6.14.6 PKGNAME= ${DISTNAME:S/ati/ati6/} @@ -20,11 +20,8 @@ GNU_CONFIGURE= YES USE_TOOLS+= automake autoconf autoreconf gmake pkg-config .include "options.mk" -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 pre-configure: cd ${WRKSRC} && autoreconf -vif diff --git a/x11/xf86-video-chips/Makefile b/x11/xf86-video-chips/Makefile index a47cc349161..cb02efe97b4 100644 --- a/x11/xf86-video-chips/Makefile +++ b/x11/xf86-video-chips/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2016/01/05 13:11:43 tnn Exp $ +# $NetBSD: Makefile,v 1.17 2016/02/26 11:27:18 jperkin Exp $ DISTNAME= xf86-video-chips-1.2.6 PKGREVISION= 1 @@ -14,11 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 # # it appears the 1.2.5 tarball forgot something diff --git a/x11/xf86-video-cirrus/Makefile b/x11/xf86-video-cirrus/Makefile index 779698e7021..48038612db9 100644 --- a/x11/xf86-video-cirrus/Makefile +++ b/x11/xf86-video-cirrus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/01/05 13:11:43 tnn Exp $ +# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:18 jperkin Exp $ DISTNAME= xf86-video-cirrus-1.5.3 PKGREVISION= 1 @@ -14,11 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-dummy/Makefile b/x11/xf86-video-dummy/Makefile index 6e7f3a4516c..baf9ba66c0b 100644 --- a/x11/xf86-video-dummy/Makefile +++ b/x11/xf86-video-dummy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/01/05 13:11:43 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2016/02/26 11:27:18 jperkin Exp $ DISTNAME= xf86-video-dummy-0.3.7 PKGREVISION= 4 @@ -15,11 +15,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/xf86dgaproto/buildlink3.mk" .include "../../x11/fontsproto/buildlink3.mk" diff --git a/x11/xf86-video-fbdev/Makefile b/x11/xf86-video-fbdev/Makefile index c8a9433d676..dbb6b4614c8 100644 --- a/x11/xf86-video-fbdev/Makefile +++ b/x11/xf86-video-fbdev/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2016/01/05 13:11:43 tnn Exp $ +# $NetBSD: Makefile,v 1.9 2016/02/26 11:27:18 jperkin Exp $ DISTNAME= xf86-video-fbdev-0.4.4 PKGREVISION= 4 @@ -15,11 +15,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/fontsproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" diff --git a/x11/xf86-video-glint/Makefile b/x11/xf86-video-glint/Makefile index 5b8e5b01191..51c13c121ab 100644 --- a/x11/xf86-video-glint/Makefile +++ b/x11/xf86-video-glint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/01/05 13:11:43 tnn Exp $ +# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:19 jperkin Exp $ # DISTNAME= xf86-video-glint-1.2.8 @@ -17,11 +17,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-i128/Makefile b/x11/xf86-video-i128/Makefile index c8750c9d886..4ac7cc746d2 100644 --- a/x11/xf86-video-i128/Makefile +++ b/x11/xf86-video-i128/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2016/01/05 13:11:44 tnn Exp $ +# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:19 jperkin Exp $ # DISTNAME= xf86-video-i128-1.3.6 @@ -15,11 +15,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-i740/Makefile b/x11/xf86-video-i740/Makefile index ea14c5e529a..504ffbe3adc 100644 --- a/x11/xf86-video-i740/Makefile +++ b/x11/xf86-video-i740/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/01/05 13:11:44 tnn Exp $ +# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:19 jperkin Exp $ DISTNAME= xf86-video-i740-1.3.5 PKGREVISION= 3 @@ -14,11 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile index 2afca15ae34..9eb793bbe0c 100644 --- a/x11/xf86-video-intel/Makefile +++ b/x11/xf86-video-intel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2016/01/05 13:05:37 tnn Exp $ +# $NetBSD: Makefile,v 1.38 2016/02/26 11:27:19 jperkin Exp $ DISTNAME= xf86-video-intel-2.99.917 PKGREVISION= 4 @@ -18,11 +18,7 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.7 diff --git a/x11/xf86-video-mach64/Makefile b/x11/xf86-video-mach64/Makefile index 977ef50da6b..a4487b14c6f 100644 --- a/x11/xf86-video-mach64/Makefile +++ b/x11/xf86-video-mach64/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2016/01/05 13:11:44 tnn Exp $ +# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:19 jperkin Exp $ DISTNAME= xf86-video-mach64-6.9.5 PKGREVISION= 1 @@ -18,12 +18,8 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CPPFLAGS+= -D__EXTENSIONS__ -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CPPFLAGS.SunOS+= -D__EXTENSIONS__ +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/fontsproto/buildlink3.mk" diff --git a/x11/xf86-video-mga/Makefile b/x11/xf86-video-mga/Makefile index 753bc9310bd..2452343b019 100644 --- a/x11/xf86-video-mga/Makefile +++ b/x11/xf86-video-mga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2016/01/05 13:11:44 tnn Exp $ +# $NetBSD: Makefile,v 1.22 2016/02/26 11:27:19 jperkin Exp $ DISTNAME= xf86-video-mga-1.6.4 PKGREVISION= 3 @@ -16,11 +16,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-modesetting/Makefile b/x11/xf86-video-modesetting/Makefile index cf504f312b0..a6c773bb716 100644 --- a/x11/xf86-video-modesetting/Makefile +++ b/x11/xf86-video-modesetting/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2015/07/03 23:23:40 rodent Exp $ +# $NetBSD: Makefile,v 1.3 2016/02/26 11:27:19 jperkin Exp $ DISTNAME= xf86-video-modesetting-0.9.0 CATEGORIES= x11 @@ -14,13 +14,9 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - USE_OLD_MODULAR_XORG_SERVER= yes -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX= 4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1 .include "../../x11/xextproto/buildlink3.mk" diff --git a/x11/xf86-video-neomagic/Makefile b/x11/xf86-video-neomagic/Makefile index 48a91bc2fe2..46e09eee3fa 100644 --- a/x11/xf86-video-neomagic/Makefile +++ b/x11/xf86-video-neomagic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2016/01/05 13:11:44 tnn Exp $ +# $NetBSD: Makefile,v 1.20 2016/02/26 11:27:19 jperkin Exp $ DISTNAME= xf86-video-neomagic-1.2.9 PKGREVISION= 1 @@ -14,11 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xf86-video-newport/Makefile b/x11/xf86-video-newport/Makefile index eeeb0e5c261..0cc0476d56b 100644 --- a/x11/xf86-video-newport/Makefile +++ b/x11/xf86-video-newport/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/09/23 16:39:17 rodent Exp $ +# $NetBSD: Makefile,v 1.7 2016/02/26 11:27:19 jperkin Exp $ DISTNAME= xf86-video-newport-0.2.4 PKGREVISION= 4 @@ -17,9 +17,7 @@ USE_TOOLS+= pkg-config .include "options.mk" -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX= 4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 USE_OLD_MODULAR_XORG_SERVER= yes diff --git a/x11/xf86-video-nouveau/Makefile b/x11/xf86-video-nouveau/Makefile index 646f5dbfe3a..9a0c60e1925 100644 --- a/x11/xf86-video-nouveau/Makefile +++ b/x11/xf86-video-nouveau/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/01/05 13:11:44 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2016/02/26 11:27:19 jperkin Exp $ DISTNAME= xf86-video-nouveau-1.0.12 PKGREVISION= 1 @@ -15,11 +15,7 @@ USE_LANGUAGES+= c99 USE_LIBTOOL= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" diff --git a/x11/xf86-video-nv/Makefile b/x11/xf86-video-nv/Makefile index 2bec2e8584a..21ee7aaaf77 100644 --- a/x11/xf86-video-nv/Makefile +++ b/x11/xf86-video-nv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2016/01/05 13:11:44 tnn Exp $ +# $NetBSD: Makefile,v 1.30 2016/02/26 11:27:19 jperkin Exp $ DISTNAME= xf86-video-nv-2.1.20 PKGREVISION= 4 @@ -15,11 +15,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-video-openchrome/Makefile b/x11/xf86-video-openchrome/Makefile index 4cb85186bbe..296e7b912b3 100644 --- a/x11/xf86-video-openchrome/Makefile +++ b/x11/xf86-video-openchrome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2016/01/05 13:11:44 tnn Exp $ +# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:19 jperkin Exp $ DISTNAME= xf86-video-openchrome-0.3.3 PKGREVISION= 4 @@ -18,6 +18,8 @@ USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --enable-maintainer-mode CONFIGURE_ARGS+= --enable-dri +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 + .include "../../mk/bsd.prefs.mk" PLIST_VARS+= XvMC @@ -25,10 +27,6 @@ PLIST_VARS+= XvMC PLIST.XvMC= yes .endif -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif - .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/libXvMC/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-qxl/Makefile b/x11/xf86-video-qxl/Makefile index 6c357b89586..a7e9ee14dd0 100644 --- a/x11/xf86-video-qxl/Makefile +++ b/x11/xf86-video-qxl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/01/05 13:11:44 tnn Exp $ +# $NetBSD: Makefile,v 1.5 2016/02/26 11:27:20 jperkin Exp $ DISTNAME= xf86-video-qxl-0.1.4 PKGREVISION= 1 @@ -17,10 +17,8 @@ USE_TOOLS+= pkg-config .include "options.mk" -.if ${OPSYS} == "SunOS" -CPPFLAGS+= -D__EXTENSIONS__ -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CPPFLAGS.SunOS+= -D__EXTENSIONS__ +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/libXext/buildlink3.mk" BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.46 diff --git a/x11/xf86-video-r128/Makefile b/x11/xf86-video-r128/Makefile index b6f0281e81b..ec5af984f92 100644 --- a/x11/xf86-video-r128/Makefile +++ b/x11/xf86-video-r128/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2016/01/22 12:11:57 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:20 jperkin Exp $ DISTNAME= xf86-video-r128-6.10.1 CATEGORIES= x11 @@ -17,11 +17,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-video-rendition/Makefile b/x11/xf86-video-rendition/Makefile index de715e8ed28..4a7b313d6ad 100644 --- a/x11/xf86-video-rendition/Makefile +++ b/x11/xf86-video-rendition/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/01/05 13:11:44 tnn Exp $ +# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:20 jperkin Exp $ DISTNAME= xf86-video-rendition-4.2.6 PKGREVISION= 1 @@ -14,11 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-s3/Makefile b/x11/xf86-video-s3/Makefile index b5fd82b8fb2..2975d30daa2 100644 --- a/x11/xf86-video-s3/Makefile +++ b/x11/xf86-video-s3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2016/01/05 13:11:44 tnn Exp $ +# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:20 jperkin Exp $ # DISTNAME= xf86-video-s3-0.6.5 @@ -15,11 +15,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-s3virge/Makefile b/x11/xf86-video-s3virge/Makefile index 4e7808d5786..0de1d1edbd2 100644 --- a/x11/xf86-video-s3virge/Makefile +++ b/x11/xf86-video-s3virge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:20 jperkin Exp $ DISTNAME= xf86-video-s3virge-1.10.7 PKGREVISION= 1 @@ -14,11 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-savage/Makefile b/x11/xf86-video-savage/Makefile index 388dd9e3f99..c826cd14c44 100644 --- a/x11/xf86-video-savage/Makefile +++ b/x11/xf86-video-savage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.21 2016/02/26 11:27:20 jperkin Exp $ DISTNAME= xf86-video-savage-2.3.8 PKGREVISION= 1 @@ -16,11 +16,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-siliconmotion/Makefile b/x11/xf86-video-siliconmotion/Makefile index c832323b068..346cbb28278 100644 --- a/x11/xf86-video-siliconmotion/Makefile +++ b/x11/xf86-video-siliconmotion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:20 jperkin Exp $ DISTNAME= xf86-video-siliconmotion-1.7.8 PKGREVISION= 1 @@ -14,11 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile index 424eb5bd0f2..c06a7d2d522 100644 --- a/x11/xf86-video-sis/Makefile +++ b/x11/xf86-video-sis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.24 2016/02/26 11:27:20 jperkin Exp $ DISTNAME= xf86-video-sis-0.10.8 PKGREVISION= 1 @@ -21,9 +21,7 @@ USE_TOOLS+= pkg-config TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-suncg14/Makefile b/x11/xf86-video-suncg14/Makefile index 9830fea7eb2..fb4fbd06522 100644 --- a/x11/xf86-video-suncg14/Makefile +++ b/x11/xf86-video-suncg14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2016/02/26 11:27:20 jperkin Exp $ DISTNAME= xf86-video-suncg14-1.1.2 PKGREVISION= 4 @@ -17,9 +17,7 @@ USE_TOOLS+= pkg-config .include "options.mk" -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/fontsproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" diff --git a/x11/xf86-video-suncg3/Makefile b/x11/xf86-video-suncg3/Makefile index f3534486302..934cadd3b88 100644 --- a/x11/xf86-video-suncg3/Makefile +++ b/x11/xf86-video-suncg3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2016/02/26 11:27:20 jperkin Exp $ DISTNAME= xf86-video-suncg3-1.1.2 PKGREVISION= 4 @@ -15,11 +15,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/fontsproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" diff --git a/x11/xf86-video-suncg6/Makefile b/x11/xf86-video-suncg6/Makefile index 2d3720649fe..a1d2c17e339 100644 --- a/x11/xf86-video-suncg6/Makefile +++ b/x11/xf86-video-suncg6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2016/02/26 11:27:20 jperkin Exp $ DISTNAME= xf86-video-suncg6-1.1.2 PKGREVISION= 1 @@ -17,9 +17,7 @@ USE_TOOLS+= pkg-config .include "options.mk" -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/fontsproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" diff --git a/x11/xf86-video-sunffb/Makefile b/x11/xf86-video-sunffb/Makefile index 6c983b2295b..6fc05922579 100644 --- a/x11/xf86-video-sunffb/Makefile +++ b/x11/xf86-video-sunffb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2016/02/26 11:27:20 jperkin Exp $ DISTNAME= xf86-video-sunffb-1.2.2 PKGREVISION= 4 @@ -17,9 +17,7 @@ USE_TOOLS+= pkg-config .include "options.mk" -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1 .include "../../x11/xextproto/buildlink3.mk" diff --git a/x11/xf86-video-suntcx/Makefile b/x11/xf86-video-suntcx/Makefile index bbf25727d03..2b61d042d7b 100644 --- a/x11/xf86-video-suntcx/Makefile +++ b/x11/xf86-video-suntcx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2016/02/26 11:27:21 jperkin Exp $ DISTNAME= xf86-video-suntcx-1.1.2 PKGREVISION= 1 @@ -17,9 +17,7 @@ USE_TOOLS+= pkg-config .include "options.mk" -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/fontsproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile index 4d048d433e7..9285a6a0b9e 100644 --- a/x11/xf86-video-tdfx/Makefile +++ b/x11/xf86-video-tdfx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.20 2016/02/26 11:27:21 jperkin Exp $ DISTNAME= xf86-video-tdfx-1.4.6 PKGREVISION= 3 @@ -16,11 +16,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-tga/Makefile b/x11/xf86-video-tga/Makefile index 929b6550eaa..54ab2cb3f14 100644 --- a/x11/xf86-video-tga/Makefile +++ b/x11/xf86-video-tga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.16 2016/02/26 11:27:21 jperkin Exp $ # DISTNAME= xf86-video-tga-1.2.2 @@ -15,11 +15,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-trident/Makefile b/x11/xf86-video-trident/Makefile index b0e35f953a0..78ba4e96dad 100644 --- a/x11/xf86-video-trident/Makefile +++ b/x11/xf86-video-trident/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/01/05 13:11:45 tnn Exp $ +# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:21 jperkin Exp $ # DISTNAME= xf86-video-trident-1.3.7 @@ -15,11 +15,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-tseng/Makefile b/x11/xf86-video-tseng/Makefile index bd385a93a23..c7fa4f07167 100644 --- a/x11/xf86-video-tseng/Makefile +++ b/x11/xf86-video-tseng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2016/01/05 13:11:46 tnn Exp $ +# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:21 jperkin Exp $ # DISTNAME= xf86-video-tseng-1.2.5 @@ -15,11 +15,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-vesa/Makefile b/x11/xf86-video-vesa/Makefile index ed82d5c029d..65b6adf8020 100644 --- a/x11/xf86-video-vesa/Makefile +++ b/x11/xf86-video-vesa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2016/01/05 13:11:46 tnn Exp $ +# $NetBSD: Makefile,v 1.23 2016/02/26 11:27:21 jperkin Exp $ DISTNAME= xf86-video-vesa-2.3.4 PKGREVISION= 1 @@ -14,11 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build diff --git a/x11/xf86-video-vmware/Makefile b/x11/xf86-video-vmware/Makefile index a25d3b3f3f6..7f3fca6e7df 100644 --- a/x11/xf86-video-vmware/Makefile +++ b/x11/xf86-video-vmware/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2016/01/05 13:11:46 tnn Exp $ +# $NetBSD: Makefile,v 1.25 2016/02/26 11:27:21 jperkin Exp $ DISTNAME= xf86-video-vmware-13.1.0 PKGREVISION= 4 @@ -14,11 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 ONLY_FOR_PLATFORM+= *-*-i386 *-*-x86_64 diff --git a/x11/xf86-video-voodoo/Makefile b/x11/xf86-video-voodoo/Makefile index b8ad396bebe..fbb58ad8918 100644 --- a/x11/xf86-video-voodoo/Makefile +++ b/x11/xf86-video-voodoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/01/05 13:11:46 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2016/02/26 11:27:21 jperkin Exp $ DISTNAME= xf86-video-voodoo-1.2.5 PKGREVISION= 1 @@ -17,9 +17,7 @@ USE_TOOLS+= pkg-config .include "options.mk" -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1 .include "../../x11/xextproto/buildlink3.mk" diff --git a/x11/xf86-video-wsfb/Makefile b/x11/xf86-video-wsfb/Makefile index 5efdbbe06cf..29f18926050 100644 --- a/x11/xf86-video-wsfb/Makefile +++ b/x11/xf86-video-wsfb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2016/01/05 13:11:46 tnn Exp $ +# $NetBSD: Makefile,v 1.17 2016/02/26 11:27:21 jperkin Exp $ DISTNAME= xf86-video-wsfb-0.4.0 PKGREVISION= 6 @@ -16,11 +16,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" diff --git a/x11/xf86-video-xgi/Makefile b/x11/xf86-video-xgi/Makefile index 439892b3397..3db2767aeca 100644 --- a/x11/xf86-video-xgi/Makefile +++ b/x11/xf86-video-xgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/01/05 13:11:46 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2016/02/26 11:27:21 jperkin Exp $ DISTNAME= xf86-video-xgi-1.6.1 PKGREVISION= 1 @@ -14,10 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 -.endif +CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4 .include "../../x11/modular-xorg-server/buildlink3.mk" #.include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xflame/Makefile b/x11/xflame/Makefile index 00e6425c71f..f00d1b93d2f 100644 --- a/x11/xflame/Makefile +++ b/x11/xflame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2012/10/29 05:07:10 asau Exp $ +# $NetBSD: Makefile,v 1.13 2016/02/26 11:27:21 jperkin Exp $ # DISTNAME= xflame-1.1.1 @@ -11,11 +11,8 @@ COMMENT= Draws a flame on the screen USE_IMAKE= yes -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -MAKE_FLAGS+= EXTRA_LOAD_FLAGS=-lrt -.endif +OPSYSVARS+= MAKE_FLAGS +MAKE_FLAGS.SunOS+= EXTRA_LOAD_FLAGS=-lrt .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile index 42f73aee251..4ea312dab2c 100644 --- a/x11/xfwp/Makefile +++ b/x11/xfwp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/12/12 00:24:42 rodent Exp $ +# $NetBSD: Makefile,v 1.4 2016/02/26 11:27:21 jperkin Exp $ DISTNAME= xfwp-1.0.3 CATEGORIES= net @@ -13,11 +13,7 @@ LICENSE= x11 GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.fast.prefs.mk" - -.if ${OPSYS} == "Linux" -CONFIGURE_ARGS+= --disable-strict-compilation --disable-selective-werror -.endif +CONFIGURE_ARGS.Linux+= --disable-strict-compilation --disable-selective-werror .include "../../x11/xproxymanagementprotocol/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" diff --git a/x11/xman/Makefile b/x11/xman/Makefile index 19aea04c3c8..79105679ca7 100644 --- a/x11/xman/Makefile +++ b/x11/xman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2015/03/07 18:32:44 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2016/02/26 11:27:22 jperkin Exp $ DISTNAME= xman-1.1.4 CATEGORIES= x11 @@ -14,11 +14,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= APP_MAN_SUFFIX=1 -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --with-manconfig=/etc/man.conf -.endif +CONFIGURE_ARGS.NetBSD+= --with-manconfig=/etc/man.conf MAKE_FLAGS+= appdefaultdir=${PREFIX}/lib/X11/app-defaults |