CVS commit: pkgsrc/devel/pango

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Mar 22 07:03:57 UTC 2021

Modified Files:
        pkgsrc/devel/pango: PLIST buildlink3.mk options.mk

Log Message:
pango: remove unused options; pkglint fixes


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/devel/pango/PLIST
cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/pango/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/pango/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/pango/PLIST
diff -u pkgsrc/devel/pango/PLIST:1.76 pkgsrc/devel/pango/PLIST:1.77
--- pkgsrc/devel/pango/PLIST:1.76       Thu Feb 25 12:20:09 2021
+++ pkgsrc/devel/pango/PLIST    Mon Mar 22 07:03:57 2021
@@ -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

Index: pkgsrc/devel/pango/buildlink3.mk
diff -u pkgsrc/devel/pango/buildlink3.mk:1.54 pkgsrc/devel/pango/buildlink3.mk:1.55
--- pkgsrc/devel/pango/buildlink3.mk:1.54       Mon Aug 17 20:17:24 2020
+++ pkgsrc/devel/pango/buildlink3.mk    Mon Mar 22 07:03:57 2021
@@ -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/
 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

Index: pkgsrc/devel/pango/options.mk
diff -u pkgsrc/devel/pango/options.mk:1.19 pkgsrc/devel/pango/options.mk:1.20
--- pkgsrc/devel/pango/options.mk:1.19  Mon Mar 22 06:57:53 2021
+++ pkgsrc/devel/pango/options.mk       Mon Mar 22 07:03:57 2021
@@ -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