fltk: cleanup, cosmetic changes, add defineDebugInfoPackage (#3671)

x11-libs/fltk/fltk-1.3~git.recipe

@@ -13,45 +13,47 @@ HOMEPAGE="https://www.fltk.org/"
 COPYRIGHT="1998-2019 by Bill Spitzak and others."
 LICENSE="FLTK
 	GNU LGPL v2"
-REVISION="1"
+REVISION="2"
-#SOURCE_URI="git+https://github.com/mmuman/fltk.git#haiku-1.3-final"
+SOURCE_URI="https://github.com/mmuman/fltk/archive/haiku-1.3-final.tar.gz"
-SOURCE_URI="https://github.com/mmuman/fltk/archive/haiku-1.3-final.zip"
+CHECKSUM_SHA256="5ea5eb6f4028534bb911a61ad3df7dbfa1274dd200a03be441b75b691f79d7f1"
-#CHECKSUM_SHA256=""
-CHECKSUM_SHA256="a57ed6729dcf1d315ca63912f6660ada1c3548289366ff34bdcfa38b8d45eb89"
-#SOURCE_DIR="qt-everywhere-src-${portVersion/\~/-}"
 SOURCE_DIR="fltk-haiku-1.3-final"
-
+PATCHES="fltk-$portVersion.patchset"
-#PATCHES="qt5-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
-PROVIDES="
+commandSuffix=$secondaryArchSuffix
-	fltk$secondaryArchSuffix = $portVersion compat >= 1.3
+commandBinDir=$binDir
-	lib:libfltk$secondaryArchSuffix = $portVersion compat >= 1.3
+if [ "$targetArchitecture" = x86_gcc2 ]; then
-	lib:libfltk_forms$secondaryArchSuffix = $portVersion compat >= 1.3
+	commandSuffix=
-	lib:libfltk_images$secondaryArchSuffix = $portVersion compat >= 1.3
+	commandBinDir=$prefix/bin
-	"
+fi
 
+libVersion="1.3"
+
+PROVIDES="
+	fltk$secondaryArchSuffix = $portVersion
+	lib:libfltk$secondaryArchSuffix = $libVersion
+	lib:libfltk_forms$secondaryArchSuffix = $libVersion
+	lib:libfltk_images$secondaryArchSuffix = $libVersion
+	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	#lib:libgl$secondaryArchSuffix
 	#lib:libglu$secondaryArchSuffix
-	#lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-	fltk${secondaryArchSuffix}_devel = $portVersion compat >= 1.3
+	fltk${secondaryArchSuffix}_devel = $portVersion
-	devel:libfltk$secondaryArchSuffix = $portVersion compat >= 1.3
+	devel:libfltk$secondaryArchSuffix = $libVersion
-	devel:libfltk_forms$secondaryArchSuffix = $portVersion compat >= 1.3
+	devel:libfltk_forms$secondaryArchSuffix = $libVersion
-	devel:libfltk_images$secondaryArchSuffix = $portVersion compat >= 1.3
+	devel:libfltk_images$secondaryArchSuffix = $libVersion
-	cmd:fltk_config$secondaryArchSuffix = $portVersion compat >= 1.3
+	cmd:fltk_config$commandSuffix = 1.3.5
-	cmd:fluid$secondaryArchSuffix = $portVersion compat >= 1.3
+	cmd:fluid$commandSuffix = 1.3.5
 	"
-
 REQUIRES_devel="
 	fltk$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
@@ -71,7 +73,6 @@ BUILD_REQUIRES="
 	devel:libpng16$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
@@ -86,10 +87,18 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
+defineDebugInfoPackage fltk$secondaryArchSuffix \
+	"$libDir"/libfltk.so.$libVersion \
+	"$libDir"/libfltk_forms.so.$libVersion \
+	"$libDir"/libfltk_images.so.$libVersion \
+	"$(getPackagePrefix devel)/bin"/fluid
+
 BUILD()
 {
 	NOCONFIGURE=1 sh ./autogen.sh
-	runConfigure ./configure \
+	runConfigure --omit-dirs "docDir binDir" ./configure \
+		--bindir=$commandBinDir \
+		--docdir=$developDocDir \
 		--enable-shared \
 		--disable-gl \
 		--disable-localjpeg \
@@ -101,24 +110,16 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p $docDir
 	make install
 
+	prepareInstalledDevelLibs \
+		libfltk libfltk_forms libfltk_images
 	fixPkgconfig
 
-	prepareInstalledDevelLibs \
-		libfltk
-
-	mv -f $libDir/*.a $developLibDir/
-
-	# TODO: fix configure.ac
-	mkdir -p $developDocDir
-	mv -f $dataDir/doc/fltk/* $developDocDir/
-
 	# install does not copy attributes and strips resources!?
-	copyattr -d fluid/fluid $binDir/fluid
+	copyattr -d fluid/fluid $commandBinDir/fluid
 
-	addAppDeskbarSymlink $binDir/fluid "FLUID"
+	addAppDeskbarSymlink $commandBinDir/fluid "FLUID"
 
 	# extract the FLTK license, we already have the GPLv2 text
 	# XXX: haikuporter does not like it, wants the licence beforehand anyway.
@@ -126,7 +127,7 @@ INSTALL()
 
 	packageEntries devel \
 		$developDir \
-		$binDir \
+		$commandBinDir \
 		$manDir \
 		${dataDir}/deskbar
 }

x11-libs/fltk/patches/fltk-1.3~git.patchset

@@ -0,0 +1,22 @@
+From e569233fe948ab284478dc67c9f1f829d0b6fae5 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 8 Mar 2019 12:11:37 +0100
+Subject: Fix install path for the examples
+
+
+diff --git a/makeinclude.in b/makeinclude.in
+index f013ddd..ca0f583 100644
+--- a/makeinclude.in
++++ b/makeinclude.in
+@@ -37,7 +37,7 @@ includedir	= @includedir@
+ libdir		= @libdir@
+ mandir		= @mandir@
+ srcdir		= @srcdir@
+-docdir		= $(datadir)/doc/fltk
++docdir		= @docdir@
+ VPATH		= @srcdir@
+ USEMMFILES	= @USEMMFILES@
+ 
+-- 
+2.19.1
+