Fix `make install; make deinstall; make install'.

2 files changed, 72 insertions, 5 deletions

diff --git a/graphics/clanlib/files/patch-sum b/graphics/clanlib/files/patch-sum
index 94cbd080bd2..6fa6ebf970f 100644
--- a/graphics/clanlib/files/patch-sum
+++ b/graphics/clanlib/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.8 2000/12/15 03:24:17 garbled Exp $
+$NetBSD: patch-sum,v 1.9 2000/12/15 04:00:14 wiz Exp $
 
 MD5 (patch-aa) = 7d4da0626e8296e6c23941dd92b6e6fa
 MD5 (patch-ab) = eb18fa66909286b953564dc7449f9428
@@ -7,5 +7,5 @@ MD5 (patch-ad) = 2d7a2fd9c8fa00ae009c56aaf9c69f20
 MD5 (patch-ae) = 2078f3e6f48d16a472207b5571d065bd
 MD5 (patch-af) = 842cb79cd277fa65e0e51942b5135189
 MD5 (patch-ag) = d45e2460769ba37f8bfe5c6a24df04ee
-MD5 (patch-ah) = 9b5c3e63043b4317f7013671320d7942
+MD5 (patch-ah) = cd4f0248f95095820b1aba403633bd7f
 MD5 (patch-ai) = 37ec8ef4fa913adf359dcd60cfc77107
diff --git a/graphics/clanlib/patches/patch-ah b/graphics/clanlib/patches/patch-ah
index 6b0dd6d6968..d90e52b7bdf 100644
--- a/graphics/clanlib/patches/patch-ah
+++ b/graphics/clanlib/patches/patch-ah
@@ -1,6 +1,73 @@
-$NetBSD: patch-ah,v 1.4 2000/12/15 03:13:06 garbled Exp $
---- Makefile.in.orig	Thu Dec 14 18:53:56 2000
-+++ Makefile.in	Thu Dec 14 19:01:56 2000
+$NetBSD: patch-ah,v 1.5 2000/12/15 04:00:15 wiz Exp $
+
+--- Makefile.in.orig	Sun Apr  9 14:17:58 2000
++++ Makefile.in
+@@ -261,43 +261,43 @@
+ 	@install -d $(BIN_PREFIX)
+ 	@install -d $(LIB_PREFIX)
+ 	@for i in `find Sources/API/* -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+-	@for i in `find Sources/API/* -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
++	@for i in `find Sources/API/* -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -c -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+ 	@echo "Libraries are being installed in $(LIB_PREFIX)."
+-	@install Libs/libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
++	@install -c Libs/libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+ 	@ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
+ 	@ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanCore.so
+ 	@if [ -f Libs/libclanGL.so ]; then \
+-		install Libs/libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
++		install -c Libs/libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
+ 		ln -s -f libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGL.so.$(D_VERSION_MAJOR); \
+ 		ln -s -f libclanGL.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGL.so; \
+ 	fi
+ 	@if [ -f Libs/libclanMagick.so ]; then \
+-		install Libs/libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
++		install -c Libs/libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
+ 		ln -s -f libclanMagick.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMagick.so.$(D_VERSION_MAJOR); \
+ 		ln -s -f libclanMagick.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMagick.so; \
+ 	fi
+ 	@if [ -f Libs/libclanMPEG.so ]; then \
+-		install Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
++		install -c Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
+ 		ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMPEG.so.$(D_VERSION_MAJOR); \
+ 		ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMPEG.so; \
+ 	fi
+ 	@if [ -f Libs/libclanLua.so ]; then \
+-		install Libs/libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
++		install -c Libs/libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
+ 		ln -s -f libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanLua.so.$(D_VERSION_MAJOR); \
+ 		ln -s -f libclanLua.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanLua.so; \
+ 	fi
+ 	@if [ -f Libs/libclanGUI.so ]; then \
+-		install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
++		install -c Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
+ 		ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR); \
+ 		ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGUI.so; \
+ 	fi
+ 	@if [ -f Libs/libclanMikMod.so ]; then \
+-		install Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
++		install -c Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
+ 		ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMikMod.so.$(D_VERSION_MAJOR); \
+ 		ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMikMod.so; \
+ 	fi
+ 	@if [ -f Libs/libclanPNG.so ]; then \
+-		install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
++		install -c Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX); \
+ 		ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR); \
+ 		ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanPNG.so; \
+ 	fi
+@@ -306,10 +306,10 @@
+ 		install -d $(TARGET_PREFIX); \
+ 		all_targets_var="$(ALL_TARGETS)"; \
+ 		for curtarget in $$all_targets_var; do \
+-			install $$curtarget $(TARGET_PREFIX);  \
++			install -c $$curtarget $(TARGET_PREFIX);  \
+ 		done; \
+ 	fi
+-	@install clanlib-config $(BIN_PREFIX)
++	@install -c clanlib-config $(BIN_PREFIX)
+ 
+ 	@echo ""
+ 	@echo "Installation complete, now run 'ldconfig' as root or point the"
 @@ -427,7 +427,7 @@
  	
  Libs/libclanPNG.so: Libs/libclanCore.so $(OBJF_LIB_PNG)