Linux needs -ldl in all cases (from PR 37587).

Add DESTDIR support.

6 files changed, 82 insertions, 35 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 4d55206e295..6582dbac13c 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/08/02 21:53:05 dbj Exp $
+# $NetBSD: Makefile,v 1.34 2007/12/22 00:05:25 joerg Exp $
 
 DISTNAME=	ffmpeg-0.4.9-pre1
 PKGNAME=	ffmpeg-0.4.9pre1
@@ -10,6 +10,8 @@ MAINTAINER=	zul@NetBSD-fr.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	MPEG decoding, encoding and streaming software
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 USE_TOOLS+=	gmake texi2html pod2man
@@ -31,25 +33,21 @@ CONFIGURE_ARGS+=	--enable-pp --disable-vhook --disable-debug
 CONFIGURE_ARGS+=	--enable-gpl
 CONFIGURE_ARGS+=	--enable-ffplay
 
+INSTALLATION_DIRS=	include/ffmpeg/libpostproc lib \
+			share/examples/ffmpeg share/doc/ffmpeg
+
 .include "options.mk"
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ffmpeg \
-		${PREFIX}/share/doc/ffmpeg \
-		${PREFIX}/include/ffmpeg/libpostproc
 	${INSTALL_DATA} ${WRKSRC}/libavcodec/apiexample.c \
-		${PREFIX}/share/doc/ffmpeg
+		${DESTDIR}${PREFIX}/share/doc/ffmpeg
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \
-		${PREFIX}/share/doc/ffmpeg
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/ffmpeg
+		${DESTDIR}${PREFIX}/share/doc/ffmpeg
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/ffmpeg
 	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
-		${PREFIX}/share/examples/ffmpeg
-	# ffplay not installed
-	if [ -f ${PREFIX}/${PKGMANDIR}/man1/ffplay.1 ]; then \
-	${RM} ${PREFIX}/${PKGMANDIR}/man1/ffplay.1 ; \
-	fi
+		${DESTDIR}${PREFIX}/share/examples/ffmpeg
 	${INSTALL_DATA} ${WRKSRC}/libavcodec/libpostproc/postprocess.h \
-		${PREFIX}/include/ffmpeg/libpostproc
+		${DESTDIR}${PREFIX}/include/ffmpeg/libpostproc
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index eac900515fe..b5b07317ed5 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.13 2007/08/02 21:48:33 dbj Exp $
+$NetBSD: distinfo,v 1.14 2007/12/22 00:05:25 joerg Exp $
 
 SHA1 (ffmpeg-0.4.9-pre1.tar.gz) = aad00445137520bec19e56bcb042e75a10c53bb3
 RMD160 (ffmpeg-0.4.9-pre1.tar.gz) = fd682846f97ada32951af7844e185c42783189a4
 Size (ffmpeg-0.4.9-pre1.tar.gz) = 1611332 bytes
-SHA1 (patch-aa) = c1cbba3599d495e70bc26edd026e18e0f5101070
+SHA1 (patch-aa) = 9211ce3acfccf8c543ffea4a99e10413742aaaea
 SHA1 (patch-ab) = 15c7def153b0854169f36ebc7c1e8ae49a0268ea
-SHA1 (patch-ac) = 176a15b8c55f14269b5cb0123b4c88a52e9de19e
-SHA1 (patch-ad) = 933d57aea5721c4562773b97086ff672bd2a4ea9
-SHA1 (patch-ae) = a6e5452b1590a9cdc2a50b4579c88855e3952fdd
+SHA1 (patch-ac) = cae476460362637186a1ba31fbec4434b18e8dc8
+SHA1 (patch-ad) = c822a8141842c5bceeb4aaadfcb69b2dd200311a
+SHA1 (patch-ae) = 3a7b0422684f2e7174b52a08a4932aa937574af3
 SHA1 (patch-af) = 82f7e656ab01320235c85e98ec4c57277956ceb8
 SHA1 (patch-ag) = 69656d16d44d3321bdf9b790e6263db1529d2c99
 SHA1 (patch-ah) = 3b600dd8d5bc0d4363139cea0ba8338691d8fa75
diff --git a/multimedia/ffmpeg/patches/patch-aa b/multimedia/ffmpeg/patches/patch-aa
index 7d0e1f7f535..7947e58f8a1 100644
--- a/multimedia/ffmpeg/patches/patch-aa
+++ b/multimedia/ffmpeg/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2007/08/02 21:48:34 dbj Exp $
+$NetBSD: patch-aa,v 1.7 2007/12/22 00:05:25 joerg Exp $
 
---- configure.orig	2004-07-05 11:06:16.000000000 -0700
-+++ configure	2007-08-02 12:56:27.000000000 -0700
+--- configure.orig	2004-07-05 21:06:16.000000000 +0300
++++ configure
 @@ -224,11 +224,10 @@ FFSLDFLAGS=""
  need_inet_aton="yes"
  extralibs="$extralibs -lsocket -lnsl"
@@ -23,3 +23,13 @@ $NetBSD: patch-aa,v 1.6 2007/08/02 21:48:34 dbj Exp $
  SHFLAGS="-dynamiclib"
  extralibs=""
  darwin="yes"
+@@ -1140,8 +1138,8 @@ fi
+ if test "$vhook" = "yes" ; then
+   echo "BUILD_VHOOK=yes" >> config.mak
+   echo "#define HAVE_VHOOK 1" >> $TMPH
+-  extralibs="$extralibs $ldl"
+ fi
++extralibs="$extralibs $ldl"
+ if test "$lshared" = "yes" ; then
+   echo "BUILD_SHARED=yes" >> config.mak
+   echo "PIC=-fPIC" >> config.mak
diff --git a/multimedia/ffmpeg/patches/patch-ac b/multimedia/ffmpeg/patches/patch-ac
index 18c3cc94e87..7dfe0239b1b 100644
--- a/multimedia/ffmpeg/patches/patch-ac
+++ b/multimedia/ffmpeg/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2007/08/02 21:48:34 dbj Exp $
+$NetBSD: patch-ac,v 1.5 2007/12/22 00:05:25 joerg Exp $
 
 --- Makefile.orig	2004-07-08 13:02:04.000000000 +0200
 +++ Makefile
@@ -83,14 +83,26 @@ $NetBSD: patch-ac,v 1.4 2007/08/02 21:48:34 dbj Exp $
  install: all install-man $(INSTALLVHOOK)
 -	$(MAKE) -C libavcodec install
 -	$(MAKE) -C libavformat install
+-	install -d "$(bindir)"
+-	install -c -s -m 755 $(PROG) "$(bindir)"
 +	$(MAKE) -C libavcodec install install-headers
 +	$(MAKE) -C libavformat install install-headers
- 	install -d "$(bindir)"
--	install -c -s -m 755 $(PROG) "$(bindir)"
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROG) "$(bindir)"
++	install -d "${DESTDIR}$(bindir)"
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(bindir)
  
  # create the window installer
  wininstaller: all install
+@@ -135,8 +128,8 @@ wininstaller: all install
+ install-man:
+ ifneq ($(CONFIG_WIN32),yes)
+ 	if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \
+-	    install -d "$(mandir)/man1" ; \
+-	    install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
++	    install -d "${DESTDIR}$(mandir)/man1" ; \
++	    install -m 644 $(MANPAGE) "${DESTDIR}$(mandir)/man1" ; \
+ 	fi
+ endif
+ 
 @@ -159,15 +152,15 @@ endif
  .depend: $(SRCS)
  	$(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend
diff --git a/multimedia/ffmpeg/patches/patch-ad b/multimedia/ffmpeg/patches/patch-ad
index ac4365dd875..6f05ce0b0dd 100644
--- a/multimedia/ffmpeg/patches/patch-ad
+++ b/multimedia/ffmpeg/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.5 2007/08/02 21:48:34 dbj Exp $
+$NetBSD: patch-ad,v 1.6 2007/12/22 00:05:25 joerg Exp $
 
---- libavformat/Makefile.orig	2004-04-24 08:16:23.000000000 -0700
-+++ libavformat/Makefile	2007-08-02 10:47:18.000000000 -0700
+--- libavformat/Makefile.orig	2004-04-24 17:16:23.000000000 +0200
++++ libavformat/Makefile
 @@ -6,7 +6,7 @@ include ../config.mak
  
  VPATH=$(SRC_PATH)/libavformat
@@ -28,7 +28,7 @@ $NetBSD: patch-ad,v 1.5 2007/08/02 21:48:34 dbj Exp $
  SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
  
 +install: all
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIB:.a=.la) ${DESTDIR}$(prefix)/lib
 +
  all: $(LIB) $(SLIB)
  
@@ -50,8 +50,17 @@ $NetBSD: patch-ad,v 1.5 2007/08/02 21:48:34 dbj Exp $
  ifeq ($(BUILD_SHARED),yes)
  install: all install-headers
  ifeq ($(CONFIG_WIN32),yes)
-@@ -124,11 +128,11 @@ install-headers:
-                 "$(prefix)/include/ffmpeg"
+@@ -117,18 +121,18 @@ installlib: all install-headers
+ 	install -m 644 $(LIB) $(prefix)/lib
+ 
+ install-headers:
+-	mkdir -p "$(prefix)/include/ffmpeg"
++	mkdir -p "${DESTDIR}$(prefix)/include/ffmpeg"
+ 	install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
+                 $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
+                 $(SRC_PATH)/libavformat/rtspcodes.h \
+-                "$(prefix)/include/ffmpeg"
++                "${DESTDIR}$(prefix)/include/ffmpeg"
  
  %.o: %.c
 -	$(CC) $(CFLAGS) -c -o $@ $< 
diff --git a/multimedia/ffmpeg/patches/patch-ae b/multimedia/ffmpeg/patches/patch-ae
index 452783be322..f76ddfa2d0d 100644
--- a/multimedia/ffmpeg/patches/patch-ae
+++ b/multimedia/ffmpeg/patches/patch-ae
@@ -1,7 +1,7 @@
--$NetBSD: patch-ae,v 1.7 2007/08/02 21:48:34 dbj Exp $
+$NetBSD: patch-ae,v 1.8 2007/12/22 00:05:25 joerg Exp $
 
---- libavcodec/Makefile.orig	2004-06-18 06:11:15.000000000 -0700
-+++ libavcodec/Makefile	2007-08-02 10:50:10.000000000 -0700
+--- libavcodec/Makefile.orig	2004-06-18 15:11:15.000000000 +0200
++++ libavcodec/Makefile
 @@ -7,7 +7,7 @@ include ../config.mak
  VPATH=$(SRC_PATH)/libavcodec
  
@@ -25,7 +25,7 @@
  TESTS= imgresample-test dct-test motion-test fft-test
  
 +install: all
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(prefix)/lib
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIB:.a=.la) ${DESTDIR}$(prefix)/lib
 +
  all: $(LIB) $(SLIB)
  
@@ -57,3 +57,21 @@
  
  dep:	depend
  
+@@ -278,14 +278,14 @@ install:
+ endif
+ 
+ installlib: all install-headers
+-	install -m 644 $(LIB) $(prefix)/lib
++	install -m 644 $(LIB) ${DESTDIR}$(prefix)/lib
+ 
+ install-headers:
+-	mkdir -p "$(prefix)/include/ffmpeg"
++	mkdir -p "${DESTDIR}$(prefix)/include/ffmpeg"
+ 	install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
+ 	               $(SRC_PATH)/libavcodec/common.h \
+ 	               $(SRC_PATH)/libavcodec/rational.h \
+-                "$(prefix)/include/ffmpeg"
++                ${DESTDIR}$(prefix)/include/ffmpeg
+ 
+ #
+ # include dependency files if they exist