head	1.12;
access;
symbols
	RELEASE_8_3_0:1.12
	RELEASE_9_0_0:1.12
	RELEASE_7_4_0:1.12
	RELEASE_8_2_0:1.12
	RELEASE_6_EOL:1.12
	RELEASE_8_1_0:1.12
	RELEASE_7_3_0:1.12
	RELEASE_8_0_0:1.12
	RELEASE_7_2_0:1.12
	RELEASE_7_1_0:1.12
	RELEASE_6_4_0:1.12
	RELEASE_5_EOL:1.12
	RELEASE_7_0_0:1.12
	RELEASE_6_3_0:1.12
	PRE_XORG_7:1.12
	RELEASE_4_EOL:1.12
	RELEASE_6_2_0:1.12
	RELEASE_6_1_0:1.12
	RELEASE_5_5_0:1.12
	RELEASE_6_0_0:1.12
	RELEASE_5_4_0:1.12
	RELEASE_4_11_0:1.12
	RELEASE_5_3_0:1.12
	RELEASE_4_10_0:1.12
	RELEASE_5_2_1:1.12
	RELEASE_5_2_0:1.12
	RELEASE_4_9_0:1.12
	RELEASE_5_1_0:1.12
	RELEASE_4_8_0:1.12
	RELEASE_5_0_0:1.12
	RELEASE_4_7_0:1.12
	RELEASE_4_6_2:1.11
	RELEASE_4_6_1:1.11
	RELEASE_4_6_0:1.11
	RELEASE_5_0_DP1:1.11
	RELEASE_4_5_0:1.11
	RELEASE_4_4_0:1.11
	RELEASE_4_3_0:1.11
	RELEASE_4_2_0:1.10
	RELEASE_4_1_1:1.10
	RELEASE_4_1_0:1.7
	RELEASE_3_5_0:1.7
	RELEASE_4_0_0:1.7
	RELEASE_3_4_0:1.7
	RELEASE_3_3_0:1.7
	RELEASE_3_2_0:1.6
	RELEASE_3_1_0:1.6
	RELEASE_2_2_8:1.6
	RELEASE_3_0_0:1.5
	RELEASE_2_2_7:1.5
	RELEASE_2_2_6:1.4
	RELEASE_2_2_5:1.4
	RELEASE_2_2_1:1.4
	RELEASE_2_2_2:1.4
	ache:1.1.1.1;
locks; strict;
comment	@# @;


1.12
date	2002.07.21.14.35.54;	author ru;	state Exp;
branches;
next	1.11;

1.11
date	2000.12.11.02.31.03;	author ache;	state Exp;
branches;
next	1.10;

1.10
date	2000.08.14.15.47.17;	author ache;	state Exp;
branches;
next	1.9;

1.9
date	2000.08.12.14.19.24;	author ache;	state Exp;
branches;
next	1.8;

1.8
date	2000.07.31.10.20.23;	author kevlo;	state Exp;
branches;
next	1.7;

1.7
date	99.09.01.18.41.21;	author sumikawa;	state Exp;
branches;
next	1.6;

1.6
date	98.11.16.22.06.19;	author kuriyama;	state Exp;
branches;
next	1.5;

1.5
date	98.04.05.04.46.17;	author max;	state Exp;
branches;
next	1.4;

1.4
date	96.12.15.02.06.00;	author max;	state Exp;
branches;
next	1.3;

1.3
date	96.08.28.17.32.48;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	95.10.06.20.01.34;	author torstenb;	state Exp;
branches;
next	1.1;

1.1
date	94.12.26.09.10.32;	author ache;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	94.12.26.09.10.33;	author ache;	state Exp;
branches;
next	;


desc
@@


1.12
log
@Fix install.

Requested by:	kris
@
text
@--- Makefile.orig	Fri Dec 15 14:13:16 2000
+++ Makefile	Sun Jul 21 17:24:46 2002
@@@@ -10,28 +10,36 @@@@
 #	SWITCHES macro definitions ... see config.eng or config.jpn.
 #-----------------------------------------------------------------------
 
-SHELL=/bin/sh
-MAKE = make
+#SHELL=/bin/sh
+#MAKE = make
 
 #CC			= cc
-CC			= gcc
-SWITCHES	= -DNEED_INCREMENTAL_INDICATOR \
- -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\""
+#CC                      = gcc
+#SWITCHES        = -DNEED_INCREMENTAL_INDICATOR \
+# -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\""
+SWITCHES        = -DNEED_INCREMENTAL_INDICATOR
 
 #MACHINE     = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC
 #MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DHAVE_TM_ZONE -DSYSV_SYSTEM_DIR
-MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DMKTIME
+#MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DMKTIME
+MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DTIMELOCAL -DUSESTRCASECMP
 
 #OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
-OPTIMIZE	= -O2 -DSUPPORT_LH7 -DMKSTEMP
+#OPTIMIZE        = -O2 -DSUPPORT_LH7 -DMKSTEMP
+# mkstemp() usage is wrong
+OPTIMIZE        = ${CFLAGS} -DSUPPORT_LH7
 
-BINDIR = /usr/local/bin
-MANDIR = /usr/local/man
-MANSECT = n
+#BINDIR = /usr/local/bin
+#MANDIR = /usr/local/man
+#MANSECT = n
+PREFIX ?= /usr/local
+BINDIR = ${PREFIX}/bin
+MANDIR = ${PREFIX}/man/ja
+MANSECT = 1
 
-INSTALL = install
-INSTALLBIN = -s -m 755
-INSTALLMAN = -m 644
+INSTALL =
+INSTALLBIN = ${BSD_INSTALL_PROGRAM}
+INSTALLMAN = ${BSD_INSTALL_MAN}
 
 SUBDIRS = src man
 
@


1.11
log
@Upgrade to 1.14h
@
text
@d1 3
a3 3
--- Makefile.orig	Wed Oct  4 18:55:00 2000
+++ Makefile	Mon Dec 11 05:24:04 2000
@@@@ -10,28 +10,38 @@@@
d47 3
a49 5
+#INSTALL = install
+#INSTALLBIN = -s -m 755
+#INSTALLMAN = -m 644
+INSTALLBIN = -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
+INSTALLMAN = -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
@


1.10
log
@Uncomment NEED_INCREMENTAL_INDICATOR
@
text
@d1 4
a4 3
--- Makefile.orig	Sat May  6 18:55:15 2000
+++ Makefile	Mon Aug 14 19:41:44 2000
@@@@ -11,27 +11,27 @@@@
d7 1
a7 1
 SHELL=/bin/sh
d9 1
d16 3
a18 1
+#CC			= gcc
d24 1
d28 4
a31 2
-OPTIMIZE	= -O2 -DSUPPORT_LH7
+OPTIMIZE       	= ${CFLAGS} -DSUPPORT_LH7
d36 3
d48 2
@


1.9
log
@Put some missing flags back
@
text
@d2 1
a2 1
+++ Makefile	Sat Aug 12 18:13:52 2000
d15 1
a15 1
+#SWITCHES	= -DNEED_INCREMENTAL_INDICATOR \
@


1.8
log
@Update to version 1.14g

PR: 20262
Submitted by: Port Fury
@
text
@d1 2
a2 2
--- Makefile.orig	Sat May  6 22:55:15 2000
+++ Makefile	Mon Jul 31 18:08:14 2000
d20 1
a20 1
+MACHINE     = -DSYSTIME_HAS_NO_TM -DSYSV_SYSTEM_DIR -DMKTIME -DUSESTRCASECMP
d24 1
a24 1
+OPTIMIZE       	= ${CFLAGS}
@


1.7
log
@update to 1.14f

PR:		13412
Submitted by:	KATO Tsuguru <tkato@@prontomail.ne.jp>
Reviewed by:	sumikawa
@
text
@d1 3
a3 3
--- Makefile.orig	Sun Aug 29 01:36:34 1999
+++ Makefile	Thu Sep  2 03:33:33 1999
@@@@ -11,27 +11,26 @@@@
d15 1
a15 1
+SWITCHES	= -DNEED_INCREMENTAL_INDICATOR -DEUC -DSUPPORT_LH6
d20 1
a20 1
+MACHINE	= -DSYSTIME_HAS_NO_TM -DSYSV_SYSTEM_DIR -DMKTIME -DUSESTRCASECMP
d22 3
a24 3
-#OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
-OPTIMIZE	= -O2 -DSUPPORT_LH6
+OPTIMIZE	= ${CFLAGS}
@


1.6
log
@Update to v1.14d.

PR:		ports/8256
Submitted by:	Shigeyuki FUKUSHIMA <shige@@kuis.kyoto-u.ac.jp>
Approved by:	ache (maintainer)
@
text
@d1 3
a3 3
--- Makefile.orig	Wed Jan 15 18:46:08 1997
+++ Makefile	Mon Mar 30 22:09:06 1998
@@@@ -11,26 +11,23 @@@@
d14 8
a21 3
-#MACHINE     = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC
-MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DHAVE_TM_ZONE
-#OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer -mv8
d23 1
a23 6
-OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
-#OPTIMIZE	= -g
+#CC			= gcc
+SWITCHES	= -DNEED_INCREMENTAL_INDICATOR
+MACHINE     = -DSYSTIME_HAS_NO_TM -DTIMELOCAL -DUSESTRCASECMP \
+              -DSYSV_SYSTEM_DIR -DEUC
@


1.5
log
@Move the man pages to ${PREFIX}/man/ja from ja_JP.EUC.
Forgotten by:	whomever changed man/ja_JP.EUC -> man/ja in BSD.local.dist
@
text
@d1 42
a42 57
*** Makefile.orig	Fri Mar  1 17:59:19 1996
--- Makefile	Sun Dec 15 11:00:17 1996
***************
*** 11,35 ****
  #-----------------------------------------------------------------------
  
  SHELL=/bin/sh
! MAKE = make
  
  #CC			= cc
! CC			= gcc
! SWITCHES	= -DNEED_INCREMENTAL_INDICATOR \
!  -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\""
  #MACHINE     = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC
! MACHINE     = -DSYSTIME_HAS_NO_TM -DEUC -DFTIME
  #OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer -mv8
  #OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
! OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
  
! BINDIR = /usr/local/bin
! MANDIR = /usr/local/man
! MANSECT = n
  
! INSTALL = install
! INSTALLBIN = -s -m 755
! INSTALLMAN = -m 644
  
  SUBDIRS = src man
  
--- 11,37 ----
  #-----------------------------------------------------------------------
  
  SHELL=/bin/sh
! #MAKE = make
  
  #CC			= cc
! #CC                      = gcc
! SWITCHES        = -DNEED_INCREMENTAL_INDICATOR
  #MACHINE     = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC
! MACHINE     = -DSYSTIME_HAS_NO_TM -DTIMELOCAL -DUSESTRCASECMP \
! 	      -DSYSV_SYSTEM_DIR
  #OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer -mv8
  #OPTIMIZE	= -O2 -fstrength-reduce -fomit-frame-pointer
! #OPTIMIZE        = -O2 -fstrength-reduce -fomit-frame-pointer
! OPTIMIZE        = ${CFLAGS}
  
! PREFIX ?= /usr/local
! BINDIR = ${PREFIX}/bin
! MANDIR = ${PREFIX}/man/ja
! MANSECT = 1
  
! #INSTALL = install
! INSTALLBIN = -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
! INSTALLMAN = -m 444 -o bin -g bin -c
  
  SUBDIRS = src man
  
@


1.4
log
@Install the Japanese man page into ${PREFIX}/man/ja_JP.EUC.
@
text
@d49 1
a49 1
! MANDIR = ${PREFIX}/man/ja_JP.EUC
@


1.3
log
@Upgrade to 1.14C
@
text
@d1 2
a2 2
*** Makefile.orig	Fri Mar  1 11:59:19 1996
--- Makefile	Wed Aug 28 21:26:21 1996
d4 1
a4 1
*** 11,37 ****
d26 1
a26 1
  INSTALLMAN = -m 644
d28 1
a28 1
! SUBDIRS = src man
d30 1
a30 3
  O		= .o
  
--- 11,39 ----
d49 1
a49 1
! MANDIR = ${PREFIX}/man
d54 1
a54 3
  INSTALLMAN = -m 644
  
! SUBDIRS = src #man
d56 1
a56 1
  O		= .o
@


1.2
log
@Use ${PREFIX} instead of /usr/local
@
text
@d1 2
a2 2
*** ./src/lharc.h.old	Fri Apr 24 20:01:24 1992
--- ./src/lharc.h	Mon Dec 26 11:39:42 1994
d4 2
a5 11
*** 12,17 ****
--- 12,23 ----
  #include <sys/types.h>
  #include <sys/file.h>
  #include <sys/stat.h>
+ #ifdef __FreeBSD__
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <utime.h>
+ #include <memory.h>
+ #endif
d7 2
a8 1
  #include <signal.h>
d10 9
a18 83
*** ./src/header.c.old	Fri Apr 24 20:01:18 1992
--- ./src/header.c	Mon Dec 26 11:27:48 1994
***************
*** 302,308 ****
    dostm.tm_mday	 =  t >> 16   & 0x1f;
    dostm.tm_mon	 = (t >> 16+5 & 0x0f) - 1;	/* 0..11 */
    dostm.tm_year	 = (t >> 16+9 & 0x7f) + 80;
!   dostm.tm_isdst = 0;				/* correct? */
  #ifdef MKTIME
    return (time_t)mktime(&dostm);
  #else /* maybe defined(TIMELOCAL) */
--- 302,308 ----
    dostm.tm_mday	 =  t >> 16   & 0x1f;
    dostm.tm_mon	 = (t >> 16+5 & 0x0f) - 1;	/* 0..11 */
    dostm.tm_year	 = (t >> 16+9 & 0x7f) + 80;
!   dostm.tm_isdst = -1;  /* mktime try to guess for negative value */
  #ifdef MKTIME
    return (time_t)mktime(&dostm);
  #else /* maybe defined(TIMELOCAL) */
*** ./src/lhext.c.old	Wed Sep 23 18:51:48 1992
--- ./src/lhext.c	Mon Dec 26 11:10:11 1994
***************
*** 130,141 ****
--- 130,151 ----
  char *name;
  LzHeader *hdr;
  {
+ #ifdef __FreeBSD__
+   struct utimbuf utimebuf;
+   uid_t myuid;
+ #else
    time_t utimebuf[2];
    unsigned myuid;
+ #endif
  
    /* adjust file stamp */
+ #ifdef __FreeBSD__
+   utimebuf.actime = utimebuf.modtime = hdr->unix_last_modified_stamp;
+   utime (name, &utimebuf);
+ #else
    utimebuf[0] = utimebuf[1] = hdr->unix_last_modified_stamp;
    utime (name, utimebuf);
+ #endif
  
    if (hdr->extend_type == EXTEND_UNIX
        || hdr->extend_type == EXTEND_OS68K
*** ./src/lhlist.c.old	Sun May  3 01:27:32 1992
--- ./src/lhlist.c	Mon Dec 26 10:59:33 1994
***************
*** 25,33 ****
       long packed_size, original_size;
  {
    if (verbose_listing)
!     printf ("%7d ", packed_size);
  
!   printf ("%7d ", original_size);
  
    if (original_size == 0L)
      printf ("******");
--- 25,33 ----
       long packed_size, original_size;
  {
    if (verbose_listing)
!     printf ("%7ld ", packed_size);
  
!   printf ("%7ld ", original_size);
  
    if (original_size == 0L)
      printf ("******");
*** Makefile.orig	Wed Sep 23 21:29:48 1992
--- Makefile	Thu Sep 28 21:20:09 1995
***************
*** 13,31 ****
  CC = cc
  
  # For Sun/SunOS 4.x:
! SWITCHES	= -DUSESTRCASECMP # -DEUC
  # For Amdahl/UTS:
  #SWITCHES	= -DUSG -DSYSTIME_HAS_NO_TM -DNOBSTRING -DNOINDEX -DNOSTRDUP\
  #		  -DFTIME -DTZSET -DSYSV_SYSTEM_DIR -DNOFTRUNCATE -DNOMKDIR
  
  #OPTIMIZE	= -g # -O -fstrength-reduce -fomit-frame-pointer
! OPTIMIZE	= -O
d25 1
a25 1
  INSTALLBIN = -s -m 755
d28 3
a30 2
--- 13,33 ----
  CC = cc
d32 2
a33 7
  # For Sun/SunOS 4.x:
! #SWITCHES        = -DUSESTRCASECMP # -DEUC
  # For Amdahl/UTS:
  #SWITCHES	= -DUSG -DSYSTIME_HAS_NO_TM -DNOBSTRING -DNOINDEX -DNOSTRDUP\
  #		  -DFTIME -DTZSET -DSYSV_SYSTEM_DIR -DNOFTRUNCATE -DNOMKDIR
+ # For FreeBSD
+ SWITCHES        = -DUSESTRCASECMP -DMKTIME -DSYSV_SYSTEM_DIR
d35 13
a47 2
  #OPTIMIZE	= -g # -O -fstrength-reduce -fomit-frame-pointer
! OPTIMIZE        = -O2
d49 1
d54 2
a55 2
! INSTALL = install -c -o bin -g bin
  INSTALLBIN = -s -m 755
d57 4
@


1.1
log
@Initial revision
@
text
@d87 2
a88 2
*** ./Makefile.old	Wed Sep 23 23:29:48 1992
--- ./Makefile	Mon Dec 26 11:52:27 1994
d102 2
a103 2
  BINDIR = /usr/local/bin
  MANDIR = /usr/local/man
d124 2
a125 2
  BINDIR = /usr/local/bin
  MANDIR = /usr/local/man
@


1.1.1.1
log
@lha archiver
@
text
@@
