git: 1ca520c0b584 - main - deskutils/arttime: Update to 2.0.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 02 Mar 2023 07:47:09 UTC
The branch main has been updated by ehaupt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1ca520c0b584b4188a1f22760d8334824a2a35ac
commit 1ca520c0b584b4188a1f22760d8334824a2a35ac
Author: Emanuel Haupt <ehaupt@FreeBSD.org>
AuthorDate: 2023-03-02 07:46:57 +0000
Commit: Emanuel Haupt <ehaupt@FreeBSD.org>
CommitDate: 2023-03-02 07:47:06 +0000
deskutils/arttime: Update to 2.0.0
---
deskutils/arttime/Makefile | 5 ++-
deskutils/arttime/distinfo | 6 +--
deskutils/arttime/files/patch-install.sh | 73 +++++++++++++-------------------
deskutils/arttime/pkg-plist | 33 +++++++++++++++
4 files changed, 68 insertions(+), 49 deletions(-)
diff --git a/deskutils/arttime/Makefile b/deskutils/arttime/Makefile
index a81c2ff50abc..3fb8fcfaf6ec 100644
--- a/deskutils/arttime/Makefile
+++ b/deskutils/arttime/Makefile
@@ -1,5 +1,5 @@
PORTNAME= arttime
-PORTVERSION= 1.9.8
+PORTVERSION= 2.0.0
DISTVERSIONPREFIX= v
CATEGORIES= deskutils
@@ -21,6 +21,7 @@ NO_ARCH= yes
NO_BUILD= yes
do-install:
- ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${WRKSRC}/install.sh --prefix ${PREFIX}
+ ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${WRKSRC}/install.sh \
+ --prefix ${STAGEDIR}${PREFIX}
.include <bsd.port.mk>
diff --git a/deskutils/arttime/distinfo b/deskutils/arttime/distinfo
index 73bbd3dba41c..29715c366d24 100644
--- a/deskutils/arttime/distinfo
+++ b/deskutils/arttime/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670434867
-SHA256 (poetaman-arttime-v1.9.8_GH0.tar.gz) = 299cfaeffac60008e892fb61d5404586860d71c66b12c714df79efb6c75480a5
-SIZE (poetaman-arttime-v1.9.8_GH0.tar.gz) = 403960
+TIMESTAMP = 1677617300
+SHA256 (poetaman-arttime-v2.0.0_GH0.tar.gz) = 11dabbcb8938cd01e91c7f303f317d1e3c76e5dd07ba4445c49245bc8fd1c9d6
+SIZE (poetaman-arttime-v2.0.0_GH0.tar.gz) = 417966
diff --git a/deskutils/arttime/files/patch-install.sh b/deskutils/arttime/files/patch-install.sh
index 371012df7dc0..76248d3201be 100644
--- a/deskutils/arttime/files/patch-install.sh
+++ b/deskutils/arttime/files/patch-install.sh
@@ -1,49 +1,34 @@
---- install.sh.orig 2022-12-06 05:41:43 UTC
+--- install.sh.orig 2023-02-25 08:04:14 UTC
+++ install.sh
-@@ -142,9 +142,9 @@ function printdirerror {
- fi
- }
-
--installdircode=$(checkdir $installdir)
--bindircode=$(checkdir $bindir)
--artdircode=$(checkdir $artdir)
-+installdircode=$(checkdir $DESTDIR$installdir)
-+bindircode=$(checkdir $DESTDIR$bindir)
-+artdircode=$(checkdir $DESTDIR$artdir)
-
- printdirerror $installdircode $installdir
- printdirerror $bindircode $bindir
-@@ -162,8 +162,8 @@ installerdir="${0:a:h}"
-
- # Copy bin files
- cd $installerdir/bin
--cp arttime $bindir/arttime
--cp artprint $bindir/artprint
-+cp arttime $DESTDIR$bindir/arttime
-+cp artprint $DESTDIR$bindir/artprint
-
- # Copy share files
- cd $installerdir/share/arttime/textart
-@@ -179,10 +179,10 @@ for ((i = 1; i <= $artfilearraysize; i++)); do
- oldmessage='"Custom message for art goes here"'
- oldmessage="$(head -n1 $artdir/$file)"
- newart="$(tail -n +2 $file)"
-- printf '%s\n' "$oldmessage" >$artdir/$file
-- printf '%s\n' "$newart" >>$artdir/$file
-+ printf '%s\n' "$oldmessage" >$DESTDIR$artdir/$file
-+ printf '%s\n' "$newart" >>$DESTDIR$artdir/$file
- else
-- cp $file $artdir/$file
-+ cp $file $DESTDIR$artdir/$file
- fi
- percentdone=$(((i-1.0)/(artfilearraysize-1.0)*100.0))
- [[ $percentdone -lt 1 ]] && percentdone="0"
-@@ -227,6 +227,8 @@ elif [[ $machine =~ ^Darwin.*$ ]]; then
+@@ -276,30 +276,5 @@ elif [[ $machine =~ ^Darwin.*$ ]]; then
echo "[4mNote[0m: Notification settings on macOS are not fully in control of an application.\n To check if you have desired notification settings, open following link.\n https://github.com/poetaman/arttime/issues/11"
fi
-+echoti cnorm
+-# Check if path to arttime excutable is on user's $PATH
+-if [[ ":$PATH:" == *":$bindir:"* ]]; then
+- echo "Installation complete!\nType 'arttime' and press Enter to start arttime."
+-else
+- loginshell=$(basename "${SHELL}")
+- if [[ $loginshell == *zsh* ]]; then
+- profile='.zshrc'
+- elif [[ $loginshell == *bash* ]]; then
+- #if [[ -e $HOME/.bash_profile ]]; then
+- # profile='.bash_profile'
+- #else
+- # profile='.profile'
+- #fi
+- profile=".bashrc"
+- else
+- profile=''
+- fi
+- if [[ ! -z $profile ]]; then
+- echo "\n# Following line was automatically added by arttime installer" >>$HOME/$profile
+- echo 'export PATH='"$bindir"':$PATH' >>$HOME/$profile
+- echo 'Note: Added export PATH='"$bindir"':$PATH to ~/'"$profile"
+- echo "Installation complete!\nSource ~/$profile or restart terminal. Then type 'arttime' and press Enter to start arttime."
+- else
+- echo "Installation [31m*[0malmost[31m*[0m complete! To start using arttime, follow these steps:\n 1) Add $bindir to your PATH environment variable in appropriate file,\n 2) Open a new terminal session, type 'arttime' and press Enter.\nTo run it right away from this shell, execute arttime by specifying its full path:\n $bindir/arttime"
+- fi
+-fi
+ echoti cnorm
+exit 0
- # Check if path to arttime excutable is on user's $PATH
- if [[ ":$PATH:" == *":$bindir:"* ]]; then
- echo "Installation complete!\nType 'arttime' and press Enter to start arttime."
diff --git a/deskutils/arttime/pkg-plist b/deskutils/arttime/pkg-plist
index ef07cb41f861..fac22e0ca3cb 100644
--- a/deskutils/arttime/pkg-plist
+++ b/deskutils/arttime/pkg-plist
@@ -1,5 +1,28 @@
bin/artprint
bin/arttime
+%%DATADIR%%/keypoems/anim.apple
+%%DATADIR%%/keypoems/anim.bear
+%%DATADIR%%/keypoems/anim.kissingcats
+%%DATADIR%%/keypoems/anim.knotscolored
+%%DATADIR%%/keypoems/anim.military
+%%DATADIR%%/keypoems/anim.monalisa
+%%DATADIR%%/keypoems/anim.more_8b
+%%DATADIR%%/keypoems/anim.vacation
+%%DATADIR%%/keypoems/anim.winnepooh
+%%DATADIR%%/keypoems/config.helloworld_8b
+%%DATADIR%%/keypoems/learn.welcome_8b
+%%DATADIR%%/keypoems/message.czechlife_8b
+%%DATADIR%%/keypoems/story.batscovid_8b
+%%DATADIR%%/keypoems/timer.apple6etc
+%%DATADIR%%/keypoems/timer.apple6learn_8b
+%%DATADIR%%/keypoems/timer.banana10etc
+%%DATADIR%%/keypoems/timer.banana10etc_8b
+%%DATADIR%%/keypoems/timer.banana10learn_8b
+%%DATADIR%%/keypoems/timer.helloworld_8b
+%%DATADIR%%/keypoems/timer.pomodoro4
+%%DATADIR%%/keypoems/timer.pomodoro4etc
+%%DATADIR%%/keypoems/timer.pomodoro4learn_8b
+%%DATADIR%%/src/arttime.zsh
%%DATADIR%%/textart/1bit
%%DATADIR%%/textart/8bits
%%DATADIR%%/textart/abstractbeams
@@ -16,6 +39,8 @@ bin/arttime
%%DATADIR%%/textart/asciiasskey3
%%DATADIR%%/textart/asciiasskey4
%%DATADIR%%/textart/badger
+%%DATADIR%%/textart/banana
+%%DATADIR%%/textart/barf
%%DATADIR%%/textart/basketball
%%DATADIR%%/textart/basketball2
%%DATADIR%%/textart/basketball3
@@ -91,6 +116,7 @@ bin/arttime
%%DATADIR%%/textart/dental
%%DATADIR%%/textart/desktop
%%DATADIR%%/textart/desktop2
+%%DATADIR%%/textart/doctor
%%DATADIR%%/textart/dog
%%DATADIR%%/textart/dog2
%%DATADIR%%/textart/dog3
@@ -130,6 +156,7 @@ bin/arttime
%%DATADIR%%/textart/fire
%%DATADIR%%/textart/firemen
%%DATADIR%%/textart/fish
+%%DATADIR%%/textart/fizzer
%%DATADIR%%/textart/floorplan
%%DATADIR%%/textart/footsteps
%%DATADIR%%/textart/fractals
@@ -149,6 +176,7 @@ bin/arttime
%%DATADIR%%/textart/golf2
%%DATADIR%%/textart/gorilla
%%DATADIR%%/textart/gravity
+%%DATADIR%%/textart/greed
%%DATADIR%%/textart/groupphoto
%%DATADIR%%/textart/guitar
%%DATADIR%%/textart/guitar2
@@ -323,6 +351,7 @@ bin/arttime
%%DATADIR%%/textart/poem_surfing
%%DATADIR%%/textart/pointsettias
%%DATADIR%%/textart/pointsettias2
+%%DATADIR%%/textart/pomodoro
%%DATADIR%%/textart/prayer
%%DATADIR%%/textart/pride50
%%DATADIR%%/textart/pride50_30
@@ -339,6 +368,8 @@ bin/arttime
%%DATADIR%%/textart/recycle
%%DATADIR%%/textart/recycle2
%%DATADIR%%/textart/rice
+%%DATADIR%%/textart/rip
+%%DATADIR%%/textart/rip2
%%DATADIR%%/textart/robot
%%DATADIR%%/textart/robot2
%%DATADIR%%/textart/robot3
@@ -394,6 +425,7 @@ bin/arttime
%%DATADIR%%/textart/sunset
%%DATADIR%%/textart/supermario
%%DATADIR%%/textart/swatchbook
+%%DATADIR%%/textart/syringe
%%DATADIR%%/textart/taco
%%DATADIR%%/textart/tajmahal
%%DATADIR%%/textart/tank
@@ -534,6 +566,7 @@ bin/arttime
%%DATADIR%%/textart/woodpecker
%%DATADIR%%/textart/worldfair
%%DATADIR%%/textart/worldmap
+%%DATADIR%%/textart/worldmap2
%%DATADIR%%/textart/www
%%DATADIR%%/textart/yinyang
%%DATADIR%%/textart/zebra