pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/*: normalize indentation of directives
Module Name: pkgsrc-wip
Committed By: Roland Illig <roland.illig%gmx.de@localhost>
Pushed By: rillig
Date: Wed May 22 21:26:11 2019 +0200
Changeset: 4a2cce4197da685867bcacdbcd6e45545d70b4d1
Modified Files:
MesaLib-dfbsd-meson/dri.mk
MesaLib-dfbsd-meson/options.mk
MesaLib-dfbsd/dri.mk
MesaLib-dfbsd/options.mk
akonadi/options.mk
avr-libc/options.mk
avrdude/options.mk
firefox-hg/options.mk
fltk14-devel/Makefile
frida-glib2/Makefile
gambas3/Makefile.common
gerris/options.mk
heimdal/Makefile
libdrm-dfbsd-meson/Makefile
libdrm-dfbsd/Makefile
libvirt490/options.mk
modular-xorg-server-dfbsd/options.mk
pike8.0/builtin_module.mk
tftp-hpa/hacks.mk
vlc-git/options.mk
vlc2/options.mk
wla-dx-git/Makefile
wla-dx/Makefile
Log Message:
wip/*: normalize indentation of directives
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4a2cce4197da685867bcacdbcd6e45545d70b4d1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
MesaLib-dfbsd-meson/dri.mk | 36 +++++------
MesaLib-dfbsd-meson/options.mk | 116 +++++++++++++++++------------------
MesaLib-dfbsd/dri.mk | 38 ++++++------
MesaLib-dfbsd/options.mk | 104 +++++++++++++++----------------
akonadi/options.mk | 2 +-
avr-libc/options.mk | 4 +-
avrdude/options.mk | 4 +-
firefox-hg/options.mk | 10 +--
fltk14-devel/Makefile | 6 +-
frida-glib2/Makefile | 2 +-
gambas3/Makefile.common | 4 +-
gerris/options.mk | 2 +-
heimdal/Makefile | 4 +-
libdrm-dfbsd-meson/Makefile | 6 +-
libdrm-dfbsd/Makefile | 6 +-
libvirt490/options.mk | 8 +--
modular-xorg-server-dfbsd/options.mk | 10 +--
pike8.0/builtin_module.mk | 2 +-
tftp-hpa/hacks.mk | 4 +-
vlc-git/options.mk | 4 +-
vlc2/options.mk | 4 +-
wla-dx-git/Makefile | 16 ++---
wla-dx/Makefile | 20 +++---
23 files changed, 206 insertions(+), 206 deletions(-)
diffs:
diff --git a/MesaLib-dfbsd-meson/dri.mk b/MesaLib-dfbsd-meson/dri.mk
index c573b3f2f6..a11deee6cf 100644
--- a/MesaLib-dfbsd-meson/dri.mk
+++ b/MesaLib-dfbsd-meson/dri.mk
@@ -5,29 +5,29 @@
.if !defined(DRI_MK)
DRI_MK= # defined
-. if !defined(USE_BUILTIN.MesaLib)
+.if !defined(USE_BUILTIN.MesaLib)
CHECK_BUILTIN.MesaLib:= yes
-. include "../../graphics/MesaLib/builtin.mk"
+. include "../../graphics/MesaLib/builtin.mk"
CHECK_BUILTIN.MesaLib:= no
-. endif
+.endif
-. if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
-. if ${OPSYS} != "Darwin"
+.if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
+. if ${OPSYS} != "Darwin"
BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.60
-. endif
-. if ${OPSYS} == "Linux"
+. endif
+. if ${OPSYS} == "Linux"
BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.9.3
-. endif
. endif
-. include "../../x11/xorgproto/buildlink3.mk"
+.endif
+.include "../../x11/xorgproto/buildlink3.mk"
# XXX these do not have builtin.mk
-. if ${X11_TYPE} == "modular"
-. include "../../x11/libxshmfence/buildlink3.mk"
-. endif
-. include "../../x11/libXdamage/buildlink3.mk"
-. include "../../x11/libXfixes/buildlink3.mk"
-. include "../../x11/libXxf86vm/buildlink3.mk"
-. if ${OPSYS} != "Darwin"
-. include "../../x11/libdrm/buildlink3.mk"
-. endif
+.if ${X11_TYPE} == "modular"
+. include "../../x11/libxshmfence/buildlink3.mk"
+.endif
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+. include "../../x11/libdrm/buildlink3.mk"
+.endif
.endif
diff --git a/MesaLib-dfbsd-meson/options.mk b/MesaLib-dfbsd-meson/options.mk
index 80c71bb4b7..c066023c71 100644
--- a/MesaLib-dfbsd-meson/options.mk
+++ b/MesaLib-dfbsd-meson/options.mk
@@ -168,66 +168,66 @@ CONFIGURE_ARGS+= --enable-dri
# will only use it if it is supported at run time.
CONFIGURE_ARGS+= --enable-dri3
MESON_ARGS+= -Ddri3=true
-.if ${OPSYS} != "Darwin"
+. if ${OPSYS} != "Darwin"
CONFIGURE_ARGS+= --enable-egl
CONFIGURE_ARGS+= --enable-gbm
MESON_ARGS+= -Degl=true
MESON_ARGS+= -Dgbm=true
PLIST.egl= yes
PLIST.gbm= yes
-.else
+. else
CONFIGURE_ARGS+= --disable-egl
CONFIGURE_ARGS+= --disable-gbm
MESON_ARGS+= -Degl=false
MESON_ARGS+= -Dgbm=false
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mosmesa)
+. if !empty(PKG_OPTIONS:Mosmesa)
CONFIGURE_ARGS+= --enable-osmesa
MESON_ARGS+= -Dosmesa=gallium
PLIST.osmesa= yes
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mglesv1)
+. if !empty(PKG_OPTIONS:Mglesv1)
CONFIGURE_ARGS+= --enable-gles1
MESON_ARGS+= -Dgles1=true
PLIST.glesv1= yes
-.else
+. else
CONFIGURE_ARGS+= --disable-gles1
MESON_ARGS+= -Dgles1=false
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mglesv2)
+. if !empty(PKG_OPTIONS:Mglesv2)
CONFIGURE_ARGS+= --enable-gles2
MESON_ARGS+= -Dgles2=true
PLIST.glesv2= yes
-.else
+. else
CONFIGURE_ARGS+= --disable-gles2
MESON_ARGS+= -Dgles2=false
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mglx-tls)
+. if !empty(PKG_OPTIONS:Mglx-tls)
# Recommended by
# http://www.freedesktop.org/wiki/Software/Glamor/
CONFIGURE_ARGS+= --enable-glx-tls
MESON_ARGS+= -Dglx-tls=true
-.else
+. else
# (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so:
# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model
# initial-exec and dlopen is not supported
CONFIGURE_ARGS+= --disable-glx-tls
MESON_ARGS+= -Dglx-tls=false
-.endif # glx-tls
+. endif # glx-tls
# DRI on Linux needs either sysfs or udev
CONFIGURE_ARGS.Linux+= --enable-sysfs
PLIST.dri= yes
-.if ${OPSYS} != "Darwin"
+. if ${OPSYS} != "Darwin"
BUILDLINK_DEPMETHOD.libpciaccess= full
.include "../../sysutils/libpciaccess/buildlink3.mk"
-.endif
+. endif
.include "../../graphics/MesaLib/dri.mk"
DRI_DRIVERS= #
@@ -240,15 +240,15 @@ VULKAN_DRIVERS= #
# error('Only one swrast provider can be built')
# endif
PLIST.swrast_dri= yes
-.if ${OPSYS} != "Darwin"
+. if ${OPSYS} != "Darwin"
PLIST.swrast= yes
GALLIUM_DRIVERS+= swrast
-.else
+. else
DRI_DRIVERS+= swrast
-.endif
+. endif
# x86 only drivers
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
+. if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
# svga / VMWare driver
PLIST.svga= yes
GALLIUM_DRIVERS+= svga
@@ -265,24 +265,24 @@ DRI_DRIVERS+= i915
PLIST.i965= yes
DRI_DRIVERS+= i965
-.endif
+. endif
# Intel Iris support
-.if !empty(PKG_OPTIONS:Miris)
+. if !empty(PKG_OPTIONS:Miris)
GALLIUM_DRIVERS+= iris
PLIST.iris= yes
-.endif
+. endif
# Vulkan support
-.if !empty(PKG_OPTIONS:Mvulkan)
+. if !empty(PKG_OPTIONS:Mvulkan)
# VULKAN_DRIVERS+= intel
# VULKAN_DRIVERS+= radeon
VULKAN_DRIVERS+= auto
PLIST.vulkan= yes
-.endif
+. endif
# ARM drivers
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
+. if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
# Qualcomm SnapDragon, libdrm_freedreno.pc
#GALLIUM_DRIVERS+= freedreno
#PLIST.freedreno= yes
@@ -290,17 +290,17 @@ PLIST.vulkan= yes
# Broadcom VideoCore 4
GALLIUM_DRIVERS+= vc4
PLIST.vc4= yes
-.endif
+. endif
# qemu Linux guest driver
-.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+. if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
# XXX test this
#GALLIUM_DRIVERS+= virgl
#PLIST.virgl= yes
-.endif
+. endif
# theoretically cross platform PCI drivers
-.if ${OPSYS} != "Darwin" && empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) && \
+. if ${OPSYS} != "Darwin" && empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) && \
empty(MACHINE_PLATFORM:MNetBSD-*-mipsel)
# AMD Radeon r600
@@ -311,11 +311,11 @@ GALLIUM_DRIVERS+= r600
# FULL_OS_VERSION= ${FULL_OS_VERSION_CMD:sh}
# FreeBSD lacks nouveau support (there are official binaries from Nvidia)
-.if ${OPSYS} != "FreeBSD"
+. if ${OPSYS} != "FreeBSD"
# nVidia
PLIST.nouveau= yes
GALLIUM_DRIVERS+= nouveau
-.endif
+. endif
# Meson build does not compile these correctly anymore.
# classic DRI radeon
@@ -327,56 +327,56 @@ PLIST.r200= yes
DRI_DRIVERS+= r200
# FreeBSD lacks nouveau support (there are official binaries from Nvidia)
-.if ${OPSYS} != "FreeBSD"
+. if ${OPSYS} != "FreeBSD"
# classic DRI nouveau
PLIST.nouveau_dri= yes
DRI_DRIVERS+= nouveau
-.endif
-.endif # cross platform PCI drivers
+. endif
+. endif # cross platform PCI drivers
-.if ${OPSYS} == "Darwin"
+. if ${OPSYS} == "Darwin"
CONFIGURE_ARGS+= --with-platforms=x11
MESON_ARGS+= -Dplatforms=x11
#.elif ${OPSYS} == "Linux"
#.include "../../wip/wayland/buildlink3.mk"
#CONFIGURE_ARGS+= --with-platforms=x11,drm,wayland
#PLIST.wayland= yes
-.else
+. else
CONFIGURE_ARGS+= --with-platforms=x11,drm
MESON_ARGS+= -Dplatforms=x11,drm
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mllvm)
+. if !empty(PKG_OPTIONS:Mllvm)
# VA-API and VDPAU
-.if !empty(PKG_OPTIONS:Mvaapi)
+. if !empty(PKG_OPTIONS:Mvaapi)
.include "../../multimedia/libva/available.mk"
-.if ${VAAPI_AVAILABLE} == "yes"
+. if ${VAAPI_AVAILABLE} == "yes"
PLIST.vaapi= yes
.include "../../multimedia/libva/buildlink3.mk"
MESON_ARGS+= -Dgallium-va=true
-.else
+. else
MESON_ARGS+= -Dgallium-va=false
-.endif
-.endif # vaapi
-.if !empty(PKG_OPTIONS:Mvdpau)
+. endif
+. endif # vaapi
+. if !empty(PKG_OPTIONS:Mvdpau)
.include "../../multimedia/libvdpau/available.mk"
-.if ${VDPAU_AVAILABLE} == "yes"
+. if ${VDPAU_AVAILABLE} == "yes"
PLIST.vdpau= yes
.include "../../multimedia/libvdpau/buildlink3.mk"
MESON_ARGS+= -Dgallium-vdpau=true
-.else
+. else
MESON_ARGS+= -Dgallium-vdpau=false
-.endif
-.endif # vdpau
+. endif
+. endif # vdpau
# XA is useful for accelerating xf86-video-vmware
-.if !empty(PKG_OPTIONS:Mxa)
+. if !empty(PKG_OPTIONS:Mxa)
CONFIGURE_ARGS+= --enable-xa
MESON_ARGS+= -Dgallium-xa=true
PLIST.xatracker= yes
-.else
+. else
MESON_ARGS+= -Dgallium-xa=false
-.endif
+. endif
# AMD Radeon r300
PLIST.r300= yes
@@ -389,9 +389,9 @@ CONFIGURE_ARGS+= --enable-llvm-shared-libs
MESON_ARGS+= -Dllvm=true
MESON_ARGS+= -Dshared-llvm=true
-.if !exists(/usr/include/libelf.h)
+. if !exists(/usr/include/libelf.h)
.include "../../devel/libelf/buildlink3.mk"
-.endif
+. endif
# XXX update libLLVM to use it instead
#BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=5.0
@@ -400,14 +400,14 @@ MESON_ARGS+= -Dshared-llvm=true
# BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=4.0
# .include "../../lang/libLLVM/buildlink3.mk"
CONFIGURE_ENV+= ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH}
-.else # !llvm
+. else # !llvm
CONFIGURE_ARGS+= --disable-xa
CONFIGURE_ARGS+= --disable-llvm
CONFIGURE_ARGS+= --disable-llvm-shared-libs
MESON_ARGS+= -Dgallium-xa=false
MESON_ARGS+= -Dllvm=false
MESON_ARGS+= -Dshared-llvm=false
-.endif # llvm
+. endif # llvm
CONFIGURE_ARGS+= --with-gallium-drivers=${GALLIUM_DRIVERS:ts,}
CONFIGURE_ARGS+= --with-dri-drivers=${DRI_DRIVERS:ts,}
@@ -437,9 +437,9 @@ MESON_ARGS+= -Dgles1=false
MESON_ARGS+= -Dgles2=false
MESON_ARGS+= -Dglx=xlib
MESON_ARGS+= -Dplatforms=x11
-.if !empty(PKG_OPTIONS:Mllvm)
+. if !empty(PKG_OPTIONS:Mllvm)
PKG_FAIL_REASON+= "The llvm PKG_OPTION must also be disabled when dri is disabled"
-.endif
+. endif
.endif # dri
.if !empty(PKG_OPTIONS:Mdebug)
diff --git a/MesaLib-dfbsd/dri.mk b/MesaLib-dfbsd/dri.mk
index b5bf454044..9a15e89c6e 100644
--- a/MesaLib-dfbsd/dri.mk
+++ b/MesaLib-dfbsd/dri.mk
@@ -5,30 +5,30 @@
.if !defined(DRI_MK)
DRI_MK= # defined
-. if !defined(USE_BUILTIN.MesaLib)
+.if !defined(USE_BUILTIN.MesaLib)
CHECK_BUILTIN.MesaLib:= yes
-. include "../../graphics/MesaLib/builtin.mk"
+. include "../../graphics/MesaLib/builtin.mk"
CHECK_BUILTIN.MesaLib:= no
-. endif
+.endif
-. if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
-. if ${OPSYS} != "Darwin"
+.if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
+. if ${OPSYS} != "Darwin"
BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.60
-. endif
-. if ${OPSYS} == "Linux"
+. endif
+. if ${OPSYS} == "Linux"
BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.9.3
-. endif
. endif
-. include "../../textproc/expat/buildlink3.mk"
-. include "../../x11/xorgproto/buildlink3.mk"
+.endif
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
# XXX these do not have builtin.mk
-. if ${X11_TYPE} == "modular"
-. include "../../x11/libxshmfence/buildlink3.mk"
-. endif
-. include "../../x11/libXdamage/buildlink3.mk"
-. include "../../x11/libXfixes/buildlink3.mk"
-. include "../../x11/libXxf86vm/buildlink3.mk"
-. if ${OPSYS} != "Darwin"
-. include "../../x11/libdrm/buildlink3.mk"
-. endif
+.if ${X11_TYPE} == "modular"
+. include "../../x11/libxshmfence/buildlink3.mk"
+.endif
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+. include "../../x11/libdrm/buildlink3.mk"
+.endif
.endif
diff --git a/MesaLib-dfbsd/options.mk b/MesaLib-dfbsd/options.mk
index 5f18b1b5c6..ddc31675d6 100644
--- a/MesaLib-dfbsd/options.mk
+++ b/MesaLib-dfbsd/options.mk
@@ -78,55 +78,55 @@ CONFIGURE_ARGS+= --enable-dri
# Having DRI3 and egl compiled in by default doesn't hurt, the X server
# will only use it if it is supported at run time.
CONFIGURE_ARGS+= --enable-dri3
-.if ${OPSYS} != "Darwin"
+. if ${OPSYS} != "Darwin"
CONFIGURE_ARGS+= --enable-egl
CONFIGURE_ARGS+= --enable-gbm
PLIST.egl= yes
PLIST.gbm= yes
-.else
+. else
CONFIGURE_ARGS+= --disable-egl
CONFIGURE_ARGS+= --disable-gbm
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mosmesa)
+. if !empty(PKG_OPTIONS:Mosmesa)
CONFIGURE_ARGS+= --enable-osmesa
PLIST.osmesa= yes
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mglesv1)
+. if !empty(PKG_OPTIONS:Mglesv1)
CONFIGURE_ARGS+= --enable-gles1
PLIST.glesv1= yes
-.else
+. else
CONFIGURE_ARGS+= --disable-gles1
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mglesv2)
+. if !empty(PKG_OPTIONS:Mglesv2)
CONFIGURE_ARGS+= --enable-gles2
PLIST.glesv2= yes
-.else
+. else
CONFIGURE_ARGS+= --disable-gles2
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mglx-tls)
+. if !empty(PKG_OPTIONS:Mglx-tls)
# Recommended by
# http://www.freedesktop.org/wiki/Software/Glamor/
CONFIGURE_ARGS+= --enable-glx-tls
-.else
+. else
# (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so:
# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model
# initial-exec and dlopen is not supported
CONFIGURE_ARGS+= --disable-glx-tls
-.endif # glx-tls
+. endif # glx-tls
# DRI on Linux needs either sysfs or udev
CONFIGURE_ARGS.Linux+= --enable-sysfs
PLIST.dri= yes
-.if ${OPSYS} != "Darwin"
+. if ${OPSYS} != "Darwin"
BUILDLINK_DEPMETHOD.libpciaccess= full
.include "../../sysutils/libpciaccess/buildlink3.mk"
-.endif
+. endif
.include "../../graphics/MesaLib/dri.mk"
DRI_DRIVERS= #
@@ -136,13 +136,13 @@ VULKAN_DRIVERS= #
# Software rasterizer
PLIST.swrast_dri= yes
DRI_DRIVERS+= swrast
-.if ${OPSYS} != "Darwin"
+. if ${OPSYS} != "Darwin"
PLIST.swrast= yes
GALLIUM_DRIVERS+= swrast
-.endif
+. endif
# x86 only drivers
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
+. if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
# svga / VMWare driver
PLIST.svga= yes
GALLIUM_DRIVERS+= svga
@@ -155,17 +155,17 @@ DRI_DRIVERS+= i915
PLIST.i965= yes
DRI_DRIVERS+= i965
-.endif
+. endif
# Vulkan support
-.if !empty(PKG_OPTIONS:Mvulkan)
+. if !empty(PKG_OPTIONS:Mvulkan)
VULKAN_DRIVERS+= intel
VULKAN_DRIVERS+= radeon
PLIST.vulkan= yes
-.endif
+. endif
# ARM drivers
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
+. if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
# Qualcomm SnapDragon, libdrm_freedreno.pc
#GALLIUM_DRIVERS+= freedreno
#PLIST.freedreno= yes
@@ -173,17 +173,17 @@ PLIST.vulkan= yes
# Broadcom VideoCore 4
GALLIUM_DRIVERS+= vc4
PLIST.vc4= yes
-.endif
+. endif
# qemu Linux guest driver
-.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+. if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
# XXX test this
#GALLIUM_DRIVERS+= virgl
#PLIST.virgl= yes
-.endif
+. endif
# theoretically cross platform PCI drivers
-.if ${OPSYS} != "Darwin" && empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) && \
+. if ${OPSYS} != "Darwin" && empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) && \
empty(MACHINE_PLATFORM:MNetBSD-*-mipsel)
# AMD Radeon r600
@@ -194,11 +194,11 @@ GALLIUM_DRIVERS+= r600
# FULL_OS_VERSION= ${FULL_OS_VERSION_CMD:sh}
# FreeBSD lacks nouveau support (there are official binaries from Nvidia)
-.if ${OPSYS} != "FreeBSD"
+. if ${OPSYS} != "FreeBSD"
# nVidia
PLIST.nouveau= yes
GALLIUM_DRIVERS+= nouveau
-.endif
+. endif
# classic DRI radeon
PLIST.radeon_dri= yes
@@ -209,45 +209,45 @@ PLIST.r200= yes
DRI_DRIVERS+= r200
# FreeBSD lacks nouveau support (there are official binaries from Nvidia)
-.if ${OPSYS} != "FreeBSD"
+. if ${OPSYS} != "FreeBSD"
# classic DRI nouveau
PLIST.nouveau_dri= yes
DRI_DRIVERS+= nouveau
-.endif
-.endif # cross platform PCI drivers
+. endif
+. endif # cross platform PCI drivers
-.if ${OPSYS} == "Darwin"
+. if ${OPSYS} == "Darwin"
CONFIGURE_ARGS+= --with-platforms=x11
#.elif ${OPSYS} == "Linux"
#.include "../../wip/wayland/buildlink3.mk"
#CONFIGURE_ARGS+= --with-platforms=x11,drm,wayland
#PLIST.wayland= yes
-.else
+. else
CONFIGURE_ARGS+= --with-platforms=x11,drm
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mllvm)
+. if !empty(PKG_OPTIONS:Mllvm)
# VA-API and VDPAU
-.if !empty(PKG_OPTIONS:Mvaapi)
+. if !empty(PKG_OPTIONS:Mvaapi)
.include "../../multimedia/libva/available.mk"
-.if ${VAAPI_AVAILABLE} == "yes"
+. if ${VAAPI_AVAILABLE} == "yes"
PLIST.vaapi= yes
.include "../../multimedia/libva/buildlink3.mk"
-.endif
-.endif # vaapi
-.if !empty(PKG_OPTIONS:Mvdpau)
+. endif
+. endif # vaapi
+. if !empty(PKG_OPTIONS:Mvdpau)
.include "../../multimedia/libvdpau/available.mk"
-.if ${VDPAU_AVAILABLE} == "yes"
+. if ${VDPAU_AVAILABLE} == "yes"
PLIST.vdpau= yes
.include "../../multimedia/libvdpau/buildlink3.mk"
-.endif
-.endif # vdpau
+. endif
+. endif # vdpau
# XA is useful for accelerating xf86-video-vmware
-.if !empty(PKG_OPTIONS:Mxa)
+. if !empty(PKG_OPTIONS:Mxa)
CONFIGURE_ARGS+= --enable-xa
PLIST.xatracker= yes
-.endif
+. endif
# AMD Radeon r300
PLIST.r300= yes
@@ -258,9 +258,9 @@ GALLIUM_DRIVERS+= radeonsi
CONFIGURE_ARGS+= --enable-llvm
CONFIGURE_ARGS+= --enable-llvm-shared-libs
-.if !exists(/usr/include/libelf.h)
+. if !exists(/usr/include/libelf.h)
.include "../../devel/libelf/buildlink3.mk"
-.endif
+. endif
# XXX update libLLVM to use it instead
#BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=5.0
@@ -269,11 +269,11 @@ CONFIGURE_ARGS+= --enable-llvm-shared-libs
# BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=4.0
# .include "../../lang/libLLVM/buildlink3.mk"
CONFIGURE_ENV+= ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH}
-.else # !llvm
+. else # !llvm
CONFIGURE_ARGS+= --disable-xa
CONFIGURE_ARGS+= --disable-llvm
CONFIGURE_ARGS+= --disable-llvm-shared-libs
-.endif # llvm
+. endif # llvm
CONFIGURE_ARGS+= --with-gallium-drivers=${GALLIUM_DRIVERS:ts,}
CONFIGURE_ARGS+= --with-dri-drivers=${DRI_DRIVERS:ts,}
@@ -293,9 +293,9 @@ CONFIGURE_ARGS+= --enable-xlib-glx
CONFIGURE_ARGS+= --with-platforms=x11
# XXX configure looks for expat but doesn't actually need it in non-dri case
CONFIGURE_ENV+= EXPAT_CFLAGS=" " EXPAT_LIBS=" "
-.if !empty(PKG_OPTIONS:Mllvm)
+. if !empty(PKG_OPTIONS:Mllvm)
PKG_FAIL_REASON+= "The llvm PKG_OPTION must also be disabled when dri is disabled"
-.endif
+. endif
.endif # dri
.if !empty(PKG_OPTIONS:Mdebug)
diff --git a/akonadi/options.mk b/akonadi/options.mk
index 762fe958b7..0fa02e1cc8 100644
--- a/akonadi/options.mk
+++ b/akonadi/options.mk
@@ -14,7 +14,7 @@ PKG_SUGGESTED_OPTIONS= sqlite
###
PLIST_VARS+= sqlite
.if !empty(PKG_OPTIONS:Msqlite)
-. include "../../databases/sqlite3/buildlink3.mk"
+. include "../../databases/sqlite3/buildlink3.mk"
CMAKE_ARGS+= -DAKONADI_BUILD_QSQLITE:BOOL=ON
CMAKE_ARGS+= -DDATABASE_BACKEND=SQLITE
CMAKE_ARGS+= -DSQLITE_INCLUDE_DIR=${BUILDLINK_PREFIX.sqlite3}/include
diff --git a/avr-libc/options.mk b/avr-libc/options.mk
index c678df56c0..5fbf5358d2 100644
--- a/avr-libc/options.mk
+++ b/avr-libc/options.mk
@@ -50,10 +50,10 @@ post-install:
## delete following or similar files, which includes PATH at build time.
##_usr_pkgsrc_cross_avr-libc_work_avr-libc-1.8.0_libc_string_.3
${RM} ${DESTDIR}${PREFIX}/share/doc/avr-libc/man/man3/*${PKGVERSION_NOREV}*
-.for f in Makefile demo.c demo.bin demo.hex demo.pdf demo.srec
+. for f in Makefile demo.c demo.bin demo.hex demo.pdf demo.srec
${INSTALL_DATA} ${WRKSRC}/doc/examples/demo/${f} \
${DESTDIR}${PREFIX}/share/doc/avr-libc/examples/demo
-.endfor
+. endfor
PLIST.doc= yes
diff --git a/avrdude/options.mk b/avrdude/options.mk
index a3dbefe85f..ab4a330d02 100644
--- a/avrdude/options.mk
+++ b/avrdude/options.mk
@@ -17,9 +17,9 @@ TEXINFO_REQD= 4.9
USE_TOOLS+= makeinfo texi2html yacc lex
# DragonFly has stripped makeinfo in the base - without texi2dvi.
-.if ${OPSYS} == "DragonFly"
+. if ${OPSYS} == "DragonFly"
BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
-.endif
+. endif
PLIST.doc= yes
.else
diff --git a/firefox-hg/options.mk b/firefox-hg/options.mk
index 2c7d6615f0..a31a084719 100644
--- a/firefox-hg/options.mk
+++ b/firefox-hg/options.mk
@@ -40,12 +40,12 @@ CONFIGURE_ARGS+= --disable-jemalloc
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mgcc)
-.if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
+. if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
# Modern gcc does not run any "tracking" passes when compiling with -O0,
# which makes the generated debug info mostly useless. So explicitly
# request them.
O0TRACKING=-fvar-tracking-assignments -fvar-tracking
-.endif
+. endif
.endif
.if !empty(PKG_OPTIONS:Mdebug)
@@ -55,12 +55,12 @@ CONFIGURE_ARGS+= --enable-debug-js-modules
CONFIGURE_ARGS+= --disable-install-strip
PLIST.debug= yes
.else
-.if !empty(PKG_OPTIONS:Mdebug-info)
+. if !empty(PKG_OPTIONS:Mdebug-info)
CONFIGURE_ARGS+= --enable-debug-symbols
CONFIGURE_ARGS+= --enable-optimize=-O0
-.else
+. else
CONFIGURE_ARGS+= --disable-debug-symbols
-.endif
+. endif
CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= --enable-optimize=-O2
CONFIGURE_ARGS+= --enable-install-strip
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index c7ee25ca99..61e4f316d9 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -35,9 +35,9 @@ CONFIGURE_ARGS+= --disable-cairo
.endif
.if !empty(PKG_OPTIONS:Mopengl)
-.if ${OPSYS} != "Darwin"
-. include "../../graphics/Mesa/buildlink3.mk"
-.endif
+. if ${OPSYS} != "Darwin"
+. include "../../graphics/Mesa/buildlink3.mk"
+. endif
CONFIGURE_ARGS+= --enable-gl
PLIST.opengl= yes
.else
diff --git a/frida-glib2/Makefile b/frida-glib2/Makefile
index 858774a4ac..cc6b316b79 100644
--- a/frida-glib2/Makefile
+++ b/frida-glib2/Makefile
@@ -50,7 +50,7 @@ CPPFLAGS.SunOS+= -DBSD_COMP
CONFIGURE_ENV+= LIBELF_LIBS='-lelf'
. endif
. else
-. include "../../devel/libelf/buildlink3.mk"
+. include "../../devel/libelf/buildlink3.mk"
. endif
.endif
diff --git a/gambas3/Makefile.common b/gambas3/Makefile.common
index 3271b10f4a..6efabffaeb 100644
--- a/gambas3/Makefile.common
+++ b/gambas3/Makefile.common
@@ -120,8 +120,8 @@ CONFIGURE_DIRS!= for d in ${BUILD_DIRS}; do echo $$d | cut -d/ -f1; done
.if "${BUILD_DIRS}" != "main/gbc"
BUILD_DEPENDS+= gambas3-devel-${GB_VERSION}:../../wip/gambas3-devel
BUILD_DEPENDS+= xdg-utils-1.*:../../misc/xdg-utils
-.export XDG_DATA_HOME ${DESTDIR}${PREFIX}/share
-.export XDG_UTILS_INSTALL_MODE user
+. export XDG_DATA_HOME ${DESTDIR}${PREFIX}/share
+. export XDG_UTILS_INSTALL_MODE user
. for comp in ${GB_DEPENDS}
DEPENDS+= ${comp}-${GB_VERSION}:../../wip/${comp}
diff --git a/gerris/options.mk b/gerris/options.mk
index b304b5d660..c77bf28689 100644
--- a/gerris/options.mk
+++ b/gerris/options.mk
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS= gts-check
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgts-check)
-. include "../../graphics/gts/buildlink3.mk"
+. include "../../graphics/gts/buildlink3.mk"
CONFIGURE_ARGS+= --enable-gts-check
.endif
diff --git a/heimdal/Makefile b/heimdal/Makefile
index 5fd30e95f3..a155429912 100644
--- a/heimdal/Makefile
+++ b/heimdal/Makefile
@@ -117,9 +117,9 @@ PLIST.hcrypto= yes
.endif
.if ${OPSYS} == "MirBSD"
-.if !empty(USE_BUILTIN.openssl:Myes)
+. if !empty(USE_BUILTIN.openssl:Myes)
PLIST.hcrypto= yes
-.endif
+. endif
PLIST.vis= yes
# all of the tools need to link against pthread, force it.
PTHREAD_AUTO_VARS= yes
diff --git a/libdrm-dfbsd-meson/Makefile b/libdrm-dfbsd-meson/Makefile
index 33d36663ba..41c41b38af 100644
--- a/libdrm-dfbsd-meson/Makefile
+++ b/libdrm-dfbsd-meson/Makefile
@@ -80,10 +80,10 @@ ATOMIC_OPS_CHECK= 0
ATOMIC_OPS_CHECK= 1
.else
# Intel driver no longer needs libatomic_ops
-.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != x86_64
-. include "../../devel/libatomic_ops/buildlink3.mk"
+. if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != x86_64
+. include "../../devel/libatomic_ops/buildlink3.mk"
CONFIGURE_ENV+= drm_cv_atomic_primitives=libatomic-ops
-.endif
+. endif
.endif
CONFIGURE_ARGS+= PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
diff --git a/libdrm-dfbsd/Makefile b/libdrm-dfbsd/Makefile
index 143cc861bf..6de4b68eae 100644
--- a/libdrm-dfbsd/Makefile
+++ b/libdrm-dfbsd/Makefile
@@ -31,10 +31,10 @@ ATOMIC_OPS_CHECK= 0
ATOMIC_OPS_CHECK= 1
.else
# Intel driver no longer needs libatomic_ops
-.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != x86_64
-. include "../../devel/libatomic_ops/buildlink3.mk"
+. if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != x86_64
+. include "../../devel/libatomic_ops/buildlink3.mk"
CONFIGURE_ENV+= drm_cv_atomic_primitives=libatomic-ops
-.endif
+. endif
.endif
CONFIGURE_ARGS+= PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
diff --git a/libvirt490/options.mk b/libvirt490/options.mk
index 6ffbd7cba6..588789cb93 100644
--- a/libvirt490/options.mk
+++ b/libvirt490/options.mk
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-xenapi=${BUILDLINK_PREFIX.xentools42}
.if !empty(PKG_OPTIONS:Mlibssh2)
CONFIGURE_ARGS+= --with-ssh2=${BUILDLINK_PREFIX.libssh2}
-. include "../../security/libssh2/buildlink3.mk"
+. include "../../security/libssh2/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mlvm)
@@ -33,15 +33,15 @@ CONFIGURE_ARGS+= --with-storage-lvm
.if !empty(PKG_OPTIONS:Mhal)
PLIST.hal= yes
CONFIGURE_ARGS+= --with-hal=${BUILDLINK_PREFIX.hal}
-. include "../../sysutils/hal/buildlink3.mk"
+. include "../../sysutils/hal/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mdbus)
CONFIGURE_ARGS+= --with-dbus=${BUILDLINK_PREFIX.dbus}
-. include "../../sysutils/dbus/buildlink3.mk"
+. include "../../sysutils/dbus/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mavahi)
CONFIGURE_ARGS+= --with-avahi=${BUILDLINK_PREFIX.avahi}
-. include "../../net/avahi/buildlink3.mk"
+. include "../../net/avahi/buildlink3.mk"
.endif
diff --git a/modular-xorg-server-dfbsd/options.mk b/modular-xorg-server-dfbsd/options.mk
index 97b5c2a971..3b814121ab 100644
--- a/modular-xorg-server-dfbsd/options.mk
+++ b/modular-xorg-server-dfbsd/options.mk
@@ -26,9 +26,9 @@ PKG_SUPPORTED_OPTIONS+= dri
PKG_SUGGESTED_OPTIONS+= dri
PKG_SUPPORTED_OPTIONS+= dri3
# dri3 requires kernel support for dma_buf
-.if ${OPSYS} == "Linux"
+. if ${OPSYS} == "Linux"
PKG_SUGGESTED_OPTIONS+= dri3
-.endif
+. endif
.endif
.include "../../mk/bsd.options.mk"
@@ -38,12 +38,12 @@ PLIST_VARS+= dri3
.if !empty(PKG_OPTIONS:Mdri)
-.if !empty(PKG_OPTIONS:Mdri3)
+. if !empty(PKG_OPTIONS:Mdri3)
CONFIGURE_ARGS+= --enable-dri3
PLIST.dri3= yes
-.else
+. else
CONFIGURE_ARGS+= --disable-dri3
-.endif
+. endif
.include "../../graphics/libepoxy/buildlink3.mk"
BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11
diff --git a/pike8.0/builtin_module.mk b/pike8.0/builtin_module.mk
index 3a15c0cb6e..07a730f874 100644
--- a/pike8.0/builtin_module.mk
+++ b/pike8.0/builtin_module.mk
@@ -21,7 +21,7 @@ MAKE_MODREF?= no
CHECK_MODULE_ENABLED?= yes
.if (${MODULE_TYPE} != "post_module" && ${MODULE_TYPE} != "module")
-.error MODULE_TYPE must be module or post_module
+. error MODULE_TYPE must be module or post_module
.endif
NAME= pike${PIKEVERSUFFIX}-${MODULENAME}
PKGNAME= ${NAME}-${PIKE_VERSION}
diff --git a/tftp-hpa/hacks.mk b/tftp-hpa/hacks.mk
index 885971bdab..c803b565ed 100644
--- a/tftp-hpa/hacks.mk
+++ b/tftp-hpa/hacks.mk
@@ -6,10 +6,10 @@ TFTP-HPA_HACKS_MK= # defined
### [Mon Jan 1 17:13:15 CET 2007 : schwarz]
### configure script fails to detect presence of u_short and u_long on IRIX 5
###
-. if ${OPSYS} == "IRIX"
+.if ${OPSYS} == "IRIX"
PKG_HACKS+= have-u_short-u_long
CONFIGURE_ENV+= ac_cv_type_u_short=yes
CONFIGURE_ENV+= ac_cv_type_u_long=yes
-. endif
+.endif
.endif
diff --git a/vlc-git/options.mk b/vlc-git/options.mk
index 2ca4550953..2d825fcff8 100644
--- a/vlc-git/options.mk
+++ b/vlc-git/options.mk
@@ -123,9 +123,9 @@ DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf
CONFIGURE_ARGS+= --enable-qt \
--with-x
PLIST.x11= yes
-.if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h)
+. if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h)
PLIST.egl= yes
-.endif
+. endif
.else
CONFIGURE_ARGS+= --without-x \
--disable-xcb \
diff --git a/vlc2/options.mk b/vlc2/options.mk
index 10a2015b3b..067686130c 100644
--- a/vlc2/options.mk
+++ b/vlc2/options.mk
@@ -122,9 +122,9 @@ DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf
CONFIGURE_ARGS+= --enable-qt \
--with-x
PLIST.x11= yes
-.if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h)
+. if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h)
PLIST.egl= yes
-.endif
+. endif
.else
CONFIGURE_ARGS+= --without-x \
--disable-xcb \
diff --git a/wla-dx-git/Makefile b/wla-dx-git/Makefile
index 324305ff21..11ace3a613 100644
--- a/wla-dx-git/Makefile
+++ b/wla-dx-git/Makefile
@@ -25,20 +25,20 @@ WLADX_BINARIES= wla-6502 wla-6510 wla-65816 wla-65c02 wla-gb wla-huc6280 \
wla-spc700 wla-z80 wlab wlalink
do-install:
-. for f in ${WLADX_BINARIES}
+.for f in ${WLADX_BINARIES}
${INSTALL_PROGRAM} ${WRKSRC}/binaries/${f} ${DESTDIR}${PREFIX}/bin
-. endfor
+.endfor
-. for f in binaries/doc/{wla-dx.txt,wla-dx.html} FILE_FORMATS CHANGELOG
+.for f in binaries/doc/{wla-dx.txt,wla-dx.html} FILE_FORMATS CHANGELOG
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-. endfor
+.endfor
-. for f in binaries/doc/*.1
+.for f in binaries/doc/*.1
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-. endfor
-. for f in binaries/doc/*.7
+.endfor
+.for f in binaries/doc/*.7
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7
-. endfor
+.endfor
.include "../../wip/mk/git-package.mk"
diff --git a/wla-dx/Makefile b/wla-dx/Makefile
index c1fdb9d3ff..79c0c2bfc6 100644
--- a/wla-dx/Makefile
+++ b/wla-dx/Makefile
@@ -24,19 +24,19 @@ WLADX_BINARIES= wla-6502 wla-6510 wla-65816 wla-65c02 wla-gb wla-huc6280 \
wla-spc700 wla-z80 wlab wlalink
do-install:
-. for f in ${WLADX_BINARIES}
+.for f in ${WLADX_BINARIES}
${INSTALL_PROGRAM} ${WRKSRC}/binaries/${f} ${DESTDIR}${PREFIX}/bin
-. endfor
-. if !empty(PKG_OPTIONS:Mdoc)
-. for f in binaries/doc/wla-dx.txt binaries/doc/wla-dx.html FILE_FORMATS CHANGELOG
+.endfor
+.if !empty(PKG_OPTIONS:Mdoc)
+. for f in binaries/doc/wla-dx.txt binaries/doc/wla-dx.html FILE_FORMATS CHANGELOG
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-. endfor
-. for f in binaries/doc/*.1
+. endfor
+. for f in binaries/doc/*.1
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-. endfor
-. for f in binaries/doc/*.7
+. endfor
+. for f in binaries/doc/*.7
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7
-. endfor
-. endif
+. endfor
+.endif
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index