5 files changed, 30 insertions, 42 deletions

diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 0a0bf260281b..9424259fa8ab 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -7,45 +7,16 @@
 #
 
 PORTNAME=	libdvdcss
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.videolan.org/pub/videolan/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt \
-		mad:${PORTSDIR}/audio/mad \
-		SDL-1.1:${PORTSDIR}/devel/sdl12
-
 USE_XLIB=	yes
-WANT_ESOUND=	yes
-WANT_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-release
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
-post-patch:
-	@${PERL} -pi -e 's|(LIBDVDCSS_VERSION=)"[\d\.]+?\.(\d)"|\1"\2"|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e 's|^.+?ln.+?FULL_SO.+?MAJOR_SO.+\n||' \
-		${WRKSRC}/extras/libdvdcss/Makefile
-
-.include <bsd.port.pre.mk>
-
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
-CONFIGURE_ARGS+=	--enable-esd
-.endif
-
-.if defined(HAVE_GTK)
-USE_GTK=	yes
-.else
-CONFIGURE_ARGS+=	--disable-gtk
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/libdvdcss/distinfo b/multimedia/libdvdcss/distinfo
index 70495dfc2d8e..d4db3e0ae50b 100644
--- a/multimedia/libdvdcss/distinfo
+++ b/multimedia/libdvdcss/distinfo
@@ -1 +1 @@
-MD5 (libdvdcss-1.0.1.tar.gz) = 19752a010e2353b60d04e00f5da69ae3
+MD5 (libdvdcss-1.1.0.tar.gz) = cbfc7f9ef395c2be476917daf218ee40
diff --git a/multimedia/libdvdcss/files/patch-ltmain.sh b/multimedia/libdvdcss/files/patch-ltmain.sh
new file mode 100644
index 000000000000..f40e58a40428
--- /dev/null
+++ b/multimedia/libdvdcss/files/patch-ltmain.sh
@@ -0,0 +1,16 @@
+--- ltmain.sh.orig	Tue Apr 16 17:17:17 2002
++++ ltmain.sh	Tue Apr 16 17:17:55 2002
+@@ -4246,11 +4246,13 @@
+ 	  IFS="$save_ifs"
+ 	fi
+ 
++	if /usr/bin/false; then
+ 	# Install the pseudo-library for information purposes.
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/multimedia/libdvdcss/files/patch-extras::libdvdcss::videolan::dvdcss.h b/multimedia/libdvdcss/files/patch-src:dvdcss:dvdcss.h
index c44bc3629b10..bbc604274187 100644
--- a/multimedia/libdvdcss/files/patch-extras::libdvdcss::videolan::dvdcss.h
+++ b/multimedia/libdvdcss/files/patch-src:dvdcss:dvdcss.h
@@ -1,16 +1,17 @@
---- extras/libdvdcss/videolan/dvdcss.h.orig	Sun Oct 14 20:58:16 2001
-+++ extras/libdvdcss/videolan/dvdcss.h	Sun Oct 14 20:59:33 2001
-@@ -22,6 +22,8 @@
+--- src/dvdcss/dvdcss.h.orig	Tue Apr 16 16:04:36 2002
++++ src/dvdcss/dvdcss.h	Tue Apr 16 16:05:06 2002
+@@ -22,6 +22,9 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
   *****************************************************************************/
  
-+#ifndef		__DVDCSS_H__
-+#define		__DVDCSS_H__	1
++#ifndef	__DVDCSS_H__
++#define	__DVDCSS_H__
++
  /*****************************************************************************
   * The libdvdcss structure
   *****************************************************************************/
-@@ -59,3 +61,4 @@
+@@ -62,3 +65,4 @@
                                      int i_flags );
  extern char *        dvdcss_error ( dvdcss_handle );
  
-+#endif
++#endif	/* __DVDCSS_H__ */
diff --git a/multimedia/libdvdcss/pkg-plist b/multimedia/libdvdcss/pkg-plist
index 808b0a3c1128..82d60660a72c 100644
--- a/multimedia/libdvdcss/pkg-plist
+++ b/multimedia/libdvdcss/pkg-plist
@@ -1,5 +1,5 @@
-include/videolan/dvdcss.h
-@dirrm include/videolan
+include/dvdcss/dvdcss.h
 lib/libdvdcss.a
 lib/libdvdcss.so
-lib/libdvdcss.so.1
+lib/libdvdcss.so.2
+@dirrm include/dvdcss