Update to 0.1.9.

Submitted by:	Simon Barner <barner@in.tum.de>
		maintainer
Approved by:	maintainer

6 files changed, 50 insertions, 28 deletions

diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 387ccd3b4602..8f812e0ccba3 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libdvdnav
-PORTVERSION=	0.1.3
+PORTVERSION=	0.1.9
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dvd
@@ -19,7 +19,9 @@ LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--program-transform-name=''
 INSTALLS_SHLIB=	yes
+USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 
 post-patch:
@@ -27,6 +29,11 @@ post-patch:
 		's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
 		 s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
 		 s|-L/usr/local/lib|-L${LOCALBASE}/lib|g ; \
-		 s|-I/usr/local/include|-I${LOCALBASE}/include|g' ${WRKSRC}/configure
-
+		 s|-I/usr/local/include|-I${LOCALBASE}/include|g ; \
+		 s|aclocal-1.7|aclocal17|g ; \
+		 s|automake-1.7|automake17|g ; \
+		 s|autoconf|autoconf257|g ; \
+		 s|autoheader|autoheader257|g' ${WRKSRC}/configure \
+		 ${WRKSRC}/missing ${WRKSRC}/aclocal.m4 ${WRKSRC}/autogen.sh
+		
 .include <bsd.port.mk>
diff --git a/multimedia/libdvdnav/distinfo b/multimedia/libdvdnav/distinfo
index f565798ee960..21da405e6ce7 100644
--- a/multimedia/libdvdnav/distinfo
+++ b/multimedia/libdvdnav/distinfo
@@ -1 +1,2 @@
-MD5 (libdvdnav-0.1.3.tar.gz) = fcb07398ea7199189d82a1cdff86ee4b
+MD5 (libdvdnav-0.1.9.tar.gz) = 5b0d168d87f66f8c8d7b2b51e16ff9d8
+SIZE (libdvdnav-0.1.9.tar.gz) = 381749
diff --git a/multimedia/libdvdnav/files/patch-example:Makefile.in b/multimedia/libdvdnav/files/patch-example:Makefile.in
index ca251d2042e6..b06d67ee61fe 100644
--- a/multimedia/libdvdnav/files/patch-example:Makefile.in
+++ b/multimedia/libdvdnav/files/patch-example:Makefile.in
@@ -1,11 +1,11 @@
---- examples/Makefile.in.orig	Tue May 21 01:52:35 2002
-+++ examples/Makefile.in	Tue May 21 01:52:51 2002
-@@ -116,7 +116,7 @@
- LIBS = @LIBS@
- menus_OBJECTS =  menus.$(OBJEXT)
- menus_DEPENDENCIES =  $(top_builddir)/src/libdvdnav.la
--menus_LDFLAGS = 
-+menus_LDFLAGS = $(THREAD_LIBS)
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
+--- examples/Makefile.in.orig	Tue May 20 23:20:12 2003
++++ examples/Makefile.in	Thu Feb 12 20:44:41 2004
+@@ -151,7 +151,7 @@
+ noinst_PROGRAMS = menus
+ 
+ menus_SOURCES = menus.c
+-menus_LDFLAGS = -L$(top_srcdir)/src/
++menus_LDFLAGS = -L$(top_srcdir)/src/ $(THREAD_LIBS)
+ menus_LDADD = $(DVDNAV_LIB)
+ subdir = examples
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/multimedia/libdvdnav/files/patch-ltmain.sh b/multimedia/libdvdnav/files/patch-ltmain.sh
index 5608bb37c45f..a74679936e80 100644
--- a/multimedia/libdvdnav/files/patch-ltmain.sh
+++ b/multimedia/libdvdnav/files/patch-ltmain.sh
@@ -1,6 +1,6 @@
---- ltmain.sh.orig	Mon Aug  5 16:46:18 2002
-+++ ltmain.sh	Mon Aug  5 22:32:19 2002
-@@ -961,6 +961,7 @@
+--- ltmain.sh.orig	Tue May 20 23:20:02 2003
++++ ltmain.sh	Thu Feb 12 20:46:44 2004
+@@ -973,6 +973,7 @@
  	;;
  
        -avoid-version)
@@ -8,16 +8,16 @@
  	avoid_version=yes
  	continue
  	;;
-@@ -2507,7 +2508,7 @@
+@@ -2501,7 +2502,7 @@
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
+ 	    if test $build_libtool_need_lc = "yes"; then
 -	      deplibs="$deplibs -lc"
 +	      deplibs="$deplibs"
  	    fi
  	    ;;
  	  esac
-@@ -4329,10 +4330,12 @@
+@@ -4325,10 +4326,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/multimedia/libdvdnav/files/patch-src:vm.c b/multimedia/libdvdnav/files/patch-src:vm.c
new file mode 100644
index 000000000000..4c0c89a916bb
--- /dev/null
+++ b/multimedia/libdvdnav/files/patch-src:vm.c
@@ -0,0 +1,13 @@
+--- src/vm.c.orig	Fri Feb 20 00:49:57 2004
++++ src/vm.c	Fri Feb 20 00:54:31 2004
+@@ -47,6 +47,10 @@
+ #define lseek64 lseek
+ #endif /* _MSC_VER */
+ 
++#ifdef __FreeBSD__
++#define lseek64 lseek
++#endif
++
+ /*
+ #define STRICT
+ */
diff --git a/multimedia/libdvdnav/pkg-plist b/multimedia/libdvdnav/pkg-plist
index c774e257e512..eb7aba858ab8 100644
--- a/multimedia/libdvdnav/pkg-plist
+++ b/multimedia/libdvdnav/pkg-plist
@@ -1,13 +1,14 @@
 bin/dvdnav-config
-include/dvdnav/decoder.h
+include/dvdnav/dvd_reader.h
 include/dvdnav/dvd_types.h
+include/dvdnav/dvd_udf.h
 include/dvdnav/dvdnav.h
 include/dvdnav/dvdnav_events.h
-include/dvdnav/dvdnav_internal.h
-include/dvdnav/read_cache.h
-include/dvdnav/vm.h
-include/dvdnav/vmcmd.h
-lib/libdvdnav.so.1
+include/dvdnav/ifo_read.h
+include/dvdnav/ifo_types.h
+include/dvdnav/nav_print.h
+include/dvdnav/nav_read.h
+include/dvdnav/nav_types.h
 lib/libdvdnav.so
-share/aclocal/dvdnav.m4
+lib/libdvdnav.so.3
 @dirrm include/dvdnav