From 75937127234b514ff5e760592a9ec65b1e38eeda Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 17 Sep 2018 07:36:01 +0200 Subject: [PATCH] code format. orphilia_dropbox: switch to archive. --- .../optipngtranslator-0.0.1.recipe | 6 ++-- .../orphilia_dropbox-1.recipe | 29 ++++++++++--------- haiku-apps/sequitur/sequitur-2.1.2.recipe | 2 +- haiku-apps/timetracker/timetracker-0.2.recipe | 8 ++--- haiku-apps/xaos/xaos-3.4.recipe | 2 +- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe index cf0148d25..47aa06017 100644 --- a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe +++ b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe @@ -4,13 +4,14 @@ The OptiPNGTranslator for Haiku allows you to save images as PNG files which \ have been optimized by OptiPNG. " HOMEPAGE="https://github.com/noryb009/OptiPNGTranslator" -LICENSE="MIT" COPYRIGHT="2013 Luke (noryb009)" +LICENSE="MIT" REVISION="3" srcGitRev="8e3996a92d840f3c097cf954e001d4f371265161" SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="4bbcb970f42bc13bba1105cce03739601339c3c52f8aec6c16130a9a1834746d" SOURCE_DIR="OptiPNGTranslator-$srcGitRev" + ARCHITECTURES="x86_gcc2 x86 x86_64" if [ $buildArchitecture = x86_gcc2 ] && \ @@ -22,7 +23,6 @@ PROVIDES=" optipngtranslator = $portVersion app:OptiPNGTranslator = $portVersion " - REQUIRES=" haiku cmd:optipng$optipngSuffix @@ -32,9 +32,9 @@ BUILD_REQUIRES=" haiku_devel " BUILD_PREREQUIRES=" + makefile_engine cmd:as cmd:gcc - makefile_engine cmd:make " diff --git a/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe b/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe index 62c63db8e..bdd75b60e 100644 --- a/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe +++ b/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe @@ -9,9 +9,13 @@ HOMEPAGE="https://github.com/ksiazkowicz/orphilia-dropbox" COPYRIGHT="2011-2014 Maciej Janiszewski" LICENSE="MIT" REVISION="2" -SOURCE_URI="git+https://github.com/ksiazkowicz/orphilia-dropbox.git#f692f26793a48e2742f12c20767f0f22a9ff39af" +srcGitRev="f692f26793a48e2742f12c20767f0f22a9ff39af" +SOURCE_URI="https://github.com/ksiazkowicz/orphilia-dropbox/archive/f692f26793a48e2742f12c20767f0f22a9ff39af.tar.gz" +CHECKSUM_SHA256="31d39a4aa08b3711bcc044045c2862ddbd831ff4e848b85c6c188ce7e4c562d1" +SOURCE_DIR="orphilia-dropbox-$srcGitRev" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + # Should be called after activating package #POST_INSTALL_SCRIPTS=" # \"orphilia.py --configuration\" @@ -19,19 +23,8 @@ ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" orphilia_dropbox = $portVersion - cmd:orphilia_haiku_notify = $portVersion cmd:orphilia.py = $portVersion - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:gcc - cmd:python - cmd:sed - " - -BUILD_REQUIRES=" - haiku_devel - setuptools_python + cmd:orphilia_haiku_notify = $portVersion " REQUIRES=" pathtools_python @@ -41,6 +34,16 @@ REQUIRES=" cmd:python " +BUILD_REQUIRES=" + haiku_devel + setuptools_python + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:python + cmd:sed + " + BUILD() { python build.py diff --git a/haiku-apps/sequitur/sequitur-2.1.2.recipe b/haiku-apps/sequitur/sequitur-2.1.2.recipe index 0af1c46b2..ad5ef957b 100644 --- a/haiku-apps/sequitur/sequitur-2.1.2.recipe +++ b/haiku-apps/sequitur/sequitur-2.1.2.recipe @@ -49,8 +49,8 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" makefile_engine - cmd:make cmd:gcc + cmd:make " # For the time being the _debuginfo package has to be generated separately, as diff --git a/haiku-apps/timetracker/timetracker-0.2.recipe b/haiku-apps/timetracker/timetracker-0.2.recipe index 9c92c98bb..68150d4ae 100644 --- a/haiku-apps/timetracker/timetracker-0.2.recipe +++ b/haiku-apps/timetracker/timetracker-0.2.recipe @@ -17,6 +17,9 @@ fi ARCHITECTURES="x86_gcc2 ?x86 x86_64" +USER_SETTINGS_FILES="settings/TimeTracker + settings/TimeTrackerTasks" + PROVIDES=" timetracker = $portVersion app:TimeTracker = $portVersion @@ -30,13 +33,10 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" makefile_engine - cmd:make cmd:g++ + cmd:make " -USER_SETTINGS_FILES="settings/TimeTracker - settings/TimeTrackerTasks" - BUILD() { cd src diff --git a/haiku-apps/xaos/xaos-3.4.recipe b/haiku-apps/xaos/xaos-3.4.recipe index 49c9eef94..9242338a3 100644 --- a/haiku-apps/xaos/xaos-3.4.recipe +++ b/haiku-apps/xaos/xaos-3.4.recipe @@ -23,8 +23,8 @@ Thomas Marsh and Jan Hubicka, and it is currently maintained by Zoltan Kovacs \ and J.B. Langston. Countless other improvements have been contributed by \ volunteers around the world. You can help improve XaoS, too." HOMEPAGE="http://xaos.sourceforge.net/" -LICENSE="GNU GPL v2" COPYRIGHT="2008 GNU XaoS Contributors" +LICENSE="GNU GPL v2" REVISION="3" SOURCE_URI="https://github.com/xaos-project/XaoS/archive/release-$portVersion.zip" CHECKSUM_SHA256="7b2a802c638ed880a86db4b2feccc7fc949599916329b799807758dca61d6eb8"