7 files changed, 33 insertions, 50 deletions

diff --git a/audio/gogo-petit/Makefile b/audio/gogo-petit/Makefile
index 228dcef6a9e3..4e92e08af18f 100644
--- a/audio/gogo-petit/Makefile
+++ b/audio/gogo-petit/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	gogo
-PORTVERSION=	3.11
-PORTREVISION=	1
+PORTVERSION=	3.13
 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 +19,16 @@ COMMENT=	New variant of well-known GOGO-no-coda mp3 encoder
 
 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}| ; \
+	s|/usr/local/bin|${PREFIX}/bin|g' ${WRKSRC}/Makefile || @${ECHO} yo
+
 .include <bsd.port.mk>
diff --git a/audio/gogo-petit/distinfo b/audio/gogo-petit/distinfo
index d07206111b22..49acfd39f4a4 100644
--- a/audio/gogo-petit/distinfo
+++ b/audio/gogo-petit/distinfo
@@ -1,2 +1,2 @@
-MD5 (petit311p1.tgz) = aaf9f56549985ef0a166213578954a90
-SIZE (petit311p1.tgz) = 380397
+MD5 (petit313.tgz) = aea10a40091b4e3aa29d700e842ccb11
+SIZE (petit313.tgz) = 389322
diff --git a/audio/gogo-petit/files/patch-FreeBSD-Makefile b/audio/gogo-petit/files/patch-FreeBSD-Makefile
new file mode 100644
index 000000000000..9a78dfa98690
--- /dev/null
+++ b/audio/gogo-petit/files/patch-FreeBSD-Makefile
@@ -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 --git a/audio/gogo-petit/files/patch-Makefile.in b/audio/gogo-petit/files/patch-Makefile.in
deleted file mode 100644
index c1303a3c0455..000000000000
--- a/audio/gogo-petit/files/patch-Makefile.in
+++ /dev/null
@@ -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 --git a/audio/gogo-petit/files/patch-engine-common.h b/audio/gogo-petit/files/patch-engine-common.h
deleted file mode 100644
index a51ff9254fc8..000000000000
--- a/audio/gogo-petit/files/patch-engine-common.h
+++ /dev/null
@@ -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 --git a/audio/gogo-petit/files/patch-main.c b/audio/gogo-petit/files/patch-main.c
deleted file mode 100644
index cd6787168918..000000000000
--- a/audio/gogo-petit/files/patch-main.c
+++ /dev/null
@@ -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 <sys/time.h>
- #include <signal.h>
- #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 --git a/audio/gogo-petit/pkg-descr b/audio/gogo-petit/pkg-descr
index c99c10ee668e..520d2452af45 100644
--- a/audio/gogo-petit/pkg-descr
+++ b/audio/gogo-petit/pkg-descr
@@ -7,4 +7,4 @@ 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
+WWW: http://homepage2.nifty.com/kei-i/