diff options
| author | miwi <miwi@FreeBSD.org> | 2008-08-15 17:25:28 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-08-15 17:25:28 +0800 |
| commit | 105cd2cc87a1af479d7feec2eb22a12d451003c8 (patch) | |
| tree | b67819b2dc97203bde0dcc5f7751fa0e86321683 /editors/calligra | |
| parent | 6578074fcc10bd563c59d986ecb9b0782a4279cd (diff) | |
| download | freebsd-ports-gnome-105cd2cc87a1af479d7feec2eb22a12d451003c8.tar.gz freebsd-ports-gnome-105cd2cc87a1af479d7feec2eb22a12d451003c8.tar.zst freebsd-ports-gnome-105cd2cc87a1af479d7feec2eb22a12d451003c8.zip | |
- Fix build when ImageMagic and GraphicsMagic installed is.
One solution proposed on the ports mailing list was to uninstall
the ImageMagick port, rebuild editors/koffice-kde3 and then reinstall
ImageMagick, while this works it is unacceptable to have to uninstall
a port to get another port to build. The correct solution is to patch
the source configure script to skip the detection of ImageMagick when
GraphicsMagick is installed.
PR: 125526
Submitted by: Scot W. Hetzel" <swhetzel@gmaill.com>
Diffstat (limited to 'editors/calligra')
| -rw-r--r-- | editors/calligra/Makefile | 2 | ||||
| -rw-r--r-- | editors/calligra/files/patch-configure | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 4b951c5471c9..651b1caa2d26 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -7,7 +7,7 @@ PORTNAME= koffice PORTVERSION= 1.6.3 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/editors/calligra/files/patch-configure b/editors/calligra/files/patch-configure new file mode 100644 index 000000000000..0d12a4a75ae3 --- /dev/null +++ b/editors/calligra/files/patch-configure @@ -0,0 +1,30 @@ +One solution proposed on the ports mailing list was to uninstall the ImageMagick port, rebuild editors/koffice-kde3 and then reinstall ImageMagick, while this works it is unacceptable to have to uninstall a port to get another port to build. + +The correct solution is to patch the source configure script to skip the detection of ImageMagick when GraphicsMagick is installed. see attached patch: + +Patch attached with submission follows: + +--- configure.orig 2007-05-30 16:56:35.000000000 -0500 ++++ configure 2008-07-10 05:51:45.898085206 -0500 +@@ -33900,8 +33900,10 @@ + + # Check for ImageMagick... + + have_imagemagick=no + ++if test "$have_graphicsmagick" = "no"; then ++ + { echo "$as_me:$LINENO: checking for Magick-config" >&5 + echo $ECHO_N "checking for Magick-config... $ECHO_C" >&6; } + if test -n "$MAGICK_CONFIG"; then +@@ -34014,7 +34017,7 @@ + LIBMAGICK_RPATH= + fi + +- ++fi + + + + + |