Date: Tue, 2 Jul 2002 09:06:28 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/40118: Update port: net/everybuddy (fix ports/40076) Message-ID: <200207021606.g62G6Sbn093535@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 40118 >Category: ports >Synopsis: Update port: net/everybuddy (fix ports/40076) >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: Tue Jul 02 09:10:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.6-RELEASE i386 >Organization: >Environment: >Description: Update port: net/everybuddy (fix ports/38787) - Fix LIB_DEPENDS - Support USE_REINPLACE - Change location of DSO modules from share/ to lib/ New file: files/patch-configure Remove file: files/patch-ab This PR supersedes ports/40076. >How-To-Repeat: >Fix: diff -urN /usr/ports/net/everybuddy/Makefile net/everybuddy/Makefile --- /usr/ports/net/everybuddy/Makefile Mon Jul 1 20:37:55 2002 +++ net/everybuddy/Makefile Tue Jul 2 01:13:51 2002 @@ -7,22 +7,50 @@ PORTNAME= everybuddy PORTVERSION= 0.4.2 +PORTREVISION= 1 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 +WANT_ESOUND= yes +USE_REINPLACE= yes +USE_GMAKE= yes +USE_LIBTOOL= yes +LIBTOOLFLAGS= # none +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -laudiofile" +CONFIGURE_ARGS= --disable-arts -LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext MAN1= everybuddy.1 -# no idea why config.h isn't created, but an empty one seems to work OK -post-patch: - touch ${WRKSRC}/config.h +.include <bsd.port.pre.mk> + +.if defined(HAVE_ESOUND) +USE_ESOUND= yes +.else +CONFIGURE_ARGS+= --disable-esd +.endif + +pre-patch: + @${REINPLACE_CMD} -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 + @${REINPLACE_CMD} -e \ + 's|share/everybuddy/modules|/lib/everybuddy/modules|g' \ + ${WRKSRC}/src/config.sh.in + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -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/files/patch-ab net/everybuddy/files/patch-ab --- /usr/ports/net/everybuddy/files/patch-ab Mon Jul 1 07:42:42 2002 +++ net/everybuddy/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.old Wed May 29 19:50:21 2002 -+++ configure Wed May 29 19:50:29 2002 -@@ -9178,7 +9178,7 @@ - CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include" - - EB_CFLAGS="$CFLAGS -I../" --EB_LIBS="$LIBS -L../libproxy -lproxy" -+EB_LIBS="$LIBS -L../libproxy -lproxy -lintl" - EB_LDADD="$LDADD" - - EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall -g " 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-comment net/everybuddy/pkg-comment --- /usr/ports/net/everybuddy/pkg-comment Mon Jul 1 20:37:57 2002 +++ net/everybuddy/pkg-comment Tue May 14 00:31:45 2002 @@ -1 +1 @@ -A "chat" program that combines AIM, ICQ, Yahoo, MSN, Jabber and IRC into one +A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one diff -urN /usr/ports/net/everybuddy/pkg-plist net/everybuddy/pkg-plist --- /usr/ports/net/everybuddy/pkg-plist Mon Jul 1 20:37:57 2002 +++ net/everybuddy/pkg-plist Fri May 31 20:54:17 2002 @@ -1,78 +1,44 @@ +bin/contact-update.pl bin/everybuddy bin/update.pl -bin/contact-update.pl -lib/charset.alias -share/pixmaps/ebicon.png +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/locale/locale.alias share/sounds/everybuddy/BuddyArrive.au share/sounds/everybuddy/BuddyLeave.au -share/sounds/everybuddy/Send.au share/sounds/everybuddy/Receive.au -share/everybuddy/modules/aim-toc.so.0 -share/everybuddy/modules/aim-toc.so -share/everybuddy/modules/aim-toc.la -share/everybuddy/modules/aim-toc.a -share/everybuddy/modules/icq.so.0 -share/everybuddy/modules/icq.so -share/everybuddy/modules/icq.la -share/everybuddy/modules/icq.a -share/everybuddy/modules/irc.so.0 -share/everybuddy/modules/irc.so -share/everybuddy/modules/irc.la -share/everybuddy/modules/irc.a -share/everybuddy/modules/jabber.so.0 -share/everybuddy/modules/jabber.so -share/everybuddy/modules/jabber.la -share/everybuddy/modules/jabber.a -share/everybuddy/modules/msn2.so.0 -share/everybuddy/modules/msn2.so -share/everybuddy/modules/msn2.la -share/everybuddy/modules/msn2.a -share/everybuddy/modules/yahoo2.so.0 -share/everybuddy/modules/yahoo2.so -share/everybuddy/modules/yahoo2.la -share/everybuddy/modules/yahoo2.a -share/everybuddy/modules/import_gaim.so.0 -share/everybuddy/modules/import_gaim.so -share/everybuddy/modules/import_gaim.la -share/everybuddy/modules/import_gaim.a -share/everybuddy/modules/import_gnomeicu.so.0 -share/everybuddy/modules/import_gnomeicu.so -share/everybuddy/modules/import_gnomeicu.la -share/everybuddy/modules/import_gnomeicu.a -share/everybuddy/modules/importlicq.so.0 -share/everybuddy/modules/importlicq.so -share/everybuddy/modules/importlicq.la -share/everybuddy/modules/importlicq.a -share/everybuddy/modules/importicq.so.0 -share/everybuddy/modules/importicq.so -share/everybuddy/modules/importicq.la -share/everybuddy/modules/importicq.a -share/everybuddy/modules/smileys2.so.0 -share/everybuddy/modules/smileys2.so -share/everybuddy/modules/smileys2.la -share/everybuddy/modules/smileys2.a -share/everybuddy/modules/smileysc.so.0 -share/everybuddy/modules/smileysc.so -share/everybuddy/modules/smileysc.la -share/everybuddy/modules/smileysc.a -share/everybuddy/modules/notes.so.0 -share/everybuddy/modules/notes.so -share/everybuddy/modules/notes.la -share/everybuddy/modules/notes.a -share/everybuddy/modules/middle.so.0 -share/everybuddy/modules/middle.so -share/everybuddy/modules/middle.la -share/everybuddy/modules/middle.a -share/everybuddy/modules/rainbow.so.0 -share/everybuddy/modules/rainbow.so -share/everybuddy/modules/rainbow.la -share/everybuddy/modules/rainbow.a -share/everybuddy/modules/autotrans.so.0 -share/everybuddy/modules/autotrans.so -share/everybuddy/modules/autotrans.la -share/everybuddy/modules/autotrans.a +share/sounds/everybuddy/Send.au @dirrm share/sounds/everybuddy -@dirrm share/everybuddy/modules -@dirrm share/everybuddy +@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?200207021606.g62G6Sbn093535>