From 27317436da6aae1bdbce1a9e885d3b04cdcdbf2f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 6 Nov 2013 02:08:29 -0800 Subject: [PATCH] Added secondaryArchSuffix for libpaper. --- app-text/libpaper/libpaper-1.1.24.recipe | 35 +++++++++++++----------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/app-text/libpaper/libpaper-1.1.24.recipe b/app-text/libpaper/libpaper-1.1.24.recipe index 4401d0adc..6cf45a760 100644 --- a/app-text/libpaper/libpaper-1.1.24.recipe +++ b/app-text/libpaper/libpaper-1.1.24.recipe @@ -2,26 +2,34 @@ SUMMARY="Library for handling paper characteristics" DESCRIPTION="The libpaper paper-handling library automates recognition of many different paper types and sizes for programs that need to deal with printed output." HOMEPAGE="http://packages.debian.org/unstable/source/libpaper" SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz" - +CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834" LICENSE="GNU GPL v2" COPYRIGHT="1996 Yves Arrouye 2000 Adrian Bunk" REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" -CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834" - -REQUIRES=" - lib:libroot >= $haikuVersion +PROVIDES=" + libpaper$secondaryArchSuffix = $portVersion + cmd:paperconf + cmd:paperconfig + lib:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1 " -BUILD_REQUIRES="" +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + " BUILD_PREREQUIRES=" - cmd:gcc - cmd:ld + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtool cmd:aclocal cmd:autoconf @@ -29,12 +37,6 @@ BUILD_PREREQUIRES=" cmd:sed " -PROVIDES=" - cmd:paperconf - cmd:paperconfig - lib:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1 - " - BUILD() { sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac @@ -65,7 +67,8 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - devel:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1 + libpaper${secondaryArchSuffix}_devel = $portVersion + devel:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1 " REQUIRES_devel="