Update to version 7. Use OPTIONS.

3 files changed, 78 insertions, 82 deletions

diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index c892af357902..9def66308ced 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		snd
-PORTVERSION=		5.5
-PORTREVISION=		3
+PORTVERSION=		7
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,80 +16,78 @@ COMMENT=		Multitracking sound editor and utilities
 
 LIB_DEPENDS=		gsl.5:${PORTSDIR}/math/gsl
 
-BROKEN=			"Does not compile"
-DEPRECATED=		${BROKEN}
-EXPIRATION_DATE=	2004-06-18
-
-.if !defined(WITHOUT_ESD)
-RUN_DEPENDS=		esd:${PORTSDIR}/audio/esound
-.endif
-.if !defined(WITHOUT_RUBY)
-RUN_DEPENDS+=		ruby:${PORTSDIR}/lang/ruby16
-.endif
-.if defined(WITHOUT_X11)
-WITHOUT_GTKEXTRA=	yes
-.endif
-.if !defined(WITHOUT_GTKEXTRA)
-LIB_DEPENDS+=		gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra
-.endif
-.if !defined(WITHOUT_GUILE)
-LIB_DEPENDS+=		guile.15:${PORTSDIR}/lang/guile
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS+=		guilegtk-1.2:${PORTSDIR}/x11-toolkits/guile-gtk
-.endif
-.endif
-
 ALL_TARGET=		audinfo snd sndinfo sndplay sndrecord sndsine
 CONFIGURE_ARGS=		--with-float-samples \
 			--with-multifile
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
+		CFLAGS="${CFLAGS}"
+GNU_CONFIGURE=	yes
+MAKE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+MAKEFILE=	makefile
+MAN1=		snd.1
+OPTIONS=	ESD		"output through enlightened sound daemon" on \
+		GUILE		"use Guile" on \
+		RUBY		"use Ruby as the extension language" on
+PLIST=		${WRKDIR}/plist
+PLIST_FILES=	share/examples/snd/DotEmacs
+PLIST_DIRS=	share/examples/snd
+WRKSRC=		${WRKDIR}/snd-${PORTVERSION}
 
-.if !defined(WITHOUT_ESD)
+.if !defined(NOPORTDOCS)
+PLIST_FILES+=	share/doc/snd/tutorial/files/.snd \
+		share/doc/snd/tutorial/files/misc.scm.txt \
+		share/doc/snd/tutorial/files/misc.scm.txt~ \
+		share/doc/snd/tutorial/README \
+		share/doc/snd/tutorial/1_intro_and_build_snd.html~
+.endif
+
+.if defined(WITH_ESD)
 CONFIGURE_ARGS+=	--with-esd
+RUN_DEPENDS=		esd:${PORTSDIR}/audio/esound
 .endif
-.if !defined(WITHOUT_RUBY)
+
+.if defined(WITH_RUBY)
 CONFIGURE_ARGS+=	--with-ruby
+RUN_DEPENDS+=		ruby:${PORTSDIR}/lang/ruby16
 .endif
+
+.if defined(WITH_GUILE)
+LIB_DEPENDS+=		guile.15:${PORTSDIR}/lang/guile
 .if !defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--with-gtk \
-			--with-gtkrc-colors \
-			--with-float-samples
+LIB_DEPENDS+=		guilegtk-1.2:${PORTSDIR}/x11-toolkits/guile-gtk
 .endif
-.if defined(WITHOUT_GUILE)
+.else
 CONFIGURE_ARGS+=	--without-guile
 .endif
-.if !defined(WITHOUT_GTKEXTRA)
-CONFIGURE_ARGS+=	--with-gtk-extra
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+	PLIST_FILES+=	share/locale/de/LC_MESSAGES/snd.mo
+.else
+CONFIGURE_ARGS+=--disable-nls
 .endif
+
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--with-no-gui
-.endif
-
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CFLAGS="${CFLAGS}"
-MAKE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-
-GNU_CONFIGURE=	yes
-MAKEFILE=	makefile
-PLIST=		${WRKDIR}/pkg-plist
-.if !defined(WITHOUT_X11)
+.else
+CONFIGURE_ARGS+=	--with-gtk \
+			--with-gtkrc-colors \
+			--with-float-samples
 PREFIX=		${X11BASE}
-USE_GETTEXT=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 USE_XLIB=	yes
 .endif
-WRKSRC=		${WRKDIR}/snd-5
 
-post-configure:
-	@${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.orig
-	@${SED} -e "s: -ldl::g" < ${WRKSRC}/makefile.orig > ${WRKSRC}/makefile
+post-build:
+	${MV} ${WRKSRC}/sndinfo ${WRKSRC}/snd-info
 
 pre-install:
-	${ECHO_CMD} bin/snd > ${PLIST}
 .if !defined(WITHOUT_X11)
 	${ECHO_CMD} lib/X11/app-defaults/Snd.ad >> ${PLIST}
+	${ECHO_CMD} share/examples/snd/Snd.gtkrc >> ${PLIST}
 .endif
-.for i in audinfo snd-info sndplay sndrecord sndsine
+.for i in audinfo snd snd-info sndplay sndrecord sndsine
 	${ECHO_CMD} bin/${i} >> ${PLIST}
 .endfor
 .if !defined(NOPORTDOCS)
@@ -101,9 +98,17 @@ pre-install:
 		${SED} -e "s:^${WRKSRC}/:share/doc/snd/:g" >> ${PLIST}
 	${FIND} ${WRKDIR} -name '*.png' | \
 		${SED} -e "s:^${WRKSRC}/:share/doc/snd/:g" >> ${PLIST}
-	${ECHO_CMD} "@dirrm share/doc/snd" >> ${PLIST}
+	${FIND} ${WRKDIR} -name '*.jpg' | \
+		${SED} -e "s:^${WRKSRC}/:share/doc/snd/:g" >> ${PLIST}
+.for ii in	share/doc/snd/tutorial/images/jpg \
+		share/doc/snd/tutorial/images \
+		share/doc/snd/tutorial/files \
+		share/doc/snd/tutorial \
+		share/doc/snd
+	${ECHO_CMD} @dirrm ${ii} >> ${PLIST}
+.endfor
 .endif
-.if !defined(WITHOUT_GUILE)
+.if defined(WITH_GUILE)
 	${FIND} ${WRKSRC} -name '*.scm' | \
 		${SED} -e "s:^${WRKSRC}/:share/snd/:g" >> ${PLIST}
 	${ECHO_CMD} "share/snd/contrib/dlp/README" >> ${PLIST}
@@ -117,6 +122,7 @@ do-install:
 .for i in audinfo snd snd-info sndplay sndrecord sndsine
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin
 .endfor
+	${INSTALL_MAN} ${WRKSRC}/snd.1 ${PREFIX}/man/man1/
 .if !defined(WITHOUT_X11)
 	${INSTALL_DATA} ${WRKSRC}/Snd.ad ${PREFIX}/lib/X11/app-defaults/
 .endif
@@ -125,19 +131,23 @@ do-install:
 .for i in COPYING HISTORY.Snd README.Snd TODO.Snd
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-	${INSTALL_DATA} \
-		${WRKSRC}/*.html \
-		${WRKSRC}/*.png \
-		${DOCSDIR}
-.if !defined(WITHOUT_GUILE)
-	${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
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/DotEmacs ${EXAMPLESDIR}
+.if !defined(WITHOUT_X11)
+	${INSTALL_DATA} ${WRKSRC}/Snd.gtkrc ${EXAMPLESDIR}
+.endif
+.if !defined(WITHOUT_NLS)
+	${INSTALL_DATA} ${WRKSRC}/po/de.gmo \
+		${PREFIX}/share/locale/de/LC_MESSAGES/snd.mo
+.endif
+.if !defined(NOPORTDOCS)
+	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.png ${DOCSDIR}
+	cd ${WRKSRC} && ${PAX} -r -w tutorial ${DOCSDIR}
+.endif
+.if defined(WITH_GUILE)
+	${INSTALL_DATA} ${WRKSRC}/*.scm ${DATADIR}
 .endif
-
-post-build:
-	${MV} ${WRKSRC}/sndinfo ${WRKSRC}/snd-info
 
 .include <bsd.port.mk>
diff --git a/audio/snd/distinfo b/audio/snd/distinfo
index d34c9288d16b..e35b76be3252 100644
--- a/audio/snd/distinfo
+++ b/audio/snd/distinfo
@@ -1,2 +1,2 @@
-MD5 (snd-5.5.tar.gz) = 56007b127210acfe7eb8ce7e7e7587e7
-SIZE (snd-5.5.tar.gz) = 2852573
+MD5 (snd-7.tar.gz) = 12beb724004b9d94f83f49f1016b8753
+SIZE (snd-7.tar.gz) = 5181334
diff --git a/audio/snd/files/patch-snd-nogui_c b/audio/snd/files/patch-snd-nogui_c
deleted file mode 100644
index a652f5b43961..000000000000
--- a/audio/snd/files/patch-snd-nogui_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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(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) {}
- void make_prev_name_row(int old_size, int new_size) {}