From 844f5f8aaaec2163ab136e1df129b20f70e255d7 Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Thu, 27 Nov 2014 22:39:06 +0000 Subject: [PATCH] hyphen: Bump version. Removed recipes for older versions of libmwaw and libcdr. --- app-text/libmwaw/libmwaw-0.3.1.recipe | 98 ----------------- .../libmwaw/patches/libmwaw-0.3.1.patchset | 65 ----------- ...yphen-2.8.7.recipe => hyphen-2.8.8.recipe} | 2 +- media-libs/libcdr/libcdr-0.1.0.recipe | 101 ------------------ 4 files changed, 1 insertion(+), 265 deletions(-) delete mode 100644 app-text/libmwaw/libmwaw-0.3.1.recipe delete mode 100644 app-text/libmwaw/patches/libmwaw-0.3.1.patchset rename dev-libs/hyphen/{hyphen-2.8.7.recipe => hyphen-2.8.8.recipe} (94%) delete mode 100644 media-libs/libcdr/libcdr-0.1.0.recipe diff --git a/app-text/libmwaw/libmwaw-0.3.1.recipe b/app-text/libmwaw/libmwaw-0.3.1.recipe deleted file mode 100644 index ae6a330a5..000000000 --- a/app-text/libmwaw/libmwaw-0.3.1.recipe +++ /dev/null @@ -1,98 +0,0 @@ -SUMMARY="A library for import of many legacy Mac document formats" -DESCRIPTION=" -libmwaw is a new project for converting many pre-OSX MAC text formats, some \ -graphic formats and some spreadsheet formats. -" -HOMEPAGE="http://sourceforge.net/projects/libmwaw/" -SRC_URI="http://prdownloads.sourceforge.net/libmwaw/libmwaw-$portVersion.tar.bz2" -LICENSE=" -MPL v2.0 -GNU LGPL v2.1 -" -COPYRIGHT=" -Fridrich Strba -Laurent Alonso -David Tardon -" -REVISION="2" -CHECKSUM_SHA256="66d3dbc4421daa628326204b5d14bb99f2b9d4423184027aabe207d677c89845" - -ARCHITECTURES="x86 ?x86_64" -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - # x86_gcc2 is fine as primary target architecture as long as we're building - # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES x86_gcc2" -fi -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - libmwaw$secondaryArchSuffix = $portVersion - cmd:mwaw2csv$secondaryArchSuffix - cmd:mwaw2html$secondaryArchSuffix - cmd:mwaw2raw$secondaryArchSuffix - cmd:mwaw2svg$secondaryArchSuffix - cmd:mwaw2text$secondaryArchSuffix - cmd:mwawFile$secondaryArchSuffix - cmd:mwawZip$secondaryArchSuffix - lib:libmwaw_0.3$secondaryArchSuffix = 3.0.1 compat >= 3 - " -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - lib:libboost_system$secondaryArchSuffix - lib:librevenge_0.0$secondaryArchSuffix - lib:librevenge_generators_0.0$secondaryArchSuffix - lib:librevenge_stream_0.0$secondaryArchSuffix - lib:libz$secondaryArchSuffix - lib:libstdc++$secondaryArchSuffix - lib:libgcc_s$secondaryArchSuffix - " -BUILD_REQUIRES=" - devel:libboost_system$secondaryArchSuffix - devel:librevenge_0.0$secondaryArchSuffix - devel:librevenge_generators_0.0$secondaryArchSuffix - devel:librevenge_stream_0.0$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:aclocal - cmd:libtoolize - cmd:autoconf - cmd:automake - cmd:autoheader - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -PATCHES="libmwaw-$portVersion.patchset" - -BUILD() -{ - libtoolize --force --copy --install - aclocal - autoheader - automake -a -c --foreign - autoconf - runConfigure ./configure --disable-werror - make $jobArgs -} - -INSTALL() -{ - make install - - prepareInstalledDevelLibs libmwaw-0.3 - fixPkgconfig - - packageEntries devel $developDir -} - -PROVIDES_devel=" - libmwaw${secondaryArchSuffix}_devel = $portVersion - devel:libmwaw_0.3$secondaryArchSuffix = 3.0.1 compat >= 3 - " -REQUIRES_devel=" - libmwaw$secondaryArchSuffix == $portVersion base - " diff --git a/app-text/libmwaw/patches/libmwaw-0.3.1.patchset b/app-text/libmwaw/patches/libmwaw-0.3.1.patchset deleted file mode 100644 index 9fed74e93..000000000 --- a/app-text/libmwaw/patches/libmwaw-0.3.1.patchset +++ /dev/null @@ -1,65 +0,0 @@ -From c6139ee764b898c8a90e898bb9fb94b89d854571 Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Mon, 21 Jul 2014 17:18:22 +0200 -Subject: Haiku support - - -diff --git a/configure.ac b/configure.ac -index 12e7614..e318411 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -304,6 +304,7 @@ AC_COMPILE_IFELSE([ - ], [ - AC_MSG_RESULT([yes, find Darwin getxattr]) - [XATTR_CFLAGS="-DWITH_EXTENDED_FS=1"] -+ [XATTR_LIBS=""] - ], [ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM( -@@ -314,12 +315,15 @@ AC_COMPILE_IFELSE([ - ], [ - AC_MSG_RESULT([yes, find Linux getxattr]) - [XATTR_CFLAGS="-DWITH_EXTENDED_FS=2"] -+ AS_CASE([$host], [*-*-haiku*], [XATTR_LIBS="-lgnu"], [XATTR_LIBS=""]) - ], [ - AC_MSG_RESULT([no]) - [XATTR_CFLAGS="-DWITH_EXTENDED_FS=0"] -+ [XATTR_LIBS=""] - ]) - ]) - AC_SUBST(XATTR_CFLAGS) -+AC_SUBST(XATTR_LIBS) - - # ========= - # Find zlib -diff --git a/src/tools/file/Makefile.am b/src/tools/file/Makefile.am -index 9b25e89..6260426 100644 ---- a/src/tools/file/Makefile.am -+++ b/src/tools/file/Makefile.am -@@ -3,7 +3,7 @@ bin_PROGRAMS = mwawFile - AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/lib/ $(REVENGE_CFLAGS) $(XATTR_CFLAGS) $(DEBUG_CXXFLAGS) - - mwawFile_DEPENDENCIES = @MWAWFILE_WIN32_RESOURCE@ --mwawFile_LDADD = @MWAWFILE_WIN32_RESOURCE@ -+mwawFile_LDADD = $(XATTR_LIBS) @MWAWFILE_WIN32_RESOURCE@ - - if STATIC_TOOLS - mwawFile_LDFLAGS = -all-static -diff --git a/src/tools/zip/Makefile.am b/src/tools/zip/Makefile.am -old mode 100755 -new mode 100644 -index a8dd26d..28a9c51 ---- a/src/tools/zip/Makefile.am -+++ b/src/tools/zip/Makefile.am -@@ -3,7 +3,7 @@ bin_PROGRAMS = mwawZip - AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/lib/ $(REVENGE_CFLAGS) $(XATTR_CFLAGS) $(ZLIB_CFLAGS) $(DEBUG_CXXFLAGS) - - mwawZip_DEPENDENCIES = @MWAWZIP_WIN32_RESOURCE@ --mwawZip_LDADD = $(ZLIB_LIBS) @MWAWZIP_WIN32_RESOURCE@ -+mwawZip_LDADD = $(XATTR_LIBS) $(ZLIB_LIBS) @MWAWZIP_WIN32_RESOURCE@ - - if STATIC_TOOLS - mwawZip_LDFLAGS = -all-static --- -1.8.3.4 - diff --git a/dev-libs/hyphen/hyphen-2.8.7.recipe b/dev-libs/hyphen/hyphen-2.8.8.recipe similarity index 94% rename from dev-libs/hyphen/hyphen-2.8.7.recipe rename to dev-libs/hyphen/hyphen-2.8.8.recipe index f448bd4fc..7366fc354 100644 --- a/dev-libs/hyphen/hyphen-2.8.7.recipe +++ b/dev-libs/hyphen/hyphen-2.8.8.recipe @@ -11,7 +11,7 @@ LICENSE="GNU GPL v2 GNU LGPL v2.1 MPL v1.1" SRC_URI="http://sourceforge.net/projects/hunspell/files/Hyphen/2.8/hyphen-$portVersion.tar.gz" -CHECKSUM_SHA256="c3e66de07f06125536f1fa03a121fa8a4c1b246a3b28a6ccd3cda24bb296f3a7" +CHECKSUM_SHA256="304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705" REVISION="1" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="?x86_gcc2 x86" diff --git a/media-libs/libcdr/libcdr-0.1.0.recipe b/media-libs/libcdr/libcdr-0.1.0.recipe deleted file mode 100644 index 45a60eadc..000000000 --- a/media-libs/libcdr/libcdr-0.1.0.recipe +++ /dev/null @@ -1,101 +0,0 @@ -SUMMARY="Corel Draw import library" -DESCRIPTION=" -libcdr is a library that parses the file format of CorelDRAW documents of all \ -versions. -" -HOMEPAGE="http://wiki.documentfoundation.org/DLP/Libraries/libcdr" -SRC_URI="http://dev-www.libreoffice.org/src/libcdr/libcdr-$portVersion.tar.bz2" -LICENSE=" -MPL v2.0 -" -COPYRIGHT=" -Fridrich Strba -David Tardon -" -REVISION="2" -CHECKSUM_SHA256="ef6c180db88e7024f91a949dd41aeafde0e074008c259ba4c1f8c3eefda48fd0" - -ARCHITECTURES="x86 ?x86_64" -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - # x86_gcc2 is fine as primary target architecture as long as we're building - # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES x86_gcc2" -fi -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - libcdr$secondaryArchSuffix = $portVersion - cmd:cdr2xhtml$secondaryArchSuffix - cmd:cmx2xhtml$secondaryArchSuffix - cmd:cdr2raw$secondaryArchSuffix - cmd:cmx2raw$secondaryArchSuffix - cmd:cdr2text$secondaryArchSuffix - cmd:cmx2text$secondaryArchSuffix - lib:libcdr_0.1$secondaryArchSuffix = 1.0.0 compat >= 1 - " -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - lib:libboost_system$secondaryArchSuffix - lib:libicudata$secondaryArchSuffix - lib:libicui18n$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix - lib:liblcms2$secondaryArchSuffix - lib:librevenge_0.0$secondaryArchSuffix - lib:librevenge_generators_0.0$secondaryArchSuffix - lib:librevenge_stream_0.0$secondaryArchSuffix - lib:libz$secondaryArchSuffix - lib:libstdc++$secondaryArchSuffix - lib:libgcc_s$secondaryArchSuffix - " -BUILD_REQUIRES=" - devel:libboost_system$secondaryArchSuffix - devel:libicudata$secondaryArchSuffix - devel:libicui18n$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix - devel:liblcms2$secondaryArchSuffix - devel:librevenge_0.0$secondaryArchSuffix - devel:librevenge_generators_0.0$secondaryArchSuffix - devel:librevenge_stream_0.0$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:aclocal - cmd:libtoolize - cmd:autoconf - cmd:automake - cmd:autoheader - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - libtoolize --force --copy --install - aclocal - autoheader - automake -a -c --foreign - autoconf - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install - - prepareInstalledDevelLibs libcdr-0.1 - fixPkgconfig - - packageEntries devel $developDir -} - -PROVIDES_devel=" - libcdr${secondaryArchSuffix}_devel = $portVersion - devel:libcdr_0.1$secondaryArchSuffix = 1.0.0 compat >= 1 - " -REQUIRES_devel=" - libcdr$secondaryArchSuffix == $portVersion base - "