diff options
40 files changed, 141 insertions, 141 deletions
diff --git a/chat/cgiirc/Makefile b/chat/cgiirc/Makefile index ed4550d2e06..160e81295b0 100644 --- a/chat/cgiirc/Makefile +++ b/chat/cgiirc/Makefile @@ -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/ diff --git a/chat/emech/Makefile b/chat/emech/Makefile index 88487667dfc..9e55a0dfd30 100644 --- a/chat/emech/Makefile +++ b/chat/emech/Makefile @@ -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 diff --git a/chat/finch/Makefile b/chat/finch/Makefile index 2b632050d7a..2ef2834a2d9 100644 --- a/chat/finch/Makefile +++ b/chat/finch/Makefile @@ -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" diff --git a/chat/gloox/Makefile b/chat/gloox/Makefile index 8c603af7877..0cdb5132ba3 100644 --- a/chat/gloox/Makefile +++ b/chat/gloox/Makefile @@ -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" diff --git a/chat/hexchat/options.mk b/chat/hexchat/options.mk index 1537fb7784e..8be88074703 100644 --- a/chat/hexchat/options.mk +++ b/chat/hexchat/options.mk @@ -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 diff --git a/chat/i2cb/Makefile b/chat/i2cb/Makefile index 8bc1fcaea02..ac0099a1a38 100644 --- a/chat/i2cb/Makefile +++ b/chat/i2cb/Makefile @@ -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 diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile index 85646e48649..b2b77d02296 100644 --- a/chat/ircII/Makefile +++ b/chat/ircII/Makefile @@ -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" diff --git a/chat/ircII/options.mk b/chat/ircII/options.mk index ed0f1a09aab..105f3b749ab 100644 --- a/chat/ircII/options.mk +++ b/chat/ircII/options.mk @@ -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 diff --git a/chat/irchat-pj/Makefile b/chat/irchat-pj/Makefile index 0b2819c1800..b0dac8372f7 100644 --- a/chat/irchat-pj/Makefile +++ b/chat/irchat-pj/Makefile @@ -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_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 -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 diff --git a/chat/irssi-icb/Makefile b/chat/irssi-icb/Makefile index c049eb033c8..5164b7f75da 100644 --- a/chat/irssi-icb/Makefile +++ b/chat/irssi-icb/Makefile @@ -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}:../../chat/irssi 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} diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk index 3f345cd7bf2..7024f1ac510 100644 --- a/chat/jabberd2/options.mk +++ b/chat/jabberd2/options.mk @@ -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) diff --git a/chat/konversation/Makefile b/chat/konversation/Makefile index 2b3cfc7f8a9..c65bac7b557 100644 --- a/chat/konversation/Makefile +++ b/chat/konversation/Makefile @@ -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++ diff --git a/chat/libfolks/Makefile b/chat/libfolks/Makefile index fd33e6e9372..70f65f59b44 100644 --- a/chat/libfolks/Makefile +++ b/chat/libfolks/Makefile @@ -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/show/Projects/Folks 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 diff --git a/chat/libmsn/Makefile b/chat/libmsn/Makefile index 3a343a50fd0..d9623deffe1 100644 --- a/chat/libmsn/Makefile +++ b/chat/libmsn/Makefile @@ -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 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 diff --git a/chat/libotr/Makefile b/chat/libotr/Makefile index 1f46f40b866..831eddafe57 100644 --- a/chat/libotr/Makefile +++ b/chat/libotr/Makefile @@ -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 diff --git a/chat/loudmouth/hacks.mk b/chat/loudmouth/hacks.mk index 452b8f3db59..33423dd7773 100644 --- a/chat/loudmouth/hacks.mk +++ b/chat/loudmouth/hacks.mk @@ -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 diff --git a/chat/matterircd/Makefile b/chat/matterircd/Makefile index cceff0931e2..abf3cf3dfef 100644 --- a/chat/matterircd/Makefile +++ b/chat/matterircd/Makefile @@ -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/matterircd 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: diff --git a/chat/mcabber/Makefile b/chat/mcabber/Makefile index 482c0955f1d..05bf3e069ab 100644 --- a/chat/mcabber/Makefile +++ b/chat/mcabber/Makefile @@ -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: diff --git a/chat/meanwhile/Makefile b/chat/meanwhile/Makefile index 9dd97d8b2f7..742a3330c4c 100644 --- a/chat/meanwhile/Makefile +++ b/chat/meanwhile/Makefile @@ -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 diff --git a/chat/pidgin-facebookchat/Makefile b/chat/pidgin-facebookchat/Makefile index 36f836fbec2..1d4001c58f5 100644 --- a/chat/pidgin-facebookchat/Makefile +++ b/chat/pidgin-facebookchat/Makefile @@ -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/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 diff --git a/chat/pidgin-latex/Makefile b/chat/pidgin-latex/Makefile index 8bb7b22ad33..762d81a25a6 100644 --- a/chat/pidgin-latex/Makefile +++ b/chat/pidgin-latex/Makefile @@ -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" diff --git a/chat/pidgin-otr/Makefile b/chat/pidgin-otr/Makefile index a903af97640..dc3280e1579 100644 --- a/chat/pidgin-otr/Makefile +++ b/chat/pidgin-otr/Makefile @@ -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 diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile index 12cbe0942fb..c18691e37da 100644 --- a/chat/pidgin/Makefile +++ b/chat/pidgin/Makefile @@ -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" diff --git a/chat/psi/Makefile b/chat/psi/Makefile index 67d30b3148e..88f3a5b02b7 100644 --- a/chat/psi/Makefile +++ b/chat/psi/Makefile @@ -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=${BUILDLINK_PREFIX.qca2-qt5}/include # 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 diff --git a/chat/psi/options.mk b/chat/psi/options.mk index 479e939bdb4..154b85be9af 100644 --- a/chat/psi/options.mk +++ b/chat/psi/options.mk @@ -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 diff --git a/chat/psybnc/Makefile b/chat/psybnc/Makefile index e160fe4f980..3e75b896ddc 100644 --- a/chat/psybnc/Makefile +++ b/chat/psybnc/Makefile @@ -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" diff --git a/chat/quirc/Makefile b/chat/quirc/Makefile index c247f293f14..7d709672252 100644 --- a/chat/quirc/Makefile +++ b/chat/quirc/Makefile @@ -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 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 diff --git a/chat/scrollz/Makefile b/chat/scrollz/Makefile index 20722b8d13a..40d6c1d6bb3 100644 --- a/chat/scrollz/Makefile +++ b/chat/scrollz/Makefile @@ -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" diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile index c90934a006e..8a82a24b5f9 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -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. # diff --git a/chat/sirc/Makefile b/chat/sirc/Makefile index 31f3e9662e7..e712c8f0f7a 100644 --- a/chat/sirc/Makefile +++ b/chat/sirc/Makefile @@ -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 diff --git a/chat/spectrum/Makefile b/chat/spectrum/Makefile index 31284fcf2a2..bbb377044d6 100644 --- a/chat/spectrum/Makefile +++ b/chat/spectrum/Makefile @@ -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 diff --git a/chat/spectrum/options.mk b/chat/spectrum/options.mk index 2051e9a59b3..68a5830eb98 100644 --- a/chat/spectrum/options.mk +++ b/chat/spectrum/options.mk @@ -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 diff --git a/chat/telepathy-gabble/Makefile b/chat/telepathy-gabble/Makefile index e84b8a4f1ad..e798bd410c1 100644 --- a/chat/telepathy-gabble/Makefile +++ b/chat/telepathy-gabble/Makefile @@ -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) diff --git a/chat/telepathy-glib/Makefile b/chat/telepathy-glib/Makefile index 4c7402e6109..1d89529a076 100644 --- a/chat/telepathy-glib/Makefile +++ b/chat/telepathy-glib/Makefile @@ -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" diff --git a/chat/telepathy-haze/Makefile b/chat/telepathy-haze/Makefile index 7542e3fb9d5..d0b2cbaa0cc 100644 --- a/chat/telepathy-haze/Makefile +++ b/chat/telepathy-haze/Makefile @@ -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" diff --git a/chat/telepathy-logger/Makefile b/chat/telepathy-logger/Makefile index 4e69c44af2d..f267a11df65 100644 --- a/chat/telepathy-logger/Makefile +++ b/chat/telepathy-logger/Makefile @@ -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/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" diff --git a/chat/telepathy-qt/Makefile b/chat/telepathy-qt/Makefile index 9defadf5595..7aebd2c5bce 100644 --- a/chat/telepathy-qt/Makefile +++ b/chat/telepathy-qt/Makefile @@ -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/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 diff --git a/chat/tirc/Makefile b/chat/tirc/Makefile index eebdbc5d305..be0b07bda34 100644 --- a/chat/tirc/Makefile +++ b/chat/tirc/Makefile @@ -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' Client GNU_CONFIGURE= YES -CONFIGURE_ARGS+="--with-ansi-colours" +CONFIGURE_ARGS+= "--with-ansi-colours" LIBS.SunOS+= -lnsl -lsocket diff --git a/chat/weechat/options.mk b/chat/weechat/options.mk index c8d64848292..d8f64ae9fea 100644 --- a/chat/weechat/options.mk +++ b/chat/weechat/options.mk @@ -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 diff --git a/chat/zenirc/Makefile b/chat/zenirc/Makefile index a484e9cc75e..eb97e6bcdcd 100644 --- a/chat/zenirc/Makefile +++ b/chat/zenirc/Makefile @@ -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 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" |