Rename sndinfo to snd-info, to avoid conflict with audio/csound

port.  Tell users about the change.  Add "PLIST=${WRKDIR}/pkg-plist"
to fix a problem found by bento.  Add a patch needed for compiling
without GUILE.  Increment PORTREVISION.

4 files changed, 28 insertions, 10 deletions

diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 7e0a67916087..a35f726ca150 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		snd
 PORTVERSION=		4.6
+PORTREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \
 			${MASTER_SITE_SOURCEFORGE}
@@ -50,6 +51,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 GNU_CONFIGURE=	yes
 MAKEFILE=	makefile
+PLIST=		${WRKDIR}/pkg-plist
 PREFIX=		/
 .if !defined(WITHOUT_X)
 USE_GLIB=	yes
@@ -62,7 +64,7 @@ post-configure:
 	@${PERL} -pi -e "s:^LIBS = :LIBS = -lm:g" ${WRKSRC}/makefile
 
 do-install:
-.for i in audinfo sndinfo sndplay sndrecord sndsine
+.for i in audinfo snd-info sndplay sndrecord sndsine
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${LOCALBASE}/bin
 .endfor
 .if !defined(WITHOUT_X)
@@ -102,4 +104,7 @@ pre-build:
 	${ECHO} "@dirrm %%LOCALBASE%%/share/doc/snd" >> ${PLIST}
 .endif
 
+post-build:
+	${MV} ${WRKSRC}/sndinfo ${WRKSRC}/snd-info
+
 .include <bsd.port.mk>
diff --git a/audio/snd/files/patch-snd-nogui_c b/audio/snd/files/patch-snd-nogui_c
new file mode 100644
index 000000000000..2642ca10ab74
--- /dev/null
+++ b/audio/snd/files/patch-snd-nogui_c
@@ -0,0 +1,12 @@
+--- snd-nogui.c.orig	Mon Sep 18 05:09:28 2000
++++ snd-nogui.c	Thu Oct 19 01:09:33 2000
+@@ -230,7 +230,9 @@
+ char *clm2snd_help(void) {return(NULL);}
+ char *read_file_data_choices(file_data *fdat, int *srate, int *chans, int *type, int *format, int *location) {return(NULL);}
+ void alert_new_file(void) {}
++#if HAVE_GUILE
+ void g_initialize_xgfile(snd_state *ss, SCM local_doc) {}
++#endif
+ snd_info *make_new_file_dialog(snd_state *ss, char *newname, int header_type, int data_format, int srate, int chans, char *comment) {return(NULL);}
+ void make_cur_name_row(int old_size, int new_size) {}
+ void make_prev_name_row(int old_size, int new_size) {}
diff --git a/audio/snd/pkg-descr b/audio/snd/pkg-descr
index c8a62d8ae863..3a988f04dd7b 100644
--- a/audio/snd/pkg-descr
+++ b/audio/snd/pkg-descr
@@ -1,22 +1,23 @@
 Snd is a sound editor modeled loosely after Emacs and an old, sorely-missed
-PDP-10 sound editor named Dpysnd. It can accommodate any number of sounds each
-with any number of channels, and can be customized and extended using guile and
-guile-gtk. It is under LGPL.
+PDP-10 sound editor named Dpysnd.  It can accommodate any number of sounds,
+each with any number of channels, and can be customized and extended using
+guile and guile-gtk.  It is under LGPL.
 
 Included with it are some command-line utilities:
-- sndinfo prints a description of a sound file.
+- snd-info (note:  renamed from sndinfo, for this FreeBSD port) prints a
+  description of a sound file.
 - sndplay plays a sound file.
 - sndrecord records sound from a microphone.
 - audinfo describes the current state of the audio hardware.
 - sndsine writes a mono NeXT/Sun sound file of a 440 Hz sine wave.
 
-To build without the GUI, define WITHOUT_X.  To build without the
-enhanced file-selection dialog, define WITHOUT_GTKEXTRA.  To omit
-support for GUILE, define WITHOUT_GUILE.
+To build without the GUI, define WITHOUT_X.  To build without the enhanced
+file-selection dialog, define WITHOUT_GTKEXTRA (this is implied by WITHOUT_X).
+To omit support for GUILE, define WITHOUT_GUILE.
 
 Saving a selection from the Edit menu does not work.
 
 WWW:  http://www-ccrma.stanford.edu/software/snd/
 
 Trevor Johnson
-trevor@jpj.net
+trevor@FreeBSD.org
diff --git a/audio/snd/pkg-plist-in b/audio/snd/pkg-plist-in
index 20bbfcc1abe4..962141816397 100644
--- a/audio/snd/pkg-plist-in
+++ b/audio/snd/pkg-plist-in
@@ -1,5 +1,5 @@
 %%LOCALBASE%%/bin/audinfo
-%%LOCALBASE%%/bin/sndinfo
+%%LOCALBASE%%/bin/snd-info
 %%LOCALBASE%%/bin/sndplay
 %%LOCALBASE%%/bin/sndrecord
 %%LOCALBASE%%/bin/sndsine