- Fix build on -stable

- Fix LIB_DEPENDS

PR:		40497
Submitted by:	Ports Fury

4 files changed, 53 insertions, 9 deletions

diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index f7b953c445b4..fc9911ea4124 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gopchop
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://outflux.net/unix/software/GOPchop/download/
@@ -17,19 +18,21 @@ DISTNAME=	GOPchop-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libvo.a:${PORTSDIR}/graphics/libmpeg2
-LIB_DEPENDS=	mpeg2:${PORTSDIR}/graphics/libmpeg2 \
-		SDL-1.1:${PORTSDIR}/devel/sdl12 \
-		gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+		mpeg2.0:${PORTSDIR}/graphics/libmpeg2
 
-USE_REINPLACE=	yes
 USE_GTK=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -D__GNU_LIBRARY__" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lSDL-1.1 -lgnugetopt"
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+CPPFLAGS=	-I${LOCALBASE}/include -D__GNU_LIBRARY__ ${PTHREAD_CFLAGS} 
+LDFLAGS=	-L${LOCALBASE}/lib -lgnugetopt ${PTHREAD_LIBS}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|-lSDL|-lSDL-1.1|g" \
-		-e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e "s|-lglib||g" ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|-lSDL |-lSDL-1.1 |g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lglib||g' ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/multimedia/gopchop/files/patch-src::ElementStream.h b/multimedia/gopchop/files/patch-src::ElementStream.h
new file mode 100644
index 000000000000..c3927a980d86
--- /dev/null
+++ b/multimedia/gopchop/files/patch-src::ElementStream.h
@@ -0,0 +1,13 @@
+--- src/ElementStream.h.orig	Fri Jul 12 00:30:21 2002
++++ src/ElementStream.h	Fri Jul 12 00:33:44 2002
+@@ -29,7 +29,10 @@
+ 
+ #include "config.h"
+ #include "Vector.h"
++
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ 
+ class ElementStream: public Vector
+ {
diff --git a/multimedia/gopchop/files/patch-src::Parser.h b/multimedia/gopchop/files/patch-src::Parser.h
new file mode 100644
index 000000000000..fd7c09b061b6
--- /dev/null
+++ b/multimedia/gopchop/files/patch-src::Parser.h
@@ -0,0 +1,12 @@
+--- src/Parser.h.orig	Fri Jul 12 00:30:21 2002
++++ src/Parser.h	Fri Jul 12 00:32:50 2002
+@@ -42,7 +42,9 @@
+ // strlen
+ #include <string.h>
+ 
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ 
+ #include "List.h"
+ 
diff --git a/multimedia/gopchop/files/patch-src::mpegcat.c b/multimedia/gopchop/files/patch-src::mpegcat.c
new file mode 100644
index 000000000000..eaed42f65606
--- /dev/null
+++ b/multimedia/gopchop/files/patch-src::mpegcat.c
@@ -0,0 +1,16 @@
+--- src/mpegcat.c.orig	Mon Mar 11 23:53:10 2002
++++ src/mpegcat.c	Fri Jul 12 00:50:19 2002
+@@ -143,11 +143,11 @@
+ 			break;
+ 
+ 		case 'n':
+-			num_bytes = atoll(optarg);
++			num_bytes = strtoll(optarg, (char **)NULL, 10);
+ 			break;
+ 
+ 		case 'b':
+-			begin_at = atoll(optarg);
++			begin_at = strtoll(optarg, (char **)NULL, 10);
+ 			break;
+ 
+ 		default: