Date: Fri, 22 Oct 2004 01:01:16 +0200 From: Piotr Smyrak <piotr.smyrak@heron.pl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/72983: [patch] update polish/gnugadu2 from 2.0.3 to 2.2.0 Message-ID: <E1CKlvo-0004H6-3m@beth.poprostu.pl> Resent-Message-ID: <200410212310.i9LNATpW013370@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72983
>Category: ports
>Synopsis: [patch] update polish/gnugadu2 from 2.0.3 to 2.2.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 21 23:10:29 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Piotr Smyrak
>Release: FreeBSD 5.3-BETA5 i386
>Organization:
>Environment:
System: FreeBSD smyru 5.3-BETA5 FreeBSD 5.3-BETA5 #2: Fri Oct 1 14:13:03 CEST 2004 root@smyru:/usr/obj/usr/src/sys/SMYRU i386
>Description:
This is upgrade of gnugadu2 port to the next major release.
>How-To-Repeat:
N/A
>Fix:
--- gg.patch begins here ---
diff -Naru gnugadu2.orig/Makefile gnugadu2/Makefile
--- gnugadu2.orig/Makefile Wed Jul 21 23:38:29 2004
+++ gnugadu2/Makefile Thu Oct 21 23:30:16 2004
@@ -6,7 +6,7 @@
#
PORTNAME= gnugadu2
-PORTVERSION= 2.0.3
+PORTVERSION= 2.2.0
CATEGORIES= polish net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ggadu
@@ -18,7 +18,6 @@
LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/ekg
USE_X_PREFIX= yes
-USE_BZIP2= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gtk20
@@ -28,12 +27,9 @@
WANT_GNOME= yes
CONFLICTS= qhacc-*
-CONFIGURE_ARGS= --with-gui \
- --with-gadu \
- --with-sms \
- --with-external \
+CONFIGURE_ARGS= \
--with-external-libgadu \
- --with-update
+ --without-remote
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -44,78 +40,71 @@
WITH_ESOUND= yes
.endif
-.if defined(WITH_GTKSPELL)
-CONFIGURE_ARGS+= --with-gtkspell
+.if !defined(WITH_GTKSPELL)
+CONFIGURE_ARGS+= --without-gtkspell
+.else
LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell2
.endif
-.if defined(WITH_DOCKLET)
-CONFIGURE_ARGS+= --with-docklet_system_tray
-PLIST_SUB+= DOCKLET:=""
-.else
-CONFIGURE_ARGS+= --without-docklet_system_tray
+.if !defined(WITH_DOCKLET)
+CONFIGURE_ARGS+= --without-docklet-system-tray
PLIST_SUB+= DOCKLET:="@comment "
+.else
+PLIST_SUB+= DOCKLET:=""
.endif
-.if defined(WITH_DOCKAPP)
-CONFIGURE_ARGS+= --with-docklet_dockapp
-PLIST_SUB+= DOCKAPP:=""
-.else
+.if !defined(WITH_DOCKAPP)
CONFIGURE_ARGS+= --without-docklet_dockapp
PLIST_SUB+= DOCKAPP:="@comment "
+.else
+PLIST_SUB+= DOCKAPP:=""
.endif
-.if defined(WITH_TLEN)
-CONFIGURE_ARGS+= --with-tlen
-LIB_DEPENDS+= tlen.1:${PORTSDIR}/polish/libtlen
-PLIST_SUB+= TLEN:=""
-.else
+.if !defined(WITH_TLEN)
CONFIGURE_ARGS+= --without-tlen
PLIST_SUB+= TLEN:="@comment "
+.else
+LIB_DEPENDS+= tlen.1:${PORTSDIR}/polish/libtlen
+PLIST_SUB+= TLEN:=""
.endif
-.if defined(WITH_JABBER)
-CONFIGURE_ARGS+= --with-jabber
-LIB_DEPENDS+= loudmouth-1.0:${PORTSDIR}/net/loudmouth
-PLIST_SUB+= JABBER:=""
-.else
+.if !defined(WITH_JABBER)
CONFIGURE_ARGS+= --without-jabber
PLIST_SUB+= JABBER:="@comment "
+.else
+LIB_DEPENDS+= loudmouth-1.0:${PORTSDIR}/net/loudmouth
+PLIST_SUB+= JABBER:=""
.endif
-.if defined(WITH_ESOUND)
-CONFIGURE_ARGS+= --with-esd
+.if !defined(WITH_ESOUND)
+CONFIGURE_ARGS+= --without-esd
+PLIST_SUB+= ESOUND:="@comment "
+.else
PKGNAMESUFFIX= -esound
USE_GNOME+= esound
PLIST_SUB+= ESOUND:=""
-.else
-CONFIGURE_ARGS+= --without-esd
-PLIST_SUB+= ESOUND:="@comment "
.endif
-.if defined(WITH_ARTS)
-CONFIGURE_ARGS+= --with-arts
-LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
-PLIST_SUB+= ARTS:=""
-.else
+.if !defined(WITH_ARTS)
CONFIGURE_ARGS+= --without-arts
PLIST_SUB+= ARTS:="@comment "
+.else
+LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
+PLIST_SUB+= ARTS:=""
.endif
-.if defined(WITH_OSS)
-CONFIGURE_ARGS+= --with-oss
-PLIST_SUB+= OSS:=""
-.else
+.if !defined(WITH_OSS)
PLIST_SUB+= OSS:="@comment "
+.else
+PLIST_SUB+= OSS:=""
.endif
-.if defined(WITH_XOSD)
-CONFIGURE_ARGS+= --with-xosd
-LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd
-PLIST_SUB+= XOSD:=""
-.else
+.if !defined(WITH_XOSD)
CONFIGURE_ARGS+= --without-xosd
PLIST_SUB+= XOSD:="@comment "
+.else
+LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd
+PLIST_SUB+= XOSD:=""
.endif
.if (${HAVE_GNOME:Mgnomehier}!="")
@@ -130,17 +119,38 @@
.endif
pre-everything::
+.if defined(WITH_TLEN) || defined(WITH_JABBER) || defined(WITH_XOSD) || defined(WITH_DOCLET) || defined(WITH_DOCKAPP) || defined(WITH_OSS) || defined(WITH_ARTS) || defined(WITH_ESOUND) || defined(WITH_GTKSPELL)
@${ECHO_MSG}
@${ECHO_MSG} " You can define following build options:"
@${ECHO_MSG}
+.endif
+.if !defined(WITH_TLEN)
@${ECHO_MSG} " WITH_TLEN to enable Tlen.pl network plugin"
+.endif
+.if !defined(WITH_JABBER)
@${ECHO_MSG} " WITH_JABBER to enable Jabber loudmouth plugin"
+.endif
+.if !defined(WITH_XOSD)
@${ECHO_MSG} " WITH_XOSD to enable On-Screen-Display messages"
+.endif
+.if !defined(WITH_DOCKLET)
@${ECHO_MSG} " WITH_DOCKLET to enable freedesktop.org docklet plugin"
+.endif
+.if !defined(WITH_DOCKAPP)
@${ECHO_MSG} " WITH_DOCKAPP to enable WindowMaker dockapp plugin"
+.endif
+.if !defined(WITH_OSS)
@${ECHO_MSG} " WITH_OSS to build with sound via OSS"
+.endif
+.if !defined(WITH_ARTS)
@${ECHO_MSG} " WITH_ARTS to build with aRts sound server"
+.endif
+.if !defined(WITH_ESOUND)
@${ECHO_MSG} " WITH_ESOUND to build with esound sound server"
+.endif
+.if !defined(WITH_GTKSPELL)
+ @${ECHO_MSG} " WITH_GTKSPELL to enable GTKSpell checker"
+.endif
@${ECHO_MSG}
post-patch:
diff -Naru gnugadu2.orig/distinfo gnugadu2/distinfo
--- gnugadu2.orig/distinfo Wed Jul 21 23:38:29 2004
+++ gnugadu2/distinfo Thu Oct 21 23:31:11 2004
@@ -1,2 +1,2 @@
-MD5 (gg2-2.0.3.tar.bz2) = e8795ba49b9817a1db5e8628c9c9e30a
-SIZE (gg2-2.0.3.tar.bz2) = 1182315
+MD5 (gg2-2.2.0.tar.gz) = 922561225eefaf1b2c1b13d772002581
+SIZE (gg2-2.2.0.tar.gz) = 1282674
diff -Naru gnugadu2.orig/files/patch-src::plugins::GUI::GUI_plugin.c gnugadu2/files/patch-src::plugins::GUI::GUI_plugin.c
--- gnugadu2.orig/files/patch-src::plugins::GUI::GUI_plugin.c Wed Jul 21 23:38:29 2004
+++ gnugadu2/files/patch-src::plugins::GUI::GUI_plugin.c Thu Jan 1 01:00:00 1970
@@ -1,19 +0,0 @@
---- src/plugins/GUI/GUI_plugin.c.orig Fri Jun 11 03:25:33 2004
-+++ src/plugins/GUI/GUI_plugin.c Wed Jul 21 22:42:19 2004
-@@ -753,6 +753,7 @@
- GGaduMsg *msg = signal->data;
- gui_protocol *gp = NULL;
- gchar *soundfile = NULL;
-+ GtkWidget *window;
-
- if (!signal || !msg)
- {
-@@ -816,7 +817,7 @@
- if (msg->message && (soundfile = ggadu_config_var_get(gui_handler, "sound_msg_in")))
- signal_emit_full("main-gui", "sound play file", soundfile, "sound*", NULL);
-
-- GtkWidget *window = gtk_widget_get_ancestor(session->chat, GTK_TYPE_WINDOW);
-+ window = gtk_widget_get_ancestor(session->chat, GTK_TYPE_WINDOW);
- if (!GTK_WIDGET_VISIBLE(window)) {
- if (showwindow) {
- /* GtkWidget *input = g_object_get_data(G_OBJECT(session->chat), "input");
diff -Naru gnugadu2.orig/files/patch-src::plugins::gadu_gadu::gadu_gadu_plugin.c gnugadu2/files/patch-src::plugins::gadu_gadu::gadu_gadu_plugin.c
--- gnugadu2.orig/files/patch-src::plugins::gadu_gadu::gadu_gadu_plugin.c Wed Jul 21 23:38:29 2004
+++ gnugadu2/files/patch-src::plugins::gadu_gadu::gadu_gadu_plugin.c Thu Jan 1 01:00:00 1970
@@ -1,140 +0,0 @@
---- src/plugins/gadu_gadu/gadu_gadu_plugin.c.orig Sat Jun 12 09:04:53 2004
-+++ src/plugins/gadu_gadu/gadu_gadu_plugin.c Wed Jul 21 23:11:11 2004
-@@ -385,6 +385,10 @@
- GGaduMsg *msg = NULL;
- gchar *hist_line = NULL;
- gint i, j;
-+ GSList *list;
-+ GSList *us;
-+ gchar *line2 = NULL;
-+
-
- /* w przypadku bledu/utraty polaczenia postap tak jak w przypadku disconnect */
- if (!(e = gg_watch_fd(session)) || (condition & G_IO_ERR) ||
-@@ -524,9 +528,8 @@
-
- }
-
-- GSList *list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
-- GSList *us = list;
-- gchar *line2 = NULL;
-+ list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
-+ us = list;
-
- while(us)
- {
-@@ -560,6 +563,8 @@
- gchar *strIP = NULL;
- gchar *id = g_strdup_printf("%d", e->event.notify60[i].uin);
- struct in_addr ip_addr;
-+ gchar *status = NULL;
-+ gchar *line;
- GGaduContact *k = ggadu_repo_find_value("gadu-gadu", ggadu_repo_key_from_string(id));
-
- if (k)
-@@ -581,7 +586,7 @@
-
- /* Zapiszmy sobie zmiane opisu do pliku historii */
-
-- gchar *status = NULL;
-+ status = NULL;
- if((k->status == GG_STATUS_AVAIL)||(k->status == GG_STATUS_AVAIL_DESCR)) status = g_strdup_printf("avail");
- else if((k->status == GG_STATUS_BUSY)||(k->status == GG_STATUS_BUSY_DESCR)) status = g_strdup_printf("busy");
- else if((k->status == GG_STATUS_INVISIBLE)||(k->status == GG_STATUS_INVISIBLE_DESCR)) status = g_strdup_printf("notavail");
-@@ -592,7 +597,7 @@
- /* Format kompatybilny z historią Kadu ;) */
- /* Jednak pierw należy skasować [numerek].idx aby uaktualnić ;) */
-
-- gchar *line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick,
-+ line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick,
- ((k->ip == NULL) ? "0.0.0.0" : k->ip), (int)time(0), status,
- ((k->status_descr == NULL) ? "" : g_strdup_printf(",%s",k->status_descr)));
- ggadu_gg_save_history((gchar *) k->id, line);
-@@ -623,6 +628,8 @@
-
- while (n->uin)
- {
-+ gchar *status;
-+ gchar *line;
- gchar *id = g_strdup_printf("%d", n->uin);
- GGaduContact *k = ggadu_repo_find_value("gadu-gadu", ggadu_repo_key_from_string(id));
- struct in_addr ip_addr;
-@@ -647,7 +654,7 @@
-
- /* Zapiszmy sobie zmiane opisu do pliku historii */
-
-- gchar *status = NULL;
-+ status = NULL;
- if((k->status == GG_STATUS_AVAIL)||(k->status == GG_STATUS_AVAIL_DESCR)) status = g_strdup_printf("avail");
- else if((k->status == GG_STATUS_BUSY)||(k->status == GG_STATUS_BUSY_DESCR)) status = g_strdup_printf("busy");
- else if((k->status == GG_STATUS_INVISIBLE)||(k->status == GG_STATUS_INVISIBLE_DESCR)) status = g_strdup_printf("notavail");
-@@ -658,7 +665,7 @@
- /* Format kompatybilny z historią Kadu ;) */
- /* Jednak pierw należy skasować [numerek].idx aby uaktualnić ;) */
-
-- gchar *line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick,
-+ line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick,
- ((k->ip == NULL) ? "0.0.0.0" : k->ip), (gint)time(0), status,
- ((k->status_descr == NULL) ? "" : g_strdup_printf(",%s",k->status_descr)));
- ggadu_gg_save_history((gchar *) k->id, line);
-@@ -674,6 +681,8 @@
- case GG_EVENT_STATUS60:
- case GG_EVENT_STATUS:
- {
-+ gchar *status;
-+ gchar *line;
- gchar *id =
- g_strdup_printf("%d",
- (e->type ==
-@@ -698,7 +707,7 @@
-
- /* Zapiszmy sobie zmiane opisu do pliku historii */
-
-- gchar *status = NULL;
-+ status = NULL;
- if((k->status == GG_STATUS_AVAIL)||(k->status == GG_STATUS_AVAIL_DESCR)) status = g_strdup_printf("avail");
- else if((k->status == GG_STATUS_BUSY)||(k->status == GG_STATUS_BUSY_DESCR)) status = g_strdup_printf("busy");
- else if((k->status == GG_STATUS_INVISIBLE)||(k->status == GG_STATUS_INVISIBLE_DESCR)) status = g_strdup_printf("notavail");
-@@ -709,7 +718,7 @@
- /* Format kompatybilny z historią Kadu ;) */
- /* Jednak pierw należy skasować [numerek].idx aby uaktualnić ;) */
-
-- gchar *line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick,
-+ line = g_strdup_printf("status,%s,%s,%s,%d,%s%s\n", k->id, k->nick,
- ((k->ip == NULL) ? "0.0.0.0" : k->ip), (gint)time(0), status,
- ((k->status_descr == NULL) ? "" : g_strdup_printf(",%s",k->status_descr)));
- ggadu_gg_save_history((gchar *) k->id, line);
-@@ -2275,6 +2284,7 @@
- GSList *tmp = msg->recipients;
- while (tmp)
- {
-+ gchar *line;
- GSList *list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
- GSList *us = list;
- gchar *line2 = NULL;
-@@ -2288,7 +2298,7 @@
- }
-
-
-- gchar *line =
-+ line =
- g_strdup_printf("chatsend,%s,%s,%d,%s\n", msg->id, line2, (gint)time(0), msg->message);
- ggadu_gg_save_history((gchar *) tmp->data, line);
- g_free(line2);
-@@ -2312,6 +2322,7 @@
- }
- else if (ggadu_config_var_get(handler, "log"))
- {
-+ gchar *line;
- GSList *list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
- GSList *us = list;
- gchar *line2 = NULL;
-@@ -2324,7 +2335,7 @@
- us = us->next;
- }
-
-- gchar *line =
-+ line =
- g_strdup_printf("chatsend,%s,%s,%d,%s\n", msg->id, line2, (gint)time(0), msg->message);
- ggadu_gg_save_history(msg->id, line);
-
diff -Naru gnugadu2.orig/pkg-descr gnugadu2/pkg-descr
--- gnugadu2.orig/pkg-descr Fri Jan 16 00:48:06 2004
+++ gnugadu2/pkg-descr Fri Oct 22 00:42:17 2004
@@ -1,9 +1,9 @@
-Development GTK2 based version of GaduGadu client for X11/GTK.
-GaduGadu is an ICQ-like messenger network for the Polish language.
+Gadu-Gadu protocol client for X11/GTK+, instant messenger targeting
+mainly users of this Poland's based propietary IM network.
GnuGadu2 is a complete rewrite featuring a plugin extensible
-architecture, that opens it to the multiprotocol world. Transport
-plugins exist for Jabber, Tlen.pl, there are sound servers and
-others.
+architecture, that has opened it to the multiprotocol world. Transport
+plugins exist for Jabber, Tlen.pl, also for various sound servers
+and others.
-WWW: http://gadu.gnu.pl
+WWW: http://www.gnugadu.org
diff -Naru gnugadu2.orig/pkg-plist gnugadu2/pkg-plist
--- gnugadu2.orig/pkg-plist Wed Jul 21 23:38:29 2004
+++ gnugadu2/pkg-plist Fri Oct 22 00:30:36 2004
@@ -228,14 +228,13 @@
share/gg2/pixmaps/icons/rozgwiazda/license.txt
share/gg2/pixmaps/icons/rozgwiazda/sms.png
share/gg2/pixmaps/icons/rozgwiazda/tlen.png
-share/gg2/pixmaps/icons/tlen-3d/README
-share/gg2/pixmaps/icons/tlen-3d/tlen-away.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-beback.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-chat.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-invisible.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-occupied.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-offline.png
-share/gg2/pixmaps/icons/tlen-3d/tlen-online.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-away.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-beback.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-chat.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-invisible.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-occupied.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-offline.png
+share/gg2/pixmaps/icons/tlen-classic/tlen-online.png
share/gg2/pixmaps/icq-away.png
share/gg2/pixmaps/icq-dnd.png
share/gg2/pixmaps/icq-freechat.png
@@ -245,14 +244,16 @@
share/gg2/pixmaps/icq-offline.png
share/gg2/pixmaps/icq-online.png
share/gg2/pixmaps/icq.png
+share/gg2/pixmaps/jabber-auth-from.png
share/gg2/pixmaps/jabber-away.png
share/gg2/pixmaps/jabber-dnd.png
share/gg2/pixmaps/jabber-error.png
+share/gg2/pixmaps/jabber-noauth.png
share/gg2/pixmaps/jabber-offline.png
share/gg2/pixmaps/jabber-online.png
share/gg2/pixmaps/jabber-xa.png
share/gg2/pixmaps/jabber.png
-share/gg2/pixmaps/new-msg.png
+share/gg2/pixmaps/new-msg.gif
share/gg2/pixmaps/offline.png
share/gg2/pixmaps/online.png
share/gg2/pixmaps/push-pin.png
@@ -279,8 +280,10 @@
share/gg2/themes/gray2.theme
share/gg2/themes/green2.theme
share/gg2/themes/lightblue.theme
+share/gg2/themes/office.theme
share/gg2/themes/red2.theme
share/gg2/themes/thinice.theme
+share/gg2/themes/tropic.theme
share/gg2/themes/vblue2.theme
share/gg2/themes/vgreen2.theme
share/gg2/themes/vred2.theme
--- gg.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1CKlvo-0004H6-3m>