 @@ -1,14 +1,14 @@
-# $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
 CATEGORIES=	chat
 MASTER_SITES=	http://cgiirc.org/releases/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cgiirc.org/
 COMMENT=	Access IRC from a web browser
 LICENSE=	gnu-gpl-v2
 USE_TOOLS+=	perl:run
 NO_BUILD=	YES
 @@ -44,38 +44,38 @@ do-configure:
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${CGIIRC}
 	${INSTALL_DATA_DIR} ${DESTDIR}${CGIIRC}/formats
 	${INSTALL_DATA_DIR} ${DESTDIR}${CGIIRC}/images
 	${INSTALL_DATA_DIR} ${DESTDIR}${CGIIRC}/images/taras
 	${INSTALL_DATA_DIR} ${DESTDIR}${CGIIRC}/interfaces
 	${INSTALL_DATA_DIR} ${DESTDIR}${CGIIRC}/interfaces/interface-make
 	${INSTALL_DATA_DIR} ${DESTDIR}${CGIIRC}/modules
 	${INSTALL_DATA_DIR} ${DESTDIR}${CGIIRC}/modules/IRC
 	${INSTALL_DATA_DIR} ${DESTDIR}${CGIIRC}/modules/IRC/Channel
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cgiirc
-.	for f in ${DOCFILES}
+.for f in ${DOCFILES}
-		${INSTALL_DATA} ${WRKSRC}/docs/${f} \
+	${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}
+.for f in ${EGFILES}
-		${INSTALL_DATA} ${WRKSRC}/${f} \
+	${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/
 	${INSTALL_DATA} ${WRKSRC}/images/*.wav ${DESTDIR}${CGIIRC}/images/
 	${INSTALL_DATA} ${WRKSRC}/images/*.ico ${DESTDIR}${CGIIRC}/images/
 	${INSTALL_DATA} ${WRKSRC}/images/taras/*.gif \
 		${DESTDIR}${CGIIRC}/images/taras
 	${INSTALL_DATA} ${WRKSRC}/interfaces/*.pm ${DESTDIR}${CGIIRC}/interfaces/
 	${INSTALL_DATA} ${WRKSRC}/interfaces/*.css ${DESTDIR}${CGIIRC}/interfaces/
 	${INSTALL_DATA} ${WRKSRC}/interfaces/interface-make/*.pm \
 		${DESTDIR}${CGIIRC}/interfaces/interface-make/
 	${INSTALL_SCRIPT} ${WRKSRC}/interfaces/interface-make/*.pl \
 		${DESTDIR}${CGIIRC}/interfaces/interface-make/

 @@ -1,25 +1,25 @@
-# $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
 PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	http://www.energymech.net/files/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.energymech.net/
 COMMENT=	IRC bot written in C
 HAS_CONFIGURE=			YES
 # The ./configure script is interactive, but selects the default values
 # when given no input.
 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
 	${INSTALL_DATA} ${WRKSRC}/sample.conf ${DESTDIR}${PREFIX}/share/examples/emech/
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $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
 COMMENT=	Multi-protocol Instant Messaging client console frontend
 .include		"../../chat/libpurple/Makefile.common"
 USE_TOOLS+=	intltool msgfmt perl
 CONFIGURE_ARGS+=	--enable-consoleui
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ENV+=		ac_cv_path_pythonpath=
 @@ -27,24 +27,24 @@ USE_NCURSES=		yes # force ncurses, for l
 BUILD_DIRS=		finch
 .include "options.mk"
 pre-build:
 	# XXX Find a cleaner way.
 	${MKDIR} ${WRKSRC}/libpurple/.libs
 	${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
 	  ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple
 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/gstreamer1/buildlink3.mk"
-.  include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libpurple+=	libpurple-${PIDGIN_VERSION}{,nb*}
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/ncursesw/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,31 +1,31 @@
-# $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
 CATEGORIES=		chat
 MASTER_SITES=		https://camaya.net/download/
 EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://camaya.net/gloox/
 COMMENT=		Jabber/XMPP client library
 LICENSE=		gnu-gpl-v3
 GNU_CONFIGURE=		yes
 USE_LANGUAGES+=		c++ c
 USE_TOOLS+=		autoconf automake pkg-config
 USE_LIBTOOL=		yes
 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"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $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
 PKG_SUPPORTED_OPTIONS+=	lua openssl perl python
 PKG_SUGGESTED_OPTIONS+=	gtk2 libproxy openssl
 PLIST_VARS+=		dbus gtk2 libpci lua perl python fishlim
 .include "../../mk/bsd.options.mk"
 .if !empty(PKG_OPTIONS:Mdbus)
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 @@ -35,31 +35,31 @@ MESON_ARGS+=		-Dwith-libcanberra=true
 .else
 MESON_ARGS+=		-Dwith-libcanberra=false
 .endif
 .if !empty(PKG_OPTIONS:Mlibnotify)
 .include "../../sysutils/libnotify/buildlink3.mk"
 MESON_ARGS+=		-Dwith-libnotify=true
 .else
 MESON_ARGS+=		-Dwith-libnotify=false
 .endif
 .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
 MESON_ARGS+=		-Dwith-sysinfo=false
 .endif
 .if !empty(PKG_OPTIONS:Mlibproxy)
 .include "../../www/libproxy/buildlink3.mk"
 MESON_ARGS+=		-Dwith-libproxy=true
 .else
 MESON_ARGS+=		-Dwith-libproxy=false
 .endif

 @@ -1,35 +1,35 @@
-# $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
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.draga.com/~jwise/i2cb/
 COMMENT=	Next generation Internet Citicen's Band chat client
 WRKSRC=		${WRKDIR}/icb
 CFLAGS.SunOS+=	-DBSD_COMP
 LIBS.SunOS+=	-lsocket
 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
 	${INSTALL_SCRIPT} ${WRKSRC}/icbserverdb \
 		${DESTDIR}${PREFIX}/libdata/i2cbserverdb
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/libdata/i2cb
 	${INSTALL_SCRIPT} ${WRKSRC}/sample.icbrc \
 		${DESTDIR}${PREFIX}/libdata/i2cb/sample.i2cbrc
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/contrib/bartender \
 		${WRKSRC}/contrib/confuse \
 		${WRKSRC}/contrib/echofile \
 		${DESTDIR}${PREFIX}/libdata/i2cb

 @@ -1,30 +1,30 @@
-# $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}
 PKGREVISION=		1
 CATEGORIES=		chat
 MASTER_SITES=		http://ircii.warped.com/
 EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.eterna.com.au/ircii/
 COMMENT=		'Internet Relay Chat' and 'Internet Citizens Band' Client
 LICENSE=		modified-bsd
 CONFLICTS=		blackened-[0-9]*
-VERS=			20190117
+VERS=		20190117
 PLIST_SUBST+=	VERS=${VERS:Q}
 .include "../../mk/bsd.prefs.mk"
 # By default, mandir defaults to @datarootdir@/man, and then it gets
 # ${DESTDIR} applied already.  However, if you pass --mandir it does
 # not provide it, and you have to supply it directly as well.  To do
 # this in pkgsrc, we have to set CONFIGURE_HAS_MANDIR=no so that
 # we don't pass --mandir=${PREFIX}/man as well, last.
 CONFIGURE_HAS_MANDIR=	no
 CONFIGURE_ARGS+=	--mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 WRKSRC=			${WRKDIR}/ircii-${VERS}

 @@ -1,17 +1,17 @@
-# $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_OPTIONS_VAR=		PKG_OPTIONS.ircII
-PKG_SUPPORTED_OPTIONS=	# only socks group
+PKG_SUPPORTED_OPTIONS=		# only socks group
 PKG_OPTIONS_OPTIONAL_GROUPS=	socks
 PKG_OPTIONS_GROUP.socks=	socks4 dante
 .include "../../mk/bsd.options.mk"
 # Include SOCKS firewall support
 .if !empty(PKG_OPTIONS:Msocks4)
 .include "../../net/socks4/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-socks4=${BUILDLINK_PREFIX.socks4}
 .endif
 .if !empty(PKG_OPTIONS:Mdante)
 .include "../../net/dante/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-socks4=${BUILDLINK_PREFIX.dante}

 @@ -1,38 +1,38 @@
-# $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}
 PKGREVISION=	4
 CATEGORIES=	chat
 MASTER_SITES=	http://his.luky.org/ftp/mirrors/irchat-pj/
 #MASTER_SITES+=	http://gouketsu.net/irchat-pj/src/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 #HOMEPAGE=	http://gouketsu.net/irchat-pj/
 COMMENT=	Emacs lisp interface to Internet Relay Chat
 INSTALLATION_DIRS=	bin ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/irchat-pj
 .include "../../editors/emacs/modules.mk"
 .if ${EMACS_FLAVOR} == "emacs"
-INSTALL_TARGET=	install
+INSTALL_TARGET=		install
 .elif ${EMACS_FLAVOR} == "xemacs"
-BUILD_TARGET=	package
+BUILD_TARGET=		package
-INSTALL_TARGET=	install-package
+INSTALL_TARGET=		install-package
 .else
-PKG_FAIL_REASON+= "Unknown Emacs flavor"
+PKG_FAIL_REASON+=	"Unknown Emacs flavor"
 .endif
 LIBS.SunOS+=	-lnsl -lsocket
 MAKE_ENV+=	LIBS=${LIBS:M*:Q}
 do-install:
 	cd ${WRKSRC}; \
 	${INSTALL_PROGRAM} dcc/dcc ${DESTDIR}${PREFIX}/bin; \
 	for f in irchat*.el*; do \
 		${INSTALL_DATA} $$f ${DESTDIR}${EMACS_LISPPREFIX}/irchat-pj; \
 	done
 .include "../../mk/bsd.pkg.mk"

 @@ -1,38 +1,38 @@
-# $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
 PKGREVISION=	5
 CATEGORIES=	chat
 MASTER_SITES=	https://github.com/downloads/jperkin/irssi-icb/
 DISTFILES=	${DISTNAME}.tar.gz ${IRSSI_DISTFILE}
 MAINTAINER=	jperkin@joyent.com
 HOMEPAGE=	http://www.irssi.org/
 COMMENT=	Irssi plugin to access ICB networks
 LICENSE=	gnu-gpl-v2
 .include "../../mk/bsd.prefs.mk"
 .include "../../chat/irssi/Makefile.common"
 WRKSRC=		${WRKDIR}/${IRSSI_DISTNAME}/${DISTNAME}
 DEPENDS+=	irssi>=${IRSSI_VERSION}:../../chat/irssi
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=		pkg-config
 SHLIBTOOL_OVERRIDE=	# empty
 CONFIGURE_ARGS+=	--with-irssi=${WRKDIR}/${IRSSI_DISTNAME}
 CONFIGURE_ARGS+=	--with-glib-prefix=${BUILDLINK_PREFIX.glib2}
 CONFIGURE_ARGS+=	--disable-glibtest
 INSTALLATION_DIRS+=	share/doc/irssi
 post-extract:
 	cd ${WRKDIR} && ${LN} -s ${IRSSI_DISTNAME:S/a//} ${IRSSI_DISTNAME}
 	${MV} ${WRKDIR}/${DISTNAME} ${WRKDIR}/${IRSSI_DISTNAME}
 	${CP} ${IRSSI_CONFIG_H} ${WRKDIR}/${IRSSI_DISTNAME}/config.h
 	${CP} ${IRSSI_CONFIG} ${WRKDIR}/${IRSSI_DISTNAME}/irssi-config

 @@ -1,14 +1,14 @@
-# $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
 # Authentication backend
 PKG_OPTIONS_GROUP.auth=		auth-mysql auth-pgsql auth-sqlite
 PKG_OPTIONS_GROUP.auth+=	auth-db auth-ldap auth-pam
 # Storage backend
 PKG_OPTIONS_GROUP.storage=	storage-mysql storage-pgsql
 PKG_OPTIONS_GROUP.storage+=	storage-sqlite storage-db
 # mio implementations
 PKG_OPTIONS_GROUP.mio=		mio-kqueue mio-select mio-poll mio-epoll
 # debugging
 PKG_SUPPORTED_OPTIONS+=		websocket
 @@ -70,27 +70,27 @@ CONFIGURE_ARGS+=	--disable-ldap
 PLIST.pam=		yes
 CONFIGURE_ARGS+=	--enable-pam
 .  include "../../mk/pam.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-pam
 .endif
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
 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)
 CONFIGURE_ARGS+=	--enable-mio=kqueue
 .endif
 .if !empty(PKG_OPTIONS:Mmio-epoll)
 CONFIGURE_ARGS+=	--enable-mio=epoll
 .endif
 .if !empty(PKG_OPTIONS:Mmio-poll)
 CONFIGURE_ARGS+=	--enable-mio=poll
 .endif

 @@ -1,28 +1,28 @@
-# $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
 PKGREVISION=	20
 CATEGORIES=	chat kde
 MASTER_SITES=	${MASTER_SITE_KDE:=konversation/1.5.1/src/}
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 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++
 REPLACE_BASH+=		data/scripts/*
 REPLACE_PERL+=		data/updaters/konversation-*.pl
 REPLACE_PERL+=		data/scripts/*
 REPLACE_PYTHON+=	data/scripts/*
 REPLACE_PYTHON+=	data/scripting_support/python/konversation/dbus.py
 USE_TOOLS+=		bash:run
 .include "../../mk/bsd.prefs.mk"

 @@ -1,31 +1,31 @@
-# $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}
 PKGREVISION=	5
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/folks/0.4/}
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://wiki.gnome.org/action/show/Projects/Folks
 COMMENT=	Library to manage contacts
 LICENSE=	gnu-lgpl-v2
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		yes
-USE_TOOLS+=	pkg-config intltool gmake msgfmt
+USE_TOOLS+=		pkg-config intltool gmake msgfmt
-USE_PKGLOCALEDIR= yes
+USE_PKGLOCALEDIR=	yes
 PKGCONFIG_OVERRIDE+=	backends/telepathy/lib/folks-telepathy.pc.in
 PKGCONFIG_OVERRIDE+=	folks/folks.pc.in
 TEST_TARGET=	check
 CPPFLAGS.SunOS+=	-std=c99 -D_XOPEN_SOURCE=600
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../devel/libgee0.6/buildlink3.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"

 @@ -1,22 +1,22 @@
-# $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
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libmsn/}
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://sourceforge.net/projects/libmsn
 COMMENT=	Library for connecting to Microsoft's MSN Messenger service
 LICENSE=	gnu-gpl-v2
 USE_CMAKE=	yes
-USE_LANGUAGES= c c++
+USE_LANGUAGES=	c c++
 PKGCONFIG_OVERRIDE+=	libmsn.pc.cmake
 LDFLAGS.SunOS+=	-lsocket -lnsl
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,31 +1,31 @@
-# $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}
 PKGNAME=	libotr-${VERSION}
 CATEGORIES=	chat security
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 MAINTAINER=	nathanw@NetBSD.org
 # also gdt@NetBSD.org
 HOMEPAGE=	http://www.cypherpunks.ca/otr/
 COMMENT=	Library for Off-The-Record encrypted messaging
 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
 # There's an apparent bug in gcc 4.1.3 on i386 (as shipped in
 # netbsd-5).  With -O2 and the stack protector (SSP) feature, the
 # function otrl_auth_handle_revealsig is badly miscompiled.
 #Not apparently relevant, but makes -S output easier to follow.
 #CFLAGS+=		-ggdb
 #A way to avoid the bug.
 #CFLAGS+=		-O1

 @@ -1,27 +1,27 @@
-# $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/}
 PKGREVISION=	8
 CATEGORIES=	chat
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 EXTRACT_USING=	bsdtar
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/42wim/matterircd
 COMMENT=	Minimal IRC server which integrates with Mattermost and Slack
 LICENSE=	mit
-GO_DIST_BASE=	${PKGNAME_NOREV}
+GO_DIST_BASE=		${PKGNAME_NOREV}
-GO_SRCPATH=	github.com/42wim/matterircd
+GO_SRCPATH=		github.com/42wim/matterircd
 GO_BUILD_PATTERN=	${GO_SRCPATH}
 pre-configure:
 	${RM} -rf ${WRKSRC}/vendor/github.com/mattermost/platform/vendor/github.com/alecthomas/log4go/examples
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/matterircd ${DESTDIR}${PREFIX}/bin
 .include "../../devel/go-golang-lru/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,34 +1,34 @@
-# $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
 CATEGORIES=	chat
 MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	degroote@NetBSD.org
 HOMEPAGE=	http://www.lilotux.net/~mikael/mcabber/
 COMMENT=	Jabber console client
 LICENSE=	gnu-gpl-v2
 CHECK_PORTABILITY_SKIP+=	contrib/events/eventcmd.pastebin
 GNU_CONFIGURE=	yes
 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:
 	${INSTALL_DATA} ${WRKSRC}/mcabberrc.example \
 			${DESTDIR}${PREFIX}/share/examples/mcabber
 .include "options.mk"
 .include "../../chat/loudmouth/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/ncursesw/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,27 +1,27 @@
-# $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
 PKGREVISION=	5
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=meanwhile/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://meanwhile.sourceforge.net/
 COMMENT=	Lotus SameTime compatible chat protocol
 LICENSE=	gnu-gpl-v2
 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
 PKGCONFIG_OVERRIDE+=	meanwhile.pc.in
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,39 +1,39 @@
-# $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
 .include		"../../chat/libpurple/Makefile.common"
 USE_TOOLS+=		msgfmt intltool
 CONFIGURE_ARGS+=	--enable-gtkui
 BUILD_DIRS=		pidgin
 INSTALLATION_DIRS=	share/applications
 # includes "Arguments to configure" as string
 CHECK_WRKREF_SKIP=	bin/pidgin
 .include "options.mk"
 pre-build:
 #	XXX Find a cleaner way.
 	${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
 	  ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
 INSTALL_DIRS=		pidgin doc
 # was an option, but is not as of 2.10.12
-.  include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
-.  include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.  include "../../chat/farstream/buildlink3.mk"
+.include "../../chat/farstream/buildlink3.mk"
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,32 +1,32 @@
-# $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-/-/}
 PKGREVISION=	17
 CATEGORIES=	chat
 MASTER_SITES=	http://pidgin-facebookchat.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/dequis/purple-facebook
 COMMENT=	Plugin for pidgin to support Facebook IM
 LICENSE=	gnu-gpl-v3 # or later
 DEPENDS+=	pidgin>=2.7.9:../../chat/pidgin
 WRKSRC=		${WRKDIR}/${PKGBASE}
-SUBST_CLASSES+=	paths
+SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Fixing absolute paths.
 SUBST_FILES.paths=	Makefile
 SUBST_SED.paths=	-e 's+-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include+-I${BUILDLINK_PREFIX.glib2}/include/glib/glib-2.0/glib -I${BUILDLINK_PREFIX.glib2}/include/glib/glib-2.0 -I${BUILDLINK_PREFIX.glib2}/lib/glib-2.0/include+g'
 SUBST_SED.paths+=	-e 's+-I/usr/include/libpurple+-I${BUILDLINK_PREFIX.libpurple}/include/libpurple+g'
 SUBST_SED.paths+=	-e 's+-I/usr/include/json-glib-1.0+-I${BUILDLINK_PREFIX.json-glib}/include/json-glib-1.0+g'
 SUBST_SED.paths+=	-e 's+/usr/share/+${DESTDIR}${PREFIX}/share/+g'
 SUBST_SED.paths+=	-e 's+/usr/lib/+${DESTDIR}${PREFIX}/lib/+g'
 INSTALLATION_DIRS+=	lib/purple-2
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

 @@ -1,14 +1,14 @@
-# $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
 DISTNAME=	pidgin-latex-${VERSION}
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	chat print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin-latex/}
 WRKSRC=		${WRKDIR}/pidgin-latex
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://sourceforge.net/projects/pidgin-latex/
 COMMENT=	Plugin for pidgin to render LaTeX as images
 @@ -18,20 +18,20 @@ DEPENDS+=	tex-amsmath-[0-9]*:../../print
 DEPENDS+=	tex-graphics-[0-9]*:../../print/tex-graphics
 DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 USE_TOOLS+=	gmake
 USE_TOOLS+=	pkg-config
 INSTALLATION_DIRS=	lib/pidgin share/doc/pidgin-latex
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/LaTeX.so ${DESTDIR}${PREFIX}/lib/pidgin/LaTeX.so
 	${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"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,36 +1,36 @@
-# $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}
 # This is present to cope with release candidates where the names do
 # not match (e.g., DISTNAME has rc3, unpack directory doesn't).
 # PKGNAME= pidgin-otr-${VERSION}
 PKGREVISION=	12
 CATEGORIES=	chat security
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://www.cypherpunks.ca/otr/
 COMMENT=	Plugin for pidgin to add OTR (Off-The-Record) encryption
 LICENSE=	gnu-gpl-v2
 # Work around rc tarballs that unpack to bare version.
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		yes
-USE_TOOLS+=	intltool msgfmt perl pkg-config
+USE_TOOLS+=		intltool msgfmt perl pkg-config
 INSTALLATION_DIRS+=	share/doc/pidgin-otr
 BUILDLINK_ABI_DEPENDS.libgcrypt+=	libgcrypt>=1.4.3
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/pidgin-otr/
 .include "../../chat/pidgin/buildlink3.mk"
 .include "../../chat/libotr/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

 @@ -1,14 +1,14 @@
-# $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
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psi/}
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://psi-im.org/
 COMMENT=	Psi XMPP/Jabber Client
 LICENSE=	gnu-gpl-v2
 DEPENDS+=	qca2-qt5-ossl>=2.0.0beta3:../../security/qca2-qt5-ossl
 @@ -26,29 +26,29 @@ CONFIG_SHELL=	${SH}
 CONFIGURE_ARGS+=	--qtselect=5
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--qtdir=${QTDIR}
 CONFIGURE_ARGS+=	--with-zlib-inc=${BUILDLINK_PREFIX.zlib}/include
 CONFIGURE_ARGS+=	--with-zlib-lib=${BUILDLINK_PREFIX.zlib}/lib
 CONFIGURE_ARGS+=	--with-qca-lib=${BUILDLINK_PREFIX.qca2-qt5}/lib
 CONFIGURE_ARGS+=	--with-qca-inc=${BUILDLINK_PREFIX.qca2-qt5}/include
+#
 # a group of scripts that aren't to be installed, and aren't used
 # 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 \
+CHECK_PORTABILITY_SKIP=	admin/build/devconfig.sh \
-			    admin/build/build_package.sh \
+			admin/build/build_package.sh \
-			    admin/build/prep_dist.sh
+			admin/build/prep_dist.sh
 INSTALLATION_DIRS=	bin share/psi share/doc/psi
 INSTALL_DIRS=		src
 INSTALL_TARGET=		install_target install_sharedfiles
 INSTALL_MAKE_FLAGS=	INSTALL_ROOT=${DESTDIR}
 .include "options.mk"
+#
 #   LANG_FILES are the translations we're going to install
+#
 # LANG_FILES= psi_be.qm psi_cs.qm psi_de.qm psi_eo.qm psi_es.qm \

 @@ -1,40 +1,40 @@
-# $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 \
+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
+				sl sv uk ur-pk vi zh-cn zh-tw
 .for l in ${PSI_SUPPORTED_LANGUAGES}
-PKG_SUPPORTED_OPTIONS+= lang-${l}
+PKG_SUPPORTED_OPTIONS+=	lang-${l}
-PLIST_VARS+=${l}
+PLIST_VARS+=		${l}
 .endfor
 .include "../../mk/bsd.options.mk"
 # handle the languages first
 #   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
+PLIST.${lang} =		yes
-. if ${lang:M??-??}
+.  if ${lang:M??-??}
-    LANG_FILES+= psi_${lang:C/-.*//g}_${lang:C/.*-//g:tu}.qm
+    LANG_FILES+=	psi_${lang:C/-.*//g}_${lang:C/.*-//g:tu}.qm
-. else
+.  else
-    LANG_FILES+= psi_${lang}.qm
+    LANG_FILES+=	psi_${lang}.qm
-. endif
+.  endif
 .endfor
 # enable aspell
 .if !empty(PKG_OPTIONS:Maspell)
 CONFIGURE_ARGS+=	--with-aspell-inc=${BUILDLINK_PREFIX.aspell}/include
 CONFIGURE_ARGS+=	--with-aspell-lib=${BUILDLINK_PREFIX.aspell}/lib
 .include "../../textproc/aspell/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-aspell
 .endif
 # enable enchant
 .if !empty(PKG_OPTIONS:Menchant)

 @@ -1,14 +1,14 @@
-# $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
 PKGNAME=	psybnc-2.4b2
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psybnc/}
 MAINTAINER=	pettai@NetBSD.org
 HOMEPAGE=	http://www.psybnc.at/
 COMMENT=	Easy-to-use, multi-user, IRC-Bouncer with many features
 LICENSE=	gnu-gpl-v2
 WRKSRC=		${WRKDIR}/psybnc
 @@ -20,27 +20,27 @@ PSYBNC_GROUP?=		psybnc
 PKG_GROUPS=		${PSYBNC_USER}
 PKG_USERS=		${PSYBNC_USER}:${PSYBNC_GROUP}
 PKG_GROUPS_VARS+=	PSYBNC_GROUP
 PKG_USERS_VARS+=	PSYBNC_USER
 CONF_FILES=	share/examples/psybnc/psybnc.conf \
 		${PKG_SYSCONFDIR}/psybnc.conf
 SUBST_CLASSES+=		prefix
 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"
 SUBST_STAGE.openssl=	post-configure
 INSTALLATION_DIRS=	bin share/examples/psybnc
 INSTALLATION_DIRS+=	share/doc/psybnc
 post-extract:
 	cd ${WRKSRC} && ${RM} src/c-ares/configure
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \

 @@ -1,32 +1,32 @@
-# $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
 PKGREVISION=	10
 CATEGORIES=	chat
 #MASTER_SITES=	http://quirc.org/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=	http://quirc.org/
 COMMENT=	Stable and powerful graphical IRC client
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake automake autoconf autoreconf wish
 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
 SUBST_FILES.T86=	configure configure.in
 SUBST_MESSAGE.T86=	Changing tcl/tk 8.3 search into tcl/tk 8.6 search
 SUBST_SED.T86=		-e 's,8_3,8_6,g'
 SUBST_SED.T86+=		-e 's,8.3,8.6,g'
 SUBST_SED.T86+=		-e 's,83,86,g'
 INSTALLATION_DIRS=	bin
 INSTALLATION_DIRS+=	share/doc/quirc
 INSTALLATION_DIRS+=	share/quirc
 INSTALLATION_DIRS+=	share/quirc/common

 @@ -1,30 +1,30 @@
-# $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}
 PKGREVISION=	6
 CATEGORIES=	chat
 MASTER_SITES=	http://www.scrollz.info/download/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.scrollz.info/
 COMMENT=	Advanced IRC client based on ircII client
 LICENSE=	modified-bsd # XXX ?
 MAKE_JOBS_SAFE=	no
 GNU_CONFIGURE=	yes
 SUBST_CLASSES+=		mandir
 SUBST_FILES.mandir=	Makefile.in
 SUBST_MESSAGE.mandir=	Fixing PKGMANDIR path.
 SUBST_SED.mandir=	-e 's|@prefix@/share/man/man1|@mandir@/man1|1'
 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"

 @@ -1,14 +1,14 @@
-# $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
 CATEGORIES=		chat security
 MASTER_SITES=		http://www.silcnet.org/download/client/sources/
 MASTER_SITES+=		ftp://ftp.silcnet.org/silc/client/sources/
 EXTRACT_SUFX=		${SILC_CLIENT_EXTRACT_SUFX}
 MAINTAINER=		salo@NetBSD.org
 HOMEPAGE=		http://www.silcnet.org/
 COMMENT=		Client for the Secure Internet Live Conferencing (SILC) protocol
 .include "../../mk/bsd.prefs.mk"
 @@ -17,36 +17,36 @@ COMMENT=		Client for the Secure Internet
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 OVERRIDE_DIRDEPTH=	3
 SHLIBTOOL_OVERRIDE=	# empty
 PKG_SYSCONFSUBDIR?=	${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 MAKE_ENV+=		examplesdir=${EGDIR}
 CONF_FILES+=		${EGDIR}/silc.conf.default ${PKG_SYSCONFDIR}/silc.conf
-GNU_CONFIGURE_LIBSUBDIR=${PKGBASE}
+GNU_CONFIGURE_LIBSUBDIR=	${PKGBASE}
-CONFIGURE_ARGS+=	--with-helpdir=${PREFIX}/share/${PKGBASE}/help
+CONFIGURE_ARGS+=		--with-helpdir=${PREFIX}/share/${PKGBASE}/help
-CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/${PKGBASE}
+CONFIGURE_ARGS+=		--with-docdir=${PREFIX}/share/doc/${PKGBASE}
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=		--with-etcdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-simdir=${PREFIX}/lib/${PKGBASE}/modules
+CONFIGURE_ARGS+=		--with-simdir=${PREFIX}/lib/${PKGBASE}/modules
-CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=		--with-iconv=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=		--enable-shared
-CONFIGURE_ARGS+=	--with-terminfo
+CONFIGURE_ARGS+=		--with-terminfo
-CONFIGURE_ARGS+=	--without-ncurses
+CONFIGURE_ARGS+=		--without-ncurses
-CONFIGURE_ARGS+=	--without-libtoolfix
+CONFIGURE_ARGS+=		--without-libtoolfix
 # Assembler optimizations.
+#
 .if (${MACHINE_ARCH} != "i386")
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 .include "options.mk"
 PLIST_SRC+=		${PKGDIR}/PLIST
 INSTALLATION_DIRS+=	lib/${PKGBASE} libexec/${PKGBASE}/scripts
 post-install:

 @@ -1,58 +1,58 @@
-# $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
 CATEGORIES=	chat
 MASTER_SITES=	http://www.iagora.com/~espel/sirc/
 DISTFILES=	${DEFAULT_DISTFILES} \
 		${SIRC_SCRIPTS}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=	https://www.iagora.com/~espel/sirc/sirc.html
 COMMENT=	IRC client written and programmable in perl
 DEPENDS+=	p5-Socket6>=0.07:../../net/p5-Socket6
 USE_LANGUAGES=	c
 # supports IPv6 (actually, AF-independent)
 BUILD_DEFS+=	IPV6_READY
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 USE_TOOLS+=	perl:run
-SIRC_SCRIPTS= \
+SIRC_SCRIPTS=	\
 		adcc.pl				\
 		akickban.pl			\
 		avoice.pl			\
 		country.pl			\
 		finger.pl			\
 		ftp.pl				\
 		howl.pl				\
 		hotmail.pl			\
 		lastlog.pl			\
 		nocolor.pl			\
 		patattack.pl			\
 		prefix.pl			\
 		quiet.pl			\
 		quit.pl				\
 		ssfe.diff			\
 		thx.pl				\
 		winnuke.pl			\
 		www.pl				\
 		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
 DIST_SUBDIR=	sirc
 REPLACE_PERL+=	dsirc
 .include "../../mk/bsd.prefs.mk"
 .if defined(DEFAULT_IRC_SERVER)
 IRC_SERVER=	${DEFAULT_IRC_SERVER}
 .else
 IRC_SERVER=	us.undernet.org
 .endif

 @@ -1,36 +1,36 @@
-# $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
 CATEGORIES=		chat
 MASTER_SITES=		https://cloud.github.com/downloads/hanzz/libtransport/
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://spectrum.im/
 COMMENT=		XMPP transport/gateway based on libpurple
 LICENSE=		gnu-gpl-v3
 DEPENDS+=		${PYPKGPREFIX}-xmpppy>=0.4.1:../../chat/py-xmpppy
 DEPENDS+=		${PYPKGPREFIX}-expat>=0nb4:../../textproc/py-expat
 DEPENDS+=		${PYPKGPREFIX}-readline>=0nb2:../../devel/py-readline
 USE_TOOLS+=		pkg-config msgfmt xgettext
 USE_CMAKE=		yes
 USE_LANGUAGES=		c++ c
-REPLACE_PYTHON+=	spectrumctl/spectrumctl.py
+REPLACE_PYTHON+=		spectrumctl/spectrumctl.py
-PY_PATCHPLIST=		yes
+PY_PATCHPLIST=			yes
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-xmpppy
+PYTHON_VERSIONS_ACCEPTED=	27 # py-xmpppy
 BUILD_DEFS+=		JABBER_USER JABBER_GROUP
 BUILD_DEFS+=		SPECTRUM_RUN SPECTRUM_DB SPECTRUM_LOG
 .include "../../mk/bsd.prefs.mk"
 JABBER_USER?=		jabberd
 JABBER_GROUP?=		jabberd
 FILES_SUBST+=		JABBER_USER=${JABBER_USER}
 FILES_SUBST+=		JABBER_GROUP=${JABBER_GROUP}
 PKG_GROUPS+=		${JABBER_GROUP}

 @@ -1,34 +1,34 @@
-# $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
 PKG_OPTIONS_OPTIONAL_GROUPS=	debug
 PKG_OPTIONS_GROUP.storage=	mysql sqlite
 PKG_OPTIONS_GROUP.debug=	debug cppunit
 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
 .if !empty(PKG_OPTIONS:Mdebug)
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Debug
 .endif
 .if !empty(PKG_OPTIONS:Mcppunit)
-. include "../../devel/cppunit/buildlink3.mk"
+.  include "../../devel/cppunit/buildlink3.mk"
 .endif

 @@ -1,35 +1,35 @@
-# $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
 CATEGORIES=	chat
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-gabble/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://telepathy.freedesktop.org/wiki/Components
 COMMENT=	Jabber/XMPP connection manager for Telepathy
 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_LIBTOOL=		yes
-USE_TOOLS+=	gmake pkg-config
+USE_TOOLS+=		gmake pkg-config
-CONFIGURE_ENV+=	UUID_CFLAGS=" " UUID_LIBS=" "
+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)
 CFLAGS+=	-Wno-error=deprecated-declarations \
 		-Wno-error=tautological-constant-out-of-range-compare \
 		-Wno-error=unused-function
 .endif
 # see pkgsrc/security/mozilla-rootcerts
 CONFIGURE_ARGS+=	--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
 # pkgsrc pkg-config wrapper hide *.pc files in source tree with PKG_CONFIG.
 BUILDLINK_TARGETS+=	wocky-pkg-config-hack

 @@ -1,39 +1,39 @@
-# $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
 CATEGORIES=	chat
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-glib/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://telepathy.freedesktop.org/components/telepathy-glib/
 COMMENT=	GObject-based C binding for the Telepathy D-Bus API
 LICENSE=	gnu-gpl-v2 AND modified-bsd
 BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+= --enable-vala-bindings
+CONFIGURE_ARGS+=	--enable-vala-bindings
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		yes
-USE_TOOLS+=	gmake pkg-config
+USE_TOOLS+=		gmake pkg-config
 PKGCONFIG_OVERRIDE+=	telepathy-glib/telepathy-glib.pc.in
-PYTHON_FOR_BUILD_ONLY=	yes
+PYTHON_FOR_BUILD_ONLY=		yes
-CONFIGURE_ENV+=		ac_cv_prog_PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+=			ac_cv_prog_PYTHON=${PYTHONBIN}
-REPLACE_PYTHON+=	tests/all-errors-documented.py
+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"
 BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=1.30.0
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/vala/buildlink3.mk"
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.90
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.dbus+=		dbus>=0.95
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"

 @@ -1,20 +1,20 @@
-# $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
 CATEGORIES=	chat
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-haze/
 MAINTAINER=	jaapb@NetBSD.org
 #HOMEPAGE=	https://telepathy.freedesktop.org/doc/telepathy-haze/
 COMMENT=	Libpurple connection manager for Telepathy
 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"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,37 +1,37 @@
-# $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
 CATEGORIES=	chat
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-logger/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=	https://telepathy.freedesktop.org/wiki/Logger
 COMMENT=	Logger module for telepathy
 LICENSE=	gnu-lgpl-v2.1
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake gsed intltool msgfmt
 CFLAGS.SunOS+=	-std=c99 -D_XOPEN_SOURCE=600
 PKGCONFIG_OVERRIDE+=	extensions/tpl-extensions.pc.in
 PKGCONFIG_OVERRIDE+=	telepathy-logger/telepathy-logger-0.1.pc.in
 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"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,36 +1,36 @@
-# $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
 CATEGORIES=	chat
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-qt/
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	https://telepathy.freedesktop.org/doc/telepathy-qt/
 COMMENT=	Qt bindings for telepathy
 LICENSE=	gnu-lgpl-v2.1
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 PKGCONFIG_OVERRIDE+=	TelepathyQt/TelepathyQt.pc.in
 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
 .include "../../chat/telepathy-farstream/buildlink3.mk"
 BUILDLINK_API_DEPENDS.telepathy-glib+=	telepathy-glib>=0.18.0
 .include "../../chat/telepathy-glib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"

 @@ -1,28 +1,28 @@
-# $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
 PKGREVISION=	4
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.mayn.de/pub/really_old_stuff/unix/network/irc/tirc/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	# http://home.mayn.de/jean-luc/alt/tirc/
 COMMENT=	Token's 'Internet Relay Chat' Client
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+="--with-ansi-colours"
+CONFIGURE_ARGS+=	"--with-ansi-colours"
 LIBS.SunOS+=	-lnsl -lsocket
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 share/tirc
 INSTALL_MAKE_FLAGS+=	bindir=${DESTDIR}${PREFIX}/bin \
 			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 post-patch:
 	${SED} "s,/usr/local,${PREFIX},g" ${WRKSRC}/tirc.1		\
 		> ${WRKSRC}/tirc.1.done
 	${MV} ${WRKSRC}/tirc.1.done ${WRKSRC}/tirc.1

 @@ -1,39 +1,39 @@
-# $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
 PKG_SUPPORTED_OPTIONS=	gnutls python lua wide-curses perl ruby
 PKG_SUGGESTED_OPTIONS=	gnutls python lua wide-curses perl ruby
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.fast.prefs.mk"
 PLIST_VARS+=		lua plugin python perl ruby
 .if !empty(PKG_OPTIONS:Mgnutls)
 .include "../../security/gnutls/buildlink3.mk"
 .endif
 .if !empty(PKG_OPTIONS:Mpython)
 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
 .endif
 .if !empty(PKG_OPTIONS:Mlua)
 LUA_VERSIONS_INCOMPATIBLE=	52
 .include "../../lang/lua/buildlink3.mk"
 CMAKE_ARGS+=	-DENABLE_LUA=ON
 PLIST.lua=	yes
 .else
 CMAKE_ARGS+=	-DENABLE_LUA=OFF
 .endif

 @@ -1,24 +1,24 @@
-# $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
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	3
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.splode.com/pub/zenirc/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 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"
 .if ${EMACS_FLAVOR} == "xemacs"
 MAKE_FLAGS+=	EMACS=xemacs
 .endif
 MAKE_FLAGS+=	elispdir=${DESTDIR}${EMACS_LISPPREFIX}/zenirc
 .include "../../mk/bsd.pkg.mk"

 @@ -1,15 +1,15 @@
-# $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
 ### symbol name is '__res_query'.
 ###
 .if "${OPSYS}" == "Linux"
 PKG_HACKS+=	libresolv
 LIBS+=		-lresolv
 .endif
 .endif