diff options
-rw-r--r-- | etc/mtree/BSD.usr.dist | 2 | ||||
-rw-r--r-- | usr.bin/vi/Makefile | 95 |
2 files changed, 1 insertions, 96 deletions
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 12340d3..abcce31 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -855,8 +855,6 @@ vi catalog .. - tcl - .. .. zoneinfo Africa diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index cdf79bf..9481bd8 100644 --- a/usr.bin/vi/Makefile +++ b/usr.bin/vi/Makefile @@ -1,32 +1,9 @@ # # $FreeBSD$ # -# This has most of the glue needed to compile tknvi and the perl hooks, -# but not all. -# SRCDIR= ${.CURDIR}/../../contrib/nvi -.if defined(RELEASE_CRUNCH) -# When building `vi' for the fixit floppy, don't include any of the -# API stuff. -APISTUFF= ex_notcl.c ex_noperl.c - -.else - -#TCLINTERP= yes #we don't have it in the base tree -#TKNVI= yes #not ready, needs X11, tk, doesn't quite work yet -#PERLINTERP= yes #works if perl has no thread support built in - -APISTUFF= ex_tcl.c ex_perl.c - -.if defined(PERLINTERP) -PERL?= /usr/bin/perl5 -CFLAGS+= -DHAVE_PERL_5_003_01 # If perl >= 5.03.01 -.endif - -.endif - CFLAGS+= -DGTAGS #if using ncurses: @@ -63,61 +40,13 @@ PLLINKS= pl_PL CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/include -.if !defined(TKNVI) DPADD+= ${LIBNCURSES} LDADD+= -lncurses -.else - -.PATH: ${SRCDIR}/tk -LDADD+= -L/usr/local/lib -L/usr/X11R6/lib -ltk41 -lX11 -CFLAGS+= -I/usr/local/include -I/usr/X11R6/include -.endif - -.if defined(TCLINTERP) -.PATH: ${SRCDIR}/tcl_api -DPADD+= ${LIBTCL} ${LIBM} -LDADD+= -ltcl -lm -CFLAGS+= -DHAVE_TCL_INTERP -I${DESTDIR}/usr/include/tcl -.endif - -.if defined(PERLINTERP) -.PATH: ${SRCDIR}/perl_api - -# Perl "knows" how to compile its components. Ask it for details... -PERLLIB!= ${PERL} -MConfig -e 'print $$Config{privlib}' -PERLCPPFLAGS!= cd ${SRCDIR}/build; ${PERL} -MExtUtils::Embed -e 'ccflags;perl_inc' -PERLLIBS!= cd ${SRCDIR}/build; ${PERL} -MExtUtils::Embed -e 'ldopts' -PERLLDFLAGS!= cd ${SRCDIR}/build; ${PERL} -MExtUtils::Embed -e 'ccdlflags' - -LDADD+= ${PERLLDFLAGS} ${PERLLIBS} -CFLAGS+= -DHAVE_PERL_INTERP ${PERLCPPFLAGS} - -.endif - CLEANFILES+=${EX} # Vi curses sources -.if !defined(TKNVI) SRCS+= cl_bsd.c cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c -.endif - -# Vi Tk sources -.if defined(TKNVI) -SRCS+= tk_funcs.c tk_main.c tk_read.c tk_screen.c tk_term.c tk_util.c -.endif - -# Vi Tcl/Perl interpreter sources -.if defined(TCLINTERP) || defined(PERLINTERP) -SRCS+= api.c -.endif -.if defined(TCLINTERP) -SRCS+= tcl.c -.endif -.if defined(PERLINTERP) -# perl.c is generated -SRCS+= perl.c perlsfio.c -.endif # General sources. SRCS+= cut.c delete.c exf.c key.c line.c log.c main.c mark.c msg.c options.c \ @@ -132,7 +61,7 @@ SRCS+= ex.c ex_abbrev.c ex_append.c ex_args.c ex_argv.c ex_at.c ex_bang.c \ ex_read.c ex_screen.c ex_script.c ex_set.c ex_shell.c \ ex_shift.c ex_source.c ex_stop.c ex_subst.c ex_tag.c \ ex_txt.c ex_undo.c ex_usage.c ex_util.c ex_version.c ex_visual.c \ - ex_write.c ex_yank.c ex_z.c ${APISTUFF} + ex_write.c ex_yank.c ex_z.c ex_notcl.c ex_noperl.c # Vi source. SRCS+= getc.c v_at.c v_ch.c v_cmd.c v_delete.c v_ex.c v_increment.c v_init.c \ @@ -144,18 +73,6 @@ SRCS+= getc.c v_at.c v_ch.c v_cmd.c v_delete.c v_ex.c v_increment.c v_init.c \ # Vi screen source. SRCS+= vs_line.c vs_msg.c vs_refresh.c vs_relative.c vs_smap.c vs_split.c -# Generate perl.c -.if defined(PERLINTERP) -perl.c: perl.xs typemap - echo "#define _PATH_PERLSCRIPTS \"/usr/share/vi/perl\"" > ${.TARGET} - $(PERL) $(PERLLIB)/ExtUtils/xsubpp -typemap \ - $(PERLLIB)/ExtUtils/typemap $(SRCDIR)/perl_api/perl.xs >> ${.TARGET} - ($(PERL) -ne 'print "sub $$1 {\$$curscr->$$1(\@_)}\n" \ - if /newXS\("VI::([^":]*)"/;' $@ ; echo "1;") > VI.pm - -CLEANFILES+= VI.pm perl.c -.endif - # unifdef has some *weird* exit codes, sigh! RTFM unifdef(1)... ex_notcl.c: ex_tcl.c -unifdef -UHAVE_TCL_INTERP ${SRCDIR}/ex/ex_tcl.c > ${.TARGET} @@ -215,15 +132,5 @@ afterinstall: ln -fs polish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-2; \ done ln -fs ru_SU.KOI8-R ${DESTDIR}/usr/share/vi/catalog/ru_RU.KOI8-R - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${SRCDIR}/tcl_scripts/*.tcl \ - ${DESTDIR}/usr/share/vi/tcl - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${SRCDIR}/perl_scripts/*.pl \ - ${DESTDIR}/usr/share/vi/perl -.if defined(PERLINTERP) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 VI.pm \ - ${DESTDIR}/usr/share/vi/perl -.endif .include <bsd.prog.mk> |