From 97cd269925fe30822d2f8512b0d006f9718b98ec Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sun, 19 Jul 2015 17:42:15 +0200 Subject: [PATCH] De-Lint recipes. * fastdep Removed "." from SUMMARY. Minor cosmetics. * ffmpeg Removed "." from SUMMARY. * fheroes Removed "." from SUMMARY. * filecropper Removed "." and improved SUMMARY. Use g++ instead of gcc. * flex Removed "." from SUMMARY. Moved haiku_devel into BUILD_REQUIRES. Minor cosmetics. * fontforge Removed "." from SUMMARY. Minor cosmetics. * fossil Shortened and improved SUMMARY/DESCRIPTION. * fpc Use same SUMMARY/DESCRIPTION in the non-BEP recipes. * freetype Minor cosmetics. (The PATCHES is commented out on purpose, enabling subpixel rendering and hinting) * ftgl Removed "." from SUMMARY. Sorted _devel block to the top. --- dev-lang/fpc/fpc-2.6.2.recipe | 25 +++++++------ dev-lang/fpc/fpc-2.6.2_bin.recipe | 21 +++++++---- dev-util/fastdep/fastdep-0.16.recipe | 14 +++----- dev-vcs/fossil/fossil-1.32.recipe | 15 ++++---- dev-vcs/fossil/fossil-1.33.recipe | 9 ++--- games-rpg/fheroes2/fheroes2-r3182.recipe | 13 +++---- haiku-apps/filecropper/filecropper-1.recipe | 13 +++---- media-gfx/fontforge/fontforge-20141126.recipe | 14 ++++---- media-libs/freetype/freetype-2.6.recipe | 35 ++++++++----------- media-libs/ftgl/ftgl-2.1.3~rc5.recipe | 24 ++++++------- media-video/ffmpeg/ffmpeg-2.3.recipe | 2 +- media-video/ffmpeg/ffmpeg-2.4.2.recipe | 2 +- media-video/ffmpeg/ffmpeg26-2.6.3.recipe | 2 +- sys-devel/flex/flex-2.5.35.recipe | 16 ++++----- sys-devel/flex/flex-2.5.39.recipe | 8 ++--- 15 files changed, 98 insertions(+), 115 deletions(-) diff --git a/dev-lang/fpc/fpc-2.6.2.recipe b/dev-lang/fpc/fpc-2.6.2.recipe index 4f6e9696c..46c1ad5fc 100644 --- a/dev-lang/fpc/fpc-2.6.2.recipe +++ b/dev-lang/fpc/fpc-2.6.2.recipe @@ -1,19 +1,18 @@ SUMMARY="An open source compiler for Pascal and Object Pascal" -DESCRIPTION=" -Free Pascal (aka FPK Pascal) is a 32 and 64 bit professional Pascal compiler.\ -It can target multiple processor architectures: Intel x86, AMD64/x86-64,\ -PowerPC, PowerPC64, SPARC, and ARM. Supported operating systems include Linux,\ -FreeBSD, Haiku, Mac OS X/iOS/Darwin, DOS, Win32, Win64, WinCE, OS/2, MorphOS,\ -Nintendo GBA, Nintendo DS, and Nintendo Wii. Additionally, JVM, MIPS (big and\ -little endian variants) and Motorola 68k architecture targets are available in\ -the development versions." +DESCRIPTION="Free Pascal (aka FPK Pascal) is a 32 and 64 bit professional \ +Pascal compiler. It can target multiple processor architectures: Intel x86, \ +AMD64/x86-64, PowerPC, PowerPC64, SPARC, and ARM. Supported operating systems \ +include Linux, FreeBSD, Haiku, Mac OS X/iOS/Darwin, DOS, Win32, Win64, WinCE, \ +OS/2, MorphOS, Nintendo GBA, Nintendo DS, and Nintendo Wii. Additionally, JVM, \ +MIPS (big and little endian variants) and Motorola 68k architecture targets \ +are available in the development versions." HOMEPAGE="http://www.freespascal.org" SOURCE_URI="http://sourceforge.net/projects/freepascal/files/Source/2.6.2/fpc-2.6.2.source.tar.gz/download" CHECKSUM_SHA256="71dd1be93593daf184556377dfde61c7882bc749ad8c0bc342210e542555f9d0" LICENSE=" GNU LGPL v3 GNU GPL v3 -" + " COPYRIGHT="1993-2013 by Florian Klaempfl" REVISION="1" @@ -62,14 +61,14 @@ PROVIDES=" cmd:rmcvsdir$secondaryArchSuffix = $portVersion cmd:rstconv$secondaryArchSuffix = $portVersion cmd:unitdiff$secondaryArchSuffix = $portVersion -" + " REQUIRES=" haiku$secondaryArchSuffix -" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel fpc == 2.6.2_bin -" + " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -77,7 +76,7 @@ BUILD_PREREQUIRES=" cmd:tar cmd:wget cmd:fpc == 2.6.2_bin -" + " SOURCE_DIR="fpc-2.6.2" #Create the fpc-2.6.2-1-x86.hpkg diff --git a/dev-lang/fpc/fpc-2.6.2_bin.recipe b/dev-lang/fpc/fpc-2.6.2_bin.recipe index 1dffa5f76..6b5020339 100644 --- a/dev-lang/fpc/fpc-2.6.2_bin.recipe +++ b/dev-lang/fpc/fpc-2.6.2_bin.recipe @@ -1,12 +1,18 @@ -SUMMARY="FreePascalCompiler binary" -DESCRIPTION="FreePascalCompiler binary" +SUMMARY="An open source compiler for Pascal and Object Pascal" +DESCRIPTION="Free Pascal (aka FPK Pascal) is a 32 and 64 bit professional \ +Pascal compiler. It can target multiple processor architectures: Intel x86, \ +AMD64/x86-64, PowerPC, PowerPC64, SPARC, and ARM. Supported operating systems \ +include Linux, FreeBSD, Haiku, Mac OS X/iOS/Darwin, DOS, Win32, Win64, WinCE, \ +OS/2, MorphOS, Nintendo GBA, Nintendo DS, and Nintendo Wii. Additionally, JVM, \ +MIPS (big and little endian variants) and Motorola 68k architecture targets \ +are available in the development versions." HOMEPAGE="http://www.freepascal.org" SOURCE_URI="ftp://freepascal.stack.nl/pub/fpc/dist/2.6.0/i386-haiku/fpc-2.6.0.i386-haiku.tar" CHECKSUM_SHA256="abec33111d1d88dcce96cf26498b3687d53aa29494c6a8aada16b9b0625eef95" LICENSE=" GNU LGPL v3 GNU GPL v3 -" + " COPYRIGHT="1993-2013 by Florian Klaempfl" REVISION="1" @@ -19,17 +25,18 @@ ARCHITECTURES="x86" PROVIDES=" fpc = $portVersion cmd:fpc = $portVersion -" + " REQUIRES=" haiku$secondaryArchSuffix -" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel -" + " BUILD_PREREQUIRES=" binutils cmd:tar -" + " + SOURCE_DIR="fpc-2.6.0.i386-haiku" BUILD() diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe index 06ca53bfb..b95631182 100644 --- a/dev-util/fastdep/fastdep-0.16.recipe +++ b/dev-util/fastdep/fastdep-0.16.recipe @@ -1,9 +1,7 @@ -SUMMARY="A fast dependency generator for C/C++ files." -DESCRIPTION=" -fastdep is a preprocessor which generates dependency information suitable for \ -Makefile inclusion from C or C++ source files. Meant to run on slower \ -hardware, it is several orders of magnitude faster than gcc. -" +SUMMARY="A fast dependency generator for C/C++ files" +DESCRIPTION="fastdep is a preprocessor which generates dependency information \ +suitable for Makefile inclusion from C or C++ source files. Meant to run on \ +slower hardware, it is several orders of magnitude faster than gcc." HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/" SOURCE_URI="http://ports-space.haiku-files.org/dev-util/source/fastdep-0.16.tar.gz" CHECKSUM_SHA256="ce87d5aba71a38ad175c831f4f380498e04c22d75478310299812485b3202abb" @@ -18,21 +16,17 @@ PATCHES="fastdep-0.16.patch" PROVIDES=" cmd:fastdep = $portVersion compat >= 0 " - REQUIRES=" haiku " - BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" cmd:gcc cmd:make " - BUILD() { runConfigure ./configure diff --git a/dev-vcs/fossil/fossil-1.32.recipe b/dev-vcs/fossil/fossil-1.32.recipe index 19e330777..197482481 100644 --- a/dev-vcs/fossil/fossil-1.32.recipe +++ b/dev-vcs/fossil/fossil-1.32.recipe @@ -1,12 +1,11 @@ -SUMMARY="Simple, high-reliability, distributed software configuration management" -DESCRIPTION="Fossil is a distributed version control system like Git and \ -Mercurial, but Fossil also supports distributed bug tracking, \ -distributed wiki, and a distributed blog mechanism all in a single \ -integrated package. +SUMMARY="A distributed software configuration management" +DESCRIPTION="Fossil is a simple, high-reliability, distributed version \ +control system like Git and Mercurial, but Fossil also supports distributed \ +bug tracking, distributed wiki, and a distributed blog mechanism all in a \ +single integrated package. -Additionally, Fossil also has a built-in and easy-to-use web \ -interface that simplifies project tracking and promotes situational \ -awareness." +Additionally, Fossil also has a built-in and easy-to-use web interface that \ +simplifies project tracking and promotes situational awareness." HOMEPAGE="http://www.fossil-scm.org/" SOURCE_URI="https://www.fossil-scm.org/download/fossil-src-1.32.tar.gz" CHECKSUM_SHA256="cd79c333eb9e86fbb8c17bf5cdf31c387e4ab768eede623aed21adfdbcad686e" diff --git a/dev-vcs/fossil/fossil-1.33.recipe b/dev-vcs/fossil/fossil-1.33.recipe index 6a72fc5c3..3ea5bd479 100644 --- a/dev-vcs/fossil/fossil-1.33.recipe +++ b/dev-vcs/fossil/fossil-1.33.recipe @@ -1,7 +1,8 @@ -SUMMARY="Simple, high-reliability, distributed software configuration management" -DESCRIPTION="Fossil is a distributed version control system like Git and \ -Mercurial, but Fossil also supports distributed bug tracking, wiki, and \ -technotes all in a single, integrated package. +SUMMARY="A distributed software configuration management" +DESCRIPTION="Fossil is a simple, high-reliability, distributed version \ +control system like Git and Mercurial, but Fossil also supports distributed \ +bug tracking, distributed wiki, and a distributed blog mechanism all in a \ +single integrated package. Additionally, Fossil also has a built-in and easy-to-use web interface that \ simplifies project tracking and promotes situational awareness." diff --git a/games-rpg/fheroes2/fheroes2-r3182.recipe b/games-rpg/fheroes2/fheroes2-r3182.recipe index bdf077b41..bb8d93a34 100644 --- a/games-rpg/fheroes2/fheroes2-r3182.recipe +++ b/games-rpg/fheroes2/fheroes2-r3182.recipe @@ -1,10 +1,8 @@ -DESCRIPTION=" -Free implementation of Heroes of the Might and Magic II engine. \ -SDL is used. Free Heroes 2 is a turn based strategy video game. \ -The original game was voted the sixth best PC game of all time \ -by PC Gamer magazine in May 1997. -" -SUMMARY="Free implementation of Heroes of the Might and Magic II engine." +SUMMARY="Free implementation of Heroes of the Might and Magic II engine" +DESCRIPTION="Free implementation of Heroes of the Might and Magic II engine. \ +SDL is used. Free Heroes 2 is a turn based strategy video game. +The original game was voted the sixth best PC game of all time by PC Gamer \ +magazine in May 1997." HOMEPAGE="http://sourceforge.net/projects/fheroes2/" LICENSE="GNU GPL v2" COPYRIGHT="2006-2013 Andrey Afletdinov" @@ -29,7 +27,6 @@ PROVIDES=" fheroes2$secondaryArchSuffix = $portVersion app:fheroes2$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix diff --git a/haiku-apps/filecropper/filecropper-1.recipe b/haiku-apps/filecropper/filecropper-1.recipe index 560d0addd..b56fe4ffc 100644 --- a/haiku-apps/filecropper/filecropper-1.recipe +++ b/haiku-apps/filecropper/filecropper-1.recipe @@ -1,8 +1,6 @@ -SUMMARY="Truncates files of any kind." -DESCRIPTION=" -FileCropper is a GUI app which truncates files of any kind. It Cuts off \ -everything from a given offset (bytes) to the end of the file. -" +SUMMARY="A tool to truncate files of any kind" +DESCRIPTION="FileCropper is a GUI app which truncates files of any kind. It \ +cuts off everything from a given offset (bytes) to the end of the file." COPYRIGHT="2002 Maurice Michalski" LICENSE="MIT" HOMEPAGE="https://github.com/HaikuArchives/FileCropper" @@ -15,17 +13,14 @@ PROVIDES=" filecropper = $portVersion app:FileCropper = $portVersion " - REQUIRES=" haiku " - BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" - cmd:gcc + cmd:g++ cmd:xres " diff --git a/media-gfx/fontforge/fontforge-20141126.recipe b/media-gfx/fontforge/fontforge-20141126.recipe index baf2e427f..9ac9f96af 100644 --- a/media-gfx/fontforge/fontforge-20141126.recipe +++ b/media-gfx/fontforge/fontforge-20141126.recipe @@ -1,10 +1,12 @@ -SUMMARY="Fontforge is an outline font editor." -DESCRIPTION=" -An outline font editor that lets you create your own OpenType, TrueType, CID-keyed, multi-master -fonts and more... or simply edit existing ones." +SUMMARY="An outline font editor" +DESCRIPTION="An outline font editor that lets you create your own OpenType, \ +TrueType, CID-keyed, multi-master fonts and more... or simply edit existing \ +ones." HOMEPAGE="http://fontforge.sourceforge.net" -COPYRIGHT="2000-2012 George Williams - The FontForge Project" +COPYRIGHT=" + 2000-2012 George Williams + The FontForge Project + " LICENSE="BSD (3-clause)" SOURCE_URI="https://github.com/fontforge/fontforge/releases/download/$portVersion/fontforge-2014-11-26-Unix-Source.tar.gz" SOURCE_FILENAME="fontforge-$portVersion.tar.gz" diff --git a/media-libs/freetype/freetype-2.6.recipe b/media-libs/freetype/freetype-2.6.recipe index 61f9ddae2..bb29619a0 100644 --- a/media-libs/freetype/freetype-2.6.recipe +++ b/media-libs/freetype/freetype-2.6.recipe @@ -1,9 +1,7 @@ -SUMMARY="A Free, High-Quality, and Portable Font Engine" -DESCRIPTION=" -FreeType is written in C, designed to be small, efficient, highly \ -customizable, and portable while capable of producing high-quality output \ -(glyph images) of most vector and bitmap font formats. -" +SUMMARY="A free, high-quality, and portable font engine" +DESCRIPTION="FreeType is written in C, designed to be small, efficient, \ +highly customizable, and portable while capable of producing high-quality \ +output (glyph images) of most vector and bitmap font formats." HOMEPAGE="http://www.freetype.org" LICENSE="FreeType" COPYRIGHT="1996-2013 David Turner, Robert Wilhelm, Werner Lemberg, et al." @@ -20,12 +18,23 @@ PROVIDES=" freetype$secondaryArchSuffix = $portVersion lib:libfreetype$secondaryArchSuffix = 6.12.0 compat >= 6 " +PROVIDES_devel=" + freetype${secondaryArchSuffix}_devel = $portVersion + cmd:freetype_config${secondaryArchSuffix} = $portVersion + devel:libfreetype${secondaryArchSuffix} = 6.12.0 compat >= 6 + " REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libz$secondaryArchSuffix >= 1 lib:libpng16$secondaryArchSuffix " +REQUIRES_devel=" + freetype${secondaryArchSuffix} == $portVersion base + devel:libbz2$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix @@ -79,17 +88,3 @@ INSTALL() $dataRootDir/aclocal \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - freetype${secondaryArchSuffix}_devel = $portVersion - cmd:freetype_config${secondaryArchSuffix} = $portVersion - devel:libfreetype${secondaryArchSuffix} = 6.12.0 compat >= 6 - " -REQUIRES_devel=" - freetype${secondaryArchSuffix} == $portVersion base - devel:libbz2$secondaryArchSuffix - devel:libz$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - " diff --git a/media-libs/ftgl/ftgl-2.1.3~rc5.recipe b/media-libs/ftgl/ftgl-2.1.3~rc5.recipe index 57197ed9a..5a6afb576 100644 --- a/media-libs/ftgl/ftgl-2.1.3~rc5.recipe +++ b/media-libs/ftgl/ftgl-2.1.3~rc5.recipe @@ -1,7 +1,6 @@ -SUMMARY="Library to use arbitrary fonts in OpenGL applications." -DESCRIPTION=" -FTGL is a free cross-platform Open Source C++ library that uses Freetype2 \ -to simplify rendering fonts in OpenGL applications." +SUMMARY="Library to use arbitrary fonts in OpenGL applications" +DESCRIPTION="FTGL is a free cross-platform Open Source C++ library that uses \ +Freetype2 to simplify rendering fonts in OpenGL applications." HOMEPAGE="http://sourceforge.net/projects/ftgl" COPYRIGHT=" 2001-2004 Unicode, Inc. @@ -20,12 +19,19 @@ PROVIDES=" ftgl$secondaryArchSuffix = $portVersion compat >= 2 lib:libftgl$secondaryArchSuffix = 2.1.3 compat >= 2 " +PROVIDES_devel=" + ftgl${secondaryArchSuffix}_devel = $portVersion compat >= 1 + devel:libftgl$secondaryArchSuffix = 2.1.3 compat >= 2 + " REQUIRES=" haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libgl$secondaryArchSuffix lib:libglu$secondaryArchSuffix " +REQUIRES_devel=" + ftgl$secondaryArchSuffix == $portVersion base + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix @@ -61,13 +67,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - ftgl${secondaryArchSuffix}_devel = $portVersion compat >= 1 - devel:libftgl$secondaryArchSuffix = 2.1.3 compat >= 2 - " -REQUIRES_devel=" - ftgl$secondaryArchSuffix == $portVersion base - " diff --git a/media-video/ffmpeg/ffmpeg-2.3.recipe b/media-video/ffmpeg/ffmpeg-2.3.recipe index 2019e26e6..dfa999910 100644 --- a/media-video/ffmpeg/ffmpeg-2.3.recipe +++ b/media-video/ffmpeg/ffmpeg-2.3.recipe @@ -1,4 +1,4 @@ -SUMMARY="Audio and video recording, conversion, and streaming library." +SUMMARY="Audio and video recording, conversion, and streaming library" DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert \ and stream audio and video. It includes libavcodec - the leading audio/video \ codec library." diff --git a/media-video/ffmpeg/ffmpeg-2.4.2.recipe b/media-video/ffmpeg/ffmpeg-2.4.2.recipe index b098111d8..3be88a025 100644 --- a/media-video/ffmpeg/ffmpeg-2.4.2.recipe +++ b/media-video/ffmpeg/ffmpeg-2.4.2.recipe @@ -1,4 +1,4 @@ -SUMMARY="Audio and video recording, conversion, and streaming library." +SUMMARY="Audio and video recording, conversion, and streaming library" DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert \ and stream audio and video. It includes libavcodec - the leading audio/video \ codec library." diff --git a/media-video/ffmpeg/ffmpeg26-2.6.3.recipe b/media-video/ffmpeg/ffmpeg26-2.6.3.recipe index f355e9d7e..f82e6e586 100644 --- a/media-video/ffmpeg/ffmpeg26-2.6.3.recipe +++ b/media-video/ffmpeg/ffmpeg26-2.6.3.recipe @@ -1,4 +1,4 @@ -SUMMARY="Audio and video recording, conversion, and streaming library." +SUMMARY="Audio and video recording, conversion, and streaming library" DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert \ and stream audio and video. It includes libavcodec - the leading audio/video \ codec library." diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 18d0b75c8..de6a64575 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -1,10 +1,11 @@ -SUMMARY="A tool for generating scanners." -DESCRIPTION=" -Flex is a fast lexical analyser generator. It is a tool for generating \ -programs that perform pattern-matching on text. -" +SUMMARY="A tool for generating scanners" +DESCRIPTION="Flex is a fast lexical analyser generator. It is a tool for \ +generating programs that perform pattern-matching on text." HOMEPAGE="http://flex.sourceforge.net/" -COPYRIGHT="2001-2007 The Flex Project; 1990, 1997 The Regents of the University of California" +COPYRIGHT=" + 2001-2007 The Flex Project + 1990, 1997 The Regents of the University of California + " LICENSE="Flex" SOURCE_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" CHECKSUM_SHA256="0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b" @@ -24,9 +25,9 @@ REQUIRES=" cmd:m4 " BUILD_REQUIRES=" + haiku_devel " BUILD_PREREQUIRES=" - haiku_devel cmd:aclocal cmd:autoconf cmd:automake @@ -37,7 +38,6 @@ BUILD_PREREQUIRES=" cmd:makeinfo " - BUILD() { rm aclocal.m4 diff --git a/sys-devel/flex/flex-2.5.39.recipe b/sys-devel/flex/flex-2.5.39.recipe index 4c918e1ee..f8ca12387 100644 --- a/sys-devel/flex/flex-2.5.39.recipe +++ b/sys-devel/flex/flex-2.5.39.recipe @@ -1,8 +1,6 @@ SUMMARY="A tool for generating scanners" -DESCRIPTION=" -Flex is a fast lexical analyser generator. It is a tool for generating \ -programs that perform pattern-matching on text. -" +DESCRIPTION="Flex is a fast lexical analyser generator. It is a tool for \ +generating programs that perform pattern-matching on text." HOMEPAGE="http://flex.sourceforge.net/" COPYRIGHT=" 2001-2007 The Flex Project @@ -30,9 +28,9 @@ REQUIRES=" cmd:m4 " BUILD_REQUIRES=" + haiku_devel " BUILD_PREREQUIRES=" - haiku_devel cmd:aclocal cmd:autoconf cmd:automake