View | Details | Raw Unified | Return to bug 260506 | Differences between
and this patch

Collapse All | Expand All

(-)b/x11-themes/canta-gtk-themes/Makefile (-1 / +3 lines)
Lines 1-6 Link Here
1
# Created by: Alexander Vereeken <Alexander88207@protonmail.com>
1
# Created by: Alexander Vereeken <Alexander88207@protonmail.com>
2
2
3
PORTNAME=	canta-gtk-themes
3
PORTNAME=	canta-gtk-themes
4
PORTREVISION=	1
4
DISTVERSION=	2021-09-08
5
DISTVERSION=	2021-09-08
5
CATEGORIES=	x11-themes
6
CATEGORIES=	x11-themes
6
7
Lines 11-16 LICENSE= GPLv3 Link Here
11
LICENSE_FILE=	${WRKSRC}/COPYING
12
LICENSE_FILE=	${WRKSRC}/COPYING
12
13
13
BUILD_DEPENDS=	bash>0:shells/bash \
14
BUILD_DEPENDS=	bash>0:shells/bash \
15
		coreutils>0:sysutils/coreutils \
14
		gsed:textproc/gsed \
16
		gsed:textproc/gsed \
15
		sassc>0:textproc/sassc
17
		sassc>0:textproc/sassc
16
RUN_DEPENDS=	gtk-engines2>0:x11-themes/gtk-engines2 \
18
RUN_DEPENDS=	gtk-engines2>0:x11-themes/gtk-engines2 \
Lines 27-32 NO_BUILD= yes Link Here
27
29
28
do-install:
30
do-install:
29
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/themes
31
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/themes
30
	${WRKSRC}/install.sh -d ${STAGEDIR}${PREFIX}/share/themes -t standard blue indigo
32
	${WRKSRC}/install.sh -d ${STAGEDIR}${PREFIX}/share/themes -t standard blue indigo 
31
33
32
.include <bsd.port.mk>
34
.include <bsd.port.mk>
(-)b/x11-themes/canta-gtk-themes/files/patch-install.sh (-9 / +172 lines)
Lines 1-6 Link Here
1
--- install.sh.orig	2021-09-22 16:18:31 UTC
1
--- install.sh.orig	2021-12-17 21:36:35 UTC
2
+++ install.sh
2
+++ install.sh
3
@@ -403,13 +403,13 @@ theme_colors() {
3
@@ -84,8 +84,8 @@ install() {
4
   theme_tweaks
5
 
6
   mkdir -p                                                                           ${THEME_DIR}
7
-  cp -rf ${SRC_DIR}/COPYING                                                          ${THEME_DIR}
8
-  cp -rf ${SRC_DIR}/AUTHORS                                                          ${THEME_DIR}
9
+  gcp -rf ${SRC_DIR}/COPYING                                                          ${THEME_DIR}
10
+  gcp -rf ${SRC_DIR}/AUTHORS                                                          ${THEME_DIR}
11
 
12
   echo "[Desktop Entry]" >> ${THEME_DIR}/index.theme
13
   echo "Type=X-GNOME-Metatheme" >> ${THEME_DIR}/index.theme
14
@@ -101,10 +101,10 @@ install() {
15
   echo "ButtonLayout=menu:minimize,maximize,close" >> ${THEME_DIR}/index.theme
16
 
17
   mkdir -p                                                                           ${THEME_DIR}/gnome-shell
18
-  cp -rf ${SRC_DIR}/src/gnome-shell/{*.svg,extensions,noise-texture.png,pad-osd.css} ${THEME_DIR}/gnome-shell
19
-  cp -rf ${SRC_DIR}/src/gnome-shell/gnome-shell-theme.gresource.xml                  ${THEME_DIR}/gnome-shell
20
-  cp -rf ${SRC_DIR}/src/gnome-shell/assets${ELSE_DARK}                               ${THEME_DIR}/gnome-shell/assets
21
-  cp -rf ${SRC_DIR}/src/gnome-shell/common-assets/*.svg                              ${THEME_DIR}/gnome-shell/assets
22
+  gcp -rf ${SRC_DIR}/src/gnome-shell/{*.svg,extensions,noise-texture.png,pad-osd.css} ${THEME_DIR}/gnome-shell
23
+  gcp -rf ${SRC_DIR}/src/gnome-shell/gnome-shell-theme.gresource.xml                  ${THEME_DIR}/gnome-shell
24
+  gcp -rf ${SRC_DIR}/src/gnome-shell/assets${ELSE_DARK}                               ${THEME_DIR}/gnome-shell/assets
25
+  gcp -rf ${SRC_DIR}/src/gnome-shell/common-assets/*.svg                              ${THEME_DIR}/gnome-shell/assets
26
 
27
   if [[ "$tweaks" == 'true' ]]; then
28
     if [[ "${GS_VERSION:-}" == 'new' ]]; then
29
@@ -114,76 +114,76 @@ install() {
30
     fi
31
   else
32
     if [[ "${GS_VERSION:-}" == 'new' ]]; then
33
-      cp -rf ${SRC_DIR}/src/gnome-shell/shell-40-0/gnome-shell${color}${size}.css    ${THEME_DIR}/gnome-shell/gnome-shell.css
34
+      gcp -rf ${SRC_DIR}/src/gnome-shell/shell-40-0/gnome-shell${color}${size}.css    ${THEME_DIR}/gnome-shell/gnome-shell.css
35
     else
36
-      cp -rf ${SRC_DIR}/src/gnome-shell/shell-3-36/gnome-shell${color}${size}.css    ${THEME_DIR}/gnome-shell/gnome-shell.css
37
+      gcp -rf ${SRC_DIR}/src/gnome-shell/shell-3-36/gnome-shell${color}${size}.css    ${THEME_DIR}/gnome-shell/gnome-shell.css
38
     fi
39
   fi
40
 
41
   mkdir -p                                                                           ${THEME_DIR}/gtk-2.0
42
-  cp -rf ${SRC_DIR}/src/gtk-2.0/{apps.rc,hacks.rc,panel.rc}                          ${THEME_DIR}/gtk-2.0
43
-  cp -rf ${SRC_DIR}/src/gtk-2.0/main.rc${theme}                                      ${THEME_DIR}/gtk-2.0/main.rc
44
-  cp -rf ${SRC_DIR}/src/gtk-2.0/assets${ELSE_DARK}                                   ${THEME_DIR}/gtk-2.0/assets
45
+  gcp -rf ${SRC_DIR}/src/gtk-2.0/{apps.rc,hacks.rc,panel.rc}                          ${THEME_DIR}/gtk-2.0
46
+  gcp -rf ${SRC_DIR}/src/gtk-2.0/main.rc${theme}                                      ${THEME_DIR}/gtk-2.0/main.rc
47
+  gcp -rf ${SRC_DIR}/src/gtk-2.0/assets${ELSE_DARK}                                   ${THEME_DIR}/gtk-2.0/assets
48
   [[ ${theme} != '' && ${color} == '-dark' ]] && \
49
-  cp -rf ${SRC_DIR}/src/gtk-2.0/assets-theme-dark/*.png                              ${THEME_DIR}/gtk-2.0/assets
50
-  cp -rf ${SRC_DIR}/src/gtk-2.0/gtkrc${theme}${color}                                ${THEME_DIR}/gtk-2.0/gtkrc
51
+  gcp -rf ${SRC_DIR}/src/gtk-2.0/assets-theme-dark/*.png                              ${THEME_DIR}/gtk-2.0/assets
52
+  gcp -rf ${SRC_DIR}/src/gtk-2.0/gtkrc${theme}${color}                                ${THEME_DIR}/gtk-2.0/gtkrc
53
 
54
   mkdir -p                                                                           ${THEME_DIR}/gtk-3.0
55
-  cp -rf ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-3.0
56
-  cp -rf ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-3.0
57
+  gcp -rf ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-3.0
58
+  gcp -rf ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-3.0
59
 
60
   if [[ "$tweaks" == 'true' ]]; then
61
     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.scss                  ${THEME_DIR}/gtk-3.0/gtk.css
62
     [[ ${color} != '-dark' ]] && \
63
     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.scss                     ${THEME_DIR}/gtk-3.0/gtk-dark.css
64
   else
65
-    cp -rf ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-3.0/gtk.css
66
+    gcp -rf ${SRC_DIR}/src/gtk/3.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-3.0/gtk.css
67
     [[ ${color} != '-dark' ]] && \
68
-    cp -rf ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-3.0/gtk-dark.css
69
+    gcp -rf ${SRC_DIR}/src/gtk/3.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-3.0/gtk-dark.css
70
   fi
71
 
72
   mkdir -p                                                                           ${THEME_DIR}/gtk-4.0
73
-  cp -rf ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-4.0
74
-  cp -rf ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-4.0
75
+  gcp -rf ${SRC_DIR}/src/gtk/assets                                                   ${THEME_DIR}/gtk-4.0
76
+  gcp -rf ${SRC_DIR}/src/gtk/common-assets                                            ${THEME_DIR}/gtk-4.0
77
 
78
   if [[ "$tweaks" == 'true' ]]; then
79
     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.scss                  ${THEME_DIR}/gtk-4.0/gtk.css
80
     [[ ${color} != '-dark' ]] && \
81
     sassc $SASSC_OPT ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.scss                     ${THEME_DIR}/gtk-4.0/gtk-dark.css
82
   else
83
-    cp -rf ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-4.0/gtk.css
84
+    gcp -rf ${SRC_DIR}/src/gtk/4.0/gtk${color}${size}.css                             ${THEME_DIR}/gtk-4.0/gtk.css
85
     [[ ${color} != '-dark' ]] && \
86
-    cp -rf ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-4.0/gtk-dark.css
87
+    gcp -rf ${SRC_DIR}/src/gtk/4.0/gtk-dark${size}.css                                ${THEME_DIR}/gtk-4.0/gtk-dark.css
88
   fi
89
 
90
   mkdir -p                                                                           ${THEME_DIR}/metacity-1
91
-  cp -rf ${SRC_DIR}/src/metacity-1/assets/*.png                                      ${THEME_DIR}/metacity-1
92
-  cp -rf ${SRC_DIR}/src/metacity-1/metacity-theme-1${color}.xml                      ${THEME_DIR}/metacity-1/metacity-theme-1.xml
93
+  gcp -rf ${SRC_DIR}/src/metacity-1/assets/*.png                                      ${THEME_DIR}/metacity-1
94
+  gcp -rf ${SRC_DIR}/src/metacity-1/metacity-theme-1${color}.xml                      ${THEME_DIR}/metacity-1/metacity-theme-1.xml
95
   cd ${THEME_DIR}/metacity-1
96
   ln -s metacity-theme-1.xml metacity-theme-2.xml
97
   ln -s metacity-theme-1.xml metacity-theme-3.xml
98
 
99
   mkdir -p                                                                           ${THEME_DIR}/unity
100
-  cp -rf ${SRC_DIR}/src/unity/{*.svg,*.png,dash-widgets.json}                        ${THEME_DIR}/unity
101
-  cp -rf ${SRC_DIR}/src/unity/assets${ELSE_LIGHT}                                    ${THEME_DIR}/unity/assets
102
+  gcp -rf ${SRC_DIR}/src/unity/{*.svg,*.png,dash-widgets.json}                        ${THEME_DIR}/unity
103
+  gcp -rf ${SRC_DIR}/src/unity/assets${ELSE_LIGHT}                                    ${THEME_DIR}/unity/assets
104
 
105
   mkdir -p                                                                           ${THEME_DIR}/xfwm4
106
-  cp -rf ${SRC_DIR}/src/xfwm4/{*.svg,themerc}                                        ${THEME_DIR}/xfwm4
107
-  cp -rf ${SRC_DIR}/src/xfwm4/assets${ELSE_LIGHT}                                    ${THEME_DIR}/xfwm4/assets
108
+  gcp -rf ${SRC_DIR}/src/xfwm4/{*.svg,themerc}                                        ${THEME_DIR}/xfwm4
109
+  gcp -rf ${SRC_DIR}/src/xfwm4/assets${ELSE_LIGHT}                                    ${THEME_DIR}/xfwm4/assets
110
 
111
   if [[ "${theme}" == '' ]]; then
112
     mkdir -p                                                                         ${THEME_DIR}/cinnamon
113
-    cp -rf ${SRC_DIR}/src/cinnamon/cinnamon${ELSE_DARK}.css                          ${THEME_DIR}/cinnamon/cinnamon.css
114
-    cp -rf ${SRC_DIR}/src/cinnamon/assets/common-assets                              ${THEME_DIR}/cinnamon/assets
115
-    cp -rf ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/checkbox/*.svg          ${THEME_DIR}/cinnamon/assets/checkbox
116
-    cp -rf ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/menu/*.svg              ${THEME_DIR}/cinnamon/assets/menu
117
-    cp -rf ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/misc/*.svg              ${THEME_DIR}/cinnamon/assets/misc
118
-    cp -rf ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/switch/*.svg            ${THEME_DIR}/cinnamon/assets/switch
119
-    cp -rf ${SRC_DIR}/src/cinnamon/thumbnail${ELSE_DARK}.png                         ${THEME_DIR}/cinnamon/thumbnail.png
120
+    gcp -rf ${SRC_DIR}/src/cinnamon/cinnamon${ELSE_DARK}.css                          ${THEME_DIR}/cinnamon/cinnamon.css
121
+    gcp -rf ${SRC_DIR}/src/cinnamon/assets/common-assets                              ${THEME_DIR}/cinnamon/assets
122
+    gcp -rf ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/checkbox/*.svg          ${THEME_DIR}/cinnamon/assets/checkbox
123
+    gcp -rf ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/menu/*.svg              ${THEME_DIR}/cinnamon/assets/menu
124
+    gcp -rf ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/misc/*.svg              ${THEME_DIR}/cinnamon/assets/misc
125
+    gcp -rf ${SRC_DIR}/src/cinnamon/assets/assets${ELSE_DARK}/switch/*.svg            ${THEME_DIR}/cinnamon/assets/switch
126
+    gcp -rf ${SRC_DIR}/src/cinnamon/thumbnail${ELSE_DARK}.png                         ${THEME_DIR}/cinnamon/thumbnail.png
127
   fi
128
 
129
   mkdir -p                                                                           ${THEME_DIR}/plank
130
-  cp -rf ${SRC_DIR}/src/plank/dock${ELSE_LIGHT}.theme                                ${THEME_DIR}/plank/dock.theme
131
+  gcp -rf ${SRC_DIR}/src/plank/dock${ELSE_LIGHT}.theme                                ${THEME_DIR}/plank/dock.theme
132
 }
133
 
134
 install_gdm() {
135
@@ -193,7 +193,7 @@ install_gdm() {
136
 
137
   if [[ -f "$GS_THEME_FILE" ]] && [[ "$(which glib-compile-resources 2> /dev/null)" ]]; then
138
     echo "Installing '$GS_THEME_FILE'..."
139
-    cp -an "$GS_THEME_FILE" "$GS_THEME_FILE.bak"
140
+    gcp -an "$GS_THEME_FILE" "$GS_THEME_FILE.bak"
141
     glib-compile-resources \
142
       --sourcedir="$THEME_DIR/gnome-shell" \
143
       --target="$GS_THEME_FILE" \
144
@@ -206,8 +206,8 @@ install_gdm() {
145
 
146
   if [[ -f "$UBUNTU_THEME_FILE" ]]; then
147
     echo "Installing '$UBUNTU_THEME_FILE'..."
148
-    cp -an "$UBUNTU_THEME_FILE" "$UBUNTU_THEME_FILE.bak"
149
-    cp -af "$THEME_DIR/gnome-shell/gnome-shell.css" "$UBUNTU_THEME_FILE"
150
+    gcp -an "$UBUNTU_THEME_FILE" "$UBUNTU_THEME_FILE.bak"
151
+    gcp -af "$THEME_DIR/gnome-shell/gnome-shell.css" "$UBUNTU_THEME_FILE"
152
   fi
153
 }
154
 
155
@@ -215,7 +215,7 @@ install_icon() {
156
   echo -e "\nInstalling Canta icon theme..."
157
 
158
   # Copying files
159
-  cp -rf ${SRC_DIR}/icons/Canta ${ICON_DEST_DIR}
160
+  gcp -rf ${SRC_DIR}/icons/Canta ${ICON_DEST_DIR}
161
 
162
   # update icon caches
163
   gtk-update-icon-cache ${ICON_DEST_DIR}/Canta
164
@@ -390,7 +390,7 @@ install_theme() {
165
 }
166
 
167
 tweaks_temp() {
168
-  cp -rf ${SRC_DIR}/src/_sass/_tweaks.scss ${SRC_DIR}/src/_sass/_tweaks-temp.scss
169
+  gcp -rf ${SRC_DIR}/src/_sass/_tweaks.scss ${SRC_DIR}/src/_sass/_tweaks-temp.scss
170
 }
171
 
172
 theme_colors() {
173
@@ -403,7 +403,7 @@ theme_colors() {
4
         theme_color='indigo'
174
         theme_color='indigo'
5
         ;;
175
         ;;
6
     esac
176
     esac
Lines 9-18 Link Here
9
   fi
179
   fi
10
 }
180
 }
11
 
181
 
12
 bakground_image() {
13
     echo "Install with no nautilus bakground image..."
14
-    sed -i "/\$theme_image:/s/true/false/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
15
+    gsed -i "/\$theme_image:/s/true/false/" ${SRC_DIR}/src/_sass/_tweaks-temp.scss
16
 }
17
 
18
 theme_tweaks() {

Return to bug 260506