Attachment #44359 for bug #68720

View | Details | Raw Unified | Return to bug 68720
Collapse All | Expand All




#

PORTNAME=	gogo
PORTVERSION=	3.13
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	http://homepage2.nifty.com/kei-i/petit/ \
		ftp://rusunix.org/pub/FreeBSD/distfiles/
PKGNAMESUFFIX=	petit
DISTNAME=	petit313
EXTRACT_SUFX=	.tgz

MAINTAINER=	aquatique-ports@rambler.ru


BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm

WRKSRC=		${WRKDIR}/${DISTNAME}/FreeBSD

USE_REINPLACE=  yes
GNU_CONFIGURE=	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 <bsd.port.mk>

Lines 1-2 Link Here

(-)gogo-petit/distinfo (-2 / +2 lines)
1	MD5 (petit311p1.tgz) = aaf9f56549985ef0a166213578954a90	1	MD5 (petit313.tgz) = aea10a40091b4e3aa29d700e842ccb11
2	SIZE (petit311p1.tgz) = 380397	2	SIZE (petit313.tgz) = 389322




--- 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 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 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
 
 /* SRêÊIÅÈ¢ */
-#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 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

Lines 7-10 Link Here

(-)gogo-petit/pkg-descr (-1 / +1 lines)
7	Overclocking may cause serious internal errors and crazy results.	7	Overclocking may cause serious internal errors and crazy results.
8	Or you need gigantic heatsink and extra-noisy fans. :-)	8	Or you need gigantic heatsink and extra-noisy fans. :-)
9		9
10	WWW: http://homepage1.nifty.com/herumi/gogo_e.html	10	WWW: http://homepage2.nifty.com/kei-i/

Return to bug 68720

Lines 6-18 Link Here

(-)gogo-petit/Makefile (-7 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= gogo	8	PORTNAME= gogo
9	PORTVERSION= 3.11	9	PORTVERSION= 3.13
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= audio	11	CATEGORIES= audio
12	MASTER_SITES= http://homepage1.nifty.com/herumi/soft/petit/ \	12	MASTER_SITES= http://homepage2.nifty.com/kei-i/petit/ \
13	ftp://rusunix.org/pub/FreeBSD/distfiles/	13	ftp://rusunix.org/pub/FreeBSD/distfiles/
14	PKGNAMESUFFIX= petit	14	PKGNAMESUFFIX= petit
15	DISTNAME= petit311p1	15	DISTNAME= petit313
16	EXTRACT_SUFX= .tgz	16	EXTRACT_SUFX= .tgz
17		17
18	MAINTAINER= aquatique-ports@rambler.ru	18	MAINTAINER= aquatique-ports@rambler.ru
Lines 20-33 Link Here
20		20
21	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm	21	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
22		22
23	WRKSRC= ${WRKDIR}/petit	23	WRKSRC= ${WRKDIR}/${DISTNAME}/FreeBSD
24		24
25	USE_GMAKE= yes	25	USE_REINPLACE= yes
26	GNU_CONFIGURE= yes
27	CFLAGS+= ${PTHREAD_CFLAGS}	26	CFLAGS+= ${PTHREAD_CFLAGS}
28	CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}"
29		27
30	ONLY_FOR_ARCHS= i386	28	ONLY_FOR_ARCHS= i386
31	PLIST_FILES= bin/gogo-petit	29	PLIST_FILES= bin/gogo-petit
		30
		31	post-patch:
		32	@${REINPLACE_CMD} -e 's\|-lc_r\|${PTHREAD_LIBS}\|' ${WRKSRC}/Makefile \|\| @${ECHO} yo
32		33
33	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Line 0 Link Here

(-)gogo-petit/files/patch-FreeBSD-Makefile (+21 lines)
	1	--- Makefile.orig Tue Jul 6 15:16:18 2004
	2	+++ Makefile Tue Jul 6 15:25:20 2004
	3	@@ -7,7 +7,7 @@
	4	#
	5	#######################################################
	6
	7	-TARGET = gogo
	8	+TARGET = gogo-petit
	9
	10	#######################################################
	11
	12	@@ -150,7 +150,8 @@
	13	#global.h : common.h gogo.h l3side.h
	14	#l3side.h: encoder.h machine.h
	15
	16	-../engine/i386/global.cfg : $(MAKECFG) global.h
	17	+global.cfg : $(MAKECFG) global.h
	18	+ gcc -pipe -I../engine ../engine/i386/makecfg.c -o $(MAKECFG)
	19	./$(MAKECFG) > ../engine/i386/global.cfg
	20
	21	thread.o : thread.c config.h global.h common.h gogo.h l3side.h encoder.h machine.h thread.h ../pthread/thread.c

Lines 1-15 Link Here

(-)gogo-petit/files/patch-Makefile.in (-15 lines)
1	diff -ruN petit.orig/Makefile.in petit/Makefile.in
2	--- Makefile.in.orig Fri Nov 22 15:54:18 2002
3	+++ Makefile.in Thu Nov 6 13:22:21 2003
4	@@ -108,9 +108,8 @@
5	$(CC) $(OBJS) -o $@ $(LIBS)
6
7	install: $(TARGET)
8	- $(INSTALL_PROGRAM) $< $(INSTDIR)/
9	-
10	-# $(STRIP) $(INSTDIR)/$(TARGET)
11	+ $(INSTALL_PROGRAM) $< $(PREFIX)/bin/gogo-petit
12	+ $(STRIP) $(PREFIX)/bin/gogo-petit
13
14	uninstall:
15	$(RM) $(INSTDIR)/$(TARGET)

Lines 1-12 Link Here

(-)gogo-petit/files/patch-engine-common.h (-12 lines)
1	diff -ruN petit.orig/engine/common.h petit/engine/common.h
2	--- engine/common.h.orig Sat Mar 16 16:19:29 2002
3	+++ engine/common.h Thu Nov 6 13:18:32 2003
4	@@ -18,7 +18,7 @@
5	#endif
6
7	/* SRêÊIÅÈ¢ */
8	-#if defined(WIN32) \|\| defined(__linux__) \|\| defined(DOS) \|\| defined(_M_IX86) \|\| defined(__os2__) \|\| defined(_X86_)
9	+#if defined(WIN32) \|\| defined(__linux__) \|\| defined(DOS) \|\| defined(_M_IX86) \|\| defined(__os2__) \|\| defined(_X86_) \|\| defined(__FreeBSD__)
10	#define CPU_I386
11	#define MIE_LITTLE_ENDIAN
12	#elif define(__MWERKS__)

Lines 1-12 Link Here

(-)gogo-petit/files/patch-main.c (-12 lines)
1	diff -ruN petit.orig/main.c petit/main.c
2	--- main.c.orig Sat Nov 23 19:32:22 2002
3	+++ main.c Thu Nov 6 13:21:06 2003
4	@@ -9,7 +9,7 @@
5	#include <sys/time.h>
6	#include <signal.h>
7	#endif
8	-#if defined(__linux__) \|\| defined(__os2__)
9	+#if defined(__linux__) \|\| defined(__os2__) \|\| defined (__FreeBSD__)
10	# define min(x,y) (((x)<(y))?(x):(y))
11	# define max(x,y) (((x)>(y))?(x):(y))
12	#endif