diff options
| author | lioux <lioux@FreeBSD.org> | 2005-12-04 18:51:30 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2005-12-04 18:51:30 +0800 |
| commit | 8f21726b00a94c7c4ef9cd768896f0e2ed0d06ed (patch) | |
| tree | ffd542155bc1b236425b7923000acc73801358fa /multimedia | |
| parent | 4f056f5f84c075a39ad0877dd4ef9602c955ece2 (diff) | |
| download | freebsd-ports-gnome-8f21726b00a94c7c4ef9cd768896f0e2ed0d06ed.tar.gz freebsd-ports-gnome-8f21726b00a94c7c4ef9cd768896f0e2ed0d06ed.tar.zst freebsd-ports-gnome-8f21726b00a94c7c4ef9cd768896f0e2ed0d06ed.zip | |
1) PLIST change: install ffmpeg's libavutil.pc pkgconfig under
${PREFIX}/libdata/pkgconfig instead of incorrect
${PREFIX}/lib/pkgconfig. This incidently fixes PLIST since
{PREFIX}/lib/pkgconfig dir can no longer forgotten behind.
2) Safer installion (no complains received regarding this): add
quotes around file/directory paths inside ffmpeg's Makefile.
Safety approach.
3) Bump PORTREVISION due to [1]
Submitted by: pointyhat (kris) [1]
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-libavformat::Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-libavutil__Makefile | 13 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/pkg-plist | 2 |
5 files changed, 19 insertions, 5 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index db4d5a959625..10449ae5c583 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 0.4.9.cvs.${RELEASE_DATE} +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} # http://mplayerhq.hu/MPlayer/cvs/ diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile index b5dc2d00d965..8f943ff510c0 100644 --- a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile +++ b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile @@ -19,8 +19,8 @@ "$(prefix)/include/ffmpeg" - install -d "$(libdir)/pkgconfig" - install -m 644 ../libavcodec.pc "$(libdir)/pkgconfig" -+ install -d $(prefix)/libdata/pkgconfig -+ ${BSD_INSTALL_DATA} ../libavcodec.pc $(prefix)/libdata/pkgconfig ++ install -d "$(prefix)/libdata/pkgconfig" ++ ${BSD_INSTALL_DATA} ../libavcodec.pc "$(prefix)/libdata/pkgconfig" # # include dependency files if they exist diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile index 3d3e577a1fc8..7b7a6875c6fd 100644 --- a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile +++ b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile @@ -21,8 +21,8 @@ "$(prefix)/include/ffmpeg" - install -d "$(libdir)/pkgconfig" - install -m 644 ../libavformat.pc "$(libdir)/pkgconfig" -+ install -d $(prefix)/libdata/pkgconfig -+ ${BSD_INSTALL_DATA} ../libavformat.pc $(prefix)/libdata/pkgconfig ++ install -d "$(prefix)/libdata/pkgconfig" ++ ${BSD_INSTALL_DATA} ../libavformat.pc "$(prefix)/libdata/pkgconfig" %.o: %.c $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< diff --git a/multimedia/ffmpeg-devel/files/patch-libavutil__Makefile b/multimedia/ffmpeg-devel/files/patch-libavutil__Makefile new file mode 100644 index 000000000000..e983e1dafb3a --- /dev/null +++ b/multimedia/ffmpeg-devel/files/patch-libavutil__Makefile @@ -0,0 +1,13 @@ +--- libavutil/Makefile.orig Sun Dec 4 08:22:19 2005 ++++ libavutil/Makefile Sun Dec 4 08:23:22 2005 +@@ -84,8 +84,8 @@ + $(SRC_PATH)/libavutil/rational.h \ + $(SRC_PATH)/libavutil/intfloat_readwrite.h \ + "$(prefix)/include/ffmpeg" +- install -d "$(libdir)/pkgconfig" +- install -m 644 ../libavutil.pc "$(libdir)/pkgconfig" ++ install -d "$(prefix)/libdata/pkgconfig" ++ install -m 644 ../libavutil.pc "$(prefix)/libdata/pkgconfig" + + # + # include dependency files if they exist diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist index 862289814250..6a6133c87766 100644 --- a/multimedia/ffmpeg-devel/pkg-plist +++ b/multimedia/ffmpeg-devel/pkg-plist @@ -22,6 +22,6 @@ lib/libavutil-CVS.so lib/libavutil.a lib/libavutil.so lib/libavutil.so.%%SHLIB_VERSION%% -lib/pkgconfig/libavutil.pc +libdata/pkgconfig/libavutil.pc libdata/pkgconfig/libavcodec.pc libdata/pkgconfig/libavformat.pc |