Date: Wed, 27 Dec 1995 12:53:42 +0000 From: Gary Jennejohn <Gary.Jennejohn@munich.netsurf.de> To: freebsd-current@freebsd.org Subject: a few patches Message-ID: <199512271253.MAA29809@peedub.gj.org>
next in thread | raw e-mail | index | archive | help
these patches are mostly to allow -current to completely compile
when a DESTDIR is specified. I needed the patch to fmt.c so that
it would compile at all. One patch installs the man page for zgrep.
The patches are relative to -current on Dec. 24.
Gary J
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*** ./Makefile.orig Sat Dec 23 23:18:58 1995
--- ./Makefile Sat Dec 23 23:20:27 1995
***************
*** 295,300 ****
--- 295,306 ----
cd ${.CURDIR}/lib/libtermcap && \
${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
.endif
+ .if exists(lib)
+ cd ${.CURDIR}/lib/csu/i386 && \
+ ${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+ cd ${.CURDIR}/lib && \
+ ${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+ .endif
.if exists(gnu)
cd ${.CURDIR}/gnu/lib && \
${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
***************
*** 303,314 ****
.endif
.if exists(secure) && !defined(NOCRYPT) && !defined(NOSECURE)
cd ${.CURDIR}/secure/lib && \
- ${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
- .endif
- .if exists(lib)
- cd ${.CURDIR}/lib/csu/i386 && \
- ${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
- cd ${.CURDIR}/lib && \
${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
.endif
.if exists(usr.sbin/lex/lib)
--- 309,314 ----
*** ./gnu/usr.bin/gzip/Makefile.orig Mon Dec 25 01:39:24 1995
--- ./gnu/usr.bin/gzip/Makefile Mon Dec 25 01:40:29 1995
***************
*** 3,9 ****
PROG= gzip
SRCS= gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
crypt.c lzw.c unlzw.c unlzh.c unpack.c getopt.c match.S
! MAN1= gzexe.1 gzip.1 zdiff.1 zforce.1 zmore.1 znew.1
CFLAGS+=-DASMV -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DDIRENT=1
MLINKS= gzip.1 gunzip.1 gzip.1 zcat.1 gzip.1 gzcat.1
LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip
--- 3,9 ----
PROG= gzip
SRCS= gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
crypt.c lzw.c unlzw.c unlzh.c unpack.c getopt.c match.S
! MAN1= gzexe.1 gzip.1 zdiff.1 zforce.1 zgrep.1 zmore.1 znew.1
CFLAGS+=-DASMV -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DDIRENT=1
MLINKS= gzip.1 gunzip.1 gzip.1 zcat.1 gzip.1 gzcat.1
LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip
*** ./lkm/cd9660/Makefile.orig Sun Dec 24 15:18:45 1995
--- ./lkm/cd9660/Makefile Sun Dec 24 15:26:33 1995
***************
*** 6,11 ****
cd9660_util.c cd9660_vfsops.c cd9660_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DCD9660
.include <bsd.kmod.mk>
--- 6,11 ----
cd9660_util.c cd9660_vfsops.c cd9660_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DCD9660 -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./lkm/coff/Makefile.orig Sun Dec 24 15:33:26 1995
--- ./lkm/coff/Makefile Sun Dec 24 15:33:53 1995
***************
*** 5,10 ****
SRCS= coff.c imgact_coff.c vnode_if.h
NOMAN=
CLEANFILES+= vnode_if.h vnode_if.c
! CFLAGS+= -DLKM -I. -DCOMPAT_IBCS2
.include <bsd.kmod.mk>
--- 5,10 ----
SRCS= coff.c imgact_coff.c vnode_if.h
NOMAN=
CLEANFILES+= vnode_if.h vnode_if.c
! CFLAGS+= -DLKM -I. -DCOMPAT_IBCS2 -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./lkm/fdesc/Makefile.orig Sun Dec 24 15:37:48 1995
--- ./lkm/fdesc/Makefile Sun Dec 24 15:38:12 1995
***************
*** 5,10 ****
SRCS= fdesc_vfsops.c fdesc_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DFDESC
.include <bsd.kmod.mk>
--- 5,10 ----
SRCS= fdesc_vfsops.c fdesc_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DFDESC -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./lkm/fpu/Makefile.orig Sun Dec 24 15:38:47 1995
--- ./lkm/fpu/Makefile Sun Dec 24 15:39:11 1995
***************
*** 5,10 ****
SRCS= math_emulate.c
NOMAN=
PSEUDO_LKM=
! CFLAGS+= -DLKM
.include <bsd.kmod.mk>
--- 5,10 ----
SRCS= math_emulate.c
NOMAN=
PSEUDO_LKM=
! CFLAGS+= -DLKM -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./lkm/gnufpu/Makefile.orig Sun Dec 24 15:48:04 1995
--- ./lkm/gnufpu/Makefile Sun Dec 24 15:48:30 1995
***************
*** 9,15 ****
reg_ld_str.c reg_u_mul.s reg_u_sub.s wm_shrx.s wm_sqrt.s
NOMAN=
PSEUDO_LKM=
! CFLAGS+= -DLKM -I${.CURDIR}/../../sys/sys
.s.o:
cpp -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o
--- 9,15 ----
reg_ld_str.c reg_u_mul.s reg_u_sub.s wm_shrx.s wm_sqrt.s
NOMAN=
PSEUDO_LKM=
! CFLAGS+= -DLKM -I${.CURDIR}/../../sys/sys -I${DESTDIR}/usr/include
.s.o:
cpp -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o
*** ./lkm/ibcs2/Makefile.orig Sun Dec 24 15:49:17 1995
--- ./lkm/ibcs2/Makefile Sun Dec 24 15:50:10 1995
***************
*** 9,15 ****
ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c vnode_if.h
MAN8= ibcs2.8
! CFLAGS+= -DLKM -I. -DCOMPAT_IBCS2
CLEANFILES+= vnode_if.h vnode_if.c
EXPORT_SYMS= _ibcs2_mod _ibcs2_emul_path _ibcs2_svr3_sysvec
--- 9,15 ----
ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c vnode_if.h
MAN8= ibcs2.8
! CFLAGS+= -DLKM -I. -DCOMPAT_IBCS2 -I${DESTDIR}/usr/include
CLEANFILES+= vnode_if.h vnode_if.c
EXPORT_SYMS= _ibcs2_mod _ibcs2_emul_path _ibcs2_svr3_sysvec
*** ./lkm/kernfs/Makefile.orig Sun Dec 24 15:51:22 1995
--- ./lkm/kernfs/Makefile Sun Dec 24 15:51:40 1995
***************
*** 5,10 ****
SRCS= kernfs_vfsops.c kernfs_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DKERNFS
.include <bsd.kmod.mk>
--- 5,10 ----
SRCS= kernfs_vfsops.c kernfs_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DKERNFS -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./lkm/linux/Makefile.orig Sun Dec 24 15:52:02 1995
--- ./lkm/linux/Makefile Sun Dec 24 15:53:06 1995
***************
*** 7,12 ****
--- 7,13 ----
linux_dummy.c linux_sysent.c imgact_linux.c vnode_if.h
NOMAN=
CFLAGS+= -DLKM -I. -DCOMPAT_LINUX -DSYSVSHM #-DSYSVMSG -DSYSVSEM #-DDEBUG
+ CFLAGS+= -I${DESTDIR}/usr/include
CLEANFILES+= vnode_if.h vnode_if.c
afterinstall:
*** ./lkm/msdos/Makefile.orig Sun Dec 24 15:53:42 1995
--- ./lkm/msdos/Makefile Sun Dec 24 15:54:00 1995
***************
*** 6,11 ****
msdosfs_vfsops.c msdosfs_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DMSDOSFS
.include <bsd.kmod.mk>
--- 6,11 ----
msdosfs_vfsops.c msdosfs_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DMSDOSFS -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./lkm/nfs/Makefile.orig Sun Dec 24 15:54:34 1995
--- ./lkm/nfs/Makefile Sun Dec 24 15:54:55 1995
***************
*** 6,11 ****
nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c nfs_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DNFS -DINET
.include <bsd.kmod.mk>
--- 6,11 ----
nfs_srvcache.c nfs_subs.c nfs_syscalls.c nfs_vfsops.c nfs_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DNFS -DINET -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./lkm/nullfs/Makefile.orig Sun Dec 24 15:57:00 1995
--- ./lkm/nullfs/Makefile Sun Dec 24 15:57:23 1995
***************
*** 5,10 ****
SRCS= null_subr.c null_vfsops.c null_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DNULLFS
.include <bsd.kmod.mk>
--- 5,10 ----
SRCS= null_subr.c null_vfsops.c null_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DNULLFS -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./lkm/portal/Makefile.orig Sun Dec 24 15:57:47 1995
--- ./lkm/portal/Makefile Sun Dec 24 15:58:09 1995
***************
*** 5,10 ****
SRCS= portal_vfsops.c portal_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DPORTAL
.include <bsd.kmod.mk>
--- 5,10 ----
SRCS= portal_vfsops.c portal_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DPORTAL -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./lkm/procfs/Makefile.orig Sun Dec 24 15:58:31 1995
--- ./lkm/procfs/Makefile Sun Dec 24 15:58:53 1995
***************
*** 8,13 ****
procfs_vfsops.c procfs_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DPROCFS
.include <bsd.kmod.mk>
--- 8,13 ----
procfs_vfsops.c procfs_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DPROCFS -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./lkm/umapfs/Makefile.orig Sun Dec 24 15:59:29 1995
--- ./lkm/umapfs/Makefile Sun Dec 24 15:59:47 1995
***************
*** 5,10 ****
SRCS= umap_subr.c umap_vfsops.c umap_vnops.c
NOMAN=
VFS_LKM= yes
! CFLAGS+= -DUMAPFS
.include <bsd.kmod.mk>
--- 5,10 ----
SRCS= umap_subr.c umap_vfsops.c umap_vnops.c
NOMAN=
VFS_LKM= yes
! CFLAGS+= -DUMAPFS -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./lkm/union/Makefile.orig Sun Dec 24 16:00:09 1995
--- ./lkm/union/Makefile Sun Dec 24 16:00:26 1995
***************
*** 5,10 ****
SRCS= union_subr.c union_vfsops.c union_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DUNION
.include <bsd.kmod.mk>
--- 5,10 ----
SRCS= union_subr.c union_vfsops.c union_vnops.c
NOMAN=
VFS_LKM=
! CFLAGS+= -DUNION -I${DESTDIR}/usr/include
.include <bsd.kmod.mk>
*** ./usr.bin/fmt/fmt.c.orig Sun Dec 24 13:19:06 1995
--- ./usr.bin/fmt/fmt.c Sun Dec 24 13:20:00 1995
***************
*** 69,75 ****
--- 69,77 ----
int lineno; /* Current input line */
int mark; /* Last place we saw a head line */
+ #if 0
char *malloc(); /* for lint . . . */
+ #endif
char *headnames[] = {"To", "Subject", "Cc", 0};
/*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199512271253.MAA29809>