aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--irc/Makefile1
-rw-r--r--irc/bitlbee-otr/Makefile85
-rw-r--r--irc/bitlbee-otr/distinfo6
-rw-r--r--irc/bitlbee-otr/files/pkg-message.in6
-rw-r--r--irc/bitlbee-otr/pkg-descr11
-rw-r--r--irc/bitlbee-otr/pkg-plist6
6 files changed, 59 insertions, 56 deletions
diff --git a/irc/Makefile b/irc/Makefile
index 4be47330e243..61bb3b7ad8e3 100644
--- a/irc/Makefile
+++ b/irc/Makefile
@@ -7,6 +7,7 @@
SUBDIR += bip
SUBDIR += bitchx
SUBDIR += bitlbee
+ SUBDIR += bitlbee-otr
SUBDIR += blackened
SUBDIR += bnc
SUBDIR += bobot++
diff --git a/irc/bitlbee-otr/Makefile b/irc/bitlbee-otr/Makefile
index c18cbd80438d..af4164ecaa73 100644
--- a/irc/bitlbee-otr/Makefile
+++ b/irc/bitlbee-otr/Makefile
@@ -1,40 +1,39 @@
# New ports collection makefile for: bitlbee
-# Date created: 10 June 2003
-# Whom: Peter van Dijk <peter@dataloss.nl>
+# Date created: 8 August 2008
+# Whom: Ashish Shukla <wahjava@gmail.com>
#
# $FreeBSD$
#
-PORTNAME= bitlbee
+PORTNAME= bitlbee-otr
PORTVERSION= 1.2.3
CATEGORIES= irc
-MASTER_SITES= http://get.bitlbee.org/src/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= brix
+MASTER_SITES= http://wahjava.googlepages.com/
-MAINTAINER= brix@FreeBSD.org
-COMMENT= An IRC to other chat networks gateway
+MAINTAINER= wahjava@gmail.com
+COMMENT= An IRC to other chat networks gateway with support for OTR
SUB_FILES= pkg-message
MAN5= bitlbee.conf.5
MAN8= bitlbee.8
PORTDOCS= AUTHORS CHANGES CREDITS FAQ README
PORTEXAMPLES= bitlbee.conf motd.txt
+CONFLICTS= bitlbee-[0-9]*
GNU_CONFIGURE= yes
+USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= glib20
USE_RC_SUBR= bitlbee
PKGMESSAGE= ${WRKDIR}/pkg-message
-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
-
+OPTIONS= MSN "Enable MSN protocol support" On \
+ DEBUG "Create debuggable binary" Off \
+ OPENSSL "Use openssl rather than gnutls" Off \
+ IPV6 "Compile IPV6 support" On \
+ XMPP "Enable 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
@@ -58,49 +57,55 @@ SUB_FILES+= pkg-install pkg-deinstall
.include <bsd.port.pre.mk>
-.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+=--ipv6=0
-.endif
-
-.if defined(WITH_OPENSSL)
-CONFIGURE_ARGS+=--ssl=openssl
-.else
-CONFIGURE_ARGS+=--ssl=gnutls
-LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls
-.endif
-
-.if defined(WITH_MSN)
+.if !defined(WITHOUT_MSN)
CONFIGURE_ARGS+=--msn=1
.else
-CONFIGURE_ARGS+=--msn=0
+CONFIGURE_ARGS+=--msn=0 --ssl=bogus
.endif
-.if defined(WITH_JABBER)
+.if !defined(WITHOUT_XMPP)
CONFIGURE_ARGS+=--jabber=1
.else
CONFIGURE_ARGS+=--jabber=0
.endif
-.if defined(WITH_OSCAR)
+.if !defined(WITHOUT_OSCAR)
CONFIGURE_ARGS+=--oscar=1
.else
CONFIGURE_ARGS+=--oscar=0
.endif
-.if defined(WITH_YAHOO)
+.if !defined(WITHOUT_YAHOO)
CONFIGURE_ARGS+=--yahoo=1
.else
CONFIGURE_ARGS+=--yahoo=0
.endif
+.if defined(WITH_OPENSSL)
+CONFIGURE_ARGS+=--ssl=openssl
+.else
+CONFIGURE_ARGS+=--ssl=gnutls
+LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--debug=1
+.endif
+
+.if defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=--ipv6=0
+.endif
+
+LIB_DEPENDS+= otr.4:${PORTSDIR}/security/libotr
+CONFIGURE_ARGS+=--otr=1
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+= ${LOCALBASE}/bin/xmlto:${PORTSDIR}/textproc/xmlto \
+ ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
+post-build:
+ ${MKDIR} ${WRKSRC}/.bzr
+ ${GMAKE} -C ${WRKSRC}/doc/user-guide
+.endif
+
post-patch:
@${REINPLACE_CMD} \
-e "s|^EFLAGS=|EFLAGS=${LDFLAGS}|" \
diff --git a/irc/bitlbee-otr/distinfo b/irc/bitlbee-otr/distinfo
index 099b0c909cd9..1e18608742c1 100644
--- a/irc/bitlbee-otr/distinfo
+++ b/irc/bitlbee-otr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bitlbee-1.2.3.tar.gz) = 2b1674d98804970809de3da3edf0bed2
-SHA256 (bitlbee-1.2.3.tar.gz) = 0cbb30188c829dc486f8d1a4157626280f93ae2a60c9f6846fe6414c416745e2
-SIZE (bitlbee-1.2.3.tar.gz) = 475748
+MD5 (bitlbee-otr-1.2.3.tar.bz2) = 089e2b3608673a00085283333d7cc32c
+SHA256 (bitlbee-otr-1.2.3.tar.bz2) = a136a4cc9b2eb0fdd28cdbc47ff53266eea28fb43f4db1bdb1f67e4e3f34f6cd
+SIZE (bitlbee-otr-1.2.3.tar.bz2) = 368134
diff --git a/irc/bitlbee-otr/files/pkg-message.in b/irc/bitlbee-otr/files/pkg-message.in
index 98c9329f1da3..811f35db2080 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.
+inetd(8) or run it as a stand-alone daemon (experimental).
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, add the following line to
-/etc/rc.conf:
+To instead launch bitlbee as a daemon (experimental), add the
+following line to /etc/rc.conf:
bitlbee_enable="YES"
diff --git a/irc/bitlbee-otr/pkg-descr b/irc/bitlbee-otr/pkg-descr
index 5da6017d5fc2..5127a7ab5622 100644
--- a/irc/bitlbee-otr/pkg-descr
+++ b/irc/bitlbee-otr/pkg-descr
@@ -1,8 +1,5 @@
-An IRC to other chat networks gateway. This program can be used
-as an IRC server which forwards everything you say to people on
-other chat networks like MSN/ICQ/Jabber.
+This is an otr-enabled branch of the mainline
+BitlBee development version. This is not any
+official bitlbee version.
-WWW: http://www.bitlbee.org/
-
-- Peter van Dijk
-peter@dataloss.nl
+WWW: http://www.khjk.org/bitlbee-otr/
diff --git a/irc/bitlbee-otr/pkg-plist b/irc/bitlbee-otr/pkg-plist
index 42efbad3d34f..26a63320f1da 100644
--- a/irc/bitlbee-otr/pkg-plist
+++ b/irc/bitlbee-otr/pkg-plist
@@ -1,8 +1,8 @@
sbin/bitlbee
-%%DATADIR%%/help.txt
-@dirrm %%DATADIR%%
+share/bitlbee/help.txt
+@dirrm share/bitlbee
@dirrmtry etc/bitlbee
@exec mkdir -p %D/etc/bitlbee
@exec mkdir -m 0700 -p /var/db/bitlbee
@exec chown -R %%BITLBEEUSER%%:%%BITLBEEGROUP%% /var/db/bitlbee
-@unexec rmdir /var/db/bitlbee 2>/dev/null || true
+@dirrmtry /var/db/bitlbee