From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 6 09:00:37 2004 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 A040116A4D0 for ; Tue, 6 Jul 2004 09:00:37 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9360043D48 for ; Tue, 6 Jul 2004 09:00:37 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6690bSq072646 for ; Tue, 6 Jul 2004 09:00:37 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6690bH7072638; Tue, 6 Jul 2004 09:00:37 GMT (envelope-from gnats) Resent-Date: Tue, 6 Jul 2004 09:00:37 GMT Resent-Message-Id: <200407060900.i6690bH7072638@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, Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67E4516A4CE; Tue, 6 Jul 2004 08:56:41 +0000 (GMT) Received: from rusunix.org (rusunix.org [195.162.56.232]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6562B43D1F; Tue, 6 Jul 2004 08:56:40 +0000 (GMT) (envelope-from aquatique@rusunix.org) Received: by rusunix.org (Postfix, from userid 1111) id 3EB271CD0A3; Tue, 6 Jul 2004 15:56:38 +0700 (OMSST) Message-Id: <20040706085638.3EB271CD0A3@rusunix.org> Date: Tue, 6 Jul 2004 15:56:38 +0700 (OMSST) From: To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: krion@FreeBSD.org Subject: ports/68720: update audio/gogo-petit to 3.13 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: aquatique-ports@rambler.ru List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jul 2004 09:00:37 -0000 >Number: 68720 >Category: ports >Synopsis: update audio/gogo-petit to 3.13 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jul 06 09:00:37 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Evgueni V. Gavrilov >Release: FreeBSD 4.10-RELEASE i386 >Organization: http://rusunix.org >Environment: System: FreeBSD rusunix.org 4.10-RELEASE FreeBSD 4.10-RELEASE #0: Thu May 27 18:47:13 OMSST 2004 root@rusunix.org:/usr/obj/usr/src/sys/NEWMONSTER i386 >Description: update audio/gogo-petit to 3.13 >How-To-Repeat: patch < >Fix: files patch-Makefile.in, patch-engine-common.h, patch-main.c should be removed at all diff -ruN gogo-petit.OLD/Makefile gogo-petit/Makefile --- gogo-petit.OLD/Makefile Tue Jul 6 15:02:07 2004 +++ gogo-petit/Makefile Tue Jul 6 15:51:23 2004 @@ -6,13 +6,13 @@ # PORTNAME= gogo -PORTVERSION= 3.11 +PORTVERSION= 3.13 PORTREVISION= 1 CATEGORIES= audio -MASTER_SITES= http://homepage1.nifty.com/herumi/soft/petit/ \ +MASTER_SITES= http://homepage2.nifty.com/kei-i/petit/ \ ftp://rusunix.org/pub/FreeBSD/distfiles/ PKGNAMESUFFIX= petit -DISTNAME= petit311p1 +DISTNAME= petit313 EXTRACT_SUFX= .tgz MAINTAINER= aquatique-ports@rambler.ru @@ -20,14 +20,15 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -WRKSRC= ${WRKDIR}/petit +WRKSRC= ${WRKDIR}/${DISTNAME}/FreeBSD -USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_REINPLACE= yes CFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}" ONLY_FOR_ARCHS= i386 PLIST_FILES= bin/gogo-petit + +post-patch: + @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile || @${ECHO} yo .include diff -ruN gogo-petit.OLD/distinfo gogo-petit/distinfo --- gogo-petit.OLD/distinfo Tue Jul 6 15:02:07 2004 +++ gogo-petit/distinfo Tue Jul 6 15:03:28 2004 @@ -1,2 +1,2 @@ -MD5 (petit311p1.tgz) = aaf9f56549985ef0a166213578954a90 -SIZE (petit311p1.tgz) = 380397 +MD5 (petit313.tgz) = aea10a40091b4e3aa29d700e842ccb11 +SIZE (petit313.tgz) = 389322 diff -ruN gogo-petit.OLD/files/patch-FreeBSD-Makefile gogo-petit/files/patch-FreeBSD-Makefile --- gogo-petit.OLD/files/patch-FreeBSD-Makefile Thu Jan 1 06:00:00 1970 +++ gogo-petit/files/patch-FreeBSD-Makefile Tue Jul 6 15:28:48 2004 @@ -0,0 +1,21 @@ +--- Makefile.orig Tue Jul 6 15:16:18 2004 ++++ Makefile Tue Jul 6 15:25:20 2004 +@@ -7,7 +7,7 @@ + # + ####################################################### + +-TARGET = gogo ++TARGET = gogo-petit + + ####################################################### + +@@ -150,7 +150,8 @@ + #global.h : common.h gogo.h l3side.h + #l3side.h: encoder.h machine.h + +-../engine/i386/global.cfg : $(MAKECFG) global.h ++global.cfg : $(MAKECFG) global.h ++ gcc -pipe -I../engine ../engine/i386/makecfg.c -o $(MAKECFG) + ./$(MAKECFG) > ../engine/i386/global.cfg + + thread.o : thread.c config.h global.h common.h gogo.h l3side.h encoder.h machine.h thread.h ../pthread/thread.c diff -ruN gogo-petit.OLD/files/patch-Makefile.in gogo-petit/files/patch-Makefile.in --- gogo-petit.OLD/files/patch-Makefile.in Tue Jul 6 15:02:07 2004 +++ gogo-petit/files/patch-Makefile.in Thu Jan 1 06:00:00 1970 @@ -1,15 +0,0 @@ -diff -ruN petit.orig/Makefile.in petit/Makefile.in ---- Makefile.in.orig Fri Nov 22 15:54:18 2002 -+++ Makefile.in Thu Nov 6 13:22:21 2003 -@@ -108,9 +108,8 @@ - $(CC) $(OBJS) -o $@ $(LIBS) - - install: $(TARGET) -- $(INSTALL_PROGRAM) $< $(INSTDIR)/ -- --# $(STRIP) $(INSTDIR)/$(TARGET) -+ $(INSTALL_PROGRAM) $< $(PREFIX)/bin/gogo-petit -+ $(STRIP) $(PREFIX)/bin/gogo-petit - - uninstall: - $(RM) $(INSTDIR)/$(TARGET) diff -ruN gogo-petit.OLD/files/patch-engine-common.h gogo-petit/files/patch-engine-common.h --- gogo-petit.OLD/files/patch-engine-common.h Tue Jul 6 15:02:07 2004 +++ gogo-petit/files/patch-engine-common.h Thu Jan 1 06:00:00 1970 @@ -1,12 +0,0 @@ -diff -ruN petit.orig/engine/common.h petit/engine/common.h ---- engine/common.h.orig Sat Mar 16 16:19:29 2002 -+++ engine/common.h Thu Nov 6 13:18:32 2003 -@@ -18,7 +18,7 @@ - #endif - - /* 全然一般的でない */ --#if defined(WIN32) || defined(__linux__) || defined(DOS) || defined(_M_IX86) || defined(__os2__) || defined(_X86_) -+#if defined(WIN32) || defined(__linux__) || defined(DOS) || defined(_M_IX86) || defined(__os2__) || defined(_X86_) || defined(__FreeBSD__) - #define CPU_I386 - #define MIE_LITTLE_ENDIAN - #elif define(__MWERKS__) diff -ruN gogo-petit.OLD/files/patch-main.c gogo-petit/files/patch-main.c --- gogo-petit.OLD/files/patch-main.c Tue Jul 6 15:02:07 2004 +++ gogo-petit/files/patch-main.c Thu Jan 1 06:00:00 1970 @@ -1,12 +0,0 @@ -diff -ruN petit.orig/main.c petit/main.c ---- main.c.orig Sat Nov 23 19:32:22 2002 -+++ main.c Thu Nov 6 13:21:06 2003 -@@ -9,7 +9,7 @@ - #include - #include - #endif --#if defined(__linux__) || defined(__os2__) -+#if defined(__linux__) || defined(__os2__) || defined (__FreeBSD__) - # define min(x,y) (((x)<(y))?(x):(y)) - # define max(x,y) (((x)>(y))?(x):(y)) - #endif diff -ruN gogo-petit.OLD/pkg-descr gogo-petit/pkg-descr --- gogo-petit.OLD/pkg-descr Tue Jul 6 15:02:07 2004 +++ gogo-petit/pkg-descr Tue Jul 6 15:02:42 2004 @@ -7,4 +7,4 @@ Overclocking may cause serious internal errors and crazy results. Or you need gigantic heatsink and extra-noisy fans. :-) -WWW: http://homepage1.nifty.com/herumi/gogo_e.html +WWW: http://homepage2.nifty.com/kei-i/ >Release-Note: >Audit-Trail: >Unformatted: