head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.90 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.88 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.86 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.84 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.82 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.80 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.8.0.78 pkgsrc-2024Q3-base:1.8 pkgsrc-2024Q2:1.8.0.76 pkgsrc-2024Q2-base:1.8 pkgsrc-2024Q1:1.8.0.74 pkgsrc-2024Q1-base:1.8 pkgsrc-2023Q4:1.8.0.72 pkgsrc-2023Q4-base:1.8 pkgsrc-2023Q3:1.8.0.70 pkgsrc-2023Q3-base:1.8 pkgsrc-2023Q2:1.8.0.68 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.8.0.66 pkgsrc-2023Q1-base:1.8 pkgsrc-2022Q4:1.8.0.64 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.8.0.62 pkgsrc-2022Q3-base:1.8 pkgsrc-2022Q2:1.8.0.60 pkgsrc-2022Q2-base:1.8 pkgsrc-2022Q1:1.8.0.58 pkgsrc-2022Q1-base:1.8 pkgsrc-2021Q4:1.8.0.56 pkgsrc-2021Q4-base:1.8 pkgsrc-2021Q3:1.8.0.54 pkgsrc-2021Q3-base:1.8 pkgsrc-2021Q2:1.8.0.52 pkgsrc-2021Q2-base:1.8 pkgsrc-2021Q1:1.8.0.50 pkgsrc-2021Q1-base:1.8 pkgsrc-2020Q4:1.8.0.48 pkgsrc-2020Q4-base:1.8 pkgsrc-2020Q3:1.8.0.46 pkgsrc-2020Q3-base:1.8 pkgsrc-2020Q2:1.8.0.42 pkgsrc-2020Q2-base:1.8 pkgsrc-2020Q1:1.8.0.22 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.44 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.40 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.38 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.36 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.34 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.32 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.30 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.28 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.26 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.24 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.20 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.18 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.16 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.14 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.12 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.10 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.8 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.6 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.4 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.2 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.6.0.6 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.4 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.2 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.5.0.40 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.38 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.36 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.34 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.32 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.30 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.28 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.26 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.24 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.22 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.20 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.18 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.16 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.14 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.12 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.10 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.8 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.6 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.4 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.2 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.4.0.56 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.54 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.52 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.50 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.48 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.46 pkgsrc-2008Q1:1.4.0.44 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.42 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.40 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.38 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.36 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.34 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.32 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.30 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.28 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.26 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.24 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.22 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.20 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.18 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.16 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.14 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.12 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.4 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.3 netbsd-1-3-PATCH002:1.2 FreeBSD-current-1997-09-25:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.8 date 2015.02.27.09.31.47; author wiz; state Exp; branches; next 1.7; commitid xAOGYU9wewcc1Dby; 1.7 date 2015.01.19.00.40.35; author wiedi; state Exp; branches; next 1.6; commitid S4DYHFAKViFEkz6y; 1.6 date 2014.06.29.03.24.33; author dholland; state Exp; branches; next 1.5; commitid dAOCmZVKKArfNmGx; 1.5 date 2009.04.25.23.46.47; author gdt; state Exp; branches; next 1.4; 1.4 date 99.11.12.05.17.20; author hubertf; state Exp; branches; next 1.3; 1.3 date 98.08.07.10.35.53; author agc; state Exp; branches; next 1.2; 1.2 date 98.02.09.00.33.15; author hubertf; state Exp; branches; next 1.1; 1.1 date 97.10.27.02.19.08; author hubertf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.10.27.02.19.08; author hubertf; state Exp; branches; next ; desc @@ 1.8 log @Fix build on Linux. From Matthias Ferdinand on pkgsrc-users. @ text @$NetBSD: patch-ab,v 1.7 2015/01/19 00:40:35 wiedi Exp $ - use standard headers - use standard macros for seeking - don't declare own lseek - use off_t - supply missing return value - on sunos ignore unsupported tm_gmtoff - include nixtime.i early enough, before the first call to time() --- bsd.c.orig 1993-05-01 04:21:53.000000000 +0000 +++ bsd.c @@@@ -26,7 +26,7 @@@@ to be on the safe side. It is needed fo long lseek PARMS ((int, long, int)); long tell (fd) int fd; -{ return (lseek (fd, 0L, 1)); } +{ return (lseek (fd, 0L, SEEK_CUR)); } #endif long ftell(); @@@@ -50,6 +50,17 @@@@ Date and time functions are standard UNI #include #include +/* Standard UNIX-compatible time routines */ +#include "nixtime.i" + +/* Standard UNIX-specific file attribute routines */ +#include "nixmode.i" + +#include +#ifndef SEEK_CUR +# define SEEK_CUR 1 +#endif + /* Function isadir() returns 1 if the supplied handle is a directory, else it returns 0. */ @@@@ -74,46 +85,27 @@@@ long gettz() #define SEC_IN_DAY (24L * 60L * 60L) #define INV_VALUE (SEC_IN_DAY + 1L) static long retval = INV_VALUE; /* cache, init to impossible value */ -#ifndef __386BSD__ - struct timeval tp; - struct timezone tzp; -#else time_t lt; struct tm *tm; -#endif if (retval != INV_VALUE) /* if have cached value, return it */ return retval; -#ifndef __386BSD__ - gettimeofday (&tp, &tzp); /* specific to 4.3BSD */ - /* return (tzp.tz_minuteswest * 60); */ /* old incorrect code */ - /* Timezone fix thanks to Bill Davidsen */ - /* !! - ache@@hq.demos.su */ - retval = tzp.tz_minuteswest * 60 - (tzp.tz_dsttime != 0) * 3600L; -#else time(<); tm = localtime(<); +#if defined(__sun) + retval = 0; +#else retval = -tm->tm_gmtoff; #endif return retval; } -/* Standard UNIX-compatible time routines */ -#include "nixtime.i" - -/* Standard UNIX-specific file attribute routines */ -#include "nixmode.i" - -#ifndef SEEK_CUR -# define SEEK_CUR 1 -#endif - /* Truncate a file. */ int zootrunc(f) FILE *f; { - extern long lseek(); - long seekpos; + off_t seekpos; int fd = fileno(f); seekpos = lseek(fd, 0L, SEEK_CUR); if (seekpos >= 0) return ftruncate(fd, seekpos); + return 0; } @ 1.7 log @fix build on sunos (ignore unsupported tm_gmtoff) @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2014/06/29 03:24:33 dholland Exp $ d9 1 d22 19 a40 1 @@@@ -74,24 +74,15 @@@@ long gettz() d68 1 a68 3 @@@@ -103,6 +94,7 @@@@ long gettz() /* Standard UNIX-specific file attribute routines */ #include "nixmode.i" d70 10 a79 5 +#include #ifndef SEEK_CUR # define SEEK_CUR 1 #endif @@@@ -110,10 +102,10 @@@@ long gettz() @ 1.6 log @Assorted basic legacy code fixes - ctype.h stuff, implicit int, use standard headers, etc. "time_t" is not "long". Don't issue own declarations of standard functions. Should fix Solaris build. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2009/04/25 23:46:47 gdt Exp $ d8 1 d21 1 a21 1 @@@@ -74,26 +74,13 @@@@ long gettz() d43 3 d47 1 a47 1 -#endif d49 1 a49 3 } @@@@ -103,6 +90,7 @@@@ long gettz() d57 1 a57 1 @@@@ -110,10 +98,10 @@@@ long gettz() @ 1.5 log @Apply massive patch from PR pkgsrc/38449 by Olaf 'Rhialto' Seibert. @ text @d1 1 a1 1 $NetBSD$ d3 7 a9 1 --- bsd.c.orig 1993-05-01 06:21:53.000000000 +0200 d11 7 a17 2 @@@@ -69,8 +69,12 @@@@ ZOOFILE f; } d19 2 a20 8 /* Function gettz() returns the offset from GMT in seconds */ -long gettz() +long gettz(t) +long t; { +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) + return -localtime(&t)->tm_gmtoff; +#else d24 18 a41 1 @@@@ -95,6 +99,7 @@@@ long gettz() d43 1 a43 1 #endif a44 1 +#endif d47 1 a47 2 /* Standard UNIX-compatible time routines */ @@@@ -103,15 +108,19 @@@@ long gettz() a50 1 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) a51 1 +#else d55 1 a55 2 +#endif a60 1 + extern off_t lseek(); d65 3 @ 1.4 log @Fix patch fuzz insanity @ text @d3 3 a5 3 --- ./bsd.c Sat May 1 06:21:53 1993 +++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/bsd.c Fri Nov 12 06:19:38 1999 @@@@ -69,8 +69,12 @@@@ d19 1 a19 1 @@@@ -95,6 +99,7 @@@@ d27 1 a27 1 @@@@ -103,15 +108,19 @@@@ @ 1.3 log @Add NetBSD RCS Ids. @ text @d3 46 a48 41 --- makefile.orig Tue Jul 16 17:52:08 1991 +++ makefile Sat Feb 7 18:20:15 1998 @@@@ -18,13 +18,13 @@@@ MAKE = make # needed for some systems e.g. older BSD -CC = cc -CFLAGS = +#CC = cc +#CFLAGS = MODEL = EXTRA = -DBIG_MEM -DNDEBUG LINTFLAGS = -DLINT -OPTIM = -O -DESTDIR = /usr/local/bin +OPTIM = $(CFLAGS) +DESTDIR = $(PREFIX)/bin #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ @@@@ -67,7 +67,7 @@@@ @@echo "lint_turboc: Run lint under **IX for checking Turbo C/MSDOS code" # install alpha zoo as "tzoo" -install: +inst_test: mv zoo $(DESTDIR)/tzoo # install beta zoo as "bzoo" @@@@ -75,8 +75,9 @@@@ mv zoo $(DESTDIR)/bzoo # install production zoo as "zoo" -inst_prod: - mv zoo $(DESTDIR)/zoo +install: + $(INSTALL_PROGRAM) $(TARGETS) $(DESTDIR) + $(INSTALL_DATA) zoo.1 fiz.1 $(PREFIX)/man/man1 # executable targets TARGETS = zoo fiz @ 1.2 log @Fix stripping of binaries (caused by fixing PR4884) @ text @d1 2 @ 1.1 log @Initial revision @ text @d1 41 a41 68 *** makefile.old Thu Aug 8 09:34:44 1991 --- makefile Thu Jan 5 05:07:23 1995 *************** *** 18,30 **** MAKE = make # needed for some systems e.g. older BSD ! CC = cc ! CFLAGS = MODEL = EXTRA = -DBIG_MEM -DNDEBUG LINTFLAGS = -DLINT ! OPTIM = -O ! DESTDIR = /usr/local/bin #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ --- 18,30 ---- MAKE = make # needed for some systems e.g. older BSD ! #CC = cc ! #CFLAGS = MODEL = EXTRA = -DBIG_MEM -DNDEBUG LINTFLAGS = -DLINT ! OPTIM = $(CFLAGS) ! DESTDIR = $(PREFIX)/bin #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ *************** *** 67,73 **** @@echo "lint_turboc: Run lint under **IX for checking Turbo C/MSDOS code" # install alpha zoo as "tzoo" ! install: mv zoo $(DESTDIR)/tzoo # install beta zoo as "bzoo" --- 67,73 ---- @@echo "lint_turboc: Run lint under **IX for checking Turbo C/MSDOS code" # install alpha zoo as "tzoo" ! inst_test: mv zoo $(DESTDIR)/tzoo # install beta zoo as "bzoo" *************** *** 75,82 **** mv zoo $(DESTDIR)/bzoo # install production zoo as "zoo" ! inst_prod: ! mv zoo $(DESTDIR)/zoo # executable targets TARGETS = zoo fiz --- 75,83 ---- mv zoo $(DESTDIR)/bzoo # install production zoo as "zoo" ! install: ! $(INSTALL) $(COPY) $(STRIP) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) $(TARGETS) $(DESTDIR) ! $(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 444 zoo.1 fiz.1 $(PREFIX)/man/man1 # executable targets TARGETS = zoo fiz @ 1.1.1.1 log @File archivers, ports from FreeBSD @ text @@