Attachment 143366 Details for Bug 190516 – Fix plist by using PLIST_SUB and comments

[patch] Fix plist by using PLIST_SUB and comments

graphics-darktable-fix-plist.a.patch (text/plain), 7.95 KB, created by Jean-Sébastien Pédron on 2014-06-04 15:00:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Sébastien Pédron

Created: 2014-06-04 15:00:59 UTC

Size: 7.95 KB

patch

obsolete

>diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
>index 7c0abb7..541fef1 100644
>--- a/graphics/darktable/Makefile
>+++ b/graphics/darktable/Makefile
>@@ -46,37 +46,34 @@ CMAKE_ARGS+=	-DBINARY_PACKAGE_BUILD=1
> 
> .if ${PORT_OPTIONS:MGPHOTO}
> LIB_DEPENDS+=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
>-PLIST_FILES+=	lib/darktable/plugins/lighttable/libcamera.so \
>-		lib/darktable/plugins/lighttable/libcapture.so \
>-		lib/darktable/plugins/lighttable/liblive_view.so \
>-		lib/darktable/views/libcapture.so
>+PLIST_SUB+=	GPHOTO=""
> .else
> CMAKE_ARGS+=	-DUSE_CAMERA_SUPPORT:BOOL=OFF
>+PLIST_SUB+=	GPHOTO="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MGEO}
> LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
>-PLIST_FILES+=	lib/darktable/plugins/lighttable/libgeotagging.so \
>-		lib/darktable/plugins/lighttable/liblocation.so \
>-		lib/darktable/plugins/lighttable/libmap_settings.so \
>-		lib/darktable/views/libmap.so
>+PLIST_SUB+=	GEO=""
> .else
> CMAKE_ARGS+=	-DUSE_GEO:BOOL=OFF
>+PLIST_SUB+=	GEO="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MFLICKR}
> LIB_DEPENDS+=	libflickcurl.so:${PORTSDIR}/www/flickcurl
>-PLIST_FILES+=	lib/darktable/plugins/imageio/storage/libflickr.so
>+PLIST_SUB+=	FLICKR=""
> .else
> CMAKE_ARGS+=	-DUSE_FLICKR:BOOL=OFF
>+PLIST_SUB+=	FLICKR="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MFB_PICASA}
> LIB_DEPENDS+=	libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
>-PLIST_FILES+=	lib/darktable/plugins/imageio/storage/libfacebook.so \
>-		lib/darktable/plugins/imageio/storage/libpicasa.so
>+PLIST_SUB+=	FB_PICASA=""
> .else
> CMAKE_ARGS+=	-DUSE_GLIBJSON:BOOL=OFF
>+PLIST_SUB+=	FB_PICASA="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MGNOMEKEYRING}
>@@ -91,16 +88,18 @@ CMAKE_ARGS+=	-DDONT_USE_RAWSPEED:BOOL=ON
> 
> .if ${PORT_OPTIONS:MOPENEXR}
> LIB_DEPENDS+=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
>-PLIST_FILES+=	lib/darktable/plugins/imageio/format/libexr.so
>+PLIST_SUB+=	OPENEXR=""
> .else
> CMAKE_ARGS+=	-DUSE_OPENEXR:BOOL=OFF
>+PLIST_SUB+=	OPENEXR="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MOPENJPEG}
> LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
>-PLIST_FILES+=	lib/darktable/plugins/imageio/format/libj2k.so
>+PLIST_SUB+=	OPENJPEG=""
> .else
> CMAKE_ARGS+=	-DUSE_OPENJPEG:BOOL=OFF
>+PLIST_SUB+=	OPENJPEG="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MCOLORD}
>@@ -119,10 +118,10 @@ CMAKE_ARGS+=	-DUSE_GRAPHICSMAGICK:BOOL=OFF
> 
> .if ${PORT_OPTIONS:MLUA}
> USES+=		lua
>-PLIST_FILES+=	%%DATADIR%%/lua/darktable/debug.lua \
>-		%%DATADIR%%/luarc
>+PLIST_SUB+=	LUA=""
> .else
> CMAKE_ARGS+=	-DUSE_LUA:BOOL=OFF
>+PLIST_SUB+=	LUA="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MSQUISH}
>@@ -134,16 +133,18 @@ CMAKE_ARGS+=	-DUSE_SQUISH:BOOL=OFF
> .if ${PORT_OPTIONS:MSLIDESHOW}
> USE_GL=		gl
> USE_SDL=	sdl
>-PLIST_FILES+=	bin/darktable-viewer
>+PLIST_SUB+=	SLIDESHOW=""
> .else
> CMAKE_ARGS+=	-DBUILD_SLIDESHOW:BOOL=OFF
>+PLIST_SUB+=	SLIDESHOW="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MWEBP}
> LIB_DEPENDS+=	libwebp.so:${PORTSDIR}/graphics/webp
>-PLIST_FILES+=	lib/darktable/plugins/imageio/format/libwebp.so
>+PLIST_SUB+=	WEBP=""
> .else
> CMAKE_ARGS+=	-DUSE_WEBP:BOOL=OFF
>+PLIST_SUB+=	WEBP="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MNLS}
>diff --git a/graphics/darktable/pkg-plist b/graphics/darktable/pkg-plist
>index 60858fc..691c4c5 100644
>--- a/graphics/darktable/pkg-plist
>+++ b/graphics/darktable/pkg-plist
>@@ -1,17 +1,24 @@
> bin/darktable
> bin/darktable-cli
> bin/darktable-cltest
>+%%SLIDESHOW%%bin/darktable-viewer
> lib/darktable/libdarktable.so
> lib/darktable/plugins/imageio/format/libcopy.so
>+%%OPENEXR%%lib/darktable/plugins/imageio/format/libexr.so
>+%%OPENJPEG%%lib/darktable/plugins/imageio/format/libj2k.so
> lib/darktable/plugins/imageio/format/libjpeg.so
> lib/darktable/plugins/imageio/format/libpfm.so
> lib/darktable/plugins/imageio/format/libpng.so
> lib/darktable/plugins/imageio/format/libppm.so
> lib/darktable/plugins/imageio/format/libtiff.so
>+%%WEBP%%lib/darktable/plugins/imageio/format/libwebp.so
> lib/darktable/plugins/imageio/storage/libdisk.so
> lib/darktable/plugins/imageio/storage/libemail.so
>+%%FB_PICASA%%lib/darktable/plugins/imageio/storage/libfacebook.so
>+%%FLICKR%%lib/darktable/plugins/imageio/storage/libflickr.so
> lib/darktable/plugins/imageio/storage/libgallery.so
> lib/darktable/plugins/imageio/storage/liblatex.so
>+%%FB_PICASA%%lib/darktable/plugins/imageio/storage/libpicasa.so
> lib/darktable/plugins/libatrous.so
> lib/darktable/plugins/libbasecurve.so
> lib/darktable/plugins/libbilat.so
>@@ -70,6 +77,8 @@ lib/darktable/plugins/libvignette.so
> lib/darktable/plugins/libwatermark.so
> lib/darktable/plugins/libzonesystem.so
> lib/darktable/plugins/lighttable/libbackgroundjobs.so
>+%%GPHOTO%%lib/darktable/plugins/lighttable/libcamera.so
>+%%GPHOTO%%lib/darktable/plugins/lighttable/libcapture.so
> lib/darktable/plugins/lighttable/libcollect.so
> lib/darktable/plugins/lighttable/libcolorlabels.so
> lib/darktable/plugins/lighttable/libcolorpicker.so
>@@ -78,6 +87,7 @@ lib/darktable/plugins/lighttable/libdarktable_label.so
> lib/darktable/plugins/lighttable/libexport.so
> lib/darktable/plugins/lighttable/libfilmstrip.so
> lib/darktable/plugins/lighttable/libfilter.so
>+%%GEO%%lib/darktable/plugins/lighttable/libgeotagging.so
> lib/darktable/plugins/lighttable/libglobal_toolbox.so
> lib/darktable/plugins/lighttable/libhinter.so
> lib/darktable/plugins/lighttable/libhistogram.so
>@@ -85,6 +95,9 @@ lib/darktable/plugins/lighttable/libhistory.so
> lib/darktable/plugins/lighttable/libimage.so
> lib/darktable/plugins/lighttable/libimport.so
> lib/darktable/plugins/lighttable/liblighttable_mode.so
>+%%GPHOTO%%lib/darktable/plugins/lighttable/liblive_view.so
>+%%GEO%%lib/darktable/plugins/lighttable/liblocation.so
>+%%GEO%%lib/darktable/plugins/lighttable/libmap_settings.so
> lib/darktable/plugins/lighttable/libmasks.so
> lib/darktable/plugins/lighttable/libmetadata.so
> lib/darktable/plugins/lighttable/libmetadata_view.so
>@@ -100,8 +113,10 @@ lib/darktable/plugins/lighttable/libstyles.so
> lib/darktable/plugins/lighttable/libtagging.so
> lib/darktable/plugins/lighttable/libview_toolbox.so
> lib/darktable/plugins/lighttable/libviewswitcher.so
>+%%GPHOTO%%lib/darktable/views/libcapture.so
> lib/darktable/views/libdarkroom.so
> lib/darktable/views/liblighttable.so
>+%%GEO%%lib/darktable/views/libmap.so
> man/man1/darktable-cli.1.gz
> man/man1/darktable.1.gz
> share/appdata/darktable.appdata.xml
>@@ -132,6 +147,8 @@ share/applications/darktable.desktop
> %%DATADIR%%/kernels/sharpen.cl
> %%DATADIR%%/kernels/soften.cl
> %%DATADIR%%/latex/photobook.cls
>+%%LUA%%%%DATADIR%%/lua/darktable/debug.lua
>+%%LUA%%%%DATADIR%%/luarc
> %%DATADIR%%/pixmaps/dt_logo_128x128.png
> %%DATADIR%%/pixmaps/idbutton-2.png
> %%DATADIR%%/pixmaps/idbutton.png
>@@ -231,24 +248,24 @@ share/locale/ru/LC_MESSAGES/darktable.mo
> share/locale/sq/LC_MESSAGES/darktable.mo
> share/locale/sv/LC_MESSAGES/darktable.mo
> share/locale/uk/LC_MESSAGES/darktable.mo
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
>-@dirrmtry %%DATADIR%%/watermarks
>-@dirrmtry %%DATADIR%%/style
>-@dirrmtry %%DATADIR%%/rawspeed
>-@dirrmtry %%DATADIR%%/pixmaps/plugins/darkroom
>-@dirrmtry %%DATADIR%%/pixmaps/plugins
>-@dirrmtry %%DATADIR%%/pixmaps
>-@dirrmtry %%DATADIR%%/lua/darktable
>-@dirrmtry %%DATADIR%%/lua
>-@dirrmtry %%DATADIR%%/latex
>-@dirrmtry %%DATADIR%%/kernels
>-@dirrmtry %%DATADIR%%/js
>-@dirrmtry %%DATADIR%%
>-@dirrmtry share/appdata
>-@dirrmtry lib/darktable/views
>-@dirrmtry lib/darktable/plugins/lighttable
>-@dirrmtry lib/darktable/plugins/imageio/storage
> @dirrmtry lib/darktable/plugins/imageio/format
>+@dirrmtry lib/darktable/plugins/imageio/storage
> @dirrmtry lib/darktable/plugins/imageio
>+@dirrmtry lib/darktable/plugins/lighttable
> @dirrmtry lib/darktable/plugins
>+@dirrmtry lib/darktable/views
> @dirrmtry lib/darktable
>+@dirrmtry share/appdata
>+@dirrmtry %%DATADIR%%/js
>+@dirrmtry %%DATADIR%%/kernels
>+@dirrmtry %%DATADIR%%/latex
>+%%LUA%%@dirrmtry %%DATADIR%%/lua/darktable
>+%%LUA%%@dirrmtry %%DATADIR%%/lua
>+@dirrmtry %%DATADIR%%/pixmaps/plugins/darkroom
>+@dirrmtry %%DATADIR%%/pixmaps/plugins
>+@dirrmtry %%DATADIR%%/pixmaps
>+@dirrmtry %%DATADIR%%/rawspeed
>+@dirrmtry %%DATADIR%%/style
>+@dirrmtry %%DATADIR%%/watermarks
>+@dirrmtry %%DATADIR%%
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 190516: 143366