Wed Sep 27 13:37:28 2017 UTC ()
gnash: add missing .endif

Remove duplicate devel/SDL/bl3.mk inclusion that confused pkglint.


(wiz)
diff -r1.21 -r1.22 pkgsrc/multimedia/gnash/options.mk
cvs diff -r1.21 -r1.22 pkgsrc/multimedia/gnash/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/gnash/Attic/options.mk 2017/09/26 09:44:08 1.21
+++ pkgsrc/multimedia/gnash/Attic/options.mk 2017/09/27 13:37:28 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.21 2017/09/26 09:44:08 wiz Exp $ 1# $NetBSD: options.mk,v 1.22 2017/09/27 13:37:28 wiz Exp $
2# 2#
3 3
4# 4#
5# see http://www.gnu.org/software/gnash/manual/gnashref.html#codedeps 5# see http://www.gnu.org/software/gnash/manual/gnashref.html#codedeps
6# 6#
7 7
8PKG_OPTIONS_VAR= PKG_OPTIONS.gnash 8PKG_OPTIONS_VAR= PKG_OPTIONS.gnash
9PKG_OPTIONS_OPTIONAL_GROUPS= gnash-media 9PKG_OPTIONS_OPTIONAL_GROUPS= gnash-media
10PKG_OPTIONS_GROUP.gnash-media= ffmpeg gstreamer 10PKG_OPTIONS_GROUP.gnash-media= ffmpeg gstreamer
11PKG_OPTIONS_REQUIRED_GROUPS= gnash-gui gnash-renderer 11PKG_OPTIONS_REQUIRED_GROUPS= gnash-gui gnash-renderer
12# XXX: add support for SDL or FLTK GUIs? 12# XXX: add support for SDL or FLTK GUIs?
13PKG_OPTIONS_GROUP.gnash-gui= gtk kde 13PKG_OPTIONS_GROUP.gnash-gui= gtk kde
14PKG_OPTIONS_GROUP.gnash-renderer= agg cairo opengl 14PKG_OPTIONS_GROUP.gnash-renderer= agg cairo opengl
@@ -43,26 +43,27 @@ PLIST.plugin= yes @@ -43,26 +43,27 @@ PLIST.plugin= yes
43.if !empty(PKG_OPTIONS:Mkde) 43.if !empty(PKG_OPTIONS:Mkde)
44GNASH_GUIS+= kde4 44GNASH_GUIS+= kde4
45PLIST.kde= yes 45PLIST.kde= yes
46PLIST.kde4= yes 46PLIST.kde4= yes
47CONFIGURE_ARGS+= --with-plugins-install=system 47CONFIGURE_ARGS+= --with-plugins-install=system
48# broken, not wroked as expected. 48# broken, not wroked as expected.
49#CONFIGURE_ARGS+= --with-kde4-plugindir=${PREFIX}/lib/kde4 49#CONFIGURE_ARGS+= --with-kde4-plugindir=${PREFIX}/lib/kde4
50#CONFIGURE_ARGS+= --with-kde-appsdatadir=${PREFIX}/share/kde/apps 50#CONFIGURE_ARGS+= --with-kde-appsdatadir=${PREFIX}/share/kde/apps
51#CONFIGURE_ARGS+= --with-kde4-configdir=${PREFIX}/share/kde4/config 51#CONFIGURE_ARGS+= --with-kde4-configdir=${PREFIX}/share/kde4/config
52#CONFIGURE_ARGS+= --with-kde4-servicesdir=${PREFIX}/share/kde4/services 52#CONFIGURE_ARGS+= --with-kde4-servicesdir=${PREFIX}/share/kde4/services
53.include "../../x11/kde-baseapps4/buildlink3.mk" 53.include "../../x11/kde-baseapps4/buildlink3.mk"
54.include "../../x11/kdelibs4/buildlink3.mk" 54.include "../../x11/kdelibs4/buildlink3.mk"
55.include "../../meta-pkgs/kde4/kde4.mk" 55.include "../../meta-pkgs/kde4/kde4.mk"
 56.endif
56 57
57CONFIGURE_ARGS+= --enable-gui=${GNASH_GUIS:tW:S/ /,/} 58CONFIGURE_ARGS+= --enable-gui=${GNASH_GUIS:tW:S/ /,/}
58 59
59### 60###
60### Select renderers. 61### Select renderers.
61### 62###
62.if !empty(PKG_OPTIONS:Magg) 63.if !empty(PKG_OPTIONS:Magg)
63GNASH_RENDER+= agg 64GNASH_RENDER+= agg
64.include "../../graphics/agg/buildlink3.mk" 65.include "../../graphics/agg/buildlink3.mk"
65.endif 66.endif
66 67
67.if !empty(PKG_OPTIONS:Mcairo) 68.if !empty(PKG_OPTIONS:Mcairo)
68GNASH_RENDER+= cairo 69GNASH_RENDER+= cairo
@@ -76,27 +77,26 @@ GNASH_RENDER+= ogl @@ -76,27 +77,26 @@ GNASH_RENDER+= ogl
76.include "../../graphics/gtkglext/buildlink3.mk" 77.include "../../graphics/gtkglext/buildlink3.mk"
77. endif 78. endif
78.endif 79.endif
79 80
80CONFIGURE_ARGS+= --enable-renderer=${GNASH_RENDER:tW:S/ /,/} 81CONFIGURE_ARGS+= --enable-renderer=${GNASH_RENDER:tW:S/ /,/}
81 82
82### 83###
83### Select a media handler 84### Select a media handler
84### 85###
85.if !empty(PKG_OPTIONS:Mffmpeg) 86.if !empty(PKG_OPTIONS:Mffmpeg)
86GNASH_MEDIA+= ffmpeg 87GNASH_MEDIA+= ffmpeg
87.include "../../audio/libdca/buildlink3.mk" 88.include "../../audio/libdca/buildlink3.mk"
88.include "../../audio/SDL_mixer/buildlink3.mk" 89.include "../../audio/SDL_mixer/buildlink3.mk"
89.include "../../devel/SDL/buildlink3.mk" 
90.include "../../multimedia/ffmpeg1/buildlink3.mk" 90.include "../../multimedia/ffmpeg1/buildlink3.mk"
91.endif 91.endif
92 92
93.if !empty(PKG_OPTIONS:Mgstreamer) 93.if !empty(PKG_OPTIONS:Mgstreamer)
94GNASH_MEDIA+= gst 94GNASH_MEDIA+= gst
95PLIST.gstreamer= yes 95PLIST.gstreamer= yes
96.include "../../multimedia/gstreamer0.10/buildlink3.mk" 96.include "../../multimedia/gstreamer0.10/buildlink3.mk"
97.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 97.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
98DEPENDS+= gst-ffmpeg-0.10.[0-9]*:../../multimedia/gst-plugins0.10-ffmpeg 98DEPENDS+= gst-ffmpeg-0.10.[0-9]*:../../multimedia/gst-plugins0.10-ffmpeg
99DEPENDS+= gst-plugins0.10-mad-[0-9]*:../../audio/gst-plugins0.10-mad 99DEPENDS+= gst-plugins0.10-mad-[0-9]*:../../audio/gst-plugins0.10-mad
100DEPENDS+= gst-plugins0.10-vorbis-[0-9]*:../../audio/gst-plugins0.10-vorbis 100DEPENDS+= gst-plugins0.10-vorbis-[0-9]*:../../audio/gst-plugins0.10-vorbis
101.endif 101.endif
102 102