Date: Tue, 6 May 2003 23:32:12 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/51869: Update port: multimedia/gopchop Message-ID: <20030506233212.01a106a9.tkato@prontomail.com> Resent-Message-ID: <200305061440.h46EeLJI012099@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 51869
>Category: ports
>Synopsis: Update port: multimedia/gopchop
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 06 07:40:21 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build on -stable
- Utilize USE_GETOPT_LONG
New file:
patch-src::ElementStream.h
patch-src::Parser.h
patch-src::mpegcat.c
Remove file:
files/patch-Makefile.in
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/multimedia/gopchop/Makefile multimedia/gopchop/Makefile
--- /usr/ports/multimedia/gopchop/Makefile Wed Apr 16 01:35:23 2003
+++ multimedia/gopchop/Makefile Tue May 6 22:46:01 2003
@@ -18,22 +18,27 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= MPEG2 GOP-accurate editor
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
- SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
- intl.4:${PORTSDIR}/devel/gettext \
- iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
+ mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+
+SDLCONFIG?= ${LOCALBASE}/bin/sdl11-config
USE_GNOME= gtk12
+USE_GETOPT_LONG= yes
USE_REINPLACE= yes
-SDLCONFIG?= ${LOCALBASE}/bin/sdl11-config
GNU_CONFIGURE= yes
-CONFIGURE_ENV= \
- CPPFLAGS="${CXXFLAGS} -DHAVE_DECL_GETOPT -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt" \
- SDLCONFIG="${SDLCONFIG}"
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+ SDLCONFIG="${SDLCONFIG}"
+CONFIGURE_ARGS= --disable-mlib
+
+CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
+LDFLAGS= -L${LOCALBASE}/lib
post-patch:
- @${REINPLACE_CMD} -e 's|-lglib||g' ${WRKSRC}/src/Makefile.in
+ @${REINPLACE_CMD} -e 's| -mcpu=.*"|"|g' ${WRKSRC}/configure
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|pixmaps/\$$(PACKAGE)|\$$(PACKAGE)/pixmaps|g ; \
+ s|-lglib||g'
.include <bsd.port.mk>
diff -urN /usr/ports/multimedia/gopchop/files/patch-Makefile.in multimedia/gopchop/files/patch-Makefile.in
--- /usr/ports/multimedia/gopchop/files/patch-Makefile.in Tue Apr 15 20:15:01 2003
+++ multimedia/gopchop/files/patch-Makefile.in Thu Jan 1 09:00:00 1970
@@ -1,15 +0,0 @@
---- 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 -urN /usr/ports/multimedia/gopchop/files/patch-src::ElementStream.h multimedia/gopchop/files/patch-src::ElementStream.h
--- /usr/ports/multimedia/gopchop/files/patch-src::ElementStream.h Thu Jan 1 09:00:00 1970
+++ multimedia/gopchop/files/patch-src::ElementStream.h Tue May 6 22:42:15 2003
@@ -0,0 +1,13 @@
+--- src/ElementStream.h.orig Thu Jan 17 06:32:23 2002
++++ src/ElementStream.h Tue May 6 21:35:30 2003
+@@ -29,7 +29,10 @@
+
+ #include "config.h"
+ #include "Vector.h"
++
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+
+ class ElementStream: public Vector
+ {
diff -urN /usr/ports/multimedia/gopchop/files/patch-src::Parser.h multimedia/gopchop/files/patch-src::Parser.h
--- /usr/ports/multimedia/gopchop/files/patch-src::Parser.h Thu Jan 1 09:00:00 1970
+++ multimedia/gopchop/files/patch-src::Parser.h Tue May 6 22:42:15 2003
@@ -0,0 +1,12 @@
+--- 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"
+
diff -urN /usr/ports/multimedia/gopchop/files/patch-src::mpegcat.c multimedia/gopchop/files/patch-src::mpegcat.c
--- /usr/ports/multimedia/gopchop/files/patch-src::mpegcat.c Thu Jan 1 09:00:00 1970
+++ multimedia/gopchop/files/patch-src::mpegcat.c Tue May 6 22:42:15 2003
@@ -0,0 +1,22 @@
+--- src/mpegcat.c.orig Mon Apr 14 12:21:04 2003
++++ src/mpegcat.c Tue May 6 21:46:58 2003
+@@ -390,11 +390,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 = strtoll(optarg, NULL, 10);
++#else
+ begin_at = atoll(optarg);
++#endif
+ break;
+
+ case 'w':
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030506233212.01a106a9.tkato>