diff options
| author | tron <tron@pkgsrc.org> | 2010-03-14 21:44:49 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2010-03-14 21:44:49 +0000 |
| commit | db8086dbd78f2adc76732739986b080816ab9862 (patch) | |
| tree | cd0ba40787e5e8e65d22cdef0b8ae3683745f6d7 /multimedia | |
| parent | 1d2811560f529f7acf41d7afbad47d37ddb3c10a (diff) | |
| download | pkgsrc-db8086dbd78f2adc76732739986b080816ab9862.tar.gz | |
Fix installation on platforms where the "install-sh" package is used.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-ac | 25 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-ad | 33 |
3 files changed, 61 insertions, 1 deletions
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 4ca830d435e..286b818ddcf 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,10 +1,12 @@ -$NetBSD: distinfo,v 1.31 2009/09/25 11:10:21 tron Exp $ +$NetBSD: distinfo,v 1.32 2010/03/14 21:44:49 tron Exp $ SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219 RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1 SHA1 (patch-ab) = 1c1da33f47be51f75635a9667b0d7d8052945ba7 +SHA1 (patch-ac) = 05820de2ae81b4607ba782b0233fd1e087045b97 +SHA1 (patch-ad) = ebee8a9e3d5caa533459e1547690ee6c2f095018 SHA1 (patch-bktr) = fb57a4f5dc0d372eb3f40dac5b05ea7d1da45d7b SHA1 (patch-configure) = ec0ae3c27026b45d380ecea04ff22518bf652ec0 SHA1 (patch-powerpc) = 0eaf8d81164e1488fdb436d50909d0a633439e6a diff --git a/multimedia/ffmpeg/patches/patch-ac b/multimedia/ffmpeg/patches/patch-ac new file mode 100644 index 00000000000..3378074ef6c --- /dev/null +++ b/multimedia/ffmpeg/patches/patch-ac @@ -0,0 +1,25 @@ +$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 + diff --git a/multimedia/ffmpeg/patches/patch-ad b/multimedia/ffmpeg/patches/patch-ad new file mode 100644 index 00000000000..80b555239d8 --- /dev/null +++ b/multimedia/ffmpeg/patches/patch-ad @@ -0,0 +1,33 @@ +$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)" \ |