Update to 1.1.6:

1.1.6: (2005-04-30)
    - modified patch from Tiziano Cappellari and Igor Baldachini to optionally
      force a prepended system header.
    - modified patch from Tiziano Cappellari and Igor Baldachini to optionally
      drop trailing packs that have system headers.
    - compilation patches from Eric Jorgensen and Barry Roberts.
    - NetBSD off_t patch from Thomas Klausner.

1.1.5: (2005-04-30)
    - improved gopchop.desktop
    - added debian menu file
    - fixed compile regression in new display code

1.1.4: (2005-04-30)
    - suse patch from Rainer Lay
    - changed scroll wheel usage to try and fix file select windows - schmidtw
    - changed the menus & menu items to be more "standard" where
      possible - schmidtw
    - added XML based load/save using libxml for editing sessions - schmidtw
    - added text enterable gop selector box - schmidtw
    - added view menu to control GOP Info window & in the future the video
      window - schmidtw
    - changed the menu items to be more descriptive - schmidtw
    - fixed details need to read other MPEG2 PES packets
    - locale clean-ups
    - Xv display is now aspect-correct
    - TODO reorganized - bryce

7 files changed, 9 insertions, 61 deletions

diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 5b4d1583288..4e4c0ab9535 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/30 23:06:25 wiz Exp $
 #
 
-DISTNAME=		gopchop-1.1.3
+DISTNAME=		gopchop-1.1.6
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gopchop/} \
 			http://outflux.net/unix/software/GOPchop/download/
@@ -16,5 +16,6 @@ USE_DIRS+=		xdg-1.1
 
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gopchop/PLIST b/multimedia/gopchop/PLIST
index 9c74ebe188d..0dd3df6b061 100644
--- a/multimedia/gopchop/PLIST
+++ b/multimedia/gopchop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/03/23 19:16:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/04/30 23:06:25 wiz Exp $
 bin/gopchop
 bin/gtkspu
 bin/mpegcat
@@ -12,4 +12,5 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gopchop.mo
 share/pixmaps/gopchop.png
 share/pixmaps/gopchop/about.xpm
 share/pixmaps/gopchop/error.xpm
+share/pixmaps/gopchop/menu_about.png
 @dirrm share/pixmaps/gopchop
diff --git a/multimedia/gopchop/distinfo b/multimedia/gopchop/distinfo
index 8b9f8cbeb84..de896e2ddb1 100644
--- a/multimedia/gopchop/distinfo
+++ b/multimedia/gopchop/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/03/23 19:16:33 wiz Exp $
+$NetBSD: distinfo,v 1.2 2005/04/30 23:06:25 wiz Exp $
 
-SHA1 (gopchop-1.1.3.tar.gz) = 29f212936c3cdcf7448c927b7baa74cf14721e7d
-RMD160 (gopchop-1.1.3.tar.gz) = 712537517e62923c281377aa6031730c56e1bd9d
-Size (gopchop-1.1.3.tar.gz) = 548101 bytes
-SHA1 (patch-aa) = 698ef42d4fb7a14f5d15c687852b299b34a62f49
-SHA1 (patch-ab) = 9f8ece5e4ad2e981483f995fa2f411f6de9b93e1
-SHA1 (patch-ac) = 30a8c12f72bdf19fee10f0fc8a0b0010ca99ee43
-SHA1 (patch-ad) = 2c4986df88b48d8ec65dba0e8f4ea1eb5c0a03c2
+SHA1 (gopchop-1.1.6.tar.gz) = b1bf5d9d0c1af32b9d7d62a6d15884e93df179ad
+RMD160 (gopchop-1.1.6.tar.gz) = da40fe3ea71e8e79f9c9ee8df58a4249845048f2
+Size (gopchop-1.1.6.tar.gz) = 546015 bytes
diff --git a/multimedia/gopchop/patches/patch-aa b/multimedia/gopchop/patches/patch-aa
deleted file mode 100644
index 059c42617fd..00000000000
--- a/multimedia/gopchop/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/03/23 19:16:33 wiz Exp $
-
---- include/GOPchop.h.orig	2003-04-27 06:13:19.000000000 +0200
-+++ include/GOPchop.h
-@@ -50,7 +50,7 @@
- #endif
- 
- /* figure out off_t formatting */
--#if _FILE_OFFSET_BITS==64
-+#if _FILE_OFFSET_BITS==64 || defined(__NetBSD__)
- # define OFF_T_FORMAT  "llu"
- #else
- # warning "Not compiling for large file (>2G) support!"
diff --git a/multimedia/gopchop/patches/patch-ab b/multimedia/gopchop/patches/patch-ab
deleted file mode 100644
index 3a0a44138f9..00000000000
--- a/multimedia/gopchop/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/03/23 19:16:33 wiz Exp $
-
---- src/Main.cpp.orig	2004-03-14 09:41:54.000000000 +0100
-+++ src/Main.cpp
-@@ -43,6 +43,7 @@
- #include <string.h>
- #include <errno.h>
- #include <time.h>
-+#include <locale.h>
- 
- #include "Vector.h"
- #include "List.h"
diff --git a/multimedia/gopchop/patches/patch-ac b/multimedia/gopchop/patches/patch-ac
deleted file mode 100644
index f9e6e2e042d..00000000000
--- a/multimedia/gopchop/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/03/23 19:16:33 wiz Exp $
-
---- src/file_buffer.h.orig	2003-08-25 10:17:41.000000000 +0200
-+++ src/file_buffer.h
-@@ -70,7 +70,7 @@
- /* figure out off_t formatting */
- #undef OFF_T_FORMAT
- #undef ATOL
--#if _FILE_OFFSET_BITS==64
-+#if _FILE_OFFSET_BITS==64 || defined(__NetBSD__)
- # define OFF_T_FORMAT  "llu"
- # define ATOL(arg)     atoll(arg)
- #else
diff --git a/multimedia/gopchop/patches/patch-ad b/multimedia/gopchop/patches/patch-ad
deleted file mode 100644
index a944b2e3375..00000000000
--- a/multimedia/gopchop/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/03/23 19:16:33 wiz Exp $
-
---- src/widgets.cpp.orig	2004-02-29 12:51:33.000000000 +0100
-+++ src/widgets.cpp
-@@ -121,6 +121,7 @@ void setup_gtk_stuff()
- 
-     /* figure out where our pixmaps are */
-     add_pixmap_directory(PACKAGE_DATA_DIR "/pixmaps");
-+    add_pixmap_directory(PACKAGE_DATA_DIR "/pixmaps/gopchop");
-     add_pixmap_directory(PACKAGE_SOURCE_DIR "/pixmaps");
- 
-     /* create our main window */