summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2019-11-03 12:04:12 +0000
committerrillig <rillig@pkgsrc.org>2019-11-03 12:04:12 +0000
commitb2e4a5f46228c81e46d7dd51126346fc05230c3d (patch)
treecebaafcaf2ebef8bc8b5bec5f211fee2aa26c7b3
parent7bf7c2274b7ce05513561cb64ce9b42f3c7753e8 (diff)
downloadpkgsrc-b2e4a5f46228c81e46d7dd51126346fc05230c3d.tar.gz
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.
-rw-r--r--comms/asterisk-sounds-native/Makefile4
-rw-r--r--comms/asterisk15/Makefile8
-rw-r--r--comms/asterisk16/Makefile12
-rw-r--r--comms/binkd/Makefile4
-rw-r--r--comms/conserver8/options.mk8
-rw-r--r--comms/dfu-util/Makefile8
-rw-r--r--comms/estic/Makefile4
-rw-r--r--comms/hylafax/options.mk4
-rw-r--r--comms/java-rxtx/Makefile4
-rw-r--r--comms/kermit/Makefile10
-rw-r--r--comms/malsync/Makefile4
-rw-r--r--comms/modemd/Makefile4
-rw-r--r--comms/multisync-gui/Makefile4
-rw-r--r--comms/p5-Asterisk/Makefile6
-rw-r--r--comms/scmxx/Makefile4
-rw-r--r--comms/xtel/Makefile8
16 files changed, 50 insertions, 46 deletions
diff --git a/comms/asterisk-sounds-native/Makefile b/comms/asterisk-sounds-native/Makefile
index 0ee503ce64b..476a14d4578 100644
--- a/comms/asterisk-sounds-native/Makefile
+++ b/comms/asterisk-sounds-native/Makefile
@@ -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 --git a/comms/asterisk15/Makefile b/comms/asterisk15/Makefile
index 5eb0a9dd04e..3859fb6fd1a 100644
--- a/comms/asterisk15/Makefile
+++ b/comms/asterisk15/Makefile
@@ -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 @@ DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.2.tar.gz
# 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 --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile
index f0a64976f1a..5da3f3c9984 100644
--- a/comms/asterisk16/Makefile
+++ b/comms/asterisk16/Makefile
@@ -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
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 @@ DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.2.tar.gz
# 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 --git a/comms/binkd/Makefile b/comms/binkd/Makefile
index f4d016618cd..f258b0dc905 100644
--- a/comms/binkd/Makefile
+++ b/comms/binkd/Makefile
@@ -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 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
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 --git a/comms/conserver8/options.mk b/comms/conserver8/options.mk
index df22c63c9d5..b3f3106d847 100644
--- a/comms/conserver8/options.mk
+++ b/comms/conserver8/options.mk
@@ -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 @@ CONFIGURE_ARGS+= --with-ipv6
.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 --git a/comms/dfu-util/Makefile b/comms/dfu-util/Makefile
index 6e49888931e..4ad043120d8 100644
--- a/comms/dfu-util/Makefile
+++ b/comms/dfu-util/Makefile
@@ -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 @@ HOMEPAGE= http://dfu-util.sourceforge.net/
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 --git a/comms/estic/Makefile b/comms/estic/Makefile
index dcb7a74ac25..acb81a09d17 100644
--- a/comms/estic/Makefile
+++ b/comms/estic/Makefile
@@ -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 @@ DISTFILES= ${EXTRACT_ONLY} ${ESTICPATCH}
MAINTAINER= pkgsrc-users@NetBSD.org
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 --git a/comms/hylafax/options.mk b/comms/hylafax/options.mk
index a06aa3386cc..433d9704053 100644
--- a/comms/hylafax/options.mk
+++ b/comms/hylafax/options.mk
@@ -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 --git a/comms/java-rxtx/Makefile b/comms/java-rxtx/Makefile
index 47a6ef65581..2fca7765c87 100644
--- a/comms/java-rxtx/Makefile
+++ b/comms/java-rxtx/Makefile
@@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir
# 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 --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 9df7700bbac..eff3ad330ba 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -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 @@ COMMENT= Network and serial communication, file transfer, and scripting utility
# 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 @@ BUILD_TARGET_OPSYS= macosx10
. 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 --git a/comms/malsync/Makefile b/comms/malsync/Makefile
index 13281cf100f..896ad517600 100644
--- a/comms/malsync/Makefile
+++ b/comms/malsync/Makefile
@@ -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 @@ COMMENT= Utility to synchronize Palm Pilots to the AvantGo.com service
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 --git a/comms/modemd/Makefile b/comms/modemd/Makefile
index 6086c898ec0..bf54a9365b7 100644
--- a/comms/modemd/Makefile
+++ b/comms/modemd/Makefile
@@ -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 @@ MAKE_JOBS_SAFE= no
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 --git a/comms/multisync-gui/Makefile b/comms/multisync-gui/Makefile
index da9e0ca0a35..a2c9662bbed 100644
--- a/comms/multisync-gui/Makefile
+++ b/comms/multisync-gui/Makefile
@@ -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 @@ COMMENT= GUI for libopensync
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 --git a/comms/p5-Asterisk/Makefile b/comms/p5-Asterisk/Makefile
index 52d49dd1802..8bcc992567e 100644
--- a/comms/p5-Asterisk/Makefile
+++ b/comms/p5-Asterisk/Makefile
@@ -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 @@ PERL5_PACKLIST= auto/asterisk-perl/.packlist
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 --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 562aea54791..5b1767869d1 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2017/09/04 18:00:51 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/03 12:04:13 rillig Exp $
#
DISTNAME= scmxx-0.9.0
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
USE_TOOLS+= gmake msgfmt
LDFLAGS.SunOS+= -lintl
-INSTALLATION_DIRS+= share/doc/scmxx share/examples/scmxx
+INSTALLATION_DIRS+= share/doc/scmxx share/examples/scmxx
post-install:
${INSTALL_DATA} ${WRKSRC}/docs/doc_sources.txt \
diff --git a/comms/xtel/Makefile b/comms/xtel/Makefile
index cc5bf0f9b9e..de345b59ac3 100644
--- a/comms/xtel/Makefile
+++ b/comms/xtel/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.29 2016/02/25 11:32:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/03 12:04:13 rillig Exp $
DISTNAME= xtel-3.3.0
PKGREVISION= 14
CATEGORIES= comms x11
MASTER_SITES= http://pficheux.free.fr/xtel/download/
-PATCHFILES= xtel-jumbo-patch-20111008.gz
-PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/xtel/
-PATCH_DIST_STRIP= -p1
+PATCHFILES= xtel-jumbo-patch-20111008.gz
+PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/xtel/
+PATCH_DIST_STRIP= -p1
MAINTAINER= bouyer@NetBSD.org
HOMEPAGE= http://pficheux.free.fr/xtel/