Add NetBSD RCS Ids.

Attempt to make the target directories ${PREFIX}-dependent.

1 files changed, 67 insertions, 96 deletions

diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa
index c2d5b37f33a..b791d782b80 100644
--- a/graphics/png/patches/patch-aa
+++ b/graphics/png/patches/patch-aa
@@ -1,96 +1,67 @@
-*** makefile.orig	Fri May 16 10:53:30 1997
---- makefile	Tue Jun 24 16:53:47 1997
-***************
-*** 5,33 ****
-  # Where the zlib library and include files are located
-  #ZLIBLIB=/usr/local/lib
-  #ZLIBINC=/usr/local/include
-! ZLIBLIB=../zlib
-! ZLIBINC=../zlib
-  
-! CC=cc
-! CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
-! LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-  
-  #RANLIB=echo
-  RANLIB=ranlib
-  
-  # where make install puts libpng.a and png.h
-! prefix=/usr/local
-  
-  OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
-  	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
-  	pngwtran.o pngmem.o pngerror.o pngpread.o
-  
-! all: libpng.a pngtest
-  
-  libpng.a: $(OBJS)
-  	ar rc $@  $(OBJS)
-  	$(RANLIB) $@
-  
-  pngtest: pngtest.o libpng.a
-  	$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
-  
---- 5,42 ----
-  # Where the zlib library and include files are located
-  #ZLIBLIB=/usr/local/lib
-  #ZLIBINC=/usr/local/include
-! #ZLIBLIB=../zlib
-! #ZLIBINC=../zlib
-  
-! VER=0.96
-! #CC=cc
-! #CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
-! LDFLAGS=-L. -lpng -lz -lm -static
-  
-  #RANLIB=echo
-  RANLIB=ranlib
-  
-  # where make install puts libpng.a and png.h
-! prefix=${PREFIX}
-  
-  OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
-  	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
-  	pngwtran.o pngmem.o pngerror.o pngpread.o
-  
-! .SUFFIXES: .c .so .o
-! 
-! .c.so:
-! 	${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-! 
-! all: libpng.a libpng.so.${VER}
-  
-  libpng.a: $(OBJS)
-  	ar rc $@  $(OBJS)
-  	$(RANLIB) $@
-  
-+ libpng.so.${VER}: $(OBJS:S/o$/so/g)
-+ 	${CC} -shared -Wl,-x -Wl,-assert -Wl,pure-text -o $@ $(OBJS:S/o$/so/g) -lz
-+ 
-  pngtest: pngtest.o libpng.a
-  	$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
-  
-***************
-*** 37,48 ****
-  install: libpng.a
-  	-@mkdir $(prefix)/include
-  	-@mkdir $(prefix)/lib
-! 	cp png.h $(prefix)/include
-! 	cp pngconf.h $(prefix)/include
-! 	chmod 644 $(prefix)/include/png.h
-! 	chmod 644 $(prefix)/include/pngconf.h
-! 	cp libpng.a $(prefix)/lib
-! 	chmod 644 $(prefix)/lib/libpng.a
-  
-  clean:
-  	rm -f *.o libpng.a pngtest pngout.png
---- 46,54 ----
-  install: libpng.a
-  	-@mkdir $(prefix)/include
-  	-@mkdir $(prefix)/lib
-! 	${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} png.h pngconf.h $(prefix)/include
-! 	${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} libpng.a libpng.so.${VER} $(prefix)/lib
-! 	ranlib $(prefix)/lib/libpng.a
-  
-  clean:
-  	rm -f *.o libpng.a pngtest pngout.png
+--- makefile.orig	Fri May 16 07:53:30 1997
++++ makefile	Thu Oct  2 16:48:59 1997
+@@ -5,29 +5,41 @@
+ # Where the zlib library and include files are located
+ #ZLIBLIB=/usr/local/lib
+ #ZLIBINC=/usr/local/include
+-ZLIBLIB=../zlib
+-ZLIBINC=../zlib
++#ZLIBLIB=../zlib
++#ZLIBINC=../zlib
+ 
+-CC=cc
+-CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
+-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
++VER=0.96
++#CC=cc
++#CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
++LDFLAGS=-L. -lpng -lz -lm -static
+ 
+ #RANLIB=echo
+ RANLIB=ranlib
+ 
+ # where make install puts libpng.a and png.h
+-prefix=/usr/local
++prefix=${PREFIX}
+ 
+ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
+ 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
+ 	pngwtran.o pngmem.o pngerror.o pngpread.o
+ 
+-all: libpng.a pngtest
++.SUFFIXES: .c .so .o
++
++.c.so:
++	${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
++
++all: libpng.a libpng.so.${VER}
+ 
+ libpng.a: $(OBJS)
+ 	ar rc $@  $(OBJS)
+ 	$(RANLIB) $@
+ 
++libpng.so.${VER}: $(OBJS:S/o$/so/g)
++	${LD} -Bshareable -o libpng.so.${VER} $(OBJS:S/o$/so/g)
++
++# XXX - agc - weird shared library load line
++#	${CC} -shared -Wl,-x -Wl,-assert -Wl,pure-text -o $@ $(OBJS:S/o$/so/g) -lz
++
+ pngtest: pngtest.o libpng.a
+ 	$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
+ 
+@@ -37,12 +49,9 @@
+ install: libpng.a
+ 	-@mkdir $(prefix)/include
+ 	-@mkdir $(prefix)/lib
+-	cp png.h $(prefix)/include
+-	cp pngconf.h $(prefix)/include
+-	chmod 644 $(prefix)/include/png.h
+-	chmod 644 $(prefix)/include/pngconf.h
+-	cp libpng.a $(prefix)/lib
+-	chmod 644 $(prefix)/lib/libpng.a
++	${BSD_INSTALL_DATA} png.h pngconf.h $(prefix)/include
++	${BSD_INSTALL_DATA} libpng.a libpng.so.${VER} $(prefix)/lib
++	ranlib $(prefix)/lib/libpng.a
+ 
+ clean:
+ 	rm -f *.o libpng.a pngtest pngout.png