- Update to version 1.0.0

PR:		ports/65264
Submitted by:	Ports Fury

6 files changed, 56 insertions, 39 deletions

diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index ee47d05c60d7..a894749a4bde 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gopchop
-PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTVERSION=	1.0.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://outflux.net/unix/software/GOPchop/download/
@@ -26,10 +25,17 @@ USE_GNOME=	gnometarget gtk12
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--disable-mlib
 
-CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include -DHAVE_DECL_GETOPT
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| -mcpu=.*"|"|g' ${WRKSRC}/configure
diff --git a/multimedia/gopchop/distinfo b/multimedia/gopchop/distinfo
index 717d0a6c477d..9777b8c46f75 100644
--- a/multimedia/gopchop/distinfo
+++ b/multimedia/gopchop/distinfo
@@ -1,2 +1,2 @@
-MD5 (GOPchop-0.9.1.tar.gz) = da88a3af95578baf9afea267ae1e0c8e
-SIZE (GOPchop-0.9.1.tar.gz) = 317732
+MD5 (GOPchop-1.0.0.tar.gz) = ca6bb18bef3e456d7c432f5bb7001df7
+SIZE (GOPchop-1.0.0.tar.gz) = 538449
diff --git a/multimedia/gopchop/files/patch-include::GOPchop.h b/multimedia/gopchop/files/patch-include::GOPchop.h
index a54d5a6d2061..18b5903d490a 100644
--- a/multimedia/gopchop/files/patch-include::GOPchop.h
+++ b/multimedia/gopchop/files/patch-include::GOPchop.h
@@ -1,5 +1,5 @@
 --- include/GOPchop.h.orig	Sun Apr 27 13:13:19 2003
-+++ include/GOPchop.h	Sun Jun  8 16:59:13 2003
++++ include/GOPchop.h	Tue Apr  6 19:31:08 2004
 @@ -31,7 +31,13 @@
  #endif
  
@@ -15,12 +15,19 @@
  
  /* import locale functions */
  #include "gettext.h"
-@@ -50,7 +56,7 @@
+@@ -50,11 +56,15 @@
  #endif
  
  /* figure out off_t formatting */
--#if _FILE_OFFSET_BITS==64
-+#if _FILE_OFFSET_BITS==64 || defined(__FreeBSD__)
++#if defined(__FreeBSD__)
++# define OFF_T_FORMAT  "llu"
++#else
+ #if _FILE_OFFSET_BITS==64
  # define OFF_T_FORMAT  "llu"
  #else
  # warning "Not compiling for large file (>2G) support!"
+ # define OFF_T_FORMAT  "lu"
++#endif
+ #endif
+ 
+ /* define a string length used for short reports */
diff --git a/multimedia/gopchop/files/patch-src::Main.cpp b/multimedia/gopchop/files/patch-src::Main.cpp
deleted file mode 100644
index 0b68ce32375a..000000000000
--- a/multimedia/gopchop/files/patch-src::Main.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/Main.cpp.orig	Sat Jun  7 19:03:16 2003
-+++ src/Main.cpp	Sat Jul 26 14:28:35 2003
-@@ -892,18 +892,21 @@
-             printf("%s", _("Using x86 3DNow acceleration\n"));
-         else if (accel & MPEG2_ACCEL_X86_MMX)
-             printf("%s", _("Using x86 MMX acceleration\n"));
-+        else
- #endif
- #ifdef ARCH_PPC
-         if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
-             printf("%s", _("Using PowerPC Altivec acceleration\n"));
-+        else
- #endif
- #ifdef ARCH_ALPHA
-         if (accel & MPEG2_ACCEL_ALPHA_MVI)
-             printf("%s", _("Using Alpha MVI acceleration\n"));
-         else if (accel & MPEG2_ACCEL_ALPHA)
-             printf("%s", _("Using Alpha acceleration\n"));
-+        else
- #endif
--        else if (accel & MPEG2_ACCEL_MLIB)
-+        if (accel & MPEG2_ACCEL_MLIB)
-             printf("%s", _("Using Mlib acceleration\n"));
-         else
-             printf("%s", _("Using no special acceleration\n"));
diff --git a/multimedia/gopchop/files/patch-src::file_buffer.h b/multimedia/gopchop/files/patch-src::file_buffer.h
new file mode 100644
index 000000000000..dc26b934ae40
--- /dev/null
+++ b/multimedia/gopchop/files/patch-src::file_buffer.h
@@ -0,0 +1,29 @@
+--- src/file_buffer.h.orig	Mon Aug 25 17:17:41 2003
++++ src/file_buffer.h	Tue Apr  6 19:32:32 2004
+@@ -51,6 +51,7 @@
+ #endif
+ 
+ #include <stdio.h> /* fopen, fread, fseek*, fclose */
++#include <sys/types.h>
+ 
+ /* figure out which fseek/ftell we need */
+ #undef FSEEK
+@@ -70,6 +71,10 @@
+ /* figure out off_t formatting */
+ #undef OFF_T_FORMAT
+ #undef ATOL
++#if defined(__FreeBSD__)
++# define OFF_T_FORMAT  "llu"
++# define ATOL(arg)     strtoll(arg, NULL, 10)
++#else
+ #if _FILE_OFFSET_BITS==64
+ # define OFF_T_FORMAT  "llu"
+ # define ATOL(arg)     atoll(arg)
+@@ -77,6 +82,7 @@
+ # warning "Not compiling for large file (>2G) support!"
+ # define OFF_T_FORMAT  "lu"
+ # define ATOL(arg)     atol(arg)
++#endif
+ #endif
+ 
+ #define DEFAULT_FILE_BUFFER_SIZE    	(1024*512)
diff --git a/multimedia/gopchop/pkg-plist b/multimedia/gopchop/pkg-plist
index 4a52f4822289..90c964203a20 100644
--- a/multimedia/gopchop/pkg-plist
+++ b/multimedia/gopchop/pkg-plist
@@ -3,8 +3,8 @@ bin/gtkspu
 bin/mpegcat
 share/GOPchop/pixmaps/about.xpm
 share/GOPchop/pixmaps/error.xpm
-share/locale/de/LC_MESSAGES/GOPchop.mo
-share/locale/en/LC_MESSAGES/GOPchop.mo
-share/locale/fr/LC_MESSAGES/GOPchop.mo
+%%NLS%%share/locale/de/LC_MESSAGES/GOPchop.mo
+%%NLS%%share/locale/en/LC_MESSAGES/GOPchop.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/GOPchop.mo
 @dirrm share/GOPchop/pixmaps
 @dirrm share/GOPchop