6 files changed, 12 insertions, 114 deletions

diff --git a/graphics/libdvdread/Makefile b/graphics/libdvdread/Makefile
index 10b95728be06..b2868a2fb51e 100644
--- a/graphics/libdvdread/Makefile
+++ b/graphics/libdvdread/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	libdvdread
-PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTVERSION=	0.9.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
-MAINTAINER=	3d@FreeBSD.org
+MAINTAINER=	lioux@FreeBSD.org
 
 LIB_DEPENDS=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/graphics/libdvdcss
 
@@ -19,32 +18,21 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
-DOC_FILES=	AUTHORS NEWS README TODO
+DOC_FILES=	AUTHORS COPYING NEWS README TODO
 
 # ugly hack to have libdvdread directly depend on libdvdcss since
 # it already does for practical reasons even though not for compile
 # time ones
 DVDCSS_LIBVERSION=	2
 
-# optional CFLAGS safeness
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-USE_AUTOCONF=	yes
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure.in
-.endif
-
-pre-everything::
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-	@${ECHO_MSG} "====> If you want to enable optimizations, please define WITH_OPTIMIZED_CFLAGS"
-.endif
-
 post-patch:
 .for p in Makefile.in dvdread/Makefile.in src/Makefile.in
 	@${PERL} -pi -e 's|cd \$$\(top_srcdir\) && \$$\(AUTOMAKE\)|\#|; \
 		s|cd \$$\(srcdir\) && \$$\(ACLOCAL\)|\#|' ${WRKSRC}/${p}
 .endfor
 # update this in sync with libdvdcss shared library version
-	@${PERL} -pi -e 's|(libdvdcss.so).0|\1.${DVDCSS_LIBVERSION}|' \
-		${WRKSRC}/dvdread/dvd_reader.c
+	@${PERL} -pi -e 's|(libdvdcss.so).2|\1.${DVDCSS_LIBVERSION}|' \
+		${WRKSRC}/dvdread/dvd_input.c
 
 post-configure:
 	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
diff --git a/graphics/libdvdread/distinfo b/graphics/libdvdread/distinfo
index 598ac964fc18..dc0371e87a3a 100644
--- a/graphics/libdvdread/distinfo
+++ b/graphics/libdvdread/distinfo
@@ -1 +1 @@
-MD5 (libdvdread-0.9.2.tar.gz) = 8898bad22d8183233f5c3d814fff5151
+MD5 (libdvdread-0.9.3.tar.gz) = 761db1225098c0834485396d9285e5ff
diff --git a/graphics/libdvdread/files/extra-patch-configure.in b/graphics/libdvdread/files/extra-patch-configure.in
deleted file mode 100644
index a7659536f264..000000000000
--- a/graphics/libdvdread/files/extra-patch-configure.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.in.orig	Wed Oct 17 19:06:20 2001
-+++ configure.in	Wed Oct 17 19:06:41 2001
-@@ -9,36 +9,11 @@
- dnl GCC-specific flags
- if test x"$GCC" = x"yes"; then
- 
--    dnl -O2
-     changequote(<<,>>)
-     OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[s0-9]*//g;"`
-     changequote([,])
--    OPT_CFLAGS="$OPT_CFLAGS -O2"
-     AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
- 
--    dnl arch-specific flags
--    case "$host_alias" in
--    i?86-* | k?-*)
--        case "$host_alias" in
--        i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
--        i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
--        i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
--        i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
--        k6-*)   OPT_CFLAGS="$CFLAGS -mcpu=k6";;
--        esac
--        AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    sparc-*)
--        OPT_CFLAGS="$CFLAGS -mcpu=ultrasparc -mvis"
--        AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    esac
--else
--
--    dnl non-gcc flags - we probably need exact configuration triplets here.
--    case "$host_alias" in
--    sparc-sun-solaris*)
--        OPT_CFLAGS="$CFLAGS -xCC -xmemalign"
--        AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    esac
- fi
- 
- 
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 10b95728be06..b2868a2fb51e 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	libdvdread
-PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTVERSION=	0.9.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
-MAINTAINER=	3d@FreeBSD.org
+MAINTAINER=	lioux@FreeBSD.org
 
 LIB_DEPENDS=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/graphics/libdvdcss
 
@@ -19,32 +18,21 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
-DOC_FILES=	AUTHORS NEWS README TODO
+DOC_FILES=	AUTHORS COPYING NEWS README TODO
 
 # ugly hack to have libdvdread directly depend on libdvdcss since
 # it already does for practical reasons even though not for compile
 # time ones
 DVDCSS_LIBVERSION=	2
 
-# optional CFLAGS safeness
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-USE_AUTOCONF=	yes
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure.in
-.endif
-
-pre-everything::
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-	@${ECHO_MSG} "====> If you want to enable optimizations, please define WITH_OPTIMIZED_CFLAGS"
-.endif
-
 post-patch:
 .for p in Makefile.in dvdread/Makefile.in src/Makefile.in
 	@${PERL} -pi -e 's|cd \$$\(top_srcdir\) && \$$\(AUTOMAKE\)|\#|; \
 		s|cd \$$\(srcdir\) && \$$\(ACLOCAL\)|\#|' ${WRKSRC}/${p}
 .endfor
 # update this in sync with libdvdcss shared library version
-	@${PERL} -pi -e 's|(libdvdcss.so).0|\1.${DVDCSS_LIBVERSION}|' \
-		${WRKSRC}/dvdread/dvd_reader.c
+	@${PERL} -pi -e 's|(libdvdcss.so).2|\1.${DVDCSS_LIBVERSION}|' \
+		${WRKSRC}/dvdread/dvd_input.c
 
 post-configure:
 	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
index 598ac964fc18..dc0371e87a3a 100644
--- a/multimedia/libdvdread/distinfo
+++ b/multimedia/libdvdread/distinfo
@@ -1 +1 @@
-MD5 (libdvdread-0.9.2.tar.gz) = 8898bad22d8183233f5c3d814fff5151
+MD5 (libdvdread-0.9.3.tar.gz) = 761db1225098c0834485396d9285e5ff
diff --git a/multimedia/libdvdread/files/extra-patch-configure.in b/multimedia/libdvdread/files/extra-patch-configure.in
deleted file mode 100644
index a7659536f264..000000000000
--- a/multimedia/libdvdread/files/extra-patch-configure.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.in.orig	Wed Oct 17 19:06:20 2001
-+++ configure.in	Wed Oct 17 19:06:41 2001
-@@ -9,36 +9,11 @@
- dnl GCC-specific flags
- if test x"$GCC" = x"yes"; then
- 
--    dnl -O2
-     changequote(<<,>>)
-     OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[s0-9]*//g;"`
-     changequote([,])
--    OPT_CFLAGS="$OPT_CFLAGS -O2"
-     AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
- 
--    dnl arch-specific flags
--    case "$host_alias" in
--    i?86-* | k?-*)
--        case "$host_alias" in
--        i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
--        i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
--        i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
--        i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
--        k6-*)   OPT_CFLAGS="$CFLAGS -mcpu=k6";;
--        esac
--        AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    sparc-*)
--        OPT_CFLAGS="$CFLAGS -mcpu=ultrasparc -mvis"
--        AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    esac
--else
--
--    dnl non-gcc flags - we probably need exact configuration triplets here.
--    case "$host_alias" in
--    sparc-sun-solaris*)
--        OPT_CFLAGS="$CFLAGS -xCC -xmemalign"
--        AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    esac
- fi
- 
-