Attachment #31152 for bug #52043

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




#

PORTNAME=	gsi
PORTVERSION=	0.9.6
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	General sound interface

WRKSRC=		${WRKDIR}/${PORTNAME}

USE_BZIP2=	yes
USE_REINPLACE=	yes
USE_GMAKE=	yes
MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" MYFLAGS="${CFLAGS}" OPTIMIZE=""
INSTALLS_SHLIB=	yes

MANCOMPRESSED=	no

MAN8=		gsi_server.8

post-patch:
	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
		's|/usr/local/lib|\$$\{LOCALBASE\}/lib|g ; \
		 s|= \.0\..|= \.0|g ; \
		 s|= \.2\..|= \.2|g'
.for file in lib/device/gsimixer/api/mixer_fbsd.c \
	lib/device/gsipcm/api/pcm_fbsd.c
	@${REINPLACE_CMD} -e \
		's|machine/soundcard.h|sys/soundcard.h|g' ${WRKSRC}/${file}
.endfor
.for file in server/FINISH_host_allow.c server/client.c server/conf.c
	@${REINPLACE_CMD} -e \
		's|"/etc/|"${PREFIX}/etc/|g' ${WRKSRC}/${file}
.endfor

do-configure:
	@${SH} ${FILESDIR}/configure.sh ${PREFIX} ${WRKSRC}

post-install:
	@${INSTALL_DATA} ${WRKSRC}/server/conf/gsi.conf.fbsd \
		 ${PREFIX}/etc/gsi.conf.sample
.for fileNdx in gsi_server gsifile gsiplay
	@${STRIP_CMD} ${PREFIX}/bin/${fileNdx}
.endfor
	@${ECHO_MSG} "A sample configuration file was installed as" \
	@${STRIP_CMD} ${PREFIX}/lib/libgsi${lib}.so.[02]
.endfor
	@${ECHO} "A sample configuration file was installed as" \
		${PREFIX}/etc/gsi.conf.sample.
	@${ECHO_MSG} "Copy and edit it to fit the system."
	@${ECHO_MSG}
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>

Line 1 Link Here

(-)audio/gsi/distinfo (-1 / +1 lines)
1	MD5 (gsi-0.9.4.tar.gz) = d6d901b545d6bd2e264e8ed326fe07bf	1	MD5 (gsi-0.9.6.tar.bz2) = 00377e95e68adb07d9f70a1a343b2126

Lines 25-34 Link Here

(-)audio/gsi/files/configure.sh (-7 lines)
25		25
26	_E_O_M2_	26	_E_O_M2_
27	echo "done."	27	echo "done."
28
29	# Fix a file to reflect where the configuration file should be looked for.
30	echo -n "Configuring server/config.c... "
31	mv server/config.c server/config.c.orig
32	cat server/config.c.orig \| sed "s\|/etc/gsi.conf\|${PREFIX}&\|" > server/config.c
33
34	echo "done."




--- Config/Configure_application.sh.orig	Thu Feb 10 05:05:40 2000
+++ Config/Configure_application.sh	Thu Dec  7 19:20:18 2000
@@ -274,8 +274,8 @@
 # Optimize & debug:
 # Include DEBUG code?
 if [ "`$Ask 'Do you want to compile with DEBUG code included?' 'y'`" != "n" ]; then
-	debug="-DDEBUG -g"
-	optimize="-O2"
+	debug="-DDEBUG"
+#	optimize="-O2"
 
 	# Use NANA debugging library?
 	if [ "`$Ask '  Use the NANA debugging library? (probably only usable for GCC)' 'n'`" != "n" ]; then
@@ -283,9 +283,8 @@
 		extralibs="$extralibs -lnana"
 	fi
 
-else
 	# Default: full optimization:
-	optimize="-O2 -fomit-frame-pointer"
+	optimize=""
 	optimize=`$Ask 'What optimization flags do you want to use?' "$optimize"`
 fi
 

Lines 1-11 Link Here

(-)audio/gsi/files/patch-ac (-11 lines)
1	--- ../gsi/applications/file/Makefile Wed Feb 2 19:04:50 2000
2	+++ ./applications/file/Makefile Thu Dec 7 18:59:20 2000
3	@@ -23,7 +23,7 @@
4
5	INCLUDES = -I../../include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
10
11

Lines 1-11 Link Here

(-)audio/gsi/files/patch-ad (-11 lines)
1	--- ../gsi/applications/player/Makefile Wed Feb 2 19:05:01 2000
2	+++ ./applications/player/Makefile Thu Dec 7 18:59:20 2000
3	@@ -23,7 +23,7 @@
4
5	INCLUDES = -I../../include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
10
11




--- ../gsi/lib/gsi/Makefile	Wed Feb  2 19:02:05 2000
+++ ./lib/gsi/Makefile	Thu Dec  7 18:59:20 2000
@@ -23,7 +23,7 @@
 STATIC_LIB	= libgsi.a
 DYNAMIC_LIB	= libgsi.so
 LIB_NAME	= $(LIBGSI)
-VERSION		= .0.1
+VERSION		= .0
 LIB_OBJS	= gsi.o event.o functions.o io.o
 
 
@@ -31,7 +31,7 @@
 
 INCLUDES	= -I../../include
 
-WARN		= -Wall -Wstrict-prototypes
+WARN		= -Wall #-Wstrict-prototypes
 
 MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
 




--- ../gsi/lib/gsicd/Makefile	Wed Feb  2 19:02:51 2000
+++ ./lib/gsicd/Makefile	Thu Dec  7 18:59:20 2000
@@ -23,14 +23,14 @@
 STATIC_LIB	= libgsicd.a
 DYNAMIC_LIB	= libgsicd.so
 LIB_NAME	= $(LIBGSICD)
-VERSION		= .0.1
+VERSION		= .0
 LIB_OBJS	= gsicd.o utils.o event.o
 
 
 
 INCLUDES	= -I../../include
 
-WARN		= -Wall -Wstrict-prototypes
+WARN		= -Wall #-Wstrict-prototypes
 
 MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
 




--- ../gsi/lib/gsif/Makefile	Wed Feb  2 19:03:14 2000
+++ ./lib/gsif/Makefile	Thu Dec  7 18:59:20 2000
@@ -23,7 +23,7 @@
 STATIC_LIB	= libgsif.a
 DYNAMIC_LIB	= libgsif.so
 LIB_NAME	= $(LIBGSIF)
-VERSION		= .0.1
+VERSION		= .0
 LIB_OBJS	= io.o \
 			sample/load_save.o sample/sample_format.o sample/block.o sample/types.o sample/fill_buffer.o sample/convert_block.o sample/mulaw.o sample/sample_get_structure_aif.o sample/sample_get_structure_au.o sample/sample_get_structure_voc.o sample/sample_get_structure_wav.o sample/save_au.o sample/save_aiff.o \
 			song/save_midi.o song/midi_utils.o song/midi_decode.o song/load_song.o song/load_midi.o song/load_hmp.o song/load_mus.o song/convert_mus_to_midi.o
@@ -34,7 +34,7 @@
 
 INCLUDES	= -I../../include
 
-WARN		= -Wall -Wstrict-prototypes
+WARN		= -Wall #-Wstrict-prototypes
 
 MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
 




--- ../gsi/lib/gsimidi_pcm/Makefile	Wed Feb  2 19:03:27 2000
+++ ./lib/gsimidi_pcm/Makefile	Thu Dec  7 18:59:21 2000
@@ -23,7 +23,7 @@
 STATIC_LIB	= libgsimidi_pcm.a
 DYNAMIC_LIB	= libgsimidi_pcm.so
 LIB_NAME	= $(LIBGSIMIDI_PCM)
-VERSION		= .2.0
+VERSION		= .2
 LIB_SRCS	= patchgram.c patchlex.c
 LIB_OBJS	= debug.o midi.o midiparse.o mididata.o input/midifile.o \
 		init.o input/midiin.o match.o volume.o instrum.o error.o \
@@ -33,7 +33,7 @@
 INSTRUM_DIR	= $(SHRDIR)/share/gsi/gsimidi_pcm
 INSTRUM_MAP	= $(INSTRUM_DIR)/patch.mp
 
-DEBUG_FLAGS	= -DKPMIDI_DEBUG -Wall -Wstrict-prototypes
+DEBUG_FLAGS	= -DKPMIDI_DEBUG -Wall #-Wstrict-prototypes
 #OTHER_FLAGS	= -DPOSIX_REALTIME -DREPLACED_GUS_C
 #OUTPUT_SRCS	= output/gsi.c
 #OUTPUT_OBJS	= output/gsi.o




--- ../gsi/lib/gsimixer/Makefile	Wed Feb  2 19:03:43 2000
+++ ./lib/gsimixer/Makefile	Thu Dec  7 18:59:21 2000
@@ -23,7 +23,7 @@
 STATIC_LIB	= libgsimixer.a
 DYNAMIC_LIB	= libgsimixer.so
 LIB_NAME	= $(LIBGSIMIXER)
-VERSION		= .0.1
+VERSION		= .0
 LIB_OBJS	= gsimixer.o
 
 
@@ -31,7 +31,7 @@
 
 INCLUDES	= -I../../include
 
-WARN		= -Wall -Wstrict-prototypes
+WARN		= -Wall #-Wstrict-prototypes
 
 MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
 




--- ../gsi/lib/gsipcm/Makefile	Wed Feb  2 19:04:05 2000
+++ ./lib/gsipcm/Makefile	Thu Dec  7 18:59:21 2000
@@ -23,7 +23,7 @@
 STATIC_LIB	= libgsipcm.a
 DYNAMIC_LIB	= libgsipcm.so
 LIB_NAME	= $(LIBGSIPCM)
-VERSION		= .0.1
+VERSION		= .0
 LIB_OBJS	= gsipcm.o
 
 
@@ -31,7 +31,7 @@
 
 INCLUDES	= -I../../include
 
-WARN		= -Wall -Wstrict-prototypes
+WARN		= -Wall #-Wstrict-prototypes
 
 MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
 




--- ../gsi/lib/gsisynth/Makefile	Wed Feb  2 19:04:23 2000
+++ ./lib/gsisynth/Makefile	Thu Dec  7 18:59:21 2000
@@ -23,13 +23,13 @@
 STATIC_LIB	= libgsisynth.a
 DYNAMIC_LIB	= libgsisynth.so
 LIB_NAME	= $(LIBGSISYNTH)
-VERSION		= .0.1
+VERSION		= .0
 LIB_OBJS	= gsisynth.o midi_control.o api/synth_null.o api/synth_oss.o api/synth_oss_opl.o api/synth_oss_gus.o api/synth_ultra.o api/synth_pcm.o api/midi_control_null.o api/midi_control_oss.o api/midi_control_ultra.o
 
 
 INCLUDES	= -I../../include
 
-WARN		= -Wall -Wstrict-prototypes
+WARN		= -Wall #-Wstrict-prototypes
 
 MY_CFLAGS	= $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
 

Lines 1-11 Link Here

(-)audio/gsi/files/patch-am (-11 lines)
1	--- ../gsi/test/gsicd/Makefile Wed Feb 2 19:05:14 2000
2	+++ ./test/gsicd/Makefile Thu Dec 7 18:59:21 2000
3	@@ -26,7 +26,7 @@
4	#-----------------------------------------------------------------------------#
5	INCLUDES = -I../../include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
10
11

Lines 1-11 Link Here

(-)audio/gsi/files/patch-an (-11 lines)
1	--- ../gsi/test/gsif/Makefile Wed Feb 2 19:05:23 2000
2	+++ ./test/gsif/Makefile Thu Dec 7 18:59:21 2000
3	@@ -25,7 +25,7 @@
4	#-----------------------------------------------------------------------------#
5	INCLUDES = -I../../include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9
10	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
11

Lines 1-11 Link Here

(-)audio/gsi/files/patch-ao (-11 lines)
1	--- ../gsi/test/gsif/mus_to_midi/Makefile Wed Feb 2 19:05:31 2000
2	+++ ./test/gsif/mus_to_midi/Makefile Thu Dec 7 18:59:21 2000
3	@@ -25,7 +25,7 @@
4	#-----------------------------------------------------------------------------#
5	INCLUDES = -I../../../include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9
10	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
11

Lines 1-11 Link Here

(-)audio/gsi/files/patch-ap (-11 lines)
1	--- ../gsi/test/gsimixer/Makefile Wed Feb 2 19:05:44 2000
2	+++ ./test/gsimixer/Makefile Thu Dec 7 18:59:21 2000
3	@@ -26,7 +26,7 @@
4	#-----------------------------------------------------------------------------#
5	INCLUDES = -I../../include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
10
11




--- applications/file/Makefile.orig	Wed Dec  6 16:30:51 2000
+++ applications/file/Makefile	Sat Jan 18 22:28:23 2003
@@ -64,10 +64,10 @@
 install: $(PRG) install.man
 	cp -f $(PRG) $(INSTALL_FILE) #$(INSTALL_DIR)
 
-install.man: doc/gsifile.1
+install.man: doc/man1/gsifile.1
 	@echo
 	@echo "Installing gsifile man page:"
-	cp -f doc/*.1 $(MANDIR)/man1/
+	cp -f doc/man1/gsifile.1 $(MANDIR)/man1/
 
 
 #-----------------------------------------------------------------------------#




--- applications/player/Makefile.orig	Tue Dec 19 02:31:29 2000
+++ applications/player/Makefile	Sat Jan 18 22:29:45 2003
@@ -69,10 +69,10 @@
 install: $(PRG) install.man
 	cp -f $(PRG) $(INSTALL_FILE)
 
-install.man: doc/gsiplay.1
+install.man: doc/man1/gsiplay.1
 	@echo
 	@echo "Installing gsiplay man page:"
-	cp -f doc/gsiplay.1 $(MANDIR)/man1/
+	cp -f doc/man1/gsiplay.1 $(MANDIR)/man1/
 
 
 #-----------------------------------------------------------------------------#

Lines 1-11 Link Here

(-)audio/gsi/files/patch-aq (-11 lines)
1	--- ../gsi/test/gsipcm/Makefile Wed Feb 2 19:05:53 2000
2	+++ ./test/gsipcm/Makefile Thu Dec 7 18:59:21 2000
3	@@ -26,7 +26,7 @@
4	#-----------------------------------------------------------------------------#
5	INCLUDES = -I../../include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
10
11

Lines 1-11 Link Here

(-)audio/gsi/files/patch-ar (-11 lines)
1	--- ../gsi/test/memory_leak/Makefile Wed Feb 2 19:06:01 2000
2	+++ ./test/memory_leak/Makefile Thu Dec 7 18:59:21 2000
3	@@ -28,7 +28,7 @@
4
5	INCLUDES = -I../../include #-I/usr/local/include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
10
11

Lines 1-11 Link Here

(-)audio/gsi/files/patch-as (-11 lines)
1	--- ../gsi/test/server/general/Makefile Wed Feb 2 19:06:12 2000
2	+++ ./test/server/general/Makefile Thu Dec 7 18:59:21 2000
3	@@ -28,7 +28,7 @@
4
5	INCLUDES = -I../../../include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
10
11

Lines 1-11 Link Here

(-)audio/gsi/files/patch-at (-11 lines)
1	--- ../gsi/test/server/shm/Makefile Wed Feb 2 19:06:19 2000
2	+++ ./test/server/shm/Makefile Thu Dec 7 18:59:21 2000
3	@@ -28,7 +28,7 @@
4
5	INCLUDES = -I../../../include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
10
11

Lines 1-11 Link Here

(-)audio/gsi/files/patch-au (-11 lines)
1	--- ../gsi/test/server/stream/Makefile Wed Feb 2 19:06:27 2000
2	+++ ./test/server/stream/Makefile Thu Dec 7 18:59:21 2000
3	@@ -28,7 +28,7 @@
4
5	INCLUDES = -I../../../include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
10
11

Lines 1-11 Link Here

(-)audio/gsi/files/patch-av (-11 lines)
1	--- ../gsi/test/server/threads/Makefile Wed Feb 2 19:06:37 2000
2	+++ ./test/server/threads/Makefile Thu Dec 7 18:59:21 2000
3	@@ -29,7 +29,7 @@
4
5	INCLUDES = -I../../../include
6
7	-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
8	+CFLAGS += -Wall -DDEBUG
9	ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
10
11

Return to bug 52043

Lines 6-22 Link Here

(-)audio/gsi/Makefile (-21 / +23 lines)
6	#	6	#
7		7
8	PORTNAME= gsi	8	PORTNAME= gsi
9	PORTVERSION= 0.9.4	9	PORTVERSION= 0.9.6
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= gsi	12	MASTER_SITE_SUBDIR= ${PORTNAME}
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= GSI - general sound interface	15	COMMENT= General sound interface
16
17	WRKSRC= ${WRKDIR}/${PORTNAME}
18		16
		17	USE_BZIP2= yes
		18	USE_REINPLACE= yes
19	USE_GMAKE= yes	19	USE_GMAKE= yes
		20	MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" MYFLAGS="${CFLAGS}" OPTIMIZE=""
20	INSTALLS_SHLIB= yes	21	INSTALLS_SHLIB= yes
21		22
22	MANCOMPRESSED= no	23	MANCOMPRESSED= no
Lines 28-59 Link Here
28	MAN8= gsi_server.8	29	MAN8= gsi_server.8
29		30
30	post-patch:	31	post-patch:
31	.for file in lib/gsimixer/api/mixer_oss.c lib/gsimixer/api/mixer_fbsd.c \	32	@${FIND} ${WRKSRC} -name "Makefile" \| ${XARGS} ${REINPLACE_CMD} -e \
32	lib/gsipcm/api/pcm_oss.c lib/gsipcm/gsipcm.c \	33	's\|/usr/local/lib\|\$$\{LOCALBASE\}/lib\|g ; \
33	lib/gsipcm/api/pcm_fbsd.c lib/gsisynth/api/synth_oss_gus.c \	34	s\|= \.0\..\|= \.0\|g ; \
34	lib/gsisynth/api/synth_oss_opl.c lib/gsisynth/api/synth_oss.c \	35	s\|= \.2\..\|= \.2\|g'
35	lib/gsisynth/api/midi_control_oss.c	36	.for file in lib/device/gsimixer/api/mixer_fbsd.c \
36	@${SED} -e 's,machine/soundcard.h,sys/soundcard.h,' < \	37	lib/device/gsipcm/api/pcm_fbsd.c
37	${WRKSRC}/${file} > ${WRKSRC}/${file}.new	38	@${REINPLACE_CMD} -e \
38	@${MV} ${WRKSRC}/${file}.new ${WRKSRC}/${file}	39	's\|machine/soundcard.h\|sys/soundcard.h\|g' ${WRKSRC}/${file}
		40	.endfor
		41	.for file in server/FINISH_host_allow.c server/client.c server/conf.c
		42	@${REINPLACE_CMD} -e \
		43	's\|"/etc/\|"${PREFIX}/etc/\|g' ${WRKSRC}/${file}
39	.endfor	44	.endfor
40		45
41	pre-configure:	46	do-configure:
42	@${SH} ${FILESDIR}/configure.sh ${PREFIX} ${WRKSRC}	47	@${SH} ${FILESDIR}/configure.sh ${PREFIX} ${WRKSRC}
43		48
44	post-install:	49	post-install:
45	@${INSTALL_DATA} ${WRKSRC}/server.conf/gsi.conf.fbsd \	50	@${INSTALL_DATA} ${WRKSRC}/server/conf/gsi.conf.fbsd \
46	${PREFIX}/etc/gsi.conf.sample	51	${PREFIX}/etc/gsi.conf.sample
47	.for fileNdx in gsi_server gsifile gsiplay	52	.for fileNdx in gsi_server gsifile gsiplay
48	@${STRIP_CMD} ${PREFIX}/bin/${fileNdx}	53	@${STRIP_CMD} ${PREFIX}/bin/${fileNdx}
49	.endfor	54	.endfor
50	.for lib in "" cd f midi_pcm mixer pcm synth	55	@${ECHO_MSG} "A sample configuration file was installed as" \
51	@${STRIP_CMD} ${PREFIX}/lib/libgsi${lib}.so.[02]
52	.endfor
53	@${ECHO} "A sample configuration file was installed as" \
54	${PREFIX}/etc/gsi.conf.sample.	56	${PREFIX}/etc/gsi.conf.sample.
55	@${ECHO} "Copy and edit it to fit the system."	57	@${ECHO_MSG} "Copy and edit it to fit the system."
56	@${ECHO}	58	@${ECHO_MSG}
57	@${CAT} ${PKGMESSAGE}	59	@${CAT} ${PKGMESSAGE}
58		60
59	.include <bsd.port.mk>	61	.include <bsd.port.mk>

Lines 1-24 Link Here

(-)audio/gsi/files/patch-ab (-24 lines)
1	--- Config/Configure_application.sh.orig Thu Feb 10 05:05:40 2000
2	+++ Config/Configure_application.sh Thu Dec 7 19:20:18 2000
3	@@ -274,8 +274,8 @@
4	# Optimize & debug:
5	# Include DEBUG code?
6	if [ "`$Ask 'Do you want to compile with DEBUG code included?' 'y'`" != "n" ]; then
7	- debug="-DDEBUG -g"
8	- optimize="-O2"
9	+ debug="-DDEBUG"
10	+# optimize="-O2"
11
12	# Use NANA debugging library?
13	if [ "`$Ask ' Use the NANA debugging library? (probably only usable for GCC)' 'n'`" != "n" ]; then
14	@@ -283,9 +283,8 @@
15	extralibs="$extralibs -lnana"
16	fi
17
18	-else
19	# Default: full optimization:
20	- optimize="-O2 -fomit-frame-pointer"
21	+ optimize=""
22	optimize=`$Ask 'What optimization flags do you want to use?' "$optimize"`
23	fi
24

Lines 1-20 Link Here

(-)audio/gsi/files/patch-ae (-20 lines)
1	--- ../gsi/lib/gsi/Makefile Wed Feb 2 19:02:05 2000
2	+++ ./lib/gsi/Makefile Thu Dec 7 18:59:20 2000
3	@@ -23,7 +23,7 @@
4	STATIC_LIB = libgsi.a
5	DYNAMIC_LIB = libgsi.so
6	LIB_NAME = $(LIBGSI)
7	-VERSION = .0.1
8	+VERSION = .0
9	LIB_OBJS = gsi.o event.o functions.o io.o
10
11
12	@@ -31,7 +31,7 @@
13
14	INCLUDES = -I../../include
15
16	-WARN = -Wall -Wstrict-prototypes
17	+WARN = -Wall #-Wstrict-prototypes
18
19	MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
20

Lines 1-19 Link Here

(-)audio/gsi/files/patch-af (-19 lines)
1	--- ../gsi/lib/gsicd/Makefile Wed Feb 2 19:02:51 2000
2	+++ ./lib/gsicd/Makefile Thu Dec 7 18:59:20 2000
3	@@ -23,14 +23,14 @@
4	STATIC_LIB = libgsicd.a
5	DYNAMIC_LIB = libgsicd.so
6	LIB_NAME = $(LIBGSICD)
7	-VERSION = .0.1
8	+VERSION = .0
9	LIB_OBJS = gsicd.o utils.o event.o
10
11
12
13	INCLUDES = -I../../include
14
15	-WARN = -Wall -Wstrict-prototypes
16	+WARN = -Wall #-Wstrict-prototypes
17
18	MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
19

Lines 1-20 Link Here

(-)audio/gsi/files/patch-ag (-20 lines)
1	--- ../gsi/lib/gsif/Makefile Wed Feb 2 19:03:14 2000
2	+++ ./lib/gsif/Makefile Thu Dec 7 18:59:20 2000
3	@@ -23,7 +23,7 @@
4	STATIC_LIB = libgsif.a
5	DYNAMIC_LIB = libgsif.so
6	LIB_NAME = $(LIBGSIF)
7	-VERSION = .0.1
8	+VERSION = .0
9	LIB_OBJS = io.o \
10	sample/load_save.o sample/sample_format.o sample/block.o sample/types.o sample/fill_buffer.o sample/convert_block.o sample/mulaw.o sample/sample_get_structure_aif.o sample/sample_get_structure_au.o sample/sample_get_structure_voc.o sample/sample_get_structure_wav.o sample/save_au.o sample/save_aiff.o \
11	song/save_midi.o song/midi_utils.o song/midi_decode.o song/load_song.o song/load_midi.o song/load_hmp.o song/load_mus.o song/convert_mus_to_midi.o
12	@@ -34,7 +34,7 @@
13
14	INCLUDES = -I../../include
15
16	-WARN = -Wall -Wstrict-prototypes
17	+WARN = -Wall #-Wstrict-prototypes
18
19	MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
20

Lines 1-20 Link Here

(-)audio/gsi/files/patch-ah (-20 lines)
1	--- ../gsi/lib/gsimidi_pcm/Makefile Wed Feb 2 19:03:27 2000
2	+++ ./lib/gsimidi_pcm/Makefile Thu Dec 7 18:59:21 2000
3	@@ -23,7 +23,7 @@
4	STATIC_LIB = libgsimidi_pcm.a
5	DYNAMIC_LIB = libgsimidi_pcm.so
6	LIB_NAME = $(LIBGSIMIDI_PCM)
7	-VERSION = .2.0
8	+VERSION = .2
9	LIB_SRCS = patchgram.c patchlex.c
10	LIB_OBJS = debug.o midi.o midiparse.o mididata.o input/midifile.o \
11	init.o input/midiin.o match.o volume.o instrum.o error.o \
12	@@ -33,7 +33,7 @@
13	INSTRUM_DIR = $(SHRDIR)/share/gsi/gsimidi_pcm
14	INSTRUM_MAP = $(INSTRUM_DIR)/patch.mp
15
16	-DEBUG_FLAGS = -DKPMIDI_DEBUG -Wall -Wstrict-prototypes
17	+DEBUG_FLAGS = -DKPMIDI_DEBUG -Wall #-Wstrict-prototypes
18	#OTHER_FLAGS = -DPOSIX_REALTIME -DREPLACED_GUS_C
19	#OUTPUT_SRCS = output/gsi.c
20	#OUTPUT_OBJS = output/gsi.o

Lines 1-20 Link Here

(-)audio/gsi/files/patch-ai (-20 lines)
1	--- ../gsi/lib/gsimixer/Makefile Wed Feb 2 19:03:43 2000
2	+++ ./lib/gsimixer/Makefile Thu Dec 7 18:59:21 2000
3	@@ -23,7 +23,7 @@
4	STATIC_LIB = libgsimixer.a
5	DYNAMIC_LIB = libgsimixer.so
6	LIB_NAME = $(LIBGSIMIXER)
7	-VERSION = .0.1
8	+VERSION = .0
9	LIB_OBJS = gsimixer.o
10
11
12	@@ -31,7 +31,7 @@
13
14	INCLUDES = -I../../include
15
16	-WARN = -Wall -Wstrict-prototypes
17	+WARN = -Wall #-Wstrict-prototypes
18
19	MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
20

Lines 1-20 Link Here

(-)audio/gsi/files/patch-aj (-20 lines)
1	--- ../gsi/lib/gsipcm/Makefile Wed Feb 2 19:04:05 2000
2	+++ ./lib/gsipcm/Makefile Thu Dec 7 18:59:21 2000
3	@@ -23,7 +23,7 @@
4	STATIC_LIB = libgsipcm.a
5	DYNAMIC_LIB = libgsipcm.so
6	LIB_NAME = $(LIBGSIPCM)
7	-VERSION = .0.1
8	+VERSION = .0
9	LIB_OBJS = gsipcm.o
10
11
12	@@ -31,7 +31,7 @@
13
14	INCLUDES = -I../../include
15
16	-WARN = -Wall -Wstrict-prototypes
17	+WARN = -Wall #-Wstrict-prototypes
18
19	MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
20

Lines 1-18 Link Here

(-)audio/gsi/files/patch-ak (-18 lines)
1	--- ../gsi/lib/gsisynth/Makefile Wed Feb 2 19:04:23 2000
2	+++ ./lib/gsisynth/Makefile Thu Dec 7 18:59:21 2000
3	@@ -23,13 +23,13 @@
4	STATIC_LIB = libgsisynth.a
5	DYNAMIC_LIB = libgsisynth.so
6	LIB_NAME = $(LIBGSISYNTH)
7	-VERSION = .0.1
8	+VERSION = .0
9	LIB_OBJS = gsisynth.o midi_control.o api/synth_null.o api/synth_oss.o api/synth_oss_opl.o api/synth_oss_gus.o api/synth_ultra.o api/synth_pcm.o api/midi_control_null.o api/midi_control_oss.o api/midi_control_ultra.o
10
11
12	INCLUDES = -I../../include
13
14	-WARN = -Wall -Wstrict-prototypes
15	+WARN = -Wall #-Wstrict-prototypes
16
17	MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
18

Line 0 Link Here

(-)audio/gsi/files/patch-applications-file-Makefile (+15 lines)
	1	--- applications/file/Makefile.orig Wed Dec 6 16:30:51 2000
	2	+++ applications/file/Makefile Sat Jan 18 22:28:23 2003
	3	@@ -64,10 +64,10 @@
	4	install: $(PRG) install.man
	5	cp -f $(PRG) $(INSTALL_FILE) #$(INSTALL_DIR)
	6
	7	-install.man: doc/gsifile.1
	8	+install.man: doc/man1/gsifile.1
	9	@echo
	10	@echo "Installing gsifile man page:"
	11	- cp -f doc/*.1 $(MANDIR)/man1/
	12	+ cp -f doc/man1/gsifile.1 $(MANDIR)/man1/
	13
	14
	15	#-----------------------------------------------------------------------------#

Line 0 Link Here

(-)audio/gsi/files/patch-applications-player-Makefile (+15 lines)
	1	--- applications/player/Makefile.orig Tue Dec 19 02:31:29 2000
	2	+++ applications/player/Makefile Sat Jan 18 22:29:45 2003
	3	@@ -69,10 +69,10 @@
	4	install: $(PRG) install.man
	5	cp -f $(PRG) $(INSTALL_FILE)
	6
	7	-install.man: doc/gsiplay.1
	8	+install.man: doc/man1/gsiplay.1
	9	@echo
	10	@echo "Installing gsiplay man page:"
	11	- cp -f doc/gsiplay.1 $(MANDIR)/man1/
	12	+ cp -f doc/man1/gsiplay.1 $(MANDIR)/man1/
	13
	14
	15	#-----------------------------------------------------------------------------#