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

libX11, use correct REQUIRES_devel

Browse Source
This commit is contained in:
begasus
2018-08-11 10:27:18 +02:00
committed by waddlesplash
parent 54e28a4fd5
commit 604455e582
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
x11-libs/libx11/libx11-1.6.5.recipe
View File

@@ -66,10 +66,11 @@ COPYRIGHT="2003-2006,2008 Jamey Sharp, Josh Triplett
" "
# TODO: check all the licenses in the COPYING file in the next century. # TODO: check all the licenses in the COPYING file in the next century.
LICENSE="MIT" LICENSE="MIT"
REVISION="6" REVISION="7"
SOURCE_URI="https://www.x.org/releases/individual/lib/libX11-$portVersion.tar.bz2" SOURCE_URI="https://www.x.org/releases/individual/lib/libX11-$portVersion.tar.bz2"
CHECKSUM_SHA256="4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" CHECKSUM_SHA256="4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d"
SOURCE_DIR="libX11-$portVersion" SOURCE_DIR="libX11-$portVersion"
# TODO: fix the remaining xmlto conversions
PATCHES="libx11-$portVersion.patchset" PATCHES="libx11-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64" ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -79,33 +80,38 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES=" PROVIDES="
libx11$secondaryArchSuffix = $portVersion libx11$secondaryArchSuffix = $portVersion
lib:libx11$secondaryArchSuffix = 6.3.0 compat >= 6 lib:libX11$secondaryArchSuffix = 6.3.0 compat >= 6
lib:libx11_xcb$secondaryArchSuffix = 1.0.0 compat >= 1 lib:libX11_xcb$secondaryArchSuffix = 1.0.0 compat >= 1
" "
REQUIRES=" REQUIRES="
haiku$secondaryArchSuffix haiku$secondaryArchSuffix
lib:libxcb$secondaryArchSuffix lib:libXau$secondaryArchSuffix
lib:libxau$secondaryArchSuffix lib:libXcb$secondaryArchSuffix
lib:libXdmcp$secondaryArchSuffix
" "
PROVIDES_devel=" PROVIDES_devel="
libx11${secondaryArchSuffix}_devel = $portVersion libx11${secondaryArchSuffix}_devel = $portVersion
devel:libx11$secondaryArchSuffix = 6.3.0 compat >= 6 devel:libX11$secondaryArchSuffix = 6.3.0 compat >= 6
devel:libx11_xcb$secondaryArchSuffix = 1.0.0 compat >= 1 devel:libX11_xcb$secondaryArchSuffix = 1.0.0 compat >= 1
" "
REQUIRES_devel=" REQUIRES_devel="
libx11$secondaryArchSuffix == $portVersion base libx11$secondaryArchSuffix == $portVersion base
devel:kbproto
devel:libXcb$secondaryArchSuffix
devel:xproto
" "
BUILD_REQUIRES=" BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel haiku${secondaryArchSuffix}_devel
#docbook_xml_dtd docbook_xml_dtd
#docbook_xsl_stylesheets docbook_xsl_stylesheets
devel:inputproto devel:inputproto
devel:kbproto devel:kbproto
devel:libpthread_stubs devel:libpthread_stubs
devel:libxau$secondaryArchSuffix devel:libXau$secondaryArchSuffix
devel:libxcb$secondaryArchSuffix devel:libXcb$secondaryArchSuffix
devel:libXdmcp$secondaryArchSuffix
devel:util_macros devel:util_macros
devel:xcb_proto devel:xcb_proto
devel:xextproto devel:xextproto
@@ -119,8 +125,8 @@ BUILD_PREREQUIRES="
cmd:libtoolize$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix
cmd:make cmd:make
cmd:pkg_config$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix
#cmd:xmlto cmd:xmlto
#cmd:xsltproc cmd:xsltproc
" "
defineDebugInfoPackage libx11$secondaryArchSuffix \ defineDebugInfoPackage libx11$secondaryArchSuffix \
@@ -138,6 +144,8 @@ BUILD()
INSTALL() INSTALL()
{ {
make install-strip make install-strip
install -d -m 755 "$docDir"
install -m 644 -t "$docDir" README
rm -f $libDir/lib*.la rm -f $libDir/lib*.la
@@ -148,7 +156,7 @@ INSTALL()
fixPkgconfig fixPkgconfig
if [ -n "$secondaryArchSuffix" ]; then if [ -n "$secondaryArchSuffix" ]; then
rm -rf $documentationDir rm -rf $manDir
maybe_manDir_man3= maybe_manDir_man3=
else else
maybe_manDir_man3=$manDir/man3 maybe_manDir_man3=$manDir/man3