Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/net
In directory sc8-pr-cvs1:/tmp/cvs-serv7103

Added Files:
        bitchx.info bitchx.patch irssi.info mutella.info mutt.info 
        mutt.patch ncftp.info ntop.info ntop.patch pine.info 
        pine.patch 
Removed Files:
        irssi-0.8.6-24.info mutella-0.4.3.0-1.info mutt-1.4i-11.info 
        mutt-1.4i-11.patch ncftp-3.1.5-11.info ntop-1.1-11.info 
        ntop-1.1-11.patch pine-4.58-11.info pine-4.58-11.patch 
Log Message:
name changes and fixed deps

--- NEW FILE: bitchx.info ---
Package: bitchx
Version: 1.0c19
Revision: 16
Depends: %N-common, ncurses-shlibs
BuildDepends: ncurses-dev (>= 5.3-20031018-1)
Provides: irc-client
#Source: ftp://ftp.bitchx.org/pub/BitchX/source/ircii-pana-%v.tar.gz
Source: mirror:sourceforge:fink/direct_download/source/ircii-pana-%v.tar.gz
SourceDirectory: BitchX
Source-MD5: 79431ff0880e7317049045981fac8adc
Patch: %n.patch
TarFilesRename: doc/bitchx.xpm:doc/bitchx2.xpm
ConfigureParams: --without-gtk --with-tgetent --with-plugins --without-ssl 
--mandir='${prefix}/share/man' --with-default-server=irc.freenode.net:6667 
SHLIB_SUFFIX=.dylib
SetCFLAGS: -I%p/include -no-cpp-precomp -DBIND_8_COMPAT
InstallScript: <<
 make install prefix=%i
 rm %i/bin/BitchX
 mv %i/bin/scr-bx %i/bin/scr-bx.bitchx
 mkdir -p %i/etc
 mv %i/lib/bitchx/script %i/etc/bitchx
 ln -s %p/etc/bitchx %i/lib/bitchx/script
 mkdir -p %i/share/doc/bitchx
 ln -s %p/lib/bitchx/help %i/share/doc/bitchx/help
 cp doc/* %i/share/doc/bitchx
 rm %i/share/doc/bitchx/*.bat
 rm %i/share/doc/bitchx/Makefile*
 rm %i/share/doc/bitchx/*.in
<<

PostInstScript: <<
 update-alternatives --install %p/bin/BitchX BitchX %p/bin/BitchX-%v 40
 update-alternatives --install %p/bin/scr-bx scr-bx %p/bin/scr-bx.bitchx 40
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
 update-alternatives --remove BitchX %p/bin/BitchX-%v
 update-alternatives --remove scr-bx %p/bin/scr-bx.bitchx
fi
<<
SplitOff: <<
  Package: bitchx-common
  Replaces: bitchx (<< 1.0c19-4), bitchx-ssl (<< 1.0c19-4)
  Conflicts: bitchx (<< 1.0c19-4), bitchx-ssl (<< 1.0c19-4)
  ConfFiles: %p/etc/bitchx/bxglobal
  Description: Common files for BitchX
  InstallScript: <<
    mv %I/etc %I/lib %i
    mkdir -p %I/lib/bitchx
    mv %i/lib/bitchx/wserv %I/lib/bitchx
    mkdir -p %i/share/doc/%n
    mv %I/share/man %i/share
    mv %I/share/doc/bitchx/* %i/share/doc/%n
    cp %i/share/doc/%n/Copyright %I/share/doc/bitchx
    echo "Please see README in %p/share/doc/%n" > %I/share/doc/bitchx/README
    echo "expanding help files..."
    cd %i/lib/bitchx/help && find . -name "*.bz2" | xargs bunzip2
  <<
<<

DocFiles: bitchx-docs/7_Docs/Copyright README
Description: Advanced Internet Relay Chat (IRC) client
DescDetail: <<
This is the bleeding edge of IRC software -- the most common functions normally done 
by scripts are coded into the client itself. It contains dozens of features such as:

    * Built-in ANSI color (this is probably the biggest feature)
    * Ease of use -- dozens of useful command aliases to reduce typing
    * Built-in notify, protection, and bot lists
    * Built-in mass commands and tools
    * Extended set of DCC commands and built-in CDCC offering
    * Extended scripting functionality, including unique functions
    * Code is based on ircII-Plutonium and more recent ircII-EPiC
<<
DescPackaging: <<
* All help & man files are bzip2 compressed. At least for the man page, this has to be 
prevented
* The "%p/bin/BitchX" symlink has to be remade, otherwise it point to %i
* Changed some default options, includeing flood_kick after 10, and 
DISPLAY_PC_CHARACTERS 3, for the terminal in Jaguar
* Disabled the europa plugin, it requires MySQL and has some build issues
<<
DescUsage <<
If versions before 1.019c-4 was used, please make sure %p/etc/bitchx and 
%p/lib/bitchx/script are working correctly. if they are not, please move them out of 
the way and reinstall bitchx.
<<
Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
Homepage: http://www.bitchx.com/
License: BSD

--- NEW FILE: bitchx.patch ---
diff -ruN BitchX/Makefile.in BitchX.new/Makefile.in
--- BitchX/Makefile.in  Mon Mar  5 14:30:04 2001
+++ BitchX.new/Makefile.in      Sun Oct 19 22:41:23 2003
@@ -302,8 +302,6 @@
                        done; \
                fi; \
        )
-       (find $(mandir)/man1/BitchX.1 -type f ! -name '*.bz2' ! -name '*.gz' -name '*' 
| \
-               (xargs bzip2 -9f || xargs gzip -9f) || :) 2>/dev/null
 
 installdirs:
        umask 022; $(top_srcdir)/mkinstalldirs $(bindir) $(IRCLIB) $(mandir)/man1 
$(TRANSLATION_PATH) $(INSTALL_SCRIPT) $(HELPDIR)
diff -ruN BitchX/configure BitchX.new/configure
--- BitchX/configure    Sun Mar 24 04:30:49 2002
+++ BitchX.new/configure        Sun Oct 19 22:41:23 2003
@@ -3071,9 +3071,6 @@
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
 echo "${ECHO_T}$ac_cv_lib_m_pow" >&6
-if test $ac_cv_lib_m_pow = yes; then
-  LIBS="-lm $LIBS"
-fi
 
 
 
@@ -12548,6 +12545,9 @@
       BSD/OS-4*)
         SHLIB_LD="$CC -shared"
         ;;
+      Darwin*)
+        SHLIB_LD="$CC -bundle -undefined error"
+        ;;
       HP-UX-*9* | HP-UX-*10* | HP-UX-*11*)
         SHLIB_CFLAGS="+Z"
         SHLIB_LD="ld"
@@ -13816,6 +13816,9 @@
       BSD/OS-4*)
         SHLIB_LD="$CC -shared"
         ;;
+      Darwin*)
+        SHLIB_LD="$CC -bundle -undefined error"
+        ;;
       HP-UX-*9* | HP-UX-*10* | HP-UX-*11*)
         SHLIB_CFLAGS="+Z"
         SHLIB_LD="ld"
@@ -14756,7 +14759,7 @@
   mandir="\$(IRCLIB)"
 else
   INSTALL_IRC="\${bindir}/\$(_VERSION_)\$(EXEEXT)"
-  IRCLIB="\${libdir}/bx"
+  IRCLIB="\${libdir}/bitchx"
   
IRCPATH="\$(DEFAULT_CTOOLZ_DIR):\$(DEFAULT_CTOOLZ_DIR)/plugins:.:\$(PLUGINDIR):\$(INSTALL_SCRIPT):\$(IRCLIB)"
   TRANSLATION_PATH="\$(IRCLIB)/translation"
   HELPDIR="\$(IRCLIB)/help"
diff -ruN BitchX/configure.in BitchX.new/configure.in
--- BitchX/configure.in Sun Mar 24 04:30:49 2002
+++ BitchX.new/configure.in     Sun Oct 19 22:41:23 2003
@@ -898,7 +898,7 @@
   mandir="\$(IRCLIB)"
 else
   INSTALL_IRC="\${bindir}/\$(_VERSION_)\$(EXEEXT)"
-  IRCLIB="\${libdir}/bx"
+  IRCLIB="\${libdir}/bitchx"
   
IRCPATH="\$(DEFAULT_CTOOLZ_DIR):\$(DEFAULT_CTOOLZ_DIR)/plugins:.:\$(PLUGINDIR):\$(INSTALL_SCRIPT):\$(IRCLIB)"
   TRANSLATION_PATH="\$(IRCLIB)/translation"
   HELPDIR="\$(IRCLIB)/help"
diff -ruN BitchX/dll/Makefile.in BitchX.new/dll/Makefile.in
--- BitchX/dll/Makefile.in      Mon Mar  5 14:36:29 2001
+++ BitchX.new/dll/Makefile.in  Sun Oct 19 22:41:23 2003
@@ -160,9 +160,9 @@
 
 ## Makefile starts here.
 
-ALL_PLUGINS = abot acro aim amp arcfour autocycle blowfish cavlink cdrom encrypt 
europa fserv hint identd nap nicklist pkga possum qbx qmail scan wavplay xmms
+ALL_PLUGINS = abot acro aim amp arcfour autocycle blowfish cavlink cdrom encrypt 
fserv hint identd nap nicklist pkga possum qbx qmail scan wavplay xmms
 
-#PLUGINS = abot acro aim arcfour autocycle blowfish cavlink encrypt europa fserv hint 
identd nap pkga possum qbx qmail scan wavplay
+#PLUGINS = abot acro aim arcfour autocycle blowfish cavlink encrypt fserv hint identd 
nap pkga possum qbx qmail scan wavplay
 PLUGINS = @PLUGINS@
 
 .c.o:
diff -ruN BitchX/dll/aim/toc/Makefile.in BitchX.new/dll/aim/toc/Makefile.in
--- BitchX/dll/aim/toc/Makefile.in      Mon Mar  5 14:36:40 2001
+++ BitchX.new/dll/aim/toc/Makefile.in  Sun Oct 19 22:41:23 2003
@@ -167,6 +167,7 @@
 
 libtoc.a: $(LOBJS)
        ar cru libtoc.a $(LOBJS)
+       ranlib libtoc.a
 
 Makefile: Makefile.in
        cd $(topdir) \
diff -ruN BitchX/dll/nap/napsend.c BitchX.new/dll/nap/napsend.c
--- BitchX/dll/nap/napsend.c    Mon Mar  5 14:37:51 2001
+++ BitchX.new/dll/nap/napsend.c        Sun Oct 19 22:41:23 2003
@@ -1,3 +1,8 @@
+#include <sys/time.h>
+#include <sys/stat.h>
+#if !defined(WINNT) || !defined(__EMX__)
+#include <sys/mman.h>
+#endif
 
 #define IN_MODULE
 #include "irc.h"
@@ -21,12 +26,6 @@
 #include "modval.h"
 #include "napster.h"
 #include "md5.h"
-
-#include <sys/time.h>
-#include <sys/stat.h>
-#if !defined(WINNT) || !defined(__EMX__)
-#include <sys/mman.h>
-#endif
 
 #define DEFAULT_FILEMASK "*.mp3"
 
diff -ruN BitchX/doc/BitchX.1 BitchX.new/doc/BitchX.1
--- BitchX/doc/BitchX.1 Fri Mar 30 17:58:28 2001
+++ BitchX.new/doc/BitchX.1     Sun Oct 19 22:41:23 2003
@@ -167,14 +167,14 @@
 .I ~/.ircservers
 Contains a list of IRC servers to cycle through.
 .TP
-.I /usr/local/lib/bx/
+.I (fink-root)/lib/bitchx/
 System-wide configuration dir.
 .TP
 .I ~/.BitchX/BitchX.sav
 Personal configuration file.
 .TP
 .I ~/.BitchX/BitchX.ircnames
-Default random real name.  NOTE: Must be copied from /usr/local/lib/bx/
+Default random real name.  NOTE: Must be copied from (fink-root)/lib/bitchx/
 .TP
 .I ~/.BitchX/BitchX.formats
 Personal 
@@ -182,12 +182,12 @@
 display formats.
 .TP
 .I ~/.BitchX/BitchX.reasons
-Default random kick messages.  NOTE: Must be copied from /usr/local/lib/bx/
+Default random kick messages.  NOTE: Must be copied from (fink-root)/lib/bitchx/
 .TP
 .I ~/.BitchX/BitchX.quit
-Default random quit messages.  NOTE: Must be copied from /usr/local/lib/bx/
+Default random quit messages.  NOTE: Must be copied from (fink-root)/lib/bitchx/
 .TP
-.I /usr/local/lib/bx/BitchX.help
+.I (fink-root)/lib/bitchx/BitchX.help
 .B BitchX 
 help file.
 .TP
diff -ruN BitchX/include/config.h BitchX.new/include/config.h
--- BitchX/include/config.h     Sun Mar 24 04:31:04 2002
+++ BitchX.new/include/config.h Sun Oct 19 22:45:17 2003
@@ -37,7 +37,27 @@
  *
  * List last updated: 03/24/01.  -dialtone.
  */
-#define DEFAULT_SERVER  "[efnet] "\
+#define DEFAULT_SERVER  "[freenode] "\
+                               "irc.freenode.net "\
+                               "vinge.freenode.net "\
+                               "truong.freenode.net "\
+                               "stephenson.freenode.net "\
+                               "simak.freenode.net "\
+                               "orwell.freenode.net "\
+                               "leguin.freenode.net "\
+                               "kornbluth.freenode.net "\
+                               "jordan.freenode.net "\
+                               "herbert.freenode.net "\
+                               "goethe.freenode.net "\
+                               "gibson.freenode.net "\
+                               "gerrold.freenode.net "\
+                               "carter.freenode.net "\
+                               "carneiro.freenode.net "\
+                               "capek.freenode.net "\
+                               "calkins.freenode.net "\
+                               "brin.freenode.net "\
+                               "adams.freenode.net "\
+                       "[efnet] "\
                                "irc.Prison.NET "\
                                "irc.colorado.edu "\
                                "irc.concentric.net "\
@@ -195,7 +215,7 @@
  * we define the default network type for server groups. Do not just
  * undefine this.
  */
- #define DEFAULT_NETWORK "efnet"
+#define DEFAULT_NETWORK "openprojects"
 
 /*
  * Below are the IRCII variable defaults.  For boolean variables, use 1 for
@@ -342,7 +362,7 @@
  * when you've defined LATIN1. The problem is that ansi graphics will look
  * ugly if you use the scroll up feature (PageUp/PageDown)
  */
-#undef ASCII_LOGO
+#define ASCII_LOGO ON
 
 /* If you define REVERSE_WHITE_BLACK, then the format codes for black and
  * white color are revepsed. (%W, %w is bold black and black, %K, %k is bold
diff -ruN BitchX/include/irc.h BitchX.new/include/irc.h
--- BitchX/include/irc.h        Sun Mar 24 04:31:04 2002
+++ BitchX.new/include/irc.h    Sun Oct 19 22:41:23 2003
@@ -280,7 +280,6 @@
 extern char    wait_nick[];
 extern char    whois_nick[];
 extern char    lame_wait_nick[];
-extern char    **environ;
 extern int     cuprent_numeric;
 extern int     quick_startup;
 extern char    version[];
diff -ruN BitchX/script/bxglobal BitchX.new/script/bxglobal
--- BitchX/script/bxglobal      Mon Mar  5 14:39:25 2001
+++ BitchX.new/script/bxglobal  Sun Oct 19 22:41:23 2003
@@ -1,3 +1,12 @@
+######################
+# load fink defaults #
+######################
+
+^load fink-defaults.bx
+######################
+
+
+
 # global bitchx script
 
 if (gtkbitchx())
@@ -6,5 +15,8 @@
        ^set nicklist on
 }
 
-# We should probably do some other things here like set flood protection to
-# some reasonable defaults so no one will complain.
+##########  End fink defaults  ########
+##########   Put site config   ########
+##########   After this line   ########
+
+
diff -ruN BitchX/script/fink-defaults.bx BitchX.new/script/fink-defaults.bx
--- BitchX/script/fink-defaults.bx      Wed Dec 31 19:00:00 1969
+++ BitchX.new/script/fink-defaults.bx  Sun Oct 19 22:41:23 2003
@@ -0,0 +1,15 @@
+SET DISPLAY_PC_CHARACTERS 3
+SET EIGHT_BIT_CHARACTERS ON
+SET FLOOD_AFTER 10
+SET FLOOD_KICK OFF
+SET FLOOD_PROTECTION OFF
+SET FLOOD_RATE 10
+SET FLOOD_USERS 10
+SET FLOOD_WARNING ON
+SET LOGFILE ~/.BitchX/IrcLog
+SET LOG ON
+
+
+^alias cm {mode $C $*}
+
+^bind ^k ERASE_LINE
diff -ruN BitchX/source/bcompat.c BitchX.new/source/bcompat.c
--- BitchX/source/bcompat.c     Mon May  7 04:44:56 2001
+++ BitchX.new/source/bcompat.c Sun Oct 19 22:41:23 2003
@@ -1011,50 +1011,13 @@
 #include <stddef.h>
 #include <string.h>
 
-int   bsd_setenv(const char *name, const char *value, int rewrite);
-
-/*
- * __findenv --
- *     Returns pointer to value associated with name, if any, else NULL.
- *     Sets offset to be the offset of the name/value combination in the
- *     environmental array, for use by setenv(3) and unsetenv(3).
- *     Explicitly removes '=' in argument name.
- *
- *     This routine *should* be a static; don't use it.
- */
-__inline__ static char *__findenv(const char *name, int *offset)
-{
-       extern char **environ;
-       register int len, i;
-       register const char *np;
-       register char **p, *cp;
-
-       if (name == NULL || environ == NULL)
-               return (NULL);
-       for (np = name; *np && *np != '='; ++np)
-               continue;
-       len = np - name;
-       for (p = environ; (cp = *p) != NULL; ++p) {
-               for (np = name, i = len; i && *cp; i--)
-                       if (*cp++ != *np++)
-                               break;
-               if (i == 0 && *cp++ == '=') {
-                       *offset = p - environ;
-                       return (cp);
-               }
-       }
-       return (NULL);
-}
-
 /*
  * getenv --
  *     Returns ptr to value associated with name, if any, else NULL.
  */
 char *bsd_getenv(const char *name)
 {
-       int offset;
-
-       return (__findenv(name, &offset));
+       return getenv(name);
 }
 
 /*
@@ -1064,67 +1027,12 @@
  */
 int bsd_setenv(const char *name, const char *value, int rewrite)
 {
-       extern char **environ;
-       static int alloced;                     /* if allocated space before */
-       register char *c;
-       int l_value, offset;
-
-       if (*value == '=')                      /* no `=' in value */
-               ++value;
-       l_value = strlen(value);
-       if ((c = __findenv(name, &offset))) {   /* find if already exists */
-               if (!rewrite)
-                       return (0);
-               if (strlen(c) >= l_value) {     /* old larger; copy over */
-                       while ( (*c++ = *value++) );
-                       return (0);
-               }
-       } else {                                        /* create new slot */
-               register int cnt;
-               register char **p;
-
-               for (p = environ, cnt = 0; *p; ++p, ++cnt);
-               if (alloced) {                  /* just increase size */
-                       environ = (char **)realloc((char *)environ,
-                           (size_t)(sizeof(char *) * (cnt + 2)));
-                       if (!environ)
-                               return (-1);
-               }
-               else {                          /* get new space */
-                       alloced = 1;            /* copy old entries into it */
-                       p = malloc((size_t)(sizeof(char *) * (cnt + 2)));
-                       if (!p)
-                               return (-1);
-                       memcpy(p, environ, cnt * sizeof(char *));
-                       environ = p;
-               }
-               environ[cnt + 1] = NULL;
-               offset = cnt;
-       }
-       for (c = (char *)name; *c && *c != '='; ++c);   /* no `=' in name */
-       if (!(environ[offset] =                 /* name + `=' + value */
-           malloc((size_t)((int)(c - name) + l_value + 2))))
-               return (-1);
-       for (c = environ[offset]; (*c = *name++) && *c != '='; ++c);
-       for (*c++ = '='; (*c++ = *value++); );
-       return (0);
+       return setenv(name, value, rewrite);
 }
 
 int bsd_putenv(const char *str)
 {
-       char *p, *equal;
-       int rval;
-
-       if ((p = strdup(str)) == NULL)
-               return (-1);
-       if ((equal = strchr(p, '=')) == NULL) {
-               free(p);
-               return (-1);
-       }
-       *equal = '\0';
-       rval = bsd_setenv(p, equal + 1, 1);
-       free(p);
-       return (rval);
+       return putenv(str);
 }
 
 /*
@@ -1133,14 +1041,7 @@
  */
 void bsd_unsetenv(const char *name)
 {
-       extern char **environ;
-       register char **p;
-       int offset;
-
-       while (__findenv(name, &offset))        /* if set multiple times */
-               for (p = &environ[offset];; ++p)
-                       if (!(*p = *(p + 1)))
-                               break;
+       return unsetenv(name);
 }
 #endif
 /* --- end of env.c --- */
diff -ruN BitchX/source/compat.c BitchX.new/source/compat.c
--- BitchX/source/compat.c      Mon May  7 04:44:56 2001
+++ BitchX.new/source/compat.c  Sun Oct 19 22:41:23 2003
@@ -1011,50 +1011,13 @@
 #include <stddef.h>
 #include <string.h>
 
-int   bsd_setenv(const char *name, const char *value, int rewrite);
-
-/*
- * __findenv --
- *     Returns pointer to value associated with name, if any, else NULL.
- *     Sets offset to be the offset of the name/value combination in the
- *     environmental array, for use by setenv(3) and unsetenv(3).
- *     Explicitly removes '=' in argument name.
- *
- *     This routine *should* be a static; don't use it.
- */
-__inline__ static char *__findenv(const char *name, int *offset)
-{
-       extern char **environ;
-       register int len, i;
-       register const char *np;
-       register char **p, *cp;
-
-       if (name == NULL || environ == NULL)
-               return (NULL);
-       for (np = name; *np && *np != '='; ++np)
-               continue;
-       len = np - name;
-       for (p = environ; (cp = *p) != NULL; ++p) {
-               for (np = name, i = len; i && *cp; i--)
-                       if (*cp++ != *np++)
-                               break;
-               if (i == 0 && *cp++ == '=') {
-                       *offset = p - environ;
-                       return (cp);
-               }
-       }
-       return (NULL);
-}
-
 /*
  * getenv --
  *     Returns ptr to value associated with name, if any, else NULL.
  */
 char *bsd_getenv(const char *name)
 {
-       int offset;
-
-       return (__findenv(name, &offset));
+       return getenv(name);
 }
 
 /*
@@ -1064,67 +1027,12 @@
  */
 int bsd_setenv(const char *name, const char *value, int rewrite)
 {
-       extern char **environ;
-       static int alloced;                     /* if allocated space before */
-       register char *c;
-       int l_value, offset;
-
-       if (*value == '=')                      /* no `=' in value */
-               ++value;
-       l_value = strlen(value);
-       if ((c = __findenv(name, &offset))) {   /* find if already exists */
-               if (!rewrite)
-                       return (0);
-               if (strlen(c) >= l_value) {     /* old larger; copy over */
-                       while ( (*c++ = *value++) );
-                       return (0);
-               }
-       } else {                                        /* create new slot */
-               register int cnt;
-               register char **p;
-
-               for (p = environ, cnt = 0; *p; ++p, ++cnt);
-               if (alloced) {                  /* just increase size */
-                       environ = (char **)realloc((char *)environ,
-                           (size_t)(sizeof(char *) * (cnt + 2)));
-                       if (!environ)
-                               return (-1);
-               }
-               else {                          /* get new space */
-                       alloced = 1;            /* copy old entries into it */
-                       p = malloc((size_t)(sizeof(char *) * (cnt + 2)));
-                       if (!p)
-                               return (-1);
-                       memcpy(p, environ, cnt * sizeof(char *));
-                       environ = p;
-               }
-               environ[cnt + 1] = NULL;
-               offset = cnt;
-       }
-       for (c = (char *)name; *c && *c != '='; ++c);   /* no `=' in name */
-       if (!(environ[offset] =                 /* name + `=' + value */
-           malloc((size_t)((int)(c - name) + l_value + 2))))
-               return (-1);
-       for (c = environ[offset]; (*c = *name++) && *c != '='; ++c);
-       for (*c++ = '='; (*c++ = *value++); );
-       return (0);
+       return setenv(name, value, rewrite);
 }
 
 int bsd_putenv(const char *str)
 {
-       char *p, *equal;
-       int rval;
-
-       if ((p = strdup(str)) == NULL)
-               return (-1);
-       if ((equal = strchr(p, '=')) == NULL) {
-               free(p);
-               return (-1);
-       }
-       *equal = '\0';
-       rval = bsd_setenv(p, equal + 1, 1);
-       free(p);
-       return (rval);
+       return putenv(str);
 }
 
 /*
@@ -1133,14 +1041,7 @@
  */
 void bsd_unsetenv(const char *name)
 {
-       extern char **environ;
-       register char **p;
-       int offset;
-
-       while (__findenv(name, &offset))        /* if set multiple times */
-               for (p = &environ[offset];; ++p)
-                       if (!(*p = *(p + 1)))
-                               break;
+       return unsetenv(name);
 }
 #endif
 /* --- end of env.c --- */
diff -ruN BitchX/source/status.c BitchX.new/source/status.c
--- BitchX/source/status.c      Wed Feb 27 23:22:51 2002
+++ BitchX.new/source/status.c  Sun Oct 19 22:49:15 2003
@@ -1213,7 +1213,7 @@
  * current-type window, although i think they should go to all windows.
  */
 #define STATUS_VAR(x) \
-static char    *status_user ## x ## (Window *window)                   \
+static char    *status_user ## x (Window *window)                      \
 {                                                                      \
        char    *text;                                                  \
                                                                        \
diff -ruN BitchX/source/translat.c BitchX.new/source/translat.c
--- BitchX/source/translat.c    Wed Feb 27 23:22:51 2002
+++ BitchX.new/source/translat.c        Sun Oct 19 22:41:23 2003
@@ -40,7 +40,7 @@
 /* we have this here as a safety feature if for some reason TRANSLATION_PATH
  * is not defined.
  */
-#define TRANSLATION_PATH "/usr/local/lib/bx/translation"
+#define TRANSLATION_PATH "/sw/lib/bitchx/translation"
 #endif
 
 

--- NEW FILE: irssi.info ---
Package: irssi
Version: 0.8.6
Revision: 26
GCC: 3.3
Maintainer: Max Horn <[EMAIL PROTECTED]>
BuildDepends: glib, fink (>= 0.13.0-1), ncurses-dev (>= 5.3-20031018-1)
Depends: glib-shlibs, ncurses, ncurses-shlibs
Conflicts: irssi-ssl
Replaces: irssi-ssl
Source: http://irssi.org/files/irssi-%v.tar.bz2
Source-MD5: 6d66982723e2eb8780ae3b8b3a7ba08d
ConfigureParams: --with-modules --without-socks --with-ncurses --enable-ipv6 
--mandir=%i/share/man --with-perl-lib=%p/lib/perl5/5.8.1/darwin-thread-multi-2level 
--disable-ssl
SetCPPFLAGS: -no-cpp-precomp
#Type: perl 5.8.1
#UpdatePOD: true
CompileScript: <<
 ./configure %c
 make perlpath=perl5.8.1
<<
InstallScript: <<
  make install prefix=%i PREFIX=%i INSTALLPRIVLIB=%i/lib/perl5/5.8.1 
INSTALLARCHLIB=%i/lib/perl5/5.8.1/darwin-thread-multi-2level 
INSTALLSITELIB=%i/lib/perl5/5.8.1 
INSTALLSITEARCH=%i/lib/perl5/5.8.1/darwin-thread-multi-2level
 mkdir -p %i/share/podfiles/5.8.1
 cat %i/lib/perl5/5.8.1/darwin-thread-multi-2level/perllocal.pod | sed -e  
s,%i/lib/perl5,%p/lib/perl5, > %i/share/podfiles/5.8.1/perllocal.%n.pod
 rm -rf %i/lib/perl5/5.8.1/darwin-thread-multi-2level/perllocal.pod
<<
PostInstScript: <<
# Updating %p/lib/perl5/darwin-thread-multi-2level/5.8.1/perllocal.pod
mkdir -p %p/lib/perl5/5.8.1/darwin-thread-multi-2level
cat %p/share/podfiles/5.8.1/*.pod > 
%p/lib/perl5/5.8.1/darwin-thread-multi-2level/perllocal.pod
<<
PostRmScript: <<
# Updating %p/lib/perl5/5.8.1/darwin-thread-multi-2level/perllocal.pod
###
### check to see if any .pod files exist in %p/share/podfiles.
###
perl <<'END_PERL'
   if (-e "%p/share/podfiles/5.8.1") {
   @files = <%p/share/podfiles/5.8.1/*.pod>;
        if ($#files >= 0) {
        exec "cat %p/share/podfiles/5.8.1/*.pod > 
%p/lib/perl5/5.8.1/darwin-thread-multi-2level/perllocal.pod";
        }
   }
END_PERL
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
Description: Modular IRC client
DescPackaging: Update the podfiles manually, due to fink changes for Type: perl
Homepage: http://real.irssi.org/
License: GPL

--- NEW FILE: mutella.info ---
Package: mutella
Version: 0.4.3.0
Revision: 10
Maintainer: Matt Stephenson <[EMAIL PROTECTED]>
Source: mirror:sourceforge:%n/%n-0.4.3.tar.gz
Source-MD5: 3fc7b649967dc722cd93532c2d043db1
Depends: readline-shlibs (>= 4.3-5)
BuildDepends: readline (>= 4.3-5), ncurses-dev (>= 5.3-20031018-1)
SetCC: gcc3
SetCXX: g++3
ConfigureParams: --mandir=%i/share/man
DocFiles: AUTHORS ChangeLog CHANGES KNOWN-BUGS LICENSE README TODO
Description: Command-line gnutella client
DescDetail: <<
 Mutella is a command-line gnutella client that supports such things as
version 0.4 and 0.6 protocols, real multiple search support (~100 searches
work fine), passive search (all query-reply packets are checked against
local search list), automatic re-submission of the queries, automatic
search for alternative locations when download fails to start immediately
and auto-get function for broken downloads.
<<
DescUsage: <<
 Type 'mutella' at the command prompt to start the client. For a list of
commands just type 'help'. Type 'help <command>' for more specific info on
a particular command.
<<
License: GPL
Homepage: http://mutella.sourceforge.net

--- NEW FILE: mutt.info ---
Package: mutt
Version: 1.4i
Revision: 21
Description: Sophisticated text-based mail user agent
License: GPL
Maintainer: Christian Swinehart <[EMAIL PROTECTED]>
Conflicts: mutt-ssl
Replaces: mutt-ssl
BuildDepends: gettext-dev, gettext-bin, libiconv-dev, ncurses-dev (>= 5.3-20031018-1)
Depends: ncurses, ncurses-shlibs
GCC: 3.3
Source: ftp://ftp.mutt.org/mutt/%n-%v.tar.gz
Source-MD5: a67bcdf1a1cd53d61ccd3ebf3993ba59
SourceDirectory: mutt-1.4
UpdateConfigGuess: yes
ConfFiles: %p/etc/Muttrc
SetCPPFLAGS: -no-cpp-precomp
Patch: %n.patch
DocFiles: GPL NEWS README README.SSL README.SECURITY TODO
ConfigureParams: --with-curses --with-regex --without-wc-funcs --enable-locales-fix 
--with-mailpath=/var/mail --enable-pop --enable-imap --with-docdir=%p/share/doc/%n 
--mandir=%p/share/man
CompileScript: <<
 ./configure %c
 make mutt_LDFLAGS=-lncurses
<<
InstallScript: make install DESTDIR=%d
 mv %i/etc/mime.types %i/etc/mime.types.mutt
PostInstScript: <<
update-alternatives --install %p/etc/mime.types mime.types %p/etc/mime.types.mutt 40
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
  update-alternatives --remove mime.types %p/etc/mime.types.mutt
fi
<<
DescDetail: <<
Mutt is a sophisticated text-based Mail User Agent. Some highlights:

 o MIME support (including RFC1522 encoding/decoding of 8-bit message
   headers).
 o PGP/MIME support (RFC 2015).
 o POP3 support.
 o Mailbox threading (both strict and non-strict).
 o Default keybindings are much like ELM.
 o Keybindings are configurable; Mush and PINE-like ones are provided as
   examples.
 o Handles MMDF, MH and Maildir in addition to regular mbox format.
 o Messages may be (indefinitely) postponed.
 o Colour support.
 o Highly configurable through easy but powerful rc file.
<<
DescPort: By default, mutt searches for a user's mbox file in /var/mail.
DescUsage: You need to create a .muttrc before Mutt will do anything useful for you.
 See /sw/share/doc/mutt/samples/ for example configs, and consult the muttrc(5) man
 page for reference.
Homepage: http://www.mutt.org

--- NEW FILE: mutt.patch ---
diff -u -aur mutt-1.4.orig/configure mutt-1.4/configure
--- mutt-1.4.orig/configure     Wed May 29 05:31:03 2002
+++ mutt-1.4/configure  Mon Jul  8 11:06:17 2002
@@ -562,7 +562,7 @@
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_compile='${CC-cc} -c -no-cpp-precomp $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext 
$LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
@@ -5696,7 +5696,7 @@
 
 
 if test x$GCC = xyes -a $mutt_cv_warnings = yes; then
-        CFLAGS="-Wall -pedantic $CFLAGS"
+        CFLAGS="-Wall $CFLAGS"
 fi
 
 # Check whether --enable-nfs-fix or --disable-nfs-fix was given.
Only in mutt-1.4: configure~

--- NEW FILE: ncftp.info ---
Package: ncftp
Version: 3.1.5
Revision: 11
Source: mirror:custom:%n-%v-src.tar.gz
Source-MD5: 8e9e3844b27f9322c055b00ced89e257
SourceDirectory: %n-%v
CustomMirror: <<
 Primary: ftp://ftp.ncftp.com/ncftp
 Secondary: 
ftp://ftp.leo.org/pub/comp/os/unix/networking/file-transfer/ftp/clients/ncftp/
<<
BuildDepends: ncurses-dev (>= 5.3-20031018-1)
Depends: ncurses, ncurses-shlibs
GCC: 3.3
SetCPPFLAGS: -no-cpp-precomp
InstallScript: mkdir -p %i/share
 make install prefix=%i mandir=%i/share/man
DocFiles: README.txt doc/[A-Z]* doc/mani* doc/read* doc/what* doc/html/*
Description: Browser program using ftp protocol
DescDetail: The purpose of ncftp is to provide a powerful and flexible
 interface to the Internet standard File Transfer Protocol.
 It is intended to replace the stock ftp program that comes
 with the system.
 Some of the cooler features include progress meters, file-
 name completion, command-line editing, background process-
 ing, auto-resume downloads, bookmarking, cached  directory
 listings, host redialing, working with firewalls and prox-
 ies, downloading entire directory trees, etc., etc.
License: Artistic
Maintainer: Andrew Rohl <[EMAIL PROTECTED]>
Homepage: http://www.ncftp.com

--- NEW FILE: ntop.info ---
Package: ntop
Version: 1.1
Revision: 21
Maintainer: Max Horn <[EMAIL PROTECTED]>
Depends: libpcap, ncurses, ncurses-shlibs
BuildDepends: ncurses-dev (>= 5.3-20031018-1)
GCC: 3.3
Source: mirror:custom:%n-%v-src.tar.gz
Source-MD5: 4630ed141d9d5f16f929a9b64b70a45c
CustomMirror: <<
  nam-US: 
http://www.alltheweb.com/go/1/H/ftp/ftp/ftp.cs.rpi.edu/.2/FreeBSD/ports/distfiles/
  nam-US: http://www.alltheweb.com/go/3/H/ftp/ftp/ftp.isc.org/FreeBSD/ports/distfiles/
<<
#Source: ftp://ftp.de.ntop.org/pub/ntop/source/ntop-%v-src.tar.gz
SourceDirectory: ntop-%v
Patch: %n.patch
UpdateConfigGuess: true
ConfigureParams: --mandir=%p/share/man
InstallScript: <<
 mkdir -p %i/sbin
 mkdir -p %i/share/man/man8
 make install DESTDIR=%d
 make install-man DESTDIR=%d
<<
SetCFLAGS: -I%p/include
DocFiles: CHANGES COPYING FAQ KNOWN_BUGS README THREADS-FAQ TO_DO VERSION
Description: Tool that shows network usage, similar to top
License: GPL
Homepage: http://www.ntop.org/

--- NEW FILE: ntop.patch ---
diff -ru -x *~ ntop-1.1/Makefile.in ntop-1.1-patched/Makefile.in
--- ntop-1.1/Makefile.in        Mon May  3 10:03:10 1999
+++ ntop-1.1-patched/Makefile.in        Tue Nov  6 22:56:58 2001
@@ -104,10 +104,10 @@
 http.c: ntop.h
 report.c: ntop.h
 
-install:
+install: $(PROG)
        $(INSTALL) -m 6550 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
 
-install-man:
+install-man: $(PROG).8
        $(INSTALL) -m 444 $(PROG).8 $(DESTDIR)$(MANDEST)/man8/$(PROG).8
 
 clean:

--- NEW FILE: pine.info ---
Package: pine
Version: 4.58
Revision: 21
Source: mirror:custom:pine%v.tar.Z
Source-MD5: ae06c30bb8b7e87b7a7bfc6fd3a07dbf
CustomMirror: <<
 Primary: ftp://ftp.cac.washington.edu/pine/old/
 Secondary: ftp://ftp.cac.washington.edu/pine/
<<
BuildDepends: ncurses-dev (>= 5.3-20031018-1)
Depends: ncurses, ncurses-shlibs
GCC: 3.3
Conflicts: pine-ssl
Replaces: pine-ssl
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
CompileScript: ./build NOSSL EXTRACFLAGS=-I%p/include EXTRALDFLAGS=-L%p/lib  DEBUG="-g 
-O2 -DDEBUG" osx 
InstallScript: mkdir -p %i/bin
 cp bin/pine %i/bin
 cp bin/pico %i/bin
 cp bin/pilot %i/bin
 cp bin/mtest %i/bin
 mkdir -p %i/sbin
 cp bin/imapd %i/sbin
 cp imap/ipopd/ipop2d %i/sbin
 cp imap/ipopd/ipop3d %i/sbin
 mkdir -p %i/share/man/man1
 cp doc/pine.1 %i/share/man/man1
 cp doc/pico.1 %i/share/man/man1
 cp doc/pilot.1 %i/share/man/man1
 mkdir -p %i/share/doc/%n/html
 cp -f doc/tech-notes/*.html %i/share/doc/%n/html
 mkdir -p %i/etc
 %i/bin/pine -conf > %i/etc/pine.conf
DocFiles: README CPYRIGHT
License: Restrictive/Distributable
Description: Text based tool for managing emails
DescDetail: Does not include SSL, LDAP or Kerberos functionality
 (use pine-ssl for that).
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>

--- NEW FILE: pine.patch ---
--- pine4.53/pine/osdep/os-osx.h.orig   Wed Nov 21 13:28:51 2001
+++ pine4.53/pine/osdep/os-osx.h        Wed Nov 21 13:30:51 2001
@@ -178,10 +178,10 @@
 
 /*----- System-wide config file ----------------------------------------*/
 #ifndef SYSTEM_PINERC
-#define SYSTEM_PINERC             "/usr/local/lib/pine.conf"
+#define SYSTEM_PINERC             "@PREFIX@/lib/pine.conf"
 #endif
 #ifndef SYSTEM_PINERC_FIXED
-#define SYSTEM_PINERC_FIXED       "/usr/local/lib/pine.conf.fixed"
+#define SYSTEM_PINERC_FIXED       "@PREFIX@/lib/pine.conf.fixed"
 #endif
 
 
--- pine4.53/pine/pine.hlp.orig Fri Nov 30 09:56:26 2001
+++ pine4.53/pine/pine.hlp      Fri Nov 30 09:56:47 2001
@@ -596,8 +596,8 @@
  executable     &lt;Unix search path&gt;/pine
  persnl cfg     ~/.pinerc
  except cfg     ~/.pinercex
- global cfg     /usr/local/lib/pine.conf
- fixed cfg      /usr/local/lib/pine.conf.fixed
+ global cfg     @PREFIX@/etc/pine.conf
+ fixed cfg      @PREFIX@/etc/pine.conf.fixed
  local help     /usr/local/lib/pine.info
 
  interrupted    ~/.pine-interrupted-mail
@@ -1952,7 +1952,7 @@
 file, execute
 
 <PRE><CODE>
-               pine -conf > /usr/local/lib/pine.conf
+               pine -conf > @PREFIX@/etc/pine.conf
 </CODE></PRE>
 <P>
 
@@ -1960,7 +1960,7 @@
 system configuration file, execute
 
 <PRE><CODE>
-               pine -P old-pine.conf -conf > /usr/local/lib/pine.conf
+               pine -P old-pine.conf -conf > @PREFIX@/etc/pine.conf
 </CODE></PRE>
 <P>
 A system configuration file is not required.
@@ -2112,7 +2112,7 @@
 <DT> -P <EM>pinerc</EM>
 
 <DD> Uses the named file as the system wide configuration file instead of
-<EM>/usr/local/lib/pine.conf</EM> on UNIX, or nothing on <EM>PC-Pine</EM>.
+<EM>@PREFIX@/etc/pine.conf</EM> on UNIX, or nothing on <EM>PC-Pine</EM>.
 Pinerc may be either a local file or a remote configuration folder.
 <P>
 
@@ -2820,10 +2820,10 @@
 </OL>
 <P>
 The fixed configuration file is normally
-<CODE>/usr/local/lib/pine.conf.fixed</CODE>.
+<CODE>@PREFIX@/etc/pine.conf.fixed</CODE>.
 <P>
 The system-wide configuration file is normally
-<CODE>/usr/local/lib/pine.conf</CODE> for Unix Pine and is normally not
+<CODE>@PREFIX@/etc/pine.conf</CODE> for Unix Pine and is normally not
 set for PC-Pine.
 For PC-Pine, if the environment variable <EM>$PINECONF</EM> is set, that
 is used for the system-wide configuration.
diff -Naur pine4.53-orig/contrib/krb5-setup pine4.53/contrib/krb5-setup
diff -rc pine4.53/pine/filter.c pine4.53.qpfilter/pine/filter.c
*** pine4.53/pine/filter.c      Wed Jan  8 12:13:50 2003
--- pine4.53.qpfilter/pine/filter.c     Thu Jan 16 09:50:00 2003
***************
*** 1693,1698 ****
--- 1693,1699 ----
      GF_INIT(f, f->next);
  
      if(flg == GF_DATA){
+       register unsigned char e;
        register unsigned char c;
        register int state = f->f1;
  
***************
*** 1713,1718 ****
--- 1714,1720 ----
                break;
  
              case EQUAL  :
+               e = c;
                if(c == '\015'){        /* "=\015" is a soft EOL */
                    state = CCR;
                    break;
***************
*** 1725,1733 ****
                }
  
                if(!isxdigit((unsigned char)c)){        /* must be hex! */
!                   fs_give((void **)&(f->line));
!                   gf_error("Non-hexadecimal character in QP encoding");
!                   /* NO RETURN */
                }
  
                if (isdigit ((unsigned char)c))
--- 1727,1738 ----
                }
  
                if(!isxdigit((unsigned char)c)){        /* must be hex! */
!                     GF_PUTC(f->next,c); /* be tolerant to sender errors */
!                   e = '\0';
!                     state = DFL;  
!                   q_status_message(SM_ORDER, 3, 4,
!                       "Non-hexadecimal character in QP encoding");
!                     break;
                }
  
                if (isdigit ((unsigned char)c))
***************
*** 1741,1749 ****
              case HEX :
                state = DFL;
                if(!isxdigit((unsigned char)c)){        /* must be hex! */
!                   fs_give((void **)&(f->line));
!                   gf_error("Non-hexadecimal character in QP encoding");
!                   /* NO RETURN */
                }
  
                if (isdigit((unsigned char)c))
--- 1746,1760 ----
              case HEX :
                state = DFL;
                if(!isxdigit((unsigned char)c)){        /* must be hex! */
!                     GF_PUTC(f->next,'='); /* be tolerant to sender errors */
!                   if (e)
!                     GF_PUTC(f->next,e);
!                   e = '\0'; 
!                     GF_PUTC(f->next,c); 
!                     state = DFL;  
!                   q_status_message(SM_ORDER, 3, 4,
!                       "Non-hexadecimal character in QP encoding");
!                     break;
                }
  
                if (isdigit((unsigned char)c))

--- irssi-0.8.6-24.info DELETED ---

--- mutella-0.4.3.0-1.info DELETED ---

--- mutt-1.4i-11.info DELETED ---

--- mutt-1.4i-11.patch DELETED ---

--- ncftp-3.1.5-11.info DELETED ---

--- ntop-1.1-11.info DELETED ---

--- ntop-1.1-11.patch DELETED ---

--- pine-4.58-11.info DELETED ---

--- pine-4.58-11.patch DELETED ---




-------------------------------------------------------
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to