Attachment #90649 for bug #127851

View | Details | Raw Unified | Return to bug 127851
Collapse All | Expand All




#

PORTNAME=	libdvdnav-mplayer
PORTVERSION=	4.1.3
CATEGORIES=	multimedia
MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/ \
		http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/ \

DISTNAME=	libdvdnav-${PORTVERSION}

MAINTAINER=	ganael.laplanche@martymac.com
COMMENT=	Mplayer version of the lidvdnav project

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}" \

post-patch:
	@${REINPLACE_CMD} -e 's|-ldl ||g' \
		${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e 's|^threadlib="-lpthread"|threadlib="${PTHREAD_LIBS}"|g' \
		${WRKSRC}/configure2

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)libdvdnav-mplayer/distinfo (-3 / +3 lines)
1	MD5 (libdvdnav-4.1.2.tar.gz) = 0e9a494403f9f5a2e781252c77599561	1	MD5 (libdvdnav-4.1.3.tar.bz2) = d62383c45b28816771e283515f2c27fa
2	SHA256 (libdvdnav-4.1.2.tar.gz) = 56bcb75113bb8091574c36590f84fb00d37711e8cda9f5f7152667b33b2d0cd1	2	SHA256 (libdvdnav-4.1.3.tar.bz2) = e82a3d7b3c342a895a332fc0fb2281f40ff9978cb8cbb8bf1343fcad0063759d
3	SIZE (libdvdnav-4.1.2.tar.gz) = 196223	3	SIZE (libdvdnav-4.1.3.tar.bz2) = 110843




--- 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




--- 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

Lines 1-3 Link Here

(-)libdvdnav-mplayer/pkg-descr (-1 / +1 lines)
1	Mplayer fork of the libdvdnav project.	1	Mplayer version of the libdvdnav project.
2		2
3	WWW: http://www.mplayerhq.hu/MPlayer/releases/dvdnav	3	WWW: http://www.mplayerhq.hu/MPlayer/releases/dvdnav




include/dvdnav/dvdnav.h
include/dvdnav/dvdnav_events.h
@dirrm include/dvdnav
lib/libdvdnav.so.4.1.3
lib/libdvdnavmini.so.4.1.2
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

Return to bug 127851

Lines 6-12 Link Here

(-)libdvdnav-mplayer/Makefile (-5 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= libdvdnav-mplayer	8	PORTNAME= libdvdnav-mplayer
9	PORTVERSION= 4.1.2	9	PORTVERSION= 4.1.3
10	CATEGORIES= multimedia	10	CATEGORIES= multimedia
11	MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/ \	11	MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/ \
12	http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/ \	12	http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/ \
Lines 18-36 Link Here
18	DISTNAME= libdvdnav-${PORTVERSION}	18	DISTNAME= libdvdnav-${PORTVERSION}
19		19
20	MAINTAINER= ganael.laplanche@martymac.com	20	MAINTAINER= ganael.laplanche@martymac.com
21	COMMENT= Mplayer fork of the lidvdnav project	21	COMMENT= Mplayer version of the lidvdnav project
22		22
23	LIB_DEPENDS= dvdread.5:${PORTSDIR}/multimedia/libdvdread	23	LIB_DEPENDS= dvdread.4:${PORTSDIR}/multimedia/libdvdread-mplayer
24		24
		25	USE_BZIP2= yes
25	CFLAGS+= "-I${LOCALBASE}/include"	26	CFLAGS+= "-I${LOCALBASE}/include"
26	LDFLAGS+= "-L${LOCALBASE}/lib"	27	LDFLAGS+= "-L${LOCALBASE}/lib"
27	HAS_CONFIGURE= yes	28	HAS_CONFIGURE= yes
28	CONFIGURE_SCRIPT= configure2	29	CONFIGURE_SCRIPT= configure2
29	CONFIGURE_ARGS= --prefix="${PREFIX}" \	30	CONFIGURE_ARGS= --prefix="${PREFIX}" \
30	--libdir="${PREFIX}/lib" \	31	--libdir="${PREFIX}/lib" \
		32	--libdatadir="${PREFIX}/libdata/pkgconfig" \
31	--shlibdir="${PREFIX}/lib" \	33	--shlibdir="${PREFIX}/lib" \
32	--incdir="${PREFIX}/include/dvdnav" \	34	--incdir="${PREFIX}/include/dvdnav" \
33	--with-dvdread="${LOCALBASE}/include/dvdread" \
34	--disable-opts \	35	--disable-opts \
35	--disable-debug \	36	--disable-debug \
36	--extra-cflags="${CFLAGS}" \	37	--extra-cflags="${CFLAGS}" \
Lines 42-48 Link Here
42	post-patch:	43	post-patch:
43	@${REINPLACE_CMD} -e 's\|-ldl \|\|g' \	44	@${REINPLACE_CMD} -e 's\|-ldl \|\|g' \
44	${WRKSRC}/Makefile	45	${WRKSRC}/Makefile
45	@${REINPLACE_CMD} -e 's\|threadlib="-lpthread"\|threadlib="${PTHREAD_LIBS}"\|g' \	46	@${REINPLACE_CMD} -e 's\|^threadlib="-lpthread"\|threadlib="${PTHREAD_LIBS}"\|g' \
46	${WRKSRC}/configure2	47	${WRKSRC}/configure2
47		48
48	.include <bsd.port.mk>	49	.include <bsd.port.mk>

Lines 1-11 Link Here

(-)libdvdnav-mplayer/files/patch-Makefile (-11 / +16 lines)
1	--- Makefile.orig 2008-08-11 07:48:09.644830172 +0200	1	--- Makefile.orig 2008-10-04 12:25:15.145677557 +0200
2	+++ Makefile 2008-08-11 07:48:56.632122342 +0200	2	+++ Makefile 2008-10-04 12:36:23.806607647 +0200
3	@@ -101,7 +101,7 @@	3	@@ -131,10 +131,9 @@
4	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -L. -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) -ldvdread $(THREADLIB)	4	$(pcedit) $< > $@
5	else	5
6	${SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)	6	install-pkgconfig: $(.OBJDIR)/dvdnav.pc $(.OBJDIR)/dvdnavmini.pc
7	- cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) -ldvdread $(THREADLIB)	7	- install -d $(DESTDIR)$(libdir)/pkgconfig
8	+ cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) $(LDFLAGS) -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) -ldvdread $(THREADLIB)	8	- install -m 0644 $(.OBJDIR)/dvdnav.pc $(DESTDIR)$(libdir)/pkgconfig
9	endif	9	- install -m 0644 $(.OBJDIR)/dvdnavmini.pc \
10	${MINI_SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)	10	- $(DESTDIR)$(libdir)/pkgconfig
11	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(MINI_SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) $(THREADLIB)	11	+ install -d $(DESTDIR)$(libdatadir)
		12	+ install -m 0644 $(.OBJDIR)/dvdnav.pc $(DESTDIR)$(libdatadir)
		13	+ install -m 0644 $(.OBJDIR)/dvdnavmini.pc $(DESTDIR)$(libdatadir)
		14
		15	distclean: clean
		16	find . -name "*~" \| xargs rm -rf

Line 0 Link Here

(-)libdvdnav-mplayer/files/patch-configure2 (+35 lines)
	1	--- configure2.orig 2008-10-04 12:27:58.564694499 +0200
	2	+++ configure2 2008-10-04 12:35:04.406225755 +0200
	3	@@ -26,6 +26,7 @@
	4	echo " --help print this message"
	5	echo " --prefix=PREFIX install in PREFIX [$PREFIX]"
	6	echo " --libdir=DIR install libs in DIR [PREFIX/lib]"
	7	+ echo " --libdatadir=DIR install pkgconfig files in DIR [PREFIX/lib/pkgconfig]"
	8	echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]"
	9	echo " --incdir=DIR install includes in DIR [PREFIX/include/dvdnav]"
	10	echo " --enable-static build static libraries [default=yes]"
	11	@@ -72,6 +73,8 @@
	12	;;
	13	--libdir=*) libdir="$optval"
	14	;;
	15	+ --libdatadir=*) libdatadir="$optval"
	16	+ ;;
	17	--shlibdir=*) shlibdir="$optval"
	18	;;
	19	--incdir=*) incdir="$optval"
	20	@@ -100,6 +103,7 @@
	21	PREFIX=`cd $PREFIX && pwd`
	22
	23	test -z "$libdir" && libdir=$PREFIX/lib
	24	+test -z "$libdatadir" && libdir=$PREFIX/lib/pkgconfig
	25	test -z "$shlibdir" && shlibdir=$PREFIX/lib
	26	test -z "$incdir" && incdir=$PREFIX/include/dvdnav
	27
	28	@@ -127,6 +131,7 @@
	29	# Automatically generated by configure, do not edit
	30	PREFIX=$PREFIX
	31	libdir=$libdir
	32	+libdatadir=$libdatadir
	33	shlibdir=$shlibdir
	34	incdir=$incdir
	35	THREADLIB=$threadlib

Lines 3-12 Link Here

(-)libdvdnav-mplayer/pkg-plist (-4 / +6 lines)
3	include/dvdnav/dvdnav.h	3	include/dvdnav/dvdnav.h
4	include/dvdnav/dvdnav_events.h	4	include/dvdnav/dvdnav_events.h
5	@dirrm include/dvdnav	5	@dirrm include/dvdnav
6	lib/libdvdnav.so.4.1.2	6	lib/libdvdnav.so.4.1.3
7	lib/libdvdnavmini.so.4.1.2
8	lib/libdvdnav.so.4	7	lib/libdvdnav.so.4
9	lib/libdvdnavmini.so.4
10	lib/libdvdnav.so	8	lib/libdvdnav.so
11	lib/libdvdnavmini.so
12	lib/libdvdnav.a	9	lib/libdvdnav.a
		10	lib/libdvdnavmini.so.4.1.3
		11	lib/libdvdnavmini.so.4
		12	lib/libdvdnavmini.so
		13	libdata/pkgconfig/dvdnav.pc
		14	libdata/pkgconfig/dvdnavmini.pc