Update to 5.5. Add FTP site. Add dependency on gsl and optionally

Ruby and esd.  Correct pkg-descr (WITHOUT_X11 not WITHOUT_X).
Generate the packing list.  Add warning about incomplete review.
Re-kludge PREFIX so new DOCSDIR macro can be used.  Perhaps bento
will no longer lose its lunch over this.

9 files changed, 76 insertions, 181 deletions

diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index da84613f0d00..6f20eb23aaaa 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -6,16 +6,23 @@
 #
 
 PORTNAME=		snd
-PORTVERSION=		4.6
-PORTREVISION=		1
+PORTVERSION=		5.5
 CATEGORIES=		audio
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
+			ftp://ccrma-ftp.stanford.edu/pub/Lisp/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=		trevor@FreeBSD.org
 
-LIB_DEPENDS=		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=		gsl.0:${PORTSDIR}/math/gsl \
+			intl.1:${PORTSDIR}/devel/gettext
 
+.if defined(WITHOUT_ESD)
+RUN_DEPENDS=		esd:${PORTSDIR}/audio/esound
+.endif
+.if defined(WITHOUT_RUBY)
+RUN_DEPENDS+=		ruby:${PORTSDIR}/lang/ruby
+.endif
 .if defined(WITHOUT_X11)
 WITHOUT_GTKEXTRA=	yes
 .endif
@@ -32,6 +39,13 @@ LIB_DEPENDS+=		guilegtk-1.2:${PORTSDIR}/x11-toolkits/guile-gtk
 ALL_TARGET=		audinfo snd sndinfo sndplay sndrecord sndsine
 CONFIGURE_ARGS=		--with-float-samples \
 			--with-multifile
+
+.if !defined(WITHOUT_ESD)
+CONFIGURE_ARGS+=	--with-esd
+.endif
+.if !defined(WITHOUT_RUBY)
+CONFIGURE_ARGS+=	--with-ruby
+.endif
 .if !defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--with-gtk \
 			--with-gtkrc-colors \
@@ -44,7 +58,7 @@ CONFIGURE_ARGS+=	--without-guile
 CONFIGURE_ARGS+=	--with-gtk-extra
 .endif
 .if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--without-gui
+CONFIGURE_ARGS+=	--with-no-gui
 .endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
@@ -53,56 +67,68 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 GNU_CONFIGURE=	yes
 MAKEFILE=	makefile
 PLIST=		${WRKDIR}/pkg-plist
-PREFIX=		/
 .if !defined(WITHOUT_X11)
+PREFIX=		${X11BASE}
 USE_GLIB=	yes
 USE_GTK=	yes
 USE_XLIB=	yes
 .endif
-WRKSRC=		${WRKDIR}/snd-4
+WRKSRC=		${WRKDIR}/snd-5
 
 post-configure:
-	@${PERL} -pi -e "s:^LIBS = :LIBS = -lm:g" ${WRKSRC}/makefile
+	@${PERL} -pi -e "s: -ldl::g" ${WRKSRC}/makefile
+	@${PERL} -pi -e "s:-lm   -lm:-lm:g" ${WRKSRC}/makefile
 
-do-install:
+pre-install:
+	${ECHO} bin/snd > ${PLIST}
+.if !defined(WITHOUT_X11)
+	${ECHO} lib/X11/app-defaults/Snd.ad >> ${PLIST}
+.endif
 .for i in audinfo snd-info sndplay sndrecord sndsine
-	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${LOCALBASE}/bin
+	${ECHO} bin/${i} >> ${PLIST}
+.endfor
+.if !defined(NOPORTDOCS)
+.for i in COPYING HISTORY.Snd README.Snd TODO.Snd
+	${ECHO} share/doc/snd/${i} >> ${PLIST}
+.endfor
+	${FIND} ${WRKDIR} -name '*.html' | \
+		${PERL} -pi -e "s:^${WRKSRC}/:share/doc/snd/:g" >> ${PLIST}
+	${FIND} ${WRKDIR} -name '*.png' | \
+		${PERL} -pi -e "s:^${WRKSRC}/:share/doc/snd/:g" >> ${PLIST}
+	${ECHO} "@dirrm share/doc/snd" >> ${PLIST}
+.endif
+.if !defined(WITHOUT_GUILE)
+	${FIND} ${WRKSRC} -name '*.scm' | \
+		${PERL} -pi -e "s:^${WRKSRC}/:share/snd/:g" >> ${PLIST}
+	${ECHO} "share/snd/contrib/dlp/README" >> ${PLIST}
+	${ECHO} "@dirrm share/snd/contrib/dlp" >> ${PLIST}
+	${ECHO} "@dirrm share/snd/contrib" >> ${PLIST}
+	${ECHO} "@dirrm share/snd" >> ${PLIST}
+.endif
+
+do-install:
+# Only "snd" is an X11 command.
+.for i in audinfo snd snd-info sndplay sndrecord sndsine
+	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin
 .endfor
 .if !defined(WITHOUT_X11)
-	${INSTALL_PROGRAM} ${WRKSRC}/snd ${X11BASE}/bin
-	${INSTALL_DATA} ${WRKSRC}/Snd.ad ${X11BASE}/lib/X11/app-defaults/
-.else
-	${INSTALL_PROGRAM} ${WRKSRC}/snd ${LOCALBASE}/bin
+	${INSTALL_DATA} ${WRKSRC}/Snd.ad ${PREFIX}/lib/X11/app-defaults/
 .endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${LOCALBASE}/share/doc/snd
-	${RM} -f ${WRKSRC}/auto.png
-.for i in COPYING HISTORY.Snd README.Snd
-	${INSTALL_DATA} ${WRKSRC}/${i} ${LOCALBASE}/share/doc/snd
+	${MKDIR} ${DOCSDIR}
+.for i in COPYING HISTORY.Snd README.Snd TODO.Snd
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	${INSTALL_DATA} \
 		${WRKSRC}/*.html \
 		${WRKSRC}/*.png \
-		${WRKSRC}/*.txt \
-		${LOCALBASE}/share/doc/snd
+		${DOCSDIR}
 .if !defined(WITHOUT_GUILE)
-	${INSTALL_DATA} ${WRKSRC}/*.scm ${LOCALBASE}/share/doc/snd
-.endif
+	${MKDIR} ${DATADIR}/contrib/dlp
+	${INSTALL_DATA} ${WRKSRC}/*.scm ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/*.scm ${DATADIR}/contrib/
+	${INSTALL_DATA} ${WRKSRC}/contrib/dlp/* ${DATADIR}/contrib/dlp/
 .endif
-
-pre-build:
-	${CP} ${PKGDIR}/pkg-plist-in ${PLIST}
-.if !defined(WITHOUT_GUILE)
-	${CAT} ${PKGDIR}/pkg-plist-guile >> ${PLIST}
-.endif
-.if !defined(WITHOUT_X11)
-	${ECHO} "%%X11BASE%%/bin/snd" >> ${PLIST}
-	${ECHO} "%%X11BASE%%/lib/X11/app-defaults/Snd.ad" >> ${PLIST}
-.else
-	${ECHO} "%%LOCALBASE%%/bin/snd" >> ${PLIST}
-.endif
-.if !defined(NOPORTDOCS)
-	${ECHO} "@dirrm %%LOCALBASE%%/share/doc/snd" >> ${PLIST}
 .endif
 
 post-build:
diff --git a/audio/snd/distinfo b/audio/snd/distinfo
index a15fc266338a..085bf5f554a4 100644
--- a/audio/snd/distinfo
+++ b/audio/snd/distinfo
@@ -1 +1 @@
-MD5 (snd-4.6.tar.gz) = cfe4b8a8926d9762f53555c81695141b
+MD5 (snd-5.5.tar.gz) = 56007b127210acfe7eb8ce7e7e7587e7
diff --git a/audio/snd/files/patch-audio_c b/audio/snd/files/patch-audio_c
deleted file mode 100644
index 7b06082a0ed6..000000000000
--- a/audio/snd/files/patch-audio_c
+++ /dev/null
@@ -1,73 +0,0 @@
---- audio.c.orig	Mon Sep 18 12:08:54 2000
-+++ audio.c	Fri Oct  6 17:34:16 2000
-@@ -1830,7 +1830,7 @@
- 	  break;
- 	}
-       if (audio_out == -1) return(error_exit(MUS_AUDIO_CANT_OPEN,audio_out));
--      if (ioctl(audio_out,SNDCTL_DSP_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
-+      if (ioctl(audio_out,SOUND_PCM_READ_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
-       return(audio_out);
-     }
- 
-@@ -1844,7 +1844,7 @@
- 	return error_exit(MUS_AUDIO_CANT_OPEN, audio_out); 
-       if ((ioctl(audio_out,SNDCTL_DSP_SETFMT,&oss_format) == -1) || (oss_format != to_oss_format(format))) 
- 	return(error_exit(MUS_AUDIO_FORMAT_NOT_AVAILABLE,audio_out));
--      if (ioctl(audio_out,SNDCTL_DSP_CHANNELS,&chans) == -1)
-+      if (ioctl(audio_out,SOUND_PCM_READ_CHANNELS,&chans) == -1)
- 	return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
-       if (ioctl(audio_out,SNDCTL_DSP_SPEED,&srate) == -1)
- 	return(error_exit(MUS_AUDIO_SRATE_NOT_AVAILABLE,audio_out));
-@@ -1880,7 +1880,7 @@
-   if ((ioctl(audio_out,SNDCTL_DSP_SETFMT,&oss_format) == -1) || (oss_format != to_oss_format(format))) 
-     return(error_exit(MUS_AUDIO_FORMAT_NOT_AVAILABLE,audio_out));
- #ifdef NEW_OSS
--  if (ioctl(audio_out,SNDCTL_DSP_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
-+  if (ioctl(audio_out,SOUND_PCM_READ_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
- #else
-   if (chans == 2) stereo = 1; else stereo = 0;
-   if ((ioctl(audio_out,SNDCTL_DSP_STEREO,&stereo) == -1) || ((chans == 2) && (stereo == 0))) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
-@@ -1947,7 +1947,7 @@
- 	  break;
- 	}
-       if (audio_fd == -1) return(error_exit(MUS_AUDIO_NO_INPUT_AVAILABLE,-1));
--      if (ioctl(audio_fd,SNDCTL_DSP_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
-+      if (ioctl(audio_fd,SOUND_PCM_READ_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
-       return(audio_fd);
-     }
- 
-@@ -1961,7 +1961,7 @@
- 	return(error_exit(MUS_AUDIO_CANT_OPEN, audio_fd)); 
-       if ((ioctl(audio_fd,SNDCTL_DSP_SETFMT,&oss_format) == -1) || (oss_format != to_oss_format(format)))
- 	return(error_exit(MUS_AUDIO_FORMAT_NOT_AVAILABLE,audio_fd));
--      if (ioctl(audio_fd,SNDCTL_DSP_CHANNELS,&chans) == -1)
-+      if (ioctl(audio_fd,SOUND_PCM_READ_CHANNELS,&chans) == -1)
- 	return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
-       if (ioctl(audio_fd,SNDCTL_DSP_SPEED,&srate) == -1)
- 	return(error_exit(MUS_AUDIO_SRATE_NOT_AVAILABLE,audio_fd));
-@@ -1992,7 +1992,6 @@
-   else 
-     {
-       err = 0;
--      err = ioctl(audio_fd,SNDCTL_DSP_SETDUPLEX,&err); /* not always a no-op! */
-       /* if (err == -1) AUDIO_ERROR = MUS_AUDIO_NO_INPUT_AVAILABLE; */
-       /* this damned thing returns -1 even when full duplex is available */
-     }
-@@ -2023,7 +2022,7 @@
-   if ((ioctl(audio_fd,SNDCTL_DSP_SETFMT,&oss_format) == -1) || (oss_format != to_oss_format(format)))
-     return(error_exit(MUS_AUDIO_FORMAT_NOT_AVAILABLE,audio_fd));
- #ifdef NEW_OSS
--  if (ioctl(audio_fd,SNDCTL_DSP_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
-+  if (ioctl(audio_fd,SOUND_PCM_READ_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
- #else
-   if (chans == 2) stereo = 1; else stereo = 0;
-   if ((ioctl(audio_fd,SNDCTL_DSP_STEREO,&stereo) == -1) || ((chans == 2) && (stereo == 0))) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
-@@ -2467,7 +2466,7 @@
- 
- static char *synth_name(int i)
- {
--  if ((i>0) && (i<=SNDCARD_UART401)) 
-+  if ((i>0) && (i<=SNDCARD_NSS)) 
-     return(synth_names[i]);
-   return("unknown");
- }
diff --git a/audio/snd/files/patch-snd-gmain_c b/audio/snd/files/patch-snd-gmain_c
deleted file mode 100644
index fd7fde3a5343..000000000000
--- a/audio/snd/files/patch-snd-gmain_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- snd-gmain.c.orig	Mon Sep 18 12:09:22 2000
-+++ snd-gmain.c	Sun Oct  8 06:26:00 2000
-@@ -191,7 +191,7 @@
- #if TRAP_SEGFAULT
- #include <setjmp.h>
- /* stolen from scwm.c */
--static jmp_buf envHandleEventsLoop;
-+static sigjmp_buf envHandleEventsLoop;
- 
- static RETSIGTYPE segv(int ignored)
- {
diff --git a/audio/snd/files/patch-snd-nogui_c b/audio/snd/files/patch-snd-nogui_c
index 2642ca10ab74..a652f5b43961 100644
--- a/audio/snd/files/patch-snd-nogui_c
+++ b/audio/snd/files/patch-snd-nogui_c
@@ -1,11 +1,13 @@
---- 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 @@
+--- snd-nogui.c.old	Mon Dec  3 05:03:09 2001
++++ snd-nogui.c	Thu Jan 17 10:46:15 2002
+@@ -240,9 +240,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) {}
+ void g_initialize_xgfile(void) {}
+-
 +#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) {}
diff --git a/audio/snd/pkg-descr b/audio/snd/pkg-descr
index 3a988f04dd7b..ce82eea05c6a 100644
--- a/audio/snd/pkg-descr
+++ b/audio/snd/pkg-descr
@@ -11,9 +11,10 @@ Included with it are some command-line utilities:
 - 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 (this is implied by WITHOUT_X).
-To omit support for GUILE, define WITHOUT_GUILE.
+To build without the GUI, define WITHOUT_X11.  To build without the enhanced
+file-selection dialog, define WITHOUT_GTKEXTRA (this is implied by WITHOUT_X11).
+To omit support for the GUILE or Ruby languages, or the Enlightened Sound
+Daemon, define WITHOUT_GUILE, WITHOUT_RUBY or WITHOUT_ESD.
 
 Saving a selection from the Edit menu does not work.
 
diff --git a/audio/snd/pkg-message b/audio/snd/pkg-message
new file mode 100644
index 000000000000..f185024867ac
--- /dev/null
+++ b/audio/snd/pkg-message
@@ -0,0 +1,3 @@
+*** WARNING ***
+The sources for the snd package have not been
+thoroughly reviewed by the FreeBSD maintainer.
diff --git a/audio/snd/pkg-plist-guile b/audio/snd/pkg-plist-guile
deleted file mode 100644
index 0c0d8446e0ac..000000000000
--- a/audio/snd/pkg-plist-guile
+++ /dev/null
@@ -1,21 +0,0 @@
-%%LOCALBASE%%/share/doc/snd/bell.scm
-%%LOCALBASE%%/share/doc/snd/snd-gtk.scm
-%%LOCALBASE%%/share/doc/snd/snd-test.scm
-%%LOCALBASE%%/share/doc/snd/effects.scm
-%%LOCALBASE%%/share/doc/snd/env.scm
-%%LOCALBASE%%/share/doc/snd/examp.scm
-%%LOCALBASE%%/share/doc/snd/fmv.scm
-%%LOCALBASE%%/share/doc/snd/glfft.scm
-%%LOCALBASE%%/share/doc/snd/gm.scm
-%%LOCALBASE%%/share/doc/snd/goopsnd.scm
-%%LOCALBASE%%/share/doc/snd/index.scm
-%%LOCALBASE%%/share/doc/snd/loop.scm
-%%LOCALBASE%%/share/doc/snd/marks.scm
-%%LOCALBASE%%/share/doc/snd/mix.scm
-%%LOCALBASE%%/share/doc/snd/moog.scm
-%%LOCALBASE%%/share/doc/snd/old-sndlib2scm.scm
-%%LOCALBASE%%/share/doc/snd/pqwvox.scm
-%%LOCALBASE%%/share/doc/snd/pvoc.scm
-%%LOCALBASE%%/share/doc/snd/rgb.scm
-%%LOCALBASE%%/share/doc/snd/v.scm
-%%LOCALBASE%%/share/doc/snd/zip.scm
diff --git a/audio/snd/pkg-plist-in b/audio/snd/pkg-plist-in
deleted file mode 100644
index 962141816397..000000000000
--- a/audio/snd/pkg-plist-in
+++ /dev/null
@@ -1,32 +0,0 @@
-%%LOCALBASE%%/bin/audinfo
-%%LOCALBASE%%/bin/snd-info
-%%LOCALBASE%%/bin/sndplay
-%%LOCALBASE%%/bin/sndrecord
-%%LOCALBASE%%/bin/sndsine
-%%LOCALBASE%%/share/doc/snd/COPYING
-%%LOCALBASE%%/share/doc/snd/HISTORY.Snd
-%%LOCALBASE%%/share/doc/snd/README.Snd
-%%LOCALBASE%%/share/doc/snd/clm.html
-%%LOCALBASE%%/share/doc/snd/controls.png
-%%LOCALBASE%%/share/doc/snd/d.png
-%%LOCALBASE%%/share/doc/snd/energy.png
-%%LOCALBASE%%/share/doc/snd/env.png
-%%LOCALBASE%%/share/doc/snd/extsnd.html
-%%LOCALBASE%%/share/doc/snd/extsnd.txt
-%%LOCALBASE%%/share/doc/snd/files.png
-%%LOCALBASE%%/share/doc/snd/grfsnd.html
-%%LOCALBASE%%/share/doc/snd/grfsnd.txt
-%%LOCALBASE%%/share/doc/snd/hfft.png
-%%LOCALBASE%%/share/doc/snd/mixer.png
-%%LOCALBASE%%/share/doc/snd/n.png
-%%LOCALBASE%%/share/doc/snd/rec.png
-%%LOCALBASE%%/share/doc/snd/reclin.png
-%%LOCALBASE%%/share/doc/snd/regions.png
-%%LOCALBASE%%/share/doc/snd/s.png
-%%LOCALBASE%%/share/doc/snd/snd-contents.html
-%%LOCALBASE%%/share/doc/snd/snd.html
-%%LOCALBASE%%/share/doc/snd/snd.txt
-%%LOCALBASE%%/share/doc/snd/snd1.html
-%%LOCALBASE%%/share/doc/snd/sndlib.html
-%%LOCALBASE%%/share/doc/snd/sndlib.txt
-%%LOCALBASE%%/share/doc/snd/title.png