upgrade to 0.8 and unbreak

7 files changed, 28 insertions, 56 deletions

diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 2b4ee6bad01f..66507122804d 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	gopchop
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.8
+PORTREVISION=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://outflux.net/unix/software/GOPchop/download/
@@ -18,25 +18,22 @@ DISTNAME=	GOPchop-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MPEG2 GOP-accurate editor
 
-BROKEN=		Does not work with libmpeg 0.3.0 and later
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libvo.a:${PORTSDIR}/multimedia/libmpeg2
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
-		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
+		SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
+		intl.4:${PORTSDIR}/devel/gettext \
+		iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_GNOMENG=	yes
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
+SDLCONFIG?=	${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE=	yes
-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}
+CONFIGURE_ENV=	\
+	CPPFLAGS="${CXXFLAGS} -DHAVE_DECL_GETOPT -I${LOCALBASE}/include" \
+	LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt" \
+	SDLCONFIG="${SDLCONFIG}"
 
 post-patch:
-	@${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/distinfo b/multimedia/gopchop/distinfo
index 66125447f3c7..ac73bc30bbaa 100644
--- a/multimedia/gopchop/distinfo
+++ b/multimedia/gopchop/distinfo
@@ -1 +1 @@
-MD5 (GOPchop-0.6.tar.gz) = dbd1cf67038db966f7be6362845130f6
+MD5 (GOPchop-0.8.tar.gz) = c3c2a6d784196111c49a3855052936ad
diff --git a/multimedia/gopchop/files/patch-Makefile.in b/multimedia/gopchop/files/patch-Makefile.in
new file mode 100644
index 000000000000..f9a0dc7cb7e8
--- /dev/null
+++ b/multimedia/gopchop/files/patch-Makefile.in
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	Tue Apr 15 19:04:54 2003
++++ Makefile.in	Tue Apr 15 19:09:09 2003
+@@ -438,10 +438,10 @@
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+ 	if test -d $(srcdir)/pixmaps; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps/$(PACKAGE); \
++	  $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE)/pixmaps; \
+ 	  for pixmap in $(srcdir)/pixmaps/*; do \
+ 	    if test -f $$pixmap; then \
+-	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/$(PACKAGE); \
++	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/$(PACKAGE)/pixmaps; \
+ 	    fi \
+ 	  done \
+ 	fi
diff --git a/multimedia/gopchop/files/patch-src::ElementStream.h b/multimedia/gopchop/files/patch-src::ElementStream.h
deleted file mode 100644
index c3927a980d86..000000000000
--- a/multimedia/gopchop/files/patch-src::ElementStream.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index fd7c09b061b6..000000000000
--- a/multimedia/gopchop/files/patch-src::Parser.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index eaed42f65606..000000000000
--- a/multimedia/gopchop/files/patch-src::mpegcat.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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:
diff --git a/multimedia/gopchop/pkg-plist b/multimedia/gopchop/pkg-plist
index 8565ba8f893c..e128851c2d9e 100644
--- a/multimedia/gopchop/pkg-plist
+++ b/multimedia/gopchop/pkg-plist
@@ -1,4 +1,5 @@
 bin/GOPchop
+bin/gtkspu
 bin/mpegcat
 share/GOPchop/pixmaps/about.xpm
 share/GOPchop/pixmaps/error.xpm