8 files changed, 16 insertions, 126 deletions

diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index 95e808ceb710..4a065b988aef 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bitlbee
-PORTVERSION=	1.2.5
+PORTVERSION=	1.2.6a
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		${MASTER_SITE_LOCAL}
@@ -33,27 +33,13 @@ OPTIONS=	DEBUG "Enable debug support" 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
+		YAHOO "Enable Yahoo! protocol support" On \
+		TWITTER "Enable Twitter protocol support" On
 
 CONFIGURE_ARGS=	--config=/var/db/bitlbee --strip=0
 
-BITLBEEUSER?=	bitlbee
-BITLBEEGROUP?=	bitlbee
-BITLBEEDIR?=	/nonexistent
-
-BITLBEEUID=	914
-BITLBEEGID=	${BITLBEEUID}
-
-PLIST_SUB=	BITLBEEUSER=${BITLBEEUSER} \
-		BITLBEEGROUP=${BITLBEEGROUP}
-
-SUB_LIST+=	BITLBEEUSER=${BITLBEEUSER} \
-		BITLBEEGROUP=${BITLBEEGROUP} \
-		BITLBEEDIR=${BITLBEEDIR} \
-		BITLBEEUID=${BITLBEEUID} \
-		BITLBEEGID=${BITLBEEGID}
-
-SUB_FILES+=	pkg-install pkg-deinstall
+USERS=		bitlbee
+GROUPS=		bitlbee
 
 CONFLICTS=	bitlbee-otr-[0-9]*
 
@@ -102,6 +88,12 @@ CONFIGURE_ARGS+=--yahoo=1
 CONFIGURE_ARGS+=--yahoo=0
 .endif
 
+.if defined(WITH_TWITTER)
+CONFIGURE_ARGS+=--twitter=1
+.else
+CONFIGURE_ARGS+=--twitter=0
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s|^EFLAGS=|EFLAGS=${LDFLAGS}|" \
@@ -120,13 +112,8 @@ post-patch:
 		${WRKSRC}/configure
 .endif
 
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
 	${MKDIR} ${PREFIX}/etc/bitlbee
-	${MKDIR} -m 0700 /var/db/bitlbee
-	${CHOWN} -R ${BITLBEEUSER}:${BITLBEEGROUP} /var/db/bitlbee
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/doc/@} ${DOCSDIR}
diff --git a/irc/bitlbee/distinfo b/irc/bitlbee/distinfo
index 5fb27d298e7b..fc43d4231884 100644
--- a/irc/bitlbee/distinfo
+++ b/irc/bitlbee/distinfo
@@ -1,3 +1,3 @@
-MD5 (bitlbee-1.2.5.tar.gz) = 7b5882a6bc1b16d82d2109a99cf92fc5
-SHA256 (bitlbee-1.2.5.tar.gz) = 7a66448b64c2f28823abd262691b221d530cc9aed929d4f91a79abc92fd06a0e
-SIZE (bitlbee-1.2.5.tar.gz) = 486510
+MD5 (bitlbee-1.2.6a.tar.gz) = c5bb4330d1089721c178ba4b18995e89
+SHA256 (bitlbee-1.2.6a.tar.gz) = f00fee060f4538bf8d18c0c7097cb9a4a0484dae25369fb827edf4f3f65612cb
+SIZE (bitlbee-1.2.6a.tar.gz) = 503842
diff --git a/irc/bitlbee/files/bitlbee.in b/irc/bitlbee/files/bitlbee.in
index ac68f0955ea0..85bf75fe5b7e 100644
--- a/irc/bitlbee/files/bitlbee.in
+++ b/irc/bitlbee/files/bitlbee.in
@@ -18,7 +18,7 @@ rcvar=`set_rcvar`
 load_rc_config $name
 
 : ${bitlbee_enable="NO"}
-: ${bitlbee_user="%%BITLBEEUSER%%"}
+: ${bitlbee_user="bitlbee"}
 : ${bitlbee_config="%%PREFIX%%/etc/bitlbee/bitlbee.conf"}
 
 required_files="${bitlbee_config}"
diff --git a/irc/bitlbee/files/pkg-deinstall.in b/irc/bitlbee/files/pkg-deinstall.in
deleted file mode 100644
index ace23937dfc0..000000000000
--- a/irc/bitlbee/files/pkg-deinstall.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh -
-#
-# $FreeBSD$
-#
-
-BITLBEEUSER=%%BITLBEEUSER%%
-BITLBEEGROUP=%%BITLBEEGROUP%%
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-  if /usr/sbin/pw group show "${BITLBEEGROUP}" 2>&1 >/dev/null; then
-    echo "You should manually remove the \"${BITLBEEGROUP}\" group."
-  fi
-
-  if /usr/sbin/pw user show "${BITLBEEUSER}" 2>&1 >/dev/null; then
-    echo "You should manually remove the \"${BITLBEEUSER}\" user."
-  fi
-fi
diff --git a/irc/bitlbee/files/pkg-install.in b/irc/bitlbee/files/pkg-install.in
deleted file mode 100644
index 06a9fa3d7beb..000000000000
--- a/irc/bitlbee/files/pkg-install.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh -
-#
-# $FreeBSD$
-#
-
-BITLBEEDIR=%%BITLBEEDIR%%
-BITLBEEUSER=%%BITLBEEUSER%%
-BITLBEEGROUP=%%BITLBEEGROUP%%
-BITLBEEUID=%%BITLBEEUID%%
-BITLBEEGID=%%BITLBEEGID%%
-
-ask() {
-  local question default answer
-
-  question=$1
-  default=$2
-  if [ -z "${PACKAGE_BUILDING}" ]; then
-    read -p "${question} [${default}]? " answer
-  fi
-  if [ "x${answer}" = "x" ]; then
-    answer=${default}
-  fi
-  echo ${answer}
-}
-
-yesno() {
-  local default question answer
-
-  question=$1
-  default=$2
-  while :; do
-    answer=$(ask "${question}" "${default}")
-    case "${answer}" in
-      [Yy][Ee][Ss]|[Yy])
-        return 0
-        ;;
-      [Nn][Oo]|[Nn])
-        return 1
-        ;;
-    esac
-    echo "Please answer yes or no."
-   done
-}
-
-if [ "$2" = "PRE-INSTALL" ]; then
-  if /usr/sbin/pw group show "${BITLBEEGROUP}" 2>&1 >/dev/null; then
-    echo "You already have a \"${BITLBEEGROUP}\" group, so I will use it."
-  else
-    echo "You need a \"${BITLBEEGROUP}\" group."
-    if yesno "Would you like me to create it" "YES"; then
-      /usr/sbin/pw groupadd "${BITLBEEGROUP}" -g "${BITLBEEGID}" -h - || \
-        /usr/sbin/pw groupadd "${BITLBEEGROUP}" -h - || exit
-      echo "Done."
-    else
-      echo "Please create the \"${BITLBEEGROUP}\" group manually and try again."
-      exit 1
-    fi
-  fi
-
-  if /usr/sbin/pw user show "${BITLBEEUSER}" 2>&1 >/dev/null; then
-    echo "You already have a \"${BITLBEEUSER}\" user, so I will use it."
-  else
-    echo "You need a \"${BITLBEEUSER}\" user."
-    if yesno "Would you like me to create it" "YES"; then
-      /usr/sbin/pw useradd "${BITLBEEUSER}" -u "${BITLBEEUID}" -g "${BITLBEEGROUP}" -h - -d "${BITLBEEDIR}" \
-        -s /sbin/nologin -c "Bitlbee pseudo-user" || \
-        /usr/sbin/pw useradd "${BITLBEEUSER}" -g "${BITLBEEGROUP}" -h - -d "${BITLBEEDIR}" \
-        -s /sbin/nologin -c "Bitlbee pseudo-user" || exit
-    else
-      echo "Please create the \"${BITLBEEUSER}\" user manually and try again."
-      exit 1
-    fi
-  fi
-fi
diff --git a/irc/bitlbee/files/pkg-message.in b/irc/bitlbee/files/pkg-message.in
index 98c9329f1da3..9ca1d122ed4a 100644
--- a/irc/bitlbee/files/pkg-message.in
+++ b/irc/bitlbee/files/pkg-message.in
@@ -13,7 +13,7 @@ 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
+ircd		stream	tcp	nowait	bitlbee	/usr/local/sbin/bitlbee	bitlbee -I
 
 To instead launch bitlbee as a daemon, add the following line to
 /etc/rc.conf:
diff --git a/irc/bitlbee/pkg-descr b/irc/bitlbee/pkg-descr
index 5da6017d5fc2..ba68f5386e5a 100644
--- a/irc/bitlbee/pkg-descr
+++ b/irc/bitlbee/pkg-descr
@@ -3,6 +3,3 @@ as an IRC server which forwards everything you say to people on
 other chat networks like MSN/ICQ/Jabber.
 
 WWW: http://www.bitlbee.org/
-
-- Peter van Dijk
-peter@dataloss.nl
diff --git a/irc/bitlbee/pkg-plist b/irc/bitlbee/pkg-plist
index 42efbad3d34f..38c703d82a94 100644
--- a/irc/bitlbee/pkg-plist
+++ b/irc/bitlbee/pkg-plist
@@ -3,6 +3,3 @@ sbin/bitlbee
 @dirrm %%DATADIR%%
 @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