- Update to 0.9.8a3 (merged from -devel)

- Fix off by one error

PR:		ports/130128
Submitted by:	Joseph S. Atkinson <jsa@mephisto.wickedmachine.net> (maintainer)

1 files changed, 22 insertions, 46 deletions

diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index 7b06e305cc87..9d55b991499a 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -4,7 +4,7 @@
 # and will be autodetected to enable
 #
 # $FreeBSD$
-#   $MCom: ports-stable/multimedia/vlc/Makefile.inc,v 1.5 2009/01/09 23:41:21 mezz Exp $
+#   $MCom: ports-stable/multimedia/vlc-devel/Makefile.inc,v 1.4 2009/01/09 23:41:21 mezz Exp $
 #      $Id: Makefile.inc 6 2006-09-27 14:05:34Z buhnux $
 # If you define for example WITH_FAAD and WITHOUT_FAAD
 # the WITHOUT_ will always over ride the WITH_.
@@ -15,20 +15,14 @@
 #  Ncurses (console) interface
 #
 # WITH_SKINS
-#  This Interface supports a skinned gtk2.0 interface
+#  This Interface supports a skinned interface usable with winamp 2.x skins
 #  Skins can be found at http://www.videolan.org/vlc/download-skins.html
 #
-# WITHOUT_WXGTK=yes
-#  WxWidgets Interface
-#
 # Audio Knobs:
 #
 # WITH_ARTS=yes
 #  Arts Support
 #
-# WITHOUT_DAAP=yes
-#  Enable libopendaap to connect to iTunes(R) music shares.
-#
 # WITHOUT_DTS=yes
 #  DTS decoder Support
 #  useful for many dvds
@@ -46,7 +40,6 @@
 # WITH_FLAC=yes
 #  Flac Support
 #
-
 # WITHOUT_A52=yes
 #  liba52 audio support
 #
@@ -138,6 +131,9 @@
 #
 # Other Knobs:
 #
+# WITHOUT_LUA=yes
+#  Support for lua scripting (interfaces, HTML parsers for video websites...)
+#
 # WITHOUT_AVAHI=yes
 #  Avahi (Rendezvous/Bonjour (R) ) networking
 #
@@ -214,11 +210,9 @@
 #  Do not install Vlc's Documents
 #
 
-post-extract:
-# remove badly formatted pre-generated messages catalogs
-	${FIND} ${WRKSRC} -name "*.gmo" -delete
-
 post-patch:
+# Do not assume LOCALBASE is /usr/local
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
 # Subtitle default font
 	@${REINPLACE_CMD} -e \
 	's|/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf|${WITH_VLC_DEFAULT_FONT}|' \
@@ -226,48 +220,33 @@ post-patch:
 # mozilla plugin
 	@${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${FAKEDIR}/mozilla|; \
 		s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \
-			${WRKSRC}/mozilla/Makefile.in
-# s/Linux/FreeBSD/
-	@${REINPLACE_CMD} -e 's|Linux|FreeBSD|' \
-		${WRKSRC}/po/*
-	@${RM} -f ${WRKSRC}/po/*.bak
-	@${REINPLACE_CMD} -e 's|Linux OSS|FreeBSD OSS|' \
-		${WRKSRC}/modules/audio_output/oss.c
-# pthreads/cflags
-	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/' \
-		-e 's/-lc_r/${PTHREAD_LIBS}/' \
-		-e 's|-mcpu=pentiumpro||' \
-		${WRKSRC}/configure
+			${WRKSRC}/projects/mozilla/Makefile.in
 # cdrom/dvd support
 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \
 		s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
 		${WRKSRC}/include/vlc_config.h
-.if ${ARCH}=="i386" && defined(WITH_WIN32_CODECS)
+# binary decoders
 	@${REINPLACE_CMD} -e 's|-DWIN32_PATH=\\"\\"|-DWIN32_PATH=\\"${LOCALBASE}/lib/win32\\"|' \
-		${WRKSRC}/loader/Makefile.in
+		${WRKSRC}/libs/loader/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/lib/win32|${LOCALBASE}/lib/win32|' \
-		${WRKSRC}/loader/module.c
-.endif
-	@${REINPLACE_CMD} -e 's|dts_free|dca_free|g ; s|-ldts|-ldca|g' ${WRKSRC}/configure
-
-pre-build:
-	@${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \
-		${WRKSRC}/vlc-config
+		${WRKSRC}/libs/loader/module.c
 
 pre-install: build
 	${RM} -rf ${PLIST} ${FAKEDIR}
 	${MKDIR} ${FAKEDIR}
 	${TOUCH} -f ${PLIST}
 	${ECHO_CMD} "share/applications/vlc.desktop" >> ${PLIST}
+.if !defined(WITHOUT_QT4)
+	${ECHO_CMD} "share/pixmaps/qvlc.png" >> ${PLIST}
+	${ECHO_CMD} "share/applications/qvlc.desktop" >> ${PLIST}
+.endif
 .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
 	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
 	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
 .endif
-.if !defined(WITHOUT_WXGTK)
-	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
-	${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
-.endif
+.if defined(WITH_SKINS) || !defined(WITHOUT_QT)
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
+.endif
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
 	${RM} -f ${FAKEDIR}/share/locale/locale.alias
@@ -311,9 +290,6 @@ pre-install: build
 .endfor
 
 do-install:
-	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
-		${FAKEDIR}/bin/vlc-config
-	@${RM} -f ${FAKEDIR}/bin/*.bak
 	cd ${FAKEDIR}/bin && ${FIND} . | \
 		${CPIO} -vpdm -R ${BINOWN}:${BINGRP} ${PREFIX}/bin
 	cd ${FAKEDIR}/include && ${FIND} . | \
@@ -328,19 +304,19 @@ do-install:
 .endif
 	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
-.if defined(WITH_SKINS) || !defined(WITHOUT_WXGTK)
+.if (defined(WITH_SKINS) && defined(WITHOUT_SKINS)) || !defined(WITHOUT_QT4)
 	if [ ! -d ${PREFIX}/share/applications ]; then \
 		${MKDIR} ${PREFIX}/share/applications ; \
 	fi
 	if [ ! -d ${PREFIX}/share/pixmaps ]; then \
 		${MKDIR} ${PREFIX}/share/pixmaps ; \
 	fi
+.if !defined(WITHOUT_QT4)
+	${INSTALL_DATA} ${FILESDIR}/qvlc.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/qvlc.png
+.endif
 .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
 	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
 .endif
-.if !defined(WITHOUT_WXGTK)
-	${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
-.endif
 .endif