From 5ed37bdcbfeef7e6a0a34b55527a6d8721ef453a Mon Sep 17 00:00:00 2001 From: jmmv Date: Mon, 17 Jan 2005 12:38:23 +0000 Subject: Remove everybuddy and everybuddy-gnome. This program has been obsoleted by two different forks (ayttm and eb-lite). Packaging any of these two could result on completely different packages than the current ones (mainly because one uses GNOME2 and the other Qt, and is modular). Furthermore, IM software tends to get useless as protocols change, so I doubt these old versions are of any use today. Not to say that they appear broken on some bulk builds. No objections in tech-pkg@. --- chat/Makefile | 4 +--- chat/everybuddy-gnome/Makefile | 13 ------------- chat/everybuddy/DESCR | 2 -- chat/everybuddy/Makefile | 10 ---------- chat/everybuddy/Makefile.common | 32 -------------------------------- chat/everybuddy/PLIST | 15 --------------- chat/everybuddy/distinfo | 7 ------- chat/everybuddy/files/wrapper | 10 ---------- chat/everybuddy/patches/patch-aa | 22 ---------------------- chat/everybuddy/patches/patch-ab | 13 ------------- chat/everybuddy/patches/patch-ac | 13 ------------- doc/CHANGES | 4 +++- doc/TODO | 4 +--- 13 files changed, 5 insertions(+), 144 deletions(-) delete mode 100644 chat/everybuddy-gnome/Makefile delete mode 100644 chat/everybuddy/DESCR delete mode 100644 chat/everybuddy/Makefile delete mode 100644 chat/everybuddy/Makefile.common delete mode 100644 chat/everybuddy/PLIST delete mode 100644 chat/everybuddy/distinfo delete mode 100644 chat/everybuddy/files/wrapper delete mode 100644 chat/everybuddy/patches/patch-aa delete mode 100644 chat/everybuddy/patches/patch-ab delete mode 100644 chat/everybuddy/patches/patch-ac diff --git a/chat/Makefile b/chat/Makefile index 2bf037543a4..b018b7a5483 100644 --- a/chat/Makefile +++ b/chat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2005/01/03 14:32:27 wiz Exp $ +# $NetBSD: Makefile,v 1.104 2005/01/17 12:38:23 jmmv Exp $ # COMMENT= Communication programs @@ -18,8 +18,6 @@ SUBDIR+= ekg SUBDIR+= emech SUBDIR+= epic4 SUBDIR+= epic4-doc -SUBDIR+= everybuddy -SUBDIR+= everybuddy-gnome SUBDIR+= fisg SUBDIR+= fugu SUBDIR+= gabber diff --git a/chat/everybuddy-gnome/Makefile b/chat/everybuddy-gnome/Makefile deleted file mode 100644 index cc0357ec83e..00000000000 --- a/chat/everybuddy-gnome/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: Makefile,v 1.16 2004/11/30 18:26:39 wiz Exp $ - -.include "../everybuddy/Makefile.common" - -PKGNAME= ${DISTNAME:S/-/-gnome-/} -PKGREVISION= 12 -CONFLICTS+= everybuddy-[0-9]* -COMMENT+= with GNOME support - -CONFIGURE_ARGS+= --enable-panel - -.include "../../x11/gnome-core/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/chat/everybuddy/DESCR b/chat/everybuddy/DESCR deleted file mode 100644 index 95bf95611d1..00000000000 --- a/chat/everybuddy/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -Everybuddy is a chat program for X that incorporates the functions of AOL -Instant Messenger, ICQ, Yahoo Chat, and MSN Messanger. diff --git a/chat/everybuddy/Makefile b/chat/everybuddy/Makefile deleted file mode 100644 index ce3971e2295..00000000000 --- a/chat/everybuddy/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:14 tv Exp $ - -.include "Makefile.common" -PKGREVISION= 6 - -CONFLICTS+= everybuddy-gnome-[0-9]* - -.include "../../audio/esound/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/chat/everybuddy/Makefile.common b/chat/everybuddy/Makefile.common deleted file mode 100644 index 3a4dfea04cd..00000000000 --- a/chat/everybuddy/Makefile.common +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: Makefile.common,v 1.15 2004/04/26 05:31:43 snj Exp $ - -DISTNAME= everybuddy-0.2.0 -CATEGORIES= chat -MASTER_SITES= http://www.everybuddy.com/files/ - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.everybuddy.com/ -COMMENT= Universal Instant Messaging Client - -USE_DIRS+= gnome1-1.5 -USE_GNU_TOOLS+= make -GNU_CONFIGURE= YES -USE_BUILDLINK3= yes - -DISTINFO_FILE= ${.CURDIR}/../everybuddy/distinfo -FILESDIR= ${.CURDIR}/../everybuddy/files -PATCHDIR= ${.CURDIR}/../everybuddy/patches -PKGDIR= ${.CURDIR}/../everybuddy - -REPLACE_PERL= src/update.pl src/contact-update.pl - -post-build: - ${SED} -e 's#@MKDIR@#${MKDIR}#' \ - -e 's#@PREFIX@#${PREFIX}#' \ - -e 's#@RM@#${RM}#' \ - ${FILESDIR}/wrapper >${WRKDIR}/wrapper - -post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/wrapper ${PREFIX}/bin/everybuddy - -.include "../../converters/libiconv/buildlink3.mk" diff --git a/chat/everybuddy/PLIST b/chat/everybuddy/PLIST deleted file mode 100644 index b409be3e999..00000000000 --- a/chat/everybuddy/PLIST +++ /dev/null @@ -1,15 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2003/01/27 12:54:53 jmmv Exp $ -bin/everybuddy -libexec/everybuddy/everybuddy -libexec/everybuddy/contact-update.pl -libexec/everybuddy/update.pl -man/man1/everybuddy.1 -share/gnome/apps/Internet/Everybuddy.desktop -share/pixmaps/ebicon.png -share/sounds/everybuddy/BuddyArrive.au -share/sounds/everybuddy/BuddyLeave.au -share/sounds/everybuddy/Send.au -share/sounds/everybuddy/Receive.au -@dirrm share/sounds/everybuddy -@comment in gnome-dirs: @dirrm share/gnome/apps/Internet -@dirrm libexec/everybuddy diff --git a/chat/everybuddy/distinfo b/chat/everybuddy/distinfo deleted file mode 100644 index 98323827c6a..00000000000 --- a/chat/everybuddy/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/12/19 14:10:04 tron Exp $ - -SHA1 (everybuddy-0.2.0.tar.gz) = f31cc95c34ca56dfb13ac4d45bf13e0c1053da7c -Size (everybuddy-0.2.0.tar.gz) = 647542 bytes -SHA1 (patch-aa) = 2e37dd6808eeb2d5195251e5db5a3600e35245a2 -SHA1 (patch-ab) = d1699cf4045b850a868263dfc2297d7ecf4aff0c -SHA1 (patch-ac) = 956fd63db7d4f3668ee8c0f240cf2af4827a10bf diff --git a/chat/everybuddy/files/wrapper b/chat/everybuddy/files/wrapper deleted file mode 100644 index a5c08828ca1..00000000000 --- a/chat/everybuddy/files/wrapper +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# -# $NetBSD: wrapper,v 1.1.1.1 2001/12/19 14:10:04 tron Exp $ - -@MKDIR@ $HOME/.everybuddy -@RM@ -f $HOME/.everybuddy/eb_socke - -PATH=@PREFIX@/libexec/everybuddy:$PATH; export PATH - -exec everybuddy "$@" diff --git a/chat/everybuddy/patches/patch-aa b/chat/everybuddy/patches/patch-aa deleted file mode 100644 index b2e9e5dce1c..00000000000 --- a/chat/everybuddy/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/12/19 14:10:04 tron Exp $ - ---- configure.orig Sat Jan 20 20:40:38 2001 -+++ configure Wed Dec 19 15:04:10 2001 -@@ -77,7 +77,7 @@ - verbose= - x_includes=NONE - x_libraries=NONE --bindir='${exec_prefix}/bin' -+bindir='${exec_prefix}/libexec/everybuddy' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' - datadir='${prefix}/share' -@@ -2415,7 +2415,7 @@ - CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include" - - EB_CFLAGS="$CFLAGS -I../" --EB_LIBS="$LIBS -L../libmsn -lmsn -L../libyahoo -lyahoo -L../libproxy -lproxy -L../libtoc -ltoc -lpthread -L../libicq -licq -L../libjabber -lEBjabber -ljabber -L../libxode -lxode" -+EB_LIBS="$LIBS ../libmsn/libmsn.a ../libyahoo/libyahoo.a ../libproxy/libproxy.a ../libtoc/libtoc.a -lpthread ../libicq/libicq.a ../libjabber/libEBjabber.a ../libjabber/libjabber.a ../libxode/libxode.a" - EB_LDADD="$LDADD" - - EB_CFLAGS="$EB_CFLAGS -D_REENTRANT -Wall -g " diff --git a/chat/everybuddy/patches/patch-ab b/chat/everybuddy/patches/patch-ab deleted file mode 100644 index c0f46ad5e83..00000000000 --- a/chat/everybuddy/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/12/19 14:10:04 tron Exp $ - ---- Makefile.in.orig Wed Dec 19 12:38:45 2001 -+++ Makefile.in Wed Dec 19 12:54:57 2001 -@@ -105,7 +105,7 @@ - SUBDIRS = pixmaps m4 libproxy libtoc libicq libyahoo libmsn libxode libjabber sounds doc src - ACLOCAL_AMFLAGS = -I m4 - --Utilitiesdir = /etc/X11/applnk/Internet -+Utilitiesdir = @prefix@/share/gnome/apps/Internet - Utilities_DATA = Everybuddy.desktop - - EXTRA_DIST = Everybuddy.desktop diff --git a/chat/everybuddy/patches/patch-ac b/chat/everybuddy/patches/patch-ac deleted file mode 100644 index 3f476e1bd95..00000000000 --- a/chat/everybuddy/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/12/19 14:10:04 tron Exp $ - ---- src/Makefile.in.orig Sat Jan 20 22:08:35 2001 -+++ src/Makefile.in Wed Dec 19 13:29:16 2001 -@@ -108,7 +108,7 @@ - - CFLAGS = $(EB_CFLAGS) -I$(top_srcdir) -I../libproxy -I../libfaim -I../libjabber/include/jabber -I../libjabber/include -I../libxode/include - #there are more than one config.h --LIBS = $(EB_LIBS) -+LIBS = $(EB_LIBS) -liconv - LDADD = $(EB_LDADD) - CLEANFILES = config.h - diff --git a/doc/CHANGES b/doc/CHANGES index f5a3bf18a88..bb9171ef5cf 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.8785 2005/01/17 12:12:43 adam Exp $ +$NetBSD: CHANGES,v 1.8786 2005/01/17 12:38:23 jmmv Exp $ Changes to the packages collection and infrastructure in 2005: @@ -348,3 +348,5 @@ Changes to the packages collection and infrastructure in 2005: Updated svk to 0.28 [epg 2005-01-16] Added amarok-1.1.1 [seb 2005-01-17] Updated lcms to 1.14 [adam 2005-01-17] + Removed everybuddy [jmmv 2005-01-17] + Removed everybuddy-gnome [jmmv 2005-01-17] diff --git a/doc/TODO b/doc/TODO index e6cc40a846c..02868422aca 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.2918 2005/01/17 12:00:07 wiz Exp $ +$NetBSD: TODO,v 1.2919 2005/01/17 12:38:23 jmmv Exp $ Suggested new packages ====================== @@ -452,8 +452,6 @@ Suggested package updates o esh-0.8.5 o etach-1.4.0 o ettercap-0.7.2 [wip/ettercap-NG|adrianp] - o everybuddy-0.4.3 - o everybuddy-gnome-0.4.3 o exmh-2.7.0 o fakeroot-1.2.2 o fd-2.06b -- cgit v1.2.3