head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.192
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.190
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.188
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.186
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.184
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.182
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.180
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.178
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.176
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.174
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.172
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.170
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.168
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.166
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.164
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.162
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.160
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.158
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.156
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.154
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.152
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.150
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.148
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.144
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.124
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.146
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.142
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.140
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.138
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.136
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.134
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.132
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.130
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.128
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.126
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.122
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.120
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.118
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.116
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2016Q2:1.3.0.114
	pkgsrc-2016Q2-base:1.3
	pkgsrc-2016Q1:1.3.0.112
	pkgsrc-2016Q1-base:1.3
	pkgsrc-2015Q4:1.3.0.110
	pkgsrc-2015Q4-base:1.3
	pkgsrc-2015Q3:1.3.0.108
	pkgsrc-2015Q3-base:1.3
	pkgsrc-2015Q2:1.3.0.106
	pkgsrc-2015Q2-base:1.3
	pkgsrc-2015Q1:1.3.0.104
	pkgsrc-2015Q1-base:1.3
	pkgsrc-2014Q4:1.3.0.102
	pkgsrc-2014Q4-base:1.3
	pkgsrc-2014Q3:1.3.0.100
	pkgsrc-2014Q3-base:1.3
	pkgsrc-2014Q2:1.3.0.98
	pkgsrc-2014Q2-base:1.3
	pkgsrc-2014Q1:1.3.0.96
	pkgsrc-2014Q1-base:1.3
	pkgsrc-2013Q4:1.3.0.94
	pkgsrc-2013Q4-base:1.3
	pkgsrc-2013Q3:1.3.0.92
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.90
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.3.0.88
	pkgsrc-2013Q1-base:1.3
	pkgsrc-2012Q4:1.3.0.86
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q3:1.3.0.84
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.82
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.80
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.78
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.76
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.74
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.72
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2010Q4:1.3.0.70
	pkgsrc-2010Q4-base:1.3
	pkgsrc-2010Q3:1.3.0.68
	pkgsrc-2010Q3-base:1.3
	pkgsrc-2010Q2:1.3.0.66
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.64
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.3.0.62
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q3:1.3.0.60
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.58
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.56
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.54
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.52
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.50
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.48
	pkgsrc-2008Q2-base:1.3
	cwrapper:1.3.0.46
	pkgsrc-2008Q1:1.3.0.44
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.42
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.40
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.38
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.36
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.34
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.32
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.30
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.28
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.26
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.24
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.22
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.20
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.18
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.16
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.14
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.12
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.10
	pkgsrc-2003Q4-base:1.3
	netbsd-1-6-1:1.3.0.6
	netbsd-1-6-1-base:1.3
	netbsd-1-6:1.3.0.8
	netbsd-1-6-RELEASE-base:1.3
	pkgviews:1.3.0.4
	pkgviews-base:1.3
	buildlink2:1.3.0.2
	buildlink2-base:1.3
	netbsd-1-5-PATCH003:1.3
	netbsd-1-5-PATCH001:1.3
	netbsd-1-5-RELEASE:1.1
	netbsd-1-4-PATCH003:1.1
	netbsd-1-4-PATCH002:1.1;
locks; strict;
comment	@# @;


1.3
date	2001.03.26.22.51.39;	author skrll;	state Exp;
branches;
next	1.2;

1.2
date	2001.02.26.16.56.36;	author agc;	state Exp;
branches;
next	1.1;

1.1
date	99.11.22.11.11.33;	author agc;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Fix installation.

Problem noted by Mark White <mark.white@@st-edmund-hall.oxford.ac.uk> on
tech-pkg.
@
text
@$NetBSD$

--- tools/makefile.src.orig	Tue Jan 28 18:47:42 1992
+++ tools/makefile.src
@@@@ -13,7 +13,6 @@@@
 	mergechan.out \
 	pyrmask.out \
 	repos.out \
-	rleClock.out \
 	rleaddcom.out \
 	rlebg.out \
 	rlebox.out \
@@@@ -49,7 +48,7 @@@@
 ALLDIRS = clock
 
 # Default is what is to be made if nothing is specified.
-default: $(PGMS)
+default: $(PGMS) rleClock.out
 
 # Everything depends on the rle headers and libraries.
 $(PGMS): $(RI)/rle.h $(RI)/rle_config.h
@@@@ -62,30 +61,27 @@@@
 pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h
 	$(CC) $(CFLAGS) pyrlib.c -c
 pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h
-	$(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
-	mv pyrmask.new pyrmask.out
+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} pyrmask.c pyrlib.o ../lib/librle.la -lm -o pyrmask.out
 
 fant.out: fant.o mallocNd.o
-	$(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
-	mv fant.new fant.out
+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} fant.o mallocNd.o ../lib/librle.la -lm -o fant.out
 	
 # rlebox and crop use some common code.
 rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h
 
 crop.out: crop.c rle_box.o
-	${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
-	mv crop.new crop.out
+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} crop.c rle_box.o ../lib/librle.la -lm -o crop.out
 rlebox.out: rlebox.c rle_box.o
-	${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
-	mv rlebox.new rlebox.out
+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} rlebox.c rle_box.o ../lib/librle.la -lm -o rlebox.out
 
-# rleClock has it's own directory, must be built special
+# rleClock has its own directory, must be built specially
 
 rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c
-	(cd clock ; make)
+	(cd clock ; $(MAKE))
 
 # Incremental install, copies everything ("$?") since last install to DEST dir.
 install: $(PGMS) install-pgm
+	(cd clock ; $(MAKE) install)
 	touch install
 
 # Clean up installed stuff and binaries
@@@@ -100,8 +96,7 @@@@
 .SUFFIXES:
 .SUFFIXES: .out .c .o
 .c.out:
-	$(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new
-	mv $*.new $@@
+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} $< ../lib/librle.la -lm -o $*.out
 
 .c.o:
-	$(CC) -c $(CFLAGS) $<
+	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -c $<
@


1.2
log
@Knock another 2 off the non-building list.

Convert this package to use libtool, much against my better judgement.
However, it slots in much more easily than the BSD *.mk structure here.
@
text
@d1 1
a1 1
$NetBSD: patch-an,v 1.1 1999/11/22 11:11:33 agc Exp $
d3 20
a22 3
--- tools/makefile.src	Tue Jan 28 15:47:42 1992
+++ tools/makefile.src	Sat Sep 16 10:33:14 1995
@@@@ -62,24 +62,24 @@@@
d27 2
a28 2
+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} pyrmask.c pyrlib.o ../lib/librle.la -lm -o pyrmask.new
 	mv pyrmask.new pyrmask.out
d32 2
a33 2
+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} fant.o mallocNd.o ../lib/librle.la -lm -o fant.new
 	mv fant.new fant.out
d40 2
a41 2
+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} crop.c rle_box.o ../lib/librle.la -lm -o crop.new
 	mv crop.new crop.out
d44 2
a45 2
+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} rlebox.c rle_box.o ../lib/librle.la -lm -o rlebox.new
 	mv rlebox.new rlebox.out
d51 10
a60 2
 	(cd clock ; make)
@@@@ -100,8 +100,8 @@@@
d65 2
a66 2
+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} $< ../lib/librle.la -lm -o $*.new
 	mv $*.new $@@
@


1.1
log
@Split patches one per source file.
Remove fuzz from patches.
Remove PATCH_FUZZ_FACTOR definition.
@
text
@d1 1
a1 1
$NetBSD$
d5 8
a12 1
@@@@ -68,7 +68,7 @@@@
d14 2
a15 1
 	$(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
d17 1
a17 2
-	
+
d21 11
a31 2
@@@@ -82,7 +82,7 @@@@
 # rleClock has it's own directory, must be built special
d34 8
a41 2
-	(cd clock ; make)
+	(cd clock ; $(MAKE))
d43 3
a45 2
 # Incremental install, copies everything ("$?") since last install to DEST dir.
 install: $(PGMS) install-pgm
@