Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/net
In directory sc8-pr-cvs1:/tmp/cvs-serv30919
Added Files:
bitchx-gtk.info bitchx.info bitchx.patch
Removed Files:
bitchx-1.0c19-5.info bitchx-1.0c19-5.patch
bitchx-gtk-1.0c19-5.info
Log Message:
new name scheme
--- NEW FILE: bitchx-gtk.info ---
Package: bitchx-gtk
Version: 1.0c19
Revision: 5
BuildDepends: gtk+, gnome-libs-dev, dlcompat-dev, orbit-dev, imlib, esound,
gettext-dev, gettext-bin, ncurses-dev
Depends: dlcompat, gtk+-shlibs, gnome-libs-shlibs, bitchx-common, ncurses
Provides: bitchx, 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: bitchx.patch
TarFilesRename: doc/bitchx.xpm:doc/bitchx2.xpm
SetCFLAGS: -I%p/include/gnome-1.0 -no-cpp-precomp
ConfigureParams: --with-gtk --with-tgetent --with-plugins --without-ssl
--mandir='${prefix}/share/man' --with-default-server=irc.openprojects.net:6667
InstallScript: <<
make install prefix=%i
rm %i/bin/gtkBitchX
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
rm -rf %i/etc %i/lib %i/share/man %i/share/doc/bitchx
<<
PostInstScript: <<
update-alternatives --install %p/bin/gtkBitchX gtkBitchX %p/bin/gtkBitchX-%v 40
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
update-alternatives --remove gtkBitchX %p/bin/gtkBitchX-%v
fi
<<
DocFiles: README bitchx-docs/7_Docs/Copyright
Description: Advanced Internet Relay Chat (IRC) client, gtk version
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. So we uncompress them
* 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
* Repacked because there was BitchX.xpm and bitchx.xpm in the same directory
<<
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.
<<
License: BSD
Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
Homepage: http://www.bitchx.com/
--- NEW FILE: bitchx.info ---
Package: bitchx
Version: 1.0c19
Revision: 5
BuildDepends: dlcompat-dev, ncurses-dev
Depends: dlcompat, %N-common, ncurses
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
SetCFLAGS: -I%p/include -no-cpp-precomp
ConfigureParams: --without-gtk --with-tgetent --with-plugins --without-ssl
--mandir='${prefix}/share/man' --with-default-server=irc.freenode.net:6667
SHLIB_SUFFIX=.dylib
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.
<<
License: BSD
Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
Homepage: http://www.bitchx.com/
--- NEW FILE: bitchx.patch ---
diff -ruN BitchX.orig/Makefile.in BitchX/Makefile.in
--- BitchX.orig/Makefile.in Mon Mar 5 14:30:04 2001
+++ BitchX/Makefile.in Mon Aug 5 00:06:00 2002
@@ -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.orig/configure BitchX/configure
--- BitchX.orig/configure Sun Mar 24 04:30:49 2002
+++ BitchX/configure Mon Aug 5 00:06:00 2002
@@ -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.orig/configure.in BitchX/configure.in
--- BitchX.orig/configure.in Sun Mar 24 04:30:49 2002
+++ BitchX/configure.in Mon Aug 5 00:06:00 2002
@@ -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.orig/dll/Makefile.in BitchX/dll/Makefile.in
--- BitchX.orig/dll/Makefile.in Mon Mar 5 14:36:29 2001
+++ BitchX/dll/Makefile.in Mon Aug 5 00:06:00 2002
@@ -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.orig/dll/aim/toc/Makefile.in BitchX/dll/aim/toc/Makefile.in
--- BitchX.orig/dll/aim/toc/Makefile.in Mon Mar 5 14:36:40 2001
+++ BitchX/dll/aim/toc/Makefile.in Mon Aug 5 00:06:00 2002
@@ -167,6 +167,7 @@
libtoc.a: $(LOBJS)
ar cru libtoc.a $(LOBJS)
+ ranlib libtoc.a
Makefile: Makefile.in
cd $(topdir) \
diff -ruN BitchX.orig/dll/nap/napsend.c BitchX/dll/nap/napsend.c
--- BitchX.orig/dll/nap/napsend.c Mon Mar 5 14:37:51 2001
+++ BitchX/dll/nap/napsend.c Mon Aug 5 00:06:00 2002
@@ -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.orig/doc/BitchX.1 BitchX/doc/BitchX.1
--- BitchX.orig/doc/BitchX.1 Fri Mar 30 17:58:28 2001
+++ BitchX/doc/BitchX.1 Mon Aug 5 00:06:00 2002
@@ -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.orig/include/config.h BitchX/include/config.h
--- BitchX.orig/include/config.h Sun Mar 24 04:31:04 2002
+++ BitchX/include/config.h Mon Aug 5 01:59:05 2002
@@ -195,7 +195,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 +342,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.orig/include/irc.h BitchX/include/irc.h
--- BitchX.orig/include/irc.h Sun Mar 24 04:31:04 2002
+++ BitchX/include/irc.h Mon Aug 5 00:06:00 2002
@@ -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.orig/script/bxglobal BitchX/script/bxglobal
--- BitchX.orig/script/bxglobal Mon Mar 5 14:39:25 2001
+++ BitchX/script/bxglobal Mon Aug 5 00:58:21 2002
@@ -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.orig/script/fink-defaults.bx BitchX/script/fink-defaults.bx
--- BitchX.orig/script/fink-defaults.bx Wed Dec 31 19:00:00 1969
+++ BitchX/script/fink-defaults.bx Mon Aug 5 00:04:34 2002
@@ -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.orig/source/bcompat.c BitchX/source/bcompat.c
--- BitchX.orig/source/bcompat.c Mon May 7 04:44:56 2001
+++ BitchX/source/bcompat.c Mon Aug 5 00:06:00 2002
@@ -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.orig/source/compat.c BitchX/source/compat.c
--- BitchX.orig/source/compat.c Mon May 7 04:44:56 2001
+++ BitchX/source/compat.c Mon Aug 5 00:06:00 2002
@@ -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.orig/source/translat.c BitchX/source/translat.c
--- BitchX.orig/source/translat.c Wed Feb 27 23:22:51 2002
+++ BitchX/source/translat.c Mon Aug 5 00:06:00 2002
@@ -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
--- bitchx-1.0c19-5.info DELETED ---
--- bitchx-1.0c19-5.patch DELETED ---
--- bitchx-gtk-1.0c19-5.info DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
