head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.6 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.4 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.2 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.6.0.74 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.72 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.70 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.68 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.66 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.64 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.62 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.60 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.58 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.56 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.54 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.52 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.50 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.48 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.46 pkgsrc-2008Q1:1.6.0.44 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.42 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.40 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.38 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.36 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.34 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.32 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.30 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.28 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.26 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.24 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.22 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.20 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.18 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.16 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.14 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.12 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.10 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.6.0.6 netbsd-1-6-1-base:1.6 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.6 netbsd-1-4-PATCH003:1.6 netbsd-1-4-PATCH002:1.6 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.2; locks; strict; comment @# @; 1.7 date 2011.10.02.14.11.53; author wiz; state dead; branches; next 1.6; 1.6 date 99.12.18.22.10.02; author christos; state Exp; branches; next 1.5; 1.5 date 99.12.18.01.48.56; author christos; state Exp; branches; next 1.4; 1.4 date 99.12.18.01.46.29; author christos; state Exp; branches; next 1.3; 1.3 date 98.10.28.01.29.16; author hubertf; state Exp; branches; next 1.2; 1.2 date 98.08.07.10.40.34; author agc; state Exp; branches; next 1.1; 1.1 date 98.07.18.04.58.17; author tsarna; state Exp; branches; next ; desc @@ 1.7 log @Remove packages scheduled to be deleted according to the pkgsrc-2011Q2 release notes. @ text @$NetBSD: patch-ab,v 1.6 1999/12/18 22:10:02 christos Exp $ --- Makefile.orig Thu May 2 13:55:19 1996 +++ Makefile Sat Dec 18 17:02:32 1999 @@@@ -8,30 +8,45 @@@@ int1a.c int2f.c intff.c \ mem.c mouse.c net.c null.c port.c setver.c signal.c timer.c trace.c trap.c tty.c xms.c +BINDIR= ${PREFIX}/bin +MANDIR= ${PREFIX}/man + BINGRP= kmem EXEGRP= bin BINMODE=2555 EXEMODE=444 -CFLAGS+=-I/usr/X11/include -DDISASSEMBLER -g -LDFLAGS+=-L/usr/X11/lib +START_ADDRESS=0x110000 +CFLAGS+=-I${X11BASE}/include -DDISASSEMBLER -g -DSTART_ADDRESS=${START_ADDRESS} +LDFLAGS+=-L${X11BASE}/lib -R${X11BASE}/lib LDADD+= -lX11 -li386 -lgcc -lc -lgcc -DPADD+= /usr/X11/lib/libX11.a ${LIBC} ${LIBGCC} +DPADD+= ${X11BASE}/lib/libX11.a ${LIBC} ${LIBGCC} + +.include +.if ${OBJECT_FMT} == "ELF" +TEXT=-e start -Ttext ${START_ADDRESS} +CRTBEGIN=/usr/lib/crtbegin.o +.else +TEXT=-e _start -T ${START_ADDRESS} +CRTBEGIN= +.endif + afterinstall: install ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \ - doscmd.kernel ${DESTDIR}/usr/libexec/doscmd.kernel + doscmd.kernel ${PREFIX}/libexec/doscmd.kernel install -c -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \ - ${.CURDIR}/instbsdi.exe ${DESTDIR}/usr/dos/ + ${.CURDIR}/instbsdi.exe ${PREFIX}/libexec/ -doscmd: doscmd.kernel ${LIBCRT0} doscmd_loader.o - ld -N -Bstatic -o doscmd ${LDFLAGS} ${LIBCRT0} doscmd_loader.o ${LDADD} +doscmd: doscmd.kernel ${LIBCRT0} ${CRTBEGIN} doscmd_loader.o + ld -N -Bstatic -o doscmd ${LDFLAGS:S/^-Wl,//g} ${LIBCRT0} ${CRTBEGIN} doscmd_loader.o ${LDADD} -.include .depend: doscmd_loader.c doscmd.kernel: crt0.o ${OBJS} - ld -N -Bstatic -T 110000 -o doscmd.kernel ${LDFLAGS} crt0.o ${OBJS} ${LDADD} + ld -N -Bstatic ${TEXT} -o doscmd.bin ${LDFLAGS:S/^-Wl,//g} crt0.o ${OBJS} ${LDADD} + objcopy -O binary doscmd.bin $@@ + @@rm -f doscmd.bin doscmd.0: doscmd.1 tbl ${.IMPSRC} | nroff -mandoc > ${.TARGET} @ 1.6 log @Use objcopy to make the binary file and load it directly, instead of using loadfile which is less portable. [suggested by Tron] @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 1999/12/18 01:48:56 christos Exp $ @ 1.5 log @typo in patch @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 1999/12/18 01:46:29 christos Exp $ d3 57 a59 88 *** Makefile.orig Thu May 2 13:55:19 1996 --- Makefile Fri Dec 17 20:27:36 1999 *************** *** 8,37 **** int1a.c int2f.c intff.c \ mem.c mouse.c net.c null.c port.c setver.c signal.c timer.c trace.c trap.c tty.c xms.c BINGRP= kmem EXEGRP= bin BINMODE=2555 EXEMODE=444 ! CFLAGS+=-I/usr/X11/include -DDISASSEMBLER -g ! LDFLAGS+=-L/usr/X11/lib LDADD+= -lX11 -li386 -lgcc -lc -lgcc ! DPADD+= /usr/X11/lib/libX11.a ${LIBC} ${LIBGCC} afterinstall: install ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \ ! doscmd.kernel ${DESTDIR}/usr/libexec/doscmd.kernel install -c -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \ ! ${.CURDIR}/instbsdi.exe ${DESTDIR}/usr/dos/ ! doscmd: doscmd.kernel ${LIBCRT0} doscmd_loader.o ! ld -N -Bstatic -o doscmd ${LDFLAGS} ${LIBCRT0} doscmd_loader.o ${LDADD} ! .include .depend: doscmd_loader.c doscmd.kernel: crt0.o ${OBJS} ! ld -N -Bstatic -T 110000 -o doscmd.kernel ${LDFLAGS} crt0.o ${OBJS} ${LDADD} doscmd.0: doscmd.1 tbl ${.IMPSRC} | nroff -mandoc > ${.TARGET} --- 8,60 ---- int1a.c int2f.c intff.c \ mem.c mouse.c net.c null.c port.c setver.c signal.c timer.c trace.c trap.c tty.c xms.c + BINDIR= ${PREFIX}/bin + MANDIR= ${PREFIX}/man + BINGRP= kmem EXEGRP= bin BINMODE=2555 EXEMODE=444 ! CFLAGS+=-I${X11BASE}/include -DDISASSEMBLER -g ! LDFLAGS+=-L${X11BASE}/lib -R${X11BASE}/lib LDADD+= -lX11 -li386 -lgcc -lc -lgcc ! DPADD+= ${X11BASE}/lib/libX11.a ${LIBC} ${LIBGCC} ! # XXX: For loadfile ! LIBSA= /usr/src/sys/lib/libsa ! CLEANFILES+= loadfile.c loadfile.h ! ! .include ! .if ${OBJECT_FMT} == "ELF" ! TEXT=-e start -Ttext ! CRTBEGIN=/usr/lib/crtbegin.o ! .else ! TEXT=-e _start -T ! CRTBEGIN= ! .endif ! afterinstall: install ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \ ! doscmd.kernel ${PREFIX}/libexec/doscmd.kernel install -c -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \ ! ${.CURDIR}/instbsdi.exe ${PREFIX}/libexec/ ! doscmd: doscmd.kernel ${LIBCRT0} ${CRTBEGIN} doscmd_loader.o loadfile.o ! ld -N -Bstatic -o doscmd ${LDFLAGS:S/^-Wl,//g} ${LIBCRT0} ${CRTBEGIN} doscmd_loader.o loadfile.o ${LDADD} ! ! loadfile.c: ${LIBSA}/loadfile.c ! @@cp $> $@@ ! ! loadfile.h: ${LIBSA}/loadfile.h ! @@cp $> $@@ ! ! doscmd_loader.o: loadfile.h .depend: doscmd_loader.c doscmd.kernel: crt0.o ${OBJS} ! ld -N -Bstatic ${TEXT} 0x110000 -o doscmd.kernel ${LDFLAGS:S/^-Wl,//g} crt0.o ${OBJS} ${LDADD} doscmd.0: doscmd.1 tbl ${.IMPSRC} | nroff -mandoc > ${.TARGET} @ 1.4 log @- Fix Makefile to work with elf - Fix RO string that got written - Add mmap() when we run ELF, because we need to map lomem - Fix uninitialized reference in di->location - Make doscmd_loader use loadfile() [Tested only with ELF] @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 1998/10/28 01:29:16 hubertf Exp $ d14 1 a14 1 ! CFLAGS+=-I/usr/X11/include -DDISASSEMBLER @ 1.3 log @Add changes to compile on current; still works on 1.3(.1) Reported and tested by Bernhard Riedel @ text @d1 1 a1 1 $NetBSD$ d3 88 a90 42 --- Makefile.orig Thu May 2 19:55:19 1996 +++ Makefile Wed Oct 28 02:07:49 1998 @@@@ -8,30 +8,33 @@@@ int1a.c int2f.c intff.c \ mem.c mouse.c net.c null.c port.c setver.c signal.c timer.c trace.c trap.c tty.c xms.c +BINDIR= ${PREFIX}/bin +MANDIR= ${PREFIX}/man + BINGRP= kmem EXEGRP= bin BINMODE=2555 EXEMODE=444 -CFLAGS+=-I/usr/X11/include -DDISASSEMBLER -g -LDFLAGS+=-L/usr/X11/lib +CFLAGS+=-I${X11BASE}/include -DDISASSEMBLER +LDFLAGS+=-L${X11BASE}/lib LDADD+= -lX11 -li386 -lgcc -lc -lgcc DPADD+= /usr/X11/lib/libX11.a ${LIBC} ${LIBGCC} afterinstall: install ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \ - doscmd.kernel ${DESTDIR}/usr/libexec/doscmd.kernel + doscmd.kernel ${PREFIX}/libexec/doscmd.kernel install -c -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \ - ${.CURDIR}/instbsdi.exe ${DESTDIR}/usr/dos/ + ${.CURDIR}/instbsdi.exe ${PREFIX}/libexec/ doscmd: doscmd.kernel ${LIBCRT0} doscmd_loader.o - ld -N -Bstatic -o doscmd ${LDFLAGS} ${LIBCRT0} doscmd_loader.o ${LDADD} + ld -N -Bstatic -o doscmd ${LDFLAGS:S/^-Wl,//g} ${LIBCRT0} doscmd_loader.o ${LDADD} .include .depend: doscmd_loader.c doscmd.kernel: crt0.o ${OBJS} - ld -N -Bstatic -T 110000 -o doscmd.kernel ${LDFLAGS} crt0.o ${OBJS} ${LDADD} + ld -N -Bstatic -T 110000 -o doscmd.kernel ${LDFLAGS:S/^-Wl,//g} crt0.o ${OBJS} ${LDADD} doscmd.0: doscmd.1 tbl ${.IMPSRC} | nroff -mandoc > ${.TARGET} @ 1.2 log @Add NetBSD RCS Ids. @ text @d3 3 a5 3 --- Makefile.orig Thu May 2 12:55:19 1996 +++ Makefile Fri Jul 17 23:30:12 1998 @@@@ -8,20 +8,23 @@@@ d32 13 a44 1 ld -N -Bstatic -o doscmd ${LDFLAGS} ${LIBCRT0} doscmd_loader.o ${LDADD} @ 1.1 log @An MS-DOS emulator (NetBSD/i386 only) @ text @d1 2 @