Attachment #32033 for bug #53106

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

Lines 7-13 Link Here

(-)multimedia/gopchop/Makefile (-1 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= gopchop	9	PORTNAME= gopchop
10	PORTVERSION= 0.8	10	PORTVERSION= 0.9.0
11	PORTREVISION= 0	11	PORTREVISION= 0
12	CATEGORIES= multimedia	12	CATEGORIES= multimedia
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \

Line 1 Link Here

(-)multimedia/gopchop/distinfo (-1 / +1 lines)
1	MD5 (GOPchop-0.8.tar.gz) = c3c2a6d784196111c49a3855052936ad	1	MD5 (GOPchop-0.9.0.tar.gz) = 506fa5b3679cceaad00f75b6b40ac1fa




--- include/GOPchop.h.orig	Sun Apr 27 13:13:19 2003
+++ include/GOPchop.h	Sun Jun  8 16:59:13 2003
@@ -31,7 +31,13 @@
 #endif
 
 /* get the cool numbers */
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
 
 /* import locale functions */
 #include "gettext.h"
@@ -50,7 +56,7 @@
 #endif
 
 /* figure out off_t formatting */
-#if _FILE_OFFSET_BITS==64
+#if _FILE_OFFSET_BITS==64 || defined(__FreeBSD__)
 # define OFF_T_FORMAT  "llu"
 #else
 # warning "Not compiling for large file (>2G) support!"




--- src/Parser.h.orig	Mon Apr  7 07:24:42 2003
+++ src/Parser.h	Tue May  6 21:36:18 2003
@@ -42,7 +42,9 @@
 // strlen
 #include <string.h>
 
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#endif
 
 #include "List.h"
 




--- src/mpegcat.c.orig	Sun Apr 27 12:08:37 2003
+++ src/mpegcat.c	Sun Jun  8 16:50:36 2003
@@ -392,11 +392,19 @@
                 break;
 
             case 'n':
+#ifdef __FreeBSD__
+                num_bytes = strtoll(optarg, NULL, 10);
+#else
                 num_bytes = atoll(optarg);
+#endif
                 break;
 
             case 'b':
+#ifdef __FreeBSD__
+                begin_at = num_bytes = strtoll(optarg, NULL, 10);
+#else
                 begin_at = atoll(optarg);
+#endif
                 break;
 
             case 'w':

Lines 3-7 Link Here

(-)multimedia/gopchop/pkg-plist (+2 lines)
3	bin/mpegcat	3	bin/mpegcat
4	share/GOPchop/pixmaps/about.xpm	4	share/GOPchop/pixmaps/about.xpm
5	share/GOPchop/pixmaps/error.xpm	5	share/GOPchop/pixmaps/error.xpm
		6	share/locale/en/LC_MESSAGES/GOPchop.mo
		7	share/locale/fr/LC_MESSAGES/GOPchop.mo
6	@dirrm share/GOPchop/pixmaps	8	@dirrm share/GOPchop/pixmaps
7	@dirrm share/GOPchop	9	@dirrm share/GOPchop

Return to bug 53106

Line 0 Link Here

(-)multimedia/gopchop/files/patch-include::GOPchop.h (+26 lines)
	1	--- include/GOPchop.h.orig Sun Apr 27 13:13:19 2003
	2	+++ include/GOPchop.h Sun Jun 8 16:59:13 2003
	3	@@ -31,7 +31,13 @@
	4	#endif
	5
	6	/* get the cool numbers */
	7	-#include <stdint.h>
	8	+#ifdef HAVE_STDINT_H
	9	+# include <stdint.h>
	10	+#endif
	11	+
	12	+#ifdef HAVE_INTTYPES_H
	13	+# include <inttypes.h>
	14	+#endif
	15
	16	/* import locale functions */
	17	#include "gettext.h"
	18	@@ -50,7 +56,7 @@
	19	#endif
	20
	21	/* figure out off_t formatting */
	22	-#if _FILE_OFFSET_BITS==64
	23	+#if _FILE_OFFSET_BITS==64 \|\| defined(__FreeBSD__)
	24	# define OFF_T_FORMAT "llu"
	25	#else
	26	# warning "Not compiling for large file (>2G) support!"

Lines 1-12 Link Here

(-)multimedia/gopchop/files/patch-src::Parser.h (-12 lines)
1	--- src/Parser.h.orig Mon Apr 7 07:24:42 2003
2	+++ src/Parser.h Tue May 6 21:36:18 2003
3	@@ -42,7 +42,9 @@
4	// strlen
5	#include <string.h>
6
7	+#ifdef HAVE_STDINT_H
8	#include <stdint.h>
9	+#endif
10
11	#include "List.h"
12

Lines 1-22 Link Here

(-)multimedia/gopchop/files/patch-src::mpegcat.c (-13 / +13 lines)
1	--- src/mpegcat.c.orig Mon Apr 14 12:21:04 2003	1	--- src/mpegcat.c.orig Sun Apr 27 12:08:37 2003
2	+++ src/mpegcat.c Tue May 6 21:46:58 2003	2	+++ src/mpegcat.c Sun Jun 8 16:50:36 2003
3	@@ -390,11 +390,19 @@	3	@@ -392,11 +392,19 @@
4	break;	4	break;
5		5
6	case 'n':	6	case 'n':
7	+#ifdef __FreeBSD__	7	+#ifdef __FreeBSD__
8	+ num_bytes = strtoll(optarg, NULL, 10);	8	+ num_bytes = strtoll(optarg, NULL, 10);
9	+#else	9	+#else
10	num_bytes = atoll(optarg);	10	num_bytes = atoll(optarg);
11	+#endif	11	+#endif
12	break;	12	break;
13		13
14	case 'b':	14	case 'b':
15	+#ifdef __FreeBSD__	15	+#ifdef __FreeBSD__
16	+ begin_at = strtoll(optarg, NULL, 10);	16	+ begin_at = num_bytes = strtoll(optarg, NULL, 10);
17	+#else	17	+#else
18	begin_at = atoll(optarg);	18	begin_at = atoll(optarg);
19	+#endif	19	+#endif
20	break;	20	break;
21		21
22	case 'w':	22	case 'w':