git: 86201944acaa - main - x11-clocks/asclock: update to 1.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 06 Nov 2024 20:42:04 UTC
The branch main has been updated by dinoex:
URL: https://cgit.FreeBSD.org/ports/commit/?id=86201944acaa83f50e91f3f989b6495a89c8de68
commit 86201944acaa83f50e91f3f989b6495a89c8de68
Author: Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2024-11-06 20:41:28 +0000
Commit: Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2024-11-06 20:41:28 +0000
x11-clocks/asclock: update to 1.3
- more language options
- add clock options
---
x11-clocks/asclock/Makefile | 112 +++++++++++++++++++++----------
x11-clocks/asclock/distinfo | 5 +-
x11-clocks/asclock/files/patch-asclock.c | 76 ++++-----------------
3 files changed, 93 insertions(+), 100 deletions(-)
diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile
index 40d3d908b0ff..54b569b53a79 100644
--- a/x11-clocks/asclock/Makefile
+++ b/x11-clocks/asclock/Makefile
@@ -1,82 +1,122 @@
PORTNAME= asclock
-PORTVERSION= 1.0
-PORTREVISION= 5
+PORTVERSION= 1.3
+PORTREVISION= 0
CATEGORIES= x11-clocks afterstep
-MASTER_SITES= XCONTRIB/applications
-DISTNAME= ${PORTNAME}
+MASTER_SITES= AFTERSTEP/apps/asclock
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Afterstep clock with some language extensions
+WWW= https://web.archive.org/web/20000816095347/http://www.asclock.org/
-LICENSE= BSD2CLAUSE
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS_INSTALL= asclock-xlib
-
-USES= tar:tgz imake xorg
+USES= imake xorg
USE_XORG= xpm xext x11
-MAKE_ARGS+= MANPATH="${PREFIX}/share/man"
+GNU_CONFIGURE= yes
PLIST_FILES= bin/asclock share/man/man1/asclock.1.gz
OPTIONS_DEFINE=
-OPTIONS_SINGLE= LANG
-OPTIONS_SINGLE_LANG= EN DE PT NL NO IT SE ES HU BRE FR CZ
-OPTIONS_DEFAULT= EN
+OPTIONS_SINGLE= LANG CLOCK
+OPTIONS_SINGLE_LANG= ENGLISH GERMAN PORTUGUESE DUTCH NORWEGIAN \
+ ITALIAN SWEDISH SPANISH HUNGARIAN BRETON \
+ FRENCH CZECH RUSSIAN UKRAINIAN SLOVENE \
+ INDONESIAN DANISH
+OPTIONS_SINGLE_CLOCK= CLK2 COLOR CLK8
+OPTIONS_DEFAULT= ENGLISH CLK8
NO_OPTIONS_SORT=yes
-EN_DESC= english
-DE_DESC= german
-PT_DESC= portuguese
-NL_DESC= dutch
-NO_DESC= norwegian
-IT_DESC= italian
-SE_DESC= swedish
-ES_DESC= spanish
-HU_DESC= hungarian
-BRE_DESC= breton
-FR_DESC= french
-CZ_DESC= czech
+ENGLISH_DESC= day and month names
+GERMAN_DESC= day and month names
+PORTUGUESE_DESC= day and month names
+DUTCH_DESC= day and month names
+NORWEGIAN_DESC= day and month names
+ITALIAN_DESC= day and month names
+SWEDISH_DESC= day and month names
+SPANISH_DESC= day and month names
+HUNGARIAN_DESC= day and month names
+BRETON_DESC= day and month names
+FRENCH_DESC= day and month names
+CZECH_DESC= day and month names
+RUSSIAN_DESC= day and month names
+UKRAINIAN_DESC= day and month names
+SLOVENE_DESC= day and month names
+INDONESIAN_DESC= day and month names
+DANISH_DESC= day and month names
+CLK2_DESC= 2bit greyscale (4 colors)
+COLOR_DESC= 8bit AfterStep-colors (44 colors)
+CLK8_DESC= 8bit NeXTStep -colors (74 colors)
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MDE}
+.if ${PORT_OPTIONS:MENGLISH}
+ASCLOCK_LANG= english
+.endif
+.if ${PORT_OPTIONS:MGERMAN}
ASCLOCK_LANG= german
.endif
-.if ${PORT_OPTIONS:MPT}
+.if ${PORT_OPTIONS:MPORTUGUESE}
ASCLOCK_LANG= portuguese
.endif
-.if ${PORT_OPTIONS:MNL}
+.if ${PORT_OPTIONS:MDUTCH}
ASCLOCK_LANG= dutch
.endif
-.if ${PORT_OPTIONS:MNO}
+.if ${PORT_OPTIONS:MNORWEGIAN}
ASCLOCK_LANG= norwegian
.endif
-.if ${PORT_OPTIONS:MIT}
+.if ${PORT_OPTIONS:MITALIAN}
ASCLOCK_LANG= italian
.endif
-.if ${PORT_OPTIONS:MSE}
+.if ${PORT_OPTIONS:MSWEDISH}
ASCLOCK_LANG= swedish
.endif
-.if ${PORT_OPTIONS:MES}
+.if ${PORT_OPTIONS:MSPANISH}
ASCLOCK_LANG= spanish
.endif
-.if ${PORT_OPTIONS:MHU}
+.if ${PORT_OPTIONS:MHUNGARIAN}
ASCLOCK_LANG= hungarian
.endif
-.if ${PORT_OPTIONS:MBRE}
+.if ${PORT_OPTIONS:MBRETON}
ASCLOCK_LANG= breton
.endif
-.if ${PORT_OPTIONS:MFR}
+.if ${PORT_OPTIONS:MFRENCH}
ASCLOCK_LANG= french
.endif
-.if ${PORT_OPTIONS:MCZ}
+.if ${PORT_OPTIONS:MCZECH}
ASCLOCK_LANG= czech
.endif
+.if ${PORT_OPTIONS:MRUSSIAN}
+ASCLOCK_LANG= russian
+.endif
+.if ${PORT_OPTIONS:MUKRAINIAN}
+ASCLOCK_LANG= ukrainian
+.endif
+.if ${PORT_OPTIONS:MSLOVENE}
+ASCLOCK_LANG= slovene
+.endif
+.if ${PORT_OPTIONS:MINDONESIAN}
+ASCLOCK_LANG= indonesian
+.endif
+.if ${PORT_OPTIONS:MDANISH}
+ASCLOCK_LANG= danish
+.endif
+.if ${PORT_OPTIONS:MCLK2}
+ASCLOCK_CLOCK= clk2
+.endif
+.if ${PORT_OPTIONS:MCOLOR}
+ASCLOCK_CLOCK= color
+.endif
+.if ${PORT_OPTIONS:MCLK8}
+ASCLOCK_CLOCK= clk8
+.endif
# default
ASCLOCK_LANG?= english
+ASCLOCK_CLOCK?= clk8
pre-configure:
- ${RM} ${WRKSRC}/month.xpm ${WRKSRC}/weekday.xpm
+ ${RM} ${WRKSRC}/month.xpm ${WRKSRC}/weekday.xpm ${WRKSRC}/clk.xpm
(cd ${WRKSRC} && ${LN} -s ./${ASCLOCK_LANG}/month.xpm ./month.xpm)
(cd ${WRKSRC} && ${LN} -s ./${ASCLOCK_LANG}/weekday.xpm ./weekday.xpm)
+ (cd ${WRKSRC} && ${LN} -s ./xpm/${ASCLOCK_CLOCK}.xpm ./clk.xpm)
.include <bsd.port.mk>
diff --git a/x11-clocks/asclock/distinfo b/x11-clocks/asclock/distinfo
index aec5ba77ea4d..7500340c16ad 100644
--- a/x11-clocks/asclock/distinfo
+++ b/x11-clocks/asclock/distinfo
@@ -1,2 +1,3 @@
-SHA256 (asclock.tgz) = aacb235bb5b54aab46dc115f72743ad10c3be1611962b76083c1c253abe1a988
-SIZE (asclock.tgz) = 19085
+TIMESTAMP = 1730922041
+SHA256 (asclock-1.3.tar.gz) = b046a9259570289acae926ea8b41ba2e2945a910884820f420cfac280d8edd32
+SIZE (asclock-1.3.tar.gz) = 53934
diff --git a/x11-clocks/asclock/files/patch-asclock.c b/x11-clocks/asclock/files/patch-asclock.c
index f85db294cecb..a1dd940e4882 100644
--- a/x11-clocks/asclock/files/patch-asclock.c
+++ b/x11-clocks/asclock/files/patch-asclock.c
@@ -1,4 +1,4 @@
---- asclock.c.orig 1996-08-25 22:35:49 UTC
+--- asclock.c.orig 1998-12-27 19:05:24 UTC
+++ asclock.c
@@ -1,4 +1,7 @@
#include <stdio.h>
@@ -8,34 +8,26 @@
#include <X11/Xlib.h>
#include <X11/xpm.h>
#include <X11/extensions/shape.h>
-@@ -245,6 +248,7 @@ int main(int argc,char *argv[])
- InsertTime();
- }
- if (ITBLINKS)
-+ {
- if (actualtime % 2)
- /* Sekunden Doppelpunkt ein */
- XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
-@@ -253,6 +257,7 @@ int main(int argc,char *argv[])
- /* Sekunden Doppelpunkt aus */
- XCopyArea(dpy, asclock.pixmap, visible.pixmap, NormalGC,
- 27,6,3,11,posx[2], posy[0]);
-+ }
-
- RedrawWindow(&visible);
-
-@@ -302,8 +307,8 @@ void GetXPM(void)
+@@ -107,6 +110,7 @@ void usage()
+ fprintf(stderr,"\n");
+ exit(1);
+ }
++int mytime(void);
+ int main(int argc,char *argv[])
+ {
+ int i;
+@@ -345,8 +349,8 @@ void GetXPM(void)
static char **clock_xpm;
XColor col;
XWindowAttributes attributes;
-- char led1[22];
-- char led2[22];
+- char led1[23];
+- char led2[23];
+ char led1[64];
+ char led2[64];
int ret;
clock_xpm =ONLYSHAPE ? mask_xpm : clk_xpm;
-@@ -317,51 +322,49 @@ void GetXPM(void)
+@@ -360,18 +364,14 @@ void GetXPM(void)
nocolor("parse",LedColor);
}
@@ -56,45 +48,5 @@
+ sprintf(led2, "X c #%04X%04X%04X", col.red, col.green, col.blue);
+ led_xpm[3] = led2;
- asclock.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
- ret = XpmCreatePixmapFromData(dpy, Root, clock_xpm, &asclock.pixmap,
- &asclock.mask, &asclock.attributes);
- if(ret != XpmSuccess)
-- {fprintf(stderr, ERR_colorcells);exit(1);}
-+ {fprintf(stderr, "1: %s\n", XpmGetErrorString(ret));exit(1);}
- visible.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
- ret = XpmCreatePixmapFromData(dpy, Root, clk_xpm, &visible.pixmap,
- &visible.mask, &visible.attributes);
-+ if(ret != XpmSuccess)
-+ {fprintf(stderr, "2: %s\n", XpmGetErrorString(ret));exit(1);}
-
- led.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
- ret = XpmCreatePixmapFromData(dpy, Root, led_xpm, &led.pixmap,
- &led.mask, &led.attributes);
- if(ret != XpmSuccess)
-- {fprintf(stderr, ERR_colorcells);exit(1);}
-+ {fprintf(stderr, "3: %s\n", XpmGetErrorString(ret));exit(1);}
- month.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
- ret = XpmCreatePixmapFromData(dpy, Root, month_xpm, &month.pixmap,
- &month.mask, &month.attributes);
- if(ret != XpmSuccess)
-- {fprintf(stderr, ERR_colorcells);exit(1);}
-+ {fprintf(stderr, "4: %s\n", XpmGetErrorString(ret));exit(1);}
-
- date.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
- ret = XpmCreatePixmapFromData(dpy, Root, date_xpm, &date.pixmap,
- &date.mask, &date.attributes);
- if(ret != XpmSuccess)
-- {fprintf(stderr, ERR_colorcells);exit(1);}
-+ {fprintf(stderr, "5: %s\n", XpmGetErrorString(ret));exit(1);}
-
- weekday.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
- ret = XpmCreatePixmapFromData(dpy, Root, weekday_xpm, &weekday.pixmap,
- &weekday.mask, &weekday.attributes);
- if(ret != XpmSuccess)
-- {fprintf(stderr, ERR_colorcells);exit(1);}
-+ {fprintf(stderr, "6: %s\n", XpmGetErrorString(ret));exit(1);}
- }
- /****************************************************************************/
- /* Removes expose events for a specific window from the queue */
+ asclock.attributes.closeness = 40000; /* Allow for "similar" colors */