--- /dev/null
+diff -urN rzip-2.0/Makefile.in rzip-2.0-darwin/Makefile.in
+--- rzip-2.0/Makefile.in 2003-10-06 06:53:00.000000000 -0500
++++ rzip-2.0-darwin/Makefile.in 2005-09-21 22:48:29.000000000 -0500
+@@ -3,8 +3,8 @@
+
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-INSTALL_BIN=$(exec_prefix)/bin
+-INSTALL_MAN=$(prefix)/man
++INSTALL_BIN=$(DESTDIR)/$(exec_prefix)/bin
++INSTALL_MAN=$(DESTDIR)/$(prefix)/man
+
+ LIBS=@LIBS@
+ CC=@CC@
+@@ -20,7 +20,7 @@
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+
+-OBJS= rzip.o runzip.o main.o stream.o util.o crc32.o
++OBJS= rzip.o runzip.o strutils.o main.o stream.o util.o crc32.o
+
+ # note that the -I. is needed to handle config.h when using VPATH
+ .c.o:
+@@ -35,6 +35,7 @@
+ ${INSTALLCMD} -m 755 rzip ${INSTALL_BIN}
+ -mkdir -p ${INSTALL_MAN}/man1
+ ${INSTALLCMD} -m 644 $(srcdir)/rzip.1 ${INSTALL_MAN}/man1/
++ -ln -s ${INSTALL_BIN}/rzip runzip
+
+ rzip: $(OBJS)
+ $(CC) $(CFLAGS) -o rzip $(OBJS) $(LIBS)
+diff -urN rzip-2.0/configure.in rzip-2.0-darwin/configure.in
+--- rzip-2.0/configure.in 2003-11-03 02:19:11.000000000 -0600
++++ rzip-2.0-darwin/configure.in 2005-09-21 22:51:47.000000000 -0500
+@@ -2,6 +2,12 @@
+ AC_INIT(main.c)
+ AC_CONFIG_HEADER(config.h)
+
++# test prior to AC_PROG_CC, since it sets cflags on it's own.
++if test x"CFLAGS" = x
++then
++ DEFAULT_CFLAGS="-g -Wall -O3"
++fi
++
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -9,10 +15,10 @@
+ AC_SYS_LARGEFILE
+
+ # Thanks to Martin Pool
+-if test x"$GCC" = xyes
++if test x"$GCC" = xyes && test x"$DEFAULT_CFLAGS" != x
+ then
+ CFLAGS="-g -Wall -O3"
+- AC_MSG_NOTICE([Setting gcc options: $CFLAGS])
++ AC_MSG_RESULT([Setting default cflags: $CFLAGS])
+ fi
+
+ AC_CHECK_HEADERS(fcntl.h sys/time.h sys/unistd.h unistd.h)
+@@ -26,31 +32,15 @@
+ AC_CHECK_SIZEOF(long)
+ AC_CHECK_SIZEOF(short)
+
+-AC_CACHE_CHECK([for large file support],rzip_cv_HAVE_LARGE_FILES,[
+-AC_TRY_RUN([
+-#include <stdio.h>
+-#include <sys/types.h>
+-main() { return (sizeof(off_t) == 4); }],
+-rzip_cv_HAVE_LARGE_FILES=yes,
+-rzip_cv_HAVE_LARGE_FILES=no,
+-rzip_cv_HAVE_LARGE_FILES=cross)])
+-if test x"$rzip_cv_HAVE_LARGE_FILES" = x"yes"; then
+- AC_DEFINE(HAVE_LARGE_FILES, 1, [ ])
+-fi
+-
+-
++AC_SYS_LARGEFILE
+ AC_C_INLINE
+
+
+ AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, ,
+ AC_MSG_ERROR([Could not find bz2 library - please install libbz2-devel]))
+
+-echo $ac_n "checking for errno in errno.h... $ac_c"
+-AC_TRY_COMPILE([#include <errno.h>],[int i = errno],
+-echo yes; AC_DEFINE(HAVE_ERRNO_DECL),
+-echo no)
+-
+ AC_CHECK_FUNCS(mmap strerror)
+ AC_CHECK_FUNCS(getopt_long)
++AC_CHECK_FUNCS(strndup)
+
+ AC_OUTPUT(Makefile)
+diff -urN rzip-2.0/main.c rzip-2.0-darwin/main.c
+--- rzip-2.0/main.c 2004-02-11 18:01:08.000000000 -0600
++++ rzip-2.0-darwin/main.c 2005-09-21 22:37:50.000000000 -0500
+@@ -18,6 +18,7 @@
+ /* rzip compression - main program */
+
+ #include "rzip.h"
++#include "strutils.h"
+
+ static void usage(void)
+ {
+@@ -58,7 +59,7 @@
+ fatal("bad magic file descriptor!?\n");
+ }
+
+-#if HAVE_LARGE_FILES
++#if _LARGE_FILES
+ v = htonl(st.st_size & 0xFFFFFFFF);
+ memcpy(&magic[6], &v, 4);
+ v = htonl(st.st_size >> 32);
+diff -urN rzip-2.0/rzip.h rzip-2.0-darwin/rzip.h
+--- rzip-2.0/rzip.h 2003-10-07 17:08:28.000000000 -0500
++++ rzip-2.0-darwin/rzip.h 2005-09-21 22:37:50.000000000 -0500
+@@ -94,7 +94,7 @@
+ #define strerror(i) sys_errlist[i]
+ #endif
+
+-#ifndef HAVE_ERRNO_DECL
++#if !defined(errno)
+ extern int errno;
+ #endif
+
+diff -urN rzip-2.0/strutils.c rzip-2.0-darwin/strutils.c
+--- rzip-2.0/strutils.c 1969-12-31 18:00:00.000000000 -0600
++++ rzip-2.0-darwin/strutils.c 2005-09-21 22:37:50.000000000 -0500
+@@ -0,0 +1,29 @@
++/*
++ Copyright (C) 2005 Gentoo Foundation
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++/* string utilities that may be missing on various platforms */
++
++#include "strutils.h"
++
++#ifndef HAVE_STRNDUP
++char* strndup(const char* s, size_t n) {
++ char* ret = malloc(n + 1);
++ if (ret == NULL) return(ret);
++ ret[n] = '\0';
++ return(memcpy(ret, s, n));
++}
++#endif
+diff -urN rzip-2.0/strutils.h rzip-2.0-darwin/strutils.h
+--- rzip-2.0/strutils.h 1969-12-31 18:00:00.000000000 -0600
++++ rzip-2.0-darwin/strutils.h 2005-09-21 22:37:50.000000000 -0500
+@@ -0,0 +1,31 @@
++/*
++ Copyright (C) 2005 Gentoo Foundation
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++/* string utilities that may be missing on various platforms */
++
++#ifndef _HEADER_STRUTIL
++#define _HEADER_STRUTIL 1
++
++#include <stdlib.h>
++#include <string.h>
++#include "config.h"
++
++# ifndef HAVE_STRNDUP
++char* strndup(const char* s, size_t n);
++# endif
++
++#endif
projects / gentoo.git / commitdiff