1 files changed, 24 insertions, 20 deletions

diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 62e05a732f6f..759788a7101b 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -26,10 +26,14 @@ 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
+		RUBY		"use Ruby as the extension language" on \
+		NLS             "Native Language Support"       on
+
 PLIST=		${WRKDIR}/plist
 PLIST_FILES=	share/examples/snd/DotEmacs
 PLIST_DIRS=	share/examples/snd
@@ -43,17 +47,30 @@ PLIST_FILES+=	share/doc/snd/tutorial/files/.snd \
 		share/doc/snd/tutorial/1_intro_and_build_snd.html~
 .endif
 
-.if defined(WITH_ESD)
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--with-no-gui
+.else
+CONFIGURE_ARGS+=	--with-gtk \
+			--with-gtkrc-colors \
+			--with-float-samples
+USE_GNOME=	gtk20
+USE_X_PREFIX=	yes
+USE_XLIB=	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_ESD)
 CONFIGURE_ARGS+=	--with-esd
 RUN_DEPENDS+=		esd:${PORTSDIR}/audio/esound
 .endif
 
-.if defined(WITH_RUBY)
+.if !defined(WITHOUT_RUBY)
 CONFIGURE_ARGS+=	--with-ruby
-RUN_DEPENDS+=		ruby:${PORTSDIR}/lang/ruby16
+RUN_DEPENDS+=		ruby:${PORTSDIR}/lang/ruby18
 .endif
 
-.if defined(WITH_GUILE)
+.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
@@ -69,19 +86,6 @@ PLIST_FILES+=	share/locale/de/LC_MESSAGES/snd.mo
 CONFIGURE_ARGS+=--disable-nls
 .endif
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--with-no-gui
-.else
-CONFIGURE_ARGS+=	--with-gtk \
-			--with-gtkrc-colors \
-			--with-float-samples
-USE_GNOME=	gtk20
-USE_X_PREFIX=	yes
-USE_XLIB=	yes
-.endif
-
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "sparc64"
 BROKEN=		does not compile on sparc64
 .endif
@@ -116,7 +120,7 @@ pre-install:
 	${ECHO_CMD} @dirrm ${ii} >> ${PLIST}
 .endfor
 .endif
-.if defined(WITH_GUILE)
+.if !defined(WITHOUT_GUILE)
 	${FIND} ${WRKSRC} -name '*.scm' | \
 		${SED} -e "s:^${WRKSRC}/:share/snd/:g" >> ${PLIST}
 	${ECHO_CMD} "share/snd/dlp/README" >> ${PLIST}
@@ -156,7 +160,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.png ${DOCSDIR}
 	cd ${WRKSRC} && ${PAX} -r -w tutorial ${DOCSDIR}
 .endif
-.if defined(WITH_GUILE)
+.if !defined(WITHOUT_GUILE)
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DATADIR}/dlp
 	@${MKDIR} ${DATADIR}/tools