diff options
| author | adam <adam@pkgsrc.org> | 2021-03-22 07:03:57 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2021-03-22 07:03:57 +0000 |
| commit | af8be75e4ef7ea40bbf6c855784226ef092d921a (patch) | |
| tree | 5f60072bc71e4a73b301bbca96cb18400c569216 /devel | |
| parent | 58223a91834cc2711c1edcce2ebe6f8e97051e86 (diff) | |
| download | pkgsrc-af8be75e4ef7ea40bbf6c855784226ef092d921a.tar.gz | |
pango: remove unused options; pkglint fixes
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pango/PLIST | 10 | ||||
| -rw-r--r-- | devel/pango/buildlink3.mk | 6 | ||||
| -rw-r--r-- | devel/pango/options.mk | 23 |
3 files changed, 12 insertions, 27 deletions
diff --git a/devel/pango/PLIST b/devel/pango/PLIST index 49212a7a893..85319230453 100644 --- a/devel/pango/PLIST +++ b/devel/pango/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.76 2021/02/25 12:20:09 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.77 2021/03/22 07:03:57 adam Exp $ bin/pango-list bin/pango-view include/pango-1.0/pango/pango-attributes.h @@ -44,16 +44,16 @@ lib/girepository-1.0/PangoOT-1.0.typelib ${PLIST.x11}lib/girepository-1.0/PangoXft-1.0.typelib lib/libpango-1.0.so lib/libpango-1.0.so.0 -lib/libpango-1.0.so.0.4800.0 +lib/libpango-1.0.so.0.4800.3 lib/libpangocairo-1.0.so lib/libpangocairo-1.0.so.0 -lib/libpangocairo-1.0.so.0.4800.0 +lib/libpangocairo-1.0.so.0.4800.3 lib/libpangoft2-1.0.so lib/libpangoft2-1.0.so.0 -lib/libpangoft2-1.0.so.0.4800.0 +lib/libpangoft2-1.0.so.0.4800.3 ${PLIST.x11}lib/libpangoxft-1.0.so ${PLIST.x11}lib/libpangoxft-1.0.so.0 -${PLIST.x11}lib/libpangoxft-1.0.so.0.4800.0 +${PLIST.x11}lib/libpangoxft-1.0.so.0.4800.3 lib/pkgconfig/pango.pc lib/pkgconfig/pangocairo.pc lib/pkgconfig/pangofc.pc diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk index 144a51091ea..701411e3a6c 100644 --- a/devel/pango/buildlink3.mk +++ b/devel/pango/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.54 2020/08/17 20:17:24 leot Exp $ +# $NetBSD: buildlink3.mk,v 1.55 2021/03/22 07:03:57 adam Exp $ BUILDLINK_TREE+= pango @@ -14,11 +14,11 @@ BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango pkgbase := pango .include "../../mk/pkg-build-options.mk" -.if !empty(PKG_BUILD_OPTIONS.pango:Mlibthai) +.if ${PKG_BUILD_OPTIONS.pango:Mlibthai} .include "../../devel/libthai/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.pango:Mx11) +.if ${PKG_BUILD_OPTIONS.pango:Mx11} .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .endif diff --git a/devel/pango/options.mk b/devel/pango/options.mk index 41bd18d4567..b1580b6afa0 100644 --- a/devel/pango/options.mk +++ b/devel/pango/options.mk @@ -1,19 +1,19 @@ -# $NetBSD: options.mk,v 1.19 2021/03/22 06:57:53 adam Exp $ +# $NetBSD: options.mk,v 1.20 2021/03/22 07:03:57 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pango -PKG_SUPPORTED_OPTIONS= libthai quartz x11 +PKG_SUPPORTED_OPTIONS= libthai x11 PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" -PLIST_VARS+= coretext quartz x11 +PLIST_VARS+= x11 ### ### X11 support ### .if !empty(PKG_OPTIONS:Mx11) # fix for pangox.pc -PLIST.x11= yes +PLIST.x11= yes MESON_ARGS+= -Dxft=enabled BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.7nb3 .include "../../x11/libXft/buildlink3.mk" @@ -36,18 +36,3 @@ MESON_ARGS+= -Dlibthai=disabled .endif .include "../../mk/bsd.prefs.mk" - -### -### Quartz "support" -### -.if ${OPSYS} == "Darwin" -### always looks for system CoreText -. if empty(MACHINE_PLATFORM:MDarwin-[1-8].*-*) -### CoreText is only available in 10.5 or newer -PLIST.coretext= yes -. endif -. if !empty(PKG_OPTIONS:Mquartz) -### installs its coretext header file if cairo was built with "quartz" option -#PLIST.quartz= yes -. endif -.endif |