diff options
author | wiz <wiz@pkgsrc.org> | 2002-09-11 20:47:14 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2002-09-11 20:47:14 +0000 |
commit | 963cdd4291515e081177a23b3d018fd8489f272a (patch) | |
tree | 8c483a0f086dece9d8419b40ffe1a3b68eb0cbd1 /net | |
parent | b614a434b80837a5c517e9bcb8761d4308173bb1 (diff) | |
download | pkgsrc-963cdd4291515e081177a23b3d018fd8489f272a.tar.gz |
Initial import of dctc (Direct Connect Text Client) and its GUI, dc_gui
(Direct Connect GUI). Requested by reed some months ago ;)
DC is another file sharing protocol.
Diffstat (limited to 'net')
-rw-r--r-- | net/dc_gui/DESCR | 14 | ||||
-rw-r--r-- | net/dc_gui/Makefile | 30 | ||||
-rw-r--r-- | net/dc_gui/PLIST | 20 | ||||
-rw-r--r-- | net/dc_gui/distinfo | 11 | ||||
-rw-r--r-- | net/dc_gui/patches/patch-aa | 32 | ||||
-rw-r--r-- | net/dc_gui/patches/patch-ab | 13 | ||||
-rw-r--r-- | net/dc_gui/patches/patch-ac | 58 | ||||
-rw-r--r-- | net/dc_gui/patches/patch-ad | 39 | ||||
-rw-r--r-- | net/dc_gui/patches/patch-ae | 36 | ||||
-rw-r--r-- | net/dc_gui/patches/patch-af | 22 | ||||
-rw-r--r-- | net/dc_gui/patches/patch-ag | 37 | ||||
-rw-r--r-- | net/dctc/DESCR | 11 | ||||
-rw-r--r-- | net/dctc/Makefile | 28 | ||||
-rw-r--r-- | net/dctc/PLIST | 5 | ||||
-rw-r--r-- | net/dctc/distinfo | 15 | ||||
-rw-r--r-- | net/dctc/patches/patch-aa | 10 | ||||
-rw-r--r-- | net/dctc/patches/patch-ab | 32 | ||||
-rw-r--r-- | net/dctc/patches/patch-ac | 13 | ||||
-rw-r--r-- | net/dctc/patches/patch-ad | 66 | ||||
-rw-r--r-- | net/dctc/patches/patch-ae | 20 | ||||
-rw-r--r-- | net/dctc/patches/patch-af | 21 | ||||
-rw-r--r-- | net/dctc/patches/patch-ag | 13 | ||||
-rw-r--r-- | net/dctc/patches/patch-ah | 13 | ||||
-rw-r--r-- | net/dctc/patches/patch-ai | 14 | ||||
-rw-r--r-- | net/dctc/patches/patch-aj | 13 | ||||
-rw-r--r-- | net/dctc/patches/patch-ak | 13 |
26 files changed, 599 insertions, 0 deletions
diff --git a/net/dc_gui/DESCR b/net/dc_gui/DESCR new file mode 100644 index 00000000000..f31753313ce --- /dev/null +++ b/net/dc_gui/DESCR @@ -0,0 +1,14 @@ +dc_gui is a GUI for DCTC. Currently, it is still a beta version, +some features don't work but the most useful ones are available: + * Currently, dc_gui can start a new client and/or attach itself + to already running DCTC. You can also start several connections + at the same time. You can switch between several DCTC. + * search: mono-hub search works and takes into account all search + criterias. It is already possible to start a download by clicking + on the wanted file. + * user list: the user list is simply displayed. It is already possible + to retrieve user shared files list. + * transfers: transfers are displayed and can be killed (either using + the popup menu or using the 'd' key). + * Preferences: current DCTC preferences are displayed and taken into + account to start new client or to update running client. diff --git a/net/dc_gui/Makefile b/net/dc_gui/Makefile new file mode 100644 index 00000000000..50604cf50e9 --- /dev/null +++ b/net/dc_gui/Makefile @@ -0,0 +1,30 @@ +# $NetBSD: Makefile,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ +# + +DISTNAME= dc_gui-0.60 +CATEGORIES= net +MASTER_SITES= http://www.ac2i.tzo.com/dctc/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.ac2i.tzo.com/dctc/ +COMMENT= graphical user interface for DCTC + +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +CONFIGURE_ARGS+= --enable-manual-db-detect +USE_GMAKE= YES + +post-configure: + @${ECHO} '#ifndef MSG_NOSIGNAL' >> ${WRKSRC}/config.h + @${ECHO} '# define MSG_NOSIGNAL 0' >> ${WRKSRC}/config.h + @${ECHO} '#endif' >> ${WRKSRC}/config.h + @${ECHO} '#ifndef ENODATA' >> ${WRKSRC}/config.h + @${ECHO} '# define ENODATA ENOMSG' >> ${WRKSRC}/config.h + @${ECHO} '#endif' >> ${WRKSRC}/config.h + +.include "../../converters/libiconv/buildlink2.mk" +.include "../../databases/db4/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" +.include "../../x11/gnome-libs/buildlink2.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/dc_gui/PLIST b/net/dc_gui/PLIST new file mode 100644 index 00000000000..c0c5ae0d52a --- /dev/null +++ b/net/dc_gui/PLIST @@ -0,0 +1,20 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ +bin/dc_gui +share/gnome/help/dc_gui/C/index.html +share/gnome/help/dc_gui/C/topic.dat +share/gnome/help/dc_gui/es/index.html +share/gnome/help/dc_gui/es/topic.dat +share/gnome/help/dc_gui/nl/index.html +share/gnome/help/dc_gui/nl/topic.dat +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dc_gui.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dc_gui.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/dc_gui.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dc_gui.mo +@dirrm share/gnome/help/dc_gui/nl/images +@dirrm share/gnome/help/dc_gui/nl +@dirrm share/gnome/help/dc_gui/es/images +@dirrm share/gnome/help/dc_gui/es +@dirrm share/gnome/help/dc_gui/C/images +@dirrm share/gnome/help/dc_gui/C +@dirrm share/gnome/help/dc_gui +@unexec ${RMDIR} share/gnome/help 2>/dev/null || ${TRUE} diff --git a/net/dc_gui/distinfo b/net/dc_gui/distinfo new file mode 100644 index 00000000000..41e19fad187 --- /dev/null +++ b/net/dc_gui/distinfo @@ -0,0 +1,11 @@ +$NetBSD: distinfo,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +SHA1 (dc_gui-0.60.tar.gz) = b22a783b9a93d1f07b9d65266469b405597ca7e9 +Size (dc_gui-0.60.tar.gz) = 430608 bytes +SHA1 (patch-aa) = 99881d4f57e646aba7a5f03aa45939e776921f71 +SHA1 (patch-ab) = acda6d89cc60414ebe69b239d357958e94e31de8 +SHA1 (patch-ac) = a1bc03b93bef1217eb9ca1077de4927049cddd74 +SHA1 (patch-ad) = 0854068b6c5940a566df4d6f689a58a7a427e617 +SHA1 (patch-ae) = f2e9fe445efea23fe52f27ff14d5dcc5c0775af0 +SHA1 (patch-af) = 9d6c0f96b5772e2eda691d7dedae539eafdbb24b +SHA1 (patch-ag) = f674203f9c05c9f3c99f9dc0e933c26df5e82e1b diff --git a/net/dc_gui/patches/patch-aa b/net/dc_gui/patches/patch-aa new file mode 100644 index 00000000000..d1476458177 --- /dev/null +++ b/net/dc_gui/patches/patch-aa @@ -0,0 +1,32 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- configure.orig Sat Aug 3 06:52:14 2002 ++++ configure +@@ -4177,14 +4177,14 @@ fi + + + if test "x$manu_db" = "xyes"; then +- echo $ac_n "checking for db_env_create in -ldb-4.0""... $ac_c" 1>&6 +-echo "configure:4182: checking for db_env_create in -ldb-4.0" >&5 +-ac_lib_var=`echo db-4.0'_'db_env_create | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for db_env_create in -ldb4""... $ac_c" 1>&6 ++echo "configure:4182: checking for db_env_create in -ldb4" >&5 ++ac_lib_var=`echo db4'_'db_env_create | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-ldb-4.0 $LIBS" ++LIBS="-ldb4 $LIBS" + cat > conftest.$ac_ext <<EOF + #line 4190 "configure" + #include "confdefs.h" +@@ -4219,7 +4219,7 @@ fi + + if test "x$HAVE_DB40" = "xyes"; then + +- berkeleydb_libs="-ldb-4.0" ++ berkeleydb_libs="-ldb4" + else + echo $ac_n "checking for db_env_create in -ldb-3.3""... $ac_c" 1>&6 + echo "configure:4226: checking for db_env_create in -ldb-3.3" >&5 diff --git a/net/dc_gui/patches/patch-ab b/net/dc_gui/patches/patch-ab new file mode 100644 index 00000000000..4abe9a90d8e --- /dev/null +++ b/net/dc_gui/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- src/bdb.c.orig Sat May 18 14:48:11 2002 ++++ src/bdb.c +@@ -28,7 +28,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <string.h> +-#include <db.h> ++#include <db4/db.h> + #include <gtk/gtk.h> + + #include "main.h" diff --git a/net/dc_gui/patches/patch-ac b/net/dc_gui/patches/patch-ac new file mode 100644 index 00000000000..6f8205980e9 --- /dev/null +++ b/net/dc_gui/patches/patch-ac @@ -0,0 +1,58 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- src/callbacks.c.orig Sun Aug 25 10:28:02 2002 ++++ src/callbacks.c +@@ -2,6 +2,13 @@ + # include <config.h> + #endif + ++#ifdef __linux__ ++#include <linux/sem.h> ++#else ++#ifndef SEMVMX ++#define SEMVMX 32767 /* semaphore maximum value */ ++#endif ++#endif + #include <math.h> + #include <sys/types.h> + #include <signal.h> +@@ -14,11 +21,10 @@ + #include <dirent.h> + #include <gdk/gdkkeysyms.h> + #include <gdk/gdk.h> +-#include <linux/sem.h> + #include <gnome.h> + #include <glib.h> + #include <time.h> +-#include <db.h> ++#include <db4/db.h> + #include <string.h> + + #include "callbacks.h" +@@ -1383,7 +1389,7 @@ on_find_entry_activate ( + + val=atof(gtk_entry_get_text(GTK_ENTRY(w))); + +- g_string_sprintfa(req,"%lf",scale*val); ++ g_string_sprintfa(req,"%f",scale*val); + } + + w=get_widget_by_widget_name("find_result"); +@@ -2610,7 +2616,7 @@ on_apply_pref_clicked ( + } + if(i==4) + i=0; +- g_string_sprintf(out,"/OFFSET %lf\n",strtod(v,NULL)*scale[i]); ++ g_string_sprintf(out,"/OFFSET %f\n",strtod(v,NULL)*scale[i]); + send_data_to_dctc(out->str); + } + } +@@ -3226,7 +3232,7 @@ static void reload_ls_cache_clist(int ev + nw[1]=buf; + + printf("%llX",lsch.share_size); +- sprintf(buf,"%'llu", lsch.share_size); ++ sprintf(buf,"%llu", lsch.share_size); + gtk_clist_append(clst,nw); + } + } diff --git a/net/dc_gui/patches/patch-ad b/net/dc_gui/patches/patch-ad new file mode 100644 index 00000000000..695fec0d5e2 --- /dev/null +++ b/net/dc_gui/patches/patch-ad @@ -0,0 +1,39 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- src/dctc_process.c.orig Tue Jul 30 17:54:39 2002 ++++ src/dctc_process.c +@@ -535,9 +535,9 @@ static void update_users_info(void) + } + + if( (amount/(1024.0*1024.0*1024.0)) > 1024.0) +- sprintf(buf,"%'d users (%'.2lfTB)",clst->rows,amount/(1024.0*1024.0*1024.0*1024.0)); ++ sprintf(buf,"%d users (%.2fTB)",clst->rows,amount/(1024.0*1024.0*1024.0*1024.0)); + else +- sprintf(buf,"%'d users (%'.2lfGB)",clst->rows,amount/(1024.0*1024.0*1024.0)); ++ sprintf(buf,"%d users (%.2fGB)",clst->rows,amount/(1024.0*1024.0*1024.0)); + w=get_widget_by_widget_name("users_info_label"); + if(w==NULL) + return; +@@ -697,7 +697,7 @@ static void uinfo_fnc(const GString *s) + fsize=g_string_new(""); + + if(vsize>(1024.0*1024.0*1024.0)) +- g_string_sprintf(fsize,"%'.2fGB",vsize/(1024.0*1024.0*1024.0)); ++ g_string_sprintf(fsize,"%.2fGB",vsize/(1024.0*1024.0*1024.0)); + else if(vsize>(1024.0*1024.0)) + g_string_sprintf(fsize,"%.2fMB",vsize/(1024.0*1024.0)); + else if(vsize>(1024.0)) +@@ -4140,11 +4140,11 @@ static void first_level_glst_end_fnc(Gtk + #endif + if(spd<1024.0) + { +- g_string_sprintfa(spd_str,"[%.2lfB/s]",spd); ++ g_string_sprintfa(spd_str,"[%.2fB/s]",spd); + } + else if(spd<(1024.0*1024.0)) + { +- g_string_sprintfa(spd_str,"[%.2lfKB/s]",spd/1024.0); ++ g_string_sprintfa(spd_str,"[%.2fKB/s]",spd/1024.0); + } + + /* Estimated Time to Arrival computation: now (in second) + missing_bytes/spd */ diff --git a/net/dc_gui/patches/patch-ae b/net/dc_gui/patches/patch-ae new file mode 100644 index 00000000000..6d9510171fc --- /dev/null +++ b/net/dc_gui/patches/patch-ae @@ -0,0 +1,36 @@ +$NetBSD: patch-ae,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- src/do_connect.c.orig Wed Aug 14 16:05:09 2002 ++++ src/do_connect.c +@@ -200,11 +200,11 @@ void update_dl_clist_size(GtkCList *clst + + if(spd<1024.0) + { +- sprintf(buf+strlen(buf)," %.2lfB/s",spd); ++ sprintf(buf+strlen(buf)," %.2fB/s",spd); + } + else if(spd<(1024.0*1024.0)) + { +- sprintf(buf+strlen(buf)," %.2lfKB/s",spd/1024.0); ++ sprintf(buf+strlen(buf)," %.2fKB/s",spd/1024.0); + } + } + +@@ -722,7 +722,7 @@ void start_a_new_dctc(char *hub_address, + + g_ptr_array_add(cmd_line,g_string_chunk_insert(sc,"-o")); + +- sprintf(bf,"%.0lf",value); ++ sprintf(bf,"%.0f",value); + g_ptr_array_add(cmd_line,g_string_chunk_insert(sc,bf)); + } + } +@@ -1160,7 +1160,7 @@ void start_a_new_dctc(char *hub_address, + + g_ptr_array_add(cmd_line,g_string_chunk_insert(sc,"-o")); + +- sprintf(bf,"%.0lf",value); ++ sprintf(bf,"%.0f",value); + g_ptr_array_add(cmd_line,g_string_chunk_insert(sc,bf)); + } + } diff --git a/net/dc_gui/patches/patch-af b/net/dc_gui/patches/patch-af new file mode 100644 index 00000000000..9aaf61f305c --- /dev/null +++ b/net/dc_gui/patches/patch-af @@ -0,0 +1,22 @@ +$NetBSD: patch-af,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- src/init_fnc.c.orig Fri Aug 23 19:11:47 2002 ++++ src/init_fnc.c +@@ -11,10 +11,17 @@ + #include <math.h> + #include <sys/types.h> + #include <sys/stat.h> ++#ifdef __linux__ + #include <linux/sem.h> /* for the value of SEMVMX */ ++#else ++#ifndef SEMVMX ++#define SEMVMX 32767 /* semaphore maximum value */ ++#endif ++#endif + #include <dirent.h> + #include <string.h> + #include <gnome.h> ++#include <db4/db.h> + + #include "misc_gtk.h" + #include "init_fnc.h" diff --git a/net/dc_gui/patches/patch-ag b/net/dc_gui/patches/patch-ag new file mode 100644 index 00000000000..14bc675334e --- /dev/null +++ b/net/dc_gui/patches/patch-ag @@ -0,0 +1,37 @@ +$NetBSD: patch-ag,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- src/main.c.orig Fri Aug 23 18:41:11 2002 ++++ src/main.c +@@ -8,7 +8,7 @@ + #endif + + #include <signal.h> +-#include <db.h> ++#include <db4/db.h> + #include <errno.h> + #include <sys/stat.h> + #include <sys/types.h> +@@ -329,6 +329,23 @@ main (int argc, char *argv[]) + + dctc_dir=g_string_new(NULL); + g_string_sprintf(dctc_dir,"%s/running",dctc_main_dir->str); ++ if(access(dctc_dir->str,R_OK|W_OK|X_OK)) ++ { ++ if(errno==ENOENT) ++ { ++ if(mkdir(dctc_dir->str,0777)) ++ { ++ perror("mkdir"); ++ fprintf(stderr,"Unable to create %s, abort.\n",dctc_dir->str); ++ exit(1); ++ } ++ } ++ else ++ { ++ fprintf(stderr,"You have no access rights on %s, abort.\n",dctc_dir->str); ++ exit(1); ++ } ++ } + dctc_active_client_file=g_string_new(NULL); + g_string_sprintf(dctc_active_client_file,"%s/gstatus",dctc_main_dir->str); + diff --git a/net/dctc/DESCR b/net/dctc/DESCR new file mode 100644 index 00000000000..073a038ead9 --- /dev/null +++ b/net/dctc/DESCR @@ -0,0 +1,11 @@ +DCTC is a Direct Connect clone, a windows client allowing users to +share their files and talk (like IRC but more software sharing +oriented) using a proprietary protocol. + +DCTC stands for Direct Connect Text Client. + +DCTC is not designed to be used by human. It doesn't contains any +GUI or CLI. The goal of this project is to build a Direct Connect +client which can be used by other programs. So even if you can +enter command using the keyboard, don't say the human interface is +poor. diff --git a/net/dctc/Makefile b/net/dctc/Makefile new file mode 100644 index 00000000000..7e09934f85e --- /dev/null +++ b/net/dctc/Makefile @@ -0,0 +1,28 @@ +# $NetBSD: Makefile,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ +# + +DISTNAME= dctc-0.83.3 +CATEGORIES= net +MASTER_SITES= http://www.ac2i.tzo.com/dctc/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.ac2i.tzo.com/dctc/ +COMMENT= Direct Connect clone (Direct Connect Text Client) + +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +CONFIGURE_ARGS+= --enable-manual-db-detect +REPLACE_PERL= GDLjoiner +USE_PERL5= YES + +post-configure: + @${ECHO} '#ifndef MSG_NOSIGNAL' >> ${WRKSRC}/config.h + @${ECHO} '# define MSG_NOSIGNAL 0' >> ${WRKSRC}/config.h + @${ECHO} '#endif' >> ${WRKSRC}/config.h + @${ECHO} '#ifndef ENODATA' >> ${WRKSRC}/config.h + @${ECHO} '# define ENODATA ENOMSG' >> ${WRKSRC}/config.h + @${ECHO} '#endif' >> ${WRKSRC}/config.h + +.include "../../databases/db4/buildlink2.mk" +.include "../../devel/glib/buildlink2.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/dctc/PLIST b/net/dctc/PLIST new file mode 100644 index 00000000000..89a89d755c6 --- /dev/null +++ b/net/dctc/PLIST @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ +bin/GDLjoiner +bin/dctc +bin/hublist +man/man1/dctc.1 diff --git a/net/dctc/distinfo b/net/dctc/distinfo new file mode 100644 index 00000000000..db68b4aec8d --- /dev/null +++ b/net/dctc/distinfo @@ -0,0 +1,15 @@ +$NetBSD: distinfo,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +SHA1 (dctc-0.83.3.tar.gz) = 908458670d5c47cd3d5a9505abbf95f1eba95c72 +Size (dctc-0.83.3.tar.gz) = 246841 bytes +SHA1 (patch-aa) = 68a3ca5f8b7e28717e1a294456be56c846f3c521 +SHA1 (patch-ab) = 59ae59cdcfb6a279fc241d6d55a78a64aa36ad9f +SHA1 (patch-ac) = e851bca630b1db46a0fce9843f7dc81049aadeec +SHA1 (patch-ad) = b99489b8a14db6781f74dda15d53306a6434c09a +SHA1 (patch-ae) = 40e4f5c3929beb1b118a7a8180cdf93a2083e084 +SHA1 (patch-af) = ab50755aee9900bf23d4888f90b25614c0866f16 +SHA1 (patch-ag) = 61f8cc1cb35312de15dbc43e0ce7d185b7cda88e +SHA1 (patch-ah) = 4d481b1fcb1b32debf44b4506ed39be09d64ae79 +SHA1 (patch-ai) = 787fe1e96b03e2ab4ec5de6ccb765e1a4ae9bb5c +SHA1 (patch-aj) = 695cac1218b4a6c1fe3057bcf3b853343885e1c0 +SHA1 (patch-ak) = 184ca9047b3d3444ef166a321fbd563d9e4bca3a diff --git a/net/dctc/patches/patch-aa b/net/dctc/patches/patch-aa new file mode 100644 index 00000000000..060f1f2deff --- /dev/null +++ b/net/dctc/patches/patch-aa @@ -0,0 +1,10 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- GDLjoiner.orig Thu Aug 22 17:35:13 2002 ++++ GDLjoiner +@@ -1,4 +1,4 @@ +-#! /usr/bin/env perl ++#! /usr/bin/perl + # + # Used to join a directory of dctc created parts of one file + # Copyright Tobias Olsson 2002 diff --git a/net/dctc/patches/patch-ab b/net/dctc/patches/patch-ab new file mode 100644 index 00000000000..f82bad5a933 --- /dev/null +++ b/net/dctc/patches/patch-ab @@ -0,0 +1,32 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- configure.orig Thu Jul 25 14:42:18 2002 ++++ configure +@@ -1860,14 +1860,14 @@ fi + + + if test "x$manu_db" = "xyes"; then +- echo $ac_n "checking for db_env_create in -ldb-4.0""... $ac_c" 1>&6 +-echo "configure:1865: checking for db_env_create in -ldb-4.0" >&5 +-ac_lib_var=`echo db-4.0'_'db_env_create | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for db_env_create in -ldb4""... $ac_c" 1>&6 ++echo "configure:1865: checking for db_env_create in -ldb4" >&5 ++ac_lib_var=`echo db4'_'db_env_create | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-ldb-4.0 $LIBS" ++LIBS="-ldb4 $LIBS" + cat > conftest.$ac_ext <<EOF + #line 1873 "configure" + #include "confdefs.h" +@@ -1902,7 +1902,7 @@ fi + + if test "x$HAVE_DB40" = "xyes"; then + +- berkeleydb_libs="-ldb-4.0" ++ berkeleydb_libs="-ldb4" + else + echo $ac_n "checking for db_env_create in -ldb-3.3""... $ac_c" 1>&6 + echo "configure:1909: checking for db_env_create in -ldb-3.3" >&5 diff --git a/net/dctc/patches/patch-ac b/net/dctc/patches/patch-ac new file mode 100644 index 00000000000..458e6504a70 --- /dev/null +++ b/net/dctc/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/09/11 20:47:15 wiz Exp $ + +--- src/bdb.c.orig Sat May 18 12:09:04 2002 ++++ src/bdb.c +@@ -28,7 +28,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <string.h> +-#include <db.h> ++#include <db4/db.h> + #include <glib.h> + + #include "var.h" diff --git a/net/dctc/patches/patch-ad b/net/dctc/patches/patch-ad new file mode 100644 index 00000000000..5885e7cc5e4 --- /dev/null +++ b/net/dctc/patches/patch-ad @@ -0,0 +1,66 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- src/display.c.orig Mon Jul 15 16:32:39 2002 ++++ src/display.c +@@ -36,7 +36,7 @@ + #include "var.h" + + /* this mutex provides a lock for stdout to avoid display conflict between thread */ +-G_LOCK_DEFINE_STATIC(stdout); ++G_LOCK_DEFINE_STATIC(std_out); + + static FILE *log_fd=NULL; + static FILE *errlog_fd=NULL; +@@ -135,7 +135,7 @@ void disp_msg_full(DISP_MSG_TYPE msg_typ + if((msg_type==DEBUG_MSG)&&(debug_mode==0)) + return; + +- G_LOCK(stdout); ++ G_LOCK(std_out); + o_str=g_string_new(""); + + va_start(ap,fnc_name); +@@ -258,7 +258,7 @@ void disp_msg_full(DISP_MSG_TYPE msg_typ + va_end(ap); + + fflush(stdout); /* flush stdout before unlocking */ +- G_UNLOCK(stdout); ++ G_UNLOCK(std_out); + } + + /***********************************/ +@@ -269,7 +269,7 @@ void disp_msg_full(DISP_MSG_TYPE msg_typ + void change_logfile(char *filename) + { + /* to avoid potential access conflict, we lock the display */ +- G_LOCK(stdout); ++ G_LOCK(std_out); + + /* close the previously existing FILE */ + if(log_fd!=NULL) +@@ -287,7 +287,7 @@ void change_logfile(char *filename) + disp_msg(ERR_MSG,"change_logfile",strerror(errno),NULL); + } + } +- G_UNLOCK(stdout); ++ G_UNLOCK(std_out); + } + + /***************************************/ +@@ -298,7 +298,7 @@ void change_logfile(char *filename) + void change_errlogfile(char *filename) + { + /* to avoid potential access conflict, we lock the display */ +- G_LOCK(stdout); ++ G_LOCK(std_out); + + /* close the previously existing FILE */ + if(errlog_fd!=NULL) +@@ -316,6 +316,6 @@ void change_errlogfile(char *filename) + disp_msg(ERR_MSG,"change_errlogfile",strerror(errno),NULL); + } + } +- G_UNLOCK(stdout); ++ G_UNLOCK(std_out); + } + diff --git a/net/dctc/patches/patch-ae b/net/dctc/patches/patch-ae new file mode 100644 index 00000000000..16530375bcc --- /dev/null +++ b/net/dctc/patches/patch-ae @@ -0,0 +1,20 @@ +$NetBSD: patch-ae,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- src/keyboard.c.orig Mon Jul 15 09:13:14 2002 ++++ src/keyboard.c +@@ -35,7 +35,6 @@ + #include <netdb.h> + #include <glib.h> + +-#if !(defined(BSD) && (BSD >= 199103)) + #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) + /* union semun is defined by including <sys/sem.h> */ + #else +@@ -47,7 +46,6 @@ + struct seminfo *__buf; /* buffer for IPC_INFO */ + }; + #endif +-#endif + + #include "dc_com.h" + #include "display.h" diff --git a/net/dctc/patches/patch-af b/net/dctc/patches/patch-af new file mode 100644 index 00000000000..ff1ab33112f --- /dev/null +++ b/net/dctc/patches/patch-af @@ -0,0 +1,21 @@ +$NetBSD: patch-af,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- src/main.c.orig Mon Jul 15 16:39:50 2002 ++++ src/main.c +@@ -34,11 +34,15 @@ + #include <sys/param.h> + #include <sys/utsname.h> + #include <sys/un.h> ++#ifdef __linux__ + #include <linux/sem.h> /* for the value of SEMVMX */ ++#else ++#include <sys/sem.h> ++#endif + #include <errno.h> + #include <getopt.h> + #include <string.h> +-#include <db.h> ++#include <db4/db.h> + #include <glib.h> + #include <pthread.h> + diff --git a/net/dctc/patches/patch-ag b/net/dctc/patches/patch-ag new file mode 100644 index 00000000000..a9dcf7060cd --- /dev/null +++ b/net/dctc/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- src/mydb.c.orig Sun Apr 14 17:13:47 2002 ++++ src/mydb.c +@@ -1079,7 +1079,7 @@ static void send_a_db_result(int output_ + /* (if dest_nick==NULL, dest_addr is the destination) */ + /* (if dest_addr==NULL, dest_nick is the destination) */ + /*******************************************************************************/ +-void search_in_db(int sck, char *dest_nick, int file_type, SIZE_ATTRIB size_matter, unsigned long size, char *pattern, unsigned char *md5sum, struct sockaddr_in *dest_addr) ++void search_in_db(int sck, char *dest_nick, int file_type, SIZE_ATTRIB size_matter, unsigned long size, char *pattern, unsigned char *md5sum, struct sockaddr *dest_addr) + { + int i; + int nb_result=0; diff --git a/net/dctc/patches/patch-ah b/net/dctc/patches/patch-ah new file mode 100644 index 00000000000..b19b5ca3480 --- /dev/null +++ b/net/dctc/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $ + +--- src/mydb.h.orig Sat Apr 13 11:45:19 2002 ++++ src/mydb.h +@@ -97,7 +97,7 @@ typedef enum + /* (if dest_nick==NULL, dest_addr is the destination) */ + /* (if dest_addr==NULL, dest_nick is the destination) */ + /*******************************************************************************/ +-void search_in_db(int sck, char *dest_nick, int file_type, SIZE_ATTRIB size_matter, unsigned long size, char *pattern, unsigned char *md5sum, struct sockaddr_in *dest_addr); ++void search_in_db(int sck, char *dest_nick, int file_type, SIZE_ATTRIB size_matter, unsigned long size, char *pattern, unsigned char *md5sum, struct sockaddr *dest_addr); + + /*************************************************************/ + /* check if the given filename exists in the shared database */ diff --git a/net/dctc/patches/patch-ai b/net/dctc/patches/patch-ai new file mode 100644 index 00000000000..7e98d1d53e5 --- /dev/null +++ b/net/dctc/patches/patch-ai @@ -0,0 +1,14 @@ +$NetBSD: patch-ai,v 1.1.1.1 2002/09/11 20:47:15 wiz Exp $ + +--- src/network.c.orig Fri May 24 17:13:04 2002 ++++ src/network.c +@@ -353,8 +353,7 @@ GString *get_default_host_ip(void) + /* the following script does this: */ + /* 1) extract the interface used by the default route: netstat -rn | grep ^0.0.0.0 | awk '{print $8;} */ + /* 2) obtain the IP of this interface: netstat xxx | fgrep inet | cut -d : -f 2 | awk '{print $1;}' */ +- const char *cmd= +- "/sbin/ifconfig `netstat -rn | grep ^0.0.0.0 | awk '{print $8;}'` | fgrep inet | cut -d : -f 2 | awk '{print $1;}'"; ++ const char *cmd= "/sbin/route -n get default | awk '/local/{print$NF}'"; + + f=popen(cmd,"r"); + if(f==NULL) diff --git a/net/dctc/patches/patch-aj b/net/dctc/patches/patch-aj new file mode 100644 index 00000000000..e4c63b48532 --- /dev/null +++ b/net/dctc/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1.1.1 2002/09/11 20:47:15 wiz Exp $ + +--- src/uaddr.c.orig Tue May 28 18:23:48 2002 ++++ src/uaddr.c +@@ -17,7 +17,7 @@ + #include <sys/socket.h> + #include <errno.h> + #include <sys/un.h> +-#include <db.h> ++#include <db4/db.h> + #include <glib.h> + + #include "var.h" diff --git a/net/dctc/patches/patch-ak b/net/dctc/patches/patch-ak new file mode 100644 index 00000000000..c31457910e8 --- /dev/null +++ b/net/dctc/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1.1.1 2002/09/11 20:47:15 wiz Exp $ + +--- src/user_manage.c.orig Sun Jul 28 07:18:48 2002 ++++ src/user_manage.c +@@ -5,7 +5,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <db.h> ++#include <db4/db.h> + #include <glib.h> + + #include "user_manage.h" |