head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.3 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1; locks; strict; comment @# @; 1.3 date 99.08.17.11.18.41; author agc; state dead; branches; next 1.2; 1.2 date 98.08.07.11.08.56; author agc; state Exp; branches; next 1.1; 1.1 date 98.03.31.11.58.47; author agc; state Exp; branches; next ; desc @@ 1.3 log @Use USE_X11 in Makefile to show that this package links with X11 headers and libs. Make this package work on Solaris. Use the same "pkgsrc" configuration file for locations of objects on NetBSD (both ELF and a.out) and Solaris. Use a Makefile target, rather than a separate script. Avoid clash with ALIGN definition in @ text @$NetBSD: patch-f,v 1.2 1998/08/07 11:08:56 agc Exp $ --- include/build 1998/03/31 09:49:53 1.1 +++ include/build 1998/03/31 09:53:47 @@@@ -21,18 +21,17 @@@@ stkmem.h\\ type.h +INCDIR= \${PREFIX}/include/elk + config.h: ../config/system ../config/site \$(SHELL) ./build-config install: \$(FILES) - -@@if [ ! -d $install_dir/include ]; then \\ - echo mkdir $install_dir/include; \\ - mkdir $install_dir/include; \\ - fi + -@@mkdir -p \${INCDIR} \${PREFIX}/share/elk @@for i in \$(FILES) ;\\ do \\ - echo cp \$\$i $install_dir/include; \\ - cp \$\$i $install_dir/include; \\ + echo \${BSD_INSTALL_DATA} \$\$i \${INCDIR}; \\ + \${BSD_INSTALL_DATA} \$\$i \${INCDIR}; \\ done localize: config.h --- src/build 1998/03/31 09:58:17 1.1 +++ src/build 1998/03/31 10:00:03 @@@@ -181,11 +181,7 @@@@ rm main3.c install: scheme standalone.o module.o - -@@if [ ! -d $install_dir/bin ]; then \\ - echo mkdir $install_dir/bin; \\ - mkdir $install_dir/bin; \\ - fi - cp scheme $install_dir/bin + \${BSD_INSTALL_PROGRAM} scheme \${PREFIX}/bin/elk -@@if [ ! -d $install_dir/lib ]; then \\ echo mkdir $install_dir/lib; \\ mkdir $install_dir/lib; \\ --- lib/xlib/build 1998/03/31 10:24:34 1.1 +++ lib/xlib/build 1998/03/31 10:26:57 @@@@ -117,15 +117,8 @@@@ mkdir $install_dir/runtime/obj; \\ fi cp xlib.pre $install_dir/runtime/obj/xlib.o - -@@if [ ! -d $install_dir/include ]; then \\ - echo mkdir $install_dir/include; \\ - mkdir $install_dir/include; \\ - fi - -@@if [ ! -d $install_dir/include/extensions ]; then \\ - echo mkdir $install_dir/include/extensions; \\ - mkdir $install_dir/include/extensions; \\ - fi - cp xlib.h $install_dir/include/extensions + -@@mkdir -p \${PREFIX}/include/elk/extensions + \${BSD_INSTALL_DATA} xlib.h \${PREFIX}/include/elk/extensions lint: lint \$(LINTFLAGS) -I\$(INC) $x11_incl \$(C) --- lib/unix/build 1998/03/31 10:28:09 1.1 +++ lib/unix/build 1998/03/31 10:28:42 @@@@ -87,15 +87,9 @@@@ mkdir $install_dir/runtime/obj; \\ fi cp unix.pre $install_dir/runtime/obj/unix.o - -@@if [ ! -d $install_dir/include ]; then \\ - echo mkdir $install_dir/include; \\ - mkdir $install_dir/include; \\ - fi - -@@if [ ! -d $install_dir/include/extensions ]; then \\ - echo mkdir $install_dir/include/extensions; \\ - mkdir $install_dir/include/extensions; \\ - fi - cp unix.h $install_dir/include/extensions + -@@mkdir -p \${PREFIX}/include/elk/extensions + \${BSD_INSTALL_DATA} unix.h \${PREFIX}/include/elk/extensions + lint: lint \$(LINTFLAGS) -I\$(INC) \$(C) --- lib/xt/build 1998/03/31 10:29:31 1.1 +++ lib/xt/build 1998/03/31 10:30:02 @@@@ -97,15 +97,9 @@@@ mkdir $install_dir/runtime/obj; \\ fi cp xt.pre $install_dir/runtime/obj/xt.o - -@@if [ ! -d $install_dir/include ]; then \\ - echo mkdir $install_dir/include; \\ - mkdir $install_dir/include; \\ - fi - -@@if [ ! -d $install_dir/include/extensions ]; then \\ - echo mkdir $install_dir/include/extensions; \\ - mkdir $install_dir/include/extensions; \\ - fi - cp xt.h $install_dir/include/extensions + -@@mkdir -p \${PREFIX}/include/elk/extensions + \${BSD_INSTALL_DATA} xt.h \${PREFIX}/include/elk/extensions + lint: lint \$(LINTFLAGS) -I\$(INC) -I../xlib $x11_incl \$(C) --- doc/man/Makefile 1998/03/31 10:42:41 1.1 +++ doc/man/Makefile 1998/03/31 10:43:33 @@@@ -7,5 +7,10 @@@@ elk.1.html: elk.1 $(UNROFF) $? +default: elk.1 + clean: rm -f elk.ps elk.1.html + +install: elk.1 + ${BSD_INSTALL_MAN} elk.1 ${PREFIX}/man/man1 --- scripts/build 1998/03/31 11:15:29 1.1 +++ scripts/build 1998/03/31 11:16:06 @@@@ -30,10 +30,7 @@@@ chmod +x \$@@ install: \$(FILES) - -@@if [ ! -d $install_dir/lib ]; then \\ - echo mkdir $install_dir/lib; \\ - mkdir $install_dir/lib; \\ - fi + -@@mkdir -p $install_dir/lib cp linkscheme $install_dir/lib cp makedl $install_dir/lib cp ldflags $install_dir/lib @ 1.2 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Update the patches for NetBSD - install object files in ${PREFIX}/lib, not ${PREFIX}/share, add NetBSD config files, install the documentation in the "make install" stage, and other minor mods. @ text @d1 2 @