[Midnightbsd-cvs] mports: irc/bitlbee: Update to 1.2.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Sep 11 01:14:04 EDT 2008
Log Message:
-----------
Update to 1.2.2
Modified Files:
--------------
mports/irc/bitlbee:
Makefile (r1.4 -> r1.5)
distinfo (r1.2 -> r1.3)
pkg-descr (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/irc/bitlbee/files:
pkg-message.in (r1.2 -> r1.3)
Added Files:
-----------
mports/irc/bitlbee/files:
bitlbee.in (r1.1)
pkg-deinstall.in (r1.1)
pkg-install.in (r1.1)
Removed Files:
-------------
mports/irc/bitlbee/files:
oscar-recode-patch
patch-Makefile
patch-configure
-------------- next part --------------
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/irc/bitlbee/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L irc/bitlbee/pkg-descr -L irc/bitlbee/pkg-descr -u -r1.1 -r1.2
--- irc/bitlbee/pkg-descr
+++ irc/bitlbee/pkg-descr
@@ -3,6 +3,3 @@
other chat networks like MSN/ICQ/Jabber.
WWW: http://www.bitlbee.org/
-
-- Peter van Dijk
-peter at dataloss.nl
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/irc/bitlbee/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L irc/bitlbee/pkg-plist -L irc/bitlbee/pkg-plist -u -r1.1 -r1.2
--- irc/bitlbee/pkg-plist
+++ irc/bitlbee/pkg-plist
@@ -1,7 +1,8 @@
sbin/bitlbee
%%DATADIR%%/help.txt
- at exec mkdir -p -m 700 %D/etc/bitlbee
-etc/bitlbee/bitlbee.conf.orig
-etc/bitlbee/motd.txt.orig
@dirrm %%DATADIR%%
@dirrmtry etc/bitlbee
+ at exec mkdir -p %D/etc/bitlbee
+ at exec mkdir -m 0700 -p /var/db/bitlbee
+ at exec chown -R %%BITLBEEUSER%%:%%BITLBEEGROUP%% /var/db/bitlbee
+ at unexec rmdir /var/db/bitlbee 2>/dev/null || true
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/irc/bitlbee/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L irc/bitlbee/Makefile -L irc/bitlbee/Makefile -u -r1.4 -r1.5
--- irc/bitlbee/Makefile
+++ irc/bitlbee/Makefile
@@ -3,69 +3,133 @@
# Whom: Peter van Dijk <peter at dataloss.nl>
#
# $MidnightBSD$
-# $FreeBSD: ports/irc/bitlbee/Makefile,v 1.26 2006/08/12 09:52:53 miwi Exp $
+# $FreeBSD: ports/irc/bitlbee/Makefile,v 1.45 2008/08/27 20:16:32 brix Exp $
#
PORTNAME= bitlbee
-PORTVERSION= 1.0.4
+PORTVERSION= 1.2.2
CATEGORIES= irc
-MASTER_SITES= http://get.bitlbee.org/src/
-
-PATCH_SITES= http://get.bitlbee.org/patches/
+MASTER_SITES= http://get.bitlbee.org/src/ \
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= brix
MAINTAINER= ports at MidnightBSD.org
COMMENT= An IRC to other chat networks gateway
+LICENSE= gpl2
SUB_FILES= pkg-message
MAN5= bitlbee.conf.5
MAN8= bitlbee.8
+PORTDOCS= AUTHORS CHANGES CREDITS FAQ README
+PORTEXAMPLES= bitlbee.conf motd.txt
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= glib20
-USE_GETOPT_LONG=yes
+USE_RC_SUBR= bitlbee
PKGMESSAGE= ${WRKDIR}/pkg-message
-OPTIONS= MSN "Enable MSN protocol support" On \
- LDAP "Enable LDAP authentication support" Off \
- RECODE "Enable oscar_recode_charset" Off \
- IPV6 "Enable 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
+
+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}
-CONFIGURE_ARGS= --mandir=${PREFIX}/man --config=${PREFIX}/etc/bitlbee
+SUB_FILES+= pkg-install pkg-deinstall
.include <bsd.port.pre.mk>
-.if defined(WITH_LDAP)
-PATCHFILES+= ${PORTNAME}-1.0-ldap.diff
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--debug=1
+.else
+CONFIGURE_ARGS+=--debug=0
.endif
-.if !defined(WITHOUT_MSN)
+.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)
CONFIGURE_ARGS+=--msn=1
.else
-CONFIGURE_ARGS+=--msn=0 --ssl=bogus
+CONFIGURE_ARGS+=--msn=0
.endif
-.if defined(WITH_RECODE)
-post-patch:
- @cd ${WRKSRC} && \
- ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/oscar-recode-patch
+.if defined(WITH_JABBER)
+CONFIGURE_ARGS+=--jabber=1
+.else
+CONFIGURE_ARGS+=--jabber=0
.endif
-.if defined(WITH_LDAP)
-USE_OPENLDAP= yes
-CONFIGURE_ARGS+=--ldap=${LOCALBASE}
+.if defined(WITH_OSCAR)
+CONFIGURE_ARGS+=--oscar=1
+.else
+CONFIGURE_ARGS+=--oscar=0
.endif
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--ipv6=0
+.if defined(WITH_YAHOO)
+CONFIGURE_ARGS+=--yahoo=1
+.else
+CONFIGURE_ARGS+=--yahoo=0
.endif
+post-patch:
+ @${REINPLACE_CMD} \
+ -e "s|^EFLAGS=|EFLAGS=${LDFLAGS}|" \
+ ${WRKSRC}/configure
+
+ @${REINPLACE_CMD} \
+ -e "s:/etc/bitlbee/motd.txt:${PREFIX}/etc/bitlbee/motd.txt:" \
+ -e "s:/var/lib/bitlbee:/var/db/bitlbee:" \
+ ${WRKSRC}/bitlbee.conf
+ @${REINPLACE_CMD} \
+ -e "s:/var/lib/bitlbee:/var/db/bitlbee:" \
+ ${WRKSRC}/doc/bitlbee.8
+
pre-install:
- @${MKDIR} -m 700 ${PREFIX}/etc/bitlbee
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- @${CP} ${WRKSRC}/bitlbee.conf ${PREFIX}/etc/bitlbee/bitlbee.conf.orig
- @${CP} ${WRKSRC}/motd.txt ${PREFIX}/etc/bitlbee/motd.txt.orig
+ ${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}
+.endif
+.if !defined(NOPORTEXAMPLES)
+ ${MKDIR} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${EXAMPLESDIR}
+.endif
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/irc/bitlbee/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L irc/bitlbee/distinfo -L irc/bitlbee/distinfo -u -r1.2 -r1.3
--- irc/bitlbee/distinfo
+++ irc/bitlbee/distinfo
@@ -1,3 +1,3 @@
-MD5 (bitlbee-1.0.4.tar.gz) = b92e301930e2322a86b73b1f6c857674
-SHA256 (bitlbee-1.0.4.tar.gz) = 6f23f37ea641d67e56c61b70d3ac7d404243929c393302ead4758d4ffe6d5b1c
-SIZE (bitlbee-1.0.4.tar.gz) = 455833
+MD5 (bitlbee-1.2.2.tar.gz) = d657a2d66f4098804e6b8f181cc0e852
+SHA256 (bitlbee-1.2.2.tar.gz) = 97dc5f28197ba61415b9e01c887b81b0efc8df38d8d1e7a0b66dac3cec719025
+SIZE (bitlbee-1.2.2.tar.gz) = 475550
--- /dev/null
+++ irc/bitlbee/files/pkg-install.in
@@ -0,0 +1,75 @@
+#!/bin/sh -
+#
+# $MidnightBSD: mports/irc/bitlbee/files/pkg-install.in,v 1.1 2008/09/11 05:14:01 laffer1 Exp $
+# $FreeBSD: ports/irc/bitlbee/files/pkg-install.in,v 1.1 2008/05/19 16:10:14 brix Exp $
+#
+
+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
--- irc/bitlbee/files/oscar-recode-patch
+++ /dev/null
@@ -1,196 +0,0 @@
---- irc.c.orig 2006-06-24 17:00:43.000000000 +0300
-+++ irc.c 2006-11-15 13:56:12.000000000 +0200
-@@ -116,6 +116,7 @@
- set_add( irc, "buddy_sendbuffer", "false", set_eval_bool );
- set_add( irc, "buddy_sendbuffer_delay", "200", set_eval_int );
- set_add( irc, "charset", "iso8859-1", set_eval_charset );
-+ set_add( irc, "oscar_recode_charset", "iso8859-1", set_eval_oscar_recode_charset );
- set_add( irc, "debug", "false", set_eval_bool );
- set_add( irc, "default_target", "root", NULL );
- set_add( irc, "display_namechanges", "false", set_eval_bool );
---- protocols/oscar/oscar.c.orig 2006-06-24 17:00:44.000000000 +0300
-+++ protocols/oscar/oscar.c 2006-11-16 13:47:10.000000000 +0200
-@@ -1029,7 +1029,10 @@
- return 1;
- }
-
-+extern GSList *irc_connection_list;
-+
- static int incomingim_chan1(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch1_args *args) {
-+ char *src="";
- char *tmp = g_malloc(BUF_LONG + 1);
- struct gaim_connection *gc = sess->aux_data;
- int flags = 0;
-@@ -1038,15 +1041,22 @@
- flags |= IM_FLAG_AWAY;
-
- if ((args->icbmflags & AIM_IMFLAGS_UNICODE) || (args->icbmflags & AIM_IMFLAGS_ISO_8859_1)) {
-- char *src;
-
- if (args->icbmflags & AIM_IMFLAGS_UNICODE)
- src = "UNICODEBIG";
- else
-- src = "ISO8859-1";
-+ {
-+ char *cs;
-+ irc_t *irc = (irc_t*)irc_connection_list->data;
-+ if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
-+ src = cs;
-+ else
-+ src = "iso88590-1";
-+ }
-
- /* Try to use iconv first to convert the message to UTF8 - which is what BitlBee expects */
- if (do_iconv(src, "UTF-8", args->msg, tmp, args->msglen, BUF_LONG) >= 0) {
-+ //fprintf (stderr, "bitlbee: converted from %s to utf8!\n", src);
- // Successfully converted!
- } else if (args->icbmflags & AIM_IMFLAGS_UNICODE) {
- int i;
-@@ -1062,12 +1072,32 @@
- g_snprintf(tmp+strlen(tmp), BUF_LONG-strlen(tmp), "&#%04x;", uni);
- }
- }
-+ //fprintf (stderr, "bitlbee: AIM_IMFLAGS_UNICODE, got %s!\n", tmp);
- } else {
-- g_snprintf(tmp, BUF_LONG, "%s", args->msg);
-+ char *cs;
-+ irc_t *irc = (irc_t*)irc_connection_list->data;
-+ if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
-+ src = cs;
-+ else
-+ src = "iso88590-1";
-+ if (do_iconv(src, "UTF-8", args->msg, tmp, args->msglen, BUF_LONG) < 0) {
-+ g_snprintf(tmp, BUF_LONG, "[1%s]%s", src, args->msg);
-+ }
-+ //fprintf (stderr, "bitlbee: not utf8, nor unicode, got %s!\n", tmp);
- }
-- } else
-- g_snprintf(tmp, BUF_LONG, "%s", args->msg);
--
-+ } else {
-+ char *cs;
-+ irc_t *irc = (irc_t*)irc_connection_list->data;
-+ if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
-+ src = cs;
-+ else
-+ src = "iso88590-1";
-+ if (do_iconv(src, "UTF-8", args->msg, tmp, args->msglen, BUF_LONG) < 0) {
-+ g_snprintf(tmp, BUF_LONG, "[2%s]%s", src, args->msg);
-+ }
-+ //fprintf (stderr, "bitlbee: unknown charset, got %s!\n", tmp);
-+ }
-+
- strip_linefeed(tmp);
- serv_got_im(gc, userinfo->sn, tmp, flags, time(NULL), -1);
- g_free(tmp);
-@@ -1163,12 +1193,23 @@
- switch (args->type) {
- case 0x0001: { /* An almost-normal instant message. Mac ICQ sends this. It's peculiar. */
- char *uin, *message;
-+ char *src = "";
-+ char *cs;
-+ char *tmp = g_malloc(BUF_LONG + 1);
-+ irc_t *irc = (irc_t*)irc_connection_list->data;
-+ if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
-+ src = cs;
-+ else
-+ src = "iso88590-1";
- uin = g_strdup_printf("%u", args->uin);
- message = g_strdup(args->msg);
- strip_linefeed(message);
-- serv_got_im(gc, uin, message, 0, time(NULL), -1);
-+ if (do_iconv(src, "UTF-8", message, tmp, strlen (message), BUF_LONG) < 0)
-+ tmp = message;
-+ serv_got_im(gc, uin, tmp, 0, time(NULL), -1);
- g_free(uin);
- g_free(message);
-+ g_free (tmp);
- } break;
-
- case 0x0004: { /* Someone sent you a URL */
-@@ -1768,9 +1809,22 @@
- char sender[32];
- char *dialog_msg = g_strdup(msg->msg);
- time_t t = get_time(msg->year, msg->month, msg->day, msg->hour, msg->minute, 0);
-+ char *tmp = g_malloc(BUF_LONG + 1);
-+ char *src = "";
-+ char *cs;
-+ irc_t *irc = (irc_t*)irc_connection_list->data;
-+ if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
-+ src = cs;
-+ else
-+ src = "iso88590-1";
- g_snprintf(sender, sizeof(sender), "%u", msg->sender);
- strip_linefeed(dialog_msg);
-- serv_got_im(gc, sender, dialog_msg, 0, t, -1);
-+ if (do_iconv(src, "UTF-8", dialog_msg, tmp, strlen (msg->msg), BUF_LONG) < 0)
-+ tmp = dialog_msg;
-+ //fprintf (stderr, "bitlbee: offlinemsg, got %s\n", tmp);
-+ serv_got_im(gc, sender, tmp, 0, t, -1);
-+ if (dialog_msg != tmp)
-+ g_free (tmp);
- g_free(dialog_msg);
- } break;
-
-@@ -1838,6 +1892,14 @@
- } else {
- struct aim_sendimext_args args;
- char *s;
-+ char *cs;
-+ char *src="";
-+ irc_t *irc = (irc_t*)irc_connection_list->data;
-+ if( ( cs = set_getstr( irc, "oscar_recode_charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
-+ src = cs;
-+ else
-+ src = "iso88590-1";
-+
-
- args.flags = AIM_IMFLAGS_ACK;
- if (odata->icq)
-@@ -1851,7 +1913,7 @@
- s = g_malloc(BUF_LONG);
- /* Try if we can put it in an ISO8859-1 string first.
- If we can't, fall back to UTF16. */
-- if ((ret = do_iconv("UTF-8", "ISO8859-1", message, s, len, BUF_LONG)) >= 0) {
-+ if ((ret = do_iconv("UTF-8", src, message, s, len, BUF_LONG)) >= 0) {
- args.flags |= AIM_IMFLAGS_ISO_8859_1;
- len = ret;
- } else if ((ret = do_iconv("UTF-8", "UNICODEBIG", message, s, len, BUF_LONG)) >= 0) {
-@@ -1863,6 +1925,7 @@
- s = message;
- }
- } else {
-+ //fprintf (stderr, "outgoing message is ascii!\n");
- s = message;
- }
-
---- util.c.orig 2006-06-24 17:01:00.000000000 +0300
-+++ util.c 2006-11-15 13:56:12.000000000 +0200
-@@ -453,3 +453,18 @@
- iconv_close( cd );
- return( value );
- }
-+
-+char *set_eval_oscar_recode_charset( irc_t *irc, set_t *set, char *value )
-+{
-+ iconv_t cd;
-+
-+ if ( g_strncasecmp( value, "none", 4 ) == 0 )
-+ return( value );
-+
-+ cd = iconv_open( "UTF-8", value );
-+ if( cd == (iconv_t) -1 )
-+ return( NULL );
-+
-+ iconv_close( cd );
-+ return( value );
-+}
---- util.h.orig 2006-06-24 17:01:00.000000000 +0300
-+++ util.h 2006-11-15 13:56:12.000000000 +0200
-@@ -46,5 +46,6 @@
-
- G_MODULE_EXPORT signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf );
- char *set_eval_charset( irc_t *irc, set_t *set, char *value );
-+char *set_eval_oscar_recode_charset( irc_t *irc, set_t *set, char *value );
-
- #endif
--- irc/bitlbee/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig Tue Jun 8 09:55:00 2004
-+++ configure Tue Jun 8 09:54:50 2004
-@@ -88,7 +88,7 @@
-
- DESTDIR=
- LFLAGS=
--EFLAGS=
-+EFLAGS=$LDFLAGS
- EOF
-
- cat<<EOF>config.h
-@@ -113,7 +113,7 @@
- echo 'DEBUG=1' >> Makefile.settings
- echo '#define DEBUG' >> config.h
- else
-- echo 'CFLAGS=-O3' >> Makefile.settings
-+ echo "CFLAGS=$CPPFLAGS" >> Makefile.settings
- fi
-
- echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
--- irc/bitlbee/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig Sat Oct 25 06:33:13 2003
-+++ Makefile Sat Nov 1 17:09:09 2003
-@@ -23,7 +23,7 @@
-
- install: install-bin install-doc
- @if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
-- @if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
-+# @if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
- @echo
-
- .PHONY: install install-bin install-etc install-doc \
Index: pkg-message.in
===================================================================
RCS file: /home/cvs/mports/irc/bitlbee/files/pkg-message.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L irc/bitlbee/files/pkg-message.in -L irc/bitlbee/files/pkg-message.in -u -r1.2 -r1.3
--- irc/bitlbee/files/pkg-message.in
+++ irc/bitlbee/files/pkg-message.in
@@ -1,6 +1,21 @@
-Remember:
- rename %%PREFIX%%/etc/bitlbee/bitlbee.conf.orig
- to %%PREFIX%%/etc/bitlbee/bitlbee.conf ,
- rename %%PREFIX%%/etc/bitlbee/motd.txt.orig
- to %%PREFIX%%/etc/bitlbee/motd.txt
- and modify them.
+To configure bitlbee, do the following:
+
+Copy %%EXAMPLESDIR%%/bitlbee.conf
+ to %%PREFIX%%/etc/bitlbee/bitlbee.conf ,
+Copy %%EXAMPLESDIR%%/motd.txt
+ to %%PREFIX%%/etc/bitlbee/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.
+
+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:
+
+bitlbee_enable="YES"
+
--- /dev/null
+++ irc/bitlbee/files/bitlbee.in
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $MidnightBSD: mports/irc/bitlbee/files/bitlbee.in,v 1.1 2008/09/11 05:14:01 laffer1 Exp $
+# $FreeBSD: ports/irc/bitlbee/files/bitlbee.in,v 1.2 2008/05/19 16:10:14 brix Exp $
+#
+# PROVIDE: bitlbee
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+. %%RC_SUBR%%
+
+name="bitlbee"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+: ${bitlbee_enable="NO"}
+: ${bitlbee_user="%%BITLBEEUSER%%"}
+: ${bitlbee_config="%%PREFIX%%/etc/bitlbee/bitlbee.conf"}
+: ${bitlbee_flags=""}
+
+required_files="${bitlbee_config}"
+command="%%PREFIX%%/sbin/bitlbee"
+start_cmd="bitlbee_start"
+
+bitlbee_start()
+{
+ echo "Starting ${name}."
+ su -m ${bitlbee_user} -c "${command} -D -c ${bitlbee_config} ${bitlbee_flags}"
+}
+
+run_rc_command "$1"
--- /dev/null
+++ irc/bitlbee/files/pkg-deinstall.in
@@ -0,0 +1,18 @@
+#!/bin/sh -
+#
+# $MidnightBSD: mports/irc/bitlbee/files/pkg-deinstall.in,v 1.1 2008/09/11 05:14:01 laffer1 Exp $
+# $FreeBSD: ports/irc/bitlbee/files/pkg-deinstall.in,v 1.1 2008/05/19 16:10:14 brix Exp $
+#
+
+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
More information about the Midnightbsd-cvs
mailing list