From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 6 07:40:43 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1893637B404 for ; Tue, 6 May 2003 07:40:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 867F044011 for ; Tue, 6 May 2003 07:40:25 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h46EeLUp012100 for ; Tue, 6 May 2003 07:40:21 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h46EeLJI012099; Tue, 6 May 2003 07:40:21 -0700 (PDT) Resent-Date: Tue, 6 May 2003 07:40:21 -0700 (PDT) Resent-Message-Id: <200305061440.h46EeLJI012099@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3673A37B401 for ; Tue, 6 May 2003 07:37:32 -0700 (PDT) Received: from hfep02.dion.ne.jp (hfep02.dion.ne.jp [203.181.105.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5537643F75 for ; Tue, 6 May 2003 07:37:31 -0700 (PDT) (envelope-from tkato@prontomail.com) Received: from localhost ([218.222.67.174]) by hfep02.dion.ne.jp with SMTP id <20030506143726050.MWJT@hfep02.dion.ne.jp> for ; Tue, 6 May 2003 23:37:26 +0900 Message-Id: <20030506233212.01a106a9.tkato@prontomail.com> Date: Tue, 6 May 2003 23:32:12 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/51869: Update port: multimedia/gopchop X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2003 14:40:43 -0000 >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 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 ++#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 + ++#ifdef HAVE_STDINT_H + #include ++#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: