Date: Thu, 17 Oct 2024 22:07:36 GMT From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f641d910db00 - main - astro/wmsun: update to 1.06 Message-ID: <202410172207.49HM7adW000437@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=f641d910db00b2da0c8ea893b3884a1c839f3c10 commit f641d910db00b2da0c8ea893b3884a1c839f3c10 Author: Rodrigo Osorio <rodrigo@FreeBSD.org> AuthorDate: 2024-10-17 22:00:17 +0000 Commit: Rodrigo Osorio <rodrigo@FreeBSD.org> CommitDate: 2024-10-17 22:04:57 +0000 astro/wmsun: update to 1.06 Changelog: https://repo.or.cz/dockapps.git/blob_plain/HEAD:/wmsun/ChangeLog Major changes: * Fix typo in manpage. * Move version number definition to Makefile * Add 'dist' target to Makefile to generate tarball Port changes: * reformat Makefile to make portfmt happy * update WWW (error 404) --- astro/wmsun/Makefile | 15 +++++++++------ astro/wmsun/distinfo | 6 +++--- astro/wmsun/files/patch-Makefile | 10 +++++----- astro/wmsun/files/patch-wmsun.c | 10 +++++----- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile index 79548bc622ce..693bf4a1d3eb 100644 --- a/astro/wmsun/Makefile +++ b/astro/wmsun/Makefile @@ -1,12 +1,12 @@ PORTNAME= wmsun -DISTVERSION= 1.05 +DISTVERSION= 1.06 PORTEPOCH= 1 CATEGORIES= astro windowmaker MASTER_SITES= https://www.dockapps.net/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Dockapp that displays the rise and set times of the Sun -WWW= https://www.dockapps.net/wmsun/ +WWW= https://www.dockapps.net/wmsun LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING @@ -16,13 +16,16 @@ LIB_DEPENDS= libdockapp.so:x11-wm/libdockapp USES= xorg USE_XORG= x11 xext xpm -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \ - INCDIR="-I${LOCALBASE}/include" LIBDIR="-L${LOCALBASE}/lib" +MAKE_ARGS= CC="${CC}" \ + CFLAGS="${CFLAGS}" \ + INCDIR="-I${LOCALBASE}/include" \ + LIBDIR="-L${LOCALBASE}/lib" MAKE_JOBS_UNSAFE= yes -WRKSRC= ${WRKDIR}/dockapps-a1e67bd +#WRKSRC= ${WRKDIR}/dockapps-a1e67bd -PLIST_FILES= bin/wmsun share/man/man1/wmsun.1.gz +PLIST_FILES= bin/wmsun \ + share/man/man1/wmsun.1.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmsun ${STAGEDIR}${PREFIX}/bin diff --git a/astro/wmsun/distinfo b/astro/wmsun/distinfo index f4c99c1135db..05290db224ba 100644 --- a/astro/wmsun/distinfo +++ b/astro/wmsun/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549747586 -SHA256 (wmsun-1.05.tar.gz) = 29c7d2da4c0731a20955af9ba01bde3901dc269bfa1020ff707927c62d5b83a0 -SIZE (wmsun-1.05.tar.gz) = 20640 +TIMESTAMP = 1729200043 +SHA256 (wmsun-1.06.tar.gz) = 32fccc7d2f7fa1c2a2fda6a9d24e6747f79789396e975d7ca20cb97742ce5a21 +SIZE (wmsun-1.06.tar.gz) = 20127 diff --git a/astro/wmsun/files/patch-Makefile b/astro/wmsun/files/patch-Makefile index 96f3b04f10ca..bc74d5d939b8 100644 --- a/astro/wmsun/files/patch-Makefile +++ b/astro/wmsun/files/patch-Makefile @@ -1,11 +1,11 @@ ---- Makefile.orig 2015-08-28 11:57:39 UTC +--- Makefile.orig 2024-10-17 21:56:44 UTC +++ Makefile -@@ -19,14 +19,14 @@ LIBS = -lXpm -lX11 -lXext -lm -ldockapp - OBJS = wmsun.o SunRise.o +@@ -21,14 +21,14 @@ .c.o: -- $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ $(INCDIR) + $(CC) $(CPPFLAGS) -DWMSUN_VERSION=\"$(WMSUN_VERSION)\" $(CFLAGS) -c $< \ +- -o $*.o ++ -o $@ $(INCDIR) all: wmsun.o wmsun diff --git a/astro/wmsun/files/patch-wmsun.c b/astro/wmsun/files/patch-wmsun.c index 50e79ebe9595..5644a39c0f1b 100644 --- a/astro/wmsun/files/patch-wmsun.c +++ b/astro/wmsun/files/patch-wmsun.c @@ -1,20 +1,20 @@ ---- wmsun.c.orig 2015-08-28 11:57:39 UTC +--- wmsun.c.orig 2024-10-17 21:51:08 UTC +++ wmsun.c -@@ -43,7 +43,6 @@ +@@ -43,7 +43,7 @@ /* * Includes */ -#define _POSIX_C_SOURCE 1 ++#define _POSIX_C_SOURCE 200112L #include <X11/X.h> /* for ButtonPress, ButtonRelease, etc */ #include <X11/Xlib.h> /* for XEvent, ConnectionNumber, etc */ #include <math.h> /* for cos, sin */ -@@ -106,7 +105,8 @@ int main(int argc, char *argv[]) { +@@ -105,7 +105,7 @@ int n; int Year, Month; int DayOfMonth; - long CurrentLocalTime, CurrentGMTTime, date; -+ time_t CurrentLocalTime, CurrentGMTTime; -+ long date; ++ time_t CurrentLocalTime, CurrentGMTTime, date; double UT, val, LTRise, LTSet, LocalHour, hour24(); int H, M; struct timeval timeout;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410172207.49HM7adW000437>