From owner-ports-jp@jp.freebsd.org  Tue Apr 25 02:58:37 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id CAA19903;
	Tue, 25 Apr 2000 02:58:37 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from kyoto-tc011-p149.alpha-net.ne.jp ([210.237.118.151])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id CAA19894
	for <ports-jp@jp.freebsd.org>; Tue, 25 Apr 2000 02:58:32 +0900 (JST)
	(envelope-from k5@cheerful.com)
Received: from souffle.bogus-local.net (souffle.bogus-local.net [192.168.1.1])
	by kyoto-tc011-p149.alpha-net.ne.jp (Postfix) with ESMTP
	id A9D823D04; Tue, 25 Apr 2000 02:58:26 +0900 (JST)
Date: Tue, 25 Apr 2000 02:58:26 +0900
Message-ID: <8666t75qkd.wl@cheerful.com>
From: FUJISHIMA Satsuki <k5@cheerful.com>
To: nakai@freebsd.org, ports-jp@jp.freebsd.org
User-Agent: Wanderlust/1.1.0 (Overjoyed) SEMI/1.13.7 (Awazu) FLIM/1.13.2 (Kasanui) Emacs/20.6 (i386--freebsd) MULE/4.1 (AOI)
MIME-Version: 1.0 (generated by SEMI 1.13.7 - "Awazu")
Content-Type: text/plain; charset=ISO-2022-JP
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: ports-jp 9282
Subject: [ports-jp 9282] GOGO-no-coda
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: k5@cheerful.com

$B=$I|$r4^$a$J$K$d$i$$$m$$$m$H$$$8$C$F$_$^$7$?!%(B

o tarball$B$O(B2.30final$B$rL>>h$C$F$$$^$9$,(Bbanner$B$O(B2.31$B$rL>>h$C$F$$$k$N$G$=$C(B
$B$A$K$7$F$_$^$7$?!%(B
o $BI,MW$J$$?M$bB?$$$@$m$&$H;W$o$l$k(Bcdrecord$B$K(BDEPEND$B$9$k$N$O(Bpackage$B$GF~(B
$B$l$?;~$KIT9,$@$m$&$H;W$C$F30$90lJ}!$(Bcdda2mp3$B%9%/%j%W%H$O>!<j$KF~$l$k$h(B
$B$&$K$7$^$7$?!%<B9T$7$F(Bcdda2wav$B$,$J$$$<$H1>$o$l$l$P2?$rF~$l$l$P$$$$$+$/(B
$B$i$$$o$+$k$G$7$g$&!%(B
o -DKANJI$B$O(Bobsolete$B$J$N$G:o=|!%:#$O(BLC_MESSAGES$B$r8+$F8@8l$rBX$($F$$$^$9!%(B
o $B%$%s%9%H!<%k$9$k%I%-%e%a%s%H4V0c$C$F$$$k$N$r=$@5!$(BNOPORTDOCS$B$r8+$F(B
PLIST$B$rJQ99!%(B
o $(CC)$B$rB:=E(B(make CC=gcc295$B$H$G$-$^$9(B)$B!$(BCFLAGS$B$N%5%s%W%k$rDI2C!%(B
o Linuxthreads$BBP1~%*%W%7%g%s!%(B
o $BFCDj$N(BCPU$B$NL>A0$r=P$9I,MW$,$J$5$=$&$J$N$GI=8=$rJQ$($F$_$^$7$?!%(B
o $B8a8e$N$3!A$@$O(B'Gogo no coder'$B$G$b(B'afternoon coder'$B$G$b$J$/$F(B
'GOGO-no-coda'$B$i$7$$$G$9$h!%(B
o $B%Y!<%9$,(Blame 3.29beta$B$K$J$C$?$i$7$-$H$3$m$KDI=>$7$F(BDESCR$B$r6K$a$F;dE*(B
$B$KD>$7$^$7$?!%(B

$B$I$s$J$b$N$G$7$g$&$+!%(B

-- 
FUJISHIMA Satsuki


diff -urN -xCVS -xCFLAGS /usr/ports/audio/gogo/Makefile gogo/Makefile
--- /usr/ports/audio/gogo/Makefile	Wed Apr 19 13:46:02 2000
+++ gogo/Makefile	Mon Apr 24 13:16:10 2000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gogo
-PORTVERSION=	2.30f
+PORTVERSION=	2.31
 CATEGORIES=	audio
 MASTER_SITES=	http://homepage1.nifty.com/herumi/soft/gogo2/src/
 DISTNAME=	gogo230f
@@ -16,34 +16,45 @@
 
 # More than version 0.98
 BUILD_DEPENDS=	nasm-0.98:${PORTSDIR}/devel/nasm
-.if !defined(MINIMAL)
-RUN_DEPENDS=	cdda2wav:${PORTSDIR}/sysutils/cdrecord \
-		list_audio_tracks:${PORTSDIR}/sysutils/cdrecord
-.endif
 
 USE_GMAKE=	yes
 ALL_TARGET=	gogo
-.if(!defined(KANJI))
-MAKE_ARGS+=	DONT_USE_KANJI=-DNO_KANJI
-.else
-MAKE_ARGS+=	DONT_USE_KANJI=
-.endif
+
 RESTRICTED=	Condition is not clear
 
 WRKSRC=		${WRKDIR}/gogo231f
+PLIST=		${WRKDIR}/PLIST
+
+# A sample of heavily optimized CFLAGS(typically used with pgcc).
+# Recommended ONLY for benchmarks.
+# CFLAGS=-march=pentiumpro -O6 -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -foptimize-register-move -ffast-math -fdefer-pop -mfancy-math-387
+
+MAKE_ENV=	"CC=$(CCMD)" "LD=$(CC)"
+CCMD!=		${ECHO} "$(CC) -c $(CFLAGS) -DRAW_INPUT"
+
+pre-fetch:
+.if !defined(USE_MT)
+	@${ECHO_MSG} "set USE_MT to compile with linuxthreads."
+	@${ECHO_MSG} "It would increase performance in SMP environment."
+.else
+LIB_DEPENDS=	lthread.2:${PORTSDIR}/devel/linuxthreads
+MAKE_ENV+=	"USE_MT=yes"
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gogo ${PREFIX}/bin
-.if !defined(MINIMAL)
-	${INSTALL_SCRIPT} ${WRKSRC}/sakai/cdda2mp3.bsd \
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/cdda2mp3.bsd \
 		${PREFIX}/bin/cdda2mp3.gogo
+	${CP} ${PKGDIR}/PLIST ${PLIST}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/gogo
-	${INSTALL_DATA} ${WRKSRC}/sakai/cdda2mp3.txt \
-		${PREFIX}/share/doc/gogo/cdda2mp3.gogo.jp
-	${INSTALL_DATA} ${WRKSRC}/sakai/readme_e.txt \
+	${INSTALL_DATA} ${WRKSRC}/contrib/cdda2mp3.txt \
 		${PREFIX}/share/doc/gogo/cdda2mp3.gogo.en
-.endif
+	${INSTALL_DATA} ${WRKSRC}/contrib/cdda2mp3.euc \
+		${PREFIX}/share/doc/gogo/cdda2mp3.gogo.ja
+	${ECHO} share/doc/gogo/cdda2mp3.gogo.en >>${PLIST}
+	${ECHO} share/doc/gogo/cdda2mp3.gogo.ja >>${PLIST}
+	${ECHO} @dirrm share/doc/gogo >>${PLIST}
 .endif
 
 .include <bsd.port.mk>
diff -urN -xCVS -xCFLAGS /usr/ports/audio/gogo/patches/patch-ac gogo/patches/patch-ac
--- /usr/ports/audio/gogo/patches/patch-ac	Thu Jan  1 09:00:00 1970
+++ gogo/patches/patch-ac	Sat Apr 22 14:01:01 2000
@@ -0,0 +1,27 @@
+--- Makefile.orig	Tue Apr 11 12:07:39 2000
++++ Makefile	Sat Apr 22 14:00:59 2000
+@@ -30,10 +30,10 @@
+ endif
+ 
+ # common definition
+-LD=gcc
++#LD=gcc
+ #LD=gcc -Wl,-Map,gogo.map
+ LIBS=-lm
+-CC=gcc -c -m486 -O3 -finline-functions -fomit-frame-pointer -funroll-loops
++#CC=gcc -c -m486 -O3 -finline-functions -fomit-frame-pointer -funroll-loops
+ # This option is available for gcc-2.8.x
+ #CC=gcc -c -mcpu=pentiumpro -malign-double -O6 -fstrength-reduce -fexpensive-optimizations  -finline-functions -fomit-frame-pointer -funroll-loops
+ # This option is available for gcc-2.95.1, gcc-2.95.2, gcc-2.95.3,...
+@@ -62,10 +62,8 @@
+ ifeq ($(OS),FreeBSD)
+ 	CFLAGS+= -DDISPLAY_REALTIME
+ 	ifeq ($(USE_MT),yes)
+-		LIBS+= -L/usr/local/lib -llthread
++		LIBS+= -L/usr/local/lib -llthread -llgcc_r
+ 		CFLAGS+= -DUSE_PTHREAD -D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads
+-		CC+=-kthread
+-		LD+=-kthread
+ 	endif
+ endif
+ ifeq ($(OS),OpenBSD)
diff -urN -xCVS -xCFLAGS /usr/ports/audio/gogo/pkg/COMMENT gogo/pkg/COMMENT
--- /usr/ports/audio/gogo/pkg/COMMENT	Fri Oct  1 17:46:14 1999
+++ gogo/pkg/COMMENT	Tue Apr 25 02:48:39 2000
@@ -1 +1 @@
-Very fast MP3 encoder with MMX, 3D Now! and PentiumIII SSE support
+Very fast MP3 encoder for recent x86 processors
diff -urN -xCVS -xCFLAGS /usr/ports/audio/gogo/pkg/DESCR gogo/pkg/DESCR
--- /usr/ports/audio/gogo/pkg/DESCR	Thu Jan 27 03:15:07 2000
+++ gogo/pkg/DESCR	Tue Apr 25 02:42:46 2000
@@ -1,12 +1,12 @@
-gogo, 'Gogo no coder' (which means 'afternoon coder'), is very fast
-MP3 encoder based on lame-3.23 which is optimized for MMX, K6-2 3DNow!
-and Intel PentiumIII SSE. The latter is available when FreeBSD
-supports SSE. (Linux supports it.)
+GOGO-no-coda is very fast MP3 encoder based on lame-3.29beta,
+optimized for MMX, 3DNow!, Enhanced 3DNow! and SSE (patched nasm required
+to compile with E3DNow! and kernel support needed to enable SSE but FreeBSD
+does not have it yet).
 
-*** DON'T OVERCLOCK YOUR K6-2 ***
-Gogo heavily uses the 3DNow! unit that almost sleeps in usual,
-and the encoding CPU becomes very hot even with its normal clock.
-So overclock may cause serious internal errors or crazy results.
-Also, this may be same on PentiumIII or others.
+*** DO NOT OVERCLOCK YOUR CPUs ***
+Gogo heavily uses the part of processors that almost sleeps in usual,
+so makes them very hot even it runs standard clock.
+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
diff -urN -xCVS -xCFLAGS /usr/ports/audio/gogo/pkg/PLIST gogo/pkg/PLIST
--- /usr/ports/audio/gogo/pkg/PLIST	Fri Jan 28 03:43:27 2000
+++ gogo/pkg/PLIST	Sat Apr 22 14:28:05 2000
@@ -1,5 +1,2 @@
 bin/cdda2mp3.gogo
 bin/gogo
-share/doc/gogo/cdda2mp3.gogo.en
-share/doc/gogo/cdda2mp3.gogo.jp
-@dirrm share/doc/gogo


