Date: Tue, 8 Jan 2002 02:15:05 -0500 (EST) From: Joe Marcus Clarke <marcus@marcuscom.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/33678: [PATCH] Update net/gabber to 0.8.6 Message-ID: <200201080715.g087F5F44988@shumai.marcuscom.com>
next in thread | raw e-mail | index | archive | help
>Number: 33678
>Category: ports
>Synopsis: [PATCH] Update net/gabber to 0.8.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 07 23:20:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Joe Marcus Clarke
>Release: FreeBSD 4.5-PRERELEASE i386
>Organization:
MarcusCom, Inc.
>Environment:
System: FreeBSD shumai.marcuscom.com 4.5-PRERELEASE FreeBSD 4.5-PRERELEASE #0: Sun Jan 6 01:07:48 EST 2002 marcus@shumai.marcuscom.com:/usr/obj/usr/src/sys/SHUMAI i386
>Description:
Gabber 0.8.6 was just released. Please update FreeBSD's port to match.
>How-To-Repeat:
>Fix:
* DELETED FILES:
files/patch-ae
files/patch-am
* ADDED FILE:
files/patch-ltmain.sh (sobomax special)
--- Makefile.orig Tue Jan 8 01:54:18 2002
+++ Makefile Tue Jan 8 02:09:52 2002
@@ -6,24 +6,31 @@
#
PORTNAME= gabber
-PORTVERSION= 0.8.3
-PORTREVISION= 2
+PORTVERSION= 0.8.6
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+.if defined(WITH_XMMS)
+BUILD_DEPENDS+= xmms-config:${PORTSDIR}/audio/xmms
+.endif
LIB_DEPENDS= gnomemm.9:${PORTSDIR}/x11-toolkits/gnome--
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= yes
-USE_LIBTOOL= yes
-LIBTOOLFILES= configure jabberoo/configure
+GNU_CONFIGURE= yes
CONFIGURE_ENV+= GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ MSGFMT=${LOCALBASE}/bin/msgfmt-new \
+ XGETTEXT=${LOCALBASE}/bin/xgettext-new
+.if !defined(WITH_XMMS)
+CONFIGURE_ARGS= --disable-xmms
+.endif
MAN1= gabber.1
--- distinfo.orig Tue Jan 8 01:54:25 2002
+++ distinfo Tue Jan 8 00:56:59 2002
@@ -1 +1 @@
-MD5 (gabber-0.8.3.tar.gz) = e74cd30afd9c7ada4e0990e7b4838a4d
+MD5 (gabber-0.8.6.tar.gz) = 45c2db56a577808731c52afd9651f6c7
--- pkg-plist.orig Tue Jan 8 01:54:34 2002
+++ pkg-plist Tue Jan 8 01:53:16 2002
@@ -10,6 +10,9 @@
share/gnome/gabber/EditGroups_dlg.glade
share/gnome/gabber/FilterList_dlg.glade
share/gnome/gabber/Filter_dlg.glade
+share/gnome/gabber/FTRecv_dlg.glade
+share/gnome/gabber/FTSend_dlg.glade
+share/gnome/gabber/FTTransfer_dlg.glade
share/gnome/gabber/GCIRecv_dlg.glade
share/gnome/gabber/GCI_dlg.glade
share/gnome/gabber/GCJoin_dlg.glade
@@ -20,7 +23,8 @@
share/gnome/gabber/IgnoreAdd_dlg.glade
share/gnome/gabber/Ignore_dlg.glade
share/gnome/gabber/Login_dlg.glade
-share/gnome/gabber/Message_win.glade
+share/gnome/gabber/MessageRecv_win.glade
+share/gnome/gabber/MessageSend_win.glade
share/gnome/gabber/MyContactInfo_win.glade
share/gnome/gabber/OOOChat_win.glade
share/gnome/gabber/Prefs_win.glade
@@ -29,7 +33,11 @@
share/gnome/gabber/Status_dlg.glade
share/gnome/gabber/SubscriptionRequest_dlg.glade
share/gnome/gabber/TransInfo_dlg.glade
+share/gnome/gabber/URLRecv_dlg.glade
share/gnome/gabber/Welcome_win.glade
+share/gnome/gabber/connected.xpm
+share/gnome/gabber/connected-ssl.xpm
+share/gnome/gabber/disconnected.xpm
share/gnome/gabber/gabber-logs.css
share/gnome/gabber/glade-add-group-menu.xpm
share/gnome/gabber/glade-alert.xpm
@@ -40,6 +48,7 @@
share/gnome/gabber/glade-edit-group-menu.xpm
share/gnome/gabber/glade-edit-user-menu.xpm
share/gnome/gabber/glade-edit-user.xpm
+share/gnome/gabber/glade-file.xpm
share/gnome/gabber/glade-gabber-logo.png
share/gnome/gabber/glade-gabber-sideways.png
share/gnome/gabber/glade-gci.xpm
@@ -51,8 +60,11 @@
share/gnome/gabber/glade-new-user.xpm
share/gnome/gabber/glade-noclose.xpm
share/gnome/gabber/glade-ooochat.xpm
+share/gnome/gabber/glade-receive-file.xpm
share/gnome/gabber/glade-s10n.xpm
share/gnome/gabber/glade-send-contact-menu.xpm
+share/gnome/gabber/glade-send-file-menu.xpm
+share/gnome/gabber/glade-send-file.xpm
share/gnome/gabber/glade-send-gci.xpm
share/gnome/gabber/glade-sendasnormal.xpm
share/gnome/gabber/glade-sendasooo.xpm
@@ -62,46 +74,27 @@
share/gnome/gabber/gnome-info.png
share/gnome/gabber/gnome-locksreen.png
share/gnome/gabber/gnome-modem.png
+share/gnome/gabber/gnome-question.png
share/gnome/gabber/gpg-badsigned.xpm
share/gnome/gabber/gpg-encrypted.xpm
share/gnome/gabber/gpg-signed.xpm
share/gnome/gabber/gpg-unencrypted.xpm
share/gnome/gabber/gpg-unsigned.xpm
share/gnome/gabber/offline.xpm
-share/gnome/help/gabber/C/agents-search.html
-share/gnome/help/gabber/C/agents.html
-share/gnome/help/gabber/C/authors.html
-share/gnome/help/gabber/C/bugs.html
-share/gnome/help/gabber/C/docbook.css
share/gnome/help/gabber/C/first.html
share/gnome/help/gabber/C/first.png
share/gnome/help/gabber/C/gabber.sgml
share/gnome/help/gabber/C/index.html
share/gnome/help/gabber/C/intro.html
-share/gnome/help/gabber/C/license.html
-share/gnome/help/gabber/C/login.html
+share/gnome/help/gabber/C/legalnotice.html
share/gnome/help/gabber/C/login.png
share/gnome/help/gabber/C/main-menubar.html
share/gnome/help/gabber/C/main-status.html
share/gnome/help/gabber/C/main-toolbar.html
share/gnome/help/gabber/C/main.html
share/gnome/help/gabber/C/main.png
-share/gnome/help/gabber/C/msg-gc.html
-share/gnome/help/gabber/C/msg-normal.html
share/gnome/help/gabber/C/msg-normal.png
-share/gnome/help/gabber/C/msg-ooo.html
share/gnome/help/gabber/C/msg-ooo.png
-share/gnome/help/gabber/C/msg-que.html
-share/gnome/help/gabber/C/msg-rules.html
-share/gnome/help/gabber/C/msg.html
-share/gnome/help/gabber/C/panel.html
-share/gnome/help/gabber/C/pref-appearance.html
-share/gnome/help/gabber/C/pref-autoaway.html
-share/gnome/help/gabber/C/pref-connection.html
-share/gnome/help/gabber/C/pref-encryption.html
-share/gnome/help/gabber/C/pref-logs.html
-share/gnome/help/gabber/C/pref-msg.html
-share/gnome/help/gabber/C/pref.html
share/gnome/help/gabber/C/stylesheet-images/caution.gif
share/gnome/help/gabber/C/stylesheet-images/home.gif
share/gnome/help/gabber/C/stylesheet-images/important.gif
@@ -115,20 +108,12 @@
share/gnome/help/gabber/C/stylesheet-images/up.gif
share/gnome/help/gabber/C/stylesheet-images/warning.gif
share/gnome/help/gabber/C/topic.dat
-share/gnome/help/gabber/C/userinfo-vcard.html
-share/gnome/help/gabber/C/userinfo.html
-share/gnome/help/gabber/C/users-adduser.html
-share/gnome/help/gabber/C/users-deluser.html
-share/gnome/help/gabber/C/users-edituser.html
-share/gnome/help/gabber/C/users-history.html
-share/gnome/help/gabber/C/users-ignore.html
-share/gnome/help/gabber/C/users-send.html
-share/gnome/help/gabber/C/users.html
share/gnome/omf/gabber/gabber-C.omf
share/gnome/pixmaps/gabber.png
share/gnome/pixmaps/gabber/away.xpm
share/gnome/pixmaps/gabber/chat.xpm
share/gnome/pixmaps/gabber/dnd.xpm
+share/gnome/pixmaps/gabber/gabber-about.png
share/gnome/pixmaps/gabber/gnome-editgroups.xpm
share/gnome/pixmaps/gabber/gnome-gabber.xpm
share/gnome/pixmaps/gabber/gnome-gpg.xpm
@@ -141,6 +126,7 @@
share/gnome/pixmaps/gabber/online.xpm
share/gnome/pixmaps/gabber/stalker.xpm
share/gnome/pixmaps/gabber/xa.xpm
+share/gnome/pixmaps/gabber/xmms.xpm
share/gnome/sounds/gabber/gabber_connected.wav
share/gnome/sounds/gabber/gabber_encrypted.wav
share/gnome/sounds/gabber/gabber_message_queue.wav
@@ -151,18 +137,28 @@
share/gnome/sounds/gabber/gabber_ooochat_recv.wav
share/gnome/sounds/gabber/gabber_startup.wav
share/gnome/sounds/gabber/gabber_subrequest.wav
-share/locale/az/LC_MESSAGES/gabber.mo
-share/locale/da/LC_MESSAGES/gabber.mo
-share/locale/de/LC_MESSAGES/gabber.mo
-share/locale/es/LC_MESSAGES/gabber.mo
-share/locale/fi/LC_MESSAGES/gabber.mo
-share/locale/fr/LC_MESSAGES/gabber.mo
-share/locale/nl/LC_MESSAGES/gabber.mo
-share/locale/no/LC_MESSAGES/gabber.mo
-share/locale/ru/LC_MESSAGES/gabber.mo
-share/locale/sv/LC_MESSAGES/gabber.mo
-share/locale/tr/LC_MESSAGES/gabber.mo
-share/locale/uk/LC_MESSAGES/gabber.mo
+share/gnome/locale/az.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/ca.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/da.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/de.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/el.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/es.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/fi.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/fr.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/ja.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/ko.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/lt.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/ms.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/nl.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/no.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/pt.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/ro.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/ru.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/sk.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/sv.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/tr.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/uk.mo/LC_MESSAGES/gabber.mo
+share/gnome/locale/zh_TW.mo/LC_MESSAGES/gabber.mo
@unexec rmdir %D/etc/sound/events 2>/dev/null || true
@unexec rmdir %D/etc/sound 2>/dev/null || true
@dirrm share/gnome/sounds/gabber
--- files/patch-am.orig Tue Jan 8 01:54:49 2002
+++ files/patch-am Tue Jan 8 01:03:49 2002
@@ -1,7 +1,11 @@
---- src/Makefile.in.orig Wed Mar 14 16:07:36 2001
-+++ src/Makefile.in Wed Mar 28 14:52:10 2001
-@@ -156,3 +156,3 @@
+--- src/Makefile.in.orig Mon Jan 7 16:52:15 2002
++++ src/Makefile.in Tue Jan 8 01:03:21 2002
+@@ -220,7 +220,7 @@
+ gabber_LDADD = @EXTRA_GNOME_LIBS@ @XMMS_LIBS@ @SSL_LIBS@ @XSS_LIBS@ @GABBER_STATIC_LIBS@ \
+ ../jabberoo/src/libjabberoo.a \
+ ../jabberoo/expat/libexpat.a \
+- -lxml
++ -lxml -lgiconv
--gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ @XSS_LIBS@ ../jabberoo/src/libjabberoo.a ../jabberoo/expat/libexpat.a -lxml
-+gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ @XSS_LIBS@ ../jabberoo/src/libjabberoo.a ../jabberoo/expat/libexpat.a -lxml -lgiconv
+ gabber_LDFLAGS = @GABBER_STATIC@
* ADDED FILE files/patch-ltmain.sh
$FreeBSD: ports/textproc/libxml2/files/patch-ltmain.sh,v 1.4 2001/12/20 06:19:00 sobomax Exp $
--- ltmain.sh 2001/08/27 09:51:26 1.1
+++ ltmain.sh 2001/08/27 09:51:42
@@ -2408,6 +2408,9 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
@@ -4175,10 +4178,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
>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?200201080715.g087F5F44988>