rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wip/*: normalize indentation of variable assignments 

pkglint -r -F --only "should be aligned"
This commit is contained in:
Roland Illig 2019-05-25 15:54:34 +02:00
parent ac9ac45577
commit 18be716048
9 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MesaLib-dfbsd/Makefile
View File

@ -116,11 +116,11 @@ SUBST_SED.wrapper-bug+= -e 's,libglapi_tmp_rename\.la,libglapi.la,g'
SUBST_SED.wrapper-bug+= -e 's,libglapi_tmp_rename_la,libglapi_la,g'
# Replace /etc/drirc.d with ${PREFIX}/etc/drirc.d
SUBST_CLASSES+= drirc
SUBST_STAGE.drirc= pre-configure
SUBST_MESSAGE.drirc= Fixing hardcoded /etc/drirc.d references
SUBST_FILES.drirc+= src/util/xmlconfig.c
SUBST_SED.drirc+= -e 's|/etc|${PREFIX}/etc|g'
SUBST_CLASSES+= drirc
SUBST_STAGE.drirc= pre-configure
SUBST_MESSAGE.drirc= Fixing hardcoded /etc/drirc.d references
SUBST_FILES.drirc+= src/util/xmlconfig.c
SUBST_SED.drirc+= -e 's|/etc|${PREFIX}/etc|g'
CFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
CXXFLAGS.SunOS+= -Drestrict=__restrict__

4
MesaLib-dfbsd/builtin.mk
View File

@ -22,7 +22,7 @@ IS_BUILTIN.MesaLib= yes
IS_BUILTIN.MesaLib= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.MesaLib
MAKEVARS+= IS_BUILTIN.MesaLib
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@ -67,7 +67,7 @@ USE_BUILTIN.MesaLib!= \
. endif
. endif # PREFER.MesaLib
.endif
MAKEVARS+= USE_BUILTIN.MesaLib
MAKEVARS+= USE_BUILTIN.MesaLib
###
### The section below only applies if we are not including this file

8
MesaLib-dfbsd/options.mk
View File

@ -336,14 +336,14 @@ DRI_DRIVERS+= nouveau
.if ${OPSYS} == "Darwin"
CONFIGURE_ARGS+= --with-platforms=x11
MESON_ARGS+= -Dplatforms=x11
MESON_ARGS+= -Dplatforms=x11
#.elif ${OPSYS} == "Linux"
#.include "../../wip/wayland/buildlink3.mk"
#CONFIGURE_ARGS+= --with-platforms=x11,drm,wayland
#PLIST.wayland= yes
.else
CONFIGURE_ARGS+= --with-platforms=x11,drm
MESON_ARGS+= -Dplatforms=x11,drm
MESON_ARGS+= -Dplatforms=x11,drm
.endif
.if !empty(PKG_OPTIONS:Mllvm)
@ -372,10 +372,10 @@ MESON_ARGS+= -Dgallium-vdpau=false
# XA is useful for accelerating xf86-video-vmware
.if !empty(PKG_OPTIONS:Mxa)
CONFIGURE_ARGS+= --enable-xa
MESON_ARGS+= -Dgallium-xa=true
MESON_ARGS+= -Dgallium-xa=true
PLIST.xatracker= yes
.else
MESON_ARGS+= -Dgallium-xa=false
MESON_ARGS+= -Dgallium-xa=false
.endif
# AMD Radeon r300

2
go-sqlite3/buildlink3.mk
View File

@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-sqlite3
GO_SQLITE3_BUILDLINK3_MK:=
BUILDLINK_CONTENTS_FILTER.go-sqlite3= ${EGREP} gopkg/
BUILDLINK_DEPMETHOD.go-sqlite3?= build
BUILDLINK_DEPMETHOD.go-sqlite3?= build
BUILDLINK_API_DEPENDS.go-sqlite3+= go-sqlite3>=1.10.0
BUILDLINK_PKGSRCDIR.go-sqlite3?= ../../wip/go-sqlite3

4
heimdal/builtin.mk
View File

@ -30,8 +30,8 @@ MAKEVARS+= IS_BUILTIN.heimdal
.if !defined(BUILTIN_PKG.heimdal) && \
!empty(IS_BUILTIN.heimdal:M[yY][eE][sS])
. if empty(SH_KRB5_CONFIG:M__nonexistent__)
BUILTIN_VERSION.heimdal!= ${SH_KRB5_CONFIG} --version | \
${AWK} '{ print $$2; exit }'
BUILTIN_VERSION.heimdal!= \
${SH_KRB5_CONFIG} --version | ${AWK} '{ print $$2; exit }'
. else
#
# heimdal<=0.6.x doesn't have a method of checking files to discover

16
libdrm-dfbsd-meson/Makefile
View File

@ -93,8 +93,8 @@ CONFIGURE_ARGS+= PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
PTHREADSTUBS_LIBS=-L${PREFIX}/lib
CONFIGURE_ARGS+= --disable-manpages
CONFIGURE_ARGS+= --disable-valgrind
MESON_ARGS+= -Dman-pages=false
MESON_ARGS+= -Dvalgrind=false
MESON_ARGS+= -Dman-pages=false
MESON_ARGS+= -Dvalgrind=false
LDFLAGS.NetBSD+= -lpci
@ -125,22 +125,22 @@ PKG_SUGGESTED_OPTIONS+= invert_atomic_add_unless
# PKG_SUGGESTED_OPTIONS+= libkms
# .endif
PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
.if ${OPSYS} == "NetBSD"
PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
.endif
.include "../../mk/bsd.options.mk"
PLIST_VARS+= libkms
PLIST_VARS+= libkms
.if !empty(PKG_OPTIONS:Mlibkms)
PKGCONFIG_OVERRIDE+= libkms.pc.in
PLIST.libkms= yes
PLIST.libkms= yes
CONFIGURE_ARGS+= --enable-libkms
MESON_ARGS+= -Dlibkms=true
MESON_ARGS+= -Dlibkms=true
.else
CONFIGURE_ARGS+= --disable-libkms
MESON_ARGS+= -Dlibkms=false
MESON_ARGS+= -Dlibkms=false
.endif
.if !empty(PKG_OPTIONS:Minvert_atomic_add_unless)

2
libdrm-dfbsd-meson/builtin.mk
View File

@ -1,6 +1,6 @@
# $NetBSD: builtin.mk,v 1.4 2018/06/01 15:05:43 maya Exp $
BUILTIN_PKG:= libdrm
BUILTIN_PKG:= libdrm
.for pcfile in libdrm libdrm_amdgpu libdrm_intel libdrm_nouveau libdrm_radeon
PKGCONFIG_FILE.libdrm+= ${X11BASE}/lib/pkgconfig/${pcfile}.pc
PKGCONFIG_FILE.libdrm+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/${pcfile}.pc

6
modular-xorg-server-dfbsd-meson/Makefile
View File

@ -20,10 +20,10 @@ CONFIGURE_ARGS+= --enable-xorg
CONFIGURE_ARGS+= --disable-xephyr
CONFIGURE_ARGS+= --disable-kdrive
CONFIGURE_ARGS.SunOS+= --disable-input-thread
MESON_ARGS+= -Dxorg=true
MESON_ARGS+= -Dxephyr=false
MESON_ARGS+= -Dxorg=true
MESON_ARGS+= -Dxephyr=false
.if ${OPSYS} == "SunOS"
MESON_ARGS+= -Dinput_thread=false
MESON_ARGS+= -Dinput_thread=false
.endif
.include "options.mk"

68
modular-xorg-server-dfbsd-meson/options.mk
View File

@ -8,30 +8,30 @@ PKG_SUPPORTED_OPTIONS+= dri
PKG_SUGGESTED_OPTIONS+= dri
.endif
PKG_SUPPORTED_OPTIONS+= devd
PKG_SUPPORTED_OPTIONS+= xkb_evdev
PKG_SUPPORTED_OPTIONS+= devd
PKG_SUPPORTED_OPTIONS+= xkb_evdev
PKG_SUPPORTED_OPTIONS+= revert_flink
PKG_SUPPORTED_OPTIONS+= revert_randr_lease
PKG_SUPPORTED_OPTIONS+= add_scfb_driver
PKG_SUPPORTED_OPTIONS+= add_modesetting_driver
PKG_SUPPORTED_OPTIONS+= revert_flink
PKG_SUPPORTED_OPTIONS+= revert_randr_lease
PKG_SUPPORTED_OPTIONS+= add_scfb_driver
PKG_SUPPORTED_OPTIONS+= add_modesetting_driver
PKG_SUPPORTED_OPTIONS+= allow_unprivileged
PKG_SUPPORTED_OPTIONS+= allow_unprivileged
PKG_SUPPORTED_OPTIONS+= otherid_xsrc_netbsd
PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
PKG_SUPPORTED_OPTIONS+= modesetting_on_intel
PKG_SUPPORTED_OPTIONS+= try_dev_wskbd
PKG_SUPPORTED_OPTIONS+= modesetting_on_intel
PKG_SUPPORTED_OPTIONS+= try_dev_wskbd
PKG_SUPPORTED_OPTIONS+= fallback_not_wsdisplay
PKG_SUPPORTED_OPTIONS+= kbd_by_masking_bits
PKG_SUPPORTED_OPTIONS+= usl_vt_switching
PKG_SUPPORTED_OPTIONS+= openbsd_more_calls
PKG_SUPPORTED_OPTIONS+= randr_backlight
PKG_SUPPORTED_OPTIONS+= ws_drivers_openbsd
PKG_SUPPORTED_OPTIONS+= fallback_not_wsdisplay
PKG_SUPPORTED_OPTIONS+= kbd_by_masking_bits
PKG_SUPPORTED_OPTIONS+= usl_vt_switching
PKG_SUPPORTED_OPTIONS+= openbsd_more_calls
PKG_SUPPORTED_OPTIONS+= randr_backlight
PKG_SUPPORTED_OPTIONS+= ws_drivers_openbsd
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
PKG_SUGGESTED_OPTIONS+= devd
PKG_SUGGESTED_OPTIONS+= devd
.endif
.if ${OPSYS} == "DragonFly"
@ -41,12 +41,12 @@ PKG_SUGGESTED_OPTIONS+= revert_randr_lease
# Add scfb driver in xf86AutoConfig.c
.if ${OPSYS} == "FreeBSD"
PKG_SUGGESTED_OPTIONS+= add_scfb_driver
PKG_SUGGESTED_OPTIONS+= add_scfb_driver
.endif
# Add modesetting driver in xf86AutoConfig.c
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
PKG_SUGGESTED_OPTIONS+= add_modesetting_driver
PKG_SUGGESTED_OPTIONS+= add_modesetting_driver
.endif
.if ${OPSYS} == "NetBSD"
@ -54,17 +54,17 @@ PKG_SUGGESTED_OPTIONS+= allow_unprivileged
.endif
.if ${OPSYS} == "NetBSD"
PKG_SUGGESTED_OPTIONS+= otherid_xsrc_netbsd
PKG_SUGGESTED_OPTIONS+= otherid_xsrc_netbsd
.endif
.if ${OPSYS} == "NetBSD"
PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
.endif
# Patch from OpenBSD to aggressively use the modesetting driver on intel integrated graphics
# .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
.endif
# From NetBSD 1.20.4 but extended to amd64 and i386
@ -74,31 +74,31 @@ PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
# From OpenBSD 6.5 xenocara xserver 1.19.6
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= fallback_not_wsdisplay
PKG_SUGGESTED_OPTIONS+= fallback_not_wsdisplay
.endif
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= kbd_by_masking_bits
PKG_SUGGESTED_OPTIONS+= kbd_by_masking_bits
.endif
# Implement VT switching based on the USL compat interface
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= usl_vt_switching
PKG_SUGGESTED_OPTIONS+= usl_vt_switching
.endif
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= openbsd_more_calls
PKG_SUGGESTED_OPTIONS+= openbsd_more_calls
.endif
# From OpenBSD 6.5 xenocara xserver 1.19.6
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= randr_backlight
PKG_SUGGESTED_OPTIONS+= randr_backlight
.endif
# From OpenBSD 6.5 xenocara xserver 1.19.6
# .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= ws_drivers_openbsd
PKG_SUGGESTED_OPTIONS+= ws_drivers_openbsd
.endif
.include "../../mk/bsd.options.mk"
@ -181,7 +181,7 @@ CONFIGURE_ARGS+= --without-dtrace
# SUBST_MESSAGE.devd_dix= Patching include/dix-config.h for devd
# SUBST_FILES.devd_dix+= include/dix-config.h
# SUBST_SED.devd_dix+= -e 's|/\* \#undef CONFIG_UDEV \*/|\#define CONFIG_DEVD 1 |'
CPPFLAGS+= -DCONFIG_DEVD=1
CPPFLAGS+= -DCONFIG_DEVD=1
MESON_ARGS+= -Ddevd=true
.endif
@ -198,11 +198,11 @@ CPPFLAGS+= -DREVERT_FLINK
.if !empty(PKG_OPTIONS:Mrevert_randr_lease)
CPPFLAGS+= -DREVERT_RANDR_LEASE
SUBST_CLASSES+= lease
SUBST_STAGE.lease= post-configure
SUBST_MESSAGE.lease= Removing definition of XF86_LEASE_VERSION
SUBST_FILES.lease+= hw/xfree86/modes/xf86Crtc.h
SUBST_SED.lease+= -e 's|XF86_LEASE_VERSION|REVERT_XF86_LEASE_VERSION|g'
SUBST_CLASSES+= lease
SUBST_STAGE.lease= post-configure
SUBST_MESSAGE.lease= Removing definition of XF86_LEASE_VERSION
SUBST_FILES.lease+= hw/xfree86/modes/xf86Crtc.h
SUBST_SED.lease+= -e 's|XF86_LEASE_VERSION|REVERT_XF86_LEASE_VERSION|g'
.endif
.if !empty(PKG_OPTIONS:Madd_scfb_driver)