git: a5a24449e385 - main - x11-clocks/asclock-xlib: update to 2.0.12

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dirk Meyer <dinoex_at_FreeBSD.org>
Date: Wed, 06 Nov 2024 20:53:50 UTC
The branch main has been updated by dinoex:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a5a24449e385d6ca8f2d77fd4a85e601bb19cb15

commit a5a24449e385d6ca8f2d77fd4a85e601bb19cb15
Author:     Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2024-11-06 20:53:37 +0000
Commit:     Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2024-11-06 20:53:37 +0000

    x11-clocks/asclock-xlib: update to 2.0.12
    
    - take maintainership
    - reset default theme
    - use DATADIR
    - rename files
    - remove CONFLICTS
---
 x11-clocks/asclock-xlib/Makefile              |  35 +++---
 x11-clocks/asclock-xlib/distinfo              |   5 +-
 x11-clocks/asclock-xlib/files/patch-Imakefile |   9 +-
 x11-clocks/asclock-xlib/pkg-descr             |   2 +
 x11-clocks/asclock-xlib/pkg-plist             | 156 +++++++++++++-------------
 5 files changed, 108 insertions(+), 99 deletions(-)

diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index a8fbefc07b25..703b3c402a22 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -1,37 +1,40 @@
 PORTNAME=	asclock-xlib
-PORTVERSION=	2.0.11
-PORTREVISION=	5
+PORTVERSION=	2.0.12
+PORTREVISION=	0
 CATEGORIES=	x11-clocks afterstep windowmaker
-MASTER_SITES=	LOCAL/kuriyama
+MASTER_SITES=	AFTERSTEP/apps/asclock
+DISTNAME=	asclock-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	New flavor of asclock
+WWW=		https://web.archive.org/web/20000816095347/http://www.asclock.org/
 
-CONFLICTS_INSTALL=	asclock
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-MAKE_JOBS_UNSAFE=	yes
-
-WRKSRC=		${WRKDIR}/asclock-xlib
 USES=		imake xorg
-USE_XORG=	xpm x11
+USE_XORG=	xpm xext x11
+
+MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@(cd ${WRKSRC}; \
-	  ${MV} config.c config.c.tmp; \
-	  ${SED} -e s@/usr/local/@${PREFIX}/@ -e s@/usr/share/asclock@${PREFIX}/share/asclock@ < config.c.tmp > config.c )
+	${MV} ${WRKSRC}/asclock.man ${WRKSRC}/asclock-xlib.man
+	${REINPLACE_CMD} -e s@/usr/local/@${PREFIX}/@ \
+		-e s@/usr/share/asclock@${DATADIR}@ \
+		${WRKSRC}/config.c
 
 pre-configure:
-	@(cd ${WRKSRC}; \
+	(cd ${WRKSRC}; \
 	  ${RM} -r default_theme; \
-	  ${LN} -s themes/Orb default_theme)
+	  ${LN} -s themes/classic default_theme)
 
 post-install:
 .for i in Freeamp Newstone Orb Stone beats classic penguin shaped
 	(cd ${WRKSRC}/themes/${i}; \
-	  ${MKDIR} ${STAGEDIR}${PREFIX}/share/asclock/${i}; \
-	  ${INSTALL_DATA} *.xpm config ${STAGEDIR}${PREFIX}/share/asclock/${i}/ )
+	  ${MKDIR} ${STAGEDIR}${DATADIR}/${i}; \
+	  ${INSTALL_DATA} *.xpm config ${STAGEDIR}${DATADIR}/${i}/ )
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/x11-clocks/asclock-xlib/distinfo b/x11-clocks/asclock-xlib/distinfo
index 2c5427434b95..762a1f75d04c 100644
--- a/x11-clocks/asclock-xlib/distinfo
+++ b/x11-clocks/asclock-xlib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (asclock-xlib-2.0.11.tar.gz) = 80a4109ee98581e92d359e6becd87ed3e4ffb4db602a28ccb1faab8093e2dd47
-SIZE (asclock-xlib-2.0.11.tar.gz) = 111832
+TIMESTAMP = 1730925840
+SHA256 (asclock-2.0.12.tar.gz) = 70df9bd991bc707c0fdf76ea1acbeff5924e9ae0b0704feb46afa591030704e6
+SIZE (asclock-2.0.12.tar.gz) = 111858
diff --git a/x11-clocks/asclock-xlib/files/patch-Imakefile b/x11-clocks/asclock-xlib/files/patch-Imakefile
index e7456f763a9d..b452d1ed2f98 100644
--- a/x11-clocks/asclock-xlib/files/patch-Imakefile
+++ b/x11-clocks/asclock-xlib/files/patch-Imakefile
@@ -1,6 +1,6 @@
---- Imakefile.orig	Sun Mar 25 12:49:22 2007
-+++ Imakefile	Sun Mar 25 12:49:32 2007
-@@ -5,7 +5,7 @@
+--- Imakefile.orig	1999-03-14 06:04:31 UTC
++++ Imakefile
+@@ -5,9 +5,9 @@ LINTLIBS = $(LINTXLIB)
  LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)  
  
  LINTLIBS = $(LINTXLIB)
@@ -9,3 +9,6 @@
  
  SRCS = asclock.c parser.c symbols.c config.c
  OBJS = asclock.o parser.o symbols.o config.o
+ 
+-ComplexProgramTarget(asclock)
++ComplexProgramTarget(asclock-xlib)
diff --git a/x11-clocks/asclock-xlib/pkg-descr b/x11-clocks/asclock-xlib/pkg-descr
index d8e8d6ef8221..6494119e2343 100644
--- a/x11-clocks/asclock-xlib/pkg-descr
+++ b/x11-clocks/asclock-xlib/pkg-descr
@@ -1 +1,3 @@
 New flavor of asclock.
+
+Support for themes
diff --git a/x11-clocks/asclock-xlib/pkg-plist b/x11-clocks/asclock-xlib/pkg-plist
index 0cd06083f53f..a92db1ee2c38 100644
--- a/x11-clocks/asclock-xlib/pkg-plist
+++ b/x11-clocks/asclock-xlib/pkg-plist
@@ -1,78 +1,78 @@
-bin/asclock
-share/asclock/Freeamp/beats.xpm
-share/asclock/Freeamp/clock.xpm
-share/asclock/Freeamp/config
-share/asclock/Freeamp/date.xpm
-share/asclock/Freeamp/hour.xpm
-share/asclock/Freeamp/led.xpm
-share/asclock/Freeamp/minute.xpm
-share/asclock/Freeamp/month.xpm
-share/asclock/Freeamp/old.clock.xpm
-share/asclock/Freeamp/second.xpm
-share/asclock/Freeamp/weekday.xpm
-share/asclock/Newstone/beats.xpm
-share/asclock/Newstone/clock.xpm
-share/asclock/Newstone/config
-share/asclock/Newstone/date.xpm
-share/asclock/Newstone/hour.xpm
-share/asclock/Newstone/led.xpm
-share/asclock/Newstone/minute.xpm
-share/asclock/Newstone/month.xpm
-share/asclock/Newstone/second.xpm
-share/asclock/Newstone/weekday.xpm
-share/asclock/Orb/beats.xpm
-share/asclock/Orb/clock.xpm
-share/asclock/Orb/config
-share/asclock/Orb/date.xpm
-share/asclock/Orb/hour.xpm
-share/asclock/Orb/led.xpm
-share/asclock/Orb/minute.xpm
-share/asclock/Orb/month.xpm
-share/asclock/Orb/second.xpm
-share/asclock/Orb/weekday.xpm
-share/asclock/Stone/beats.xpm
-share/asclock/Stone/clock.xpm
-share/asclock/Stone/config
-share/asclock/Stone/date.xpm
-share/asclock/Stone/hour.xpm
-share/asclock/Stone/led.xpm
-share/asclock/Stone/minute.xpm
-share/asclock/Stone/month.xpm
-share/asclock/Stone/second.xpm
-share/asclock/Stone/weekday.xpm
-share/asclock/beats/beats.xpm
-share/asclock/beats/clock.xpm
-share/asclock/beats/config
-share/asclock/beats/date.xpm
-share/asclock/beats/hour.xpm
-share/asclock/beats/led.xpm
-share/asclock/beats/minute.xpm
-share/asclock/beats/month.xpm
-share/asclock/beats/second.xpm
-share/asclock/beats/weekday.xpm
-share/asclock/classic/beats.xpm
-share/asclock/classic/clock.xpm
-share/asclock/classic/config
-share/asclock/classic/date.xpm
-share/asclock/classic/hour.xpm
-share/asclock/classic/led.xpm
-share/asclock/classic/minute.xpm
-share/asclock/classic/month.xpm
-share/asclock/classic/second.xpm
-share/asclock/classic/weekday.xpm
-share/asclock/penguin/clock.xpm
-share/asclock/penguin/config
-share/asclock/penguin/date.xpm
-share/asclock/penguin/led.xpm
-share/asclock/penguin/month.xpm
-share/asclock/shaped/beats.xpm
-share/asclock/shaped/clock.xpm
-share/asclock/shaped/config
-share/asclock/shaped/date.xpm
-share/asclock/shaped/hour.xpm
-share/asclock/shaped/led.xpm
-share/asclock/shaped/minute.xpm
-share/asclock/shaped/month.xpm
-share/asclock/shaped/second.xpm
-share/asclock/shaped/weekday.xpm
-share/man/man1/asclock.1.gz
+bin/asclock-xlib
+%%DATADIR%%/Freeamp/beats.xpm
+%%DATADIR%%/Freeamp/clock.xpm
+%%DATADIR%%/Freeamp/config
+%%DATADIR%%/Freeamp/date.xpm
+%%DATADIR%%/Freeamp/hour.xpm
+%%DATADIR%%/Freeamp/led.xpm
+%%DATADIR%%/Freeamp/minute.xpm
+%%DATADIR%%/Freeamp/month.xpm
+%%DATADIR%%/Freeamp/old.clock.xpm
+%%DATADIR%%/Freeamp/second.xpm
+%%DATADIR%%/Freeamp/weekday.xpm
+%%DATADIR%%/Newstone/beats.xpm
+%%DATADIR%%/Newstone/clock.xpm
+%%DATADIR%%/Newstone/config
+%%DATADIR%%/Newstone/date.xpm
+%%DATADIR%%/Newstone/hour.xpm
+%%DATADIR%%/Newstone/led.xpm
+%%DATADIR%%/Newstone/minute.xpm
+%%DATADIR%%/Newstone/month.xpm
+%%DATADIR%%/Newstone/second.xpm
+%%DATADIR%%/Newstone/weekday.xpm
+%%DATADIR%%/Orb/beats.xpm
+%%DATADIR%%/Orb/clock.xpm
+%%DATADIR%%/Orb/config
+%%DATADIR%%/Orb/date.xpm
+%%DATADIR%%/Orb/hour.xpm
+%%DATADIR%%/Orb/led.xpm
+%%DATADIR%%/Orb/minute.xpm
+%%DATADIR%%/Orb/month.xpm
+%%DATADIR%%/Orb/second.xpm
+%%DATADIR%%/Orb/weekday.xpm
+%%DATADIR%%/Stone/beats.xpm
+%%DATADIR%%/Stone/clock.xpm
+%%DATADIR%%/Stone/config
+%%DATADIR%%/Stone/date.xpm
+%%DATADIR%%/Stone/hour.xpm
+%%DATADIR%%/Stone/led.xpm
+%%DATADIR%%/Stone/minute.xpm
+%%DATADIR%%/Stone/month.xpm
+%%DATADIR%%/Stone/second.xpm
+%%DATADIR%%/Stone/weekday.xpm
+%%DATADIR%%/beats/beats.xpm
+%%DATADIR%%/beats/clock.xpm
+%%DATADIR%%/beats/config
+%%DATADIR%%/beats/date.xpm
+%%DATADIR%%/beats/hour.xpm
+%%DATADIR%%/beats/led.xpm
+%%DATADIR%%/beats/minute.xpm
+%%DATADIR%%/beats/month.xpm
+%%DATADIR%%/beats/second.xpm
+%%DATADIR%%/beats/weekday.xpm
+%%DATADIR%%/classic/beats.xpm
+%%DATADIR%%/classic/clock.xpm
+%%DATADIR%%/classic/config
+%%DATADIR%%/classic/date.xpm
+%%DATADIR%%/classic/hour.xpm
+%%DATADIR%%/classic/led.xpm
+%%DATADIR%%/classic/minute.xpm
+%%DATADIR%%/classic/month.xpm
+%%DATADIR%%/classic/second.xpm
+%%DATADIR%%/classic/weekday.xpm
+%%DATADIR%%/penguin/clock.xpm
+%%DATADIR%%/penguin/config
+%%DATADIR%%/penguin/date.xpm
+%%DATADIR%%/penguin/led.xpm
+%%DATADIR%%/penguin/month.xpm
+%%DATADIR%%/shaped/beats.xpm
+%%DATADIR%%/shaped/clock.xpm
+%%DATADIR%%/shaped/config
+%%DATADIR%%/shaped/date.xpm
+%%DATADIR%%/shaped/hour.xpm
+%%DATADIR%%/shaped/led.xpm
+%%DATADIR%%/shaped/minute.xpm
+%%DATADIR%%/shaped/month.xpm
+%%DATADIR%%/shaped/second.xpm
+%%DATADIR%%/shaped/weekday.xpm
+share/man/man1/asclock-xlib.1.gz