ports/99508: [PATCH][OPTIONS]audio/snd options fixes

[Arseny Nasokin]

>Number:         99508
>Category:       ports
>Synopsis:       [PATCH][OPTIONS]audio/snd options fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 27 00:50:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Arseny Nasokin
>Release:        FreeBSD 7.0-CURRENT
>Organization:
Moscow State University
>Environment:
>Description:
some missed options added and all checks moved to post section
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/snd/Makefile,v
retrieving revision 1.54
diff -d -u -r1.54 Makefile
--- Makefile    6 May 2006 01:28:19 -0000       1.54
+++ Makefile    27 Jun 2006 00:31:18 -0000
@@ -27,9 +27,13 @@
                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
+
+OPTIONS=       ESD             "output through enlightened sound daemon" on    \
+               GUILE           "use Guile" on                                  \
+               X11             "Build with GUI support"        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,22 @@
                share/doc/snd/tutorial/1_intro_and_build_snd.html~
 .endif

-.if defined(WITH_ESD)
+WANT_GNOME=yes
+USE_X_PREFIX=no
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ESD) || ! defined (WITHOUT_ESD)
 CONFIGURE_ARGS+=       --with-esd
 RUN_DEPENDS+=          esd:${PORTSDIR}/audio/esound
 .endif

-.if defined(WITH_RUBY)
+.if defined(WITH_RUBY) || ! defined (WITHOUT_RUBY)
 CONFIGURE_ARGS+=       --with-ruby
 RUN_DEPENDS+=          ruby:${PORTSDIR}/lang/ruby16
 .endif

-.if defined(WITH_GUILE)
+.if defined(WITH_GUILE) || !defined(WITHOUT_GUILE)
 LIB_DEPENDS+=          guile.15:${PORTSDIR}/lang/guile
 .if !defined(WITHOUT_X11)
 LIB_DEPENDS+=          guilegtk-1.2:${PORTSDIR}/x11-toolkits/guile-gtk
@@ -80,8 +89,6 @@
 USE_XLIB=      yes
 .endif

-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "sparc64"
 BROKEN=                does not compile on sparc64
 .endif
>Release-Note:
>Audit-Trail:
>Unformatted: