diff options
| author | bf <bf@FreeBSD.org> | 2012-06-13 22:26:58 +0800 |
|---|---|---|
| committer | bf <bf@FreeBSD.org> | 2012-06-13 22:26:58 +0800 |
| commit | a98550683121daa5f0497ae44c82cb138cde7c47 (patch) | |
| tree | e52a511721cdf23568d56a466b1ba136aaa75466 /graphics | |
| parent | 4135ca8deaa2eda291f74dae104b4455a764c69c (diff) | |
| download | freebsd-ports-graphics-a98550683121daa5f0497ae44c82cb138cde7c47.tar.gz freebsd-ports-graphics-a98550683121daa5f0497ae44c82cb138cde7c47.tar.zst freebsd-ports-graphics-a98550683121daa5f0497ae44c82cb138cde7c47.zip | |
fix the build when librsvg2 or ImageMagick is installed
Reported by: avg, J.H. Sylvester
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/djvulibre/files/patch-desktopfiles_Makefile.in | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/graphics/djvulibre/files/patch-desktopfiles_Makefile.in b/graphics/djvulibre/files/patch-desktopfiles_Makefile.in index 6059dc24e4a..bff3d33aebc 100644 --- a/graphics/djvulibre/files/patch-desktopfiles_Makefile.in +++ b/graphics/djvulibre/files/patch-desktopfiles_Makefile.in @@ -1,23 +1,24 @@ ---- desktopfiles/Makefile.in.orig 2012-05-07 22:56:53.000000000 -0400 -+++ desktopfiles/Makefile.in 2012-06-09 21:00:25.000000000 -0400 -@@ -30,9 +30,10 @@ +--- desktopfiles/Makefile.in.orig 2012-06-13 09:31:40.000000000 -0400 ++++ desktopfiles/Makefile.in 2012-06-13 09:34:37.000000000 -0400 +@@ -30,6 +30,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ CONVERT = @CONVERT@ --INKSCAPE = @INKSCAPE@ -+INKSCAPE = false - RSVG = @RSVG@ - XDG_MIME = @XDG_MIME@ - XDG_ICON_RESOURCE = @XDG_ICON_RESOURCE@ -@@ -58,10 +59,10 @@ - || ${CONVERT} -geometry $${s}x$${s} -depth 8 -background none $< $@ \ - || ${INKSCAPE} --without-gui --export-width=$${s} \ - --export-height=$${s} --export-png=$@ $< \ + INKSCAPE = @INKSCAPE@ +@@ -53,15 +54,10 @@ + icons: ${PNGICONS} hi-djvu.svgz + + ${PNGICONS}: djvu.svg +- s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \ +- ${RSVG} -w $${s} -h $${s} -o $@ $< \ +- || ${CONVERT} -geometry $${s}x$${s} -depth 8 -background none $< $@ \ +- || ${INKSCAPE} --without-gui --export-width=$${s} \ +- --export-height=$${s} --export-png=$@ $< \ - || cp ${srcdir}/prebuilt-$@ $@ -+ || if test -f ${srcdir}/prebuilt-$@ ; then cp ${srcdir}/prebuilt-$@ $@ ; fi ++ if test -f ${srcdir}/prebuilt-$@ ; then cp ${srcdir}/prebuilt-$@ $@ ; fi hi-djvu.svgz: djvu.svg - cat $< | gzip >$@ @@ -25,7 +26,7 @@ register-djvu-mime: register-djvu-mime.in sed < ${srcdir}/register-djvu-mime.in > register-djvu-mime \ -@@ -80,7 +81,7 @@ +@@ -80,7 +76,7 @@ install-djvu-files: FORCE ${INSTALL} -d ${DESTDIR}${datadir_djvu} |