Update to 1.1.8:

1.1.8: (2009-03-02)
    - x86_64 cleanups
    - subversion migration
    - datarootdir cleanups
    - src/display.cpp: debian FTBFS
    - src/widgets.cpp: debian icon path patch
    - src/Main.cpp: debian progress bar patch
    - gopchop.desktop: clean up thanks to Gregor Herrmann
    - libvo/video_out_x11.c: Xv crasher fixed thanks to Tony Mancill
    - docs/gopchop.sgml: cleanups from debian
    - src/*: bump copyright years

6 files changed, 22 insertions, 37 deletions

diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index bb5ce2acc59..ec4e5f83120 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2009/02/24 16:18:24 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/03/06 10:35:21 wiz Exp $
 #
 
-DISTNAME=		gopchop-1.1.7
-PKGREVISION=		6
+DISTNAME=		gopchop-1.1.8
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gopchop/} \
 			http://outflux.net/unix/software/GOPchop/download/
@@ -27,6 +26,7 @@ BROKEN_GETTEXT_DETECTION=	yes
 #CONFIGURE_ARGS+=	--disable-sdl
 
 .include "../../multimedia/libmpeg2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.6
 .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 36620ef06de..355d6f04940 100644
--- a/multimedia/gopchop/PLIST
+++ b/multimedia/gopchop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/03/06 10:35:21 wiz Exp $
 bin/gopchop
 bin/gtkspu
 bin/mpegcat
@@ -6,11 +6,10 @@ man/man1/gopchop.1
 man/man1/gtkspu.1
 man/man1/mpegcat.1
 share/applications/gopchop.desktop
-share/locale/de/LC_MESSAGES/gopchop.mo
-share/locale/en/LC_MESSAGES/gopchop.mo
-share/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
+@comment in xdg-dirs: @dirrm share/pixmaps
+@comment in xdg-dirs: @dirrm share/applications
diff --git a/multimedia/gopchop/distinfo b/multimedia/gopchop/distinfo
index f3f4760a122..d0bb1d10131 100644
--- a/multimedia/gopchop/distinfo
+++ b/multimedia/gopchop/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.6 2006/10/16 00:51:35 wiz Exp $
+$NetBSD: distinfo,v 1.7 2009/03/06 10:35:21 wiz Exp $
 
-SHA1 (gopchop-1.1.7.tar.gz) = d7e110d0e12aeb6ae6b6b90c9a3cf1f9222f30e4
-RMD160 (gopchop-1.1.7.tar.gz) = 31e9cf6934099dcda3025ec62e6d84714171809d
-Size (gopchop-1.1.7.tar.gz) = 556083 bytes
-SHA1 (patch-aa) = 560d87bf80a877b39acee9430b10d14e5363c82a
-SHA1 (patch-ab) = d4ea7c7828f3403f29ff493f707767f245204e71
-SHA1 (patch-ac) = 36d01756a44ba7f669b739579b119f85d16051af
+SHA1 (gopchop-1.1.8.tar.gz) = 6e879c6cbf081df8fa44b535c9fd991ae175d5a2
+RMD160 (gopchop-1.1.8.tar.gz) = 8e5cffca5ef2cc7c1d055ac0a5a20e75d074c2d1
+Size (gopchop-1.1.8.tar.gz) = 574559 bytes
+SHA1 (patch-aa) = 0bb17c6001a06b782cb8aca8a8d82df66cde100d
+SHA1 (patch-ab) = 24496930dbe8d58aeea87abcbfad1a30397f6f87
diff --git a/multimedia/gopchop/patches/patch-aa b/multimedia/gopchop/patches/patch-aa
index 2cf5b09baec..9a7baa53308 100644
--- a/multimedia/gopchop/patches/patch-aa
+++ b/multimedia/gopchop/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2005/06/06 15:12:07 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2009/03/06 10:35:22 wiz Exp $
 
---- src/widgets.cpp.orig	2005-05-01 09:03:14.000000000 +0200
+--- src/widgets.cpp.orig	2009-03-02 23:27:15.000000000 +0000
 +++ src/widgets.cpp
 @@ -130,6 +130,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/" PACKAGE_NAME);
 +    add_pixmap_directory(PACKAGE_DATA_DIR "/pixmaps/gopchop");
-     add_pixmap_directory(PACKAGE_SOURCE_DIR "/pixmaps");
  
      /* create our main window */
+     main_window = GTK_WIDGET(create_main_window());
diff --git a/multimedia/gopchop/patches/patch-ab b/multimedia/gopchop/patches/patch-ab
index 081e0ad4df5..0c1e8353d6f 100644
--- a/multimedia/gopchop/patches/patch-ab
+++ b/multimedia/gopchop/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.3 2006/06/27 22:11:43 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2009/03/06 10:35:22 wiz Exp $
 
---- configure.orig	2006-06-27 21:59:36.000000000 +0000
+--- configure.orig	2009-03-02 23:01:57.000000000 +0000
 +++ configure
-@@ -24815,13 +24815,6 @@ cat >>confdefs.h <<\_ACEOF
- #define ARCH_X86
+@@ -21446,13 +21446,6 @@ cat >>confdefs.h <<\_ACEOF
+ #define ARCH_X86 /**/
  _ACEOF
  
 -        case "$host" in
@@ -13,6 +13,6 @@ $NetBSD: patch-ab,v 1.3 2006/06/27 22:11:43 wiz Exp $
 -        i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
 -        k6-*)   OPT_CFLAGS="$CFLAGS -mcpu=k6";;
 -        esac
-         echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
- echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+         { $as_echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
+ $as_echo_n "checking if $CC supports $OPT_CFLAGS flags... " >&6; }
      SAVE_CFLAGS="$CFLAGS"
diff --git a/multimedia/gopchop/patches/patch-ac b/multimedia/gopchop/patches/patch-ac
deleted file mode 100644
index 2caca1bfa09..00000000000
--- a/multimedia/gopchop/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/10/16 00:51:35 wiz Exp $
-
---- autogen.sh.orig	2005-04-28 05:24:34.000000000 +0000
-+++ autogen.sh
-@@ -151,7 +151,7 @@ if test x$AUTOMAKE != x; then
- fi
- 
- # if no automake, don't bother testing for aclocal
--test x$AUTOMAKE == x || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-+test x$AUTOMAKE = x || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-   echo
-   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
-   echo "installed doesn't appear recent enough."