From 71ed1188bb69afb12ced704607859c0132544e53 Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Mon, 26 Apr 2010 10:00:54 +0400 Subject: [PATCH] x11-themes/slim-themes: fix patching for parallel dimensions theme Patch it only when theme is selected to unbreak the builds without this theme. Noticed-by: Alexey Golodov Signed-off-by: Eygene Ryabinkin --- x11-themes/slim-themes/Makefile | 9 +++++++-- .../extra-patch-parallel-dimensions-slim.theme | 13 +++++++++++++ .../files/patch-parallel-dimensions-slim.theme | 13 ------------- 3 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 x11-themes/slim-themes/files/extra-patch-parallel-dimensions-slim.theme delete mode 100644 x11-themes/slim-themes/files/patch-parallel-dimensions-slim.theme diff --git a/x11-themes/slim-themes/Makefile b/x11-themes/slim-themes/Makefile index d6d9310..c4e128e 100644 --- a/x11-themes/slim-themes/Makefile +++ b/x11-themes/slim-themes/Makefile @@ -7,6 +7,7 @@ PORTNAME= slim-themes PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= x11-themes MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= slim @@ -84,13 +85,17 @@ PLIST_SUB:= ${NEW_PLIST_SUB} .endfor # n in ${THEMELIST} .if !defined(SEEN_THEMES) -IGNORE= at least one theme must be chosen +IGNORE= at least one theme must be selected .endif +.if defined(WITH_PARALLEL_DIMS) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-parallel-dimensions-slim.theme + post-patch: @${RM} ${WRKSRC}/parallel-dimensions/slim.theme.orig +.endif # defined(WITH_PARALLEL_DIMS) -# Install chose themes. Another regexp voodoo, yay! \o/ +# Install selected themes. Another regexp voodoo, yay! \o/ do-install: ${MKDIR} ${THEMEDIR} .for n in ${ALLTHEMES} diff --git a/x11-themes/slim-themes/files/extra-patch-parallel-dimensions-slim.theme b/x11-themes/slim-themes/files/extra-patch-parallel-dimensions-slim.theme new file mode 100644 index 0000000..9aa2118 --- /dev/null +++ b/x11-themes/slim-themes/files/extra-patch-parallel-dimensions-slim.theme @@ -0,0 +1,13 @@ +Properly align both prompts. + +--- parallel-dimensions/slim.theme.orig 2009-05-22 13:07:27.000000000 +0400 ++++ parallel-dimensions/slim.theme 2009-05-22 13:07:52.000000000 +0400 +@@ -26,7 +26,7 @@ + # Username / password request + username_font Verdana:size=14:bold + username_color #f9f9f9 +-username_x 280 ++username_x 50% + username_y 183 + password_x 50% + password_y 183 diff --git a/x11-themes/slim-themes/files/patch-parallel-dimensions-slim.theme b/x11-themes/slim-themes/files/patch-parallel-dimensions-slim.theme deleted file mode 100644 index 9aa2118..0000000 --- a/x11-themes/slim-themes/files/patch-parallel-dimensions-slim.theme +++ /dev/null @@ -1,13 +0,0 @@ -Properly align both prompts. - ---- parallel-dimensions/slim.theme.orig 2009-05-22 13:07:27.000000000 +0400 -+++ parallel-dimensions/slim.theme 2009-05-22 13:07:52.000000000 +0400 -@@ -26,7 +26,7 @@ - # Username / password request - username_font Verdana:size=14:bold - username_color #f9f9f9 --username_x 280 -+username_x 50% - username_y 183 - password_x 50% - password_y 183 -- 1.7.0.4