diff options
-rw-r--r-- | irc/bitlbee-otr/Makefile | 50 | ||||
-rw-r--r-- | irc/bitlbee-otr/distinfo | 6 | ||||
-rw-r--r-- | irc/bitlbee-otr/files/pkg-message.in | 6 | ||||
-rw-r--r-- | irc/bitlbee/Makefile | 50 | ||||
-rw-r--r-- | irc/bitlbee/distinfo | 6 | ||||
-rw-r--r-- | irc/bitlbee/files/pkg-message.in | 6 |
6 files changed, 88 insertions, 36 deletions
diff --git a/irc/bitlbee-otr/Makefile b/irc/bitlbee-otr/Makefile index 1c57a7b6bd57..02206453918d 100644 --- a/irc/bitlbee-otr/Makefile +++ b/irc/bitlbee-otr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bitlbee -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= irc MASTER_SITES= http://get.bitlbee.org/src/ \ ${MASTER_SITE_LOCAL} @@ -27,10 +27,14 @@ USE_GNOME= glib20 USE_RC_SUBR= bitlbee PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS= MSN "Enable MSN protocol support" On \ - DEBUG "Create debuggable binary" Off \ - OPENSSL "Use openssl rather than gnutls" Off \ - IPV6 "Compile IPV6 support" On +OPTIONS= DEBUG "Enable debug support" Off \ + IPV6 "Enable IPv6 support" On \ + OPENSSL "Use OpenSSL rather than GnuTLS" Off \ + MSN "Enable MSN protocol support" On \ + JABBER "Enable Jabber (XMPP) protocol support" On \ + OSCAR "Enable OSCAR (ICQ, AIM) protocol support" On \ + YAHOO "Enable Yahoo! protocol support" On + CONFIGURE_ARGS= --config=/var/db/bitlbee --strip=0 @@ -54,10 +58,16 @@ SUB_FILES+= pkg-install pkg-deinstall .include <bsd.port.pre.mk> -.if !defined(WITHOUT_MSN) -CONFIGURE_ARGS+=--msn=1 +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+=--debug=1 +.else +CONFIGURE_ARGS+=--debug=0 +.endif + +.if defined(WITH_IPV6) +CONFIGURE_ARGS+=--ipv6=1 .else -CONFIGURE_ARGS+=--msn=0 --ssl=bogus +CONFIGURE_ARGS+=--ipv6=0 .endif .if defined(WITH_OPENSSL) @@ -67,12 +77,28 @@ CONFIGURE_ARGS+=--ssl=gnutls LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls .endif -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+=--debug=1 +.if defined(WITH_MSN) +CONFIGURE_ARGS+=--msn=1 +.else +CONFIGURE_ARGS+=--msn=0 .endif -.if defined(WITHOUT_IPV6) -CONFIGURE_ARGS+=--ipv6=0 +.if defined(WITH_JABBER) +CONFIGURE_ARGS+=--jabber=1 +.else +CONFIGURE_ARGS+=--jabber=0 +.endif + +.if defined(WITH_OSCAR) +CONFIGURE_ARGS+=--oscar=1 +.else +CONFIGURE_ARGS+=--oscar=0 +.endif + +.if defined(WITH_YAHOO) +CONFIGURE_ARGS+=--yahoo=1 +.else +CONFIGURE_ARGS+=--yahoo=0 .endif post-patch: diff --git a/irc/bitlbee-otr/distinfo b/irc/bitlbee-otr/distinfo index 935692be23c9..5848fcd5a06f 100644 --- a/irc/bitlbee-otr/distinfo +++ b/irc/bitlbee-otr/distinfo @@ -1,3 +1,3 @@ -MD5 (bitlbee-1.2.1.tar.gz) = ca00f65aea89903ba78321eac00f7849 -SHA256 (bitlbee-1.2.1.tar.gz) = 4654e8824eea2ba787b4751782ee3ca704b756d3c4f623cda409cde212198d06 -SIZE (bitlbee-1.2.1.tar.gz) = 471454 +MD5 (bitlbee-1.2.2.tar.gz) = d657a2d66f4098804e6b8f181cc0e852 +SHA256 (bitlbee-1.2.2.tar.gz) = 97dc5f28197ba61415b9e01c887b81b0efc8df38d8d1e7a0b66dac3cec719025 +SIZE (bitlbee-1.2.2.tar.gz) = 475550 diff --git a/irc/bitlbee-otr/files/pkg-message.in b/irc/bitlbee-otr/files/pkg-message.in index 811f35db2080..98c9329f1da3 100644 --- a/irc/bitlbee-otr/files/pkg-message.in +++ b/irc/bitlbee-otr/files/pkg-message.in @@ -8,15 +8,15 @@ Copy %%EXAMPLESDIR%%/motd.txt and modify them to suit your needs. You have two options for launching bitlbee: either launch it from -inetd(8) or run it as a stand-alone daemon (experimental). +inetd(8) or run it as a stand-alone daemon. To launch bitlbee from inetd(8), add the following line to /etc/inetd.conf and reload inetd(8): ircd stream tcp nowait %%BITLBEEUSER%% /usr/local/sbin/bitlbee bitlbee -I -To instead launch bitlbee as a daemon (experimental), add the -following line to /etc/rc.conf: +To instead launch bitlbee as a daemon, add the following line to +/etc/rc.conf: bitlbee_enable="YES" diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile index 1c57a7b6bd57..02206453918d 100644 --- a/irc/bitlbee/Makefile +++ b/irc/bitlbee/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bitlbee -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= irc MASTER_SITES= http://get.bitlbee.org/src/ \ ${MASTER_SITE_LOCAL} @@ -27,10 +27,14 @@ USE_GNOME= glib20 USE_RC_SUBR= bitlbee PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS= MSN "Enable MSN protocol support" On \ - DEBUG "Create debuggable binary" Off \ - OPENSSL "Use openssl rather than gnutls" Off \ - IPV6 "Compile IPV6 support" On +OPTIONS= DEBUG "Enable debug support" Off \ + IPV6 "Enable IPv6 support" On \ + OPENSSL "Use OpenSSL rather than GnuTLS" Off \ + MSN "Enable MSN protocol support" On \ + JABBER "Enable Jabber (XMPP) protocol support" On \ + OSCAR "Enable OSCAR (ICQ, AIM) protocol support" On \ + YAHOO "Enable Yahoo! protocol support" On + CONFIGURE_ARGS= --config=/var/db/bitlbee --strip=0 @@ -54,10 +58,16 @@ SUB_FILES+= pkg-install pkg-deinstall .include <bsd.port.pre.mk> -.if !defined(WITHOUT_MSN) -CONFIGURE_ARGS+=--msn=1 +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+=--debug=1 +.else +CONFIGURE_ARGS+=--debug=0 +.endif + +.if defined(WITH_IPV6) +CONFIGURE_ARGS+=--ipv6=1 .else -CONFIGURE_ARGS+=--msn=0 --ssl=bogus +CONFIGURE_ARGS+=--ipv6=0 .endif .if defined(WITH_OPENSSL) @@ -67,12 +77,28 @@ CONFIGURE_ARGS+=--ssl=gnutls LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls .endif -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+=--debug=1 +.if defined(WITH_MSN) +CONFIGURE_ARGS+=--msn=1 +.else +CONFIGURE_ARGS+=--msn=0 .endif -.if defined(WITHOUT_IPV6) -CONFIGURE_ARGS+=--ipv6=0 +.if defined(WITH_JABBER) +CONFIGURE_ARGS+=--jabber=1 +.else +CONFIGURE_ARGS+=--jabber=0 +.endif + +.if defined(WITH_OSCAR) +CONFIGURE_ARGS+=--oscar=1 +.else +CONFIGURE_ARGS+=--oscar=0 +.endif + +.if defined(WITH_YAHOO) +CONFIGURE_ARGS+=--yahoo=1 +.else +CONFIGURE_ARGS+=--yahoo=0 .endif post-patch: diff --git a/irc/bitlbee/distinfo b/irc/bitlbee/distinfo index 935692be23c9..5848fcd5a06f 100644 --- a/irc/bitlbee/distinfo +++ b/irc/bitlbee/distinfo @@ -1,3 +1,3 @@ -MD5 (bitlbee-1.2.1.tar.gz) = ca00f65aea89903ba78321eac00f7849 -SHA256 (bitlbee-1.2.1.tar.gz) = 4654e8824eea2ba787b4751782ee3ca704b756d3c4f623cda409cde212198d06 -SIZE (bitlbee-1.2.1.tar.gz) = 471454 +MD5 (bitlbee-1.2.2.tar.gz) = d657a2d66f4098804e6b8f181cc0e852 +SHA256 (bitlbee-1.2.2.tar.gz) = 97dc5f28197ba61415b9e01c887b81b0efc8df38d8d1e7a0b66dac3cec719025 +SIZE (bitlbee-1.2.2.tar.gz) = 475550 diff --git a/irc/bitlbee/files/pkg-message.in b/irc/bitlbee/files/pkg-message.in index 811f35db2080..98c9329f1da3 100644 --- a/irc/bitlbee/files/pkg-message.in +++ b/irc/bitlbee/files/pkg-message.in @@ -8,15 +8,15 @@ Copy %%EXAMPLESDIR%%/motd.txt and modify them to suit your needs. You have two options for launching bitlbee: either launch it from -inetd(8) or run it as a stand-alone daemon (experimental). +inetd(8) or run it as a stand-alone daemon. To launch bitlbee from inetd(8), add the following line to /etc/inetd.conf and reload inetd(8): ircd stream tcp nowait %%BITLBEEUSER%% /usr/local/sbin/bitlbee bitlbee -I -To instead launch bitlbee as a daemon (experimental), add the -following line to /etc/rc.conf: +To instead launch bitlbee as a daemon, add the following line to +/etc/rc.conf: bitlbee_enable="YES" |