Attachment #36758 for bug #58798

View | Details | Raw Unified | Return to bug 58798
Collapse All | Expand All




#

PORTNAME=	bitlbee
PORTVERSION=	0.82
PORTREVISION=	0
CATEGORIES=	irc
MASTER_SITES=	http://www.lintux.cx/downloads/


MAN8=		bitlbee.8

GNU_CONFIGURE=	yes
CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man --config=${PREFIX}/etc/bitlbee
USE_GMAKE=	yes
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>

Line 1 Link Here

(-)bitlbee/distinfo (-1 / +1 lines)
1	MD5 (bitlbee-0.74a.tar.gz) = 03e59381091c4c41ca01e4547ae12be1	1	MD5 (bitlbee-0.82.tar.gz) = fecb84a97e13a46b45989d71e7723b35

Line 0 Link Here

(-)bitlbee/files/patch-Makefile (+11 lines)
	1	--- Makefile.orig Sat Oct 25 06:33:13 2003
	2	+++ Makefile Sat Nov 1 17:09:09 2003
	3	@@ -23,7 +23,7 @@
	4
	5	install: install-bin install-doc
	6	@if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\n\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
	7	- @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
	8	+# @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
	9	@echo -e '\n'
	10
	11	.PHONY: install install-bin install-etc install-doc \




--- 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?)'

Line 0 Link Here

(-)bitlbee/pkg-message (+8 lines)
	1	/************************************************************************
	2	Remember:
	3	rename /usr/local/etc/bitlbee/bitlbee.conf.orig
	4	to /usr/local/etc/bitlbee/bitlbee.conf ,
	5	rename /usr/local/etc/bitlbee/motd.txt.orig
	6	to /usr/local/etc/bitlbee/motd.txt
	7	and modify them.
	8	*************************************************************************/

Lines 1-5 Link Here

(-)bitlbee/pkg-plist (+2 lines)
1	sbin/bitlbee	1	sbin/bitlbee
2	share/bitlbee/help.txt	2	share/bitlbee/help.txt
3	@exec mkdir -p -m 700 %D/etc/bitlbee	3	@exec mkdir -p -m 700 %D/etc/bitlbee
		4	etc/bitlbee/bitlbee.conf.orig
		5	etc/bitlbee/motd.txt.orig
4	@dirrm share/bitlbee	6	@dirrm share/bitlbee
5	@dirrm etc/bitlbee	7	@dirrm etc/bitlbee

Return to bug 58798

Lines 6-12 Link Here

(-)bitlbee/Makefile (-3 / +17 lines)
6	#	6	#
7		7
8	PORTNAME= bitlbee	8	PORTNAME= bitlbee
9	PORTVERSION= 0.74a	9	PORTVERSION= 0.82
10	PORTREVISION= 0	10	PORTREVISION= 0
11	CATEGORIES= irc	11	CATEGORIES= irc
12	MASTER_SITES= http://www.lintux.cx/downloads/	12	MASTER_SITES= http://www.lintux.cx/downloads/
Lines 16-27 Link Here
16		16
17	MAN8= bitlbee.8	17	MAN8= bitlbee.8
18		18
19	HAS_CONFIGURE= yes	19	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man --config=${PREFIX}/etc/bitlbee	20	CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/man --config=${PREFIX}/etc/bitlbee
21	USE_GMAKE= yes	21	USE_GMAKE= yes
22	USE_GNOME= glib12	22	USE_GNOME= glib20
		23
		24	.if defined(WITH_MSN)
		25	LIB_DEPENDS= soup-2.0.0:${PORTSDIR}/devel/libsoup
		26	pre-configure:
		27	@${ECHO_CMD} "MSN support will be enabled."
		28	.else
		29	pre-configure:
		30	@${ECHO_CMD} "Type \"make -DWITH_MSN\" if you want enable MSN support."
		31	.endif
23		32
24	pre-install:	33	pre-install:
25	@mkdir -p -m 700 ${PREFIX}/etc/bitlbee	34	@mkdir -p -m 700 ${PREFIX}/etc/bitlbee
		35
		36	post-install:
		37	@cp ${WRKSRC}/bitlbee.conf ${PREFIX}/etc/bitlbee/bitlbee.conf.orig
		38	@cp ${WRKSRC}/motd.txt ${PREFIX}/etc/bitlbee/motd.txt.orig
		39	@${CAT} ${PKGMESSAGE}
26		40
27	.include <bsd.port.mk>	41	.include <bsd.port.mk>

Lines 1-25 Link Here

(-)bitlbee/files/patch-configure (-25 lines)
1	--- configure.orig Sat Apr 12 10:30:35 2003
2	+++ configure Fri Aug 29 23:00:20 2003
3	@@ -22,7 +22,7 @@
4	cpu=`uname -m`
5
6	while [ -n "$1" ]; do
7	- e="`expr "$1" : '--\(.=.\)'`"
8	+ e="`EXPR_COMPAT=yes expr "$1" : '--\(.=.\)'`"
9	if [ -z "$e" ]; then
10	cat<<EOF
11	BitlBee configure
12	@@ -108,10 +108,10 @@
13	exit 1;
14	fi
15
16	-if type glib-config > /dev/null 2> /dev/null; then
17	+if type glib12-config > /dev/null 2> /dev/null; then
18	cat<<EOF>>Makefile.settings
19	-LFLAGS+=`glib-config --libs`
20	-CFLAGS+=`glib-config --cflags`
21	+LFLAGS+=`glib12-config --libs`
22	+CFLAGS+=`glib12-config --cflags`
23	EOF
24	else
25	echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'