Thu Feb 25 11:28:58 2016 UTC ()
Use OPSYSVARS.


(jperkin)
diff -r1.56 -r1.57 pkgsrc/chat/bitchx/Makefile
diff -r1.74 -r1.75 pkgsrc/chat/ircII/Makefile
diff -r1.6 -r1.7 pkgsrc/chat/phone/Makefile
diff -r1.23 -r1.24 pkgsrc/chat/prosody/Makefile
diff -r1.65 -r1.66 pkgsrc/chat/xchat/Makefile.common
cvs diff -r1.56 -r1.57 pkgsrc/chat/bitchx/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/bitchx/Makefile 2015/09/27 19:06:23 1.56
+++ pkgsrc/chat/bitchx/Makefile 2016/02/25 11:28:57 1.57
@@ -1,33 +1,29 @@ @@ -1,33 +1,29 @@
1# $NetBSD: Makefile,v 1.56 2015/09/27 19:06:23 kamil Exp $ 1# $NetBSD: Makefile,v 1.57 2016/02/25 11:28:57 jperkin Exp $
2 2
3DISTNAME= bitchx-1.2.1 3DISTNAME= bitchx-1.2.1
4CATEGORIES= chat 4CATEGORIES= chat
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bitchx/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bitchx/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.bitchx.org/ 8HOMEPAGE= http://www.bitchx.org/
9COMMENT= IRC client based on ircII 9COMMENT= IRC client based on ircII
10LICENSE= modified-bsd 10LICENSE= modified-bsd
11 11
12USE_TOOLS+= bash 12USE_TOOLS+= bash
13 13
14GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
15CONFIGURE_ARGS+= --with-ssl 15CONFIGURE_ARGS+= --with-ssl
16CONFIGURE_ARGS+= --datadir=${PREFIX}/share 16CONFIGURE_ARGS+= --datadir=${PREFIX}/share
17CONFIG_SHELL= ${TOOLS_PATH.bash} 17CONFIG_SHELL= ${TOOLS_PATH.bash}
18 18
19.include "../../mk/bsd.prefs.mk" 19CFLAGS.Darwin+= -DBIND_8_COMPAT
20 
21.if ${OPSYS} == "Darwin" 
22CFLAGS+= -DBIND_8_COMPAT 
23.endif 
24 20
25SUBST_CLASSES+= manpage 21SUBST_CLASSES+= manpage
26SUBST_STAGE.manpage= post-patch 22SUBST_STAGE.manpage= post-patch
27SUBST_FILES.manpage+= doc/BitchX.1 23SUBST_FILES.manpage+= doc/BitchX.1
28SUBST_SED.manpage+= -e 's,@PREFIX@,${PREFIX},g' 24SUBST_SED.manpage+= -e 's,@PREFIX@,${PREFIX},g'
29 25
30.include "../../archivers/bzip2/buildlink3.mk" 26.include "../../archivers/bzip2/buildlink3.mk"
31.include "../../security/openssl/buildlink3.mk" 27.include "../../security/openssl/buildlink3.mk"
32.include "../../mk/terminfo.buildlink3.mk" 28.include "../../mk/terminfo.buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.74 -r1.75 pkgsrc/chat/ircII/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/ircII/Makefile 2015/12/07 06:44:23 1.74
+++ pkgsrc/chat/ircII/Makefile 2016/02/25 11:28:58 1.75
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.74 2015/12/07 06:44:23 mrg Exp $ 1# $NetBSD: Makefile,v 1.75 2016/02/25 11:28:58 jperkin Exp $
2 2
3DISTNAME= ircii-${VERS} 3DISTNAME= ircii-${VERS}
4PKGNAME= ircII-${VERS} 4PKGNAME= ircII-${VERS}
5CATEGORIES= chat 5CATEGORIES= chat
6MASTER_SITES= http://ircii.warped.com/ 6MASTER_SITES= http://ircii.warped.com/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.eterna.com.au/ircii/ 10HOMEPAGE= http://www.eterna.com.au/ircii/
11COMMENT= 'Internet Relay Chat' and 'Internet Citizens Band' Client 11COMMENT= 'Internet Relay Chat' and 'Internet Citizens Band' Client
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14CONFLICTS= blackened-[0-9]* 14CONFLICTS= blackened-[0-9]*
@@ -35,29 +35,27 @@ USE_TOOLS+= chmod # see post-extract @@ -35,29 +35,27 @@ USE_TOOLS+= chmod # see post-extract
35 35
36# This pkg auto-detects IPv6. 36# This pkg auto-detects IPv6.
37BUILD_DEFS+= IPV6_READY 37BUILD_DEFS+= IPV6_READY
38 38
39.include "options.mk" 39.include "options.mk"
40 40
41# Allow customizations from ${MAKECONF} 41# Allow customizations from ${MAKECONF}
42CONFIGURE_ARGS+= ${IRCII_CONFIGURE_ARGS} 42CONFIGURE_ARGS+= ${IRCII_CONFIGURE_ARGS}
43CONFIGURE_ENV+= ${IRCII_CONFIGURE_ENV} 43CONFIGURE_ENV+= ${IRCII_CONFIGURE_ENV}
44 44
45LDFLAGS.SunOS+= -lsocket -lnsl 45LDFLAGS.SunOS+= -lsocket -lnsl
46LDFLAGS+= ${BUILDLINK_LDADD.iconv} 46LDFLAGS+= ${BUILDLINK_LDADD.iconv}
47 47
48.if ${OPSYS} == "Interix" 48CONFIGURE_ARGS.Interix+= --with-non-blocking=none
49CONFIGURE_ARGS+= --with-non-blocking=none 
50.endif 
51 49
52# Optionally install compressed help files if MANZ is defined. 50# Optionally install compressed help files if MANZ is defined.
53.if defined(MANZ) 51.if defined(MANZ)
54PLIST_SUBST+= GZSUFFIX=".gz" 52PLIST_SUBST+= GZSUFFIX=".gz"
55DOC_COMPRESS_ARGS= -z ${DESTDIR}${PREFIX} 53DOC_COMPRESS_ARGS= -z ${DESTDIR}${PREFIX}
56.else 54.else
57PLIST_SUBST+= GZSUFFIX= 55PLIST_SUBST+= GZSUFFIX=
58DOC_COMPRESS_ARGS= ${DESTDIR}${PREFIX} 56DOC_COMPRESS_ARGS= ${DESTDIR}${PREFIX}
59.endif 57.endif
60 58
61post-extract: 59post-extract:
62 chmod -R g-w ${WRKSRC}/help/. 60 chmod -R g-w ${WRKSRC}/help/.
63 61
cvs diff -r1.6 -r1.7 pkgsrc/chat/phone/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/phone/Makefile 2015/11/07 22:19:32 1.6
+++ pkgsrc/chat/phone/Makefile 2016/02/25 11:28:58 1.7
@@ -1,30 +1,26 @@ @@ -1,30 +1,26 @@
1# $NetBSD: Makefile,v 1.6 2015/11/07 22:19:32 dholland Exp $ 1# $NetBSD: Makefile,v 1.7 2016/02/25 11:28:58 jperkin Exp $
2 2
3DISTNAME= phone-2.0 3DISTNAME= phone-2.0
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= chat 5CATEGORIES= chat
6MASTER_SITES= ftp://ftp.astron.com/pub/phone/ 6MASTER_SITES= ftp://ftp.astron.com/pub/phone/
7DIST_SUBDIR= phone-2.0nb1 7DIST_SUBDIR= phone-2.0nb1
8 8
9MAINTAINER= christos@NetBSD.org 9MAINTAINER= christos@NetBSD.org
10HOMEPAGE= ftp://ftp.astron.com/pub/phone/ 10HOMEPAGE= ftp://ftp.astron.com/pub/phone/
11COMMENT= Multi-person chat program, like VMS phone 11COMMENT= Multi-person chat program, like VMS phone
12LICENSE= generic-nonlicense 12LICENSE= generic-nonlicense
13 13
14INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 sbin 14INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 sbin
15 15
16# needs utmpx unless someone wants to patch legacy utmp support in 16# needs utmpx unless someone wants to patch legacy utmp support in
17BROKEN_ON_PLATFORM= OpenBSD-*-* 17BROKEN_ON_PLATFORM= OpenBSD-*-*
18 18
19.include "../../mk/bsd.prefs.mk" 19BUILDLINK_TRANSFORM.Darwin+= rm:-Wa,--fatal-warnings
20 20CFLAGS.Darwin+= -DINFTIM=-1
21.if ${OPSYS} == "Darwin" 
22BUILDLINK_TRANSFORM+= rm:-Wa,--fatal-warnings 
23CFLAGS+= -DINFTIM=-1 
24.endif 
25 21
26post-install: 22post-install:
27 ${INSTALL_MAN} ${WRKSRC}/phone.1 \ 23 ${INSTALL_MAN} ${WRKSRC}/phone.1 \
28 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/phone.1 24 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/phone.1
29 25
30.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.23 -r1.24 pkgsrc/chat/prosody/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/prosody/Makefile 2016/02/01 12:35:33 1.23
+++ pkgsrc/chat/prosody/Makefile 2016/02/25 11:28:58 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.23 2016/02/01 12:35:33 fhajny Exp $ 1# $NetBSD: Makefile,v 1.24 2016/02/25 11:28:58 jperkin Exp $
2# 2#
3 3
4DISTNAME= prosody-0.9.10 4DISTNAME= prosody-0.9.10
5CATEGORIES= chat 5CATEGORIES= chat
6MASTER_SITES= http://prosody.im/downloads/source/ 6MASTER_SITES= http://prosody.im/downloads/source/
7 7
8MAINTAINER= filip@joyent.com 8MAINTAINER= filip@joyent.com
9HOMEPAGE= http://prosody.im/ 9HOMEPAGE= http://prosody.im/
10COMMENT= Flexible communications server for Jabber/XMPP written in Lua 10COMMENT= Flexible communications server for Jabber/XMPP written in Lua
11LICENSE= mit 11LICENSE= mit
12 12
13DEPENDS+= ${LUA_PKGPREFIX}-expat>=1.2:../../textproc/lua-expat 13DEPENDS+= ${LUA_PKGPREFIX}-expat>=1.2:../../textproc/lua-expat
14DEPENDS+= ${LUA_PKGPREFIX}-filesystem>=1.0:../../devel/lua-filesystem 14DEPENDS+= ${LUA_PKGPREFIX}-filesystem>=1.0:../../devel/lua-filesystem
@@ -57,25 +57,23 @@ SUBST_MESSAGE.path= Fixing default paths @@ -57,25 +57,23 @@ SUBST_MESSAGE.path= Fixing default paths
57SUBST_STAGE.path= pre-configure 57SUBST_STAGE.path= pre-configure
58SUBST_FILES.path= Makefile man/prosodyctl.man prosody.cfg.lua.dist 58SUBST_FILES.path= Makefile man/prosodyctl.man prosody.cfg.lua.dist
59SUBST_SED.path= -e 's,/etc/prosody,${PKG_SYSCONFDIR},g' 59SUBST_SED.path= -e 's,/etc/prosody,${PKG_SYSCONFDIR},g'
60SUBST_VARS.path= EGDIR PROSODY_DATA PROSODY_LOG PROSODY_RUN 60SUBST_VARS.path= EGDIR PROSODY_DATA PROSODY_LOG PROSODY_RUN
61 61
62CONFIGURE_ARGS+= --cflags=${CFLAGS:Q} 62CONFIGURE_ARGS+= --cflags=${CFLAGS:Q}
63CONFIGURE_ARGS+= --datadir=${PROSODY_DATA} 63CONFIGURE_ARGS+= --datadir=${PROSODY_DATA}
64CONFIGURE_ARGS+= --ldflags="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared" 64CONFIGURE_ARGS+= --ldflags="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared"
65CONFIGURE_ARGS+= --prefix=${PREFIX} 65CONFIGURE_ARGS+= --prefix=${PREFIX}
66CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 66CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
67CONFIGURE_ARGS+= --with-lua-include=${PREFIX}/${LUA_INCDIR} 67CONFIGURE_ARGS+= --with-lua-include=${PREFIX}/${LUA_INCDIR}
68 68
69CFLAGS+= -fPIC -Wall -DLUA_COMPAT_MODULE 69CFLAGS+= -fPIC -Wall -DLUA_COMPAT_MODULE
70.if ${OPSYS} == "SunOS" 70MAKE_ENV.SunOS+= SOCKET_LIB=-lsocket
71MAKE_ENV+= SOCKET_LIB=-lsocket 
72.endif 
73 71
74RCD_SCRIPTS= prosody 72RCD_SCRIPTS= prosody
75 73
76.include "../../lang/lua/application.mk" 74.include "../../lang/lua/application.mk"
77.include "../../lang/lua/tool.mk" 75.include "../../lang/lua/tool.mk"
78.include "../../devel/libidn/buildlink3.mk" 76.include "../../devel/libidn/buildlink3.mk"
79.include "../../lang/lua/buildlink3.mk" 77.include "../../lang/lua/buildlink3.mk"
80.include "../../security/openssl/buildlink3.mk" 78.include "../../security/openssl/buildlink3.mk"
81.include "../../mk/bsd.pkg.mk" 79.include "../../mk/bsd.pkg.mk"
cvs diff -r1.65 -r1.66 pkgsrc/chat/xchat/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/chat/xchat/Attic/Makefile.common 2015/12/29 04:54:37 1.65
+++ pkgsrc/chat/xchat/Attic/Makefile.common 2016/02/25 11:28:58 1.66
@@ -1,28 +1,24 @@ @@ -1,28 +1,24 @@
1# $NetBSD: Makefile.common,v 1.65 2015/12/29 04:54:37 dholland Exp $ 1# $NetBSD: Makefile.common,v 1.66 2016/02/25 11:28:58 jperkin Exp $
2# 2#
3# used by chat/xchat/Makefile 3# used by chat/xchat/Makefile
4# used by chat/xchat-perl/Makefile 4# used by chat/xchat-perl/Makefile
5# used by chat/xchat-python/Makefile 5# used by chat/xchat-python/Makefile
6 6
7DISTNAME= xchat-2.8.8 7DISTNAME= xchat-2.8.8
8CATEGORIES= chat 8CATEGORIES= chat
9MASTER_SITES= http://xchat.org/files/source/2.8/ 9MASTER_SITES= http://xchat.org/files/source/2.8/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12HOMEPAGE= http://xchat.org/ 12HOMEPAGE= http://xchat.org/
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15DISTINFO_FILE= ${.CURDIR}/../../chat/xchat/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../chat/xchat/distinfo
16PATCHDIR?= ${.CURDIR}/../../chat/xchat/patches 16PATCHDIR?= ${.CURDIR}/../../chat/xchat/patches
17 17
18GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
19USE_LIBTOOL= YES 19USE_LIBTOOL= YES
20USE_TOOLS+= gmake pkg-config 20USE_TOOLS+= gmake pkg-config
21 21
22.include "../../mk/bsd.prefs.mk" 22CONFIGURE_ARGS.Darwin+= --disable-mmx
23 
24.if ${OPSYS} == "Darwin" 
25CONFIGURE_ARGS+= --disable-mmx 
26.endif 
27 23
28.include "../../devel/glib2/buildlink3.mk" 24.include "../../devel/glib2/buildlink3.mk"