pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/comms comms: align variable assignments
details: https://anonhg.NetBSD.org/pkgsrc/rev/dff41f94d73b
branches: trunk
changeset: 403929:dff41f94d73b
user: rillig <rillig%pkgsrc.org@localhost>
date: Sun Nov 03 12:04:12 2019 +0000
description:
comms: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
Manually adjusted the indentation in asterisk15 and asterisk16 to avoid
too deep indentation.
diffstat:
comms/asterisk-sounds-native/Makefile | 4 ++--
comms/asterisk15/Makefile | 8 +++++---
comms/asterisk16/Makefile | 12 +++++++-----
comms/binkd/Makefile | 4 ++--
comms/conserver8/options.mk | 8 ++++----
comms/dfu-util/Makefile | 8 ++++----
comms/estic/Makefile | 4 ++--
comms/hylafax/options.mk | 4 ++--
comms/java-rxtx/Makefile | 4 ++--
comms/kermit/Makefile | 10 +++++-----
comms/malsync/Makefile | 4 ++--
comms/modemd/Makefile | 4 ++--
comms/multisync-gui/Makefile | 4 ++--
comms/p5-Asterisk/Makefile | 6 +++---
comms/scmxx/Makefile | 4 ++--
comms/xtel/Makefile | 8 ++++----
16 files changed, 50 insertions(+), 46 deletions(-)
diffs (truncated from 335 to 300 lines):
diff -r 121e68a42302 -r dff41f94d73b comms/asterisk-sounds-native/Makefile
--- a/comms/asterisk-sounds-native/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/asterisk-sounds-native/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/08/01 17:40:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 12:04:12 rillig Exp $
#
-PKGNAME= asterisk-sounds-native-20060209
+PKGNAME= asterisk-sounds-native-20060209
DISTNAME= asterisk-native-sounds-20060209-01-ulaw
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+= asterisk-native-sounds-20060209-01-alaw.tar.bz2
diff -r 121e68a42302 -r dff41f94d73b comms/asterisk15/Makefile
--- a/comms/asterisk15/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/asterisk15/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/22 12:22:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 12:04:12 rillig Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -149,8 +149,10 @@
# pjproject
PJPROJ_VERSION= 2.7.2
-SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/pjproject-${PJPROJ_VERSION}.tar.bz2
-SITES.pjproject-${PJPROJ_VERSION}.md5= -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/MD5SUM.TXT
+SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \
+ -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/pjproject-${PJPROJ_VERSION}.tar.bz2
+SITES.pjproject-${PJPROJ_VERSION}.md5= \
+ -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/MD5SUM.TXT
DISTFILES+= pjproject-${PJPROJ_VERSION}.tar.bz2 pjproject-${PJPROJ_VERSION}.md5
ALL_ENV+= EXTERNALS_CACHE_DIR=${DISTDIR}/${DIST_SUBDIR}
diff -r 121e68a42302 -r dff41f94d73b comms/asterisk16/Makefile
--- a/comms/asterisk16/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/asterisk16/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2019/08/22 12:22:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.49 2019/11/03 12:04:12 rillig Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -139,10 +139,10 @@
PLIST.mgcp= yes
.endif
-PLIST_VARS+= unbound
+PLIST_VARS+= unbound
# unbound 1.5 or later is required.`
.if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M9.*)
-PLIST.unbound= yes
+PLIST.unbound= yes
.else
CONFIGURE_ARGS+= --without-unbound
.endif
@@ -154,8 +154,10 @@
# pjproject
PJPROJ_VERSION= 2.9
-SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/pjproject-${PJPROJ_VERSION}.tar.bz2
-SITES.pjproject-${PJPROJ_VERSION}.md5= -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/MD5SUM.TXT
+SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \
+ -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/pjproject-${PJPROJ_VERSION}.tar.bz2
+SITES.pjproject-${PJPROJ_VERSION}.md5= \
+ -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/MD5SUM.TXT
DISTFILES+= pjproject-${PJPROJ_VERSION}.tar.bz2 pjproject-${PJPROJ_VERSION}.md5
ALL_ENV+= EXTERNALS_CACHE_DIR=${DISTDIR}/${DIST_SUBDIR}
diff -r 121e68a42302 -r dff41f94d73b comms/binkd/Makefile
--- a/comms/binkd/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/binkd/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2017/08/16 20:45:32 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/03 12:04:12 rillig Exp $
#
DISTNAME= binkd098
@@ -20,7 +20,7 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} PREFIX=${DESTDIR:Q}${PREFIX:Q}
+INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} PREFIX=${DESTDIR:Q}${PREFIX:Q}
BROKEN_ON_PLATFORM= ${LP64PLATFORMS}
diff -r 121e68a42302 -r dff41f94d73b comms/conserver8/options.mk
--- a/comms/conserver8/options.mk Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/conserver8/options.mk Sun Nov 03 12:04:12 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.5 2017/02/10 10:35:06 he Exp $
+# $NetBSD: options.mk,v 1.6 2019/11/03 12:04:12 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.conserver8
-PKG_OPTIONS_OPTIONAL_GROUPS= connectivity
-PKG_OPTIONS_GROUP.connectivity=inet6 uds
+PKG_OPTIONS_OPTIONAL_GROUPS= connectivity
+PKG_OPTIONS_GROUP.connectivity= inet6 uds
PKG_SUPPORTED_OPTIONS= pam ssl
@@ -32,7 +32,7 @@
.if !empty(PKG_OPTIONS:Mssl)
CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
-. include "../../security/openssl/buildlink3.mk"
+. include "../../security/openssl/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-openssl
.endif
diff -r 121e68a42302 -r dff41f94d73b comms/dfu-util/Makefile
--- a/comms/dfu-util/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/dfu-util/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/12/03 13:02:22 sevan Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/03 12:04:12 rillig Exp $
#
DISTNAME= dfu-util-0.9
@@ -10,12 +10,12 @@
COMMENT= Host side implementation of the USB DFU protocol
LICENSE= gnu-gpl-v2
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
-CPPFLAGS+= "-I${BUILDLINK_PREFIX.libusb1}/include/libusb-1.0"
+CPPFLAGS+= "-I${BUILDLINK_PREFIX.libusb1}/include/libusb-1.0"
CONFIGURE_ARGS+= -prefix=${PREFIX}
-CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS}"
.include "../../mk/bsd.prefs.mk"
diff -r 121e68a42302 -r dff41f94d73b comms/estic/Makefile
--- a/comms/estic/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/estic/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/06/24 10:59:42 nia Exp $
+# $NetBSD: Makefile,v 1.38 2019/11/03 12:04:12 rillig Exp $
DISTNAME= estic-1.61
PKGREVISION= 2
@@ -10,7 +10,7 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.von-bassewitz.de/uz/estic/estic.html
COMMENT= German language configuration tool for ISTEC 1003/1008 ISDN systems
-LICENSE= estic-license
+LICENSE= estic-license
EXTRACT_ONLY= estic-1.60-sources${EXTRACT_SUFX}
diff -r 121e68a42302 -r dff41f94d73b comms/hylafax/options.mk
--- a/comms/hylafax/options.mk Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/hylafax/options.mk Sun Nov 03 12:04:12 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2014/03/14 15:59:29 adam Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/03 12:04:12 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.hylafax
PKG_SUPPORTED_OPTIONS= pam
#pam doesn't work right now, so disabled by default
-#PKG_SUGGESTED_OPTIONS= pam
+#PKG_SUGGESTED_OPTIONS= pam
.include "../../mk/bsd.options.mk"
diff -r 121e68a42302 -r dff41f94d73b comms/java-rxtx/Makefile
--- a/comms/java-rxtx/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/java-rxtx/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/05/02 08:36:10 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 12:04:13 rillig Exp $
#
DISTNAME= rxtx-2.1-7r2
@@ -23,7 +23,7 @@
# Configuration looks for certain versions of JDK - this list can be expanded
# if the patches are also appropriately updated.
-PKG_JVMS_ACCEPTED= oracle-jdk8 openjdk8 openjdk7 sun-jdk7
+PKG_JVMS_ACCEPTED= oracle-jdk8 openjdk8 openjdk7 sun-jdk7
.include "../../mk/bsd.prefs.mk"
diff -r 121e68a42302 -r dff41f94d73b comms/kermit/Makefile
--- a/comms/kermit/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/kermit/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2019/04/11 02:21:09 mrg Exp $
+# $NetBSD: Makefile,v 1.91 2019/11/03 12:04:13 rillig Exp $
DISTNAME= cku302
PKGNAME= kermit-9.0.302
@@ -12,7 +12,7 @@
# UNIX C-Kermit 9.0 has been released with the Revised 3-Clause BSD License.
# http://www.columbia.edu/kermit/licensing.html
-LICENSE= modified-bsd
+LICENSE= modified-bsd
.include "../../mk/bsd.prefs.mk"
@@ -55,11 +55,11 @@
. endif
.elif ${OPSYS} == "Linux"
BUILD_TARGET_OPSYS= linux
-MAKE_ENV+= HAVE_LIBCURSES=-l${BUILDLINK_LIBNAME.curses}
+MAKE_ENV+= HAVE_LIBCURSES=-l${BUILDLINK_LIBNAME.curses}
. if ${CURSES_TYPE} == "ncurses"
-MAKE_ENV+= HAVE_CURSES=-DCK_NCURSES
+MAKE_ENV+= HAVE_CURSES=-DCK_NCURSES
. else
-MAKE_ENV+= HAVE_CURSES=-DCK_NCURSES
+MAKE_ENV+= HAVE_CURSES=-DCK_NCURSES
. endif
.elif ${OPSYS} == "SunOS"
BUILD_TARGET_OPSYS= solaris11g
diff -r 121e68a42302 -r dff41f94d73b comms/malsync/Makefile
--- a/comms/malsync/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/malsync/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/09/03 08:36:51 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 12:04:13 rillig Exp $
DISTNAME= ${PKGNAME_NOREV:S/-/_/}.src
PKGNAME= malsync-2.2.0
@@ -12,7 +12,7 @@
CONFLICTS+= libmal-[0-9]*
-WRKSRC= ${WRKDIR}/malsync
+WRKSRC= ${WRKDIR}/malsync
USE_TOOLS+= gmake
MAKE_ENV+= PILOT_LINK_DIR=${BUILDLINK_PREFIX.pilot-link-libs}
CPPFLAGS+= -D__unix__=1
diff -r 121e68a42302 -r dff41f94d73b comms/modemd/Makefile
--- a/comms/modemd/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/modemd/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2014/02/24 12:44:23 wiedi Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 12:04:13 rillig Exp $
DISTNAME= modemd-970221
PKGNAME= modemd-19970221
@@ -15,7 +15,7 @@
MANCOMPRESSED_IF_MANZ= yes
-MAKE_ENV+= LIBS=${LIBS:Q}
+MAKE_ENV+= LIBS=${LIBS:Q}
USE_BSD_MAKEFILE= yes
INSTALLATION_DIRS= ${PKGMANDIR}/cat5 ${PKGMANDIR}/man5 \
diff -r 121e68a42302 -r dff41f94d73b comms/multisync-gui/Makefile
--- a/comms/multisync-gui/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/multisync-gui/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2019/09/02 13:19:58 adam Exp $
+# $NetBSD: Makefile,v 1.69 2019/11/03 12:04:13 rillig Exp $
DISTNAME= multisync-gui-0.91.0
PKGREVISION= 51
@@ -12,7 +12,7 @@
USE_TOOLS+= pkg-config
HAS_CONFIGURE= yes
-REPLACE_PYTHON= waf
+REPLACE_PYTHON= waf
PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.91.0
LDFLAGS.DragonFly= -lgthread-2.0
diff -r 121e68a42302 -r dff41f94d73b comms/p5-Asterisk/Makefile
--- a/comms/p5-Asterisk/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/p5-Asterisk/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/08/11 13:18:08 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 12:04:13 rillig Exp $
DISTNAME= asterisk-perl-1.08
PKGNAME= p5-Asterisk-${DISTNAME:S/asterisk-perl-//}
@@ -18,8 +18,8 @@
EXAMPLES_DIR= ${PREFIX}/share/examples/p5-Asterisk
EXAMPLE_FILES= agi-enum.agi agi-sayani.agi agi-test.agi
-EXAMPLE_FILES+= calleridnamelookup.agi directory.agi manager-test.pl
-EXAMPLE_FILES+= tts-bofh.agi tts-line.agi tts-ping.agi
+EXAMPLE_FILES+= calleridnamelookup.agi directory.agi manager-test.pl
+EXAMPLE_FILES+= tts-bofh.agi tts-line.agi tts-ping.agi
.for file in ${EXAMPLE_FILES}
REPLACE_PERL+= ${WRKSRC}/examples/${file}
diff -r 121e68a42302 -r dff41f94d73b comms/scmxx/Makefile
--- a/comms/scmxx/Makefile Sun Nov 03 11:56:04 2019 +0000
+++ b/comms/scmxx/Makefile Sun Nov 03 12:04:12 2019 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index