CVS commit: pkgsrc/chat

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/chat
From: "Roland Illig" <rillig%netbsd.org@localhost>
Date: Sat, 2 Nov 2019 22:18:27 +0000

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Nov  2 22:18:26 UTC 2019

Modified Files:
        pkgsrc/chat/cgiirc: Makefile
        pkgsrc/chat/emech: Makefile
        pkgsrc/chat/finch: Makefile
        pkgsrc/chat/gloox: Makefile
        pkgsrc/chat/hexchat: options.mk
        pkgsrc/chat/i2cb: Makefile
        pkgsrc/chat/ircII: Makefile options.mk
        pkgsrc/chat/irchat-pj: Makefile
        pkgsrc/chat/irssi-icb: Makefile
        pkgsrc/chat/jabberd2: options.mk
        pkgsrc/chat/konversation: Makefile
        pkgsrc/chat/libfolks: Makefile
        pkgsrc/chat/libmsn: Makefile
        pkgsrc/chat/libotr: Makefile
        pkgsrc/chat/loudmouth: hacks.mk
        pkgsrc/chat/matterircd: Makefile
        pkgsrc/chat/mcabber: Makefile
        pkgsrc/chat/meanwhile: Makefile
        pkgsrc/chat/pidgin: Makefile
        pkgsrc/chat/pidgin-facebookchat: Makefile
        pkgsrc/chat/pidgin-latex: Makefile
        pkgsrc/chat/pidgin-otr: Makefile
        pkgsrc/chat/psi: Makefile options.mk
        pkgsrc/chat/psybnc: Makefile
        pkgsrc/chat/quirc: Makefile
        pkgsrc/chat/scrollz: Makefile
        pkgsrc/chat/silc-client: Makefile
        pkgsrc/chat/sirc: Makefile
        pkgsrc/chat/spectrum: Makefile options.mk
        pkgsrc/chat/telepathy-gabble: Makefile
        pkgsrc/chat/telepathy-glib: Makefile
        pkgsrc/chat/telepathy-haze: Makefile
        pkgsrc/chat/telepathy-logger: Makefile
        pkgsrc/chat/telepathy-qt: Makefile
        pkgsrc/chat/tirc: Makefile
        pkgsrc/chat/weechat: options.mk
        pkgsrc/chat/zenirc: Makefile

Log Message:
chat: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/chat/cgiirc/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/chat/emech/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/chat/finch/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/chat/gloox/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/chat/hexchat/options.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/chat/i2cb/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/chat/ircII/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/ircII/options.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/chat/irchat-pj/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/chat/irssi-icb/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/chat/jabberd2/options.mk
cvs rdiff -u -r1.97 -r1.98 pkgsrc/chat/konversation/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/chat/libfolks/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/chat/libmsn/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/chat/libotr/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/loudmouth/hacks.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/chat/matterircd/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/chat/mcabber/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/chat/meanwhile/Makefile
cvs rdiff -u -r1.80 -r1.81 pkgsrc/chat/pidgin/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/chat/pidgin-facebookchat/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/chat/pidgin-latex/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/chat/pidgin-otr/Makefile
cvs rdiff -u -r1.92 -r1.93 pkgsrc/chat/psi/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/chat/psi/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/psybnc/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/chat/quirc/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/chat/scrollz/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/chat/silc-client/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/chat/sirc/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/chat/spectrum/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/spectrum/options.mk
cvs rdiff -u -r1.69 -r1.70 pkgsrc/chat/telepathy-gabble/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/chat/telepathy-glib/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/chat/telepathy-haze/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/chat/telepathy-logger/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/chat/telepathy-qt/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/chat/tirc/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/chat/weechat/options.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/chat/zenirc/Makefile

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

Modified files:

Index: pkgsrc/chat/cgiirc/Makefile
diff -u pkgsrc/chat/cgiirc/Makefile:1.28 pkgsrc/chat/cgiirc/Makefile:1.29
--- pkgsrc/chat/cgiirc/Makefile:1.28    Sun Aug 11 13:18:02 2019
+++ pkgsrc/chat/cgiirc/Makefile Sat Nov  2 22:18:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/08/11 13:18:02 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/02 22:18:22 rillig Exp $
 
 DISTNAME=      cgiirc-0.5.12
 PKGREVISION=   1
@@ -54,18 +54,18 @@ do-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${CGIIRC}/modules/IRC/Channel
 
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cgiirc
-.      for f in ${DOCFILES}
-               ${INSTALL_DATA} ${WRKSRC}/docs/${f} \
+.for f in ${DOCFILES}
+       ${INSTALL_DATA} ${WRKSRC}/docs/${f} \
                        ${DESTDIR}${PREFIX}/share/examples/cgiirc/${f}
-.      endfor
+.endfor
        ${INSTALL_DATA} ${WRKSRC}/cgiirc.config \
                ${DESTDIR}${PREFIX}/share/examples/cgiirc
        ${INSTALL_DATA} ${WRKDIR}/cgiirc.conf \
                ${DESTDIR}${PREFIX}/share/examples/cgiirc
-.      for f in ${EGFILES}
-               ${INSTALL_DATA} ${WRKSRC}/${f} \
+.for f in ${EGFILES}
+       ${INSTALL_DATA} ${WRKSRC}/${f} \
                        ${DESTDIR}${PREFIX}/share/examples/cgiirc/${f}
-.      endfor
+.endfor
        ${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${DESTDIR}${CGIIRC}
        ${INSTALL_DATA} ${WRKSRC}/formats/* ${DESTDIR}${CGIIRC}/formats/
        ${INSTALL_DATA} ${WRKSRC}/images/*.gif ${DESTDIR}${CGIIRC}/images/

Index: pkgsrc/chat/emech/Makefile
diff -u pkgsrc/chat/emech/Makefile:1.10 pkgsrc/chat/emech/Makefile:1.11
--- pkgsrc/chat/emech/Makefile:1.10     Mon Feb 23 18:18:42 2015
+++ pkgsrc/chat/emech/Makefile  Sat Nov  2 22:18:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/02/23 18:18:42 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/02 22:18:22 rillig Exp $
 #
 
 DISTNAME=      emech-3.0.2
@@ -16,7 +16,7 @@ HAS_CONFIGURE=                        YES
 CONFIGURE_ARGS+=               < /dev/null
 BUILD_TARGET=                  mech
 
-INSTALLATION_DIRS+= bin share/examples/emech
+INSTALLATION_DIRS+=    bin share/examples/emech
 
 post-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/energymech ${DESTDIR}${PREFIX}/bin/mech

Index: pkgsrc/chat/finch/Makefile
diff -u pkgsrc/chat/finch/Makefile:1.70 pkgsrc/chat/finch/Makefile:1.71
--- pkgsrc/chat/finch/Makefile:1.70     Sun Aug 11 13:18:02 2019
+++ pkgsrc/chat/finch/Makefile  Sat Nov  2 22:18:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2019/08/11 13:18:02 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2019/11/02 22:18:22 rillig Exp $
 
 PKGNAME=       finch-${PIDGIN_VERSION}
 PKGREVISION=   3
@@ -37,8 +37,8 @@ pre-build:
 INSTALL_DIRS=          finch doc
 
 # this was an option, but doesn't seem to be one as of 2.10.12
-.  include "../../multimedia/gstreamer1/buildlink3.mk"
-.  include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 
 BUILDLINK_API_DEPENDS.libpurple+=      libpurple-${PIDGIN_VERSION}{,nb*}
 .include "../../chat/libpurple/buildlink3.mk"

Index: pkgsrc/chat/gloox/Makefile
diff -u pkgsrc/chat/gloox/Makefile:1.20 pkgsrc/chat/gloox/Makefile:1.21
--- pkgsrc/chat/gloox/Makefile:1.20     Sat Jul 20 22:46:11 2019
+++ pkgsrc/chat/gloox/Makefile  Sat Nov  2 22:18:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/07/20 22:46:11 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/02 22:18:22 rillig Exp $
 
 DISTNAME=              gloox-1.0.17
 PKGREVISION=           3
@@ -22,7 +22,7 @@ LIBS.SunOS+=          -lnsl
 # -pedantic in gcc 4.5.3 (NetBSD 6) is less pedantic than
 # in gcc 4.1.3 (NetBSD 5.*) aka, -pedantic causes build
 # failures when including gnutls on older versions of gcc.
-BUILDLINK_TRANSFORM+=   rm:-pedantic
+BUILDLINK_TRANSFORM+=  rm:-pedantic
 
 .include "options.mk"
 

Index: pkgsrc/chat/hexchat/options.mk
diff -u pkgsrc/chat/hexchat/options.mk:1.7 pkgsrc/chat/hexchat/options.mk:1.8
--- pkgsrc/chat/hexchat/options.mk:1.7  Tue Jul  9 10:32:51 2019
+++ pkgsrc/chat/hexchat/options.mk      Sat Nov  2 22:18:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2019/07/09 10:32:51 nia Exp $
+# $NetBSD: options.mk,v 1.8 2019/11/02 22:18:22 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.hexchat
 PKG_SUPPORTED_OPTIONS= dbus gtk2 libcanberra libnotify libpci libproxy
@@ -45,11 +45,11 @@ MESON_ARGS+=                -Dwith-libnotify=false
 
 .if !empty(PKG_OPTIONS:Mlibpci)
 .include "../../sysutils/pciutils/buildlink3.mk"
-.if ${OPSYS} == "NetBSD"
+.  if ${OPSYS} == "NetBSD"
 LIBS+=                 -lpciutils
-.else
+.  else
 LIBS+=                 -lpci
-.endif
+.  endif
 PLIST.libpci=          yes
 MESON_ARGS+=           -Dwith-sysinfo=true
 .else

Index: pkgsrc/chat/i2cb/Makefile
diff -u pkgsrc/chat/i2cb/Makefile:1.28 pkgsrc/chat/i2cb/Makefile:1.29
--- pkgsrc/chat/i2cb/Makefile:1.28      Sun Feb 11 15:43:18 2018
+++ pkgsrc/chat/i2cb/Makefile   Sat Nov  2 22:18:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2018/02/11 15:43:18 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/02 22:18:22 rillig Exp $
 
 DISTNAME=      i2cb-6.0_ALPHA
 PKGREVISION=   7
@@ -19,7 +19,7 @@ MAKE_ENV+=    LIBS=${LIBS:Q}
 INSTALLATION_DIRS=     bin libdata
 
 post-extract:
-               ${RM} -f ${WRKSRC}/src/.depend
+       ${RM} -f ${WRKSRC}/src/.depend
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/src/icb ${DESTDIR}${PREFIX}/bin/i2cb

Index: pkgsrc/chat/ircII/Makefile
diff -u pkgsrc/chat/ircII/Makefile:1.83 pkgsrc/chat/ircII/Makefile:1.84
--- pkgsrc/chat/ircII/Makefile:1.83     Fri Apr 26 00:13:34 2019
+++ pkgsrc/chat/ircII/Makefile  Sat Nov  2 22:18:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2019/04/26 00:13:34 mrg Exp $
+# $NetBSD: Makefile,v 1.84 2019/11/02 22:18:22 rillig Exp $
 
 DISTNAME=              ircii-${VERS}
 PKGNAME=               ircII-${VERS}
@@ -14,7 +14,7 @@ LICENSE=              modified-bsd
 
 CONFLICTS=             blackened-[0-9]*
 
-VERS=                  20190117
+VERS=          20190117
 PLIST_SUBST+=  VERS=${VERS:Q}
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/chat/ircII/options.mk
diff -u pkgsrc/chat/ircII/options.mk:1.2 pkgsrc/chat/ircII/options.mk:1.3
--- pkgsrc/chat/ircII/options.mk:1.2    Wed Sep 30 08:25:37 2015
+++ pkgsrc/chat/ircII/options.mk        Sat Nov  2 22:18:22 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2015/09/30 08:25:37 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/02 22:18:22 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.ircII
-PKG_SUPPORTED_OPTIONS= # only socks group
+PKG_OPTIONS_VAR=               PKG_OPTIONS.ircII
+PKG_SUPPORTED_OPTIONS=         # only socks group
 PKG_OPTIONS_OPTIONAL_GROUPS=   socks
 PKG_OPTIONS_GROUP.socks=       socks4 dante
 

Index: pkgsrc/chat/irchat-pj/Makefile
diff -u pkgsrc/chat/irchat-pj/Makefile:1.21 pkgsrc/chat/irchat-pj/Makefile:1.22
--- pkgsrc/chat/irchat-pj/Makefile:1.21 Wed Aug 16 20:45:32 2017
+++ pkgsrc/chat/irchat-pj/Makefile      Sat Nov  2 22:18:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/08/16 20:45:32 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/02 22:18:23 rillig Exp $
 
 DISTNAME=      irchat-pj-2.4.24.22
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -17,12 +17,12 @@ INSTALLATION_DIRS=  bin ${EMACS_LISPPREFI
 .include "../../editors/emacs/modules.mk"
 
 .if ${EMACS_FLAVOR} == "emacs"
-INSTALL_TARGET=        install
+INSTALL_TARGET=                install
 .elif ${EMACS_FLAVOR} == "xemacs"
-BUILD_TARGET=  package
-INSTALL_TARGET=        install-package
+BUILD_TARGET=          package
+INSTALL_TARGET=                install-package
 .else
-PKG_FAIL_REASON+= "Unknown Emacs flavor"
+PKG_FAIL_REASON+=      "Unknown Emacs flavor"
 .endif
 
 LIBS.SunOS+=   -lnsl -lsocket

Index: pkgsrc/chat/irssi-icb/Makefile
diff -u pkgsrc/chat/irssi-icb/Makefile:1.43 pkgsrc/chat/irssi-icb/Makefile:1.44
--- pkgsrc/chat/irssi-icb/Makefile:1.43 Sat Aug 31 10:04:26 2019
+++ pkgsrc/chat/irssi-icb/Makefile      Sat Nov  2 22:18:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/08/31 10:04:26 nia Exp $
+# $NetBSD: Makefile,v 1.44 2019/11/02 22:18:23 rillig Exp $
 #
 
 DISTNAME=      irssi-icb-0.15
@@ -21,8 +21,8 @@ DEPENDS+=     irssi>=${IRSSI_VERSION}:../../
 
 GNU_CONFIGURE= yes
 
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config
 SHLIBTOOL_OVERRIDE=    # empty
 
 CONFIGURE_ARGS+=       --with-irssi=${WRKDIR}/${IRSSI_DISTNAME}

Index: pkgsrc/chat/jabberd2/options.mk
diff -u pkgsrc/chat/jabberd2/options.mk:1.29 pkgsrc/chat/jabberd2/options.mk:1.30
--- pkgsrc/chat/jabberd2/options.mk:1.29        Sun May 29 17:24:48 2016
+++ pkgsrc/chat/jabberd2/options.mk     Sat Nov  2 22:18:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.29 2016/05/29 17:24:48 schnoebe Exp $
+# $NetBSD: options.mk,v 1.30 2019/11/02 22:18:23 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.jabberd2
 PKG_OPTIONS_REQUIRED_GROUPS=   auth storage mio
@@ -80,7 +80,7 @@ CONFIGURE_ARGS+=      --enable-developer
 # CONFIGURE_ARGS+=     --enable-nad-debug
 # CONFIGURE_ARGS+=     --enable-pool-debug
 # CONFIGURE_ARGS+=     --enable-mio-debug
-.   include "../../devel/cppunit/buildlink3.mk"
+.  include "../../devel/cppunit/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mmio-kqueue)

Index: pkgsrc/chat/konversation/Makefile
diff -u pkgsrc/chat/konversation/Makefile:1.97 pkgsrc/chat/konversation/Makefile:1.98
--- pkgsrc/chat/konversation/Makefile:1.97      Thu Aug 22 12:22:52 2019
+++ pkgsrc/chat/konversation/Makefile   Sat Nov  2 22:18:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2019/08/22 12:22:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.98 2019/11/02 22:18:23 rillig Exp $
 #
 
 DISTNAME=      konversation-1.5.1
@@ -12,7 +12,7 @@ HOMEPAGE=     https://konversation.kde.org/
 COMMENT=       KDE IRC Client
 LICENSE=       gnu-gpl-v2
 
-BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
+BUILD_DEPENDS+=        automoc4>=0.9.87:../../devel/automoc4
 
 USE_TOOLS+=    perl msgfmt
 USE_LANGUAGES= c c++

Index: pkgsrc/chat/libfolks/Makefile
diff -u pkgsrc/chat/libfolks/Makefile:1.12 pkgsrc/chat/libfolks/Makefile:1.13
--- pkgsrc/chat/libfolks/Makefile:1.12  Tue Sep 19 08:32:08 2017
+++ pkgsrc/chat/libfolks/Makefile       Sat Nov  2 22:18:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/09/19 08:32:08 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 22:18:23 rillig Exp $
 
 DISTNAME=      folks-0.4.2
 PKGNAME=       lib${DISTNAME}
@@ -12,10 +12,10 @@ HOMEPAGE=   https://wiki.gnome.org/action/
 COMMENT=       Library to manage contacts
 LICENSE=       gnu-lgpl-v2
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config intltool gmake msgfmt
-USE_PKGLOCALEDIR= yes
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config intltool gmake msgfmt
+USE_PKGLOCALEDIR=      yes
 
 PKGCONFIG_OVERRIDE+=   backends/telepathy/lib/folks-telepathy.pc.in
 PKGCONFIG_OVERRIDE+=   folks/folks.pc.in

Index: pkgsrc/chat/libmsn/Makefile
diff -u pkgsrc/chat/libmsn/Makefile:1.10 pkgsrc/chat/libmsn/Makefile:1.11
--- pkgsrc/chat/libmsn/Makefile:1.10    Sat Jun 22 11:52:31 2019
+++ pkgsrc/chat/libmsn/Makefile Sat Nov  2 22:18:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/06/22 11:52:31 nia Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/02 22:18:23 rillig Exp $
 
 DISTNAME=      libmsn-4.2.1
 PKGREVISION=   3
@@ -12,7 +12,7 @@ COMMENT=      Library for connecting to Micro
 LICENSE=       gnu-gpl-v2
 
 USE_CMAKE=     yes
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++
 
 PKGCONFIG_OVERRIDE+=   libmsn.pc.cmake
 

Index: pkgsrc/chat/libotr/Makefile
diff -u pkgsrc/chat/libotr/Makefile:1.18 pkgsrc/chat/libotr/Makefile:1.19
--- pkgsrc/chat/libotr/Makefile:1.18    Wed Mar  9 18:04:17 2016
+++ pkgsrc/chat/libotr/Makefile Sat Nov  2 22:18:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/03/09 18:04:17 gdt Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/02 22:18:23 rillig Exp $
 
 VERSION=       4.1.1
 DISTNAME=      libotr-${VERSION}
@@ -15,7 +15,7 @@ LICENSE=      gnu-gpl-v2
 # Work around rc tarballs that unpack to bare version.
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-pic
 
 USE_LIBTOOL=   yes

Index: pkgsrc/chat/loudmouth/hacks.mk
diff -u pkgsrc/chat/loudmouth/hacks.mk:1.2 pkgsrc/chat/loudmouth/hacks.mk:1.3
--- pkgsrc/chat/loudmouth/hacks.mk:1.2  Sun May  6 17:41:30 2012
+++ pkgsrc/chat/loudmouth/hacks.mk      Sat Nov  2 22:18:23 2019
@@ -1,7 +1,7 @@
-# $NetBSD: hacks.mk,v 1.2 2012/05/06 17:41:30 dholland Exp $
+# $NetBSD: hacks.mk,v 1.3 2019/11/02 22:18:23 rillig Exp $
 
 .if !defined(HACKS_MK)
-HACKS_MK= defined
+HACKS_MK=      defined
 
 ### [Tue Feb 21 19:10:18 NZDT 2012: sbd]
 ### 'AC_CHECK_LIB(resolv,res_query)' fails on Linux because the function's

Index: pkgsrc/chat/matterircd/Makefile
diff -u pkgsrc/chat/matterircd/Makefile:1.18 pkgsrc/chat/matterircd/Makefile:1.19
--- pkgsrc/chat/matterircd/Makefile:1.18        Fri Oct 18 14:58:43 2019
+++ pkgsrc/chat/matterircd/Makefile     Sat Nov  2 22:18:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/10/18 14:58:43 bsiegert Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/02 22:18:24 rillig Exp $
 
 DISTNAME=      matterircd-0.18.4
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=42wim/}
@@ -12,8 +12,8 @@ HOMEPAGE=     https://github.com/42wim/matte
 COMMENT=       Minimal IRC server which integrates with Mattermost and Slack
 LICENSE=       mit
 
-GO_DIST_BASE=  ${PKGNAME_NOREV}
-GO_SRCPATH=    github.com/42wim/matterircd
+GO_DIST_BASE=          ${PKGNAME_NOREV}
+GO_SRCPATH=            github.com/42wim/matterircd
 GO_BUILD_PATTERN=      ${GO_SRCPATH}
 
 pre-configure:

Index: pkgsrc/chat/mcabber/Makefile
diff -u pkgsrc/chat/mcabber/Makefile:1.11 pkgsrc/chat/mcabber/Makefile:1.12
--- pkgsrc/chat/mcabber/Makefile:1.11   Sun Nov 18 12:06:23 2018
+++ pkgsrc/chat/mcabber/Makefile        Sat Nov  2 22:18:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/11/18 12:06:23 bsiegert Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/02 22:18:24 rillig Exp $
 
 DISTNAME=      mcabber-1.1.0
 PKGREVISION=   1
@@ -18,7 +18,7 @@ USE_LIBTOOL=  yes
 USE_TOOLS+=    gmake xgettext pkg-config
 USE_NCURSES=   yes
 
-INSTALLATION_DIRS+=    share/examples/mcabber
+INSTALLATION_DIRS+=    share/examples/mcabber
 CONFIGURE_ARGS+=       --disable-hgcset
 
 post-install:

Index: pkgsrc/chat/meanwhile/Makefile
diff -u pkgsrc/chat/meanwhile/Makefile:1.11 pkgsrc/chat/meanwhile/Makefile:1.12
--- pkgsrc/chat/meanwhile/Makefile:1.11 Wed Oct  3 00:02:40 2012
+++ pkgsrc/chat/meanwhile/Makefile      Sat Nov  2 22:18:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/03 00:02:40 asau Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/02 22:18:24 rillig Exp $
 #
 
 DISTNAME=      meanwhile-1.0.2
@@ -16,7 +16,7 @@ GNU_CONFIGURE=        yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config
 
-CONFIGURE_ARGS+= --disable-doxygen
+CONFIGURE_ARGS+=       --disable-doxygen
 
 CHECK_WRKREF_SKIP+=    share/doc/meanwhile-doc-1.0.2/samples/build
 

Index: pkgsrc/chat/pidgin/Makefile
diff -u pkgsrc/chat/pidgin/Makefile:1.80 pkgsrc/chat/pidgin/Makefile:1.81
--- pkgsrc/chat/pidgin/Makefile:1.80    Sun Aug 11 13:18:05 2019
+++ pkgsrc/chat/pidgin/Makefile Sat Nov  2 22:18:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2019/08/11 13:18:05 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2019/11/02 22:18:24 rillig Exp $
 
 COMMENT=               Multi-protocol Instant Messaging client GTK frontend
 PKGREVISION=           7
@@ -25,9 +25,9 @@ pre-build:
 INSTALL_DIRS=          pidgin doc
 
 # was an option, but is not as of 2.10.12
-.  include "../../multimedia/gstreamer1/buildlink3.mk"
-.  include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.  include "../../chat/farstream/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+.include "../../chat/farstream/buildlink3.mk"
 
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/chat/pidgin-facebookchat/Makefile
diff -u pkgsrc/chat/pidgin-facebookchat/Makefile:1.36 pkgsrc/chat/pidgin-facebookchat/Makefile:1.37
--- pkgsrc/chat/pidgin-facebookchat/Makefile:1.36       Sun May  5 22:49:46 2019
+++ pkgsrc/chat/pidgin-facebookchat/Makefile    Sat Nov  2 22:18:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/05/05 22:49:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/02 22:18:24 rillig Exp $
 
 DISTNAME=      pidgin-facebookchat-source-1.69
 PKGNAME=       ${DISTNAME:S/-source-/-/}
@@ -16,7 +16,7 @@ DEPENDS+=     pidgin>=2.7.9:../../chat/pidgi
 
 WRKSRC=                ${WRKDIR}/${PKGBASE}
 
-SUBST_CLASSES+=        paths
+SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_MESSAGE.paths=   Fixing absolute paths.
 SUBST_FILES.paths=     Makefile

Index: pkgsrc/chat/pidgin-latex/Makefile
diff -u pkgsrc/chat/pidgin-latex/Makefile:1.51 pkgsrc/chat/pidgin-latex/Makefile:1.52
--- pkgsrc/chat/pidgin-latex/Makefile:1.51      Sun Jul 21 22:24:32 2019
+++ pkgsrc/chat/pidgin-latex/Makefile   Sat Nov  2 22:18:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/07/21 22:24:32 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/02 22:18:24 rillig Exp $
 
 VERSION=       1.2.1
 PKGREVISION=   43
@@ -28,7 +28,7 @@ do-install:
 
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/pidgin-latex/
 
-DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
+DEPENDS+=      ImageMagick-[0-9]*:../../graphics/ImageMagick
 
 .include "../../chat/pidgin/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/chat/pidgin-otr/Makefile
diff -u pkgsrc/chat/pidgin-otr/Makefile:1.63 pkgsrc/chat/pidgin-otr/Makefile:1.64
--- pkgsrc/chat/pidgin-otr/Makefile:1.63        Sun Aug 11 13:18:05 2019
+++ pkgsrc/chat/pidgin-otr/Makefile     Sat Nov  2 22:18:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2019/08/11 13:18:05 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2019/11/02 22:18:24 rillig Exp $
 
 VERSION=       4.0.2
 DISTNAME=      pidgin-otr-${VERSION}
@@ -18,9 +18,9 @@ LICENSE=      gnu-gpl-v2
 # Work around rc tarballs that unpack to bare version.
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    intltool msgfmt perl pkg-config
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            intltool msgfmt perl pkg-config
 INSTALLATION_DIRS+=    share/doc/pidgin-otr
 
 BUILDLINK_ABI_DEPENDS.libgcrypt+=      libgcrypt>=1.4.3

Index: pkgsrc/chat/psi/Makefile
diff -u pkgsrc/chat/psi/Makefile:1.92 pkgsrc/chat/psi/Makefile:1.93
--- pkgsrc/chat/psi/Makefile:1.92       Wed Sep 18 14:17:07 2019
+++ pkgsrc/chat/psi/Makefile    Sat Nov  2 22:18:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2019/09/18 14:17:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.93 2019/11/02 22:18:24 rillig Exp $
 
 DISTNAME=      psi-1.4
 PKGREVISION=   3
@@ -36,9 +36,9 @@ CONFIGURE_ARGS+=      --with-qca-inc=${BUILDL
 # by the pkgsrc system.  But they all have the non-standard
 # "==" in them. (silly linux developers thinking [ bash = sh ].
 #
-CHECK_PORTABILITY_SKIP=            admin/build/devconfig.sh \
-                           admin/build/build_package.sh \
-                           admin/build/prep_dist.sh
+CHECK_PORTABILITY_SKIP=        admin/build/devconfig.sh \
+                       admin/build/build_package.sh \
+                       admin/build/prep_dist.sh
 
 
 INSTALLATION_DIRS=     bin share/psi share/doc/psi

Index: pkgsrc/chat/psi/options.mk
diff -u pkgsrc/chat/psi/options.mk:1.4 pkgsrc/chat/psi/options.mk:1.5
--- pkgsrc/chat/psi/options.mk:1.4      Sun Mar  3 21:05:57 2019
+++ pkgsrc/chat/psi/options.mk  Sat Nov  2 22:18:24 2019
@@ -1,16 +1,16 @@
-# $NetBSD: options.mk,v 1.4 2019/03/03 21:05:57 nia Exp $
+# $NetBSD: options.mk,v 1.5 2019/11/02 22:18:24 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.psi
 PKG_SUPPORTED_OPTIONS+=        aspell enchant whiteboard xscreensaver
 PKG_SUGGESTED_OPTIONS+=        aspell enchant
 
 # from an idea stolen from ../../misc/openoffice3.
-PSI_SUPPORTED_LANGUAGES=be cs de eo es es-es fr it ja mk pl pt-br ru \
-                       sl sv uk ur-pk vi zh-cn zh-tw
+PSI_SUPPORTED_LANGUAGES=       be cs de eo es es-es fr it ja mk pl pt-br ru \
+                               sl sv uk ur-pk vi zh-cn zh-tw
 
 .for l in ${PSI_SUPPORTED_LANGUAGES}
-PKG_SUPPORTED_OPTIONS+= lang-${l}
-PLIST_VARS+=${l}
+PKG_SUPPORTED_OPTIONS+=        lang-${l}
+PLIST_VARS+=           ${l}
 .endfor
 
 .include "../../mk/bsd.options.mk"
@@ -19,12 +19,12 @@ PLIST_VARS+=${l}
 #   bit of special logic, as the dialects of languages are handled
 #   as lang_DIALECT (aka, lower underscore UPPER) in the PSI translations
 .for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
-PLIST.${lang} = yes
-. if ${lang:M??-??}
-    LANG_FILES+= psi_${lang:C/-.*//g}_${lang:C/.*-//g:tu}.qm
-. else
-    LANG_FILES+= psi_${lang}.qm
-. endif
+PLIST.${lang} =                yes
+.  if ${lang:M??-??}
+    LANG_FILES+=       psi_${lang:C/-.*//g}_${lang:C/.*-//g:tu}.qm
+.  else
+    LANG_FILES+=       psi_${lang}.qm
+.  endif
 .endfor
 
 # enable aspell

Index: pkgsrc/chat/psybnc/Makefile
diff -u pkgsrc/chat/psybnc/Makefile:1.5 pkgsrc/chat/psybnc/Makefile:1.6
--- pkgsrc/chat/psybnc/Makefile:1.5     Thu May 23 19:22:56 2019
+++ pkgsrc/chat/psybnc/Makefile Sat Nov  2 22:18:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/05/23 19:22:56 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 22:18:25 rillig Exp $
 #
 
 DISTNAME=      psyBNC-2.4BETA2
@@ -30,7 +30,7 @@ SUBST_FILES.prefix=   tools/autoconf.c
 SUBST_VARS.prefix=     PREFIX
 SUBST_STAGE.prefix=    pre-configure
 
-SUBST_CLASSES+=         openssl
+SUBST_CLASSES+=                openssl
 SUBST_FILES.openssl=   makefile.out
 SUBST_SED.openssl=     -e "s|/usr/bin/openssl|openssl|g"
 SUBST_SED.openssl=     -e "s|req -new|req -new -batch|g"

Index: pkgsrc/chat/quirc/Makefile
diff -u pkgsrc/chat/quirc/Makefile:1.32 pkgsrc/chat/quirc/Makefile:1.33
--- pkgsrc/chat/quirc/Makefile:1.32     Wed Dec  5 18:42:06 2018
+++ pkgsrc/chat/quirc/Makefile  Sat Nov  2 22:18:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2018/12/05 18:42:06 scole Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/02 22:18:25 rillig Exp $
 #
 
 DISTNAME=      quirc-0.9.84
@@ -16,7 +16,7 @@ USE_TOOLS+=   gmake automake autoconf auto
 
 CONFIGURE_ARGS+=       --with-tcl=${BUILDLINK_PREFIX.tcl}
 CONFIGURE_ARGS+=       --with-wish=${TOOLS_PATH.wish}
-MAKE_FLAGS+=   docdir=${PREFIX}/share/doc/quirc
+MAKE_FLAGS+=           docdir=${PREFIX}/share/doc/quirc
 
 SUBST_CLASSES+=                T86
 SUBST_STAGE.T86=       pre-configure

Index: pkgsrc/chat/scrollz/Makefile
diff -u pkgsrc/chat/scrollz/Makefile:1.26 pkgsrc/chat/scrollz/Makefile:1.27
--- pkgsrc/chat/scrollz/Makefile:1.26   Sat Jul 20 22:46:11 2019
+++ pkgsrc/chat/scrollz/Makefile        Sat Nov  2 22:18:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/07/20 22:46:11 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/02 22:18:25 rillig Exp $
 
 DISTNAME=      ScrollZ-2.2.3
 PKGNAME=       ${DISTNAME:tl}
@@ -24,7 +24,7 @@ SUBST_STAGE.mandir=   pre-configure
 .include "options.mk"
 
 post-install:
-               ${CHMOD} -x ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/scrollz.1
+       ${CHMOD} -x ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/scrollz.1
 
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/chat/silc-client/Makefile
diff -u pkgsrc/chat/silc-client/Makefile:1.71 pkgsrc/chat/silc-client/Makefile:1.72
--- pkgsrc/chat/silc-client/Makefile:1.71       Sun Aug 11 13:18:06 2019
+++ pkgsrc/chat/silc-client/Makefile    Sat Nov  2 22:18:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2019/08/11 13:18:06 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2019/11/02 22:18:25 rillig Exp $
 
 DISTNAME=              ${SILC_CLIENT_DISTNAME}
 PKGREVISION=           11
@@ -27,16 +27,16 @@ MAKE_ENV+=          examplesdir=${EGDIR}
 
 CONF_FILES+=           ${EGDIR}/silc.conf.default ${PKG_SYSCONFDIR}/silc.conf
 
-GNU_CONFIGURE_LIBSUBDIR=${PKGBASE}
-CONFIGURE_ARGS+=       --with-helpdir=${PREFIX}/share/${PKGBASE}/help
-CONFIGURE_ARGS+=       --with-docdir=${PREFIX}/share/doc/${PKGBASE}
-CONFIGURE_ARGS+=       --with-etcdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --with-simdir=${PREFIX}/lib/${PKGBASE}/modules
-CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=       --enable-shared
-CONFIGURE_ARGS+=       --with-terminfo
-CONFIGURE_ARGS+=       --without-ncurses
-CONFIGURE_ARGS+=       --without-libtoolfix
+GNU_CONFIGURE_LIBSUBDIR=       ${PKGBASE}
+CONFIGURE_ARGS+=               --with-helpdir=${PREFIX}/share/${PKGBASE}/help
+CONFIGURE_ARGS+=               --with-docdir=${PREFIX}/share/doc/${PKGBASE}
+CONFIGURE_ARGS+=               --with-etcdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=               --with-simdir=${PREFIX}/lib/${PKGBASE}/modules
+CONFIGURE_ARGS+=               --with-iconv=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=               --enable-shared
+CONFIGURE_ARGS+=               --with-terminfo
+CONFIGURE_ARGS+=               --without-ncurses
+CONFIGURE_ARGS+=               --without-libtoolfix
 
 # Assembler optimizations.
 #

Index: pkgsrc/chat/sirc/Makefile
diff -u pkgsrc/chat/sirc/Makefile:1.36 pkgsrc/chat/sirc/Makefile:1.37
--- pkgsrc/chat/sirc/Makefile:1.36      Sun Aug 11 13:18:06 2019
+++ pkgsrc/chat/sirc/Makefile   Sat Nov  2 22:18:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/08/11 13:18:06 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/02 22:18:25 rillig Exp $
 
 DISTNAME=      sirc-2.211
 PKGREVISION=   11
@@ -20,7 +20,7 @@ BUILD_DEFS+=  IPV6_READY
 
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 USE_TOOLS+=    perl:run
-SIRC_SCRIPTS= \
+SIRC_SCRIPTS=  \
                adcc.pl                         \
                akickban.pl                     \
                avoice.pl                       \
@@ -42,7 +42,7 @@ SIRC_SCRIPTS= \
                yiff.pl
 
 .for script in ${SIRC_SCRIPTS}
-SITES.${script:T:S/=/--/}?= ${MASTER_SITES:=scripts/}
+SITES.${script:T:S/=/--/}?=    ${MASTER_SITES:=scripts/}
 .endfor
 
 NO_BUILD=      yes

Index: pkgsrc/chat/spectrum/Makefile
diff -u pkgsrc/chat/spectrum/Makefile:1.84 pkgsrc/chat/spectrum/Makefile:1.85
--- pkgsrc/chat/spectrum/Makefile:1.84  Mon Sep  2 13:19:53 2019
+++ pkgsrc/chat/spectrum/Makefile       Sat Nov  2 22:18:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2019/09/02 13:19:53 adam Exp $
+# $NetBSD: Makefile,v 1.85 2019/11/02 22:18:25 rillig Exp $
 
 DISTNAME=              spectrum-1.4.8
 PKGREVISION=           55
@@ -18,9 +18,9 @@ USE_TOOLS+=           pkg-config msgfmt xgettext
 USE_CMAKE=             yes
 USE_LANGUAGES=         c++ c
 
-REPLACE_PYTHON+=       spectrumctl/spectrumctl.py
-PY_PATCHPLIST=         yes
-PYTHON_VERSIONS_ACCEPTED=       27 # py-xmpppy
+REPLACE_PYTHON+=               spectrumctl/spectrumctl.py
+PY_PATCHPLIST=                 yes
+PYTHON_VERSIONS_ACCEPTED=      27 # py-xmpppy
 
 BUILD_DEFS+=           JABBER_USER JABBER_GROUP
 BUILD_DEFS+=           SPECTRUM_RUN SPECTRUM_DB SPECTRUM_LOG

Index: pkgsrc/chat/spectrum/options.mk
diff -u pkgsrc/chat/spectrum/options.mk:1.2 pkgsrc/chat/spectrum/options.mk:1.3
--- pkgsrc/chat/spectrum/options.mk:1.2 Sat Jan 16 12:18:42 2016
+++ pkgsrc/chat/spectrum/options.mk     Sat Nov  2 22:18:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2016/01/16 12:18:42 ryoon Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/02 22:18:25 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.spectrum
 PKG_OPTIONS_REQUIRED_GROUPS=   storage
@@ -10,17 +10,17 @@ PKG_SUGGESTED_OPTIONS=              sqlite
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=                   sqlite mysql
+PLIST_VARS+=   sqlite mysql
 CMAKE_ARGS+=   -DPOCO_ODBC=OFF
 
 .if !empty(PKG_OPTIONS:Msqlite)
-. include "../../databases/poco-data-sqlite/buildlink3.mk"
+.  include "../../databases/poco-data-sqlite/buildlink3.mk"
 CMAKE_ARGS+=   -DPOCO_MYSQL=OFF
 PLIST.sqlite=  yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
-. include "../../databases/poco-data-mysql/buildlink3.mk"
+.  include "../../databases/poco-data-mysql/buildlink3.mk"
 CMAKE_ARGS+=   -DPOCO_SQLITE=OFF
 PLIST.mysql=   yes
 .endif
@@ -30,5 +30,5 @@ CMAKE_ARGS+=  -DCMAKE_BUILD_TYPE=Debug
 .endif
 
 .if !empty(PKG_OPTIONS:Mcppunit)
-. include "../../devel/cppunit/buildlink3.mk"
+.  include "../../devel/cppunit/buildlink3.mk"
 .endif

Index: pkgsrc/chat/telepathy-gabble/Makefile
diff -u pkgsrc/chat/telepathy-gabble/Makefile:1.69 pkgsrc/chat/telepathy-gabble/Makefile:1.70
--- pkgsrc/chat/telepathy-gabble/Makefile:1.69  Mon Sep  2 13:19:53 2019
+++ pkgsrc/chat/telepathy-gabble/Makefile       Sat Nov  2 22:18:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2019/09/02 13:19:53 adam Exp $
+# $NetBSD: Makefile,v 1.70 2019/11/02 22:18:25 rillig Exp $
 
 DISTNAME=      telepathy-gabble-0.18.3
 PKGREVISION=   16
@@ -12,14 +12,14 @@ LICENSE=    gnu-lgpl-v2.1 AND mit
 
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 OVERRIDE_DIRDEPTH=     3
-USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake pkg-config
-CONFIGURE_ENV+=        UUID_CFLAGS=" " UUID_LIBS=" "
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake pkg-config
+CONFIGURE_ENV+=                UUID_CFLAGS=" " UUID_LIBS=" "
 
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.11.10
-REPLACE_PYTHON+=       plugins/telepathy-gabble-xmpp-console
+REPLACE_PYTHON+=               plugins/telepathy-gabble-xmpp-console
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)

Index: pkgsrc/chat/telepathy-glib/Makefile
diff -u pkgsrc/chat/telepathy-glib/Makefile:1.60 pkgsrc/chat/telepathy-glib/Makefile:1.61
--- pkgsrc/chat/telepathy-glib/Makefile:1.60    Mon Sep  2 13:19:53 2019
+++ pkgsrc/chat/telepathy-glib/Makefile Sat Nov  2 22:18:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2019/09/02 13:19:53 adam Exp $
+# $NetBSD: Makefile,v 1.61 2019/11/02 22:18:25 rillig Exp $
 
 DISTNAME=      telepathy-glib-0.24.1
 PKGREVISION=   11
@@ -12,18 +12,18 @@ LICENSE=    gnu-gpl-v2 AND modified-bsd
 
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-vala-bindings
-USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake pkg-config
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --enable-vala-bindings
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=   telepathy-glib/telepathy-glib.pc.in
 
-PYTHON_FOR_BUILD_ONLY= yes
-CONFIGURE_ENV+=                ac_cv_prog_PYTHON=${PYTHONBIN}
-REPLACE_PYTHON+=       tests/all-errors-documented.py
+PYTHON_FOR_BUILD_ONLY=         yes
+CONFIGURE_ENV+=                        ac_cv_prog_PYTHON=${PYTHONBIN}
+REPLACE_PYTHON+=               tests/all-errors-documented.py
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.24.1
-TEST_TARGET=           check
+TEST_TARGET=                   check
 
 BUILDLINK_API_DEPENDS.glib2+=          glib2>=2.36
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/chat/telepathy-haze/Makefile
diff -u pkgsrc/chat/telepathy-haze/Makefile:1.10 pkgsrc/chat/telepathy-haze/Makefile:1.11
--- pkgsrc/chat/telepathy-haze/Makefile:1.10    Mon Sep  2 13:19:53 2019
+++ pkgsrc/chat/telepathy-haze/Makefile Sat Nov  2 22:18:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/09/02 13:19:53 adam Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/02 22:18:26 rillig Exp $
 
 DISTNAME=      telepathy-haze-0.8.0
 PKGREVISION=   1
@@ -12,7 +12,7 @@ LICENSE=      gnu-gpl-v2
 
 GNU_CONFIGURE= yes
 USE_TOOLS=     gmake pkg-config
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 0.8.0
+PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.8.0
 
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"

Index: pkgsrc/chat/telepathy-logger/Makefile
diff -u pkgsrc/chat/telepathy-logger/Makefile:1.51 pkgsrc/chat/telepathy-logger/Makefile:1.52
--- pkgsrc/chat/telepathy-logger/Makefile:1.51  Mon Sep  2 13:19:53 2019
+++ pkgsrc/chat/telepathy-logger/Makefile       Sat Nov  2 22:18:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/09/02 13:19:53 adam Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/02 22:18:26 rillig Exp $
 
 DISTNAME=      telepathy-logger-0.2.7
 PKGREVISION=   26
@@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE+=  telepathy-logger/te
 
 BUILD_DEPENDS= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-PYTHON_FOR_BUILD_ONLY= yes
+PYTHON_FOR_BUILD_ONLY=         yes
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.2.7
 
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/chat/telepathy-qt/Makefile
diff -u pkgsrc/chat/telepathy-qt/Makefile:1.13 pkgsrc/chat/telepathy-qt/Makefile:1.14
--- pkgsrc/chat/telepathy-qt/Makefile:1.13      Mon Sep  2 13:19:52 2019
+++ pkgsrc/chat/telepathy-qt/Makefile   Sat Nov  2 22:18:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/09/02 13:19:52 adam Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/02 22:18:26 rillig Exp $
 
 DISTNAME=      telepathy-qt-0.9.6.1
 PKGREVISION=   3
@@ -18,9 +18,9 @@ PKGCONFIG_OVERRIDE+=  TelepathyQt/Telepat
 PKGCONFIG_OVERRIDE+=   TelepathyQt/TelepathyQtService.pc.in
 PKGCONFIG_OVERRIDE+=   TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
 
-PYTHON_FOR_BUILD_ONLY= yes
+PYTHON_FOR_BUILD_ONLY=         yes
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 0.24.1
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+BUILD_DEPENDS+=                        ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--no-add-needed
 

Index: pkgsrc/chat/tirc/Makefile
diff -u pkgsrc/chat/tirc/Makefile:1.19 pkgsrc/chat/tirc/Makefile:1.20
--- pkgsrc/chat/tirc/Makefile:1.19      Wed Oct 16 07:37:10 2013
+++ pkgsrc/chat/tirc/Makefile   Sat Nov  2 22:18:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/10/16 07:37:10 roy Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 22:18:26 rillig Exp $
 #
 
 DISTNAME=      tirc-1.2
@@ -12,7 +12,7 @@ COMMENT=      Token's 'Internet Relay Chat' C
 
 GNU_CONFIGURE= YES
 
-CONFIGURE_ARGS+="--with-ansi-colours"
+CONFIGURE_ARGS+=       "--with-ansi-colours"
 
 LIBS.SunOS+=   -lnsl -lsocket
 

Index: pkgsrc/chat/weechat/options.mk
diff -u pkgsrc/chat/weechat/options.mk:1.21 pkgsrc/chat/weechat/options.mk:1.22
--- pkgsrc/chat/weechat/options.mk:1.21 Sun Sep 22 17:13:24 2019
+++ pkgsrc/chat/weechat/options.mk      Sat Nov  2 22:18:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2019/09/22 17:13:24 nia Exp $
+# $NetBSD: options.mk,v 1.22 2019/11/02 22:18:26 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.weechat
 # mk/curses will handle wide-curses
@@ -19,11 +19,11 @@ PYTHON_VERSIONS_INCOMPATIBLE=       27
 .include "../../lang/python/extension.mk"
 CMAKE_ARGS+=   -DENABLE_PYTHON=ON
 CMAKE_ARGS+=   -DPYTHON_EXECUTABLE=${PYTHONBIN}
-.if ${OPSYS} == "Darwin"
+.  if ${OPSYS} == "Darwin"
 CMAKE_ARGS+=   -DPYTHON_LIBRARIES=${PREFIX}/lib/libpython${PYVERSSUFFIX}.dylib
-.else
+.  else
 CMAKE_ARGS+=   -DPYTHON_LIBRARIES=${PREFIX}/lib/libpython${PYVERSSUFFIX}.so
-.endif
+.  endif
 PLIST.python=  yes
 .else
 CMAKE_ARGS+=   -DENABLE_PYTHON=OFF

Index: pkgsrc/chat/zenirc/Makefile
diff -u pkgsrc/chat/zenirc/Makefile:1.16 pkgsrc/chat/zenirc/Makefile:1.17
--- pkgsrc/chat/zenirc/Makefile:1.16    Sat Jan 13 23:18:27 2018
+++ pkgsrc/chat/zenirc/Makefile Sat Nov  2 22:18:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/01/13 23:18:27 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 22:18:26 rillig Exp $
 #
 
 DISTNAME=      zenirc-2.112
@@ -11,7 +11,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.splode.com/~friedman/software/emacs-lisp/zenirc/
 COMMENT=       IRC client for Emacs
 
-GNU_CONFIGURE= YES
+GNU_CONFIGURE=         YES
 CONFIGURE_HAS_MANDIR=  NO
 
 .include "../../editors/emacs/modules.mk"

Prev by Date: CVS commit: pkgsrc/biology
Next by Date: CVS commit: pkgsrc/fonts
Previous by Thread: CVS commit: pkgsrc/biology
Next by Thread: CVS commit: pkgsrc/fonts
Indexes:

Home | Main Index | Thread Index | Old Index