Primary object is to make this build with libdvdread 4.2.0 (patch-ad)

Additionally:
 * Mark it as also working with libdvdread 4.1.3
 * Add comments to the patches
 * Add LICENSE=gnu-gpl-v2
This fixes all pkglint warnings.
OK'ed by wiz@

6 files changed, 129 insertions, 119 deletions

diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index ff48678727a..dd554a03b39 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2011/04/22 13:44:17 obache Exp $
+# $NetBSD: Makefile,v 1.29 2012/04/07 08:28:45 he Exp $
 
 DISTNAME=	ogle-0.9.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
 COMMENT=	DVD player with menus
 
+LICENSE=	gnu-gpl-v2
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 ONLY_FOR_PLATFORM=	NetBSD-1.5.[23]*-i386 NetBSD-1.5[Y-Z]*-i386
@@ -39,6 +41,8 @@ WRAPPER_TRANSFORM_CMDS+=	opt:-mcpu=pentiumpro:-mtune=pentiumpro
 
 MESSAGE_SUBST+=		PKGBASE=${PKGBASE}
 
+BUILDLINK_API_DEPENDS.libdvdread+=      libdvdread>=4.1.3
+
 .include "../../audio/liba52/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/multimedia/ogle/distinfo b/multimedia/ogle/distinfo
index d242dc56293..91580520302 100644
--- a/multimedia/ogle/distinfo
+++ b/multimedia/ogle/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2009/01/27 02:06:49 jmcneill Exp $
+$NetBSD: distinfo,v 1.6 2012/04/07 08:28:45 he Exp $
 
 SHA1 (ogle-0.9.2.tar.gz) = bf44e835d04634b4e52fb50bab2a1b78e69391eb
 RMD160 (ogle-0.9.2.tar.gz) = 16055614b5a3b336aa42a96efc0456bf88f37129
 Size (ogle-0.9.2.tar.gz) = 488984 bytes
-SHA1 (patch-aa) = e88f4c4765a72afe9e6a1bb859d37adb040c3d48
-SHA1 (patch-ab) = 8cc4f41533feeb35a4b9400aadea230c40f91c3d
-SHA1 (patch-ac) = 3cee7186c517fc7427a9a4a4b96680f25d442c1d
-SHA1 (patch-ad) = 15f6466ab82811bebb169a6cd0886c92e34033ec
+SHA1 (patch-aa) = 95778b6a78f8d37416428bc27b709ed64bf4533a
+SHA1 (patch-ab) = 0a4837639fd3e0dbab6ff804962f62fd7971582c
+SHA1 (patch-ac) = c30136ad38ff2238abfafe0fad419a4214acbb03
+SHA1 (patch-ad) = d1e9150f7544175f4bdf3b3fbc8fb3d072c04b5c
diff --git a/multimedia/ogle/patches/patch-aa b/multimedia/ogle/patches/patch-aa
index 4ea43674ab9..edf256544ba 100644
--- a/multimedia/ogle/patches/patch-aa
+++ b/multimedia/ogle/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2005/12/07 19:33:03 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2012/04/07 08:28:45 he Exp $
+
+Also handle DragonFly BSD.
 
 --- include/ogle_endian.h.orig	2005-12-07 19:00:42.000000000 +0000
 +++ include/ogle_endian.h
diff --git a/multimedia/ogle/patches/patch-ab b/multimedia/ogle/patches/patch-ab
index b6f27402217..b8701fd9f2d 100644
--- a/multimedia/ogle/patches/patch-ab
+++ b/multimedia/ogle/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2005/12/07 19:33:03 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2012/04/07 08:28:45 he Exp $
+
+Also handle DragonFly BSD.
 
 --- configure.orig	2005-12-07 19:04:43.000000000 +0000
 +++ configure
diff --git a/multimedia/ogle/patches/patch-ac b/multimedia/ogle/patches/patch-ac
index 408a045e6da..48bf2868dca 100644
--- a/multimedia/ogle/patches/patch-ac
+++ b/multimedia/ogle/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2006/07/16 22:20:37 seb Exp $
+$NetBSD: patch-ac,v 1.2 2012/04/07 08:28:45 he Exp $
+
+Make program_name a global.
 
 --- ac3/ac3dec_wrap.c.orig	2003-03-02 15:50:03.000000000 +0000
 +++ ac3/ac3dec_wrap.c
diff --git a/multimedia/ogle/patches/patch-ad b/multimedia/ogle/patches/patch-ad
index d928ac2aa57..634c13ff1c1 100644
--- a/multimedia/ogle/patches/patch-ad
+++ b/multimedia/ogle/patches/patch-ad
@@ -1,129 +1,129 @@
-$NetBSD: patch-ad,v 1.1 2009/01/27 02:06:49 jmcneill Exp $
+$NetBSD: patch-ad,v 1.2 2012/04/07 08:28:45 he Exp $
 
---- vmg/ifo_dump.c.orig	2009-01-26 21:00:17.000000000 -0500
-+++ vmg/ifo_dump.c	2009-01-26 21:00:33.000000000 -0500
-@@ -65,38 +65,38 @@ static void print_ifo(char *path, int ti
-   if(h->vmgi_mat != NULL) {
+Adapt to libdvdread 4.2.0 (actually >= 4.1.3).
+
+--- vmg/ifo_dump.c.orig	2003-06-25 16:12:43.000000000 +0000
++++ vmg/ifo_dump.c
+@@ -59,121 +59,8 @@ static void print_ifo(char *path, int ti
+     return;
+   }
+ 
+-  if((h = ifoOpen(dvd, title)) == NULL)
+-    return;
+-    
+-  if(h->vmgi_mat != NULL) {
++  ifo_print(dvd, title);
      
-     printf("VMG top level\n-------------\n");
+-    printf("VMG top level\n-------------\n");
 -    ifoPrint_VMGI_MAT(h->vmgi_mat);
-+    ifo_print_VMGI_MAT(h->vmgi_mat);
-       
-     printf("\nFirst Play PGC\n--------------\n");
+-      
+-    printf("\nFirst Play PGC\n--------------\n");
 -    ifoPrint_PGC(h->first_play_pgc);
-+    ifo_print_PGC(h->first_play_pgc);
-       
-     printf("\nTitle Track search pointer table\n");
-     printf(  "------------------------------------------------\n");
+-      
+-    printf("\nTitle Track search pointer table\n");
+-    printf(  "------------------------------------------------\n");
 -    ifoPrint_TT_SRPT(h->tt_srpt);
-+    ifo_print_TT_SRPT(h->tt_srpt);
-       
-     printf("\nMenu PGCI Unit table\n");
-     printf(  "--------------------\n");
-     if(h->vmgi_mat->vmgm_pgci_ut != 0) {
+-      
+-    printf("\nMenu PGCI Unit table\n");
+-    printf(  "--------------------\n");
+-    if(h->vmgi_mat->vmgm_pgci_ut != 0) {
 -      ifoPrint_PGCI_UT(h->pgci_ut);
-+      ifo_print_PGCI_UT(h->pgci_ut);
-     } else 
-       printf("No Menu PGCI Unit table present\n");
-       
-     printf("\nParental Manegment Information table\n");
-     printf(  "------------------------------------\n");
-     if(h->vmgi_mat->ptl_mait != 0) {
+-    } else 
+-      printf("No Menu PGCI Unit table present\n");
+-      
+-    printf("\nParental Manegment Information table\n");
+-    printf(  "------------------------------------\n");
+-    if(h->vmgi_mat->ptl_mait != 0) {
 -      ifoPrint_PTL_MAIT(h->ptl_mait);
-+      ifo_print_PTL_MAIT(h->ptl_mait);
-     } else
-       printf("No Parental Management Information present\n");
-       
-     printf("\nVideo Title Set Attribute Table\n");
-     printf(  "-------------------------------\n");
+-    } else
+-      printf("No Parental Management Information present\n");
+-      
+-    printf("\nVideo Title Set Attribute Table\n");
+-    printf(  "-------------------------------\n");
 -    ifoPrint_VTS_ATRT(h->vts_atrt);
-+    ifo_print_VTS_ATRT(h->vts_atrt);
- 
-       
-     printf("\nText Data Manager Information\n");
-     printf(  "-----------------------------\n");
-     if(h->vmgi_mat->txtdt_mgi != 0) {
+-
+-      
+-    printf("\nText Data Manager Information\n");
+-    printf(  "-----------------------------\n");
+-    if(h->vmgi_mat->txtdt_mgi != 0) {
 -      //ifoPrint_TXTDT_MGI(h->txtdt_mgi);
-+      //ifo_print_TXTDT_MGI(h->txtdt_mgi);
-       printf("Can't print Text Data Manager Information yet\n");
-     } else
-       printf("No Text Data Manager Information present\n");
-@@ -106,14 +106,14 @@ static void print_ifo(char *path, int ti
-       printf("\nCell Address table\n");
-       printf(  "-----------------\n");
-       if(h->vmgi_mat->vmgm_c_adt != 0) {
+-      printf("Can't print Text Data Manager Information yet\n");
+-    } else
+-      printf("No Text Data Manager Information present\n");
+-      
+-    if(1) {
+-      
+-      printf("\nCell Address table\n");
+-      printf(  "-----------------\n");
+-      if(h->vmgi_mat->vmgm_c_adt != 0) {
 -	ifoPrint_C_ADT(h->menu_c_adt);
-+	ifo_print_C_ADT(h->menu_c_adt);
-       } else
- 	printf("No Cell Address table present\n");
-       
-       printf("\nVideo Title set Menu VOBU address map\n");
-       printf(  "-----------------\n");
-       if(h->vmgi_mat->vmgm_vobu_admap != 0) {
+-      } else
+-	printf("No Cell Address table present\n");
+-      
+-      printf("\nVideo Title set Menu VOBU address map\n");
+-      printf(  "-----------------\n");
+-      if(h->vmgi_mat->vmgm_vobu_admap != 0) {
 -	ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
-+	ifo_print_VOBU_ADMAP(h->menu_vobu_admap);
-       } else
- 	printf("No Menu VOBU address map present\n");
-     }
-@@ -122,20 +122,20 @@ static void print_ifo(char *path, int ti
-   if(h->vtsi_mat != NULL) {
-       
-     printf("VTS top level\n-------------\n");
+-      } else
+-	printf("No Menu VOBU address map present\n");
+-    }
+-  }
+-
+-  if(h->vtsi_mat != NULL) {
+-      
+-    printf("VTS top level\n-------------\n");
 -    ifoPrint_VTSI_MAT(h->vtsi_mat);
-+    ifo_print_VTSI_MAT(h->vtsi_mat);
-       
-     printf("\nPart of title search pointer table information\n");
-     printf(  "----------------------------------------------\n");
+-      
+-    printf("\nPart of title search pointer table information\n");
+-    printf(  "----------------------------------------------\n");
 -    ifoPrint_VTS_PTT_SRPT(h->vts_ptt_srpt);
-+    ifo_print_VTS_PTT_SRPT(h->vts_ptt_srpt);
-        
-     printf("\nPGCI Unit table\n");
-     printf(  "--------------------\n");
+-       
+-    printf("\nPGCI Unit table\n");
+-    printf(  "--------------------\n");
 -    ifoPrint_PGCIT(h->vts_pgcit);
-+    ifo_print_PGCIT(h->vts_pgcit);
-       
-     printf("\nMenu PGCI Unit table\n");
-     printf(  "--------------------\n");
-     if(h->vtsi_mat->vtsm_pgci_ut != 0) {
+-      
+-    printf("\nMenu PGCI Unit table\n");
+-    printf(  "--------------------\n");
+-    if(h->vtsi_mat->vtsm_pgci_ut != 0) {
 -      ifoPrint_PGCI_UT(h->pgci_ut);
-+      ifo_print_PGCI_UT(h->pgci_ut);
-     } else
-       printf("No Menu PGCI Unit table present\n");
-       
-@@ -144,31 +144,31 @@ static void print_ifo(char *path, int ti
-       printf("\nTime Map table\n");
-       printf(  "-----------------\n");
-       if(h->vtsi_mat->vts_tmapt != 0) {
+-    } else
+-      printf("No Menu PGCI Unit table present\n");
+-      
+-    if(1) {
+-      
+-      printf("\nTime Map table\n");
+-      printf(  "-----------------\n");
+-      if(h->vtsi_mat->vts_tmapt != 0) {
 -	ifoPrint_VTS_TMAPT(h->vts_tmapt);
-+	ifo_print_VTS_TMAPT(h->vts_tmapt);
-       } else
- 	printf("No Time Map table present\n");
-       
-       printf("\nMenu Cell Address table\n");
-       printf(  "-----------------\n");
-       if(h->vtsi_mat->vtsm_c_adt != 0) {
+-      } else
+-	printf("No Time Map table present\n");
+-      
+-      printf("\nMenu Cell Address table\n");
+-      printf(  "-----------------\n");
+-      if(h->vtsi_mat->vtsm_c_adt != 0) {
 -	ifoPrint_C_ADT(h->menu_c_adt);
-+	ifo_print_C_ADT(h->menu_c_adt);
-       } else
- 	printf("No Cell Address table present\n");
-       
-       printf("\nVideo Title Set Menu VOBU address map\n");
-       printf(  "-----------------\n");
-       if(h->vtsi_mat->vtsm_vobu_admap != 0) {
+-      } else
+-	printf("No Cell Address table present\n");
+-      
+-      printf("\nVideo Title Set Menu VOBU address map\n");
+-      printf(  "-----------------\n");
+-      if(h->vtsi_mat->vtsm_vobu_admap != 0) {
 -	ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
-+	ifo_print_VOBU_ADMAP(h->menu_vobu_admap);
-       } else
- 	printf("No Menu VOBU address map present\n");
-       
-       printf("\nCell Address table\n");
-       printf(  "-----------------\n");
+-      } else
+-	printf("No Menu VOBU address map present\n");
+-      
+-      printf("\nCell Address table\n");
+-      printf(  "-----------------\n");
 -      ifoPrint_C_ADT(h->vts_c_adt);
-+      ifo_print_C_ADT(h->vts_c_adt);
-       
-       printf("\nVideo Title Set VOBU address map\n");
-       printf(  "-----------------\n");
+-      
+-      printf("\nVideo Title Set VOBU address map\n");
+-      printf(  "-----------------\n");
 -      ifoPrint_VOBU_ADMAP(h->vts_vobu_admap);
-+      ifo_print_VOBU_ADMAP(h->vts_vobu_admap);
-       
-     }
-   }
+-      
+-    }
+-  }
+-
+-
+   /* Vob */
+   
+ }