Wed Jan 25 01:18:15 2012 UTC ()
LDFLAGS setting only needed when gtk option is turned on, so move it there.
Tested by John Marino.


(wiz)
diff -r1.64 -r1.65 pkgsrc/audio/snd/Makefile
diff -r1.3 -r1.4 pkgsrc/audio/snd/options.mk
cvs diff -r1.64 -r1.65 pkgsrc/audio/snd/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/snd/Makefile 2012/01/24 09:43:31 1.64
+++ pkgsrc/audio/snd/Makefile 2012/01/25 01:18:15 1.65
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1# $NetBSD: Makefile,v 1.64 2012/01/24 09:43:31 marino Exp $ 1# $NetBSD: Makefile,v 1.65 2012/01/25 01:18:15 wiz Exp $
2# 2#
3 3
4DISTNAME= snd-9.9 4DISTNAME= snd-9.9
5PKGREVISION= 10 5PKGREVISION= 10
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=snd/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=snd/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://ccrma.stanford.edu/software/snd/ 10HOMEPAGE= http://ccrma.stanford.edu/software/snd/
11COMMENT= X based sound editor 11COMMENT= X based sound editor
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15DEPENDS+= flac-[0-9]*:../../audio/flac 15DEPENDS+= flac-[0-9]*:../../audio/flac
16DEPENDS+= speex-[0-9]*:../../audio/speex 16DEPENDS+= speex-[0-9]*:../../audio/speex
17DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools 17DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools
18 18
19USE_PKGLOCALEDIR= yes 19USE_PKGLOCALEDIR= yes
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21USE_TOOLS+= gmake msgfmt pkg-config 21USE_TOOLS+= gmake msgfmt pkg-config
22 22
23BUILD_TARGET= snd 23BUILD_TARGET= snd
24MAKE_FILE= makefile 24MAKE_FILE= makefile
25WRKSRC= ${WRKDIR}/snd-9 25WRKSRC= ${WRKDIR}/snd-9
26LDFLAGS.DragonFly= -lX11 
27 26
28INSTALLATION_DIRS= ${PKGLOCALEDIR}/locale/de/LC_MESSAGES 27INSTALLATION_DIRS= ${PKGLOCALEDIR}/locale/de/LC_MESSAGES
29INSTALL_MAKE_FLAGS+= localedir=${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale 28INSTALL_MAKE_FLAGS+= localedir=${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale
30 29
31post-install: 30post-install:
32 ${INSTALL_DATA} ${WRKSRC}/po/de.gmo \ 31 ${INSTALL_DATA} ${WRKSRC}/po/de.gmo \
33 ${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale/de/LC_MESSAGES/snd.mo 32 ${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale/de/LC_MESSAGES/snd.mo
34 33
35.include "options.mk" 34.include "options.mk"
36 35
37.include "../../converters/libiconv/buildlink3.mk" 36.include "../../converters/libiconv/buildlink3.mk"
38.include "../../devel/gettext-lib/buildlink3.mk" 37.include "../../devel/gettext-lib/buildlink3.mk"
39.include "../../math/gsl/buildlink3.mk" 38.include "../../math/gsl/buildlink3.mk"
cvs diff -r1.3 -r1.4 pkgsrc/audio/snd/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/snd/options.mk 2011/12/05 19:16:57 1.3
+++ pkgsrc/audio/snd/options.mk 2012/01/25 01:18:15 1.4
@@ -1,34 +1,35 @@ @@ -1,34 +1,35 @@
1# $NetBSD: options.mk,v 1.3 2011/12/05 19:16:57 dholland Exp $ 1# $NetBSD: options.mk,v 1.4 2012/01/25 01:18:15 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.snd 3PKG_OPTIONS_VAR= PKG_OPTIONS.snd
4PKG_SUPPORTED_OPTIONS= esound guile 4PKG_SUPPORTED_OPTIONS= esound guile
5# fftw2 fftw3 ladspa gamin/fam mpg123 timidity 5# fftw2 fftw3 ladspa gamin/fam mpg123 timidity
6PKG_OPTIONS_REQUIRED_GROUPS= frontend 6PKG_OPTIONS_REQUIRED_GROUPS= frontend
7PKG_OPTIONS_GROUP.frontend= gtk motif 7PKG_OPTIONS_GROUP.frontend= gtk motif
8PKG_SUGGESTED_OPTIONS= gtk guile 8PKG_SUGGESTED_OPTIONS= gtk guile
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
12.if !empty(PKG_OPTIONS:Mesound) 12.if !empty(PKG_OPTIONS:Mesound)
13CONFIGURE_ARGS+= --with-esd 13CONFIGURE_ARGS+= --with-esd
14.include "../../audio/esound/buildlink3.mk" 14.include "../../audio/esound/buildlink3.mk"
15.else 15.else
16CONFIGURE_ARGS+= --without-esd 16CONFIGURE_ARGS+= --without-esd
17.endif 17.endif
18 18
19.if !empty(PKG_OPTIONS:Mgtk) 19.if !empty(PKG_OPTIONS:Mgtk)
20CONFIGURE_ARGS+= --with-gtk 20CONFIGURE_ARGS+= --with-gtk
21.include "../../x11/gtk2/buildlink3.mk" 21.include "../../x11/gtk2/buildlink3.mk"
 22LDFLAGS.DragonFly= -lX11
22.else 23.else
23CONFIGURE_ARGS+= --without-gtk 24CONFIGURE_ARGS+= --without-gtk
24.endif 25.endif
25 26
26.if !empty(PKG_OPTIONS:Mguile) 27.if !empty(PKG_OPTIONS:Mguile)
27CONFIGURE_ARGS+= --with-guile 28CONFIGURE_ARGS+= --with-guile
28.include "../../lang/guile/buildlink3.mk" 29.include "../../lang/guile/buildlink3.mk"
29.else 30.else
30CONFIGURE_ARGS+= --without-guile 31CONFIGURE_ARGS+= --without-guile
31.endif 32.endif
32 33
33.if !empty(PKG_OPTIONS:Mmotif) 34.if !empty(PKG_OPTIONS:Mmotif)
34CONFIGURE_ARGS+= --with-motif 35CONFIGURE_ARGS+= --with-motif