Sun Mar 14 21:44:49 2010 UTC ()
Fix installation on platforms where the "install-sh" package is used.


(tron)
diff -r1.31 -r1.32 pkgsrc/multimedia/ffmpeg/distinfo
diff -r0 -r1.7 pkgsrc/multimedia/ffmpeg/patches/patch-ac
diff -r0 -r1.8 pkgsrc/multimedia/ffmpeg/patches/patch-ad
cvs diff -r1.31 -r1.32 pkgsrc/multimedia/ffmpeg/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/distinfo 2009/09/25 11:10:21 1.31
+++ pkgsrc/multimedia/ffmpeg/Attic/distinfo 2010/03/14 21:44:49 1.32
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: distinfo,v 1.31 2009/09/25 11:10:21 tron Exp $ 1$NetBSD: distinfo,v 1.32 2010/03/14 21:44:49 tron Exp $
2 2
3SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219 3SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219
4RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a 4RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a
5Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes 5Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes
6SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1 6SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1
7SHA1 (patch-ab) = 1c1da33f47be51f75635a9667b0d7d8052945ba7 7SHA1 (patch-ab) = 1c1da33f47be51f75635a9667b0d7d8052945ba7
 8SHA1 (patch-ac) = 05820de2ae81b4607ba782b0233fd1e087045b97
 9SHA1 (patch-ad) = ebee8a9e3d5caa533459e1547690ee6c2f095018
8SHA1 (patch-bktr) = fb57a4f5dc0d372eb3f40dac5b05ea7d1da45d7b 10SHA1 (patch-bktr) = fb57a4f5dc0d372eb3f40dac5b05ea7d1da45d7b
9SHA1 (patch-configure) = ec0ae3c27026b45d380ecea04ff22518bf652ec0 11SHA1 (patch-configure) = ec0ae3c27026b45d380ecea04ff22518bf652ec0
10SHA1 (patch-powerpc) = 0eaf8d81164e1488fdb436d50909d0a633439e6a 12SHA1 (patch-powerpc) = 0eaf8d81164e1488fdb436d50909d0a633439e6a
File Added: pkgsrc/multimedia/ffmpeg/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.7 2010/03/14 21:44:49 tron Exp $

Fix installation using the "install-sh" the package.

--- Makefile.orig	Fri May 29 00:13:17 2009
+++ Makefile	Sun Mar 14 22:35:24 2010
@@ -93,15 +93,15 @@
 
 install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes)
 	install -d "$(BINDIR)"
-	install -c -m 755 $(PROGS) "$(BINDIR)"
+	install -c -c -m 755 $(PROGS) "$(BINDIR)"
 
 install-data: $(DATA_FILES)
 	install -d "$(DATADIR)"
-	install -m 644 $(DATA_FILES) "$(DATADIR)"
+	install -c -m 644 $(DATA_FILES) "$(DATADIR)"
 
 install-man: $(MANPAGES)
 	install -d "$(MANDIR)/man1"
-	install -m 644 $(MANPAGES) "$(MANDIR)/man1"
+	install -c -m 644 $(MANPAGES) "$(MANDIR)/man1"
 
 uninstall: uninstall-progs uninstall-data uninstall-man
File Added: pkgsrc/multimedia/ffmpeg/patches/Attic/patch-ad
$NetBSD: patch-ad,v 1.8 2010/03/14 21:44:49 tron Exp $

Fix installation using the "install-sh" the package.

--- subdir.mak.orig	Wed May 20 20:37:34 2009
+++ subdir.mak	Sun Mar 14 22:37:07 2010
@@ -64,7 +64,7 @@
 
 install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
 	install -d "$(SHLIBDIR)"
-	install -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+	install -c -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
 	$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
 	cd "$(SHLIBDIR)" && \
 		$(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
@@ -74,14 +74,14 @@
 
 install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
 	install -d "$(LIBDIR)"
-	install -m 644 $$< "$(LIBDIR)"
+	install -c -m 644 $$< "$(LIBDIR)"
 	$(LIB_INSTALL_EXTRA_CMD)
 
 install-headers::
 	install -d "$(INCINSTDIR)"
 	install -d "$(LIBDIR)/pkgconfig"
-	install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
-	install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
+	install -c -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
+	install -c -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
 
 uninstall-libs::
 	-rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \