diff -aurN libdvdnav-mplayer.orig/Makefile libdvdnav-mplayer/Makefile --- libdvdnav-mplayer.orig/Makefile 2008-08-17 08:12:16.000000000 +0200 +++ libdvdnav-mplayer/Makefile 2008-10-04 13:06:46.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= libdvdnav-mplayer -PORTVERSION= 4.1.2 +PORTVERSION= 4.1.3 CATEGORIES= multimedia MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/ \ http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/ \ @@ -18,19 +18,20 @@ DISTNAME= libdvdnav-${PORTVERSION} MAINTAINER= ganael.laplanche@martymac.com -COMMENT= Mplayer fork of the lidvdnav project +COMMENT= Mplayer version of the lidvdnav project -LIB_DEPENDS= dvdread.5:${PORTSDIR}/multimedia/libdvdread +LIB_DEPENDS= dvdread.4:${PORTSDIR}/multimedia/libdvdread-mplayer +USE_BZIP2= yes CFLAGS+= "-I${LOCALBASE}/include" LDFLAGS+= "-L${LOCALBASE}/lib" HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure2 CONFIGURE_ARGS= --prefix="${PREFIX}" \ --libdir="${PREFIX}/lib" \ + --libdatadir="${PREFIX}/libdata/pkgconfig" \ --shlibdir="${PREFIX}/lib" \ --incdir="${PREFIX}/include/dvdnav" \ - --with-dvdread="${LOCALBASE}/include/dvdread" \ --disable-opts \ --disable-debug \ --extra-cflags="${CFLAGS}" \ @@ -42,7 +43,7 @@ post-patch: @${REINPLACE_CMD} -e 's|-ldl ||g' \ ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|threadlib="-lpthread"|threadlib="${PTHREAD_LIBS}"|g' \ + @${REINPLACE_CMD} -e 's|^threadlib="-lpthread"|threadlib="${PTHREAD_LIBS}"|g' \ ${WRKSRC}/configure2 .include diff -aurN libdvdnav-mplayer.orig/distinfo libdvdnav-mplayer/distinfo --- libdvdnav-mplayer.orig/distinfo 2008-08-17 08:12:16.000000000 +0200 +++ libdvdnav-mplayer/distinfo 2008-10-03 11:23:29.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (libdvdnav-4.1.2.tar.gz) = 0e9a494403f9f5a2e781252c77599561 -SHA256 (libdvdnav-4.1.2.tar.gz) = 56bcb75113bb8091574c36590f84fb00d37711e8cda9f5f7152667b33b2d0cd1 -SIZE (libdvdnav-4.1.2.tar.gz) = 196223 +MD5 (libdvdnav-4.1.3.tar.bz2) = d62383c45b28816771e283515f2c27fa +SHA256 (libdvdnav-4.1.3.tar.bz2) = e82a3d7b3c342a895a332fc0fb2281f40ff9978cb8cbb8bf1343fcad0063759d +SIZE (libdvdnav-4.1.3.tar.bz2) = 110843 diff -aurN libdvdnav-mplayer.orig/files/patch-Makefile libdvdnav-mplayer/files/patch-Makefile --- libdvdnav-mplayer.orig/files/patch-Makefile 2008-08-17 08:12:16.000000000 +0200 +++ libdvdnav-mplayer/files/patch-Makefile 2008-10-04 12:36:41.000000000 +0200 @@ -1,11 +1,16 @@ ---- Makefile.orig 2008-08-11 07:48:09.644830172 +0200 -+++ Makefile 2008-08-11 07:48:56.632122342 +0200 -@@ -101,7 +101,7 @@ - cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -L. -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) -ldvdread $(THREADLIB) - else - ${SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS) -- cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) -ldvdread $(THREADLIB) -+ cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) $(LDFLAGS) -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) -ldvdread $(THREADLIB) - endif - ${MINI_SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS) - cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(MINI_SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) $(THREADLIB) +--- Makefile.orig 2008-10-04 12:25:15.145677557 +0200 ++++ Makefile 2008-10-04 12:36:23.806607647 +0200 +@@ -131,10 +131,9 @@ + $(pcedit) $< > $@ + + install-pkgconfig: $(.OBJDIR)/dvdnav.pc $(.OBJDIR)/dvdnavmini.pc +- install -d $(DESTDIR)$(libdir)/pkgconfig +- install -m 0644 $(.OBJDIR)/dvdnav.pc $(DESTDIR)$(libdir)/pkgconfig +- install -m 0644 $(.OBJDIR)/dvdnavmini.pc \ +- $(DESTDIR)$(libdir)/pkgconfig ++ install -d $(DESTDIR)$(libdatadir) ++ install -m 0644 $(.OBJDIR)/dvdnav.pc $(DESTDIR)$(libdatadir) ++ install -m 0644 $(.OBJDIR)/dvdnavmini.pc $(DESTDIR)$(libdatadir) + + distclean: clean + find . -name "*~" | xargs rm -rf diff -aurN libdvdnav-mplayer.orig/files/patch-configure2 libdvdnav-mplayer/files/patch-configure2 --- libdvdnav-mplayer.orig/files/patch-configure2 1970-01-01 01:00:00.000000000 +0100 +++ libdvdnav-mplayer/files/patch-configure2 2008-10-04 12:35:14.000000000 +0200 @@ -0,0 +1,35 @@ +--- configure2.orig 2008-10-04 12:27:58.564694499 +0200 ++++ configure2 2008-10-04 12:35:04.406225755 +0200 +@@ -26,6 +26,7 @@ + echo " --help print this message" + echo " --prefix=PREFIX install in PREFIX [$PREFIX]" + echo " --libdir=DIR install libs in DIR [PREFIX/lib]" ++ echo " --libdatadir=DIR install pkgconfig files in DIR [PREFIX/lib/pkgconfig]" + echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]" + echo " --incdir=DIR install includes in DIR [PREFIX/include/dvdnav]" + echo " --enable-static build static libraries [default=yes]" +@@ -72,6 +73,8 @@ + ;; + --libdir=*) libdir="$optval" + ;; ++ --libdatadir=*) libdatadir="$optval" ++ ;; + --shlibdir=*) shlibdir="$optval" + ;; + --incdir=*) incdir="$optval" +@@ -100,6 +103,7 @@ + PREFIX=`cd $PREFIX && pwd` + + test -z "$libdir" && libdir=$PREFIX/lib ++test -z "$libdatadir" && libdir=$PREFIX/lib/pkgconfig + test -z "$shlibdir" && shlibdir=$PREFIX/lib + test -z "$incdir" && incdir=$PREFIX/include/dvdnav + +@@ -127,6 +131,7 @@ + # Automatically generated by configure, do not edit + PREFIX=$PREFIX + libdir=$libdir ++libdatadir=$libdatadir + shlibdir=$shlibdir + incdir=$incdir + THREADLIB=$threadlib diff -aurN libdvdnav-mplayer.orig/pkg-descr libdvdnav-mplayer/pkg-descr --- libdvdnav-mplayer.orig/pkg-descr 2008-08-17 08:12:16.000000000 +0200 +++ libdvdnav-mplayer/pkg-descr 2008-10-04 13:06:54.000000000 +0200 @@ -1,3 +1,3 @@ -Mplayer fork of the libdvdnav project. +Mplayer version of the libdvdnav project. WWW: http://www.mplayerhq.hu/MPlayer/releases/dvdnav diff -aurN libdvdnav-mplayer.orig/pkg-plist libdvdnav-mplayer/pkg-plist --- libdvdnav-mplayer.orig/pkg-plist 2008-08-17 08:12:16.000000000 +0200 +++ libdvdnav-mplayer/pkg-plist 2008-10-04 12:56:18.000000000 +0200 @@ -3,10 +3,12 @@ include/dvdnav/dvdnav.h include/dvdnav/dvdnav_events.h @dirrm include/dvdnav -lib/libdvdnav.so.4.1.2 -lib/libdvdnavmini.so.4.1.2 +lib/libdvdnav.so.4.1.3 lib/libdvdnav.so.4 -lib/libdvdnavmini.so.4 lib/libdvdnav.so -lib/libdvdnavmini.so lib/libdvdnav.a +lib/libdvdnavmini.so.4.1.3 +lib/libdvdnavmini.so.4 +lib/libdvdnavmini.so +libdata/pkgconfig/dvdnav.pc +libdata/pkgconfig/dvdnavmini.pc