diff options
| author | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
| commit | b71a1d488b6b45e0a968a4c149990c25b6a09215 (patch) | |
| tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /chat | |
| parent | 624eed58928f83676fbd7ca01a5f6974bb2cce2a (diff) | |
| download | pkgsrc-b71a1d488b6b45e0a968a4c149990c25b6a09215.tar.gz | |
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'chat')
38 files changed, 93 insertions, 106 deletions
diff --git a/chat/aim/Makefile b/chat/aim/Makefile index a98496a8d89..162dc738ecd 100644 --- a/chat/aim/Makefile +++ b/chat/aim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:41 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:52 rillig Exp $ DISTNAME= aim-1.5.286 CATEGORIES= chat @@ -23,7 +23,7 @@ NO_BUILD= YES EXTRACT_ONLY= # nothing PLIST_SRC= ${WRKDIR}/PLIST.rpm -PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR} +PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} DIST_SUBDIR= . RPMFILES= ${DISTFILES} diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile index 45a16a55402..3b9dd616739 100644 --- a/chat/bitlbee/Makefile +++ b/chat/bitlbee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/11/12 19:51:24 tonio Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:52 rillig Exp $ # DISTNAME= bitlbee-0.99 @@ -48,7 +48,6 @@ do-install: .for f in AUTHORS FAQ README TODO ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCDIR} .endfor -.undef f PKG_OPTIONS_VAR= PKG_OPTIONS.bitlbee PKG_SUPPORTED_OPTIONS= inet6 diff --git a/chat/bnc/Makefile b/chat/bnc/Makefile index c87161ab219..0d645be10b7 100644 --- a/chat/bnc/Makefile +++ b/chat/bnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/10/16 17:49:41 tonio Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:52 rillig Exp $ DISTNAME= bnc2.9.4 PKGNAME= ${DISTNAME:S/bnc/&-/} @@ -12,9 +12,8 @@ COMMENT= Simple IRC relay proxy with support for virtual hosting DEPENDS+= dialog-[0-9]*:../../misc/dialog -GNU_CONFIGURE= YES - -CONFIGURE_ARGS= --with-ssl +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-ssl INSTALLATION_DIRS= bin diff --git a/chat/bsflite/Makefile b/chat/bsflite/Makefile index 1bb5205b175..9457ffa386f 100644 --- a/chat/bsflite/Makefile +++ b/chat/bsflite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/07/29 04:50:39 grant Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:52 rillig Exp $ DISTNAME= bsflite-0.80 CATEGORIES= chat @@ -19,6 +19,6 @@ do-install: ${PREFIX}/share/examples/bsflite LIBS.SunOS+= -lnsl -lsocket -MAKE_ENV+= LIBS=${LIBS:Q} +MAKE_ENV+= LIBS=${LIBS:M*:Q} .include "../../mk/bsd.pkg.mk" diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile index f226a072583..e90df3e215b 100644 --- a/chat/centericq/Makefile +++ b/chat/centericq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2005/12/03 17:04:23 adrianp Exp $ +# $NetBSD: Makefile,v 1.56 2005/12/05 20:49:52 rillig Exp $ # DISTNAME= centericq-4.21.0 @@ -19,13 +19,13 @@ USE_LANGUAGES= c c++ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-ssl --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config -LIBS= ${LDFLAGS} +LIBS+= ${LDFLAGS} REPLACE_PERL= misc/cicqconv INCOMPAT_CURSES+= NetBSD-1.[45]*-* NetBSD-1.6-* NetBSD-1.6.[1-9]-* INCOMPAT_CURSES+= NetBSD-1.6_*-* NetBSD-1.6.[1-9]_*-* NetBSD-1.6[A-T]-* -INCOMPAT_CURSES+= NetBSD-2.* NetBSD-3.* # see PR 29060 +INCOMPAT_CURSES+= NetBSD-2.*-* NetBSD-3.*-* # see PR 29060 .include "../../mk/bsd.prefs.mk" diff --git a/chat/cgiirc/Makefile b/chat/cgiirc/Makefile index bf394e5e75d..9fd9ca9096f 100644 --- a/chat/cgiirc/Makefile +++ b/chat/cgiirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:07 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:52 rillig Exp $ DISTNAME= cgiirc-0.5.6 CATEGORIES= chat @@ -55,14 +55,12 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/docs/${f} \ ${PREFIX}/share/examples/cgiirc/${f} . endfor -. undef f ${INSTALL_DATA} ${WRKSRC}/cgiirc.config ${PREFIX}/share/examples/cgiirc ${INSTALL_DATA} ${WRKDIR}/cgiirc.conf ${PREFIX}/share/examples/cgiirc . for f in ${EGFILES} ${INSTALL_DATA} ${WRKSRC}/${f} \ ${PREFIX}/share/examples/cgiirc/${f} . endfor -. undef f ${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${CGIIRC} ${INSTALL_DATA} ${WRKSRC}/formats/* ${CGIIRC}/formats/ ${INSTALL_DATA} ${WRKSRC}/images/*.gif ${CGIIRC}/images/ diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile index 3ab98be4991..60ee64976c2 100644 --- a/chat/fugu/Makefile +++ b/chat/fugu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/10/16 19:12:27 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:52 rillig Exp $ # DISTNAME= fugu-1.0 @@ -14,7 +14,7 @@ COMMENT= Graphical client for the gale secure instant messaging system PYTHON_VERSIONS_ACCEPTED= 20 21 # no 22 - uses Makefile.pre.in GNU_CONFIGURE= YES -CONFIGURE_ENV+= vi_cv_path_python=${PYTHONBIN} +CONFIGURE_ENV+= vi_cv_path_python=${PYTHONBIN:Q} LDFLAGS+= -L${BUILDLINK_PREFIX.py-Pmw}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.py-Pmw}/lib CPPFLAGS+= -I${BUILDLINK_PREFIX.py-Pmw}/include \ diff --git a/chat/gale/Makefile b/chat/gale/Makefile index 11e0cf58f57..31aa7130891 100644 --- a/chat/gale/Makefile +++ b/chat/gale/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/09/07 13:58:16 adam Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:52 rillig Exp $ DISTNAME= gale-0.99fruit PKGNAME= gale-0.99f @@ -15,8 +15,8 @@ USE_GNU_READLINE= yes # needs rl_named_function() USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/liboopltconfig GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ENV+= PROG_GLIB_CONFIG="${GLIB_CONFIG}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ENV+= PROG_GLIB_CONFIG=${GLIB_CONFIG:Q} CPPFLAGS+= -I${BUILDLINK_PREFIX.rsaref}/include/rsaref CPPFLAGS+= -I${BUILDLINK_PREFIX.libwww}/include/w3c-libwww diff --git a/chat/goofey/Makefile b/chat/goofey/Makefile index 04fcaa3d673..8132a4c8735 100644 --- a/chat/goofey/Makefile +++ b/chat/goofey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:42 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:52 rillig Exp $ # DISTNAME= goofey-3.15 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.csse.monash.edu.au/~tym/goofey.html COMMENT= Text-based client for goofey, a flexible short message system NO_CONFIGURE= yes -LDFLAGS.SunOS= -lnsl -lsocket +LDFLAGS.SunOS+= -lnsl -lsocket INSTALLATION_DIRS= bin man/man1 diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile index 305d61a5017..bf400a5b9f1 100644 --- a/chat/gossip/Makefile +++ b/chat/gossip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/08/25 20:16:52 jmmv Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 20:49:53 rillig Exp $ # DISTNAME= gossip-0.9 @@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://gossip.imendio.org/ COMMENT= GTK2 Jabber Instant Messaging client -BUILD_DEPENDS= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser +BUILD_DEPENDS+= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser BUILD_USES_MSGFMT= yes USE_DIRS+= gnome2-1.5 diff --git a/chat/gtmess/Makefile b/chat/gtmess/Makefile index 5639b647a79..759dd98cacd 100644 --- a/chat/gtmess/Makefile +++ b/chat/gtmess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/10/06 15:54:26 minskim Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:53 rillig Exp $ # DISTNAME= gtmess-0.91 @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_search_iconv=${BUILDLINK_LDADD.iconv:Q} -INCOMPAT_CURSES= NetBSD-1.* +INCOMPAT_CURSES= NetBSD-1.*-* .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" diff --git a/chat/i2cbd/Makefile b/chat/i2cbd/Makefile index 7943c960e1d..4d1bfdba5df 100644 --- a/chat/i2cbd/Makefile +++ b/chat/i2cbd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/08/19 18:12:36 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:53 rillig Exp $ # DISTNAME= i2cbd-2.0_BETA1 @@ -16,7 +16,7 @@ USE_PKGINSTALL= YES BUILD_DEFS+= ICBD_OWNER ICBD_OWNER?= ${ROOT_USER} -PLIST_SUBST+= ICBD_OWNER=${ICBD_OWNER} +PLIST_SUBST+= ICBD_OWNER=${ICBD_OWNER:Q} PKG_SYSCONFSUBDIR= icbd EGDIR= ${PREFIX}/share/examples/i2cbd @@ -26,7 +26,6 @@ CONF_FILES_PERMS= # empty CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \ ${ICBD_OWNER} ${ROOT_GROUP} 644 .endfor -.undef f CONF_FILES_PERMS+= /dev/null /var/log/icbd.log \ ${ICBD_OWNER} ${ROOT_GROUP} 644 @@ -42,7 +41,6 @@ post-install: .for f in ${EGFILES} ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${EGDIR} .endfor -.undef f ${INSTALL_SCRIPT} ${WRKDIR}/icbd.sh ${PREFIX}/etc/rc.d/icbd .include "../../mk/bsd.pkg.mk" diff --git a/chat/icbirc/distinfo b/chat/icbirc/distinfo index becc7071a61..9ccf4dc16e6 100644 --- a/chat/icbirc/distinfo +++ b/chat/icbirc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2005/03/10 13:22:01 tv Exp $ +$NetBSD: distinfo,v 1.7 2005/12/05 20:49:53 rillig Exp $ SHA1 (icbirc-1.8.tar.gz) = 99ff8674b189fdf8a86b6acd2bc19418b888c38b RMD160 (icbirc-1.8.tar.gz) = 769c35949b79b9e401d99026800e61063e6d1103 Size (icbirc-1.8.tar.gz) = 11061 bytes -SHA1 (patch-aa) = ee8e182618cb0563a9244b57de307f2f8a710f09 +SHA1 (patch-aa) = 97441a0fb639095fc9e10290aa0d8b125f59285b diff --git a/chat/icbirc/patches/patch-aa b/chat/icbirc/patches/patch-aa index 53217d3f010..873c81da7a6 100644 --- a/chat/icbirc/patches/patch-aa +++ b/chat/icbirc/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2005/03/10 13:22:01 tv Exp $ +$NetBSD: patch-aa,v 1.5 2005/12/05 20:49:53 rillig Exp $ --- icbirc.c.orig Thu Nov 18 16:14:28 2004 +++ icbirc.c -@@ -35,6 +35,7 @@ static const char rcsid[] = "$Id: icbirc +@@ -35,6 +35,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/stat.h> diff --git a/chat/iip/Makefile b/chat/iip/Makefile index cf8bbdeb3ee..ebe2923860e 100644 --- a/chat/iip/Makefile +++ b/chat/iip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/11/04 08:53:54 rillig Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:53 rillig Exp $ # DISTNAME= iip-1.1.0 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.invisiblenet.net/iip/ COMMENT= The Invisible IRC Project BUILD_DIRS= ${WRKSRC}/src -MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} LDFLAGS=${LDFLAGS:Q} +MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} LDFLAGS=${LDFLAGS:M*:Q} MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}" "${CPPFLAGS:Q}" -I." do-install: diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile index 59f82f8806f..b68e12eb16d 100644 --- a/chat/ircII/Makefile +++ b/chat/ircII/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/06/02 22:21:18 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2005/12/05 20:49:53 rillig Exp $ DISTNAME= ircii-${VERS} PKGNAME= ircII-${VERS} @@ -18,7 +18,7 @@ CONFLICTS= blackened-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews VERS= 20040820 -PLIST_SUBST+= VERS=${VERS} +PLIST_SUBST+= VERS=${VERS:Q} .include "../../mk/bsd.prefs.mk" diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile index aa7c1b7c585..8c256bd07b9 100644 --- a/chat/ircd-hybrid/Makefile +++ b/chat/ircd-hybrid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/11/16 22:59:19 adrianp Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:49:53 rillig Exp $ DISTNAME= ircd-hybrid-7.1.3 EXTRACT_SUFX= .tgz @@ -35,9 +35,9 @@ OWN_DIRS_PERMS+= ${VARBASE}/log/ircd-hybrid/logs \ OWN_DIRS_PERMS+= ${VARBASE}/run/ircd-hybrid \ ${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 0770 -FILES_SUBST+= IRCD_HYBRID_IRC_USER=${IRCD_HYBRID_IRC_USER} -FILES_SUBST+= IRCD_HYBRID_IRC_GROUP=${IRCD_HYBRID_IRC_GROUP} -FILES_SUBST+= VARBASE=${VARBASE} +FILES_SUBST+= IRCD_HYBRID_IRC_USER=${IRCD_HYBRID_IRC_USER:Q} +FILES_SUBST+= IRCD_HYBRID_IRC_GROUP=${IRCD_HYBRID_IRC_GROUP:Q} +FILES_SUBST+= VARBASE=${VARBASE:Q} PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::ircd-hybrid\ User::${NOLOGIN} PKG_GROUPS= ${IRCD_HYBRID_IRC_GROUP} diff --git a/chat/irchat-pj/Makefile b/chat/irchat-pj/Makefile index 2b400f45015..fd2cde63a08 100644 --- a/chat/irchat-pj/Makefile +++ b/chat/irchat-pj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:28 uebayasi Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:53 rillig Exp $ DISTNAME= irchat-pj-2.4.24.22 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -21,6 +21,6 @@ PKG_FAIL_REASON+= "Unknown Emacs flavor" .endif LIBS.SunOS+= -lnsl -lsocket -MAKE_ENV+= LIBS="${LIBS}" +MAKE_ENV+= LIBS=${LIBS:M*:Q} .include "../../mk/bsd.pkg.mk" diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile index 5e397b44379..6e173e88d17 100644 --- a/chat/ircservices/Makefile +++ b/chat/ircservices/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/11/30 17:47:54 adrianp Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:53 rillig Exp $ # DISTNAME= ircservices-5.0.56 @@ -18,9 +18,9 @@ USE_TOOLS+= gmake grep gsed perl RCD_SCRIPTS= ircservices PKG_GROUPS= services -CONFIGURE_ARGS= -prefix ${PREFIX} +CONFIGURE_ARGS+= -prefix ${PREFIX:Q} -SUBST_CLASSES= install utils conf +SUBST_CLASSES+= install SUBST_STAGE.install= post-patch SUBST_FILES.install= install-script tools/ircservices-chk.in SUBST_SED.install= -e "s|/bin/cp|${CP}|g" \ @@ -30,6 +30,7 @@ SUBST_SED.install= -e "s|/bin/cp|${CP}|g" \ -e "s|@DATDEST@|${VARBASE}/run|g" SUBST_MESSAGE.install= "Fixing scripts." +SUBST_CLASSES+= utils SUBST_STAGE.utils= post-patch SUBST_FILES.utils= data/Makefile tools/Makefile SUBST_SED.utils= -e "s|chgrp|${CHGRP}|g" \ @@ -37,6 +38,7 @@ SUBST_SED.utils= -e "s|chgrp|${CHGRP}|g" \ -e "s|find|${FIND}|g" SUBST_MESSAGE.utils= "Fixing paths of hard-coded utilities." +SUBST_CLASSES+= conf SUBST_STAGE.conf= post-patch SUBST_FILES.conf= data/example-ircservices.conf data/example-modules.conf SUBST_SED.conf= -e "s|/usr/local|${PREFIX}|g" \ diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile index 40efa2ad1a0..52010b9e222 100644 --- a/chat/ircu/Makefile +++ b/chat/ircu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/11/29 19:05:12 adrianp Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:53 rillig Exp $ # DISTNAME= ircu2.10.11.07 @@ -41,7 +41,7 @@ SPECIAL_PERMS+= ${PKG_SYSCONFDIR} ${IRCD_USER} ${IRCD_GROUP} 0700 RCD_SCRIPTS= ircd -FILES_SUBST+= IRCD_USER=${IRCD_USER} +FILES_SUBST+= IRCD_USER=${IRCD_USER:Q} MESSAGE_SUBST+= IRCD_USER=${IRCD_USER} MESSAGE_SUBST+= IRCD_GROUP=${IRCD_GROUP} PKG_GROUPS= ${IRCD_GROUP} diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile index 287187bee4c..08983247983 100644 --- a/chat/irssi/Makefile +++ b/chat/irssi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/10/31 09:18:45 rillig Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 20:49:53 rillig Exp $ DISTNAME= ${IRSSI_DISTNAME} PKGREVISION= 7 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-terminfo \ --sysconfdir=${PKG_SYSCONFDIR} # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} EGDIR= ${PREFIX}/share/examples/irssi CONF_FILES= ${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile index 2f6a99d8e71..49ccda38632 100644 --- a/chat/jabberd/Makefile +++ b/chat/jabberd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/10/22 12:36:34 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:53 rillig Exp $ # DISTNAME= jabber-1.4.2 @@ -40,15 +40,14 @@ BUILD_DEFS+= JABBERD_USER JABBERD_GROUP \ PKG_GROUPS= ${JABBERD_GROUP} PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP}::Jabberd\ user -FILES_SUBST+= JABBERD_USER="${JABBERD_USER}" -FILES_SUBST+= JABBERD_GROUP="${JABBERD_GROUP}" -FILES_SUBST+= JABBERD_SPOOLDIR="${JABBERD_SPOOLDIR}" -FILES_SUBST+= JABBERD_PIDDIR="${JABBERD_PIDDIR}" +FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q} +FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP:Q} +FILES_SUBST+= JABBERD_SPOOLDIR=${JABBERD_SPOOLDIR:Q} +FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q} .for f in ${JABBERD_LOGDIR} ${JABBERD_SPOOLDIR} ${JABBERD_PIDDIR} OWN_DIRS_PERMS+= ${f} ${JABBERD_USER} ${JABBERD_GROUP} 750 .endfor -.undef f CONF_FILES= ${EGDIR}/jabber.xml ${PKG_SYSCONFDIR}/jabber.xml CONF_FILES+= ${EGDIR}/platform-settings \ diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index 01770dfd3af..42f99d19799 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/10/20 11:47:18 xtraeme Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:49:53 rillig Exp $ # DISTNAME= jabberd-2.0s10 @@ -18,7 +18,7 @@ USE_PKGINSTALL= yes BUILDLINK_DEPENDS.openssl+= openssl>=0.9.6b BUILDLINK_TRANSFORM.db4= -e "s,/db4/,/,g" -SUBST_CLASSES= path +SUBST_CLASSES+= path SUBST_STAGE.path= post-patch SUBST_FILES.path= configure SUBST_MESSAGE.path= "Fixing configure script." @@ -42,10 +42,10 @@ PKG_SYSCONFSUBDIR= jabberd RCD_SCRIPTS= jabberd c2s sm resolver router s2s JABBERD_USER?= jabberd JABBERD_GROUP?= jabberd -FILES_SUBST+= JABBERD_USER=${JABBERD_USER} -FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP} -FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR} -FILES_SUBST+= JABBERD_LOGDIR=${JABBERD_LOGDIR} +FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q} +FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP:Q} +FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q} +FILES_SUBST+= JABBERD_LOGDIR=${JABBERD_LOGDIR:Q} PKG_GROUPS= ${JABBERD_GROUP} PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP} @@ -61,20 +61,17 @@ DBFILES= db-setup.mysql db-setup.pgsql CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor CONF_FILES+= ${EGDIR}/roster.xml ${PKG_SYSCONFDIR}/roster.xml -.undef f .include "options.mk" .for f in ${JABBERD_LOGDIR} ${JABBERD_DBDIR} ${JABBERD_PIDDIR} OWN_DIRS_PERMS+= ${f} ${JABBERD_USER} ${JABBERD_GROUP} 770 .endfor -.undef f post-extract: .for f in ${FILES} @${MV} ${WRKSRC}/etc/${f}.dist.in ${WRKSRC}/etc/${f}.in .endfor -.undef f @${MV} ${WRKSRC}/etc/jabberd.cfg.dist.in ${WRKSRC}/etc/jabberd.cfg.in pre-configure: @@ -88,7 +85,6 @@ pre-configure: -e "s|@DBDIR@|${JABBERD_DBDIR}|g" \ ${WRKSRC}/etc/${f}.in > ${WRKSRC}/etc/${f} .endfor -.undef f post-install: ${INSTALL_DATA_DIR} ${EGDIR} @@ -99,11 +95,9 @@ post-install: .for f in ${DBFILES} ${INSTALL_DATA} ${WRKSRC}/tools/${f} ${EGDIR} .endfor -.undef f .for f in jabberd.cfg ${FILES} ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${EGDIR} .endfor -.undef f .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" diff --git a/chat/kadu/Makefile b/chat/kadu/Makefile index 29d83cb6cbb..0a5af5c7179 100644 --- a/chat/kadu/Makefile +++ b/chat/kadu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/07/20 14:49:05 adam Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:53 rillig Exp $ DISTNAME= kadu-0.4.1 CATEGORIES= chat @@ -13,7 +13,7 @@ USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-existing-libgadu=${BUILDLINK_PREFIX.ekg} -CONFIGURE_ENV+= X11BASE="${X11BASE}" +CONFIGURE_ENV+= X11BASE=${X11BASE:Q} LIBS+= ${LIBOSSAUDIO} WRKSRC= ${WRKDIR}/kadu diff --git a/chat/licq-gui-qt/Makefile b/chat/licq-gui-qt/Makefile index bdb025a72a7..07fa59f87dd 100644 --- a/chat/licq-gui-qt/Makefile +++ b/chat/licq-gui-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/07/19 10:01:16 grant Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:53 rillig Exp $ # DISTNAME= licq-1.2.6 @@ -22,7 +22,7 @@ NOT_FOR_PLATFORM= NetBSD-*-* GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= # defined +LIBTOOL_OVERRIDE= # none SHLIBTOOL_OVERRIDE= libtool */libtool */*/libtool WRKSRC= ${WRKDIR:=/${DISTNAME}/plugins/qt-gui} diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile index 05c2ae2cb8d..f342dd90fc6 100644 --- a/chat/mu-conference/Makefile +++ b/chat/mu-conference/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:13 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:53 rillig Exp $ # DISTNAME= mu-conference-0.6.0 @@ -26,8 +26,8 @@ RCD_SCRIPTS= muc BUILD_DEFS+= JABBERD_USER JABBERD_LOGDIR JABBERD_PIDDIR JABBERD_USER?= jabberd -FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR} -FILES_SUBST+= JABBERD_USER=${JABBERD_USER} +FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q} +FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q} EGDIR= ${PREFIX}/share/examples/jabberd CONF_FILES+= ${EGDIR}/muc-jcr.xml ${PKG_SYSCONFDIR}/muc-jcr.xml @@ -56,4 +56,3 @@ do-install: .include "../../devel/glib2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" - diff --git a/chat/p5-POE-Component-IRC/Makefile b/chat/p5-POE-Component-IRC/Makefile index 7ce2533ee79..d2debf241dd 100644 --- a/chat/p5-POE-Component-IRC/Makefile +++ b/chat/p5-POE-Component-IRC/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/10/14 09:46:54 adrianp Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:49:54 rillig Exp $ # DISTNAME= POE-Component-IRC-4.71 @@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=POE/} MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://search.cpan.org/~bingos/${DISTNAME}/ -COMMENT= Fully event-driven IRC client module. +COMMENT= Fully event-driven IRC client module DEPENDS+= p5-POE>=0.17:../../devel/p5-POE DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate diff --git a/chat/psi/Makefile b/chat/psi/Makefile index ad3d2ab9c9b..f61fcf1aa97 100644 --- a/chat/psi/Makefile +++ b/chat/psi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/10/01 22:02:00 jdolecek Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:49:54 rillig Exp $ PSI_VERSION= 0.9.3 DISTNAME= psi-${PSI_VERSION} @@ -26,9 +26,10 @@ HAS_CONFIGURE= yes CONFIG_SHELL= ${SH} -CONFIGURE_ARGS= --prefix="${PREFIX}" --qtdir="${QTDIR}" -CONFIGURE_ARGS+= --with-qca-inc="${BUILDLINK_PREFIX.qca}/include" \ - --with-qca-lib="${BUILDLINK_PREFIX.qca}/lib" +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} +CONFIGURE_ARGS+= --qtdir=${QTDIR:Q} +CONFIGURE_ARGS+= --with-qca-inc=${BUILDLINK_PREFIX.qca:Q}/include +CONFIGURE_ARGS+= --with-qca-lib=${BUILDLINK_PREFIX.qca:Q}/lib LANG_FILES= psi_zh.qm psi_nl.qm psi_sk.qm psi_fr.qm psi_cs.qm \ psi_de.qm psi_et.qm psi_pl.qm psi_mk.qm psi_el.qm \ diff --git a/chat/ser/Makefile b/chat/ser/Makefile index 80e941bdece..95bb87cc48e 100644 --- a/chat/ser/Makefile +++ b/chat/ser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/11/08 02:20:07 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:54 rillig Exp $ # DISTNAME= ser-0.8.14_src @@ -23,7 +23,7 @@ REQD_DIRS= ${EGDIR} MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q} MAKE_ENV+= cfg-prefix=${PREFIX}/share/examples -MAKE_ENV+= EGDIR=${EGDIR} +MAKE_ENV+= EGDIR=${EGDIR:Q} .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/silc-client-icb/Makefile b/chat/silc-client-icb/Makefile index 86c0e63d3f4..7389a1a3e9f 100644 --- a/chat/silc-client-icb/Makefile +++ b/chat/silc-client-icb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:05 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:54 rillig Exp $ # DISTNAME= irssi-icb-0.14 @@ -20,7 +20,7 @@ GNU_CONFIGURE= YES IRSSI_DIR= ${WRKDIR}/${SILC_CLIENT_DISTNAME}/irssi -CONFIGURE_ARGS= --with-irssi=${IRSSI_DIR} +CONFIGURE_ARGS+= --with-irssi=${IRSSI_DIR:Q} post-extract: ${CP} ${SILC_CLIENT_CONFIG_H} ${IRSSI_DIR}/config.h diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile index 75845eae132..0345f7c591d 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/09/17 17:06:27 salo Exp $ +# $NetBSD: Makefile,v 1.41 2005/12/05 20:49:54 rillig Exp $ # DISTNAME= ${SILC_CLIENT_DISTNAME} @@ -26,7 +26,7 @@ SHLIBTOOL_OVERRIDE= libtool */libtool */*/*/libtool PKG_SYSCONFSUBDIR?= ${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} -MAKE_ENV+= examplesdir=${EGDIR} +MAKE_ENV+= examplesdir=${EGDIR:Q} CONF_FILES+= ${EGDIR}/silc.conf.default ${PKG_SYSCONFDIR}/silc.conf diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 2da34292713..38129f07d83 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/09/13 22:02:24 salo Exp $ +# $NetBSD: Makefile,v 1.43 2005/12/05 20:49:54 rillig Exp $ # DISTNAME= silc-server-1.0 @@ -32,7 +32,7 @@ PKG_USERS= ${SILCD_USER}:${SILCD_GROUP}::SILC\ Server\ user PKG_SYSCONFSUBDIR?= ${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} -MAKE_ENV+= examplesdir=${EGDIR} +MAKE_ENV+= examplesdir=${EGDIR:Q} CONF_FILES_MODE= 0600 CONF_FILES+= ${EGDIR}/silcd.conf.default \ @@ -65,7 +65,7 @@ CONFIGURE_ARGS+= --enable-shared # XXX: Avoid an ICE in gcc2 on sparc64 # -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} .if ${MACHINE_ARCH} != "i386" CONFIGURE_ARGS+= --disable-asm diff --git a/chat/tik/Makefile b/chat/tik/Makefile index ecbfa0a47ae..d47ea712202 100644 --- a/chat/tik/Makefile +++ b/chat/tik/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:18 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:54 rillig Exp $ # DISTNAME= tik-0.90 @@ -63,4 +63,3 @@ do-install: ${PREFIX}/share/examples/tik .include "../../mk/bsd.pkg.mk" - diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile index cf05cd52e35..9542e68d2c7 100644 --- a/chat/weechat/Makefile +++ b/chat/weechat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:06 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:54 rillig Exp $ # DISTNAME= weechat-0.0.6 @@ -18,7 +18,7 @@ BUILD_USES_MSGFMT= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -INCOMPAT_CURSES+= NetBSD-1.* +INCOMPAT_CURSES+= NetBSD-1.*-* .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile index ed0ace539e9..6b0fe9f4560 100644 --- a/chat/xchat-systray-integration/Makefile +++ b/chat/xchat-systray-integration/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:13 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:54 rillig Exp $ DISTNAME= xchat-systray-integration-2.4.5-src PKGNAME= ${DISTNAME:S/-src//} @@ -9,7 +9,7 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://blight.altervista.org/index.php?act=Systray COMMENT= Systray icon plugin for X-Chat -DEPENDS= xchat>=2.0:../../chat/xchat +DEPENDS+= xchat>=2.0:../../chat/xchat WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_TOOLS+= gmake pkg-config @@ -17,7 +17,7 @@ USE_TOOLS+= gmake pkg-config # We build a shared object, so ensure that the object files are PIC. CFLAGS+= -fPIC -MAKE_ENV+= prefix=${PREFIX} +MAKE_ENV+= prefix=${PREFIX:Q} .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/ymessenger/Makefile b/chat/ymessenger/Makefile index 96dff8f3509..f0e0aba7722 100644 --- a/chat/ymessenger/Makefile +++ b/chat/ymessenger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/04/24 22:46:08 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:54 rillig Exp $ DISTNAME= ymessenger-0.93.0 CATEGORIES= chat @@ -28,7 +28,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} EXTRACT_ONLY= # empty NO_BUILD= yes PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR} +PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} RPMFILES= ${DISTFILES} diff --git a/chat/zephyr-mode/Makefile b/chat/zephyr-mode/Makefile index a1984a3a222..8fe99c83291 100644 --- a/chat/zephyr-mode/Makefile +++ b/chat/zephyr-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:28 uebayasi Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:54 rillig Exp $ # DISTNAME= zephyr-mode-2.5.20 @@ -10,7 +10,7 @@ MAINTAINER= sommerfeld@NetBSD.org HOMEPAGE= http://www-2.cs.cmu.edu/People/dkindred/zephyr-mode/zephyr.html COMMENT= CMU Emacs-based Zephyr client -DEPENDS= tzc>=2.6.15:../../chat/tzc +DEPENDS+= tzc>=2.6.15:../../chat/tzc NO_BUILD= yes diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile index 9abdfde1e81..c789edd6c86 100644 --- a/chat/zephyr/Makefile +++ b/chat/zephyr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:41 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:54 rillig Exp $ # DISTNAME= zephyr-20010518 @@ -38,7 +38,6 @@ pre-install: .for f in ${ZEPHYR_DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${ZEPHYR_DOCDIR} .endfor -.undef f .include "../../devel/readline/buildlink3.mk" .include "../../net/hesiod/buildlink3.mk" |