From 147fc77aff6b3e82ddabd69242001f6bdc637393 Mon Sep 17 00:00:00 2001 From: Erwin Lansing Date: Fri, 12 Dec 2003 14:48:05 +0000 Subject: - upgrade 0.74a to 0.82 - add WITH_MSN to decide if want MSN support - add pkg-message to notice installed config files PR: 58798 Submitted by: Cheng-Lung Sung Approved by: maintainer --- irc/bitlbee-otr/Makefile | 22 ++++++++++++++++++---- irc/bitlbee-otr/distinfo | 2 +- irc/bitlbee-otr/files/patch-Makefile | 11 +++++++++++ irc/bitlbee-otr/files/patch-configure | 25 ------------------------- irc/bitlbee-otr/pkg-plist | 2 ++ irc/bitlbee/Makefile | 22 ++++++++++++++++++---- irc/bitlbee/distinfo | 2 +- irc/bitlbee/files/patch-Makefile | 11 +++++++++++ irc/bitlbee/files/patch-configure | 25 ------------------------- irc/bitlbee/pkg-plist | 2 ++ 10 files changed, 64 insertions(+), 60 deletions(-) create mode 100644 irc/bitlbee-otr/files/patch-Makefile delete mode 100644 irc/bitlbee-otr/files/patch-configure create mode 100644 irc/bitlbee/files/patch-Makefile delete mode 100644 irc/bitlbee/files/patch-configure diff --git a/irc/bitlbee-otr/Makefile b/irc/bitlbee-otr/Makefile index a3d1c70d0134..8c73da40d050 100644 --- a/irc/bitlbee-otr/Makefile +++ b/irc/bitlbee-otr/Makefile @@ -6,22 +6,36 @@ # PORTNAME= bitlbee -PORTVERSION= 0.74a +PORTVERSION= 0.82 PORTREVISION= 0 CATEGORIES= irc -MASTER_SITES= http://www.lintux.cx/downloads/ +MASTER_SITES= http://get.bitlbee.org/src/ MAINTAINER= peter@dataloss.nl COMMENT= An IRC to other chat networks gateway 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 diff --git a/irc/bitlbee-otr/distinfo b/irc/bitlbee-otr/distinfo index 3266842e6c10..e7feb1450403 100644 --- a/irc/bitlbee-otr/distinfo +++ b/irc/bitlbee-otr/distinfo @@ -1 +1 @@ -MD5 (bitlbee-0.74a.tar.gz) = 03e59381091c4c41ca01e4547ae12be1 +MD5 (bitlbee-0.82.tar.gz) = fecb84a97e13a46b45989d71e7723b35 diff --git a/irc/bitlbee-otr/files/patch-Makefile b/irc/bitlbee-otr/files/patch-Makefile new file mode 100644 index 000000000000..c84bb4fa96a5 --- /dev/null +++ b/irc/bitlbee-otr/files/patch-Makefile @@ -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 --git a/irc/bitlbee-otr/files/patch-configure b/irc/bitlbee-otr/files/patch-configure deleted file mode 100644 index edf91bd01ee0..000000000000 --- a/irc/bitlbee-otr/files/patch-configure +++ /dev/null @@ -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< /dev/null 2> /dev/null; then -+if type glib12-config > /dev/null 2> /dev/null; then - cat<>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 --git a/irc/bitlbee-otr/pkg-plist b/irc/bitlbee-otr/pkg-plist index 99ce2873deca..128d3e8091a0 100644 --- a/irc/bitlbee-otr/pkg-plist +++ b/irc/bitlbee-otr/pkg-plist @@ -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 diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile index a3d1c70d0134..8c73da40d050 100644 --- a/irc/bitlbee/Makefile +++ b/irc/bitlbee/Makefile @@ -6,22 +6,36 @@ # PORTNAME= bitlbee -PORTVERSION= 0.74a +PORTVERSION= 0.82 PORTREVISION= 0 CATEGORIES= irc -MASTER_SITES= http://www.lintux.cx/downloads/ +MASTER_SITES= http://get.bitlbee.org/src/ MAINTAINER= peter@dataloss.nl COMMENT= An IRC to other chat networks gateway 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 diff --git a/irc/bitlbee/distinfo b/irc/bitlbee/distinfo index 3266842e6c10..e7feb1450403 100644 --- a/irc/bitlbee/distinfo +++ b/irc/bitlbee/distinfo @@ -1 +1 @@ -MD5 (bitlbee-0.74a.tar.gz) = 03e59381091c4c41ca01e4547ae12be1 +MD5 (bitlbee-0.82.tar.gz) = fecb84a97e13a46b45989d71e7723b35 diff --git a/irc/bitlbee/files/patch-Makefile b/irc/bitlbee/files/patch-Makefile new file mode 100644 index 000000000000..c84bb4fa96a5 --- /dev/null +++ b/irc/bitlbee/files/patch-Makefile @@ -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 --git a/irc/bitlbee/files/patch-configure b/irc/bitlbee/files/patch-configure deleted file mode 100644 index edf91bd01ee0..000000000000 --- a/irc/bitlbee/files/patch-configure +++ /dev/null @@ -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< /dev/null 2> /dev/null; then -+if type glib12-config > /dev/null 2> /dev/null; then - cat<>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 --git a/irc/bitlbee/pkg-plist b/irc/bitlbee/pkg-plist index 99ce2873deca..128d3e8091a0 100644 --- a/irc/bitlbee/pkg-plist +++ b/irc/bitlbee/pkg-plist @@ -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 -- cgit v1.2.3