ports/52043: Update port: audio/gsi to 0.9.6
KATO Tsuguru
tkato at prontomail.com
Fri May 16 21:40:17 UTC 2003
The following reply was made to PR ports/52043; it has been noted by GNATS.
From: KATO Tsuguru <tkato at prontomail.com>
To: Pete Fritchman <petef at FreeBSD.org>
Cc: FreeBSD-gnats-submit at FreeBSD.org
Subject: Re: ports/52043: Update port: audio/gsi to 0.9.6
Date: Sat, 17 May 2003 06:36:17 +0900
On Thu, 15 May 2003 22:02:27 -0500 (CDT)
Pete Fritchman <petef at FreeBSD.org> wrote:
> Synopsis: Update port: audio/gsi to 0.9.6
>
> State-Changed-From-To: open->analyzed
> State-Changed-By: petef
> State-Changed-When: Thu May 15 22:01:08 CDT 2003
> State-Changed-Why:
> This doesn't complete a 'make install' for me:
Ah, that's right. Plase use this patch instead.
diff -urN /usr/ports/audio/gsi/Makefile audio/gsi/Makefile
--- /usr/ports/audio/gsi/Makefile Sat Apr 12 22:35:39 2003
+++ audio/gsi/Makefile Fri May 16 17:25:30 2003
@@ -6,17 +6,18 @@
#
PORTNAME= gsi
-PORTVERSION= 0.9.4
+PORTVERSION= 0.9.6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gsi
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports at FreeBSD.org
-COMMENT= GSI - general sound interface
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
+COMMENT= General sound interface
+USE_BZIP2= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" MYFLAGS="${CFLAGS}" OPTIMIZE=""
INSTALLS_SHLIB= yes
MANCOMPRESSED= no
@@ -28,32 +29,29 @@
MAN8= gsi_server.8
post-patch:
-.for file in lib/gsimixer/api/mixer_oss.c lib/gsimixer/api/mixer_fbsd.c \
- lib/gsipcm/api/pcm_oss.c lib/gsipcm/gsipcm.c \
- lib/gsipcm/api/pcm_fbsd.c lib/gsisynth/api/synth_oss_gus.c \
- lib/gsisynth/api/synth_oss_opl.c lib/gsisynth/api/synth_oss.c \
- lib/gsisynth/api/midi_control_oss.c
- @${SED} -e 's,machine/soundcard.h,sys/soundcard.h,' < \
- ${WRKSRC}/${file} > ${WRKSRC}/${file}.new
- @${MV} ${WRKSRC}/${file}.new ${WRKSRC}/${file}
+.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
-pre-configure:
+do-configure:
@${SH} ${FILESDIR}/configure.sh ${PREFIX} ${WRKSRC}
post-install:
- @${INSTALL_DATA} ${WRKSRC}/server.conf/gsi.conf.fbsd \
+ @${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
-.for lib in "" cd f midi_pcm mixer pcm synth
- @${STRIP_CMD} ${PREFIX}/lib/libgsi${lib}.so.[02]
-.endfor
- @${ECHO} "A sample configuration file was installed as" \
+ @${ECHO_MSG} "A sample configuration file was installed as" \
${PREFIX}/etc/gsi.conf.sample.
- @${ECHO} "Copy and edit it to fit the system."
- @${ECHO}
+ @${ECHO_MSG} "Copy and edit it to fit the system."
+ @${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff -urN /usr/ports/audio/gsi/distinfo audio/gsi/distinfo
--- /usr/ports/audio/gsi/distinfo Sun Jul 22 01:10:08 2001
+++ audio/gsi/distinfo Sat Jan 18 20:47:19 2003
@@ -1 +1 @@
-MD5 (gsi-0.9.4.tar.gz) = d6d901b545d6bd2e264e8ed326fe07bf
+MD5 (gsi-0.9.6.tar.bz2) = 00377e95e68adb07d9f70a1a343b2126
diff -urN /usr/ports/audio/gsi/files/configure.sh audio/gsi/files/configure.sh
--- /usr/ports/audio/gsi/files/configure.sh Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/configure.sh Sat Jan 18 20:56:51 2003
@@ -25,10 +25,3 @@
_E_O_M2_
echo "done."
-
-# Fix a file to reflect where the configuration file should be looked for.
-echo -n "Configuring server/config.c... "
-mv server/config.c server/config.c.orig
-cat server/config.c.orig | sed "s|/etc/gsi.conf|${PREFIX}&|" > server/config.c
-
-echo "done."
diff -urN /usr/ports/audio/gsi/files/patch-ab audio/gsi/files/patch-ab
--- /usr/ports/audio/gsi/files/patch-ab Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,24 +0,0 @@
---- 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
-
diff -urN /usr/ports/audio/gsi/files/patch-ac audio/gsi/files/patch-ac
--- /usr/ports/audio/gsi/files/patch-ac Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-ac Fri May 16 17:19:57 2003
@@ -1,11 +1,33 @@
---- ../gsi/applications/file/Makefile Wed Feb 2 19:04:50 2000
-+++ ./applications/file/Makefile Thu Dec 7 18:59:20 2000
+--- applications/file/Makefile.orig Wed Dec 6 16:30:51 2000
++++ applications/file/Makefile Fri May 16 17:19:09 2003
@@ -23,7 +23,7 @@
- INCLUDES = -I../../include
+ INCLUDES = -I../../lib/include
-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
+CFLAGS += -Wall -DDEBUG
ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
+@@ -38,7 +38,7 @@
+ INSTALL_FILE = $(BINDIR)/$(PRG)
+
+ CURRENT_GSI_LIBS= -L../../lib/gsif
+-LIBS = $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsif -lm
++LIBS = $(CURRENT_GSI_LIBS) -lgsif -lm
+
+
+ #-----------------------------------------------------------------------------#
+@@ -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/*.1 $(MANDIR)/man1/
+
+
+ #-----------------------------------------------------------------------------#
diff -urN /usr/ports/audio/gsi/files/patch-ad audio/gsi/files/patch-ad
--- /usr/ports/audio/gsi/files/patch-ad Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-ad Fri May 16 17:12:56 2003
@@ -1,11 +1,33 @@
---- ../gsi/applications/player/Makefile Wed Feb 2 19:05:01 2000
-+++ ./applications/player/Makefile Thu Dec 7 18:59:20 2000
+--- applications/player/Makefile.orig Tue Dec 19 02:31:29 2000
++++ applications/player/Makefile Fri May 16 17:12:31 2003
@@ -23,7 +23,7 @@
- INCLUDES = -I../../include
+ INCLUDES = -I../../lib/include
-CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
+CFLAGS += -Wall -DDEBUG
ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
+@@ -43,7 +43,7 @@
+ else
+ CURSES = ncurses
+ endif
+-LIBS = $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsi -lgsif -lm -l$(CURSES) $(EXTRALIBS)
++LIBS = $(CURRENT_GSI_LIBS) -lgsi -lgsif -lm -l$(CURSES) $(EXTRALIBS)
+
+
+ #-----------------------------------------------------------------------------#
+@@ -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/
+
+
+ #-----------------------------------------------------------------------------#
diff -urN /usr/ports/audio/gsi/files/patch-ae audio/gsi/files/patch-ae
--- /usr/ports/audio/gsi/files/patch-ae Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-ae Fri May 16 16:43:52 2003
@@ -1,20 +1,29 @@
---- ../gsi/lib/gsi/Makefile Wed Feb 2 19:02:05 2000
-+++ ./lib/gsi/Makefile Thu Dec 7 18:59:20 2000
+--- lib/gsi/Makefile.orig Tue Jan 30 21:10:30 2001
++++ lib/gsi/Makefile Fri May 16 16:43:36 2003
@@ -23,7 +23,7 @@
STATIC_LIB = libgsi.a
DYNAMIC_LIB = libgsi.so
LIB_NAME = $(LIBGSI)
--VERSION = .0.1
+-VERSION = .0.2
+VERSION = .0
- LIB_OBJS = gsi.o event.o functions.o io.o
+ LIB_OBJS = connect.o event.o functions.o io.o utils.o log.o
@@ -31,7 +31,7 @@
- INCLUDES = -I../../include
+ INCLUDES = -I../include
-WARN = -Wall -Wstrict-prototypes
+WARN = -Wall #-Wstrict-prototypes
- MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
+ MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_MAKELIB_CFLAGS)
+@@ -132,7 +132,7 @@
+
+
+ install.man:
+- cp -f doc/*.3 $(MANDIR)/man3/
++ cp -f doc/man3/*.3 $(MANDIR)/man3/
+
+ uninstall:
+ rm -f $(INSTALL_FILE)
diff -urN /usr/ports/audio/gsi/files/patch-af audio/gsi/files/patch-af
--- /usr/ports/audio/gsi/files/patch-af Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-af Fri May 16 16:59:04 2003
@@ -1,12 +1,12 @@
---- ../gsi/lib/gsicd/Makefile Wed Feb 2 19:02:51 2000
-+++ ./lib/gsicd/Makefile Thu Dec 7 18:59:20 2000
+--- lib/device/gsicd/Makefile.orig Tue Jan 30 21:12:12 2001
++++ lib/device/gsicd/Makefile Fri May 16 16:58:53 2003
@@ -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
+ LIB_OBJS = cd_functions.o utils.o event.o log.o
@@ -15,5 +15,5 @@
-WARN = -Wall -Wstrict-prototypes
+WARN = -Wall #-Wstrict-prototypes
- MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
+ MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_MAKELIB_CFLAGS)
diff -urN /usr/ports/audio/gsi/files/patch-ag audio/gsi/files/patch-ag
--- /usr/ports/audio/gsi/files/patch-ag Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-ag Fri May 16 16:45:06 2003
@@ -1,20 +1,29 @@
---- ../gsi/lib/gsif/Makefile Wed Feb 2 19:03:14 2000
-+++ ./lib/gsif/Makefile Thu Dec 7 18:59:20 2000
+--- lib/gsif/Makefile.orig Tue Jan 30 16:23:10 2001
++++ lib/gsif/Makefile Fri May 16 16:44:47 2003
@@ -23,7 +23,7 @@
STATIC_LIB = libgsif.a
DYNAMIC_LIB = libgsif.so
LIB_NAME = $(LIBGSIF)
--VERSION = .0.1
+-VERSION = .0.2
+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 @@
+ LIB_OBJS = io.o log.o error.o \
+ formats.o \
+ \
+@@ -36,7 +36,7 @@
- INCLUDES = -I../../include
+ INCLUDES = -I../include
-WARN = -Wall -Wstrict-prototypes
+WARN = -Wall #-Wstrict-prototypes
- MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
+ MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_MAKELIB_CFLAGS)
+@@ -101,7 +101,7 @@
+
+
+ install.man:
+- cp doc/*.3 $(MANDIR)/man3/
++ cp doc/man3/*.3 $(MANDIR)/man3/
+
+ uninstall:
+ rm -f $(INSTALL_FILE)
diff -urN /usr/ports/audio/gsi/files/patch-ah audio/gsi/files/patch-ah
--- /usr/ports/audio/gsi/files/patch-ah Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-ah Fri May 16 16:47:24 2003
@@ -1,20 +1,20 @@
---- ../gsi/lib/gsimidi_pcm/Makefile Wed Feb 2 19:03:27 2000
-+++ ./lib/gsimidi_pcm/Makefile Thu Dec 7 18:59:21 2000
+--- lib/gsimidi_pcm/Makefile.orig Mon Jan 8 19:49:16 2001
++++ lib/gsimidi_pcm/Makefile Fri May 16 16:47:01 2003
@@ -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
+ LIB_SRCS = instrument/patchgram.c instrument/patchlex.c
+ LIB_OBJS = gsimidi_pcm.o midi_to_pcm.o midi_parse.o midi_init.o midi_data.o \
+ input/midi_file.o input/midi_stream.o volume.o \
+@@ -38,7 +38,7 @@
+ INSTRUM_DIR = $(SHRDIR)/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
+-DEBUG_FLAGS = -Wall -Wstrict-prototypes #-DKPMIDI_DEBUG #-g
++DEBUG_FLAGS = -Wall #-Wstrict-prototypes #-DKPMIDI_DEBUG #-g
+
+ # Comment out the following line if you do not want to use the GPL'ed GUS
+ # patch reading code:
diff -urN /usr/ports/audio/gsi/files/patch-ai audio/gsi/files/patch-ai
--- /usr/ports/audio/gsi/files/patch-ai Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-ai Fri May 16 17:23:02 2003
@@ -1,12 +1,12 @@
---- ../gsi/lib/gsimixer/Makefile Wed Feb 2 19:03:43 2000
-+++ ./lib/gsimixer/Makefile Thu Dec 7 18:59:21 2000
+--- lib/device/gsimixer/Makefile.orig Mon Jan 15 01:13:55 2001
++++ lib/device/gsimixer/Makefile Fri May 16 17:22:30 2003
@@ -23,7 +23,7 @@
STATIC_LIB = libgsimixer.a
DYNAMIC_LIB = libgsimixer.so
LIB_NAME = $(LIBGSIMIXER)
-VERSION = .0.1
+VERSION = .0
- LIB_OBJS = gsimixer.o
+ LIB_OBJS = gsimixer.o log.o
@@ -31,7 +31,7 @@
@@ -16,5 +16,5 @@
-WARN = -Wall -Wstrict-prototypes
+WARN = -Wall #-Wstrict-prototypes
- MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
+ MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_MAKELIB_CFLAGS)
diff -urN /usr/ports/audio/gsi/files/patch-aj audio/gsi/files/patch-aj
--- /usr/ports/audio/gsi/files/patch-aj Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-aj Fri May 16 16:42:41 2003
@@ -1,12 +1,12 @@
---- ../gsi/lib/gsipcm/Makefile Wed Feb 2 19:04:05 2000
-+++ ./lib/gsipcm/Makefile Thu Dec 7 18:59:21 2000
+--- lib/device/gsipcm/Makefile.orig Tue Jan 30 21:14:16 2001
++++ lib/device/gsipcm/Makefile Fri May 16 16:42:32 2003
@@ -23,7 +23,7 @@
STATIC_LIB = libgsipcm.a
DYNAMIC_LIB = libgsipcm.so
LIB_NAME = $(LIBGSIPCM)
-VERSION = .0.1
+VERSION = .0
- LIB_OBJS = gsipcm.o
+ LIB_OBJS = pcm_functions.o log.o
@@ -31,7 +31,7 @@
@@ -16,5 +16,14 @@
-WARN = -Wall -Wstrict-prototypes
+WARN = -Wall #-Wstrict-prototypes
- MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_CFLAGS)
+ MY_CFLAGS = $(CFLAGS) $(DEBUG) $(OPTIMIZE) $(WARN) $(SYSCONFIG_THREADS_MAKELIB_CFLAGS)
+@@ -95,7 +95,7 @@
+
+
+ install.man:
+- cp doc/*.3 $(MANDIR)/man3/
++ cp doc/man3/*.3 $(MANDIR)/man3/
+
+ uninstall:
+ rm -f $(INSTALL_FILE)
diff -urN /usr/ports/audio/gsi/files/patch-ak audio/gsi/files/patch-ak
--- /usr/ports/audio/gsi/files/patch-ak Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-ak Thu Jan 1 09:00:00 1970
@@ -1,18 +0,0 @@
---- ../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)
-
diff -urN /usr/ports/audio/gsi/files/patch-al audio/gsi/files/patch-al
--- /usr/ports/audio/gsi/files/patch-al Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-al Fri May 16 16:37:04 2003
@@ -1,5 +1,5 @@
---- ../gsi/server/Makefile Wed Feb 2 19:01:15 2000
-+++ ./server/Makefile Thu Dec 7 18:59:21 2000
+--- server/Makefile.orig Tue Jan 30 13:05:51 2001
++++ server/Makefile Fri May 16 16:36:47 2003
@@ -23,7 +23,7 @@
DEFINES =
@@ -9,7 +9,7 @@
CFLAGS = $(DEBUG) $(OPTIMIZE) $(WARN)
-@@ -96,12 +96,6 @@
+@@ -102,20 +102,14 @@
@echo
@echo "Installing the server:"
cp $(GSI_SERVER) $(INSTALL_FILE)
@@ -20,5 +20,16 @@
- @echo "[ note the security implications, see the documentation ]"
-
- install.man: $(MANDIR)/man8/gsi_server.8 $(MANDIR)/man5/gsi.conf.5
+-install.man: doc/gsi_server.8 doc/gsi.conf.5
++install.man: doc/man8/gsi_server.8 doc/man5/gsi.conf.5
+ @echo
+ @echo "Installing gsi_server man page:"
+- cp -f doc/gsi_server.8 $(MANDIR)/man8/
++ cp -f doc/man8/gsi_server.8 $(MANDIR)/man8/
+ @echo
+ @echo "Installing gsi.conf man page:"
+- cp -f doc/gsi.conf.5 $(MANDIR)/man5/
++ cp -f doc/man5/gsi.conf.5 $(MANDIR)/man5/
+
+ uninstall.man:
diff -urN /usr/ports/audio/gsi/files/patch-am audio/gsi/files/patch-am
--- /usr/ports/audio/gsi/files/patch-am Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-am Fri May 16 17:08:51 2003
@@ -1,11 +1,20 @@
---- ../gsi/test/gsicd/Makefile Wed Feb 2 19:05:14 2000
-+++ ./test/gsicd/Makefile Thu Dec 7 18:59:21 2000
-@@ -26,7 +26,7 @@
+--- test/device/gsicd/Makefile.orig Thu Dec 28 04:00:45 2000
++++ test/device/gsicd/Makefile Fri May 16 17:08:09 2003
+@@ -21,7 +21,7 @@
#-----------------------------------------------------------------------------#
- INCLUDES = -I../../include
+ INCLUDES = -I../../../lib/include
--CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
+-CFLAGS = -O2 -DDEBUG -g -Wall
+CFLAGS += -Wall -DDEBUG
ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
+@@ -35,7 +35,7 @@
+
+
+ CURRENT_GSI_LIBS= -L../../../lib/device/gsicd
+-LIBS = $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsicd $(EXTRALIBS_CD)
++LIBS = $(CURRENT_GSI_LIBS) -lgsicd $(EXTRALIBS_CD)
+
+
+ #-----------------------------------------------------------------------------#
diff -urN /usr/ports/audio/gsi/files/patch-an audio/gsi/files/patch-an
--- /usr/ports/audio/gsi/files/patch-an Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-an Fri May 16 17:10:29 2003
@@ -1,11 +1,20 @@
---- ../gsi/test/gsif/Makefile Wed Feb 2 19:05:23 2000
-+++ ./test/gsif/Makefile Thu Dec 7 18:59:21 2000
-@@ -25,7 +25,7 @@
+--- test/gsif/Makefile.orig Tue Jan 30 16:38:07 2001
++++ test/gsif/Makefile Fri May 16 17:09:57 2003
+@@ -20,7 +20,7 @@
#-----------------------------------------------------------------------------#
- INCLUDES = -I../../include
+ INCLUDES = -I../../lib/include
--CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
+-CFLAGS = -O2 -DDEBUG -g -Wall
+CFLAGS += -Wall -DDEBUG
ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
+@@ -40,7 +40,7 @@
+ DEPEND = .depend
+
+ CURRENT_GSI_LIBS= -L../../lib/gsif
+-LIBS = $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsif
++LIBS = $(CURRENT_GSI_LIBS) -lgsif
+
+
+ #-----------------------------------------------------------------------------#
diff -urN /usr/ports/audio/gsi/files/patch-ao audio/gsi/files/patch-ao
--- /usr/ports/audio/gsi/files/patch-ao Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-ao Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- ../gsi/test/gsif/mus_to_midi/Makefile Wed Feb 2 19:05:31 2000
-+++ ./test/gsif/mus_to_midi/Makefile Thu Dec 7 18:59:21 2000
-@@ -25,7 +25,7 @@
- #-----------------------------------------------------------------------------#
- INCLUDES = -I../../../include
-
--CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
-+CFLAGS += -Wall -DDEBUG
-
- ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
-
diff -urN /usr/ports/audio/gsi/files/patch-ap audio/gsi/files/patch-ap
--- /usr/ports/audio/gsi/files/patch-ap Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-ap Fri May 16 17:09:34 2003
@@ -1,11 +1,20 @@
---- ../gsi/test/gsimixer/Makefile Wed Feb 2 19:05:44 2000
-+++ ./test/gsimixer/Makefile Thu Dec 7 18:59:21 2000
-@@ -26,7 +26,7 @@
+--- test/device/gsimixer/Makefile.orig Wed Dec 6 16:32:21 2000
++++ test/device/gsimixer/Makefile Fri May 16 17:09:12 2003
+@@ -21,7 +21,7 @@
#-----------------------------------------------------------------------------#
- INCLUDES = -I../../include
+ INCLUDES = -I../../../lib/include
--CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
+-CFLAGS = -O2 -DDEBUG -g -Wall
+CFLAGS += -Wall -DDEBUG
ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
+@@ -32,7 +32,7 @@
+
+
+ CURRENT_GSI_LIBS= -L../../../lib/device/gsimixer
+-LIBS = $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsimixer $(EXTRALIBS_MIXER)
++LIBS = $(CURRENT_GSI_LIBS) -lgsimixer $(EXTRALIBS_MIXER)
+
+
+ #-----------------------------------------------------------------------------#
diff -urN /usr/ports/audio/gsi/files/patch-aq audio/gsi/files/patch-aq
--- /usr/ports/audio/gsi/files/patch-aq Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-aq Fri May 16 17:02:46 2003
@@ -1,11 +1,20 @@
---- ../gsi/test/gsipcm/Makefile Wed Feb 2 19:05:53 2000
-+++ ./test/gsipcm/Makefile Thu Dec 7 18:59:21 2000
-@@ -26,7 +26,7 @@
+--- test/device/gsipcm/Makefile.orig Wed Dec 6 16:32:26 2000
++++ test/device/gsipcm/Makefile Fri May 16 16:52:33 2003
+@@ -21,7 +21,7 @@
#-----------------------------------------------------------------------------#
- INCLUDES = -I../../include
+ INCLUDES = -I../../../lib/include
--CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
+-CFLAGS = -O2 -DDEBUG -g -Wall
+CFLAGS += -Wall -DDEBUG
ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
+@@ -32,7 +32,7 @@
+
+
+ CURRENT_GSI_LIBS= -L../../../lib/device/gsipcm -L../../../lib/gsif
+-LIBS = $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsipcm -lgsif $(EXTRALIBS_PCM)
++LIBS = $(CURRENT_GSI_LIBS) -lgsipcm -lgsif $(EXTRALIBS_PCM)
+
+
+ #-----------------------------------------------------------------------------#
diff -urN /usr/ports/audio/gsi/files/patch-ar audio/gsi/files/patch-ar
--- /usr/ports/audio/gsi/files/patch-ar Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-ar Fri May 16 17:02:13 2003
@@ -1,11 +1,20 @@
---- ../gsi/test/memory_leak/Makefile Wed Feb 2 19:06:01 2000
-+++ ./test/memory_leak/Makefile Thu Dec 7 18:59:21 2000
-@@ -28,7 +28,7 @@
+--- test/server/memory_leak/Makefile.orig Thu Dec 28 02:59:47 2000
++++ test/server/memory_leak/Makefile Fri May 16 16:53:49 2003
+@@ -23,7 +23,7 @@
- INCLUDES = -I../../include #-I/usr/local/include
+ INCLUDES = -I../../../lib/include
--CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
+-CFLAGS = -O2 -DDEBUG -g -Wall
+CFLAGS += -Wall -DDEBUG
ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
+@@ -44,7 +44,7 @@
+ else
+ CURSES = ncurses
+ endif
+-LIBS = $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsi -lgsif -lm -l$(CURSES) $(EXTRALIBS)
++LIBS = $(CURRENT_GSI_LIBS) -lgsi -lgsif -lm -l$(CURSES) $(EXTRALIBS)
+
+ #-----------------------------------------------------------------------------#
+ # Targets
diff -urN /usr/ports/audio/gsi/files/patch-as audio/gsi/files/patch-as
--- /usr/ports/audio/gsi/files/patch-as Fri Dec 8 03:05:11 2000
+++ audio/gsi/files/patch-as Fri May 16 16:54:53 2003
@@ -1,11 +1,20 @@
---- ../gsi/test/server/general/Makefile Wed Feb 2 19:06:12 2000
-+++ ./test/server/general/Makefile Thu Dec 7 18:59:21 2000
-@@ -28,7 +28,7 @@
+--- test/server/general/Makefile.orig Tue Jan 2 09:22:00 2001
++++ test/server/general/Makefile Fri May 16 16:54:46 2003
+@@ -23,7 +23,7 @@
- INCLUDES = -I../../../include
+ INCLUDES = -I../../../lib/include
--CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
+-CFLAGS = -O2 -DDEBUG -g -Wall
+CFLAGS += -Wall -DDEBUG
ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
+@@ -42,7 +42,7 @@
+ else
+ CURSES = ncurses
+ endif
+-LIBS = $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsi -lgsif -lm -l$(CURSES) $(EXTRALIBS)
++LIBS = $(CURRENT_GSI_LIBS) -lgsi -lgsif -lm -l$(CURSES) $(EXTRALIBS)
+
+
+ #-----------------------------------------------------------------------------#
diff -urN /usr/ports/audio/gsi/files/patch-at audio/gsi/files/patch-at
--- /usr/ports/audio/gsi/files/patch-at Fri Dec 8 03:05:12 2000
+++ audio/gsi/files/patch-at Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- ../gsi/test/server/shm/Makefile Wed Feb 2 19:06:19 2000
-+++ ./test/server/shm/Makefile Thu Dec 7 18:59:21 2000
-@@ -28,7 +28,7 @@
-
- INCLUDES = -I../../../include
-
--CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
-+CFLAGS += -Wall -DDEBUG
- ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
-
-
diff -urN /usr/ports/audio/gsi/files/patch-au audio/gsi/files/patch-au
--- /usr/ports/audio/gsi/files/patch-au Fri Dec 8 03:05:12 2000
+++ audio/gsi/files/patch-au Fri May 16 16:56:06 2003
@@ -1,11 +1,20 @@
---- ../gsi/test/server/stream/Makefile Wed Feb 2 19:06:27 2000
-+++ ./test/server/stream/Makefile Thu Dec 7 18:59:21 2000
-@@ -28,7 +28,7 @@
+--- test/server/stream/Makefile.orig Wed Dec 6 16:32:56 2000
++++ test/server/stream/Makefile Fri May 16 16:55:55 2003
+@@ -23,7 +23,7 @@
- INCLUDES = -I../../../include
+ INCLUDES = -I../../../lib/include
--CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
+-CFLAGS = -O2 -DDEBUG -g -Wall
+CFLAGS += -Wall -DDEBUG
ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
+@@ -42,7 +42,7 @@
+ else
+ CURSES = ncurses
+ endif
+-LIBS = $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsi -lgsif -lm -l$(CURSES) $(EXTRALIBS)
++LIBS = $(CURRENT_GSI_LIBS) -lgsi -lgsif -lm -l$(CURSES) $(EXTRALIBS)
+
+
+ #-----------------------------------------------------------------------------#
diff -urN /usr/ports/audio/gsi/files/patch-av audio/gsi/files/patch-av
--- /usr/ports/audio/gsi/files/patch-av Fri Dec 8 03:05:12 2000
+++ audio/gsi/files/patch-av Fri May 16 17:02:04 2003
@@ -1,11 +1,20 @@
---- ../gsi/test/server/threads/Makefile Wed Feb 2 19:06:37 2000
-+++ ./test/server/threads/Makefile Thu Dec 7 18:59:21 2000
-@@ -29,7 +29,7 @@
+--- test/server/threads/Makefile.orig Wed Dec 6 16:33:01 2000
++++ test/server/threads/Makefile Fri May 16 16:57:21 2003
+@@ -24,7 +24,7 @@
- INCLUDES = -I../../../include
+ INCLUDES = -I../../../lib/include
--CFLAGS = -O2 -fomit-frame-pointer -DDEBUG -g -Wall
+-CFLAGS = -O2 -DDEBUG -g -Wall
+CFLAGS += -Wall -DDEBUG
- ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS)
+ ifeq ($(OS), OpenBSD)
+ ALL_CFLAGS = $(DEFINES) $(INCLUDES) $(CFLAGS) -pthread
+ else
+@@ -50,7 +50,7 @@
+ else
+ CURSES = ncurses
+ endif
+-LIBS = $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsi -lgsif $(SYSCONFIG_THREADS_LFLAGS) -l$(CURSES) $(EXTRALIBS)
++LIBS = $(CURRENT_GSI_LIBS) -lgsi -lgsif $(SYSCONFIG_THREADS_LFLAGS) -l$(CURSES) $(EXTRALIBS)
+ #-----------------------------------------------------------------------------#
diff -urN /usr/ports/audio/gsi/files/patch-aw audio/gsi/files/patch-aw
--- /usr/ports/audio/gsi/files/patch-aw Thu Jan 1 09:00:00 1970
+++ audio/gsi/files/patch-aw Fri May 16 17:15:28 2003
@@ -0,0 +1,11 @@
+--- test/gsimidi_pcm/Makefile.orig Tue Jan 2 09:42:20 2001
++++ test/gsimidi_pcm/Makefile Fri May 16 17:15:09 2003
+@@ -33,7 +33,7 @@
+
+
+ CURRENT_GSI_LIBS= -L../../lib/device/gsipcm -L../../lib/gsimidi_pcm -L../../lib/gsif
+-LIBS = $(CURRENT_GSI_LIBS) -L/usr/local/lib -lgsipcm -lgsimidi_pcm -lgsif -lm $(EXTRALIBS_PCM)
++LIBS = $(CURRENT_GSI_LIBS) -lgsipcm -lgsimidi_pcm -lgsif -lm $(EXTRALIBS_PCM)
+
+
+ #-----------------------------------------------------------------------------#
diff -urN /usr/ports/audio/gsi/pkg-plist audio/gsi/pkg-plist
--- /usr/ports/audio/gsi/pkg-plist Fri Dec 8 03:08:37 2000
+++ audio/gsi/pkg-plist Fri May 16 16:20:49 2003
@@ -16,13 +16,21 @@
include/gsi/gsi_events.h
include/gsi/gsi_instrumentnames_gus.h
include/gsi/gsi_midi_names.h
+include/gsi/gsi_shm.h
include/gsi/gsi_subcommands.h
include/gsi/gsicd.h
+include/gsi/gsicd_config.h
include/gsi/gsif.h
+include/gsi/gsif_config.h
include/gsi/gsif_midi.h
+include/gsi/gsimidi_pcm.h
+include/gsi/gsimidi_pcm_config.h
include/gsi/gsimixer.h
+include/gsi/gsimixer_config.h
include/gsi/gsipcm.h
+include/gsi/gsipcm_config.h
include/gsi/gsisynth.h
+include/gsi/gsisynth_config.h
include/gsi/kpmidi.h
include/gsi/kpmidi_patch.h
include/gsi/mixer_data.h
@@ -31,7 +39,9 @@
include/gsi/pcm_data.h
include/gsi/synth_data.h
include/gsi/version.h
+include/gsi/volume.h
include/gsi/whs_debug.h
+include/gsi/whs_debug2.h
include/gsi/whs_defines.h
include/gsi/whs_types.h
lib/libgsi.so
@@ -46,6 +56,4 @@
lib/libgsimixer.so.0
lib/libgsipcm.so
lib/libgsipcm.so.0
-lib/libgsisynth.so
-lib/libgsisynth.so.0
@dirrm include/gsi
More information about the freebsd-ports-bugs
mailing list