Date: Sat, 1 Nov 2003 17:14:04 +0800 (CST) From: Cheng-Lung Sung <clsung@dragon2.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: clsung@tiger2.net Subject: ports/58798: Update port: irc/bitlbee Message-ID: <20031101091404.3DA4115787@mail.dragon2.net> Resent-Message-ID: <200311010920.hA19KK3e002849@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58798 >Category: ports >Synopsis: Update port: irc/bitlbee >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Nov 01 01:20:20 PST 2003 >Closed-Date: >Last-Modified: >Originator: Cheng-Lung Sung >Release: FreeBSD 4.9-RELEASE i386 >Organization: FreeBSD @ Taiwan >Environment: System: FreeBSD sungsung.csie.nctu.edu.tw 4.9-RELEASE FreeBSD 4.9-RELEASE #5: Wed Oct 29 20:13:25 CST 2003 root@sungsung.csie.nctu.edu.tw:/usr/obj/usr/src/sys/SUNGSUNG i386 >Description: - upgrade 0.74a to 0.82 - add WITH_MSN to decide if want MSN support - add pkg-message to notice installed config files >How-To-Repeat: >Fix: diff -ruN /usr/ports/irc/bitlbee/Makefile bitlbee/Makefile --- /usr/ports/irc/bitlbee/Makefile Sat Aug 30 14:11:49 2003 +++ bitlbee/Makefile Sat Nov 1 17:06:49 2003 @@ -6,7 +6,7 @@ # PORTNAME= bitlbee -PORTVERSION= 0.74a +PORTVERSION= 0.82 PORTREVISION= 0 CATEGORIES= irc MASTER_SITES= http://www.lintux.cx/downloads/ @@ -16,12 +16,26 @@ MAN8= bitlbee.8 -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man --config=${PREFIX}/etc/bitlbee USE_GMAKE= yes -USE_GNOME= glib12 +USE_GNOME= glib20 + +.if defined(WITH_MSN) +LIB_DEPENDS= soup-2.0.0:${PORTSDIR}/devel/libsoup +pre-configure: + @${ECHO_CMD} "MSN support will be enabled." +.else +pre-configure: + @${ECHO_CMD} "Type \"make -DWITH_MSN\" if you want enable MSN support." +.endif pre-install: @mkdir -p -m 700 ${PREFIX}/etc/bitlbee + +post-install: + @cp ${WRKSRC}/bitlbee.conf ${PREFIX}/etc/bitlbee/bitlbee.conf.orig + @cp ${WRKSRC}/motd.txt ${PREFIX}/etc/bitlbee/motd.txt.orig + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff -ruN /usr/ports/irc/bitlbee/distinfo bitlbee/distinfo --- /usr/ports/irc/bitlbee/distinfo Sat Aug 30 14:11:49 2003 +++ bitlbee/distinfo Sat Nov 1 16:25:01 2003 @@ -1 +1 @@ -MD5 (bitlbee-0.74a.tar.gz) = 03e59381091c4c41ca01e4547ae12be1 +MD5 (bitlbee-0.82.tar.gz) = fecb84a97e13a46b45989d71e7723b35 diff -ruN /usr/ports/irc/bitlbee/files/patch-Makefile bitlbee/files/patch-Makefile --- /usr/ports/irc/bitlbee/files/patch-Makefile Thu Jan 1 08:00:00 1970 +++ bitlbee/files/patch-Makefile Sat Nov 1 17:09:19 2003 @@ -0,0 +1,11 @@ +--- 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 '\n\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 '\n\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 '\n\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi + @echo -e '\n' + + .PHONY: install install-bin install-etc install-doc \ diff -ruN /usr/ports/irc/bitlbee/files/patch-configure bitlbee/files/patch-configure --- /usr/ports/irc/bitlbee/files/patch-configure Sat Aug 30 14:11:49 2003 +++ bitlbee/files/patch-configure Thu Jan 1 08:00:00 1970 @@ -1,25 +0,0 @@ ---- configure.orig Sat Apr 12 10:30:35 2003 -+++ configure Fri Aug 29 23:00:20 2003 -@@ -22,7 +22,7 @@ - cpu=`uname -m` - - while [ -n "$1" ]; do -- e="`expr "$1" : '--\(.*=.*\)'`" -+ e="`EXPR_COMPAT=yes expr "$1" : '--\(.*=.*\)'`" - if [ -z "$e" ]; then - cat<<EOF - BitlBee configure -@@ -108,10 +108,10 @@ - exit 1; - fi - --if type glib-config > /dev/null 2> /dev/null; then -+if type glib12-config > /dev/null 2> /dev/null; then - cat<<EOF>>Makefile.settings --LFLAGS+=`glib-config --libs` --CFLAGS+=`glib-config --cflags` -+LFLAGS+=`glib12-config --libs` -+CFLAGS+=`glib12-config --cflags` - EOF - else - echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)' diff -ruN /usr/ports/irc/bitlbee/pkg-message bitlbee/pkg-message --- /usr/ports/irc/bitlbee/pkg-message Thu Jan 1 08:00:00 1970 +++ bitlbee/pkg-message Sat Nov 1 17:07:25 2003 @@ -0,0 +1,8 @@ +/************************************************************************ +Remember: + rename /usr/local/etc/bitlbee/bitlbee.conf.orig + to /usr/local/etc/bitlbee/bitlbee.conf , + rename /usr/local/etc/bitlbee/motd.txt.orig + to /usr/local/etc/bitlbee/motd.txt + and modify them. +*************************************************************************/ diff -ruN /usr/ports/irc/bitlbee/pkg-plist bitlbee/pkg-plist --- /usr/ports/irc/bitlbee/pkg-plist Sat Aug 30 14:11:49 2003 +++ bitlbee/pkg-plist Sat Nov 1 17:10:22 2003 @@ -1,5 +1,7 @@ sbin/bitlbee share/bitlbee/help.txt @exec mkdir -p -m 700 %D/etc/bitlbee +etc/bitlbee/bitlbee.conf.orig +etc/bitlbee/motd.txt.orig @dirrm share/bitlbee @dirrm etc/bitlbee >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031101091404.3DA4115787>