1 files changed, 8 insertions, 22 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 3fbd31fcf404..8b08ac9636a2 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -25,9 +25,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
 		texi2html:${PORTSDIR}/textproc/texi2html
 
-CONFLICTS=	ffmpeg-0.7*
-
-LATEST_LINK=	ffmpeg-devel
+LATEST_LINK=	ffmpeg${PKGNAMESUFFIX}
 
 GIT_SNAPSHOT=	388243bb27f3d9b8f50d54268a784d55a7171f10
 GIT_SUFFIX=	${GIT_SNAPSHOT:C/^(.......).*$/\1/g}
@@ -62,16 +60,13 @@ OPENAL_DESC=	OpenAL 1.1 capture support
 X11GRAB_DESC=	Enable x11 grabbing
 
 FFPROGS=	ffmpeg ffprobe
-FFLIBS=		libavcodec libavdevice libavfilter libavformat \
-		libavutil libpostproc libswresample libswscale
-INSTALL_TARGET=	install-data install-libs install-headers
-FFMPEG_SUFFIX=	-head
+INSTALL_TARGET=	install-progs install-data install-libs install-headers
+FFMPEG_SUFFIX=	-devel
 PLIST_SUB+=	SUFF="${FFMPEG_SUFFIX}"
 MAN1=		ffmpeg${FFMPEG_SUFFIX}.1 ffprobe${FFMPEG_SUFFIX}.1
 
-SHLIB_VER=	99
-PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
 USE_LDCONFIG=	${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.options.mk>
 
@@ -100,6 +95,8 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
 		--shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
 		--datadir="${DATADIR}" \
+		--build-suffix="${FFMPEG_SUFFIX}" \
+		--progs-suffix="${FFMPEG_SUFFIX}" \
 		--enable-shared \
 		--enable-gpl \
 		--enable-postproc \
@@ -364,7 +361,7 @@ CONFIGURE_ARGS+=	--disable-libschroedinger
 # sdl
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
-PLIST_FILES+=	bin/ffplay
+PLIST_FILES+=	bin/ffplay${FFMPEG_SUFFIX}
 FFPROGS+=	ffplay
 MAN1+=	ffplay${FFMPEG_SUFFIX}.1
 .if ${PORT_OPTIONS:MDOCS}
@@ -487,7 +484,7 @@ post-patch:
 		s|-pthread|${PTHREAD_LIBS}|g; \
 		s|gsm/gsm.h|gsm.h|g" \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
+	@${REINPLACE_CMD} -e 's|-ldl||' \
 		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
@@ -508,18 +505,7 @@ post-configure:
 		${WRKSRC}/config.mak
 .endif
 
-pre-install:
-.for PROG in ${FFPROGS}
-	@${MKDIR} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/${PROG} ${PREFIX}/bin/${PROG}${FFMPEG_SUFFIX}
-.endfor
-
 post-install:
-.for LIB in ${FFLIBS}
-	@${MKDIR} ${PREFIX}/libdata/pkgconfig
-	@${INSTALL_DATA} ${WRKSRC}/${LIB}/${LIB}.pc \
-		${PREFIX}/libdata/pkgconfig/${LIB}${FFMPEG_SUFFIX}.pc
-.endfor
 .for PROG in ${FFPROGS}
 	@${MKDIR} ${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/${PROG}.1 ${MAN1PREFIX}/man/man1/${PROG}${FFMPEG_SUFFIX}.1