diff options
Diffstat (limited to 'x11')
-rw-r--r-- | x11/Xaw-Xpm/buildlink3.mk | 4 | ||||
-rw-r--r-- | x11/appmenu-qt/Makefile | 6 | ||||
-rw-r--r-- | x11/autocutsel/Makefile | 4 | ||||
-rw-r--r-- | x11/eekboard/Makefile | 6 | ||||
-rw-r--r-- | x11/elementary/Makefile | 4 | ||||
-rw-r--r-- | x11/enlightenment/Makefile | 4 | ||||
-rw-r--r-- | x11/gtkada/Makefile | 4 | ||||
-rw-r--r-- | x11/labltk/Makefile | 4 | ||||
-rw-r--r-- | x11/libXrender/Makefile | 4 | ||||
-rw-r--r-- | x11/libxkbcommon/options.mk | 8 | ||||
-rw-r--r-- | x11/modular-xorg-xquartz/Makefile | 76 | ||||
-rw-r--r-- | x11/neXtaw/buildlink3.mk | 4 | ||||
-rw-r--r-- | x11/ocaml-graphics/Makefile | 14 | ||||
-rw-r--r-- | x11/ocaml-lablgtk/Makefile | 4 | ||||
-rw-r--r-- | x11/py-qwt-qt4/Makefile | 4 | ||||
-rw-r--r-- | x11/tk-Tix/Makefile | 8 | ||||
-rw-r--r-- | x11/tk-Tix/options.mk | 4 | ||||
-rw-r--r-- | x11/wxGTK30/Makefile | 6 | ||||
-rw-r--r-- | x11/xcb-util/builtin.mk | 10 | ||||
-rw-r--r-- | x11/xcolorsel/Makefile | 14 | ||||
-rw-r--r-- | x11/xwininfo/Makefile | 4 |
21 files changed, 98 insertions, 98 deletions
diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk index d29c7c74341..8a6e703293e 100644 --- a/x11/Xaw-Xpm/buildlink3.mk +++ b/x11/Xaw-Xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2013/01/15 16:21:35 morr Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2015/12/29 04:54:38 dholland Exp $ BUILDLINK_TREE+= Xaw-Xpm @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1 BUILDLINK_ABI_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1nb2 BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm -BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d .include "../../mk/bsd.fast.prefs.mk" diff --git a/x11/appmenu-qt/Makefile b/x11/appmenu-qt/Makefile index 48bad298717..65ef735882d 100644 --- a/x11/appmenu-qt/Makefile +++ b/x11/appmenu-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2015/04/25 14:25:02 tnn Exp $ +# $NetBSD: Makefile,v 1.6 2015/12/29 04:54:39 dholland Exp $ DISTNAME= appmenu-qt-0.2.6 PKGREVISION= 2 @@ -12,8 +12,8 @@ COMMENT= Allows Qt applications to export menus over DBus to a menu applet LICENSE= gnu-lgpl-v2.1 USE_TOOLS+= pkg-config -USE_LANGUAGES= c c++ -USE_CMAKE= yes +USE_LANGUAGES= c c++ +USE_CMAKE= yes pre-configure: ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ diff --git a/x11/autocutsel/Makefile b/x11/autocutsel/Makefile index c43f47d51ae..ff0738a47b9 100644 --- a/x11/autocutsel/Makefile +++ b/x11/autocutsel/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2015/06/09 13:10:00 ryoon Exp $ +# $NetBSD: Makefile,v 1.3 2015/12/29 04:54:38 dholland Exp $ # DISTNAME= autocutsel-0.10.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=sigmike/} GITHUB_PROJECT= autocutsel -GITHUB_TAG= ${PKGVERSION_NOREV} +GITHUB_TAG= ${PKGVERSION_NOREV} MAINTAINER= ryoon@NetBSD.org HOMEPAGE= http://www.nongnu.org/autocutsel/ diff --git a/x11/eekboard/Makefile b/x11/eekboard/Makefile index edab6a7b531..e05de1e3c50 100644 --- a/x11/eekboard/Makefile +++ b/x11/eekboard/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.34 2015/05/06 08:54:49 mef Exp $ +# $NetBSD: Makefile,v 1.35 2015/12/29 04:54:38 dholland Exp $ DISTNAME= eekboard-1.0.8 PKGREVISION= 5 -MASTER_SITES= ${MASTER_SITE_GITHUB:=ueno/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=ueno/} GITHUB_PROJECT= eekboard -GITHUB_TAG= ${DISTNAME} +GITHUB_TAG= ${DISTNAME} CATEGORIES= x11 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/x11/elementary/Makefile b/x11/elementary/Makefile index b0ca05156d9..97fe61adf51 100644 --- a/x11/elementary/Makefile +++ b/x11/elementary/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/05/03 13:14:39 alnsn Exp $ +# $NetBSD: Makefile,v 1.7 2015/12/29 04:54:38 dholland Exp $ DISTNAME= elementary-1.7.7 PKGREVISION= 4 @@ -28,7 +28,7 @@ PKGCONFIG_OVERRIDE= elementary # currently it is like it is MODULE_ARCH= ${LOWER_OPSYS}-${LOWER_ARCH}-1.7.7 PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH} -PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } +PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } MAKE_FLAGS+= MODULE_ARCH=${MODULE_ARCH} diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile index c5c28355e79..909528882b7 100644 --- a/x11/enlightenment/Makefile +++ b/x11/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2014/05/03 13:14:39 alnsn Exp $ +# $NetBSD: Makefile,v 1.36 2015/12/29 04:54:38 dholland Exp $ # DISTNAME= enlightenment-0.17.3 @@ -56,7 +56,7 @@ PKGCONFIG_OVERRIDE= enlightenment.pc.in MODULE_ARCH= ${LOWER_OPSYS}-${LOWER_ARCH}-${PKGVERSION_NOREV} PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH} -PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } +PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } .include "../../devel/ecore/buildlink3.mk" .include "../../devel/eet/buildlink3.mk" diff --git a/x11/gtkada/Makefile b/x11/gtkada/Makefile index f717a4db938..3d840f98b1d 100644 --- a/x11/gtkada/Makefile +++ b/x11/gtkada/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2015/09/24 02:38:33 tnn Exp $ +# $NetBSD: Makefile,v 1.33 2015/12/29 04:54:38 dholland Exp $ # DISTNAME= gtkada-${GTKADA_VERSION} @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --enable-nls \ --with-GL=no MAKE_ENV+= PROCESSORS=${MAKE_JOBS} -SUBST_CLASSES+= docs lgnat sphinx +SUBST_CLASSES+= docs lgnat sphinx SUBST_STAGE.docs= post-patch SUBST_FILES.docs= Makefile.in SUBST_SED.docs= -e 's/^all: \(.*\)/all: \1 docs/g' diff --git a/x11/labltk/Makefile b/x11/labltk/Makefile index de7e56850dd..10105114420 100644 --- a/x11/labltk/Makefile +++ b/x11/labltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2015/08/07 11:20:36 jaapb Exp $ +# $NetBSD: Makefile,v 1.26 2015/12/29 04:54:39 dholland Exp $ DISTNAME= labltk-8.06.0 PKGREVISION= 3 @@ -8,7 +8,7 @@ LICENSE= gnu-lgpl-v2.1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://forge.ocamlcore.org/projects/labltk/ -COMMENT= Tk bindings for ocaml +COMMENT= Tk bindings for ocaml USE_TOOLS+= gmake MAKE_JOBS_SAFE= no diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile index a4b50089622..4a0530233b2 100644 --- a/x11/libXrender/Makefile +++ b/x11/libXrender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2015/05/01 08:43:00 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2015/12/29 04:54:39 dholland Exp $ DISTNAME= libXrender-0.9.9 CATEGORIES= x11 devel @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-malloc0returnsnull .include "../../meta-pkgs/modular-xorg/hacks.mk" .include "../../x11/renderproto/buildlink3.mk" -BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 +BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6 .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/libxkbcommon/options.mk b/x11/libxkbcommon/options.mk index ac5d01e6998..aa8d683a433 100644 --- a/x11/libxkbcommon/options.mk +++ b/x11/libxkbcommon/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2013/12/18 18:51:03 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:39 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libxkbcommon PKG_SUPPORTED_OPTIONS= doc @@ -8,9 +8,9 @@ PLIST_VARS+= doc .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdoc) -BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen +BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen PLIST.doc= yes -CONFIGURE_ARGS+= --enable-docs=yes +CONFIGURE_ARGS+= --enable-docs=yes .else -CONFIGURE_ARGS+= --enable-docs=no +CONFIGURE_ARGS+= --enable-docs=no .endif diff --git a/x11/modular-xorg-xquartz/Makefile b/x11/modular-xorg-xquartz/Makefile index 294c1b50351..d7d7d915974 100644 --- a/x11/modular-xorg-xquartz/Makefile +++ b/x11/modular-xorg-xquartz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2015/10/25 20:05:01 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2015/12/29 04:54:40 dholland Exp $ DISTNAME= xorg-server-1.17.2 PKGNAME= ${DISTNAME:S/xorg-server/modular-xorg-xquartz/} @@ -18,12 +18,12 @@ USE_LANGUAGES= c c++ objc ONLY_FOR_PLATFORM= Darwin-*-* -BUILD_DEFS+= VARBASE -BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR +BUILD_DEFS+= VARBASE +BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR -OWN_DIRS+= ${VARBASE}/log -OWN_DIRS+= ${XKB_OUTPUT_DIR} -XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config +OWN_DIRS+= ${VARBASE}/log +OWN_DIRS+= ${XKB_OUTPUT_DIR} +XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config @@ -36,49 +36,49 @@ DEPENDS+= xinit-[0-9]*:../../x11/xinit LEGACY_FONT_PATHS= DEFAULT_FONT_PATHS= .for f in misc TTF OTF Type1 100dpi 75dpi cyrillic -DEFAULT_FONT_PATHS+= ${PREFIX}/share/fonts/X11/${f} -LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fonts/${f} +DEFAULT_FONT_PATHS+= ${PREFIX}/share/fonts/X11/${f} +LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fonts/${f} .endfor -FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS} +FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS} CONFIGURE_ARGS+= --enable-xquartz -CONFIGURE_ARGS+= --disable-xorg -CONFIGURE_ARGS+= --disable-xephyr -CONFIGURE_ARGS+= --disable-kdrive -CONFIGURE_ARGS+= --disable-config-hal -CONFIGURE_ARGS+= --disable-dmx -CONFIGURE_ARGS+= --disable-xwin -CONFIGURE_ARGS+= --disable-xfake -CONFIGURE_ARGS+= --disable-xfbdev - -CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} -CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11 -CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q} - -CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" -CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" -CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} - -CONFIGURE_ARGS+= --enable-xtrans-send-fds -CONFIGURE_ARGS+= --enable-dri -CONFIGURE_ARGS+= --enable-dri2 -CONFIGURE_ARGS+= --enable-dri3 -CONFIGURE_ARGS+= --enable-glx -CONFIGURE_ARGS+= --enable-aiglx -CONFIGURE_ARGS+= --enable-glamor -CONFIGURE_ARGS+= --enable-ipv6 +CONFIGURE_ARGS+= --disable-xorg +CONFIGURE_ARGS+= --disable-xephyr +CONFIGURE_ARGS+= --disable-kdrive +CONFIGURE_ARGS+= --disable-config-hal +CONFIGURE_ARGS+= --disable-dmx +CONFIGURE_ARGS+= --disable-xwin +CONFIGURE_ARGS+= --disable-xfake +CONFIGURE_ARGS+= --disable-xfbdev + +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} +CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11 +CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q} + +CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" +CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" +CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} + +CONFIGURE_ARGS+= --enable-xtrans-send-fds +CONFIGURE_ARGS+= --enable-dri +CONFIGURE_ARGS+= --enable-dri2 +CONFIGURE_ARGS+= --enable-dri3 +CONFIGURE_ARGS+= --enable-glx +CONFIGURE_ARGS+= --enable-aiglx +CONFIGURE_ARGS+= --enable-glamor +CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --with-apple-applications-dir=${PREFIX}/Applications/Utilities -CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 -CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 +CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 +CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" .include "../../security/nettle/buildlink3.mk" -CONFIGURE_ARGS+= --with-sha1=libnettle +CONFIGURE_ARGS+= --with-sha1=libnettle .if exists(/usr/bin/xcrun) && exists(/usr/bin/sw_vers) MY_OSX_VERS!= /usr/bin/sw_vers -productVersion diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk index dacebc49388..658b91245ea 100644 --- a/x11/neXtaw/buildlink3.mk +++ b/x11/neXtaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2013/01/15 16:21:36 morr Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2015/12/29 04:54:39 dholland Exp $ BUILDLINK_TREE+= neXtaw @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.neXtaw+= neXtaw>=0.15.1 BUILDLINK_ABI_DEPENDS.neXtaw+= neXtaw>=0.15.1nb2 BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw -BUILDLINK_TRANSFORM+= l:Xaw:neXtaw +BUILDLINK_TRANSFORM+= l:Xaw:neXtaw .include "../../mk/bsd.fast.prefs.mk" diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile index c6bb411e0c3..66fa98a559b 100644 --- a/x11/ocaml-graphics/Makefile +++ b/x11/ocaml-graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2015/08/07 11:20:33 jaapb Exp $ +# $NetBSD: Makefile,v 1.26 2015/12/29 04:54:39 dholland Exp $ .include "../../lang/ocaml/Makefile.common" DISTINFO_FILE= ${PKGDIR}/../../lang/ocaml/distinfo @@ -54,12 +54,12 @@ SUBST_FILES.mklib= otherlibs/Makefile.shared SUBST_SED.mklib= -e 's,^MKLIB=.*,MKLIB=ocamlmklib,g' SUBST_MESSAGE.mklib= Fixing MKLIB in otherlibs/Makefile.shared. -SUBST_CLASSES+= comp -SUBST_STAGE.comp= post-patch -SUBST_FILES.comp= otherlibs/Makefile -SUBST_SED.comp= -e 's,^CAMLC=.*,CAMLC=ocamlc,g' -SUBST_SED.comp+= -e 's,^CAMLOPT=.*,CAMLOPT=ocamlopt,g' -SUBST_MESSAGE.comp= Fixing CAMLC OCAMLOPT in otherlibs/Makefile. +SUBST_CLASSES+= comp +SUBST_STAGE.comp= post-patch +SUBST_FILES.comp= otherlibs/Makefile +SUBST_SED.comp= -e 's,^CAMLC=.*,CAMLC=ocamlc,g' +SUBST_SED.comp+= -e 's,^CAMLOPT=.*,CAMLOPT=ocamlopt,g' +SUBST_MESSAGE.comp= Fixing CAMLC OCAMLOPT in otherlibs/Makefile. INSTALLATION_DIRS+= lib/ocaml/stublibs diff --git a/x11/ocaml-lablgtk/Makefile b/x11/ocaml-lablgtk/Makefile index 4f3141dde9a..854d9494c35 100644 --- a/x11/ocaml-lablgtk/Makefile +++ b/x11/ocaml-lablgtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2015/10/10 01:57:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.10 2015/12/29 04:54:40 dholland Exp $ DISTNAME= lablgtk-2.18.3 PKGREVISION= 6 @@ -41,7 +41,7 @@ PLIST.stubs= yes .include "../../mk/ocaml.mk" .if ${OCAML_USE_OPT_COMPILER} == "yes" -PLIST.opt= yes +PLIST.opt= yes .endif .include "options.mk" diff --git a/x11/py-qwt-qt4/Makefile b/x11/py-qwt-qt4/Makefile index 6f8ef714f7d..0439e088847 100644 --- a/x11/py-qwt-qt4/Makefile +++ b/x11/py-qwt-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2015/12/05 21:26:09 adam Exp $ +# $NetBSD: Makefile,v 1.5 2015/12/29 04:54:40 dholland Exp $ DISTNAME= PyQwt-5.2.0 PKGNAME= ${PYPKGPREFIX}-qwt-qt4-${DISTNAME:S/PyQwt-//} @@ -21,7 +21,7 @@ PLIST_SUBST+= PYSITELIB=${PYSITELIB} PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} # Following line rescues from 'Unresolved dependency with pbulk' -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-Numeric +PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-Numeric REPLACE_PYTHON+=qt4lib/PyQt4/Qwt5/grace.py REPLACE_PYTHON+=qt4lib/PyQt4/Qwt5/qplt.py diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile index 843cc71d241..61884303204 100644 --- a/x11/tk-Tix/Makefile +++ b/x11/tk-Tix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2014/01/20 19:20:09 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2015/12/29 04:54:39 dholland Exp $ # DISTNAME= Tix${TIX_VERSION}-src @@ -23,14 +23,14 @@ CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib CONFIGURE_ARGS+= --disable-stubs -CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include -CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib${LIBABISUFFIX:Q} +CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include +CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib${LIBABISUFFIX:Q} MAKE_ENV+= TCL_DIR=${BUILDLINK_PREFIX.tcl} MAKE_ENV+= TK_DIR=${BUILDLINK_PREFIX.tk} MAKE_ENV+= LIBS=${X11_LDFLAGS:Q} INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} TEST_TARGET= test -INSTALLATION_DIRS+= ${PKGMANDIR}/mann +INSTALLATION_DIRS+= ${PKGMANDIR}/mann INSTALLATION_DIRS+= lib/Tix${TIX_VERSION}/docs USE_TOOLS+= tar diff --git a/x11/tk-Tix/options.mk b/x11/tk-Tix/options.mk index f6d1e1a97b0..7fd9446c575 100644 --- a/x11/tk-Tix/options.mk +++ b/x11/tk-Tix/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2012/08/28 11:46:32 he Exp $ +# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:39 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.Tix PKG_SUPPORTED_OPTIONS= threads debug @@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= threads .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-symbols +CONFIGURE_ARGS+= --enable-symbols .endif .if !empty(PKG_OPTIONS:Mthreads) diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile index 55fca3981fa..b62762f4eba 100644 --- a/x11/wxGTK30/Makefile +++ b/x11/wxGTK30/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.9 2015/04/25 14:25:20 tnn Exp $ +# $NetBSD: Makefile,v 1.10 2015/12/29 04:54:40 dholland Exp $ VERSION= 3.0.2 PKGREVISION= 2 DISTNAME= wxWidgets-${VERSION} PKGNAME= wxGTK30-${VERSION} CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= dbj@NetBSD.org HOMEPAGE= http://www.wxwidgets.org/ COMMENT= GTK-based implementation of the wxWidgets GUI library # LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows -LICENSE= gnu-lgpl-v2 +LICENSE= gnu-lgpl-v2 PATCHFILES= ${DISTNAME}-libtool.diff.bz2 PATCH_SITES= ${MASTER_SITE_LOCAL} diff --git a/x11/xcb-util/builtin.mk b/x11/xcb-util/builtin.mk index 01c1350fce0..47a2259832c 100644 --- a/x11/xcb-util/builtin.mk +++ b/x11/xcb-util/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.4 2014/10/20 11:10:31 wiz Exp $ +# $NetBSD: builtin.mk,v 1.5 2015/12/29 04:54:39 dholland Exp $ BUILTIN_PKG:= xcb-util PKGCONFIG_FILE.xcb-util= ${X11BASE}/lib/pkgconfig/xcb-atom.pc @@ -8,8 +8,8 @@ PKGCONFIG_FILE.xcb-util+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb-atom.pc .include "../../mk/x11.builtin.mk" .if !empty(USE_BUILTIN.xcb-util:M[yY][eE][sS]) -BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-atom.pc -BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-aux.pc -BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-event.pc -BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-util.pc +BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-atom.pc +BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-aux.pc +BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-event.pc +BUILDLINK_FILES.xcb-util+= lib/pkgconfig/xcb-util.pc .endif diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile index 3148fd9095a..5bb89edbe75 100644 --- a/x11/xcolorsel/Makefile +++ b/x11/xcolorsel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2015/10/14 20:17:28 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2015/12/29 04:54:39 dholland Exp $ DISTNAME= xcolorsel-1.1a-src PKGNAME= xcolorsel-1.1a @@ -12,16 +12,16 @@ COMMENT= Browse and select named X colors from rgb.txt WRKSRC= ${WRKDIR}/xcolorsel USE_IMAKE= yes -SUBST_CLASSES+= xcolorsel -SUBST_STAGE.xcolorsel= pre-configure -SUBST_MESSAGE.xcolorsel= Fixing hard-coded paths. -SUBST_FILES.xcolorsel= RgbText.c -SUBST_SED.xcolorsel+= -e "s,@X11BASE@,${X11BASE},g" +SUBST_CLASSES+= xcolorsel +SUBST_STAGE.xcolorsel= pre-configure +SUBST_MESSAGE.xcolorsel= Fixing hard-coded paths. +SUBST_FILES.xcolorsel= RgbText.c +SUBST_SED.xcolorsel+= -e "s,@X11BASE@,${X11BASE},g" #this requires Xaw3d XAW_TYPE= 3d # does not directly support Xaw3d -BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d .PHONY: buildlink-Xaw3d-inc-hack pre-configure: buildlink-Xaw3d-inc-hack diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile index 10304752bed..cd4f9be0a2d 100644 --- a/x11/xwininfo/Makefile +++ b/x11/xwininfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/10/22 14:33:03 mef Exp $ +# $NetBSD: Makefile,v 1.13 2015/12/29 04:54:39 dholland Exp $ DISTNAME= xwininfo-1.1.3 CATEGORIES= x11 @@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= APP_MAN_SUFFIX=1 .include "../../x11/libXext/buildlink3.mk" -BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.9 +BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.9 .include "../../x11/libxcb/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |