Date: Sun, 23 May 1999 03:26:56 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/11853: Port update: net/yagirc Message-ID: <199905230126.DAA10449@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 11853 >Category: ports >Synopsis: Port update: net/yagirc >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat May 22 18:30:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Jeremy Lea >Release: FreeBSD 4.0-CURRENT i386 >Organization: Arb's Inc. >Environment: FreeBSD Ports collection. >Description: Upgrade to 0.66.1. Kludge it to work with gtk12. This means that the glib11, gtk11 and glib11-devel ports can be removed (I think... :) >How-To-Repeat: >Fix: net/yagirc: Upgrade from 0.65.7 to 0.66.1 Changes: Makefile files/md5 patches/patch-aa pkg/PLIST Adds : patches/patch-ab patches/patch-ac Removes: --- /usr/ports.ref/net/yagirc/Makefile Wed Mar 17 12:52:16 1999 +++ net/yagirc/Makefile Sun May 23 03:18:23 1999 @@ -1,27 +1,29 @@ # New ports collection makefile for: yagirc -# Version required: 0.65.7 +# Version required: 0.66.1 # Date created: 6 July 1998 # Whom: mph # # $Id: Makefile,v 1.14 1999/03/15 18:30:05 nectar Exp $ # -DISTNAME= yagirc-0.65.7 +DISTNAME= yagirc-0.66.1 CATEGORIES= net MASTER_SITES= http://www.elpaso.net/~spoon/yagirc/ MAINTAINER= mph@freebsd.org -LIB_DEPENDS= gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 \ - Imlib.3:${PORTSDIR}/graphics/imlib \ +LIB_DEPENDS= Imlib.4:${PORTSDIR}/graphics/imlib \ + Xpm.4:${PORTSDIR}/graphics/xpm \ esd.1:${PORTSDIR}/audio/esound -BROKEN= build +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_GMAKE= yes USE_PERL5= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-gnome --disable-gtktest -CONFIGURE_ENV= PTHREAD_LIB="-lc_r" +USE_LIBTOOL= yes +CONFIGURE_ARGS= --disable-gnome --disable-pthread +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> --- /usr/ports.ref/net/yagirc/files/md5 Thu Aug 27 07:15:05 1998 +++ net/yagirc/files/md5 Sun May 23 02:56:28 1999 @@ -1 +1,2 @@ -MD5 (yagirc-0.65.7.tar.gz) = 7f16475a56af4cb9e0ee7ebf38bcccc7 +MD5 (yagirc-0.66.1.tar.gz) = 034b73f35f7c8d3790ca695c73486106 +MD5 (gtkonly.patch) = dd7711efb875fee732a15b0681fc1b5b --- /usr/ports.ref/net/yagirc/patches/patch-aa Tue Aug 25 06:09:42 1998 +++ net/yagirc/patches/patch-aa Sun May 23 02:29:10 1999 @@ -1,178 +1,22 @@ ---- configure.orig Wed Aug 19 16:13:49 1998 -+++ configure Tue Aug 25 11:24:48 1998 -@@ -1666,7 +1666,7 @@ - - - --SCRIPT_PATH=`/bin/ls /usr/lib/perl5/*/*/CORE/EXTERN.h 2>/dev/null` -+SCRIPT_PATH=`/bin/ls /usr/local/lib/perl5/*/*/CORE/EXTERN.h 2>/dev/null` - - if [ _$SCRIPT_PATH = _ ] || [ ! -f $SCRIPT_PATH ]; then - SCRIPT_PATH=`locate CORE/EXTERN.h|grep /CORE$|grep perl5` -@@ -1769,18 +1769,18 @@ - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config - fi - fi - -- # Extract the first word of "gtk-config", so it can be a program name with args. --set dummy gtk-config; ac_word=$2 -+ # Extract the first word of "gtk11-config", so it can be a program name with args. -+set dummy gtk11-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:1786: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then -@@ -1861,16 +1861,16 @@ - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { -- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); -- printf ("*** was found! If gtk-config was correct, then it is best\n"); -+ printf ("*** was found! If gtk11-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); -- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -+ printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n"); -+ printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else -@@ -1890,10 +1890,10 @@ - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); -- printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -+ printf("*** probably means that the wrong copy of the gtk11-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -- printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -+ printf("*** correct copy of gtk11-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } -@@ -1925,10 +1925,10 @@ - else - echo "$ac_t""no" 1>&6 - if test "$GTK_CONFIG" = "no" ; then -- echo "*** The gtk-config script installed by GTK could not be found" -+ echo "*** The gtk11mn:wq-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" -- echo "*** full path to gtk-config." -+ echo "*** full path to gtk11-config." - else - if test -f conf.gtktest ; then - : -@@ -1970,7 +1970,7 @@ - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" -- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -+ echo "*** may want to edit the gtk11-config script: $GTK_CONFIG" +--- configure.orig Sun May 23 02:28:26 1999 ++++ configure Sun May 23 02:28:56 1999 +@@ -3113,15 +3113,15 @@ fi - rm -f conftest* - CFLAGS="$ac_save_CFLAGS" -@@ -1979,7 +1979,7 @@ - fi - GTK_CFLAGS="" - GTK_LIBS="" -- { echo "configure: error: Cannot find GTK: Is gtk-config in path?" 1>&2; exit 1; } -+ { echo "configure: error: Cannot find GTK: Is gtk11-config in path?" 1>&2; exit 1; } - fi - - -@@ -2185,18 +2185,18 @@ - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config - fi - fi -- # Extract the first word of "gtk-config", so it can be a program name with args. --set dummy gtk-config; ac_word=$2 -+ # Extract the first word of "gtk11-config", so it can be a program name with args. -+set dummy gtk11-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:2202: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then -@@ -2277,16 +2277,16 @@ - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { -- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); -- printf ("*** was found! If gtk-config was correct, then it is best\n"); -+ printf ("*** was found! If gtk11-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); -- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -+ printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n"); -+ printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else -@@ -2306,10 +2306,10 @@ - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); -- printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -+ printf("*** probably means that the wrong copy of the gtk11-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -- printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -+ printf("*** correct copy of gtk11-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } -@@ -2340,10 +2340,10 @@ - else - echo "$ac_t""no" 1>&6 - if test "$GTK_CONFIG" = "no" ; then -- echo "*** The gtk-config script installed by GTK could not be found" -+ echo "*** The gtk11-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" -- echo "*** full path to gtk-config." -+ echo "*** full path to gtk11-config." - else - if test -f conf.gtktest ; then - : -@@ -2385,7 +2385,7 @@ - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" -- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -+ echo "*** may want to edit the gtk11-config script: $GTK_CONFIG" - fi - rm -f conftest* - CFLAGS="$ac_save_CFLAGS" + +- USE_INCLUDED_LIBINTL=yes ++# USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share +- INTLDEPS='$(top_builddir)/intl/libintl.a' ++ INTLDEPS='-lintl' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` +- nls_cv_header_intl=intl/libintl.h +- nls_cv_header_libgt=intl/libgettext.h ++# nls_cv_header_intl=intl/libintl.h ++# nls_cv_header_libgt=intl/libgettext.h + fi + + if test "$XGETTEXT" != ":"; then --- /usr/ports.ref/net/yagirc/patches/patch-ab Thu Jan 1 02:00:00 1970 +++ net/yagirc/patches/patch-ab Sun May 23 02:44:24 1999 @@ -0,0 +1,10 @@ +--- src/net_nowait.c.orig Sun May 23 02:42:46 1999 ++++ src/net_nowait.c Sun May 23 02:43:09 1999 +@@ -32,6 +32,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <errno.h> + #include <glib.h> + #include <string.h> + --- /usr/ports.ref/net/yagirc/patches/patch-ac Thu Jan 1 02:00:00 1970 +++ net/yagirc/patches/patch-ac Sun May 23 03:14:45 1999 @@ -0,0 +1,45 @@ +--- src/gui_channels.c.orig Fri Oct 23 00:56:58 1998 ++++ src/gui_channels.c Sun May 23 03:01:28 1999 +@@ -240,8 +240,9 @@ + gethostname(hostname, 127); + sprintf(pid, "%d", getpid()); + +- channel_drag_types[0].target = +- g_copy_strings("application/x-yagirc-channel-", hostname, pid, NULL); ++ channel_drag_types[0].target = g_malloc ( strlen (hostname) + strlen (pid) + 29 ); ++ sprintf(channel_drag_types[0].target, "%s%s%s", ++ "application/x-yagirc-channel-", hostname, pid, NULL); + } + + /* create widget */ +--- src/gui_list.c.orig Sun May 23 03:12:18 1999 ++++ src/gui_list.c Sun May 23 03:12:30 1999 +@@ -278,8 +278,6 @@ + gtk_signal_connect(GTK_OBJECT(clist), "unselect_row", GTK_SIGNAL_FUNC(list_callback), "unselect"); + gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(clist), TRUE, TRUE, 0); + gtk_clist_set_selection_mode(clist, GTK_SELECTION_SINGLE); +- gtk_clist_set_policy(clist, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +- gtk_clist_set_border(clist, GTK_SHADOW_OUT); + gtk_clist_set_column_title(clist, 0, "Channel"); + gtk_clist_set_column_title(clist, 1, "Users"); + gtk_clist_set_column_title(clist, 2, "Topic"); +--- src/gui_setup_alias.c.orig Sun May 23 03:12:54 1999 ++++ src/gui_setup_alias.c Sun May 23 03:13:09 1999 +@@ -239,7 +239,6 @@ + + /* alias list */ + gtk_clist_set_column_width (GTK_CLIST (alias_list), 0, 100); +- gtk_clist_set_policy(GTK_CLIST(alias_list), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + //gtk_list_set_selection_mode (GTK_LIST(alias_list), GTK_SELECTION_MULTIPLE); + gtk_clist_set_selection_mode (GTK_CLIST(alias_list), GTK_SELECTION_BROWSE); + gtk_signal_connect (GTK_OBJECT (alias_list), "select_row", +--- src/gui_urllist.c.orig Sun May 23 03:13:42 1999 ++++ src/gui_urllist.c Sun May 23 03:13:54 1999 +@@ -160,7 +160,6 @@ + + /* configure the list box */ + gtk_clist_set_selection_mode(GTK_CLIST(urlwin->list), GTK_SELECTION_BROWSE); +- gtk_clist_set_policy(GTK_CLIST(urlwin->list), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_clist_column_titles_passive(GTK_CLIST(urlwin->list)); + gtk_clist_set_column_width(GTK_CLIST(urlwin->list), 0, 140); + gtk_clist_set_column_width(GTK_CLIST(urlwin->list), 1, 60); --- /usr/ports.ref/net/yagirc/pkg/PLIST Tue Aug 25 06:09:42 1998 +++ net/yagirc/pkg/PLIST Sun May 23 03:17:48 1999 @@ -1,5 +1,25 @@ bin/yagirc etc/yagirc.conf +share/locale/es/LC_MESSAGES/yagirc.mo +share/locale/fr/LC_MESSAGES/yagirc.mo +share/locale/ko/LC_MESSAGES/yagirc.mo +share/locale/pt_BR/LC_MESSAGES/yagirc.mo share/yagirc/irc.pl +share/yagirc/pixmaps/about.xpm +share/yagirc/pixmaps/autoraise.xpm +share/yagirc/pixmaps/away.xpm +share/yagirc/pixmaps/close.xpm +share/yagirc/pixmaps/connect.xpm +share/yagirc/pixmaps/disconnect.xpm +share/yagirc/pixmaps/font.xpm +share/yagirc/pixmaps/join.xpm +share/yagirc/pixmaps/newh.xpm +share/yagirc/pixmaps/neww.xpm +share/yagirc/pixmaps/part.xpm +share/yagirc/pixmaps/quit.xpm +share/yagirc/pixmaps/selectserver.xpm +share/yagirc/pixmaps/setup.xpm +share/yagirc/pixmaps/url.xpm share/yagirc/startup.pm +@dirrm share/yagirc/pixmaps @dirrm share/yagirc >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?199905230126.DAA10449>