Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 May 2002 14:13:51 -0700 (PDT)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/38787: Update port: net/everybuddy to 0.4.2 (fix ports/38713)
Message-ID:  <200205312113.g4VLDpRJ077539@www.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         38787
>Category:       ports
>Synopsis:       Update port: net/everybuddy to 0.4.2 (fix ports/38713)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 31 14:20:03 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.5-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.4.2

New file:
files/patch-configure

Remove file:
files/patch-aa
files/patch-ae
files/patch-ag

This PR superseds ports/38713.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/net/everybuddy/Makefile net/everybuddy/Makefile
--- /usr/ports/net/everybuddy/Makefile	Wed Aug 29 02:00:55 2001
+++ net/everybuddy/Makefile	Fri May 31 19:13:36 2002
@@ -6,23 +6,49 @@
 #
 
 PORTNAME=	everybuddy
-PORTVERSION=	0.2.1b6
+PORTVERSION=	0.4.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.everybuddy.com/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
 
 MAINTAINER=	jim@FreeBSD.org
 
+LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
+		iconv.3:${PORTSDIR}/converters/libiconv \
+		ltdl.1:${PORTSDIR}/devel/libtool
+
 USE_X_PREFIX=	yes
-USE_GMAKE=	yes
 USE_GTK=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+WANT_ESOUND=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFLAGS=	# none
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -laudiofile"
+CONFIGURE_ARGS=	--disable-arts
 
 MAN1=		everybuddy.1
 
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_ESOUND)
+USE_ESOUND=	yes
+.else
+CONFIGURE_ARGS+=	--disable-esd
+.endif
+
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		s|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
+	@${PERL} -pi -e \
+		's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
+		 s|-lpthreads|${PTHREAD_LIBS:S/"//g}|g; \
+		 s|-D_REENTRANT -Wall -g|-D_REENTRANT ${PTHREAD_CFLAGS}|g' \
+			${WRKSRC}/configure
+	@${PERL} -pi -e \
+		's|share/everybuddy/modules|/lib/everybuddy/modules|g' \
+			${WRKSRC}/src/config.sh.in
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
+		's|^Utilitiesdir|#Utilitiesdir|g; \
+		 s|^Utilities_DATA|#Utilities_DATA|g; \
+		 s|\$$\(datadir\)/everybuddy|\$$\(prefix\)/lib/everybuddy|g; \
+		 s|-module|-module -avoid-version|g'
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/net/everybuddy/distinfo net/everybuddy/distinfo
--- /usr/ports/net/everybuddy/distinfo	Mon Jul  2 07:25:57 2001
+++ net/everybuddy/distinfo	Fri May 31 19:17:26 2002
@@ -1 +1 @@
-MD5 (everybuddy-0.2.1beta6.tar.gz) = f9f020a184459a9289fbdd9b62cf0bfb
+MD5 (everybuddy-0.4.2.tar.gz) = b7a0143c9e3c34d7b4c4e5d0fd5efbd0
diff -urN /usr/ports/net/everybuddy/files/patch-aa net/everybuddy/files/patch-aa
--- /usr/ports/net/everybuddy/files/patch-aa	Tue Jun 19 03:05:44 2001
+++ net/everybuddy/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- configure.orig	Mon Jun 18 13:40:19 2001
-+++ configure	Mon Jun 18 13:44:04 2001
-@@ -3437,7 +3437,7 @@
- EB_LIBS="$LIBS -L../libmsn -lmsn -L../libyahoo -lyahoo -L../libproxy -lproxy -L../libtoc -ltoc -L../libicq -licq -L../libjabber -lEBjabber -ljabber -L../libxode -lxode -L../zephyr -lzephyr"
- EB_LDADD="$LDADD"
- 
--EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall -g "
-+EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall"
- 
- esd_val=yes
- # Check whether --enable-esd or --disable-esd was given.
diff -urN /usr/ports/net/everybuddy/files/patch-ae net/everybuddy/files/patch-ae
--- /usr/ports/net/everybuddy/files/patch-ae	Mon Oct 16 06:06:13 2000
+++ net/everybuddy/files/patch-ae	Thu Jan  1 09:00:00 1970
@@ -1,14 +0,0 @@
---- Makefile.am.orig	Sun Oct 15 13:46:35 2000
-+++ Makefile.am	Sun Oct 15 13:46:52 2000
-@@ -1,8 +1,8 @@
- SUBDIRS = pixmaps m4 libproxy libtoc libicq libyahoo libmsn sounds doc src 
- ACLOCAL_AMFLAGS = -I m4
- 
--Utilitiesdir = /etc/X11/applnk/Internet
--Utilities_DATA = Everybuddy.desktop
-+Utilitiesdir = 
-+Utilities_DATA = 
- 
- 
--EXTRA_DIST = Everybuddy.desktop 
-+EXTRA_DIST = 
diff -urN /usr/ports/net/everybuddy/files/patch-ag net/everybuddy/files/patch-ag
--- /usr/ports/net/everybuddy/files/patch-ag	Tue Jun 19 03:05:44 2001
+++ net/everybuddy/files/patch-ag	Thu Jan  1 09:00:00 1970
@@ -1,10 +0,0 @@
---- pixmaps/Makefile.am.orig	Mon Jun 18 13:54:21 2001
-+++ pixmaps/Makefile.am	Mon Jun 18 13:54:43 2001
-@@ -6,5 +6,5 @@
- 	msn_online.xpm msn_away.xpm tb_mail_send.xpm tb_search.xpm \
- 	line-wrap.xbm line-arrow.xbm ebicon.png jabber_online.xpm jabber_away.xpm \
- 	ebicon.png zephyr_online.xpm zephyr_hidden.xpm zephyr_offline.xpm
--Utilitiesdir = $(datadir)/pixmaps
--Utilities_DATA = ebicon.png
-+Utilitiesdir = 
-+Utilities_DATA = 
diff -urN /usr/ports/net/everybuddy/files/patch-configure net/everybuddy/files/patch-configure
--- /usr/ports/net/everybuddy/files/patch-configure	Thu Jan  1 09:00:00 1970
+++ net/everybuddy/files/patch-configure	Thu May 30 01:12:56 2002
@@ -0,0 +1,10 @@
+--- configure.orig	Fri May 17 09:04:56 2002
++++ configure	Thu May 30 01:12:46 2002
+@@ -5451,6 +5451,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff -urN /usr/ports/net/everybuddy/pkg-plist net/everybuddy/pkg-plist
--- /usr/ports/net/everybuddy/pkg-plist	Sun Mar 11 09:44:45 2001
+++ net/everybuddy/pkg-plist	Fri May 31 20:54:17 2002
@@ -1,9 +1,44 @@
+bin/contact-update.pl
 bin/everybuddy
 bin/update.pl
-bin/contact-update.pl
+lib/everybuddy/modules/aim-toc.la
+lib/everybuddy/modules/aim-toc.so
+lib/everybuddy/modules/autotrans.la
+lib/everybuddy/modules/autotrans.so
+lib/everybuddy/modules/icq.la
+lib/everybuddy/modules/icq.so
+lib/everybuddy/modules/import_gaim.la
+lib/everybuddy/modules/import_gaim.so
+lib/everybuddy/modules/import_gnomeicu.la
+lib/everybuddy/modules/import_gnomeicu.so
+lib/everybuddy/modules/importicq.la
+lib/everybuddy/modules/importicq.so
+lib/everybuddy/modules/importlicq.la
+lib/everybuddy/modules/importlicq.so
+lib/everybuddy/modules/irc.la
+lib/everybuddy/modules/irc.so
+lib/everybuddy/modules/jabber.la
+lib/everybuddy/modules/jabber.so
+lib/everybuddy/modules/middle.la
+lib/everybuddy/modules/middle.so
+lib/everybuddy/modules/msn2.la
+lib/everybuddy/modules/msn2.so
+lib/everybuddy/modules/notes.la
+lib/everybuddy/modules/notes.so
+lib/everybuddy/modules/rainbow.la
+lib/everybuddy/modules/rainbow.so
+lib/everybuddy/modules/smileys2.la
+lib/everybuddy/modules/smileys2.so
+lib/everybuddy/modules/smileysc.la
+lib/everybuddy/modules/smileysc.so
+lib/everybuddy/modules/yahoo2.la
+lib/everybuddy/modules/yahoo2.so
+share/locale/fr/LC_MESSAGES/everybuddy.mo
 share/sounds/everybuddy/BuddyArrive.au
 share/sounds/everybuddy/BuddyLeave.au
-share/sounds/everybuddy/Send.au
 share/sounds/everybuddy/Receive.au
+share/sounds/everybuddy/Send.au
 @dirrm share/sounds/everybuddy
-@dirrm share/sounds
+@unexec rmdir %D/share/sounds 2>/dev/null || true
+@dirrm lib/everybuddy/modules
+@dirrm lib/everybuddy

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205312113.g4VLDpRJ077539>