haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

imagemagick: install documentation to the proper directory (#8782)

Browse Source
This commit is contained in:
Joachim Mairböck
2023-06-03 13:47:55 +02:00
committed by GitHub
parent 89e6843bb2
commit 9bae1f2873
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media-gfx/imagemagick/imagemagick-7.1.1.11.recipe
View File

@@ -9,7 +9,7 @@ HOMEPAGE="https://www.imagemagick.org/
https://github.com/ImageMagick/ImageMagick/"
COPYRIGHT="1999-2020 ImageMagick Studio LLC"
LICENSE="IMAGEMAGICK"
REVISION="1"
REVISION="2"
imageMagickVersion="${portVersion%.*}-${portVersion##*.}"
SOURCE_URI="https://www.imagemagick.org/download/releases/ImageMagick-$imageMagickVersion.tar.xz
https://mirror.sobukus.de/files/src/imagemagick/ImageMagick-$imageMagickVersion.tar.xz
@@ -164,8 +164,9 @@ BUILD()
{
export LDFLAGS="-lnetwork"
autoreconf -vfi
runConfigure --omit-dirs binDir ./configure \
runConfigure --omit-dirs "binDir docDir" ./configure \
--bindir=$commandBinDir \
--docdir=$documentationDir/packages \
--enable-shared \
--disable-static \
--without-modules
@@ -188,7 +189,7 @@ INSTALL()
$developDir \
$commandBinDir/*-config \
$manDir/man1/*-config.1 \
$dataDir/doc/ImageMagick-7/www/api
$documentationDir/packages/ImageMagick-7/www/api
}
TEST()

36
media-gfx/imagemagick/patches/imagemagick-7.1.1.11.patchset
View File

@@ -1,4 +1,4 @@
From 07617b434bad49481638d65c7dacdd70a6fdbd5e Mon Sep 17 00:00:00 2001
From d8ea38de79991ff78476088ae015b5ec3ab00933 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Wed, 27 Dec 2017 18:43:52 +0100
Subject: Don't reset LIBRARY_PATH.
@@ -27,10 +27,10 @@ index cd5ef55..e76d766 100644
#ifndef MAGICKCORE_SHAREARCH_RELATIVE_PATH
diff --git a/configure.ac b/configure.ac
index 92cc60e..4c643dc 100644
index 3aaac47..9e912f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2968,15 +2968,15 @@ AC_DEFINE_UNQUOTED([EXECUTABLE_PATH],["$DEFINE_EXECUTABLE_PATH"],[Directory wher
@@ -3003,15 +3003,15 @@ AC_DEFINE_UNQUOTED([EXECUTABLE_PATH],["$DEFINE_EXECUTABLE_PATH"],[Directory wher
AC_SUBST([EXECUTABLE_PATH])
# Path to ImageMagick lib
@@ -51,7 +51,7 @@ index 92cc60e..4c643dc 100644
#
# path to local binaries
@@ -2993,7 +2993,7 @@ AC_SUBST([LIB_BIN_DIR])
@@ -3028,7 +3028,7 @@ AC_SUBST([LIB_BIN_DIR])
LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR
AC_SUBST([LIB_BIN_DIR_RELATIVE_PATH])
@@ -60,7 +60,7 @@ index 92cc60e..4c643dc 100644
AC_SUBST([LIB_BIN_DIR_PATH])
#
@@ -3013,7 +3013,7 @@ AC_SUBST([MODULES_DIRNAME])
@@ -3048,7 +3048,7 @@ AC_SUBST([MODULES_DIRNAME])
MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
AC_SUBST([MODULES_RELATIVE_PATH])
@@ -69,7 +69,7 @@ index 92cc60e..4c643dc 100644
AC_SUBST([MODULES_PATH])
#
@@ -3106,7 +3106,7 @@ AC_SUBST([SHAREARCH_DIRNAME])
@@ -3141,7 +3141,7 @@ AC_SUBST([SHAREARCH_DIRNAME])
SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}"
AC_SUBST([SHAREARCH_RELATIVE_PATH])
@@ -81,3 +81,27 @@ index 92cc60e..4c643dc 100644
--
2.37.3
From 03f432375cce1fd8818e712021b2d42242422e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sat, 3 Jun 2023 13:17:44 +0200
Subject: set DOC_DIR from configure argument
A subdirectory is added to the final docDir
diff --git a/configure.ac b/configure.ac
index 9e912f3..aad59b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,7 +207,7 @@ eval "eval LIBEXEC_DIR=$libexecdir"
AC_SUBST([LIBEXEC_DIR])
eval "eval DATA_DIR=$datadir"
AC_SUBST([DATA_DIR])
-eval "eval DOC_DIR=$datadir/doc"
+eval "eval DOC_DIR=$docdir"
AC_SUBST([DOC_DIR])
eval "eval SYSCONF_DIR=$sysconfdir"
AC_SUBST([SYSCONF_DIR])
--
2.37.3